Adapted project directory structure to suit the new maven based build process.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@909 d688527b-c9ab-4aba-bd8d-4036d912da1d

1079 files changed, 0 insertions, 9329 deletions

diff --git a/common/src/test/at/gv/egovernment/moa/AllTests.java b/common-test/src/main/java/test/at/gv/egovernment/moa/AllTests.java
index 00e2c505f..00e2c505f 100644
--- a/common/src/test/at/gv/egovernment/moa/AllTests.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/AllTests.java
diff --git a/common/src/test/at/gv/egovernment/moa/MOATestCase.java b/common-test/src/main/java/test/at/gv/egovernment/moa/MOATestCase.java
index 86ea2ee6c..86ea2ee6c 100644
--- a/common/src/test/at/gv/egovernment/moa/MOATestCase.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/MOATestCase.java
diff --git a/common/src/test/at/gv/egovernment/moa/util/DOMUtilsTest.java b/common-test/src/main/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
index eb3ad1a5c..eb3ad1a5c 100644
--- a/common/src/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
diff --git a/common/src/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java b/common-test/src/main/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
index da6b29b1c..da6b29b1c 100644
--- a/common/src/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
diff --git a/common/src/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java b/common-test/src/main/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
index a6d1847ce..a6d1847ce 100644
--- a/common/src/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
diff --git a/common/src/test/at/gv/egovernment/moa/util/SSLUtilsTest.java b/common-test/src/main/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
index 7e55cb7d0..7e55cb7d0 100644
--- a/common/src/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
diff --git a/common/src/test/at/gv/egovernment/moa/util/URLDecoderTest.java b/common-test/src/main/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
index b6ea0e152..b6ea0e152 100644
--- a/common/src/test/at/gv/egovernment/moa/util/URLDecoderTest.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/util/URLDecoderTest.java
diff --git a/common/src/test/at/gv/egovernment/moa/util/URLEncoderTest.java b/common-test/src/main/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
index 43238c51f..43238c51f 100644
--- a/common/src/test/at/gv/egovernment/moa/util/URLEncoderTest.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/util/URLEncoderTest.java
diff --git a/common/src/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java b/common-test/src/main/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
index 7986fe540..7986fe540 100644
--- a/common/src/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
diff --git a/common/src/test/at/gv/egovernment/moa/util/XPathUtilsTest.java b/common-test/src/main/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
index 559494300..559494300 100644
--- a/common/src/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
+++ b/common-test/src/main/java/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
diff --git a/common/build.xml b/common/build.xml
deleted file mode 100644
index cf352e47b..000000000
--- a/common/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  Ant Buildfile for MOA Common component
-
-  $Id$
-
--->
-<project name="moa.common" default="package" basedir=".">
-  <property environment="env"/>
-  <property name="version" value="1.4.0"/>
-  <property name="src" value="src"/>
-  <property name="res" value="res"/>
-  <property name="tmp" value="tmp"/>
-  <property name="compile" value="${tmp}/compile"/>
-  <property name="dist" value="${tmp}/dist"/>
-  <property name="lib" value="lib"/>
-  <property name="lib.jaxp" value="${lib}/jaxp-1.2_01"/>
-  <property name="lib.jaxen" value="${lib}/jaxen-1.0"/>
-  <property name="lib.xerces" value="${lib}/xerces-j-2.4.0"/>
-  <property name="lib.xalan" value="${lib}/xalan-j-2.5.1"/>
-  <property name="lib.iaik-jce" value="${lib}/iaik-jce-3.0.6"/>
-  <property name="lib.jsse" value="${lib}/jsse-1.0.3_03"/>
-  <property name="lib.junit" value="${lib}/junit-3.8.1"/>
-  <property name="lib.commons-logging" value="${lib}/commons-logging-1.0.4"/>
-  <property name="compile-classpath" value="
-                   ${lib.jaxp}/jaxp-api.jar;
-                   ${lib.jaxp}/dom.jar;
-                   ${lib.xerces}/xercesImpl.jar;
-                   ${lib.jaxen}/jaxen-core.jar;
-                   ${lib.jaxen}/jaxen-dom.jar;
-                   ${lib.jaxen}/saxpath.jar;
-                   ${lib.xalan}/xalan.jar;
-                   ${lib.iaik-jce}/iaik_jce_full.jar;
-                   ${lib.jsse}/jcer.jar;
-                   ${lib.jsse}/jnet.jar;
-                   ${lib.jsse}/jsse.jar;
-                   ${lib.junit}/junit.jar;
-                   ${lib.commons-logging}/commons-logging-api.jar"/>
-                   
-  <!-- set up directories etc. -->
-  <target name="init">
-    <tstamp/>
-    <dirname property="dist.moa-common-jar" file="${env.MOA_COMMON_JAR}"/>
-    <dirname property="dist.moa-common-test-jar" 
-             file="${env.MOA_COMMON_TEST_JAR}"/>
-    <mkdir dir="${tmp}"/>
-    <mkdir dir="${compile}"/>
-    <mkdir dir="${dist.moa-common-jar}"/>
-    <mkdir dir="${dist.moa-common-test-jar}"/>
-  </target>
-
-  <!-- compile everything -->
-  <target name="compile" depends="init">
-    <javac destdir="${compile}" classpath="${compile-classpath}" debug="on">
-      <src path="${src}"/>
-    </javac>
-  </target>
-
-  <!-- package jar file -->
-  <target name="package" depends="compile,manifest">
-    <jar destfile="${env.MOA_COMMON_JAR}" manifest="${tmp}/MANIFEST.MF">
-      <fileset dir="${compile}" excludes="test/**"/>
-      <fileset dir="${res}"/>
-    </jar>
-    <jar destfile="${env.MOA_COMMON_TEST_JAR}" manifest="${tmp}/MANIFEST.MF">
-      <fileset dir="${compile}"/>
-      <fileset dir="${res}"/>
-    </jar>
-  </target>
-  
-  <!-- distribute everything -->
-  <target name="dist-all" depends="package"/>
-  
-  <!-- clean temporary files -->
-  <target name="clean">
-    <delete dir="${tmp}"/>
-  </target>
-
-	<!-- prepare Manifest file -->
-	<target name="manifest">
-		<filter token="version" value="${version}" /> 
-		<copy file="manifest.template" tofile="${tmp}/MANIFEST.MF" overwrite="true" filtering="true" /> 
-	</target>	
-</project>
diff --git a/common/res/resources/properties/common_messages_de.properties b/common/res/resources/properties/common_messages_de.properties
deleted file mode 100644
index ac05b7996..000000000
--- a/common/res/resources/properties/common_messages_de.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file contains exception messages in the standard Java properties
-# format. The messages may contain formatting patterns as definied in the
-# java.text.MessageFormat class.
-
-
-#
-# Messages private to the MOA common subsystem
-#
-
-parser.00=Leichter Fehler beim Parsen: {0}, SystemID={1}, Zeile={2}, Spalte={3}
-parser.01=Fehler beim Parsen: {0}, SystemID={1}, Zeile={2}, Spalte={3}
-parser.02=Schwerer Fehler beim Parsen: {0}, SystemID={1}, Zeile={2}, Spalte={3}
-
-xpath.00=Fehler beim Auswerten des XPath-Ausdruckes: {0}
-
-datetime.00=Fehler beim Parsen der DateTime
\ No newline at end of file
diff --git a/common/res/resources/schemas/Core-1.2.xsd b/common/res/resources/schemas/Core-1.2.xsd
deleted file mode 100644
index 864fee6d5..000000000
--- a/common/res/resources/schemas/Core-1.2.xsd
+++ /dev/null
@@ -1,881 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Securitylayer, Schnittstellenspezifikation -->
-
-<!-- XML-Schema fuer Schnittstellenspezifikation Version 1.2.2 -->
-
-<!-- 01. 03. 2005, Bundeskanzleramt, Stabsstelle IKT-Strategie, Technik und Standards -->
-
-<xsd:schema targetNamespace="http://www.buergerkarte.at/namespaces/securitylayer/1.2#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2.1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
-  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <!--###################################################################### -->
-  <!--# Create CMS Signature                                               # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Create CMS Signature Request                                       = -->
-  <!--====================================================================== -->
-  <xsd:element name="CreateCMSSignatureRequest" type="CreateCMSSignatureRequestType"/>
-  <xsd:complexType name="CreateCMSSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="KeyboxIdentifier" type="BoxIdentifierType"/>
-      <xsd:element name="DataObject" type="CMSDataObjectRequiredMetaType"/>
-    </xsd:sequence>
-    <xsd:attribute name="Structure" use="required">
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string">
-          <xsd:enumeration value="detached"/>
-          <xsd:enumeration value="enveloping"/>
-        </xsd:restriction>
-      </xsd:simpleType>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:complexType name="CMSDataObjectRequiredMetaType">
-    <xsd:complexContent>
-      <xsd:restriction base="CMSDataObjectOptionalMetaType">
-        <xsd:sequence>
-          <xsd:element name="MetaInfo" type="MetaInfoType"/>
-          <xsd:element name="Content" type="Base64OptRefContentType"/>
-        </xsd:sequence>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="CMSDataObjectOptionalMetaType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
-      <xsd:element name="Content" type="Base64OptRefContentType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Create CMS Siganture Response                                      = -->
-  <!--====================================================================== -->
-  <xsd:element name="CreateCMSSignatureResponse" type="CreateCMSSignatureResponseType"/>
-  <xsd:complexType name="CreateCMSSignatureResponseType">
-    <xsd:sequence>
-      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--###################################################################### -->
-  <!--# Create XML Signature                                               # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Create XML Signature Request                                       = -->
-  <!--====================================================================== -->
-  <xsd:element name="CreateXMLSignatureRequest" type="CreateXMLSignatureRequestType"/>
-  <xsd:complexType name="CreateXMLSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="KeyboxIdentifier" type="BoxIdentifierType"/>
-      <xsd:element name="DataObjectInfo" type="DataObjectInfoType" maxOccurs="unbounded"/>
-      <xsd:element name="SignatureInfo" type="SignatureInfoCreationType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="SignatureInfoCreationType">
-    <xsd:sequence>
-      <xsd:element name="SignatureEnvironment" type="Base64XMLOptRefContentType"/>
-      <xsd:element name="SignatureLocation">
-        <xsd:complexType>
-          <xsd:simpleContent>
-            <xsd:extension base="xsd:token">
-              <xsd:attribute name="Index" type="xsd:nonNegativeInteger" use="required"/>
-            </xsd:extension>
-          </xsd:simpleContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="Supplement" type="DataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="MetaInfoType">
-    <xsd:sequence>
-      <xsd:element name="MimeType" type="MimeTypeType"/>
-      <xsd:element name="Description" type="xsd:string" minOccurs="0"/>
-      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="DataObjectInfoType">
-    <xsd:sequence>
-      <xsd:element name="DataObject" type="Base64XMLLocRefOptRefContentType"/>
-      <xsd:element name="TransformsInfo" type="TransformsInfoType" maxOccurs="unbounded"/>
-      <xsd:element name="Supplement" type="DataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="Structure" use="required">
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string">
-          <xsd:enumeration value="detached"/>
-          <xsd:enumeration value="enveloping"/>
-        </xsd:restriction>
-      </xsd:simpleType>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:complexType name="TransformsInfoType">
-    <xsd:sequence>
-      <xsd:element ref="dsig:Transforms" minOccurs="0"/>
-      <xsd:element name="FinalDataMetaInfo" type="MetaInfoType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Create XML Signature Response                                      = -->
-  <!--====================================================================== -->
-  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>
-  <xsd:complexType name="CreateXMLSignatureResponseType">
-    <xsd:sequence>
-      <xsd:any namespace="##any" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--###################################################################### -->
-  <!--# Verify CMS Signature                                               # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Verify CMS Signature Request                                       = -->
-  <!--====================================================================== -->
-  <xsd:element name="VerifyCMSSignatureRequest" type="VerifyCMSSignatureRequestType"/>
-  <xsd:complexType name="VerifyCMSSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
-      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
-      <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>
-  </xsd:complexType>
-  <xsd:simpleType name="SignatoriesType">
-    <xsd:union memberTypes="AllSignatoriesType">
-      <xsd:simpleType>
-        <xsd:list itemType="xsd:positiveInteger"/>
-      </xsd:simpleType>
-    </xsd:union>
-  </xsd:simpleType>
-  <xsd:simpleType name="AllSignatoriesType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="all"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <!--====================================================================== -->
-  <!--= Verify CMS Signature Response                                      = -->
-  <!--====================================================================== -->
-  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>
-  <xsd:complexType name="VerifyCMSSignatureResponseType">
-    <xsd:sequence maxOccurs="unbounded">
-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType"/>
-      <xsd:element name="SignatureCheck" type="CheckResultType"/>
-      <xsd:element name="CertificateCheck" type="CheckResultType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="QualifiedCertificate"/>
-  <!--###################################################################### -->
-  <!--# Verify XML Signature                                               # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Verify XML Signature Request                                       = -->
-  <!--====================================================================== -->
-  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>
-  <xsd:complexType name="VerifyXMLSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
-      <xsd:element name="SignatureInfo" type="SignatureInfoVerificationType"/>
-      <xsd:element name="Supplement" type="DataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="SignatureInfoVerificationType">
-    <xsd:sequence>
-      <xsd:element name="SignatureEnvironment" type="Base64XMLOptRefContentType"/>
-      <xsd:element name="SignatureLocation" type="xsd:token"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Verify XML Signature Response                                      = -->
-  <!--====================================================================== -->
-  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>
-  <xsd:complexType name="VerifyXMLSignatureResponseType">
-    <xsd:sequence>
-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType"/>
-      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
-      <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType"/>
-      <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="CertificateCheck" type="CheckResultType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="ReferencesCheckResultType">
-    <xsd:sequence>
-      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
-      <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="ManifestRefsCheckResultType">
-    <xsd:sequence>
-      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
-      <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
-      <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CheckResultType">
-    <xsd:sequence>
-      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
-      <xsd:element name="Info" type="AnyMixedChildrenType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--###################################################################### -->
-  <!--# Encrypt a CMS message                                              # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Encrypt a CMS message: Request                                     = -->
-  <!--====================================================================== -->
-  <xsd:element name="EncryptCMSRequest" type="EncryptCMSRequestType"/>
-  <xsd:complexType name="EncryptCMSRequestType">
-    <xsd:sequence>
-      <xsd:element name="RecipientPublicKey" type="CMSRecipientPublicKeyType" maxOccurs="unbounded"/>
-      <xsd:element name="ToBeEncrypted" type="CMSToBeEncryptedType"/>
-    </xsd:sequence>
-    <xsd:attribute name="ReturnBinaryResult" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="CMSToBeEncryptedType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType"/>
-      <xsd:element name="Content" type="Base64OptRefContentType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CMSRecipientPublicKeyType">
-    <xsd:choice>
-      <xsd:element name="X509Certificate" type="xsd:base64Binary"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Encrypt a CMS message: Response                                    = -->
-  <!--====================================================================== -->
-  <xsd:element name="EncryptCMSResponse" type="EncryptCMSResponseType"/>
-  <xsd:complexType name="EncryptCMSResponseType">
-    <xsd:sequence>
-      <xsd:element name="CMSMessage" type="xsd:base64Binary"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--###################################################################### -->
-  <!--# Decrypt a CMS message                                              # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Decrypt a CMS message: Request                                     = -->
-  <!--====================================================================== -->
-  <xsd:element name="DecryptCMSRequest" type="DecryptCMSRequestType"/>
-  <xsd:complexType name="DecryptCMSRequestType">
-    <xsd:sequence>
-      <xsd:element name="CMSMessage" type="xsd:base64Binary"/>
-      <xsd:element name="EncryptedContent" type="CMSEncryptedContentType" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="ReturnResult" type="ReturnResultType" use="optional" default="xml"/>
-  </xsd:complexType>
-  <xsd:complexType name="CMSEncryptedContentType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
-      <xsd:element name="Content" type="Base64OptRefContentType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="ReturnResultType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="binary"/>
-      <xsd:enumeration value="xml"/>
-      <xsd:enumeration value="none"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <!--====================================================================== -->
-  <!--= Decrypt a CMS message: Response                                    = -->
-  <!--====================================================================== -->
-  <xsd:element name="DecryptCMSResponse" type="DecryptCMSResponseType"/>
-  <xsd:complexType name="DecryptCMSResponseType">
-    <xsd:sequence>
-      <xsd:element name="DecryptedData" type="xsd:base64Binary"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--###################################################################### -->
-  <!--# Encrypt an XML document                                            # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Encrypt an XML document: Request                                   = -->
-  <!--====================================================================== -->
-  <xsd:element name="EncryptXMLRequest">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="EncryptXMLRequestType"/>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:complexType name="EncryptXMLRequestType">
-    <xsd:sequence>
-      <xsd:element name="RecipientPublicKey" type="XMLRecipientPublicKeyType" maxOccurs="unbounded"/>
-      <xsd:element name="ToBeEncrypted" type="ToBeEncryptedType" maxOccurs="unbounded"/>
-      <xsd:element name="EncryptionInfo" type="EncryptionInfoType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="ToBeEncryptedType">
-    <xsd:choice>
-      <xsd:element name="Element">
-        <xsd:complexType>
-          <xsd:attribute name="Selector" type="xsd:token" use="required"/>
-          <xsd:attribute name="EncDataReference" type="xsd:anyURI" use="optional"/>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="ElementContent">
-        <xsd:complexType>
-          <xsd:attribute name="Selector" type="xsd:token" use="required"/>
-          <xsd:attribute name="EncDataReference" type="xsd:anyURI" use="optional"/>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="New" type="XMLToBeEncryptedNewType"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="XMLToBeEncryptedNewType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType"/>
-      <xsd:element name="Content" type="XMLToBeEncryptedNewContentType"/>
-    </xsd:sequence>
-    <xsd:attribute name="ParentSelector" type="xsd:token" use="required"/>
-    <xsd:attribute name="NodeCount" type="xsd:nonNegativeInteger" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="XMLToBeEncryptedNewContentType">
-    <xsd:complexContent>
-      <xsd:extension base="Base64XMLLocRefContentType">
-        <xsd:attribute name="EncDataReference" type="xsd:anyURI" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="XMLRecipientPublicKeyType">
-    <xsd:choice>
-      <xsd:element ref="dsig:KeyValue"/>
-      <xsd:element name="X509Certificate" type="xsd:base64Binary"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="EncryptionInfoType">
-    <xsd:sequence>
-      <xsd:element name="EncryptionEnvironment" type="Base64XMLOptRefContentType"/>
-      <xsd:element name="EncryptedKeyLocation" minOccurs="0">
-        <xsd:complexType>
-          <xsd:attribute name="ParentSelector" type="xsd:token" use="required"/>
-          <xsd:attribute name="NodeCount" type="xsd:nonNegativeInteger" use="required"/>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="Supplement" type="DataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Encrypt an XML document: Response                                  = -->
-  <!--====================================================================== -->
-  <xsd:element name="EncryptXMLResponse" type="EncryptXMLResponseType"/>
-  <xsd:complexType name="EncryptXMLResponseType">
-    <xsd:sequence>
-      <xsd:element name="EncryptionEnvironment">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any namespace="##any" processContents="lax"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="EncryptedData" type="EncryptedDataType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="EncryptedDataType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:base64Binary">
-        <xsd:attribute name="EncDataReference" type="xsd:anyURI" use="required"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <!--###################################################################### -->
-  <!--# Decrypt an XML document                                            # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Decrypt an XML document: Request                                   = -->
-  <!--====================================================================== -->
-  <xsd:element name="DecryptXMLRequest" type="DecryptXMLRequestType"/>
-  <xsd:complexType name="DecryptXMLRequestType">
-    <xsd:sequence>
-      <xsd:element name="EncryptedContent" type="Base64XMLOptRefContentType"/>
-      <xsd:element name="EncrElemsSelector" type="xsd:string"/>
-      <xsd:element name="Supplement" type="DataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="ReturnResult" type="ReturnResultType" use="optional" default="xml"/>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Decrypt an XML document: Response                                  = -->
-  <!--====================================================================== -->
-  <xsd:element name="DecryptXMLResponse" type="DecryptXMLResponseType"/>
-  <xsd:complexType name="DecryptXMLResponseType">
-    <xsd:sequence minOccurs="0">
-      <xsd:element name="CandidateDocument" type="XMLContentType"/>
-      <xsd:element name="DecryptedBinaryData" minOccurs="0" maxOccurs="unbounded">
-        <xsd:complexType>
-          <xsd:simpleContent>
-            <xsd:extension base="xsd:base64Binary">
-              <xsd:attribute name="EncrElemSelector" type="xsd:string" use="required"/>
-              <xsd:attribute name="MimeType" type="xsd:string" use="optional"/>
-              <xsd:attribute name="Encoding" type="xsd:anyURI" use="optional"/>
-            </xsd:extension>
-          </xsd:simpleContent>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--###################################################################### -->
-  <!--# Hashing                                                            # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Hash Computation Request                                           = -->
-  <!--====================================================================== -->
-  <xsd:element name="CreateHashRequest" type="CreateHashRequestType"/>
-  <xsd:complexType name="CreateHashRequestType">
-    <xsd:sequence>
-      <xsd:element name="HashInfo" type="CreateHashInfoRequestType" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CreateHashInfoRequestType">
-    <xsd:sequence>
-      <xsd:element name="HashData" type="HashDataType"/>
-      <xsd:element name="HashAlgorithm" type="xsd:anyURI"/>
-      <xsd:element name="FriendlyName" type="xsd:string" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="RespondHashData" type="xsd:boolean" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="HashDataType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType"/>
-      <xsd:element name="Content" type="Base64XMLOptRefContentType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Hash Computation Response                                          = -->
-  <!--====================================================================== -->
-  <xsd:element name="CreateHashResponse" type="CreateHashResponseType"/>
-  <xsd:complexType name="CreateHashResponseType">
-    <xsd:sequence>
-      <xsd:element name="HashInfo" type="CreateHashInfoResponseType" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CreateHashInfoResponseType">
-    <xsd:sequence>
-      <xsd:element name="HashData" type="HashDataType" minOccurs="0"/>
-      <xsd:element name="HashAlgorithm" type="xsd:anyURI"/>
-      <xsd:element name="FriendlyName" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="HashValue" type="xsd:base64Binary"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Hash Verification Request                                          = -->
-  <!--====================================================================== -->
-  <xsd:element name="VerifyHashRequest" type="VerifyHashRequestType"/>
-  <xsd:complexType name="VerifyHashRequestType">
-    <xsd:sequence>
-      <xsd:element name="HashInfo" type="VerifyHashInfoRequestType" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="VerifyHashInfoRequestType">
-    <xsd:sequence>
-      <xsd:element name="HashData" type="HashDataType"/>
-      <xsd:element name="HashAlgorithm" type="xsd:anyURI"/>
-      <xsd:element name="FriendlyName" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="HashValue" type="xsd:base64Binary"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Hash Verification Response                                         = -->
-  <!--====================================================================== -->
-  <xsd:element name="VerifyHashResponse" type="VerifyHashResponseType"/>
-  <xsd:complexType name="VerifyHashResponseType">
-    <xsd:sequence>
-      <xsd:element name="VerificationResult" type="VerificationResultType" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="VerificationResultType">
-    <xsd:sequence>
-      <xsd:element name="FriendlyName" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="Result" type="xsd:boolean"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--###################################################################### -->
-  <!--# Infobox Commands                                                   # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Check Available Infoboxes Request                                  = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxAvailableRequest" type="InfoboxAvailableRequestType"/>
-  <xsd:complexType name="InfoboxAvailableRequestType"/>
-  <!--====================================================================== -->
-  <!--= Check Available Infoboxes Response                                 = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxAvailableResponse" type="InfoboxAvailableResponseType"/>
-  <xsd:complexType name="InfoboxAvailableResponseType">
-    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="InfoboxIdentifier" type="BoxIdentifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Create Infobox Request                                             = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxCreateRequest" type="InfoboxCreateRequestType"/>
-  <xsd:complexType name="InfoboxCreateRequestType">
-    <xsd:sequence>
-      <xsd:element name="InfoboxIdentifier" type="BoxIdentifierType"/>
-      <xsd:element name="InfoboxType" type="InfoboxTypeType"/>
-      <xsd:element name="Creator" type="xsd:string"/>
-      <xsd:element name="Purpose" type="xsd:string"/>
-      <xsd:element name="ReadAccessAuthorization" type="AccessAuthorizationType" minOccurs="0"/>
-      <xsd:element name="UpdateAccessAuthorization" type="AccessAuthorizationType" minOccurs="0"/>
-      <xsd:element name="ReadUserConfirmation" type="UserConfirmationType" minOccurs="0"/>
-      <xsd:element name="UpdateUserConfirmation" type="UserConfirmationType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="InfoboxTypeType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="BinaryFile"/>
-      <xsd:enumeration value="AssocArray"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="AccessAuthorizationType">
-    <xsd:sequence>
-      <xsd:element name="RequesterID" type="RequesterIDType" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="UserMayChange" type="xsd:boolean" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="RequesterIDSimpleType">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:complexType name="RequesterIDType">
-    <xsd:simpleContent>
-      <xsd:extension base="RequesterIDSimpleType">
-        <xsd:attribute name="AuthenticationClass" type="AuthenticationClassType" use="required"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="UserConfirmationType">
-    <xsd:simpleContent>
-      <xsd:extension base="UserConfirmationSimpleType">
-        <xsd:attribute name="UserMayChange" type="xsd:boolean" use="required"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:simpleType name="UserConfirmationSimpleType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="none"/>
-      <xsd:enumeration value="info"/>
-      <xsd:enumeration value="confirm"/>
-      <xsd:enumeration value="confirmWithSecret"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="AuthenticationClassType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="anonym"/>
-      <xsd:enumeration value="pseudoanonym"/>
-      <xsd:enumeration value="certified"/>
-      <xsd:enumeration value="certifiedGovAgency"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <!--====================================================================== -->
-  <!--= Create Infobox Response                                            = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxCreateResponse" type="InfoboxCreateResponseType"/>
-  <xsd:complexType name="InfoboxCreateResponseType"/>
-  <!--====================================================================== -->
-  <!--= Delete Infobox Request                                             = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxDeleteRequest" type="InfoboxDeleteRequestType"/>
-  <xsd:complexType name="InfoboxDeleteRequestType">
-    <xsd:sequence>
-      <xsd:element name="InfoboxIdentifier" type="BoxIdentifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Delete Infobox Response                                            = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxDeleteResponse" type="InfoboxDeleteResponseType"/>
-  <xsd:complexType name="InfoboxDeleteResponseType"/>
-  <!--====================================================================== -->
-  <!--= Read Infobox Request                                               = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxReadRequest" type="InfoboxReadRequestType"/>
-  <xsd:complexType name="InfoboxReadRequestType">
-    <xsd:sequence>
-      <xsd:element name="InfoboxIdentifier" type="BoxIdentifierType"/>
-      <xsd:choice>
-        <xsd:element name="BinaryFileParameters" type="InfoboxReadParamsBinaryFileType"/>
-        <xsd:element name="AssocArrayParameters" type="InfoboxReadParamsAssocArrayType"/>
-      </xsd:choice>
-      <xsd:element name="BoxSpecificParameters" type="AnyChildrenType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="InfoboxReadParamsBinaryFileType">
-    <xsd:attribute name="ContentIsXMLEntity" type="xsd:boolean" use="optional" default="false"/>
-  </xsd:complexType>
-  <xsd:complexType name="InfoboxReadParamsAssocArrayType">
-    <xsd:choice>
-      <xsd:element name="ReadKeys">
-        <xsd:complexType>
-          <xsd:attribute name="SearchString" type="WildCardSearchStringType" use="required"/>
-          <xsd:attribute name="UserMakesUnique" type="xsd:boolean" use="optional" default="false"/>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="ReadPairs">
-        <xsd:complexType>
-          <xsd:attribute name="SearchString" type="WildCardSearchStringType" use="required"/>
-          <xsd:attribute name="UserMakesUnique" type="xsd:boolean" use="optional" default="false"/>
-          <xsd:attribute name="ValuesAreXMLEntities" type="xsd:boolean" use="optional" default="false"/>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="ReadValue">
-        <xsd:complexType>
-          <xsd:attribute name="Key" type="BoxIdentifierType" use="required"/>
-          <xsd:attribute name="ValueIsXMLEntity" type="xsd:boolean" use="optional" default="false"/>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:element name="IdentityLinkDomainIdentifier" type="xsd:anyURI"/>
-  <!--====================================================================== -->
-  <!--= Read Infobox Response                                              = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxReadResponse" type="InfoboxReadResponseType"/>
-  <xsd:complexType name="InfoboxReadResponseType">
-    <xsd:choice>
-      <xsd:element name="BinaryFileData" type="Base64XMLContentType"/>
-      <xsd:element name="AssocArrayData" type="InfoboxReadDataAssocArrayType"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="InfoboxReadDataAssocArrayType">
-    <xsd:choice>
-      <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="Key" type="BoxIdentifierType"/>
-      </xsd:sequence>
-      <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="Pair" type="InfoboxAssocArrayPairType"/>
-      </xsd:sequence>
-    </xsd:choice>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Update Infobox Request                                             = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxUpdateRequest" type="InfoboxUpdateRequestType"/>
-  <xsd:complexType name="InfoboxUpdateRequestType">
-    <xsd:sequence>
-      <xsd:element name="InfoboxIdentifier" type="BoxIdentifierType"/>
-      <xsd:choice>
-        <xsd:element name="BinaryFileParameters" type="Base64XMLContentType"/>
-        <xsd:element name="AssocArrayParameters" type="InfoboxUpdateParamsAssocArrayType"/>
-      </xsd:choice>
-      <xsd:element name="BoxSpecificParameters" type="AnyChildrenType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="InfoboxUpdateParamsAssocArrayType">
-    <xsd:choice>
-      <xsd:element name="UpdateKey">
-        <xsd:complexType>
-          <xsd:attribute name="Key" type="xsd:token" use="required"/>
-          <xsd:attribute name="NewKey" type="xsd:token" use="required"/>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="UpdateValue" type="InfoboxAssocArrayPairType"/>
-      <xsd:element name="DeletePair">
-        <xsd:complexType>
-          <xsd:attribute name="Key" type="xsd:token" use="required"/>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Update Infobox Response                                            = -->
-  <!--====================================================================== -->
-  <xsd:element name="InfoboxUpdateResponse" type="InfoboxUpdateResponseType"/>
-  <xsd:complexType name="InfoboxUpdateResponseType"/>
-  <!--###################################################################### -->
-  <!--# Null-Operation                                                     # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Null-Operation ReQuest                                             = -->
-  <!--====================================================================== -->
-  <xsd:element name="NullOperationRequest" type="NullOperationRequestType"/>
-  <xsd:complexType name="NullOperationRequestType"/>
-  <!--====================================================================== -->
-  <!--= Null-Operation Response                                            = -->
-  <!--====================================================================== -->
-  <xsd:element name="NullOperationResponse" type="NullOperationResponseType"/>
-  <xsd:complexType name="NullOperationResponseType"/>
-  <!--###################################################################### -->
-  <!--# Get Properties                                                     # -->
-  <!--###################################################################### -->
-  <xsd:element name="GetPropertiesRequest">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="GetPropertiesRequestType"/>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:complexType name="GetPropertiesRequestType"/>
-  <!--====================================================================== -->
-  <!--= Get Properties Response                                            = -->
-  <!--====================================================================== -->
-  <xsd:element name="GetPropertiesResponse" type="GetPropertiesResponseType"/>
-  <xsd:complexType name="GetPropertiesResponseType">
-    <xsd:sequence>
-      <xsd:element name="ViewerMediaType" type="MimeTypeType" maxOccurs="unbounded"/>
-      <xsd:element name="XMLSignatureTransform" type="xsd:anyURI" maxOccurs="unbounded"/>
-      <xsd:element name="KeyboxIdentifier" type="QualifiedBoxIdentifierType" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="Binding" type="BindingType" maxOccurs="unbounded"/>
-      <xsd:element name="ProtocolVersion" type="xsd:token" maxOccurs="unbounded"/>
-      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="BindingType">
-    <xsd:complexContent>
-      <xsd:extension base="AnyChildrenType">
-        <xsd:attribute name="Identifier" type="xsd:token" use="required"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="QualifiedBoxIdentifierType">
-    <xsd:simpleContent>
-      <xsd:extension base="BoxIdentifierType">
-        <xsd:attribute name="Signature" type="xsd:boolean" use="required"/>
-        <xsd:attribute name="Encryption" type="xsd:boolean" use="required"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <!--###################################################################### -->
-  <!--# Get Token Status                                                   # -->
-  <!--###################################################################### -->
-  <!--====================================================================== -->
-  <!--= Get Token Status Request                                           = -->
-  <!--====================================================================== -->
-  <xsd:element name="GetStatusRequest" type="GetStatusRequestType"/>
-  <xsd:complexType name="GetStatusRequestType">
-    <xsd:sequence minOccurs="0">
-      <xsd:element name="TokenStatus" type="TokenStatusType"/>
-      <xsd:element name="MaxDelay" type="xsd:nonNegativeInteger"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--====================================================================== -->
-  <!--= Get Token Status Response                                          = -->
-  <!--====================================================================== -->
-  <xsd:element name="GetStatusResponse" type="GetStatusResponseType"/>
-  <xsd:complexType name="GetStatusResponseType">
-    <xsd:sequence>
-      <xsd:element name="TokenStatus" type="TokenStatusType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="TokenStatusType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="ready"/>
-      <xsd:enumeration value="removed"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <!--###################################################################### -->
-  <!--# Error Response                                                     # -->
-  <!--###################################################################### -->
-  <xsd:element name="ErrorResponse" type="ErrorResponseType"/>
-  <xsd:complexType name="ErrorResponseType">
-    <xsd:sequence>
-      <xsd:element name="ErrorCode" type="ErrorCodeType"/>
-      <xsd:element name="Info" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="ErrorCodeType">
-    <xsd:restriction base="xsd:integer">
-      <xsd:minInclusive value="1000"/>
-      <xsd:maxInclusive value="99999"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <!--###################################################################### -->
-  <!--# Auxiliary Types                                                    # -->
-  <!--###################################################################### -->
-  <xsd:simpleType name="BoxIdentifierType">
-    <xsd:restriction base="xsd:token"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="MimeTypeType">
-    <xsd:restriction base="xsd:token"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="WildCardSearchStringType">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="[^\*/]*(\*[^\*/]*)?(/[^\*/]*(\*[^\*/]*)?)*"/>
-      <xsd:pattern value="\*\*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="InfoboxAssocArrayPairType">
-    <xsd:complexContent>
-      <xsd:extension base="Base64XMLContentType">
-        <xsd:attribute name="Key" type="xsd:string" use="required"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="AnyChildrenType" mixed="false">
-    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-      <xsd:any namespace="##any" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="AnyMixedChildrenType" mixed="true">
-    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-      <xsd:any namespace="##any" processContents="skip"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="XMLContentType" mixed="true">
-    <xsd:complexContent mixed="true">
-      <xsd:extension base="AnyMixedChildrenType">
-        <xsd:attribute ref="xml:space" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="Base64XMLLocRefOptRefContentType">
-    <xsd:complexContent>
-      <xsd:extension base="Base64XMLLocRefContentType">
-        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="Base64XMLLocRefReqRefContentType">
-    <xsd:complexContent>
-      <xsd:extension base="Base64XMLLocRefContentType">
-        <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="Base64XMLOptRefContentType">
-    <xsd:complexContent>
-      <xsd:extension base="Base64XMLContentType">
-        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="Base64OptRefContentType">
-    <xsd:complexContent>
-      <xsd:extension base="Base64ContentType">
-        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="Base64ContentType">
-    <xsd:choice minOccurs="0">
-      <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="Base64XMLContentType">
-    <xsd:choice minOccurs="0">
-      <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-      <xsd:element name="XMLContent" type="XMLContentType"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="Base64XMLLocRefContentType">
-    <xsd:choice minOccurs="0">
-      <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-      <xsd:element name="XMLContent" type="XMLContentType"/>
-      <xsd:element name="LocRefContent" type="xsd:anyURI"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="DataObjectAssociationType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
-      <xsd:element name="Content" type="Base64XMLLocRefReqRefContentType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/common/res/resources/schemas/Core.20020225.xsd b/common/res/resources/schemas/Core.20020225.xsd
deleted file mode 100644
index 5dd2836a0..000000000
--- a/common/res/resources/schemas/Core.20020225.xsd
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Securitylayer, Schnittstellenspezifikation -->

-<!-- XML-Schema für Schnittstellenspezifikation Version 1.1.0, Protokollelemente im datierten Namespace 20020225 -->

-<!-- 31. 08. 2002, Operative Unit, CIO, BMOeLS -->

-<xsd:schema xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" targetNamespace="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1.0">

-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>

-	<!--########### Create CMS Signature ###-->

-	<!--### Create CMS Signature Request ###-->

-	<xsd:element name="CreateCMSSignatureRequest" type="CreateCMSSignatureRequestType"/>

-	<xsd:complexType name="CreateCMSSignatureRequestType">

-		<xsd:sequence>

-			<xsd:element name="KeyboxIdentifier" type="BoxIdentifierType"/>

-			<xsd:element name="DataObject" type="CMSDataObjectRequiredMetaType"/>

-		</xsd:sequence>

-		<xsd:attribute name="Structure" use="required">

-			<xsd:simpleType>

-				<xsd:restriction base="xsd:string">

-					<xsd:enumeration value="detached"/>

-					<xsd:enumeration value="enveloping"/>

-				</xsd:restriction>

-			</xsd:simpleType>

-		</xsd:attribute>

-	</xsd:complexType>

-	<xsd:complexType name="CMSDataObjectRequiredMetaType">

-		<xsd:complexContent>

-			<xsd:restriction base="CMSDataObjectOptionalMetaType">

-				<xsd:sequence>

-					<xsd:element name="MetaInfo" type="MetaInfoType"/>

-					<xsd:element name="Content" type="CMSContentBaseType"/>

-				</xsd:sequence>

-			</xsd:restriction>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<xsd:complexType name="CMSDataObjectOptionalMetaType">

-		<xsd:sequence>

-			<xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>

-			<xsd:element name="Content" type="CMSContentBaseType"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="CMSContentBaseType">

-		<xsd:complexContent>

-			<xsd:restriction base="ContentOptionalRefType">

-				<xsd:choice minOccurs="0">

-					<xsd:element name="Base64Content" type="xsd:base64Binary"/>

-				</xsd:choice>

-			</xsd:restriction>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<!--### Create CMS Siganture Response ###-->

-	<xsd:element name="CreateCMSSignatureResponse" type="CreateCMSSignatureResponseType"/>

-	<xsd:complexType name="CreateCMSSignatureResponseType">

-		<xsd:sequence>

-			<xsd:element name="CMSSignature" type="xsd:base64Binary"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--########## Create XML Signature ###-->

-	<!--### Create XML Signature Request ###-->

-	<xsd:element name="CreateXMLSignatureRequest" type="CreateXMLSignatureRequestType"/>

-	<xsd:complexType name="CreateXMLSignatureRequestType">

-		<xsd:sequence>

-			<xsd:element name="KeyboxIdentifier" type="BoxIdentifierType"/>

-			<xsd:element name="DataObjectInfo" type="DataObjectInfoType" maxOccurs="unbounded"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="MetaInfoType">

-		<xsd:sequence>

-			<xsd:element name="MimeType" type="MimeTypeType"/>

-			<xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>

-			<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="DataObjectInfoType">

-		<xsd:sequence>

-			<xsd:element name="DataObject" type="ContentOptionalRefType"/>

-			<xsd:element name="TransformsInfo" type="TransformsInfoType" maxOccurs="unbounded"/>

-			<xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>

-		</xsd:sequence>

-		<xsd:attribute name="Structure" use="required">

-			<xsd:simpleType>

-				<xsd:restriction base="xsd:string">

-					<xsd:enumeration value="detached"/>

-					<xsd:enumeration value="enveloping"/>

-				</xsd:restriction>

-			</xsd:simpleType>

-		</xsd:attribute>

-	</xsd:complexType>

-	<xsd:complexType name="TransformsInfoType">

-		<xsd:sequence>

-			<xsd:element ref="dsig:Transforms" minOccurs="0"/>

-			<xsd:element name="FinalDataMetaInfo" type="MetaInfoType"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="XMLDataObjectAssociationType">

-		<xsd:sequence>

-			<xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>

-			<xsd:element name="Content" type="ContentRequiredRefType"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--### Create XML Signature Response ###-->

-	<xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>

-	<xsd:complexType name="CreateXMLSignatureResponseType">

-		<xsd:sequence>

-			<xsd:element ref="dsig:Signature"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--########## Verify CMS Signature ###-->

-	<!--### Verifiy CMS Signature Request ###-->

-	<xsd:element name="VerifyCMSSignatureRequest" type="VerifyCMSSignatureRequestType"/>

-	<xsd:complexType name="VerifyCMSSignatureRequestType">

-		<xsd:sequence>

-			<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

-			<xsd:element name="CMSSignature" type="xsd:base64Binary"/>

-			<xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--### Verify CMS Signature Response ###-->

-	<xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>

-	<xsd:complexType name="VerifyCMSSignatureResponseType">

-		<xsd:sequence>

-			<xsd:element name="SignerInfo" type="dsig:KeyInfoType"/>

-			<xsd:element name="SignatureCheck" type="CheckResultType"/>

-			<xsd:element name="CertificateCheck" type="CheckResultType"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--########## Verify XML Signature ###-->

-	<!--### Verify XML Signature Request ###-->

-	<xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>

-	<xsd:complexType name="VerifyXMLSignatureRequestType">

-		<xsd:sequence>

-			<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

-			<xsd:element name="SignatureInfo">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="SignatureEnvironment">

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:any namespace="##any" processContents="skip"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element>

-						<xsd:element name="SignatureLocation" type="xsd:token"/>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--### Verify XML Signature Response ###-->

-	<xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>

-	<xsd:complexType name="VerifyXMLSignatureResponseType">

-		<xsd:sequence>

-			<xsd:element name="SignerInfo" type="dsig:KeyInfoType"/>

-			<xsd:element name="SignatureCheck" type="CheckResultType"/>

-			<xsd:element name="SignatureManifestCheck" type="CheckResultType"/>

-			<xsd:element name="CertificateCheck" type="CheckResultType"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="CheckResultType">

-		<xsd:sequence>

-			<xsd:element name="Code" type="xsd:nonNegativeInteger"/>

-			<xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--########## Infobox Commands ###-->

-	<!--### Check Available Infoboxes Request ###-->

-	<xsd:element name="InfoboxAvailableRequest" type="InfoboxAvailableRequestType"/>

-	<xsd:complexType name="InfoboxAvailableRequestType"/>

-	<!--### Check Available Infoboxes Response ###-->

-	<xsd:element name="InfoboxAvailableResponse" type="InfoboxAvailableResponseType"/>

-	<xsd:complexType name="InfoboxAvailableResponseType">

-		<xsd:sequence minOccurs="0" maxOccurs="unbounded">

-			<xsd:element name="InfoboxIdentifier" type="BoxIdentifierType"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--### Read Infobox Request ###-->

-	<xsd:element name="InfoboxReadRequest" type="InfoboxReadRequestType"/>

-	<xsd:complexType name="InfoboxReadRequestType">

-		<xsd:sequence>

-			<xsd:element name="InfoboxIdentifier" type="BoxIdentifierType"/>

-			<xsd:choice>

-				<xsd:element name="BinaryFileParameters" type="InfoboxReadParamsBinaryFileType"/>

-				<xsd:element name="AssocArrayParameters" type="InfoboxReadParamsAssocArrayType"/>

-			</xsd:choice>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="InfoboxReadParamsBinaryFileType">

-		<xsd:attribute name="ContentIsXMLEntity" type="xsd:boolean" use="optional" default="false"/>

-	</xsd:complexType>

-	<xsd:complexType name="InfoboxReadParamsAssocArrayType">

-		<xsd:choice>

-			<xsd:element name="ReadKeys">

-				<xsd:complexType>

-					<xsd:attribute name="SearchString" type="WildCardSearchStringType" use="required"/>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="ReadPairs">

-				<xsd:complexType>

-					<xsd:attribute name="SearchString" type="WildCardSearchStringType" use="required"/>

-					<xsd:attribute name="ValuesAreXMLEntities" type="xsd:boolean" use="optional" default="false"/>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="ReadValue">

-				<xsd:complexType>

-					<xsd:attribute name="Key" type="BoxIdentifierType" use="required"/>

-					<xsd:attribute name="ValueIsXMLEntity" type="xsd:boolean" use="optional" default="false"/>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:choice>

-	</xsd:complexType>

-	<!--### Read Infobox Response ###-->

-	<xsd:element name="InfoboxReadResponse" type="InfoboxReadResponseType"/>

-	<xsd:complexType name="InfoboxReadResponseType">

-		<xsd:choice>

-			<xsd:element name="BinaryFileData" type="ContentBaseType"/>

-			<xsd:element name="AssocArrayData" type="InfoboxReadDataAssocArrayType"/>

-		</xsd:choice>

-	</xsd:complexType>

-	<xsd:complexType name="InfoboxReadDataAssocArrayType">

-		<xsd:choice>

-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">

-				<xsd:element name="Key" type="BoxIdentifierType"/>

-			</xsd:sequence>

-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">

-				<xsd:element name="Pair" type="InfoboxAssocArrayPairType"/>

-			</xsd:sequence>

-		</xsd:choice>

-	</xsd:complexType>

-	<!--### Update Infobox Request ###-->

-	<xsd:element name="InfoboxUpdateRequest" type="InfoboxUpdateRequestType"/>

-	<xsd:complexType name="InfoboxUpdateRequestType">

-		<xsd:sequence>

-			<xsd:element name="InfoboxIdentifier" type="BoxIdentifierType"/>

-			<xsd:choice>

-				<xsd:element name="BinaryFileParameters" type="ContentBaseType"/>

-				<xsd:element name="AssocArrayParameters" type="InfoboxUpdateParamsAssocArrayType"/>

-			</xsd:choice>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="InfoboxUpdateParamsAssocArrayType">

-		<xsd:choice>

-			<xsd:element name="UpdateKey">

-				<xsd:complexType>

-					<xsd:attribute name="Key" type="xsd:token" use="required"/>

-					<xsd:attribute name="NewKey" type="xsd:token" use="required"/>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="UpdateValue" type="InfoboxAssocArrayPairType"/>

-			<xsd:element name="DeletePair">

-				<xsd:complexType>

-					<xsd:attribute name="Key" type="xsd:token" use="required"/>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:choice>

-	</xsd:complexType>

-	<!--### Update Infobox Response ###-->

-	<xsd:element name="InfoboxUpdateResponse" type="InfoboxUpdateResponseType"/>

-	<xsd:complexType name="InfoboxUpdateResponseType"/>

-	<!--########## Create Session Certificate ###-->

-	<!--### Create Session Certificate Request ###-->

-	<xsd:element name="CreateSessionKeyRequest" type="CreateSessionKeyRequestType"/>

-	<xsd:complexType name="CreateSessionKeyRequestType">

-		<xsd:sequence>

-			<xsd:element name="KeyboxIdentifier" type="BoxIdentifierType"/>

-			<xsd:element name="Password" type="xsd:string"/>

-			<xsd:element name="Minutes" type="xsd:positiveInteger"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--### Create Session Certificate Response ###-->

-	<xsd:element name="CreateSessionKeyResponse" type="CreateSessionKeyResponseType"/>

-	<xsd:complexType name="CreateSessionKeyResponseType">

-		<xsd:sequence>

-			<xsd:element name="PKCS12Object" type="xsd:base64Binary"/>

-			<xsd:element name="Certificate" type="xsd:base64Binary"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--########## Create Symmetric Key ###-->

-	<!--### Create SymmetricKey Request ###-->

-	<xsd:element name="CreateSymmetricSecretRequest" type="CreateSymmetricSecretRequestType"/>

-	<xsd:complexType name="CreateSymmetricSecretRequestType" mixed="false">

-		<xsd:sequence>

-			<xsd:element name="KeyboxIdentifier" type="BoxIdentifierType"/>

-			<xsd:element ref="dsig:KeyInfo"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--### Create SymmetricKey Response ###-->

-	<xsd:element name="CreateSymmetricSecretResponse" type="CreateSymmetricSecretResponseType"/>

-	<xsd:complexType name="CreateSymmetricSecretResponseType" mixed="false">

-		<xsd:sequence>

-			<xsd:element name="SymmetricSecretValue" type="xsd:base64Binary"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--########## Get Properties ###-->

-	<!--### Get Properties Request ###-->

-	<xsd:element name="GetPropertiesRequest" type="GetPropertiesRequestType"/>

-	<xsd:complexType name="GetPropertiesRequestType"/>

-	<!--### Get Properties Response ###-->

-	<xsd:element name="GetPropertiesResponse" type="GetPropertiesResponseType"/>

-	<xsd:complexType name="GetPropertiesResponseType">

-		<xsd:sequence>

-			<xsd:element name="ViewerMediaType" type="MimeTypeType" maxOccurs="unbounded"/>

-			<xsd:element name="XMLSignatureTransform" type="xsd:anyURI" minOccurs="5" maxOccurs="unbounded"/>

-			<xsd:element name="KeyboxIdentifier" type="BoxIdentifierType" minOccurs="2" maxOccurs="unbounded"/>

-			<xsd:element name="Binding" type="BindingType" minOccurs="2" maxOccurs="unbounded"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="BindingType" mixed="true">

-		<xsd:complexContent mixed="true">

-			<xsd:extension base="AnyChildrenType">

-				<xsd:attribute name="Identifier" type="xsd:token" use="required"/>

-			</xsd:extension>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<!--########### Get Token Status ###-->

-	<!--### Get Token Status Reqeust ###-->

-	<xsd:element name="GetStatusRequest" type="GetStatusRequestType"/>

-	<xsd:complexType name="GetStatusRequestType">

-		<xsd:sequence minOccurs="0">

-			<xsd:element name="TokenStatus" type="TokenStatusType"/>

-			<xsd:element name="MaxDelay" type="xsd:nonNegativeInteger"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--### Get Token Status Response ###-->

-	<xsd:element name="GetStatusResponse" type="GetStatusResponseType"/>

-	<xsd:complexType name="GetStatusResponseType">

-		<xsd:sequence>

-			<xsd:element name="TokenStatus" type="TokenStatusType"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:simpleType name="TokenStatusType">

-		<xsd:restriction base="xsd:string">

-			<xsd:enumeration value="ready"/>

-			<xsd:enumeration value="removed"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<!--########## Error Response ###-->

-	<xsd:element name="ErrorResponse" type="ErrorResponseType"/>

-	<xsd:complexType name="ErrorResponseType">

-		<xsd:sequence>

-			<xsd:element name="ErrorCode" type="xsd:integer"/>

-			<xsd:element name="Info" type="xsd:string"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<!--########## Auxiliary Types ###-->

-	<xsd:simpleType name="BoxIdentifierType">

-		<xsd:restriction base="xsd:token"/>

-	</xsd:simpleType>

-	<xsd:simpleType name="MimeTypeType">

-		<xsd:restriction base="xsd:token"/>

-	</xsd:simpleType>

-	<xsd:simpleType name="WildCardSearchStringType">

-		<xsd:restriction base="xsd:string">

-			<xsd:pattern value="[^\*/]*(\*[^\*/]*)?(/[^\*/]*(\*[^\*/]*)?)*"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:complexType name="AnyChildrenType" mixed="true">

-		<xsd:sequence minOccurs="0" maxOccurs="unbounded">

-			<xsd:any namespace="##any" processContents="skip"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="XMLContentType" mixed="true">

-		<xsd:complexContent mixed="true">

-			<xsd:extension base="AnyChildrenType">

-				<xsd:attribute ref="xml:space" use="optional"/>

-			</xsd:extension>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<xsd:complexType name="ContentBaseType">

-		<xsd:choice minOccurs="0">

-			<xsd:element name="Base64Content" type="xsd:base64Binary"/>

-			<xsd:element name="XMLContent" type="XMLContentType"/>

-		</xsd:choice>

-	</xsd:complexType>

-	<xsd:complexType name="ContentOptionalRefType">

-		<xsd:complexContent>

-			<xsd:extension base="ContentBaseType">

-				<xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>

-			</xsd:extension>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<xsd:complexType name="ContentRequiredRefType">

-		<xsd:complexContent>

-			<xsd:restriction base="ContentOptionalRefType">

-				<xsd:choice>

-					<xsd:element name="Base64Content" type="xsd:base64Binary"/>

-					<xsd:element name="XMLContent" type="XMLContentType"/>

-				</xsd:choice>

-				<xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>

-			</xsd:restriction>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<xsd:complexType name="InfoboxAssocArrayPairType">

-		<xsd:complexContent>

-			<xsd:extension base="ContentBaseType">

-				<xsd:attribute name="Key" type="xsd:string" use="required"/>

-			</xsd:extension>

-		</xsd:complexContent>

-	</xsd:complexType>

-</xsd:schema>

diff --git a/common/res/resources/schemas/Core.20020831.xsd b/common/res/resources/schemas/Core.20020831.xsd
deleted file mode 100644
index 6ec40be63..000000000
--- a/common/res/resources/schemas/Core.20020831.xsd
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Securitylayer, Schnittstellenspezifikation -->

-<!-- XML-Schema für Schnittstellenspezifikation Version 1.1.0, Protokollelemente im datierten Namespace 20020831 -->

-<!-- 31. 08. 2002, Operative Unit, CIO, BMOeLS -->

-<xsd:schema targetNamespace="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1.0">

-  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>

-  <xsd:import namespace="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" schemaLocation="Core.20020225.xsd"/>

-  <!--########## Create XML Signature ###-->

-  <!--### Create XML Signature Request ###-->

-  <xsd:element name="CreateXMLSignatureRequest" type="CreateXMLSignatureRequestType"/>

-  <xsd:complexType name="CreateXMLSignatureRequestType">

-    <xsd:sequence>

-      <xsd:element name="KeyboxIdentifier" type="sl10:BoxIdentifierType"/>

-      <xsd:element name="DataObjectInfo" type="sl10:DataObjectInfoType" maxOccurs="unbounded"/>

-      <xsd:element name="SignatureInfo" type="SignatureInfoCreationType" minOccurs="0"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:complexType name="SignatureInfoCreationType">

-    <xsd:sequence>

-      <xsd:element name="SignatureEnvironment" type="sl10:ContentOptionalRefType"/>

-      <xsd:element name="SignatureLocation">

-        <xsd:complexType>

-          <xsd:simpleContent>

-            <xsd:extension base="xsd:token">

-              <xsd:attribute name="Index" type="xsd:nonNegativeInteger" use="required"/>

-            </xsd:extension>

-          </xsd:simpleContent>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="Supplement" type="sl10:XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <!--### Create XML Signature Response ###-->

-  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>

-  <xsd:complexType name="CreateXMLSignatureResponseType">

-    <xsd:sequence>

-      <xsd:any namespace="##any" processContents="lax"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <!--########## Verify CMS Signature ###-->

-  <!--### Verifiy CMS Signature Request ###-->

-  <xsd:element name="VerifyCMSSignatureRequest" type="VerifyCMSSignatureRequestType"/>

-  <xsd:complexType name="VerifyCMSSignatureRequestType">

-    <xsd:sequence>

-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

-      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>

-      <xsd:element name="DataObject" type="sl10:CMSDataObjectOptionalMetaType" minOccurs="0"/>

-    </xsd:sequence>

-    <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>

-  </xsd:complexType>

-  <xsd:simpleType name="SignatoriesType">

-    <xsd:union memberTypes="AllSignatoriesType">

-      <xsd:simpleType>

-        <xsd:list itemType="xsd:positiveInteger"/>

-      </xsd:simpleType>

-    </xsd:union>

-  </xsd:simpleType>

-  <xsd:simpleType name="AllSignatoriesType">

-    <xsd:restriction base="xsd:string">

-      <xsd:enumeration value="all"/>

-    </xsd:restriction>

-  </xsd:simpleType>

-  <!--### Verify CMS Signature Response ###-->

-  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>

-  <xsd:complexType name="VerifyCMSSignatureResponseType">

-    <xsd:sequence maxOccurs="unbounded">

-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType"/>

-      <xsd:element name="SignatureCheck" type="sl10:CheckResultType"/>

-      <xsd:element name="CertificateCheck" type="sl10:CheckResultType"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:element name="QualifiedCertificate"/>

-  <!--########## Verify XML Signature ###-->

-  <!--### Verify XML Signature Request ###-->

-  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>

-  <xsd:complexType name="VerifyXMLSignatureRequestType">

-    <xsd:sequence>

-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

-      <xsd:element name="SignatureInfo" type="SignatureInfoVerificationType"/>

-      <xsd:element name="Supplement" type="sl10:XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:complexType name="SignatureInfoVerificationType">

-    <xsd:sequence>

-      <xsd:element name="SignatureEnvironment" type="sl10:ContentOptionalRefType"/>

-      <xsd:element name="SignatureLocation" type="xsd:token"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <!--### Verify XML Signature Response ###-->

-  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>

-  <xsd:complexType name="VerifyXMLSignatureResponseType">

-    <xsd:sequence>

-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType"/>

-      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>

-      <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType"/>

-      <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>

-      <xsd:element name="CertificateCheck" type="sl10:CheckResultType"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:complexType name="ReferencesCheckResultType">

-    <xsd:complexContent>

-      <xsd:restriction base="sl10:CheckResultType">

-        <xsd:sequence>

-          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

-          <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>

-        </xsd:sequence>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">

-    <xsd:complexContent mixed="true">

-      <xsd:restriction base="sl10:AnyChildrenType">

-        <xsd:sequence>

-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>

-        </xsd:sequence>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="ManifestRefsCheckResultType">

-    <xsd:complexContent>

-      <xsd:restriction base="sl10:CheckResultType">

-        <xsd:sequence>

-          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

-          <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>

-        </xsd:sequence>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">

-    <xsd:complexContent mixed="true">

-      <xsd:extension base="ReferencesCheckResultInfoType">

-        <xsd:sequence>

-          <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>

-        </xsd:sequence>

-      </xsd:extension>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <!--########## Get Properties ###-->

-  <!--### Get Properties Response ###-->

-  <xsd:element name="GetPropertiesResponse" type="GetPropertiesResponseType"/>

-  <xsd:complexType name="GetPropertiesResponseType">

-    <xsd:sequence>

-      <xsd:element name="ViewerMediaType" type="sl10:MimeTypeType" maxOccurs="unbounded"/>

-      <xsd:element name="XMLSignatureTransform" type="xsd:anyURI" maxOccurs="unbounded"/>

-      <xsd:element name="KeyboxIdentifier" type="sl10:BoxIdentifierType" maxOccurs="unbounded"/>

-      <xsd:element name="Binding" type="sl10:BindingType" maxOccurs="unbounded"/>

-      <xsd:element name="ProtocolVersion" type="xsd:anyURI" maxOccurs="unbounded"/>

-      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>

-    </xsd:sequence>

-  </xsd:complexType>

-</xsd:schema>

diff --git a/common/res/resources/schemas/ECDSAKeyValue.ancient.xsd b/common/res/resources/schemas/ECDSAKeyValue.ancient.xsd
deleted file mode 100644
index 833d327f2..000000000
--- a/common/res/resources/schemas/ECDSAKeyValue.ancient.xsd
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.buergerkarte.at/namespaces/ecdsa/200206030#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ecdsa="http://www.buergerkarte.at/namespaces/ecdsa/200206030#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.3">
-	<!--ECDSA key value root element-->
-	<xs:element name="ECDSAKeyValue" type="ecdsa:ECDSAKeyValueType"/>
-	<xs:complexType name="ECDSAKeyValueType">
-		<xs:sequence>
-			<xs:element name="DomainParameters" type="ecdsa:DomainParamsType" minOccurs="0"/>
-			<xs:element name="PublicKey" type="ecdsa:ECPointType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--EC domain parameters-->
-	<xs:complexType name="DomainParamsType">
-		<xs:choice>
-			<xs:element name="ExplicitParams" type="ecdsa:ExplicitParamsType"/>
-			<xs:element name="NamedCurve">
-				<xs:complexType>
-					<xs:attribute name="URN" type="xs:anyURI" use="required"/>
-				</xs:complexType>
-			</xs:element>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="FieldParamsType" abstract="true"/>
-	<xs:complexType name="PrimeFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldParamsType">
-				<xs:sequence>
-					<xs:element name="P" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="CharTwoFieldParamsType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldParamsType">
-				<xs:sequence>
-					<xs:element name="M" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="OddCharExtensionFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldParamsType">
-				<xs:sequence>
-					<xs:element name="M" type="xs:positiveInteger"/>
-					<xs:element name="W" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="TnBFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:CharTwoFieldParamsType">
-				<xs:sequence>
-					<xs:element name="K" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="PnBFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:CharTwoFieldParamsType">
-				<xs:sequence>
-					<xs:element name="K1" type="xs:positiveInteger"/>
-					<xs:element name="K2" type="xs:positiveInteger"/>
-					<xs:element name="K3" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ExplicitParamsType">
-		<xs:sequence>
-			<xs:element name="FieldParams" type="ecdsa:FieldParamsType"/>
-			<xs:element name="CurveParams" type="ecdsa:CurveParamsType"/>
-			<xs:element name="BasePointParams" type="ecdsa:BasePointParamsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="CurveParamsType">
-		<xs:sequence>
-			<xs:element name="A" type="ecdsa:FieldElemType"/>
-			<xs:element name="B" type="ecdsa:FieldElemType"/>
-			<xs:element name="Seed" type="xs:hexBinary" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="BasePointParamsType">
-		<xs:sequence>
-			<xs:element name="BasePoint" type="ecdsa:ECPointType"/>
-			<xs:element name="Order" type="xs:positiveInteger"/>
-			<xs:element name="Cofactor" type="xs:positiveInteger" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--EC point-->
-	<xs:complexType name="ECPointType">
-		<xs:sequence minOccurs="0">
-			<xs:element name="X" type="ecdsa:FieldElemType"/>
-			<xs:element name="Y" type="ecdsa:FieldElemType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--Field element-->
-	<xs:complexType name="FieldElemType" abstract="true"/>
-	<xs:complexType name="PrimeFieldElemType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldElemType">
-				<xs:attribute name="Value" type="xs:nonNegativeInteger" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="CharTwoFieldElemType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldElemType">
-				<xs:attribute name="Value" type="xs:hexBinary" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="OddCharExtensionFieldElemType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldElemType">
-				<xs:attribute name="Value" type="xs:nonNegativeInteger" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/common/res/resources/schemas/ECDSAKeyValue.wrong.xsd b/common/res/resources/schemas/ECDSAKeyValue.wrong.xsd
deleted file mode 100644
index db83c9df5..000000000
--- a/common/res/resources/schemas/ECDSAKeyValue.wrong.xsd
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/2004/01/xmldsig-more#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ecdsa="http://www.w3.org/2004/01/xmldsig-more#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.3">
-	<!--ECDSA key value root element-->
-	<xs:element name="ECDSAKeyValue" type="ecdsa:ECDSAKeyValueType"/>
-	<xs:complexType name="ECDSAKeyValueType">
-		<xs:sequence>
-			<xs:element name="DomainParameters" type="ecdsa:DomainParamsType" minOccurs="0"/>
-			<xs:element name="PublicKey" type="ecdsa:ECPointType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--EC domain parameters-->
-	<xs:complexType name="DomainParamsType">
-		<xs:choice>
-			<xs:element name="ExplicitParams" type="ecdsa:ExplicitParamsType"/>
-			<xs:element name="NamedCurve">
-				<xs:complexType>
-					<xs:attribute name="URN" type="xs:anyURI" use="required"/>
-				</xs:complexType>
-			</xs:element>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="FieldParamsType" abstract="true"/>
-	<xs:complexType name="PrimeFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldParamsType">
-				<xs:sequence>
-					<xs:element name="P" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="CharTwoFieldParamsType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldParamsType">
-				<xs:sequence>
-					<xs:element name="M" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="OddCharExtensionFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldParamsType">
-				<xs:sequence>
-					<xs:element name="M" type="xs:positiveInteger"/>
-					<xs:element name="W" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="TnBFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:CharTwoFieldParamsType">
-				<xs:sequence>
-					<xs:element name="K" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="PnBFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:CharTwoFieldParamsType">
-				<xs:sequence>
-					<xs:element name="K1" type="xs:positiveInteger"/>
-					<xs:element name="K2" type="xs:positiveInteger"/>
-					<xs:element name="K3" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ExplicitParamsType">
-		<xs:sequence>
-			<xs:element name="FieldParams" type="ecdsa:FieldParamsType"/>
-			<xs:element name="CurveParams" type="ecdsa:CurveParamsType"/>
-			<xs:element name="BasePointParams" type="ecdsa:BasePointParamsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="CurveParamsType">
-		<xs:sequence>
-			<xs:element name="A" type="ecdsa:FieldElemType"/>
-			<xs:element name="B" type="ecdsa:FieldElemType"/>
-			<xs:element name="Seed" type="xs:hexBinary" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="BasePointParamsType">
-		<xs:sequence>
-			<xs:element name="BasePoint" type="ecdsa:ECPointType"/>
-			<xs:element name="Order" type="xs:positiveInteger"/>
-			<xs:element name="Cofactor" type="xs:positiveInteger" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--EC point-->
-	<xs:complexType name="ECPointType">
-		<xs:sequence minOccurs="0">
-			<xs:element name="X" type="ecdsa:FieldElemType"/>
-			<xs:element name="Y" type="ecdsa:FieldElemType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--Field element-->
-	<xs:complexType name="FieldElemType" abstract="true"/>
-	<xs:complexType name="PrimeFieldElemType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldElemType">
-				<xs:attribute name="Value" type="xs:nonNegativeInteger" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="CharTwoFieldElemType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldElemType">
-				<xs:attribute name="Value" type="xs:hexBinary" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="OddCharExtensionFieldElemType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldElemType">
-				<xs:attribute name="Value" type="xs:nonNegativeInteger" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/common/res/resources/schemas/ECDSAKeyValue.xsd b/common/res/resources/schemas/ECDSAKeyValue.xsd
deleted file mode 100644
index 7a01b23d1..000000000
--- a/common/res/resources/schemas/ECDSAKeyValue.xsd
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/2001/04/xmldsig-more#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.3">
-	<!--ECDSA key value root element-->
-	<xs:element name="ECDSAKeyValue" type="ecdsa:ECDSAKeyValueType"/>
-	<xs:complexType name="ECDSAKeyValueType">
-		<xs:sequence>
-			<xs:element name="DomainParameters" type="ecdsa:DomainParamsType" minOccurs="0"/>
-			<xs:element name="PublicKey" type="ecdsa:ECPointType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--EC domain parameters-->
-	<xs:complexType name="DomainParamsType">
-		<xs:choice>
-			<xs:element name="ExplicitParams" type="ecdsa:ExplicitParamsType"/>
-			<xs:element name="NamedCurve">
-				<xs:complexType>
-					<xs:attribute name="URN" type="xs:anyURI" use="required"/>
-				</xs:complexType>
-			</xs:element>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="FieldParamsType" abstract="true"/>
-	<xs:complexType name="PrimeFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldParamsType">
-				<xs:sequence>
-					<xs:element name="P" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="CharTwoFieldParamsType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldParamsType">
-				<xs:sequence>
-					<xs:element name="M" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="OddCharExtensionFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldParamsType">
-				<xs:sequence>
-					<xs:element name="M" type="xs:positiveInteger"/>
-					<xs:element name="W" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="TnBFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:CharTwoFieldParamsType">
-				<xs:sequence>
-					<xs:element name="K" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="PnBFieldParamsType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:CharTwoFieldParamsType">
-				<xs:sequence>
-					<xs:element name="K1" type="xs:positiveInteger"/>
-					<xs:element name="K2" type="xs:positiveInteger"/>
-					<xs:element name="K3" type="xs:positiveInteger"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="ExplicitParamsType">
-		<xs:sequence>
-			<xs:element name="FieldParams" type="ecdsa:FieldParamsType"/>
-			<xs:element name="CurveParams" type="ecdsa:CurveParamsType"/>
-			<xs:element name="BasePointParams" type="ecdsa:BasePointParamsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="CurveParamsType">
-		<xs:sequence>
-			<xs:element name="A" type="ecdsa:FieldElemType"/>
-			<xs:element name="B" type="ecdsa:FieldElemType"/>
-			<xs:element name="Seed" type="xs:hexBinary" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="BasePointParamsType">
-		<xs:sequence>
-			<xs:element name="BasePoint" type="ecdsa:ECPointType"/>
-			<xs:element name="Order" type="xs:positiveInteger"/>
-			<xs:element name="Cofactor" type="xs:positiveInteger" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--EC point-->
-	<xs:complexType name="ECPointType">
-		<xs:sequence minOccurs="0">
-			<xs:element name="X" type="ecdsa:FieldElemType"/>
-			<xs:element name="Y" type="ecdsa:FieldElemType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--Field element-->
-	<xs:complexType name="FieldElemType" abstract="true"/>
-	<xs:complexType name="PrimeFieldElemType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldElemType">
-				<xs:attribute name="Value" type="xs:nonNegativeInteger" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="CharTwoFieldElemType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldElemType">
-				<xs:attribute name="Value" type="xs:hexBinary" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="OddCharExtensionFieldElemType">
-		<xs:complexContent>
-			<xs:extension base="ecdsa:FieldElemType">
-				<xs:attribute name="Value" type="xs:nonNegativeInteger" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/common/res/resources/schemas/MOA-SPSS-config-1.3.xsd b/common/res/resources/schemas/MOA-SPSS-config-1.3.xsd
deleted file mode 100644
index 8ab3d62aa..000000000
--- a/common/res/resources/schemas/MOA-SPSS-config-1.3.xsd
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  MOA SP/SS 1.3 Configuration Schema

--->

-<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:config="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema">

-  <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

-  <xs:element name="MOAConfiguration">

-    <xs:complexType>

-      <xs:sequence>

-        <xs:element name="Common" minOccurs="0">

-          <xs:complexType>

-            <xs:sequence>

-              <xs:element name="HardwareCryptoModule" minOccurs="0" maxOccurs="unbounded">

-                <xs:complexType>

-                  <xs:sequence>

-                    <xs:element name="Name" type="xs:string"/>

-                    <xs:element name="SlotId" type="xs:string" minOccurs="0"/>

-                    <xs:element name="UserPIN" type="xs:string"/>

-                  </xs:sequence>

-                </xs:complexType>

-              </xs:element>

-            </xs:sequence>

-          </xs:complexType>

-        </xs:element>

-        <xs:element name="SignatureCreation" minOccurs="0">

-          <xs:complexType>

-            <xs:sequence>

-              <xs:element name="KeyModules">

-                <xs:complexType>

-                  <xs:choice maxOccurs="unbounded">

-                    <xs:element name="HardwareKeyModule">

-                      <xs:complexType>

-                        <xs:sequence>

-                          <xs:element name="Id" type="xs:token"/>

-                          <xs:element name="Name" type="xs:string"/>

-                          <xs:element name="SlotId" type="xs:string" minOccurs="0"/>

-                          <xs:element name="UserPIN" type="xs:string"/>

-                        </xs:sequence>

-                      </xs:complexType>

-                    </xs:element>

-                    <xs:element name="SoftwareKeyModule">

-                      <xs:complexType>

-                        <xs:sequence>

-                          <xs:element name="Id" type="xs:token"/>

-                          <xs:element name="FileName" type="xs:string"/>

-                          <xs:element name="Password" type="xs:string" minOccurs="0"/>

-                        </xs:sequence>

-                      </xs:complexType>

-                    </xs:element>

-                  </xs:choice>

-                </xs:complexType>

-              </xs:element>

-              <xs:element name="KeyGroup" maxOccurs="unbounded">

-                <xs:complexType>

-                  <xs:sequence>

-                    <xs:element name="Id" type="xs:token"/>

-                    <xs:sequence maxOccurs="unbounded">

-                      <xs:element name="Key">

-                        <xs:complexType>

-                          <xs:sequence>

-                            <xs:element name="KeyModuleId" type="xs:token"/>

-                            <xs:element name="KeyCertIssuerSerial" type="dsig:X509IssuerSerialType"/>

-                          </xs:sequence>

-                        </xs:complexType>

-                      </xs:element>

-                    </xs:sequence>

-                  </xs:sequence>

-                </xs:complexType>

-              </xs:element>

-              <xs:element name="KeyGroupMapping" maxOccurs="unbounded">

-                <xs:complexType>

-                  <xs:sequence>

-                    <xs:element name="CustomerId" type="dsig:X509IssuerSerialType" minOccurs="0"/>

-                    <xs:element name="KeyGroupId" type="xs:token" maxOccurs="unbounded"/>

-                  </xs:sequence>

-                </xs:complexType>

-              </xs:element>

-              <xs:element name="XMLDSig">

-                <xs:complexType>

-                  <xs:sequence>

-                    <xs:element name="CanonicalizationAlgorithm" type="xs:anyURI" minOccurs="0"/>

-                    <xs:element name="DigestMethodAlgorithm" type="xs:anyURI" minOccurs="0"/>

-                  </xs:sequence>

-                </xs:complexType>

-              </xs:element>

-              <xs:element name="CreateTransformsInfoProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>

-              <xs:element name="CreateSignatureEnvironmentProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>

-            </xs:sequence>

-          </xs:complexType>

-        </xs:element>

-        <xs:element name="SignatureVerification" minOccurs="0">

-          <xs:complexType>

-            <xs:sequence>

-              <xs:element name="CertificateValidation">

-                <xs:complexType>

-                  <xs:sequence>

-                    <xs:element name="PathConstruction">

-                      <xs:complexType>

-                        <xs:sequence>

-                          <xs:element name="AutoAddCertificates" type="xs:boolean"/>

-                          <xs:element name="UseAuthorityInformationAccess" type="xs:boolean"/>

-                          <xs:element name="CertificateStore">

-                            <xs:complexType>

-                              <xs:choice>

-                                <xs:element name="DirectoryStore">

-                                  <xs:complexType>

-                                    <xs:sequence>

-                                      <xs:element name="Location" type="xs:token"/>

-                                    </xs:sequence>

-                                  </xs:complexType>

-                                </xs:element>

-                              </xs:choice>

-                            </xs:complexType>

-                          </xs:element>

-                        </xs:sequence>

-                      </xs:complexType>

-                    </xs:element>

-                    <xs:element name="PathValidation">

-                      <xs:complexType>

-                        <xs:sequence>

-                          <xs:element name="ChainingMode">

-                            <xs:complexType>

-                              <xs:sequence>

-                                <xs:element name="DefaultMode" type="config:ChainingModeType"/>

-                                <xs:element name="TrustAnchor" minOccurs="0" maxOccurs="unbounded">

-                                  <xs:complexType>

-                                    <xs:sequence>

-                                      <xs:element name="Identification" type="dsig:X509IssuerSerialType"/>

-                                      <xs:element name="Mode" type="config:ChainingModeType"/>

-                                    </xs:sequence>

-                                  </xs:complexType>

-                                </xs:element>

-                              </xs:sequence>

-                            </xs:complexType>

-                          </xs:element>

-                          <xs:element name="TrustProfile" maxOccurs="unbounded">

-                            <xs:complexType>

-                              <xs:sequence>

-                                <xs:element name="Id" type="xs:token"/>

-                                <xs:element name="TrustAnchorsLocation" type="xs:anyURI"/>

-                                <xs:element name="SignerCertsLocation" type="xs:anyURI" minOccurs="0"/>

-                              </xs:sequence>

-                            </xs:complexType>

-                          </xs:element>

-                        </xs:sequence>

-                      </xs:complexType>

-                    </xs:element>

-                    <xs:element name="RevocationChecking">

-                      <xs:complexType>

-                        <xs:sequence>

-                          <xs:element name="EnableChecking" type="xs:boolean"/>

-                          <xs:element name="MaxRevocationAge" type="xs:integer"/>

-                          <xs:element name="ServiceOrder" minOccurs="0">

-                            <xs:complexType>

-                              <xs:sequence minOccurs="2" maxOccurs="2">

-                                <xs:element name="Service">

-                                  <xs:simpleType>

-                                    <xs:restriction base="xs:token">

-                                      <xs:enumeration value="OCSP"/>

-                                      <xs:enumeration value="CRL"/>

-                                    </xs:restriction>

-                                  </xs:simpleType>

-                                </xs:element>

-                              </xs:sequence>

-                            </xs:complexType>

-                          </xs:element>

-                          <xs:element name="Archiving">

-                            <xs:complexType>

-                              <xs:sequence>

-                                <xs:element name="EnableArchiving" type="xs:boolean"/>

-                                <xs:element name="ArchiveDuration" type="xs:nonNegativeInteger" minOccurs="0"/>

-                                <xs:element name="Archive" minOccurs="0">

-                                  <xs:complexType>

-                                    <xs:choice>

-                                      <xs:element name="DatabaseArchive">

-                                        <xs:complexType>

-                                          <xs:sequence>

-                                            <xs:element name="JDBCURL" type="xs:anyURI"/>

-                                            <xs:element name="JDBCDriverClassName" type="xs:token"/>

-                                          </xs:sequence>

-                                        </xs:complexType>

-                                      </xs:element>

-                                    </xs:choice>

-                                  </xs:complexType>

-                                </xs:element>

-                              </xs:sequence>

-                            </xs:complexType>

-                          </xs:element>

-                          <xs:element name="DistributionPoint" minOccurs="0" maxOccurs="unbounded">

-                            <xs:complexType>

-                              <xs:sequence>

-                                <xs:element name="CAIssuerDN" type="xs:token"/>

-                                <xs:choice maxOccurs="unbounded">

-                                  <xs:element name="CRLDP">

-                                    <xs:complexType>

-                                      <xs:sequence>

-                                        <xs:element name="Location" type="xs:anyURI"/>

-                                        <xs:element name="ReasonCode" minOccurs="0" maxOccurs="unbounded">

-                                          <xs:simpleType>

-                                            <xs:restriction base="xs:token">

-                                              <xs:enumeration value="unused"/>

-                                              <xs:enumeration value="keyCompromise"/>

-                                              <xs:enumeration value="cACompromise"/>

-                                              <xs:enumeration value="affiliationChanged"/>

-                                              <xs:enumeration value="superseded"/>

-                                              <xs:enumeration value="cessationOfOperation"/>

-                                              <xs:enumeration value="certificateHold"/>

-                                              <xs:enumeration value="privilegeWithdrawn"/>

-                                              <xs:enumeration value="aACompromise"/>

-                                            </xs:restriction>

-                                          </xs:simpleType>

-                                        </xs:element>

-                                      </xs:sequence>

-                                    </xs:complexType>

-                                  </xs:element>

-                                  <xs:element name="OCSPDP">

-                                    <xs:complexType>

-                                      <xs:sequence>

-                                        <xs:element name="Location" type="xs:anyURI"/>

-                                      </xs:sequence>

-                                    </xs:complexType>

-                                  </xs:element>

-                                </xs:choice>

-                              </xs:sequence>

-                            </xs:complexType>

-                          </xs:element>

-                        </xs:sequence>

-                      </xs:complexType>

-                    </xs:element>

-                  </xs:sequence>

-                </xs:complexType>

-              </xs:element>

-              <xs:element name="VerifyTransformsInfoProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>

-              <xs:element name="SupplementProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>

-            </xs:sequence>

-          </xs:complexType>

-        </xs:element>

-      </xs:sequence>

-    </xs:complexType>

-  </xs:element>

-  <xs:simpleType name="ChainingModeType">

-    <xs:restriction base="xs:string">

-      <xs:enumeration value="chaining"/>

-      <xs:enumeration value="pkix"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:complexType name="ProfileType">

-    <xs:sequence>

-      <xs:element name="Id" type="xs:token"/>

-      <xs:element name="Location" type="xs:anyURI"/>

-    </xs:sequence>

-  </xs:complexType>

-</xs:schema>

diff --git a/common/res/resources/schemas/MOAIdentities.xsd b/common/res/resources/schemas/MOAIdentities.xsd
deleted file mode 100644
index de9d9d4e4..000000000
--- a/common/res/resources/schemas/MOAIdentities.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rudolf Schamberger (Stabsstelle IKT-Strategie) (Bundesrechenzentrum GmbH) -->

-<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#/xmllpr20030814" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#/xmllpr20030814" elementFormDefault="qualified" attributeFormDefault="unqualified">

-	<xs:element name="MOAIdentities">

-		<xs:annotation>

-			<xs:documentation>MOAIdentities provides a mapping from identities to parameters used in the XMLLoginParameterResolver of MOA-ID</xs:documentation>

-		</xs:annotation>

-		<xs:complexType>

-			<xs:sequence maxOccurs="unbounded">

-				<xs:element name="Mapping">

-					<xs:complexType>

-						<xs:sequence>

-							<xs:element name="Identity">

-								<xs:complexType>

-									<xs:choice>

-										<xs:element name="NamedIdentity" type="tns:NamedIdentityType"/>

-										<xs:element name="bPKIdentity" type="tns:bPKIdentitiyType"/>

-									</xs:choice>

-								</xs:complexType>

-							</xs:element>

-							<xs:element name="Parameters" type="tns:ParametersType"/>

-						</xs:sequence>

-					</xs:complexType>

-				</xs:element>

-			</xs:sequence>

-		</xs:complexType>

-	</xs:element>

-	<xs:complexType name="bPKIdentitiyType">

-		<xs:simpleContent>

-			<xs:extension base="xs:boolean">

-				<xs:attribute name="bPK" type="xs:string" use="required"/>

-			</xs:extension>

-		</xs:simpleContent>

-	</xs:complexType>

-	<xs:complexType name="NamedIdentityType">

-		<xs:simpleContent>

-			<xs:extension base="xs:boolean">

-				<xs:attribute name="SurName" type="xs:string" use="required"/>

-				<xs:attribute name="GivenName" type="xs:string" use="required"/>

-				<xs:attribute name="BirthDate" type="xs:string" use="optional"/>

-			</xs:extension>

-		</xs:simpleContent>

-	</xs:complexType>

-	<xs:complexType name="ParametersType">

-		<xs:attribute name="UN" type="xs:string" use="optional"/>

-		<xs:attribute name="PW" type="xs:string" use="optional"/>

-		<xs:attribute name="Param1" type="xs:string" use="optional"/>

-		<xs:attribute name="Param2" type="xs:string" use="optional"/>

-		<xs:attribute name="Param3" type="xs:string" use="optional"/>

-	</xs:complexType>

-</xs:schema>

diff --git a/common/res/resources/schemas/PersonData.xsd b/common/res/resources/schemas/PersonData.xsd
deleted file mode 100644
index 0e3bc6b3b..000000000
--- a/common/res/resources/schemas/PersonData.xsd
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Peter Reichstädter (CIO) -->
-<!--Generisches Schema zum Speichern und Austauschen von Personendaten
-    (c) 2001-2002 Chief Information Office Austria, Stabsstelle IKT-Strategie des Bundes, BMÖLS
-    Kontakt: Peter Reichstädter (peter.reichstaedter@cio.gv.at), Arno Hollosi (arno.hollosi@cio.gv.at)
-    Die freie Verwendung dieses Schemas in Applikationen (behördenintern, kommerziell, privat) ist erlaubt und erwünscht.
--->
-<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
-	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="W3C-XMLDSig.xsd"/>
-	<!-- ### include definitions from hr-xml schemas ###-->
-	<xs:include schemaLocation="PersonName-1_2.xsd"/>
-	<xs:include schemaLocation="PostalAddress-1_2.xsd"/>
-	<xs:include schemaLocation="TelcomNumber-1_0.xsd"/>
-	<!-- ### type definition of Unique Identifier Entities ### -->
-	<xs:complexType name="IdentificationType">
-		<xs:annotation>
-			<xs:documentation>unique identifier</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Value">
-				<xs:annotation>
-					<xs:documentation>actual value of the identifier.</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:string">
-							<xs:attribute name="Id" type="xs:ID" use="optional"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Type" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>type of value (eg 'ZMR', 'SV-Nummer', 'Martrikelnummer', database identification, ...)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Authority" type="xs:anyURI" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>authority, which is reponsible for generation of the identifier (eg university in case of 'MatrikelNummer')</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>any additional properties</xs:documentation>
-				</xs:annotation>
-			</xs:any>
-		</xs:sequence>
-		<xs:attribute name="Id" type="xs:ID" use="optional"/>
-		<xs:anyAttribute namespace="##other"/>
-	</xs:complexType>
-	<!-- ### base type for person data ### -->
-	<xs:element name="Person" type="AbstractPersonType">
-		<xs:annotation>
-			<xs:documentation>element of person type</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="AbstractPersonType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>main structure of person data</xs:documentation>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element name="Identification" type="IdentificationType" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>unique identification entities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="Id" type="xs:ID" use="optional"/>
-		<xs:anyAttribute namespace="##other"/>
-	</xs:complexType>
-	<!-- ### physical person and corporate body ### -->
-	<xs:element name="PhysicalPerson" type="PhysicalPersonType">
-		<xs:annotation>
-			<xs:documentation>element of physical person type</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="PhysicalPersonType">
-		<xs:annotation>
-			<xs:documentation>physical person</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractPersonType">
-				<xs:sequence minOccurs="0">
-					<xs:element name="Name" type="PersonNameType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>data related to the person's name</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AlternativeName" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Former name, Artist name, changes of Given name ...</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:complexContent>
-								<xs:extension base="PersonNameType">
-									<xs:attribute name="Type" type="AlternativeNameTypeType"/>
-								</xs:extension>
-							</xs:complexContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="MaritalStatus" type="MaritalStatusType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>status of a person in the cycle of life</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Sex" type="SexType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>gender</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DateOfBirth" type="DateOfBirthType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>date of birth</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="PlaceOfBirth" type="xs:token" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>place of birth</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="CountryOfBirth" type="xs:token" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>country of birth</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Nationality" type="xs:token" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>nationality of Person (Staatsbürgerschaft)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Confession" type="xs:token" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>confession (religion) of Person</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="relatedPerson" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>relatives (parents, ...)</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="TypeOfRelation" type="RelationType" maxOccurs="unbounded">
-									<xs:annotation>
-										<xs:documentation>type of the relationship</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-								<xs:element ref="Person"/>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>any additional properties</xs:documentation>
-						</xs:annotation>
-					</xs:any>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:element name="CorporateBody" type="CorporateBodyType">
-		<xs:annotation>
-			<xs:documentation>element of corporate body type</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="CorporateBodyType">
-		<xs:annotation>
-			<xs:documentation>juridical person, organisation</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractPersonType">
-				<xs:sequence minOccurs="0">
-					<xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>category (eg organisation, function, sector, ...)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="FullName" type="xs:token" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>name of corporate body (whole name)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AlternativeName" type="xs:token" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>alternative names of corporate body (abbreviations, short name, synonyms, ...)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="LegalForm" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>type of company (eg AG, OHG, ...)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Organisation" type="xs:token" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>part of an organisation, see also X.500 ou (eg departement, section, branch, ...) </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>any additional properties</xs:documentation>
-						</xs:annotation>
-					</xs:any>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ### signed structure of a person  ### -->
-	<xs:element name="PersonData" type="PersonDataType">
-		<xs:annotation>
-			<xs:documentation>element of signed person datastructure type</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="PersonDataType">
-		<xs:annotation>
-			<xs:documentation>signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractPersonType">
-				<xs:sequence>
-					<xs:element ref="Person"/>
-					<xs:element ref="Address" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>one or more electronic signatures applied on fields above</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AdditionalData" minOccurs="0">
-						<xs:complexType mixed="true">
-							<xs:sequence minOccurs="0" maxOccurs="unbounded">
-								<xs:any namespace="##any" processContents="lax">
-									<xs:annotation>
-										<xs:documentation>any additional properties</xs:documentation>
-									</xs:annotation>
-								</xs:any>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ### auxiliary types ### -->
-	<xs:simpleType name="SexType">
-		<xs:annotation>
-			<xs:documentation>simple type for sex (gender) of person</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="male"/>
-			<xs:enumeration value="female"/>
-			<xs:enumeration value="unknown"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="DateOfBirthType">
-		<xs:annotation>
-			<xs:documentation>simple type for dates (union), which may omit day and/or month</xs:documentation>
-		</xs:annotation>
-		<xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
-	</xs:simpleType>
-	<xs:simpleType name="MaritalStatusType">
-		<xs:annotation>
-			<xs:documentation>simple type for marital status of a person</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="single"/>
-			<xs:enumeration value="married"/>
-			<xs:enumeration value="divorced"/>
-			<xs:enumeration value="widowed"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="xStringPatternExtensionType">
-		<xs:annotation>
-			<xs:documentation>pattern type for enlargement of type definitions</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:pattern value="x:\S.*"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="DefinedRelationType">
-		<xs:annotation>
-			<xs:documentation>known relations (family + functional)</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="family:Parent"/>
-			<xs:enumeration value="family:Child"/>
-			<xs:enumeration value="family:Sibling"/>
-			<xs:enumeration value="family:Grandparent"/>
-			<xs:enumeration value="family:Grandchild"/>
-			<xs:enumeration value="family:Spouse"/>
-			<xs:enumeration value="function:LegalGuardian"/>
-			<xs:enumeration value="function:IsGuardedBy"/>
-			<xs:enumeration value="function:Cohabitant"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="RelationType">
-		<xs:annotation>
-			<xs:documentation>known + any other relation</xs:documentation>
-		</xs:annotation>
-		<xs:union memberTypes="xStringPatternExtensionType DefinedRelationType"/>
-	</xs:simpleType>
-	<xs:simpleType name="DefinedAlternativeNameTypeType">
-		<xs:annotation>
-			<xs:documentation>known types of alternative names</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ArtistName"/>
-			<xs:enumeration value="NickName"/>
-			<xs:enumeration value="FormerName"/>
-			<xs:enumeration value="Alias"/>
-			<xs:enumeration value="MaidenName"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AlternativeNameTypeType">
-		<xs:annotation>
-			<xs:documentation>known + any other alternative name types</xs:documentation>
-		</xs:annotation>
-		<xs:union memberTypes="xStringPatternExtensionType DefinedAlternativeNameTypeType"/>
-	</xs:simpleType>
-	<!-- ### adress data for various types of communications ### -->
-	<xs:element name="Address" type="AbstractAddressType">
-		<xs:annotation>
-			<xs:documentation>element of address type</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="AbstractAddressType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>main structure of address data</xs:documentation>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element name="Identification" type="IdentificationType" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>unique identification entities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="Id" type="xs:ID" use="optional"/>
-		<xs:anyAttribute namespace="##other"/>
-	</xs:complexType>
-	<xs:element name="TypedPostalAddress" type="TypedPostalAddressType">
-		<xs:annotation>
-			<xs:documentation>element of postal address type</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="TypedPostalAddressType">
-		<xs:annotation>
-			<xs:documentation>postal address</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractAddressType">
-				<xs:sequence minOccurs="0">
-					<xs:element name="Type" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>type of address - category (eg 'Wohnsitz', 'Zentrale', ...)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element ref="PostalAddress"/>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>any additional properties</xs:documentation>
-						</xs:annotation>
-					</xs:any>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:element name="TelephoneAddress" type="TelephoneAddressType">
-		<xs:annotation>
-			<xs:documentation>element of telephone address type</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="TelephoneAddressType">
-		<xs:annotation>
-			<xs:documentation>phone numbers</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractAddressType">
-				<xs:sequence minOccurs="0">
-					<xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>type of phononumber - category (eg 'Festnetz', 'Mobile', 'fax', ...)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Number" type="TelcomNumberType">
-						<xs:annotation>
-							<xs:documentation>phonenumber</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>any additional properties</xs:documentation>
-						</xs:annotation>
-					</xs:any>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:element name="InternetAddress" type="InternetAddressType">
-		<xs:annotation>
-			<xs:documentation>element of internet address type</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="InternetAddressType">
-		<xs:annotation>
-			<xs:documentation>internet based communication</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="AbstractAddressType">
-				<xs:sequence minOccurs="0">
-					<xs:element ref="dsig:KeyInfo" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>certificate for secure communication</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Address" type="xs:anyURI">
-						<xs:annotation>
-							<xs:documentation>email-Address, Web, FTP, LDAP, ...</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>any additional properties</xs:documentation>
-						</xs:annotation>
-					</xs:any>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/common/res/resources/schemas/PersonData_20_en_moaWID.xsd b/common/res/resources/schemas/PersonData_20_en_moaWID.xsd
deleted file mode 100644
index cf8f796db..000000000
--- a/common/res/resources/schemas/PersonData_20_en_moaWID.xsd
+++ /dev/null
@@ -1,1229 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Larissa Naber (Bundeskanzleramt) -->

-<!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Peter Reichstädter (CIO) -->

-<!--Generisches Schema zum Speichern und Austauschen von Personendaten

-    (c) 2001-2002 Chief Information Office Austria, Stabsstelle IKT-Strategie des Bundes, BMÖLS

-    Kontakt: Peter Reichstädter (peter.reichstaedter@cio.gv.at), Arno Hollosi (arno.hollosi@cio.gv.at)

-    Die freie Verwendung dieses Schemas in Applikationen (behördenintern, kommerziell, privat) ist erlaubt und erwünscht.

--->

-<?xml-stylesheet type="text/xsl" href="getelementnames.xslt"?>

-<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">

-  <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>

-  <xs:annotation>

-    <xs:documentation>This version of person deploys only global elements. All types derived from abstract types have been replaced by substitution groups</xs:documentation>

-  </xs:annotation>

-  <!-- ### signed structure of a person  ### -->

-  <xs:element name="AbstractPersonData" type="AbstractPersonType">

-    <xs:annotation>

-      <xs:documentation>dummy abstract Peson Data element needed for bi-lingual schema (substitution groups)</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="PersonData" type="PersonDataType" substitutionGroup="AbstractPersonData">

-    <xs:annotation>

-      <xs:documentation>element of signed person datastructure type</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="CompactPersonData">

-    <xs:annotation>

-      <xs:documentation>element of signed person datastructure type</xs:documentation>

-    </xs:annotation>

-    <xs:complexType>

-      <xs:sequence>

-        <xs:choice>

-          <xs:element ref="CompactPhysicalPerson"/>

-          <xs:element ref="CompactCorporateBody"/>

-        </xs:choice>

-        <xs:choice minOccurs="0" maxOccurs="unbounded">

-          <xs:element ref="InternetAddress"/>

-          <xs:element ref="TelephoneAddress"/>

-          <xs:element ref="CompactPostalAddress"/>

-        </xs:choice>

-      </xs:sequence>

-    </xs:complexType>

-  </xs:element>

-  <!-- ### base type for person data ### -->

-  <xs:element name="Person" type="AbstractPersonType">

-    <xs:annotation>

-      <xs:documentation>element of person type, essential abstract, subsitute PhysicalPerson or CorporateBody instead or use with xsi:type="..."</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <!-- ### physical person and corporate body ### -->

-  <xs:element name="PhysicalPerson" type="PhysicalPersonType" substitutionGroup="Person">

-    <xs:annotation>

-      <xs:documentation>element of physical person type, dreived from Person (abstract)</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="CompactPhysicalPerson" type="CompactPhysicalPersonType" substitutionGroup="Person">

-    <xs:annotation>

-      <xs:documentation>element of physical person type, dreived from Person (abstract)</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="CorporateBody" type="CorporateBodyType" substitutionGroup="Person">

-    <xs:annotation>

-      <xs:documentation>element of corporate body type, derived from Person</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="CompactCorporateBody" type="CompactCorporateBodyType" substitutionGroup="Person">

-    <xs:annotation>

-      <xs:documentation>element of corporate body type, derived from Person</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <!--### complex child elements of person, also available as standalone ###-->

-  <xs:element name="Name" type="PersonNameType">

-    <xs:annotation>

-      <xs:documentation>data related to the person's name</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="CompactName" type="CompactPersonNameType">

-    <xs:annotation>

-      <xs:documentation>data related to the person's name</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="AlternativeName">

-    <xs:annotation>

-      <xs:documentation>Former name, Artist name, changes of Given name ..., compare AlternativName</xs:documentation>

-    </xs:annotation>

-    <xs:complexType>

-      <xs:complexContent>

-        <xs:extension base="PersonNameType">

-          <xs:attribute name="Type" type="AlternativeNameTypeType"/>

-        </xs:extension>

-      </xs:complexContent>

-    </xs:complexType>

-  </xs:element>

-  <xs:element name="relatedPerson">

-    <xs:annotation>

-      <xs:documentation>relatives (parents, ...), compare Verwandter</xs:documentation>

-    </xs:annotation>

-    <xs:complexType>

-      <xs:sequence>

-        <xs:element name="TypeOfRelation" type="RelationType" minOccurs="0" maxOccurs="unbounded">

-          <xs:annotation>

-            <xs:documentation>type of the relationship, compare Verwandschftsgrad</xs:documentation>

-          </xs:annotation>

-        </xs:element>

-        <xs:element ref="PhysicalPerson"/>

-      </xs:sequence>

-    </xs:complexType>

-  </xs:element>

-  <!-- ### adress data for various types of communications ### -->

-  <xs:element name="Address" type="AbstractAddressType">

-    <xs:annotation>

-      <xs:documentation>element of address type, essentially abstract. Use InternetAddress, TelephoneAddress, PostalAddress, TypedPostalAddress instead, or use Address with xsi:type Attribute</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="PostalAddress" type="PostalAddressType" substitutionGroup="Address">

-    <xs:annotation>

-      <xs:documentation>Postal or ZMR Address, compare PostAdresse</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="CompactPostalAddress" type="CompactPostalAddressType" substitutionGroup="Address">

-    <xs:annotation>

-      <xs:documentation>Postal or ZMR Address, compare PostAdresse</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="TypedPostalAddress" type="TypedPostalAddressType" substitutionGroup="Address">

-    <xs:annotation>

-      <xs:documentation>Typed Postal or ZMR Address, compare TypisiertePostAdresse</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="InternetAddress" type="InternetAddressType" substitutionGroup="Address">

-    <xs:annotation>

-      <xs:documentation>InternetAdress such as e-mail or website, compare InternetAdresse</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="TelephoneAddress" type="TelephoneAddressType" substitutionGroup="Address">

-    <xs:annotation>

-      <xs:documentation>Typed TelephoneAddress, compare TelefonAdresse</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="BankConnection" type="BankConnectionType">

-    <xs:annotation>

-      <xs:documentation>National or international bank connection, compare Bankverbindung</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <!-- ###  Identification elements ###-->

-  <xs:element name="AbstractSimpleIdentification" type="AbstractSimpleIdentificationType">

-    <xs:annotation>

-      <xs:documentation>possibility to include common austrian primary keys in human readable way, english translation not available</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="ZMRzahl" substitutionGroup="AbstractSimpleIdentification">

-	  <xs:complexType>

-	      <xs:simpleContent>

-	        <xs:extension base="AbstractSimpleIdentificationType">

-	          <xs:attribute name="Identifier" type="xs:string" fixed="ZMR"/>

-	        </xs:extension>

-	      </xs:simpleContent>

-	    </xs:complexType>

-  </xs:element>

-  <xs:element name="Stammzahl" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>

-  <xs:element name="Firmenbuchnummer" substitutionGroup="AbstractSimpleIdentification">

-	  <xs:complexType>

-	      <xs:simpleContent>

-	        <xs:extension base="AbstractSimpleIdentificationType">

-	          <xs:attribute name="Identifier" type="xs:string" fixed="FN"/>

-	        </xs:extension>

-	      </xs:simpleContent>

-	    </xs:complexType>

-  </xs:element>

-  <xs:element name="ERJPZahl" substitutionGroup="AbstractSimpleIdentification">

-    <xs:annotation>

-      <xs:documentation>Ergänzungsregister für nicht-natürliche Personen (CorporateBody)</xs:documentation>

-    </xs:annotation>

-    <xs:complexType>

-      <xs:simpleContent>

-        <xs:extension base="AbstractSimpleIdentificationType">

-          <xs:attribute name="Identifier" type="xs:string" fixed="ERJ"/>

-        </xs:extension>

-      </xs:simpleContent>

-    </xs:complexType>

-  </xs:element>

-  <xs:element name="Vereinsnummer" substitutionGroup="AbstractSimpleIdentification">

-	  <xs:complexType>

-	      <xs:simpleContent>

-	        <xs:extension base="AbstractSimpleIdentificationType">

-	          <xs:attribute name="Identifier" type="xs:string" fixed="VR"/>

-	        </xs:extension>

-	      </xs:simpleContent>

-	    </xs:complexType>

-  </xs:element>	   

-  <xs:element name="Sozialversicherungsnummer" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>

-  <xs:element name="Steuernummer" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>

-  <xs:element name="Matrikelnummer" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>

-  <!-- ###  additional telecom elements - not used internally - german translation not available ###-->

-  <xs:element name="Telephone" type="TelcomNumberType"/>

-  <xs:element name="Mobile" type="MobileTelcomNumberType"/>

-  <xs:element name="Fax" type="TelcomNumberType"/>

-  <xs:element name="Pager" type="TelcomNumberType"/>

-  <xs:element name="TTYTDD" type="TelcomNumberType">

-    <xs:annotation>

-      <xs:documentation>teletyper or telephone for the hearing impaired</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <!--### elements of simple type ####-->

-  <xs:element name="MaritalStatus" type="MaritalStatusType">

-    <xs:annotation>

-      <xs:documentation>status of a person in the cycle of life, compare Familienstand</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="Sex" type="SexType">

-    <xs:annotation>

-      <xs:documentation>gender, comapre Geschlecht</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="DateOfBirth" type="DateOfBirthType">

-    <xs:annotation>

-      <xs:documentation>date of birth, compare Geburtsdatum</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="DateOfDeath" type="DateOfDeathType">

-    <xs:annotation>

-      <xs:documentation>date of death, compare Sterbedatum</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="PlaceOfBirth" type="xs:token">

-    <xs:annotation>

-      <xs:documentation>place of birth, compare Geburtsort</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="CountryOfBirth" type="xs:token">

-    <xs:annotation>

-      <xs:documentation>country of birth, compare Geburtsland</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="StateOfBirth" type="xs:token">

-    <xs:annotation>

-      <xs:documentation>state of birth, comapre Geburtsbundesland</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="Nationality" type="NationalityType">

-    <xs:annotation>

-      <xs:documentation>nationality of Person, compare Staatsangehoerigkeit. attention! New Fomrat is complex, string value accepted for compatibility only</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="Confession" type="xs:token">

-    <xs:annotation>

-      <xs:documentation>confession (religion) of Person - xs:token? gibt es wirklich keine Staaten mit Leerzeichen im Namen?</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="Occupation" type="xs:string">

-    <xs:annotation>

-      <xs:documentation>occupation, compare Beruf</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <!--### complex telephone types ###-->

-  <xs:element name="InternationalCountryCode" type="xs:string">

-    <xs:annotation>

-      <xs:documentation>compare InternationalerLaendercode</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="NationalNumber" type="xs:string">

-    <xs:annotation>

-      <xs:documentation>compare NationalNummer</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="AreaCityCode" type="xs:string">

-    <xs:annotation>

-      <xs:documentation>compare Vorwahl</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="SubscriberNumber" type="xs:string">

-    <xs:annotation>

-      <xs:documentation>compare Anschlussnummer</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="FormattedNumber" type="xs:string">

-    <xs:annotation>

-      <xs:documentation>Complete number, ready formated - e.g. +43 1 5131345 4664  compare FormatierteNummer</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="Extension" type="xs:string">

-    <xs:annotation>

-      <xs:documentation>compare Klappe</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name="Identification" type ="IdentificationType">

-    <xs:annotation>

-      <xs:documentation>unique identifier</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <!--### complex types ###-->

-  <xs:complexType name="PersonDataType">

-    <xs:annotation>

-      <xs:documentation>signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractPersonType">

-        <xs:sequence>

-          <xs:element ref="Person"/>

-          <xs:element ref="Address" minOccurs="0" maxOccurs="unbounded"/>

-          <xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>one or more electronic signatures applied on fields above</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="AdditionalData" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>container for your Information needs. Contained Elements must reside in a different Namespace</xs:documentation>

-            </xs:annotation>

-            <xs:complexType mixed="true">

-              <xs:sequence minOccurs="0" maxOccurs="unbounded">

-                <xs:any namespace="##any" processContents="lax">

-                  <xs:annotation>

-                    <xs:documentation>any additional properties</xs:documentation>

-                  </xs:annotation>

-                </xs:any>

-              </xs:sequence>

-            </xs:complexType>

-          </xs:element>

-        </xs:sequence>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="CompactPersonDataType">

-    <xs:annotation>

-      <xs:documentation>signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractPersonType">

-        <xs:sequence>

-          <xs:element ref="Person"/>

-          <xs:element ref="Address" minOccurs="0" maxOccurs="unbounded"/>

-          <xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>one or more electronic signatures applied on fields above</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="AdditionalData" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>container for your Information needs. Contained Elements must reside in a different Namespace</xs:documentation>

-            </xs:annotation>

-            <xs:complexType mixed="true">

-              <xs:sequence minOccurs="0" maxOccurs="unbounded">

-                <xs:any namespace="##any" processContents="lax">

-                  <xs:annotation>

-                    <xs:documentation>any additional properties</xs:documentation>

-                  </xs:annotation>

-                </xs:any>

-              </xs:sequence>

-            </xs:complexType>

-          </xs:element>

-        </xs:sequence>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="AbstractSimpleIdentificationType">

-    <xs:simpleContent>

-      <xs:extension base="xs:string"/>

-    </xs:simpleContent>

-  </xs:complexType>

-  <xs:complexType name="IdentificationType">

-    <xs:annotation>

-      <xs:documentation>unique identifier</xs:documentation>

-    </xs:annotation>

-    <xs:sequence>

-      <xs:element name="Value">

-        <xs:annotation>

-          <xs:documentation>actual value of the identifier.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-          <xs:simpleContent>

-            <xs:extension base="xs:string">

-              <xs:attribute name="Id" type="xs:ID" use="optional"/>

-            </xs:extension>

-          </xs:simpleContent>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="Type" type="xs:anyURI">

-        <xs:annotation>

-          <xs:documentation>type of value (eg 'ZMR', 'SV-Nummer', 'Martrikelnummer', database identification, ...)</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-      <xs:element name="Authority" type="xs:anyURI" minOccurs="0">

-        <xs:annotation>

-          <xs:documentation>authority, which is reponsible for generation of the identifier (eg university in case of 'MatrikelNummer')</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>any additional properties</xs:documentation>

-        </xs:annotation>

-      </xs:any>

-    </xs:sequence>

-    <xs:attribute name="Id" type="xs:ID" use="optional"/>

-    <xs:anyAttribute namespace="##other"/>

-  </xs:complexType>  

-  <xs:complexType name="AbstractPersonType">

-    <xs:annotation>

-      <xs:documentation>main structure of person data</xs:documentation>

-    </xs:annotation>

-    <xs:choice minOccurs="0">

-      <xs:element ref="Identification" minOccurs="0" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>unique identification entities</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-      <xs:element ref="AbstractSimpleIdentification" minOccurs="0" maxOccurs="unbounded"/>

-    </xs:choice>

-    <xs:attribute name="Id" type="xs:ID" use="optional"/>

-    <xs:anyAttribute namespace="##other"/>

-  </xs:complexType>

-  <xs:complexType name="PhysicalPersonType">

-    <xs:annotation>

-      <xs:documentation>physical person, compare NatuerlichePersonTyp</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractPersonType">

-        <xs:sequence minOccurs="0">

-          <xs:element ref="Name" minOccurs="0"/>

-          <xs:element ref="AlternativeName" minOccurs="0" maxOccurs="unbounded"/>

-          <xs:element ref="MaritalStatus" minOccurs="0"/>

-          <xs:element ref="Sex" minOccurs="0"/>

-          <xs:element ref="DateOfBirth" minOccurs="0"/>

-          <xs:element ref="PlaceOfBirth" minOccurs="0"/>

-          <xs:element ref="StateOfBirth" minOccurs="0"/>

-          <xs:element ref="CountryOfBirth" minOccurs="0"/>

-          <xs:element ref="DateOfDeath" minOccurs="0"/>

-          <xs:element ref="Nationality" minOccurs="0" maxOccurs="unbounded"/>

-          <xs:element ref="Confession" minOccurs="0"/>

-          <xs:element ref="Occupation" minOccurs="0"/>

-          <xs:element ref="relatedPerson" minOccurs="0" maxOccurs="unbounded"/>

-          <xs:element ref="BankConnection" minOccurs="0" maxOccurs="unbounded"/>

-          <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>any additional properties</xs:documentation>

-            </xs:annotation>

-          </xs:any>

-        </xs:sequence>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="CompactPhysicalPersonType">

-    <xs:annotation>

-      <xs:documentation>physical person, compare NatuerlichePersonTyp</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractPersonType">

-        <xs:sequence minOccurs="0">

-          <xs:element ref="CompactName"/>

-          <xs:element ref="MaritalStatus" minOccurs="0"/>

-          <xs:element ref="Sex" minOccurs="0"/>

-          <xs:element ref="DateOfBirth" minOccurs="0"/>

-          <xs:element ref="PlaceOfBirth" minOccurs="0"/>

-          <xs:element ref="Nationality" minOccurs="0" maxOccurs="unbounded"/>

-          <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>any additional properties</xs:documentation>

-            </xs:annotation>

-          </xs:any>

-        </xs:sequence>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="CorporateBodyType">

-    <xs:annotation>

-      <xs:documentation>juridical person, organisation, compare NichtNatuerlichePersonTyp</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractPersonType">

-        <xs:sequence minOccurs="0">

-          <xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>URI pointing to a predefined Class of CorporateBodies, compare Typ</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="FullName" type="xs:token" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>name of corporate body (whole name), compare VollerName</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="AlternativeName" type="xs:token" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>alternative names of corporate body (abbreviations, short name, synonyms, ...), comapre AlternativName</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="LegalForm" type="xs:anyURI" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>type of company (eg AG, OHG, ...), URI pointing to predefined LegalForm, compare Rechtsform</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="Organization" type="xs:token" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>part of an organisation, see also X.500 ou (eg departement, section, branch, ...) , compare Organisation</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element ref="BankConnection" minOccurs="0" maxOccurs="unbounded"/>

-          <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>any additional properties</xs:documentation>

-            </xs:annotation>

-          </xs:any>

-        </xs:sequence>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="CompactCorporateBodyType">

-    <xs:annotation>

-      <xs:documentation>juridical person, organisation, compare NichtNatuerlichePersonTyp</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractPersonType">

-        <xs:sequence minOccurs="0">

-          <xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>URI pointing to a predefined Class of CorporateBodies, compare Typ</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="FullName" type="xs:token">

-            <xs:annotation>

-              <xs:documentation>name of corporate body (whole name), compare VollerName</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="LegalForm" type="xs:anyURI" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>type of company (eg AG, OHG, ...), URI pointing to predefined LegalForm, compare Rechtsform</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="Organization" type="xs:token" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>part of an organisation, see also X.500 ou (eg departement, section, branch, ...) , compare Organisation</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>any additional properties</xs:documentation>

-            </xs:annotation>

-          </xs:any>

-        </xs:sequence>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="PersonNameType">

-    <xs:annotation>

-      <xs:documentation>container for parts of a name, comapre PersonenNameTyp</xs:documentation>

-    </xs:annotation>

-    <xs:sequence>

-      <xs:element name="FormattedName" minOccurs="0" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>Complete Name (including Affixes) of the Person, especially useful for names from different cultural environments</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-          <xs:simpleContent>

-            <xs:extension base="xs:string">

-              <xs:attribute name="type" default="presentation">

-                <xs:simpleType>

-                  <xs:restriction base="xs:string">

-                    <xs:enumeration value="presentation"/>

-                    <xs:enumeration value="legal"/>

-                    <xs:enumeration value="sortOrder"/>

-                  </xs:restriction>

-                </xs:simpleType>

-              </xs:attribute>

-            </xs:extension>

-          </xs:simpleContent>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="LegalName" type="xs:string" minOccurs="0"/>

-      <xs:element name="GivenName" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>Every given name should be  contained inside a GivenName Tag. If that is not possible due to dabase contraints, ... putting several given names inside one GivenName Element is acceptable</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-      <xs:element name="PreferredGivenName" type="xs:string" minOccurs="0">

-        <xs:annotation>

-          <xs:documentation>A Person in possesion of more than one GivenName frequently preferrs the use of a Name other than the first GivenName</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-      <xs:element name="MiddleName" type="xs:string" minOccurs="0">

-        <xs:annotation>

-          <xs:documentation>MiddleNames are not commonly found in central Europe. The field is mainly for compatibility reasons</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-      <xs:element name="FamilyName" minOccurs="0" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>Every family name should be  contained inside a FamilyName Tag. If that is not possible due to dabase contraints, ... putting several family names inside one FamilyName Element is acceptable</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-          <xs:simpleContent>

-            <xs:extension base="xs:string">

-              <xs:attribute name="primary" default="undefined">

-                <xs:simpleType>

-                  <xs:restriction base="xs:string">

-                    <xs:enumeration value="true"/>

-                    <xs:enumeration value="false"/>

-                    <xs:enumeration value="undefined"/>

-                  </xs:restriction>

-                </xs:simpleType>

-              </xs:attribute>

-              <xs:attribute name="prefix" type="xs:string"/>

-            </xs:extension>

-          </xs:simpleContent>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="Affix" minOccurs="0" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>Inlcudes all Information that is not exactly a name: academic or aristocratic titles, ... the new position attribute can contain a suffx or prefix value</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-          <xs:simpleContent>

-            <xs:extension base="xs:string">

-              <xs:attribute name="type" use="optional">

-                <xs:simpleType>

-                  <xs:restriction base="xs:string">

-                    <xs:enumeration value="academicGrade"/>

-                    <xs:enumeration value="aristocraticPrefix"/>

-                    <xs:enumeration value="aristocraticTitle"/>

-                    <xs:enumeration value="familyNamePrefix"/>

-                    <xs:enumeration value="familyNameSuffix"/>

-                    <xs:enumeration value="formOfAddress"/>

-                    <xs:enumeration value="generation"/>

-                    <xs:enumeration value="qualification"/>

-                  </xs:restriction>

-                </xs:simpleType>

-              </xs:attribute>

-              <xs:attribute name="position" use="optional">

-                <xs:simpleType>

-                  <xs:restriction base="xs:string">

-                    <xs:enumeration value="prefix"/>

-                    <xs:enumeration value="suffix"/>

-                  </xs:restriction>

-                </xs:simpleType>

-              </xs:attribute>

-            </xs:extension>

-          </xs:simpleContent>

-        </xs:complexType>

-      </xs:element>

-    </xs:sequence>

-  </xs:complexType>

-  <xs:complexType name="CompactPersonNameType">

-    <xs:annotation>

-      <xs:documentation>container for parts of a name, comapre PersonenNameTyp</xs:documentation>

-    </xs:annotation>

-    <xs:sequence>

-      <xs:element name="GivenName" type="xs:string" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>Every given name should be  contained inside a GivenName Tag. If that is not possible due to dabase contraints, ... putting several given names inside one GivenName Element is acceptable</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-      <xs:element name="FamilyName" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>Every family name should be  contained inside a FamilyName Tag. If that is not possible due to dabase contraints, ... putting several family names inside one FamilyName Element is acceptable</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-          <xs:simpleContent>

-            <xs:extension base="xs:string">

-              <xs:attribute name="primary" default="undefined">

-                <xs:simpleType>

-                  <xs:restriction base="xs:string">

-                    <xs:enumeration value="true"/>

-                    <xs:enumeration value="false"/>

-                    <xs:enumeration value="undefined"/>

-                  </xs:restriction>

-                </xs:simpleType>

-              </xs:attribute>

-              <xs:attribute name="prefix" type="xs:string"/>

-            </xs:extension>

-          </xs:simpleContent>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="Affix" minOccurs="0" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>Inlcudes all Information that is not exactly a name: academic or aristocratic titles, ... the new position attribute can contain a suffx or prefix value</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-          <xs:simpleContent>

-            <xs:extension base="xs:string">

-              <xs:attribute name="type" use="optional">

-                <xs:simpleType>

-                  <xs:restriction base="xs:string">

-                    <xs:enumeration value="academicGrade"/>

-                    <xs:enumeration value="aristocraticPrefix"/>

-                    <xs:enumeration value="aristocraticTitle"/>

-                    <xs:enumeration value="familyNamePrefix"/>

-                    <xs:enumeration value="familyNameSuffix"/>

-                    <xs:enumeration value="formOfAddress"/>

-                    <xs:enumeration value="generation"/>

-                    <xs:enumeration value="qualification"/>

-                  </xs:restriction>

-                </xs:simpleType>

-              </xs:attribute>

-              <xs:attribute name="position" use="optional">

-                <xs:simpleType>

-                  <xs:restriction base="xs:string">

-                    <xs:enumeration value="prefix"/>

-                    <xs:enumeration value="suffix"/>

-                  </xs:restriction>

-                </xs:simpleType>

-              </xs:attribute>

-            </xs:extension>

-          </xs:simpleContent>

-        </xs:complexType>

-      </xs:element>

-    </xs:sequence>

-  </xs:complexType>

-  <xs:complexType name="NationalityType" mixed="true">

-    <xs:annotation>

-      <xs:documentation>comapre, StaatsangehoerigkeitTyp</xs:documentation>

-    </xs:annotation>

-    <xs:sequence>

-      <xs:element name="ISOCode3" minOccurs="0">

-        <xs:simpleType>

-          <xs:restriction base="xs:string">

-            <xs:length value="3"/>

-          </xs:restriction>

-        </xs:simpleType>

-      </xs:element>

-      <xs:element name="CountryNameDE" type="xs:string" minOccurs="0"/>

-      <xs:element name="CountryNameEN" type="xs:string" minOccurs="0"/>

-      <xs:element name="CountryNameFR" type="xs:string" minOccurs="0"/>

-      <xs:any namespace="##other" processContents="lax"/>

-    </xs:sequence>

-  </xs:complexType>

-  <xs:complexType name="BankConnectionType">

-    <xs:annotation>

-      <xs:documentation>compare BankverbindungTyp</xs:documentation>

-    </xs:annotation>

-    <xs:sequence>

-      <xs:element name="Holder" type="xs:string">

-        <xs:annotation>

-          <xs:documentation>Account holder, compare Inhaber</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-      <xs:element name="BankName" type="xs:string">

-        <xs:annotation>

-          <xs:documentation>compare BankName</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-      <xs:choice>

-        <xs:element name="NationalBankConnection">

-          <xs:annotation>

-            <xs:documentation>compare NationaleBankverbindung</xs:documentation>

-          </xs:annotation>

-          <xs:complexType>

-            <xs:sequence>

-              <xs:element name="AccountNumber" type="xs:integer">

-                <xs:annotation>

-                  <xs:documentation>compare Kontonummer</xs:documentation>

-                </xs:annotation>

-              </xs:element>

-              <xs:element name="BankCode" type="xs:integer">

-                <xs:annotation>

-                  <xs:documentation>compare BLZ</xs:documentation>

-                </xs:annotation>

-              </xs:element>

-            </xs:sequence>

-          </xs:complexType>

-        </xs:element>

-        <xs:element name="InternationalBankConnection">

-          <xs:annotation>

-            <xs:documentation>compare InternationaleBankverbindung</xs:documentation>

-          </xs:annotation>

-          <xs:complexType>

-            <xs:sequence>

-              <xs:element name="IBAN" type="xs:string">

-                <xs:annotation>

-                  <xs:documentation>compare IBAN</xs:documentation>

-                </xs:annotation>

-              </xs:element>

-              <xs:element name="BIC" type="xs:string">

-                <xs:annotation>

-                  <xs:documentation>comapre BIC</xs:documentation>

-                </xs:annotation>

-              </xs:element>

-            </xs:sequence>

-          </xs:complexType>

-        </xs:element>

-      </xs:choice>

-    </xs:sequence>

-  </xs:complexType>

-  <xs:complexType name="AbstractAddressType">

-    <xs:annotation>

-      <xs:documentation>main structure of address data</xs:documentation>

-    </xs:annotation>

-    <xs:sequence minOccurs="0">

-      <xs:element ref="Identification" minOccurs="0" maxOccurs="unbounded">

-        <xs:annotation>

-          <xs:documentation>unique identification entities</xs:documentation>

-        </xs:annotation>

-      </xs:element>

-    </xs:sequence>

-    <xs:attribute name="Id" type="xs:ID" use="optional"/>

-    <xs:anyAttribute namespace="##other"/>

-  </xs:complexType>

-  <xs:complexType name="TypedPostalAddressType">

-    <xs:annotation>

-      <xs:documentation>postal address with type information, compare TypisiertePostAdresseTyp</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractAddressType">

-        <xs:sequence minOccurs="0">

-          <xs:element name="Type" type="xs:anyURI" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>type of address - category (eg 'Wohnsitz', 'Zentrale', ...)</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element ref="PostalAddress"/>

-          <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>any additional properties</xs:documentation>

-            </xs:annotation>

-          </xs:any>

-        </xs:sequence>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="PostalAddressType">

-    <xs:annotation>

-      <xs:documentation>compare PostAdresseTyp</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractAddressType">

-        <xs:sequence>

-          <xs:element name="CountryCode" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>Code for the country, use ISO or internatinal Postalstandard, compare Staatscode</xs:documentation>

-            </xs:annotation>

-            <xs:simpleType>

-              <xs:restriction base="xs:string">

-                <xs:pattern value="[A-Z]{2}"/>

-              </xs:restriction>

-            </xs:simpleType>

-          </xs:element>

-          <xs:element name="CountryName" type="xs:string" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>Name of the country, use ISO Name, or international Postal Standard, compare Staatsname</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="PostalCode" type="xs:string" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>ZIP, compare Postleitzahl</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="Region" type="xs:string" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>compare Region</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="State" type="xs:string" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>compare Bundesland</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="Municipality" type="xs:string" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>compare Gemeinde</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="MunicipalityNumber" type="xs:string" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>compare Gemeindekennzahl</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="Hamlet" type="xs:string" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>ZMR use, compare Ortschaft</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="HamletBilingual" type="xs:string" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>ZMR use, comapre OrtschaftZweisprachig</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="DeliveryAddress" minOccurs="0">

-            <xs:complexType>

-              <xs:sequence>

-                <xs:element name="AddressLine" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>

-                <xs:element name="StreetName" type="xs:string" minOccurs="0"/>

-                <xs:element name="BuildingNumber" type="xs:string" minOccurs="0"/>

-                <xs:element name="Unit" type="xs:string" minOccurs="0"/>

-                <xs:element name="DoorNumber" type="xs:string" minOccurs="0"/>

-                <xs:element name="PostOfficeBox" type="xs:string" minOccurs="0"/>

-                <xs:element name="LivingQuality" type="xs:string" minOccurs="0">

-                  <xs:annotation>

-                    <xs:documentation>zmr use only</xs:documentation>

-                  </xs:annotation>

-                </xs:element>

-                <xs:element name="DropOffPoint" type="xs:boolean" minOccurs="0">

-                  <xs:annotation>

-                    <xs:documentation>zmr use only</xs:documentation>

-                  </xs:annotation>

-                </xs:element>

-                <xs:element name="AreaNumber" type="xs:string" minOccurs="0"/>

-                <xs:element name="AddressRegisterEntry" minOccurs="0">

-                  <xs:annotation>

-                    <xs:documentation>Addressregister database keys used to identify Addresses</xs:documentation>

-                  </xs:annotation>

-                  <xs:complexType>

-                    <xs:sequence>

-                      <xs:element name="AddressCode" type="string7"/>

-                      <xs:element name="SubCode" type="string3" minOccurs="0"/>

-                      <xs:element name="ObjectNumber" type="string7" minOccurs="0"/>

-                    </xs:sequence>

-                  </xs:complexType>

-                </xs:element>

-              </xs:sequence>

-            </xs:complexType>

-          </xs:element>

-          <xs:element name="Recipient" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>If Addressis used outside of PersonData a recipient can be specified</xs:documentation>

-            </xs:annotation>

-            <xs:complexType>

-              <xs:sequence>

-                <xs:element name="PersonName" type="PersonNameType" minOccurs="0"/>

-                <xs:element name="AdditionalText" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>

-                <xs:element name="Organization" type="xs:string" minOccurs="0">

-                  <xs:annotation>

-                    <xs:documentation>rather OrganizationUnit e.G Sales Departement</xs:documentation>

-                  </xs:annotation>

-                </xs:element>

-                <xs:element name="OrganizationName" type="xs:string" minOccurs="0">

-                  <xs:annotation>

-                    <xs:documentation>e.g. Smith Ltd</xs:documentation>

-                  </xs:annotation>

-                </xs:element>

-              </xs:sequence>

-            </xs:complexType>

-          </xs:element>

-        </xs:sequence>

-        <xs:attribute name="type" default="undefined">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="postOfficeBoxAddress"/>

-              <xs:enumeration value="streetAddress"/>

-              <xs:enumeration value="militaryAddress"/>

-              <xs:enumeration value="undefined"/>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="CompactPostalAddressType">

-    <xs:annotation>

-      <xs:documentation>compare PostAdresseTyp</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractAddressType">

-        <xs:sequence>

-          <xs:element name="CountryCode" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>Code for the country, use ISO or internatinal Postalstandard, compare Staatscode</xs:documentation>

-            </xs:annotation>

-            <xs:simpleType>

-              <xs:restriction base="xs:string">

-                <xs:pattern value="[A-Z]{2}"/>

-              </xs:restriction>

-            </xs:simpleType>

-          </xs:element>

-          <xs:element name="CountryName" type="xs:string" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>Name of the country, use ISO Name, or international Postal Standard, compare Staatsname</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="PostalCode" type="xs:string">

-            <xs:annotation>

-              <xs:documentation>ZIP, compare Postleitzahl</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="Municipality" type="xs:string">

-            <xs:annotation>

-              <xs:documentation>compare Gemeinde</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="DeliveryAddress">

-            <xs:complexType>

-              <xs:sequence>

-                <xs:element name="StreetName" type="xs:string">

-                  <xs:annotation>

-                    <xs:documentation>if streetname not available use name of Ortschaft</xs:documentation>

-                  </xs:annotation>

-                </xs:element>

-                <xs:element name="BuildingNumber" type="xs:string"/>

-                <xs:element name="Unit" type="xs:string" minOccurs="0"/>

-                <xs:element name="DoorNumber" type="xs:string" minOccurs="0"/>

-              </xs:sequence>

-            </xs:complexType>

-          </xs:element>

-        </xs:sequence>

-        <xs:attribute name="type" default="undefined">

-          <xs:simpleType>

-            <xs:restriction base="xs:string">

-              <xs:enumeration value="postOfficeBoxAddress"/>

-              <xs:enumeration value="streetAddress"/>

-              <xs:enumeration value="militaryAddress"/>

-              <xs:enumeration value="undefined"/>

-            </xs:restriction>

-          </xs:simpleType>

-        </xs:attribute>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="InternetAddressType">

-    <xs:annotation>

-      <xs:documentation>e.g. e-mail, webiste, compare InternetAdresseTyp</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractAddressType">

-        <xs:sequence minOccurs="0">

-          <xs:element ref="dsig:KeyInfo" minOccurs="0">

-            <xs:annotation>

-              <xs:documentation>certificate for secure communication</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="Address" type="xs:anyURI">

-            <xs:annotation>

-              <xs:documentation>URI: email-Address, Web, FTP, LDAP, ..., comapre Adress</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>any additional properties</xs:documentation>

-            </xs:annotation>

-          </xs:any>

-        </xs:sequence>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="TelephoneAddressType">

-    <xs:annotation>

-      <xs:documentation>phone numbers, conmpare TelephoneAdresseTyp</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="AbstractAddressType">

-        <xs:sequence minOccurs="0">

-          <xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>type of phononumber - category (eg 'Festnetz', 'Mobile', 'fax', ...)</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:element name="Number" type="TelcomNumberType">

-            <xs:annotation>

-              <xs:documentation>phonenumber</xs:documentation>

-            </xs:annotation>

-          </xs:element>

-          <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

-            <xs:annotation>

-              <xs:documentation>any additional properties</xs:documentation>

-            </xs:annotation>

-          </xs:any>

-        </xs:sequence>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="MobileTelcomNumberType">

-    <xs:annotation>

-      <xs:documentation>like TelephoneAddresseType but with additional smsEnabled attribute</xs:documentation>

-    </xs:annotation>

-    <xs:complexContent>

-      <xs:extension base="TelcomNumberType">

-        <xs:attribute name="smsEnabled" type="xs:boolean" use="optional"/>

-      </xs:extension>

-    </xs:complexContent>

-  </xs:complexType>

-  <xs:complexType name="TelcomNumberType">

-    <xs:annotation>

-      <xs:documentation>formated number or set of telephone number parts</xs:documentation>

-    </xs:annotation>

-    <xs:choice>

-      <xs:element ref="FormattedNumber"/>

-      <xs:group ref="TelcomNumberGroup"/>

-    </xs:choice>

-  </xs:complexType>

-  <xs:group name="TelcomNumberGroup">

-    <xs:annotation>

-      <xs:documentation>set of telephone number parts</xs:documentation>

-    </xs:annotation>

-    <xs:sequence>

-      <xs:element ref="InternationalCountryCode" minOccurs="0"/>

-      <xs:element ref="NationalNumber" minOccurs="0"/>

-      <xs:element ref="AreaCityCode" minOccurs="0"/>

-      <xs:element ref="SubscriberNumber"/>

-      <xs:element ref="Extension" minOccurs="0"/>

-    </xs:sequence>

-  </xs:group>

-  <!-- ### auxiliary types ### -->

-  <xs:simpleType name="SexType">

-    <xs:annotation>

-      <xs:documentation>simple type for sex (gender) of person</xs:documentation>

-    </xs:annotation>

-    <xs:restriction base="xs:token">

-      <xs:enumeration value="male"/>

-      <xs:enumeration value="female"/>

-      <xs:enumeration value="unknown"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="DateOfBirthType">

-    <xs:annotation>

-      <xs:documentation>simple type for dates (union), which may omit day and/or month</xs:documentation>

-    </xs:annotation>

-    <xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>

-  </xs:simpleType>

-  <xs:simpleType name="DateOfDeathType">

-    <xs:annotation>

-      <xs:documentation>simple type for dates (union), which may omit day and/or month</xs:documentation>

-    </xs:annotation>

-    <xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>

-  </xs:simpleType>

-  <xs:simpleType name="MaritalStatusType">

-    <xs:annotation>

-      <xs:documentation>simple type for marital status of a person</xs:documentation>

-    </xs:annotation>

-    <xs:restriction base="xs:token">

-      <xs:enumeration value="single"/>

-      <xs:enumeration value="married"/>

-      <xs:enumeration value="divorced"/>

-      <xs:enumeration value="widowed"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="xStringPatternExtensionType">

-    <xs:annotation>

-      <xs:documentation>pattern type for enlargement of type definitions. Contents as follows 

-x:sometext or 12345 or _ or  other symbols

-</xs:documentation>

-    </xs:annotation>

-    <xs:restriction base="xs:string">

-      <xs:pattern value="x:\S.*"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="DefinedRelationType">

-    <xs:annotation>

-      <xs:documentation>known relations (family + functional)</xs:documentation>

-    </xs:annotation>

-    <xs:restriction base="xs:string">

-      <xs:enumeration value="family:Parent"/>

-      <xs:enumeration value="family:Child"/>

-      <xs:enumeration value="family:Sibling"/>

-      <xs:enumeration value="family:Grandparent"/>

-      <xs:enumeration value="family:Grandchild"/>

-      <xs:enumeration value="family:Spouse"/>

-      <xs:enumeration value="function:LegalGuardian"/>

-      <xs:enumeration value="function:IsGuardedBy"/>

-      <xs:enumeration value="function:Cohabitant"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="RelationType">

-    <xs:annotation>

-      <xs:documentation>known + any other relation</xs:documentation>

-    </xs:annotation>

-    <xs:union memberTypes="xStringPatternExtensionType DefinedRelationType"/>

-  </xs:simpleType>

-  <xs:simpleType name="DefinedAlternativeNameTypeType">

-    <xs:annotation>

-      <xs:documentation>known types of alternative names</xs:documentation>

-    </xs:annotation>

-    <xs:restriction base="xs:string">

-      <xs:enumeration value="ArtistName"/>

-      <xs:enumeration value="NickName"/>

-      <xs:enumeration value="FormerName"/>

-      <xs:enumeration value="Alias"/>

-      <xs:enumeration value="MaidenName"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="AlternativeNameTypeType">

-    <xs:annotation>

-      <xs:documentation>known + any other alternative name types</xs:documentation>

-    </xs:annotation>

-    <xs:union memberTypes="xStringPatternExtensionType DefinedAlternativeNameTypeType"/>

-  </xs:simpleType>

-  <!-- ### additional data types for ZMR address #### -->

-  <xs:simpleType name="FederalStateType">

-    <xs:annotation>

-      <xs:documentation>zmr use only</xs:documentation>

-    </xs:annotation>

-    <xs:restriction base="xs:string">

-      <xs:enumeration value="Wien"/>

-      <xs:enumeration value="Niederösterreich"/>

-      <xs:enumeration value="Burgenland"/>

-      <xs:enumeration value="Oberösterreich"/>

-      <xs:enumeration value="Steiermark"/>

-      <xs:enumeration value="Salzburg"/>

-      <xs:enumeration value="Kärnten"/>

-      <xs:enumeration value="Tirol"/>

-      <xs:enumeration value="Vorarlberg"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <!-- ### strings of defined maximum lenght for use with ZMR address ###-->

-  <xs:simpleType name="string3">

-    <xs:restriction base="xs:string">

-      <xs:maxLength value="3"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="string4">

-    <xs:restriction base="xs:string">

-      <xs:maxLength value="4"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="string7">

-    <xs:restriction base="xs:string">

-      <xs:maxLength value="7"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="string20">

-    <xs:restriction base="xs:string">

-      <xs:maxLength value="20"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="string30">

-    <xs:restriction base="xs:string">

-      <xs:maxLength value="30"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="string50">

-    <xs:restriction base="xs:string">

-      <xs:maxLength value="50"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="string100">

-    <xs:restriction base="xs:string">

-      <xs:maxLength value="100"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name="integer5">

-    <xs:restriction base="xs:integer">

-      <xs:minInclusive value="10000"/>

-      <xs:maxInclusive value="99999"/>

-    </xs:restriction>

-  </xs:simpleType>

-</xs:schema>

diff --git a/common/res/resources/schemas/PersonName-1_2.xsd b/common/res/resources/schemas/PersonName-1_2.xsd
deleted file mode 100644
index 347ed3d7f..000000000
--- a/common/res/resources/schemas/PersonName-1_2.xsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- CHANGES from original HR-XML schema for use with PersonData.xsd:

-	* elementFormDefault set to "qualified" -->

-<!--

-"Copyright  The HR-XML Consortium. All Rights Reserved. http://www.hr-xml.org"

-Name: PersonName-1_2.xsd, Second Edition

-Status: Recommendation

-Date this version: 2001-12-17

-Date last version: 2001-09-05

-Purpose: Defines the schema for PersonName

-Author(s): Paul Kiel, Kim Bartkus, CPO Workgroup

-

-Note: This Second Edition corrects an inconsistency between the schema in this xsd file and the schema in the pdf documentation.  The documentation is correct.  This schema was changed in syntax only, not functionality.  When adding attributes to elements, "xsd:restriction" was used.  This Second Edition correctly changes it to "xsd:extension".

-

-This HR-XML Consortium Work (including specifications, documents,

-software, and related items) is provided by the copyright holders

-under the following license. By obtaining, using and/or copying

-this work, you (the licensee) agree that you have read, understood,

-and will comply with the following terms and conditions.

-

-Permission to use, copy, modify, or redistribute this Work and

-its documentation, with or without modification, for any purpose

-and without fee or royalty is hereby granted, provided that you

-include the following on ALL copies of the software and

-documentation or portions thereof, including modifications,

-that you make:

-

-1. This notice: "Copyright  The HR-XML Consortium. All Rights

-   Reserved. http://www.hr-xml.org"

-2. Notice of any changes or modifications to the The HR-XML

-   Consortium files.

-

-THIS WORK, INCLUDING SPECIFICATIONS, DOCUMENTS, SOFTWARE, OR OTHER

-RELATED ITEMS, IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO

-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT

-NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY

-PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION

-WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS

-OR OTHER RIGHTS.

-

-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,

-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE

-SOFTWARE OR DOCUMENTATION.

-

-TITLE TO COPYRIGHT IN THIS WORK AND ANY ASSOCIATED DOCUMENTATION

-WILL AT ALL TIMES REMAIN WITH COPYRIGHT HOLDERS.

--->

-<xsd:schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">

-	<xsd:complexType name="PersonNameType">

-		<xsd:sequence>

-			<xsd:element name="FormattedName" minOccurs="0" maxOccurs="unbounded">

-				<xsd:complexType>

-					<xsd:simpleContent>

-						<xsd:extension base="xsd:string">

-							<xsd:attribute name="type" default="presentation">

-								<xsd:simpleType>

-									<xsd:restriction base="xsd:string">

-										<xsd:enumeration value="presentation"/>

-										<xsd:enumeration value="legal"/>

-										<xsd:enumeration value="sortOrder"/>

-									</xsd:restriction>

-								</xsd:simpleType>

-							</xsd:attribute>

-						</xsd:extension>

-					</xsd:simpleContent>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="LegalName" type="xsd:string" minOccurs="0"/>

-			<xsd:element name="GivenName" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>

-			<xsd:element name="PreferredGivenName" type="xsd:string" minOccurs="0"/>

-			<xsd:element name="MiddleName" type="xsd:string" minOccurs="0"/>

-			<xsd:element name="FamilyName" minOccurs="0" maxOccurs="unbounded">

-				<xsd:complexType>

-					<xsd:simpleContent>

-						<xsd:extension base="xsd:string">

-							<xsd:attribute name="primary" default="undefined">

-								<xsd:simpleType>

-									<xsd:restriction base="xsd:string">

-										<xsd:enumeration value="true"/>

-										<xsd:enumeration value="false"/>

-										<xsd:enumeration value="undefined"/>

-									</xsd:restriction>

-								</xsd:simpleType>

-							</xsd:attribute>

-							<xsd:attribute name="prefix" type="xsd:string"/>

-						</xsd:extension>

-					</xsd:simpleContent>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Affix" minOccurs="0" maxOccurs="unbounded">

-				<xsd:complexType>

-					<xsd:simpleContent>

-						<xsd:extension base="xsd:string">

-							<xsd:attribute name="type" use="required">

-								<xsd:simpleType>

-									<xsd:restriction base="xsd:string">

-										<xsd:enumeration value="academicGrade"/>

-										<xsd:enumeration value="aristocraticPrefix"/>

-										<xsd:enumeration value="aristocraticTitle"/>

-										<xsd:enumeration value="familyNamePrefix"/>

-										<xsd:enumeration value="familyNameSuffix"/>

-										<xsd:enumeration value="formOfAddress"/>

-										<xsd:enumeration value="generation"/>

-										<xsd:enumeration value="qualification"/>

-									</xsd:restriction>

-								</xsd:simpleType>

-							</xsd:attribute>

-						</xsd:extension>

-					</xsd:simpleContent>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:element name="PersonName" type="PersonNameType"/>

-</xsd:schema>

diff --git a/common/res/resources/schemas/PostalAddress-1_2.xsd b/common/res/resources/schemas/PostalAddress-1_2.xsd
deleted file mode 100644
index b3d89abbb..000000000
--- a/common/res/resources/schemas/PostalAddress-1_2.xsd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- CHANGES from original HR-XML schema for use with PersonData.xsd:

-	* elementFormDefault set to "qualified"

-	* CountryCode set to minOccurs="0" -->

-<!--

-"Copyright  The HR-XML Consortium. All Rights Reserved. http://www.hr-xml.org"

-Name: PostalAddress-1_2.xsd

-Status: Recommendation

-Date this version: 2001-08-20

-Date last version: 2001-07-20

-Purpose: Defines the schema for Postal Address

-Author(s): Paul Kiel, Kim Bartkus, CPO Workgroup

-

-This HR-XML Consortium Work (including specifications, documents,

-software, and related items) is provided by the copyright holders

-under the following license. By obtaining, using and/or copying

-this work, you (the licensee) agree that you have read, understood,

-and will comply with the following terms and conditions.

-

-Permission to use, copy, modify, or redistribute this Work and

-its documentation, with or without modification, for any purpose

-and without fee or royalty is hereby granted, provided that you

-include the following on ALL copies of the software and

-documentation or portions thereof, including modifications,

-that you make:

-

-1. This notice: "Copyright  The HR-XML Consortium. All Rights

-   Reserved. http://www.hr-xml.org"

-2. Notice of any changes or modifications to the The HR-XML

-   Consortium files.

-

-THIS WORK, INCLUDING SPECIFICATIONS, DOCUMENTS, SOFTWARE, OR OTHER

-RELATED ITEMS, IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO

-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT

-NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY

-PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION

-WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS

-OR OTHER RIGHTS.

-

-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,

-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE

-SOFTWARE OR DOCUMENTATION.

-

-TITLE TO COPYRIGHT IN THIS WORK AND ANY ASSOCIATED DOCUMENTATION

-WILL AT ALL TIMES REMAIN WITH COPYRIGHT HOLDERS.

--->

-<xsd:schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">

-	<xsd:include schemaLocation="PersonName-1_2.xsd"/>

-	<xsd:complexType name="PostalAddressType">

-		<xsd:sequence>

-			<xsd:element name="CountryCode" minOccurs="0">

-				<xsd:simpleType>

-					<xsd:restriction base="xsd:string">

-						<xsd:pattern value="[A-Z]{2}"/>

-					</xsd:restriction>

-				</xsd:simpleType>

-			</xsd:element>

-			<xsd:element name="PostalCode" type="xsd:string" minOccurs="0"/>

-			<xsd:element name="Region" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>

-			<xsd:element name="Municipality" type="xsd:string" minOccurs="0"/>

-			<xsd:element name="DeliveryAddress" minOccurs="0">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="AddressLine" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>

-						<xsd:element name="StreetName" type="xsd:string" minOccurs="0"/>

-						<xsd:element name="BuildingNumber" type="xsd:string" minOccurs="0"/>

-						<xsd:element name="Unit" type="xsd:string" minOccurs="0"/>

-						<xsd:element name="PostOfficeBox" type="xsd:string" minOccurs="0"/>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Recipient" minOccurs="0" maxOccurs="unbounded">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="PersonName" type="PersonNameType" minOccurs="0"/>

-						<xsd:element name="AdditionalText" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>

-						<xsd:element name="Organization" type="xsd:string" minOccurs="0"/>

-						<xsd:element name="OrganizationName" type="xsd:string" minOccurs="0"/>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:sequence>

-		<xsd:attribute name="type" default="undefined">

-			<xsd:simpleType>

-				<xsd:restriction base="xsd:string">

-					<xsd:enumeration value="postOfficeBoxAddress"/>

-					<xsd:enumeration value="streetAddress"/>

-					<xsd:enumeration value="militaryAddress"/>

-					<xsd:enumeration value="undefined"/>

-				</xsd:restriction>

-			</xsd:simpleType>

-		</xsd:attribute>

-	</xsd:complexType>

-	<xsd:element name="PostalAddress" type="PostalAddressType"/>

-</xsd:schema>

diff --git a/common/res/resources/schemas/TelcomNumber-1_0.xsd b/common/res/resources/schemas/TelcomNumber-1_0.xsd
deleted file mode 100644
index f89702aeb..000000000
--- a/common/res/resources/schemas/TelcomNumber-1_0.xsd
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- CHANGES from original HR-XML schema for use with PersonData.xsd:

-	* elementFormDefault set to "qualified" -->

-<!--

-"Copyright  The HR-XML Consortium. All Rights Reserved. http://www.hr-xml.org"

-Name: TelcomNumber-1_0.xsd

-Status:Recommendation

-Date this version: 2002-01-31

-Date last version: 2001-12-20

-Purpose: Schema for Telecommunications data.

-Author(s): Don Simonson, Robert Half Int'l., CPO Workgroup

-

-This HR-XML Consortium Work (including specifications, documents,

-software, and related items) is provided by the copyright holders

-under the following license. By obtaining, using and/or copying

-this work, you (the licensee) agree that you have read, understood,

-and will comply with the following terms and conditions.

-

-Permission to use, copy, modify, or redistribute this Work and

-its documentation, with or without modification, for any purpose

-and without fee or royalty is hereby granted, provided that you

-include the following on ALL copies of the software and

-documentation or portions thereof, including modifications,

-that you make:

-

-1. This notice: "Copyright  The HR-XML Consortium. All Rights

-   Reserved. http://www.hr-xml.org"

-2. Notice of any changes or modifications to the The HR-XML

-   Consortium files.

-

-THIS WORK, INCLUDING SPECIFICATIONS, DOCUMENTS, SOFTWARE, OR OTHER

-RELATED ITEMS, IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO

-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT

-NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY

-PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION

-WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS

-OR OTHER RIGHTS.

-

-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,

-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE

-SOFTWARE OR DOCUMENTATION.

-

-TITLE TO COPYRIGHT IN THIS WORK AND ANY ASSOCIATED DOCUMENTATION

-WILL AT ALL TIMES REMAIN WITH COPYRIGHT HOLDERS.

--->

-<xsd:schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">

-	<xsd:group name="TelcomNumberGroup">

-		<xsd:sequence>

-			<xsd:element ref="InternationalCountryCode" minOccurs="0"/>

-			<xsd:element ref="NationalNumber" minOccurs="0"/>

-			<xsd:element ref="AreaCityCode" minOccurs="0"/>

-			<xsd:element ref="SubscriberNumber"/>

-			<xsd:element ref="Extension" minOccurs="0"/>

-		</xsd:sequence>

-	</xsd:group>

-	<xsd:element name="FormattedNumber" type="xsd:string"/>

-	<xsd:element name="InternationalCountryCode" type="xsd:string"/>

-	<xsd:element name="NationalNumber" type="xsd:string"/>

-	<xsd:element name="AreaCityCode" type="xsd:string"/>

-	<xsd:element name="SubscriberNumber" type="xsd:string"/>

-	<xsd:complexType name="TelcomNumberType">

-		<xsd:choice>

-			<xsd:element ref="FormattedNumber"/>

-			<xsd:group ref="TelcomNumberGroup"/>

-		</xsd:choice>

-	</xsd:complexType>

-	<xsd:element name="Extension" type="xsd:string"/>

-	<xsd:element name="Telephone" type="TelcomNumberType"/>

-	<xsd:element name="Mobile" type="MobileTelcomNumberType"/>

-	<xsd:element name="Fax" type="TelcomNumberType"/>

-	<xsd:element name="Pager" type="TelcomNumberType"/>

-	<xsd:element name="TTYTDD" type="TelcomNumberType"/>

-	<xsd:complexType name="MobileTelcomNumberType">

-		<xsd:complexContent>

-			<xsd:extension base="TelcomNumberType">

-				<xsd:attribute name="smsEnabled" type="xsd:boolean" use="optional"/>

-			</xsd:extension>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<xsd:complexType name="TelcomNumberListType">

-		<xsd:sequence>

-			<xsd:element ref="Telephone" minOccurs="0"/>

-			<xsd:element ref="Mobile" minOccurs="0"/>

-			<xsd:element ref="Fax" minOccurs="0"/>

-			<xsd:element ref="Pager" minOccurs="0"/>

-			<xsd:element ref="TTYTDD" minOccurs="0"/>

-		</xsd:sequence>

-	</xsd:complexType>

-</xsd:schema>

diff --git a/common/res/resources/schemas/XMLSchema-instance.xsd b/common/res/resources/schemas/XMLSchema-instance.xsd
deleted file mode 100644
index f47577b8a..000000000
--- a/common/res/resources/schemas/XMLSchema-instance.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xs:schema SYSTEM "XMLSchema.dtd" [
-<!ELEMENT p ANY>
-<!ELEMENT a ANY>
-<!ATTLIST a href CDATA #IMPLIED>
-<!ELEMENT hr ANY>
-<!ELEMENT h1 ANY>
-<!ELEMENT br ANY>
-]>
-<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns="http://www.w3.org/1999/xhtml">
-  <xs:annotation>
-   <xs:documentation>
-    <h1>XML Schema instance namespace</h1>
-    <p>See <a href="http://www.w3.org/TR/xmlschema-1/">the XML Schema
-       Recommendation</a> for an introduction</p>
-
-
-    <hr />
-    $Date: 2001/03/16 20:25:57 $<br />
-    $Id: XMLSchema-instance.xsd,v 1.4 2001/03/16 20:25:57 ht Exp $
-  </xs:documentation>
- </xs:annotation>
- <xs:annotation>
-  <xs:documentation><p>This schema should never be used as such:
-                    <a href="http://www.w3.org/TR/xmlschema-1/#no-xsi">the XML
-                    Schema Recommendation</a> forbids the declaration of
-                    attributes in this namespace</p>
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="nil"/>
- <xs:attribute name="type"/>
- <xs:attribute name="schemaLocation"/>
- <xs:attribute name="noNamespaceSchemaLocation"/>
-</xs:schema>
diff --git a/common/res/resources/schemas/XMLSchema.dtd b/common/res/resources/schemas/XMLSchema.dtd
deleted file mode 100644
index e8e8f7625..000000000
--- a/common/res/resources/schemas/XMLSchema.dtd
+++ /dev/null
@@ -1,402 +0,0 @@
-<!-- DTD for XML Schemas: Part 1: Structures
-     Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
-     Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
-<!-- $Id: XMLSchema.dtd,v 1.31 2001/10/24 15:50:16 ht Exp $ -->
-<!-- Note this DTD is NOT normative, or even definitive. -->           <!--d-->
-<!-- prose copy in the structures REC is the definitive version -->    <!--d-->
-<!-- (which shouldn't differ from this one except for this -->         <!--d-->
-<!-- comment and entity expansions, but just in case) -->              <!--d-->
-<!-- With the exception of cases with multiple namespace
-     prefixes for the XML Schema namespace, any XML document which is
-     not valid per this DTD given redefinitions in its internal subset of the
-     'p' and 's' parameter entities below appropriate to its namespace
-     declaration of the XML Schema namespace is almost certainly not
-     a valid schema. -->
-
-<!-- The simpleType element and its constituent parts
-     are defined in XML Schema: Part 2: Datatypes -->
-<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
-
-<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
-                         schema document to establish a different
-                         namespace prefix -->
-<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
-                         also define %s as the suffix for the appropriate
-                         namespace declaration (e.g. :foo) -->
-<!ENTITY % nds 'xmlns%s;'>
-
-<!-- Define all the element names, with optional prefix -->
-<!ENTITY % schema "%p;schema">
-<!ENTITY % complexType "%p;complexType">
-<!ENTITY % complexContent "%p;complexContent">
-<!ENTITY % simpleContent "%p;simpleContent">
-<!ENTITY % extension "%p;extension">
-<!ENTITY % element "%p;element">
-<!ENTITY % unique "%p;unique">
-<!ENTITY % key "%p;key">
-<!ENTITY % keyref "%p;keyref">
-<!ENTITY % selector "%p;selector">
-<!ENTITY % field "%p;field">
-<!ENTITY % group "%p;group">
-<!ENTITY % all "%p;all">
-<!ENTITY % choice "%p;choice">
-<!ENTITY % sequence "%p;sequence">
-<!ENTITY % any "%p;any">
-<!ENTITY % anyAttribute "%p;anyAttribute">
-<!ENTITY % attribute "%p;attribute">
-<!ENTITY % attributeGroup "%p;attributeGroup">
-<!ENTITY % include "%p;include">
-<!ENTITY % import "%p;import">
-<!ENTITY % redefine "%p;redefine">
-<!ENTITY % notation "%p;notation">
-
-<!-- annotation elements -->
-<!ENTITY % annotation "%p;annotation">
-<!ENTITY % appinfo "%p;appinfo">
-<!ENTITY % documentation "%p;documentation">
-
-<!-- Customisation entities for the ATTLIST of each element type.
-     Define one of these if your schema takes advantage of the
-     anyAttribute='##other' in the schema for schemas -->
-
-<!ENTITY % schemaAttrs ''>
-<!ENTITY % complexTypeAttrs ''>
-<!ENTITY % complexContentAttrs ''>
-<!ENTITY % simpleContentAttrs ''>
-<!ENTITY % extensionAttrs ''>
-<!ENTITY % elementAttrs ''>
-<!ENTITY % groupAttrs ''>
-<!ENTITY % allAttrs ''>
-<!ENTITY % choiceAttrs ''>
-<!ENTITY % sequenceAttrs ''>
-<!ENTITY % anyAttrs ''>
-<!ENTITY % anyAttributeAttrs ''>
-<!ENTITY % attributeAttrs ''>
-<!ENTITY % attributeGroupAttrs ''>
-<!ENTITY % uniqueAttrs ''>
-<!ENTITY % keyAttrs ''>
-<!ENTITY % keyrefAttrs ''>
-<!ENTITY % selectorAttrs ''>
-<!ENTITY % fieldAttrs ''>
-<!ENTITY % includeAttrs ''>
-<!ENTITY % importAttrs ''>
-<!ENTITY % redefineAttrs ''>
-<!ENTITY % notationAttrs ''>
-<!ENTITY % annotationAttrs ''>
-<!ENTITY % appinfoAttrs ''>
-<!ENTITY % documentationAttrs ''>
-
-<!ENTITY % complexDerivationSet "CDATA">
-      <!-- #all or space-separated list drawn from derivationChoice -->
-<!ENTITY % blockSet "CDATA">
-      <!-- #all or space-separated list drawn from
-                      derivationChoice + 'substitution' -->
-
-<!ENTITY % mgs '%all; | %choice; | %sequence;'>
-<!ENTITY % cs '%choice; | %sequence;'>
-<!ENTITY % formValues '(qualified|unqualified)'>
-
-
-<!ENTITY % attrDecls    '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
-
-<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
-
-<!-- This is used in part2 -->
-<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
-
-%xs-datatypes;
-
-<!-- the duplication below is to produce an unambiguous content model
-     which allows annotation everywhere -->
-<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
-                    ((%simpleType; | %complexType;
-                      | %element; | %attribute;
-                      | %attributeGroup; | %group;
-                      | %notation; ),
-                     (%annotation;)*)* )>
-<!ATTLIST %schema;
-   targetNamespace      %URIref;               #IMPLIED
-   version              CDATA                  #IMPLIED
-   %nds;                %URIref;               #FIXED 'http://www.w3.org/2001/XMLSchema'
-   xmlns                CDATA                  #IMPLIED
-   finalDefault         %complexDerivationSet; ''
-   blockDefault         %blockSet;             ''
-   id                   ID                     #IMPLIED
-   elementFormDefault   %formValues;           'unqualified'
-   attributeFormDefault %formValues;           'unqualified'
-   xml:lang             CDATA                  #IMPLIED
-   %schemaAttrs;>
-<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
-     because at the Infoset level where schemas operate,
-     xmlns(:prefix) is NOT an attribute! -->
-<!-- The declaration of xmlns is a convenience for schema authors -->
- 
-<!-- The id attribute here and below is for use in external references
-     from non-schemas using simple fragment identifiers.
-     It is NOT used for schema-to-schema reference, internal or
-     external. -->
-
-<!-- a type is a named content type specification which allows attribute
-     declarations-->
-<!-- -->
-
-<!ELEMENT %complexType; ((%annotation;)?,
-                         (%simpleContent;|%complexContent;|
-                          %particleAndAttrs;))>
-
-<!ATTLIST %complexType;
-          name      %NCName;                        #IMPLIED
-          id        ID                              #IMPLIED
-          abstract  %boolean;                       #IMPLIED
-          final     %complexDerivationSet;          #IMPLIED
-          block     %complexDerivationSet;          #IMPLIED
-          mixed (true|false) 'false'
-          %complexTypeAttrs;>
-
-<!-- particleAndAttrs is shorthand for a root type -->
-<!-- mixed is disallowed if simpleContent, overriden if complexContent
-     has one too. -->
-
-<!-- If anyAttribute appears in one or more referenced attributeGroups
-     and/or explicitly, the intersection of the permissions is used -->
-
-<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %complexContent;
-          mixed (true|false) #IMPLIED
-          id    ID           #IMPLIED
-          %complexContentAttrs;>
-
-<!-- restriction should use the branch defined above, not the simple
-     one from part2; extension should use the full model  -->
-
-<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %simpleContent;
-          id    ID           #IMPLIED
-          %simpleContentAttrs;>
-
-<!-- restriction should use the simple branch from part2, not the 
-     one defined above; extension should have no particle  -->
-
-<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
-<!ATTLIST %extension;
-          base  %QName;      #REQUIRED
-          id    ID           #IMPLIED
-          %extensionAttrs;>
-
-<!-- an element is declared by either:
- a name and a type (either nested or referenced via the type attribute)
- or a ref to an existing element declaration -->
-
-<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
-                     (%unique; | %key; | %keyref;)*)>
-<!-- simpleType or complexType only if no type|ref attribute -->
-<!-- ref not allowed at top level -->
-<!ATTLIST %element;
-            name               %NCName;               #IMPLIED
-            id                 ID                     #IMPLIED
-            ref                %QName;                #IMPLIED
-            type               %QName;                #IMPLIED
-            minOccurs          %nonNegativeInteger;   #IMPLIED
-            maxOccurs          CDATA                  #IMPLIED
-            nillable           %boolean;              #IMPLIED
-            substitutionGroup  %QName;                #IMPLIED
-            abstract           %boolean;              #IMPLIED
-            final              %complexDerivationSet; #IMPLIED
-            block              %blockSet;             #IMPLIED
-            default            CDATA                  #IMPLIED
-            fixed              CDATA                  #IMPLIED
-            form               %formValues;           #IMPLIED
-            %elementAttrs;>
-<!-- type and ref are mutually exclusive.
-     name and ref are mutually exclusive, one is required -->
-<!-- In the absence of type AND ref, type defaults to type of
-     substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
-<!-- default and fixed are mutually exclusive -->
-
-<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
-<!ATTLIST %group; 
-          name        %NCName;               #IMPLIED
-          ref         %QName;                #IMPLIED
-          minOccurs   %nonNegativeInteger;   #IMPLIED
-          maxOccurs   CDATA                  #IMPLIED
-          id          ID                     #IMPLIED
-          %groupAttrs;>
-
-<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
-<!ATTLIST %all;
-          minOccurs   (1)                    #IMPLIED
-          maxOccurs   (1)                    #IMPLIED
-          id          ID                     #IMPLIED
-          %allAttrs;>
-
-<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %choice;
-          minOccurs   %nonNegativeInteger;   #IMPLIED
-          maxOccurs   CDATA                  #IMPLIED
-          id          ID                     #IMPLIED
-          %choiceAttrs;>
-
-<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %sequence;
-          minOccurs   %nonNegativeInteger;   #IMPLIED
-          maxOccurs   CDATA                  #IMPLIED
-          id          ID                     #IMPLIED
-          %sequenceAttrs;>
-
-<!-- an anonymous grouping in a model, or
-     a top-level named group definition, or a reference to same -->
-
-<!-- Note that if order is 'all', group is not allowed inside.
-     If order is 'all' THIS group must be alone (or referenced alone) at
-     the top level of a content model -->
-<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
-<!-- Should allow minOccurs=0 inside order='all' . . . -->
-
-<!ELEMENT %any; (%annotation;)?>
-<!ATTLIST %any;
-            namespace       CDATA                  '##any'
-            processContents (skip|lax|strict)      'strict'
-            minOccurs       %nonNegativeInteger;   '1'
-            maxOccurs       CDATA                  '1'
-            id              ID                     #IMPLIED
-            %anyAttrs;>
-
-<!-- namespace is interpreted as follows:
-                  ##any      - - any non-conflicting WFXML at all
-
-                  ##other    - - any non-conflicting WFXML from namespace other
-                                  than targetNamespace
-
-                  ##local    - - any unqualified non-conflicting WFXML/attribute
-                  one or     - - any non-conflicting WFXML from
-                  more URI        the listed namespaces
-                  references
-
-                  ##targetNamespace ##local may appear in the above list,
-                    with the obvious meaning -->
-
-<!ELEMENT %anyAttribute; (%annotation;)?>
-<!ATTLIST %anyAttribute;
-            namespace       CDATA              '##any'
-            processContents (skip|lax|strict)  'strict'
-            id              ID                 #IMPLIED
-            %anyAttributeAttrs;>
-<!-- namespace is interpreted as for 'any' above -->
-
-<!-- simpleType only if no type|ref attribute -->
-<!-- ref not allowed at top level, name iff at top level -->
-<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
-<!ATTLIST %attribute;
-          name      %NCName;      #IMPLIED
-          id        ID            #IMPLIED
-          ref       %QName;       #IMPLIED
-          type      %QName;       #IMPLIED
-          use       (prohibited|optional|required) #IMPLIED
-          default   CDATA         #IMPLIED
-          fixed     CDATA         #IMPLIED
-          form      %formValues;  #IMPLIED
-          %attributeAttrs;>
-<!-- type and ref are mutually exclusive.
-     name and ref are mutually exclusive, one is required -->
-<!-- default for use is optional when nested, none otherwise -->
-<!-- default and fixed are mutually exclusive -->
-<!-- type attr and simpleType content are mutually exclusive -->
-
-<!-- an attributeGroup is a named collection of attribute decls, or a
-     reference thereto -->
-<!ELEMENT %attributeGroup; ((%annotation;)?,
-                       (%attribute; | %attributeGroup;)*,
-                       (%anyAttribute;)?) >
-<!ATTLIST %attributeGroup;
-                 name       %NCName;       #IMPLIED
-                 id         ID             #IMPLIED
-                 ref        %QName;        #IMPLIED
-                 %attributeGroupAttrs;>
-
-<!-- ref iff no content, no name.  ref iff not top level -->
-
-<!-- better reference mechanisms -->
-<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %unique;
-          name     %NCName;       #REQUIRED
-	  id       ID             #IMPLIED
-	  %uniqueAttrs;>
-
-<!ELEMENT %key;    ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %key;
-          name     %NCName;       #REQUIRED
-	  id       ID             #IMPLIED
-	  %keyAttrs;>
-
-<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %keyref;
-          name     %NCName;       #REQUIRED
-	  refer    %QName;        #REQUIRED
-	  id       ID             #IMPLIED
-	  %keyrefAttrs;>
-
-<!ELEMENT %selector; ((%annotation;)?)>
-<!ATTLIST %selector;
-          xpath %XPathExpr; #REQUIRED
-          id    ID          #IMPLIED
-          %selectorAttrs;>
-<!ELEMENT %field; ((%annotation;)?)>
-<!ATTLIST %field;
-          xpath %XPathExpr; #REQUIRED
-          id    ID          #IMPLIED
-          %fieldAttrs;>
-
-<!-- Schema combination mechanisms -->
-<!ELEMENT %include; (%annotation;)?>
-<!ATTLIST %include;
-          schemaLocation %URIref; #REQUIRED
-          id             ID       #IMPLIED
-          %includeAttrs;>
-
-<!ELEMENT %import; (%annotation;)?>
-<!ATTLIST %import;
-          namespace      %URIref; #IMPLIED
-          schemaLocation %URIref; #IMPLIED
-          id             ID       #IMPLIED
-          %importAttrs;>
-
-<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
-                      %attributeGroup; | %group;)*>
-<!ATTLIST %redefine;
-          schemaLocation %URIref; #REQUIRED
-          id             ID       #IMPLIED
-          %redefineAttrs;>
-
-<!ELEMENT %notation; (%annotation;)?>
-<!ATTLIST %notation;
-	  name        %NCName;    #REQUIRED
-	  id          ID          #IMPLIED
-	  public      CDATA       #REQUIRED
-	  system      %URIref;    #IMPLIED
-	  %notationAttrs;>
-
-<!-- Annotation is either application information or documentation -->
-<!-- By having these here they are available for datatypes as well
-     as all the structures elements -->
-
-<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
-<!ATTLIST %annotation; %annotationAttrs;>
-
-<!-- User must define annotation elements in internal subset for this
-     to work -->
-<!ELEMENT %appinfo; ANY>   <!-- too restrictive -->
-<!ATTLIST %appinfo;
-          source     %URIref;      #IMPLIED
-          id         ID         #IMPLIED
-          %appinfoAttrs;>
-<!ELEMENT %documentation; ANY>   <!-- too restrictive -->
-<!ATTLIST %documentation;
-          source     %URIref;   #IMPLIED
-          id         ID         #IMPLIED
-          xml:lang   CDATA      #IMPLIED
-          %documentationAttrs;>
-
-<!NOTATION XMLSchemaStructures PUBLIC
-           'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
-<!NOTATION XML PUBLIC
-           'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
diff --git a/common/res/resources/schemas/datatypes.dtd b/common/res/resources/schemas/datatypes.dtd
deleted file mode 100644
index 8e48553be..000000000
--- a/common/res/resources/schemas/datatypes.dtd
+++ /dev/null
@@ -1,203 +0,0 @@
-<!--
-        DTD for XML Schemas: Part 2: Datatypes
-        $Id: datatypes.dtd,v 1.23 2001/03/16 17:36:30 ht Exp $
-        Note this DTD is NOT normative, or even definitive. - - the
-        prose copy in the datatypes REC is the definitive version
-        (which shouldn't differ from this one except for this comment
-        and entity expansions, but just in case)
-  -->
-
-<!--
-        This DTD cannot be used on its own, it is intended
-        only for incorporation in XMLSchema.dtd, q.v.
-  -->
-
-<!-- Define all the element names, with optional prefix -->
-<!ENTITY % simpleType "%p;simpleType">
-<!ENTITY % restriction "%p;restriction">
-<!ENTITY % list "%p;list">
-<!ENTITY % union "%p;union">
-<!ENTITY % maxExclusive "%p;maxExclusive">
-<!ENTITY % minExclusive "%p;minExclusive">
-<!ENTITY % maxInclusive "%p;maxInclusive">
-<!ENTITY % minInclusive "%p;minInclusive">
-<!ENTITY % totalDigits "%p;totalDigits">
-<!ENTITY % fractionDigits "%p;fractionDigits">
-<!ENTITY % length "%p;length">
-<!ENTITY % minLength "%p;minLength">
-<!ENTITY % maxLength "%p;maxLength">
-<!ENTITY % enumeration "%p;enumeration">
-<!ENTITY % whiteSpace "%p;whiteSpace">
-<!ENTITY % pattern "%p;pattern">
-
-<!--
-        Customisation entities for the ATTLIST of each element
-        type. Define one of these if your schema takes advantage
-        of the anyAttribute='##other' in the schema for schemas
-  -->
-
-<!ENTITY % simpleTypeAttrs "">
-<!ENTITY % restrictionAttrs "">
-<!ENTITY % listAttrs "">
-<!ENTITY % unionAttrs "">
-<!ENTITY % maxExclusiveAttrs "">
-<!ENTITY % minExclusiveAttrs "">
-<!ENTITY % maxInclusiveAttrs "">
-<!ENTITY % minInclusiveAttrs "">
-<!ENTITY % totalDigitsAttrs "">
-<!ENTITY % fractionDigitsAttrs "">
-<!ENTITY % lengthAttrs "">
-<!ENTITY % minLengthAttrs "">
-<!ENTITY % maxLengthAttrs "">
-<!ENTITY % enumerationAttrs "">
-<!ENTITY % whiteSpaceAttrs "">
-<!ENTITY % patternAttrs "">
-
-<!-- Define some entities for informative use as attribute
-        types -->
-<!ENTITY % URIref "CDATA">
-<!ENTITY % XPathExpr "CDATA">
-<!ENTITY % QName "NMTOKEN">
-<!ENTITY % QNames "NMTOKENS">
-<!ENTITY % NCName "NMTOKEN">
-<!ENTITY % nonNegativeInteger "NMTOKEN">
-<!ENTITY % boolean "(true|false)">
-<!ENTITY % simpleDerivationSet "CDATA">
-<!--
-        #all or space-separated list drawn from derivationChoice
-  -->
-
-<!--
-        Note that the use of 'facet' below is less restrictive
-        than is really intended:  There should in fact be no
-        more than one of each of minInclusive, minExclusive,
-        maxInclusive, maxExclusive, totalDigits, fractionDigits,
-        length, maxLength, minLength within datatype,
-        and the min- and max- variants of Inclusive and Exclusive
-        are mutually exclusive. On the other hand,  pattern and
-        enumeration may repeat.
-  -->
-<!ENTITY % minBound "(%minInclusive; | %minExclusive;)">
-<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">
-<!ENTITY % bounds "%minBound; | %maxBound;">
-<!ENTITY % numeric "%totalDigits; | %fractionDigits;">
-<!ENTITY % ordered "%bounds; | %numeric;">
-<!ENTITY % unordered
-   "%pattern; | %enumeration; | %whiteSpace; | %length; |
-   %maxLength; | %minLength;">
-<!ENTITY % facet "%ordered; | %unordered;">
-<!ENTITY % facetAttr 
-        "value CDATA #REQUIRED
-        id ID #IMPLIED">
-<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
-<!ENTITY % facetModel "(%annotation;)?">
-<!ELEMENT %simpleType;
-        ((%annotation;)?, (%restriction; | %list; | %union;))>
-<!ATTLIST %simpleType;
-    name      %NCName; #IMPLIED
-    final     %simpleDerivationSet; #IMPLIED
-    id        ID       #IMPLIED
-    %simpleTypeAttrs;>
-<!-- name is required at top level -->
-<!ELEMENT %restriction; ((%annotation;)?,
-                         (%restriction1; |
-                          ((%simpleType;)?,(%facet;)*)),
-                         (%attrDecls;))>
-<!ATTLIST %restriction;
-    base      %QName;                  #IMPLIED
-    id        ID       #IMPLIED
-    %restrictionAttrs;>
-<!--
-        base and simpleType child are mutually exclusive,
-        one is required.
-
-        restriction is shared between simpleType and
-        simpleContent and complexContent (in XMLSchema.xsd).
-        restriction1 is for the latter cases, when this
-        is restricting a complex type, as is attrDecls.
-  -->
-<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)>
-<!ATTLIST %list;
-    itemType      %QName;             #IMPLIED
-    id        ID       #IMPLIED
-    %listAttrs;>
-<!--
-        itemType and simpleType child are mutually exclusive,
-        one is required
-  -->
-<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)>
-<!ATTLIST %union;
-    id            ID       #IMPLIED
-    memberTypes   %QNames;            #IMPLIED
-    %unionAttrs;>
-<!--
-        At least one item in memberTypes or one simpleType
-        child is required
-  -->
-
-<!ELEMENT %maxExclusive; %facetModel;>
-<!ATTLIST %maxExclusive;
-        %facetAttr;
-        %fixedAttr;
-        %maxExclusiveAttrs;>
-<!ELEMENT %minExclusive; %facetModel;>
-<!ATTLIST %minExclusive;
-        %facetAttr;
-        %fixedAttr;
-        %minExclusiveAttrs;>
-
-<!ELEMENT %maxInclusive; %facetModel;>
-<!ATTLIST %maxInclusive;
-        %facetAttr;
-        %fixedAttr;
-        %maxInclusiveAttrs;>
-<!ELEMENT %minInclusive; %facetModel;>
-<!ATTLIST %minInclusive;
-        %facetAttr;
-        %fixedAttr;
-        %minInclusiveAttrs;>
-
-<!ELEMENT %totalDigits; %facetModel;>
-<!ATTLIST %totalDigits;
-        %facetAttr;
-        %fixedAttr;
-        %totalDigitsAttrs;>
-<!ELEMENT %fractionDigits; %facetModel;>
-<!ATTLIST %fractionDigits;
-        %facetAttr;
-        %fixedAttr;
-        %fractionDigitsAttrs;>
-
-<!ELEMENT %length; %facetModel;>
-<!ATTLIST %length;
-        %facetAttr;
-        %fixedAttr;
-        %lengthAttrs;>
-<!ELEMENT %minLength; %facetModel;>
-<!ATTLIST %minLength;
-        %facetAttr;
-        %fixedAttr;
-        %minLengthAttrs;>
-<!ELEMENT %maxLength; %facetModel;>
-<!ATTLIST %maxLength;
-        %facetAttr;
-        %fixedAttr;
-        %maxLengthAttrs;>
-
-<!-- This one can be repeated -->
-<!ELEMENT %enumeration; %facetModel;>
-<!ATTLIST %enumeration;
-        %facetAttr;
-        %enumerationAttrs;>
-
-<!ELEMENT %whiteSpace; %facetModel;>
-<!ATTLIST %whiteSpace;
-        %facetAttr;
-        %fixedAttr;
-        %whiteSpaceAttrs;>
-
-<!-- This one can be repeated -->
-<!ELEMENT %pattern; %facetModel;>
-<!ATTLIST %pattern;
-        %facetAttr;
-        %patternAttrs;>
diff --git a/common/res/resources/schemas/exclusive-canonicalization.xsd b/common/res/resources/schemas/exclusive-canonicalization.xsd
deleted file mode 100644
index d4a2d82ec..000000000
--- a/common/res/resources/schemas/exclusive-canonicalization.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- commented out for compatibility with Xerces 2.0.2

-<!DOCTYPE schema

-  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"

-  [

-   <!ATTLIST schema 

-     xmlns:ec CDATA #FIXED 'http://www.w3.org/2001/10/xml-exc-c14n#'>

-   <!ENTITY ec 'http://www.w3.org/2001/10/xml-exc-c14n#'> 

-   <!ENTITY % p ''>

-   <!ENTITY % s ''>

-  ]>

--->

-<schema xmlns="http://www.w3.org/2001/XMLSchema"

-        xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"

-        targetNamespace="http://www.w3.org/2001/10/xml-exc-c14n#"

-        version="0.1" elementFormDefault="qualified">

-  <element name="InclusiveNamespaces"

-           type="ec:InclusiveNamespaces"/>

-  <complexType name="InclusiveNamespaces">

-     <attribute name="PrefixList" type="string"/>

-  </complexType>

-</schema>
\ No newline at end of file
diff --git a/common/res/resources/schemas/xml.xsd b/common/res/resources/schemas/xml.xsd
deleted file mode 100644
index 79dbc02ba..000000000
--- a/common/res/resources/schemas/xml.xsd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version='1.0'?>

-<!-- documented out for compatibility with Xerces-2.0.2

-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >

--->

-<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.

-  </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 or xml:space 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/03/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/2001/03/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.  In other words, if the XML Schema namespace changes, the version

-   of this document at

-   http://www.w3.org/2001/xml.xsd will change

-   accordingly; the version at

-   http://www.w3.org/2001/03/xml.xsd will not change.

-  </xs:documentation>

- </xs:annotation>

-

- <xs:attribute name="lang" type="xs:language">

-  <xs:annotation>

-   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter

-         codes as the enumerated possible values . . .</xs:documentation>

-  </xs:annotation>

- </xs:attribute>

-

- <xs:attribute name="space" default="preserve">

-  <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:attributeGroup name="specialAttrs">

-  <xs:attribute ref="xml:base"/>

-  <xs:attribute ref="xml:lang"/>

-  <xs:attribute ref="xml:space"/>

- </xs:attributeGroup>

-

-</xs:schema>

diff --git a/common/res/resources/schemas/xmldsig-core-schema.xsd b/common/res/resources/schemas/xmldsig-core-schema.xsd
deleted file mode 100644
index a7e302373..000000000
--- a/common/res/resources/schemas/xmldsig-core-schema.xsd
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- documented out for compatibility with Xerces-2.0.2

-<!DOCTYPE schema PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "XMLSchema.dtd" [

-  <!ATTLIST schema

-  xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#"

->

-  <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>

-  <!ENTITY % p ''>

-  <!ENTITY % s ''>

-]>

--->

-<!-- Schema for XML Signatures

-    http://www.w3.org/2000/09/xmldsig#

-    $Revision: 1.1 $ on $Date: 2003/03/11 10:10:34 $ by $Author: peck $

-

-    Copyright 2001 The Internet Society and W3C (Massachusetts Institute

-    of Technology, Institut National de Recherche en Informatique et en

-    Automatique, Keio University). All Rights Reserved.

-    http://www.w3.org/Consortium/Legal/

-

-    This document is governed by the W3C Software License [1] as described

-    in the FAQ [2].

-

-    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720

-    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD

--->

-<schema targetNamespace="http://www.w3.org/2000/09/xmldsig#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="0.1">

-  <!-- Basic Types Defined for Signatures -->

-  <simpleType name="CryptoBinary">

-    <restriction base="base64Binary"/>

-  </simpleType>

-  <!-- Start Signature -->

-  <element name="Signature" type="ds:SignatureType"/>

-  <complexType name="SignatureType">

-    <sequence>

-      <element ref="ds:SignedInfo"/>

-      <element ref="ds:SignatureValue"/>

-      <element ref="ds:KeyInfo" minOccurs="0"/>

-      <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>

-    </sequence>

-    <attribute name="Id" type="ID" use="optional"/>

-  </complexType>

-  <element name="SignatureValue" type="ds:SignatureValueType"/>

-  <complexType name="SignatureValueType">

-    <simpleContent>

-      <extension base="base64Binary">

-        <attribute name="Id" type="ID" use="optional"/>

-      </extension>

-    </simpleContent>

-  </complexType>

-  <!-- Start SignedInfo -->

-  <element name="SignedInfo" type="ds:SignedInfoType"/>

-  <complexType name="SignedInfoType">

-    <sequence>

-      <element ref="ds:CanonicalizationMethod"/>

-      <element ref="ds:SignatureMethod"/>

-      <element ref="ds:Reference" maxOccurs="unbounded"/>

-    </sequence>

-    <attribute name="Id" type="ID" use="optional"/>

-  </complexType>

-  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>

-  <complexType name="CanonicalizationMethodType" mixed="true">

-    <sequence>

-      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>

-      <!-- (0,unbounded) elements from (1,1) namespace -->

-    </sequence>

-    <attribute name="Algorithm" type="anyURI" use="required"/>

-  </complexType>

-  <element name="SignatureMethod" type="ds:SignatureMethodType"/>

-  <complexType name="SignatureMethodType" mixed="true">

-    <sequence>

-      <element name="HMACOutputLength" type="ds:HMACOutputLengthType" minOccurs="0"/>

-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>

-      <!-- (0,unbounded) elements from (1,1) external namespace -->

-    </sequence>

-    <attribute name="Algorithm" type="anyURI" use="required"/>

-  </complexType>

-  <!-- Start Reference -->

-  <element name="Reference" type="ds:ReferenceType"/>

-  <complexType name="ReferenceType">

-    <sequence>

-      <element ref="ds:Transforms" minOccurs="0"/>

-      <element ref="ds:DigestMethod"/>

-      <element ref="ds:DigestValue"/>

-    </sequence>

-    <attribute name="Id" type="ID" use="optional"/>

-    <attribute name="URI" type="anyURI" use="optional"/>

-    <attribute name="Type" type="anyURI" use="optional"/>

-  </complexType>

-  <element name="Transforms" type="ds:TransformsType"/>

-  <complexType name="TransformsType">

-    <sequence>

-      <element ref="ds:Transform" maxOccurs="unbounded"/>

-    </sequence>

-  </complexType>

-  <element name="Transform" type="ds:TransformType"/>

-  <complexType name="TransformType" mixed="true">

-    <choice minOccurs="0" maxOccurs="unbounded">

-      <any namespace="##other" processContents="lax"/>

-      <element name="XPath" type="string"/>

-      <!-- (1,1) elements from (0,unbounded) namespaces -->

-    </choice>

-    <attribute name="Algorithm" type="anyURI" use="required"/>

-  </complexType>

-  <!-- End Reference -->

-  <element name="DigestMethod" type="ds:DigestMethodType"/>

-  <complexType name="DigestMethodType" mixed="true">

-    <sequence>

-      <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-    </sequence>

-    <attribute name="Algorithm" type="anyURI" use="required"/>

-  </complexType>

-  <element name="DigestValue" type="ds:DigestValueType"/>

-  <simpleType name="DigestValueType">

-    <restriction base="base64Binary"/>

-  </simpleType>

-  <!-- End SignedInfo -->

-  <!-- Start KeyInfo -->

-  <element name="KeyInfo" type="ds:KeyInfoType"/>

-  <complexType name="KeyInfoType" mixed="true">

-    <choice maxOccurs="unbounded">

-      <element ref="ds:KeyName"/>

-      <element ref="ds:KeyValue"/>

-      <element ref="ds:RetrievalMethod"/>

-      <element ref="ds:X509Data"/>

-      <element ref="ds:PGPData"/>

-      <element ref="ds:SPKIData"/>

-      <element ref="ds:MgmtData"/>

-      <any namespace="##other" processContents="lax"/>

-      <!-- (1,1) elements from (0,unbounded) namespaces -->

-    </choice>

-    <attribute name="Id" type="ID" use="optional"/>

-  </complexType>

-  <element name="KeyName" type="string"/>

-  <element name="MgmtData" type="string"/>

-  <element name="KeyValue" type="ds:KeyValueType"/>

-  <complexType name="KeyValueType" mixed="true">

-    <choice>

-      <element ref="ds:DSAKeyValue"/>

-      <element ref="ds:RSAKeyValue"/>

-      <any namespace="##other" processContents="lax"/>

-    </choice>

-  </complexType>

-  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>

-  <complexType name="RetrievalMethodType">

-    <sequence>

-      <element ref="ds:Transforms" minOccurs="0"/>

-    </sequence>

-    <attribute name="URI" type="anyURI"/>

-    <attribute name="Type" type="anyURI" use="optional"/>

-  </complexType>

-  <!-- Start X509Data -->

-  <element name="X509Data" type="ds:X509DataType"/>

-  <complexType name="X509DataType">

-    <sequence maxOccurs="unbounded">

-      <choice>

-        <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>

-        <element name="X509SKI" type="base64Binary"/>

-        <element name="X509SubjectName" type="string"/>

-        <element name="X509Certificate" type="base64Binary"/>

-        <element name="X509CRL" type="base64Binary"/>

-        <any namespace="##other" processContents="lax"/>

-      </choice>

-    </sequence>

-  </complexType>

-  <complexType name="X509IssuerSerialType">

-    <sequence>

-      <element name="X509IssuerName" type="string"/>

-      <element name="X509SerialNumber" type="integer"/>

-    </sequence>

-  </complexType>

-  <!-- End X509Data -->

-  <!-- Begin PGPData -->

-  <element name="PGPData" type="ds:PGPDataType"/>

-  <complexType name="PGPDataType">

-    <choice>

-      <sequence>

-        <element name="PGPKeyID" type="base64Binary"/>

-        <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>

-        <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-      </sequence>

-      <sequence>

-        <element name="PGPKeyPacket" type="base64Binary"/>

-        <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-      </sequence>

-    </choice>

-  </complexType>

-  <!-- End PGPData -->

-  <!-- Begin SPKIData -->

-  <element name="SPKIData" type="ds:SPKIDataType"/>

-  <complexType name="SPKIDataType">

-    <sequence maxOccurs="unbounded">

-      <element name="SPKISexp" type="base64Binary"/>

-      <any namespace="##other" processContents="lax" minOccurs="0"/>

-    </sequence>

-  </complexType>

-  <!-- End SPKIData -->

-  <!-- End KeyInfo -->

-  <!-- Start Object (Manifest, SignatureProperty) -->

-  <element name="Object" type="ds:ObjectType"/>

-  <complexType name="ObjectType" mixed="true">

-    <sequence minOccurs="0" maxOccurs="unbounded">

-      <any namespace="##any" processContents="lax"/>

-    </sequence>

-    <attribute name="Id" type="ID" use="optional"/>

-    <attribute name="MimeType" type="string" use="optional"/>

-    <attribute name="Encoding" type="anyURI" use="optional"/>

-    <!-- add a grep facet -->

-  </complexType>

-  <element name="Manifest" type="ds:ManifestType"/>

-  <complexType name="ManifestType">

-    <sequence>

-      <element ref="ds:Reference" maxOccurs="unbounded"/>

-    </sequence>

-    <attribute name="Id" type="ID" use="optional"/>

-  </complexType>

-  <element name="SignatureProperties" type="ds:SignaturePropertiesType"/>

-  <complexType name="SignaturePropertiesType">

-    <sequence>

-      <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>

-    </sequence>

-    <attribute name="Id" type="ID" use="optional"/>

-  </complexType>

-  <element name="SignatureProperty" type="ds:SignaturePropertyType"/>

-  <complexType name="SignaturePropertyType" mixed="true">

-    <choice maxOccurs="unbounded">

-      <any namespace="##other" processContents="lax"/>

-      <!-- (1,1) elements from (1,unbounded) namespaces -->

-    </choice>

-    <attribute name="Target" type="anyURI" use="required"/>

-    <attribute name="Id" type="ID" use="optional"/>

-  </complexType>

-  <!-- End Object (Manifest, SignatureProperty) -->

-  <!-- Start Algorithm Parameters -->

-  <simpleType name="HMACOutputLengthType">

-    <restriction base="integer"/>

-  </simpleType>

-  <!-- Start KeyValue Element-types -->

-  <element name="DSAKeyValue" type="ds:DSAKeyValueType"/>

-  <complexType name="DSAKeyValueType">

-    <sequence>

-      <sequence minOccurs="0">

-        <element name="P" type="ds:CryptoBinary"/>

-        <element name="Q" type="ds:CryptoBinary"/>

-      </sequence>

-      <element name="G" type="ds:CryptoBinary" minOccurs="0"/>

-      <element name="Y" type="ds:CryptoBinary"/>

-      <element name="J" type="ds:CryptoBinary" minOccurs="0"/>

-      <sequence minOccurs="0">

-        <element name="Seed" type="ds:CryptoBinary"/>

-        <element name="PgenCounter" type="ds:CryptoBinary"/>

-      </sequence>

-    </sequence>

-  </complexType>

-  <element name="RSAKeyValue" type="ds:RSAKeyValueType"/>

-  <complexType name="RSAKeyValueType">

-    <sequence>

-      <element name="Modulus" type="ds:CryptoBinary"/>

-      <element name="Exponent" type="ds:CryptoBinary"/>

-    </sequence>

-  </complexType>

-  <!-- End KeyValue Element-types -->

-  <!-- End Signature -->

-</schema>

diff --git a/common/res/resources/schemas/xmldsig-filter2.xsd b/common/res/resources/schemas/xmldsig-filter2.xsd
deleted file mode 100644
index 330eafd19..000000000
--- a/common/res/resources/schemas/xmldsig-filter2.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- documented out for compatibility with Xerces-2.0.2

-   <!DOCTYPE schema

-    PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"

-   [

-     <!ATTLIST schema

-       xmlns:xf CDATA #FIXED 'http://www.w3.org/2002/06/xmldsig-filter2'>

-     <!ENTITY xf 'http://www.w3.org/2002/06/xmldsig-filter2'>

-     <!ENTITY % p ''>

-     <!ENTITY % s ''>

-    ]>

--->

-

-   <schema xmlns="http://www.w3.org/2001/XMLSchema"

-           xmlns:xf="http://www.w3.org/2002/06/xmldsig-filter2"

-           targetNamespace="http://www.w3.org/2002/06/xmldsig-filter2"

-           version="0.1" elementFormDefault="qualified">

-

-   <element name="XPath"

-            type="xf:XPathType"/>

-

-   <complexType name="XPathType">

-    <simpleContent>

-      <extension base="string">

-        <attribute name="Filter">

-           <simpleType>

-             <restriction base="string">

-               <enumeration value="intersect"/>

-               <enumeration value="subtract"/>

-               <enumeration value="union"/>

-             </restriction>

-           </simpleType>

-        </attribute>

-      </extension>

-    </simpleContent>

-   </complexType>

-

-   </schema>
\ No newline at end of file
diff --git a/common/src/at/gv/egovernment/moa/logging/LogMsg.java b/common/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java
index 4d04fc72d..4d04fc72d 100644
--- a/common/src/at/gv/egovernment/moa/logging/LogMsg.java
+++ b/common/src/main/java/at/gv/egovernment/moa/logging/LogMsg.java
diff --git a/common/src/at/gv/egovernment/moa/logging/Logger.java b/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java
index eb7aa5634..eb7aa5634 100644
--- a/common/src/at/gv/egovernment/moa/logging/Logger.java
+++ b/common/src/main/java/at/gv/egovernment/moa/logging/Logger.java
diff --git a/common/src/at/gv/egovernment/moa/logging/LoggingContext.java b/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java
index 42d8db06e..42d8db06e 100644
--- a/common/src/at/gv/egovernment/moa/logging/LoggingContext.java
+++ b/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContext.java
diff --git a/common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java b/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java
index 2bbe6caa1..2bbe6caa1 100644
--- a/common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java
+++ b/common/src/main/java/at/gv/egovernment/moa/logging/LoggingContextManager.java
diff --git a/common/src/at/gv/egovernment/moa/util/Base64Utils.java b/common/src/main/java/at/gv/egovernment/moa/util/Base64Utils.java
index ad29180a6..ad29180a6 100644
--- a/common/src/at/gv/egovernment/moa/util/Base64Utils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/Base64Utils.java
diff --git a/common/src/at/gv/egovernment/moa/util/BoolUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/BoolUtils.java
index fcd39b4dd..fcd39b4dd 100644
--- a/common/src/at/gv/egovernment/moa/util/BoolUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/BoolUtils.java
diff --git a/common/src/at/gv/egovernment/moa/util/CollectionUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/CollectionUtils.java
index 5329dcbd2..5329dcbd2 100644
--- a/common/src/at/gv/egovernment/moa/util/CollectionUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/CollectionUtils.java
diff --git a/common/src/at/gv/egovernment/moa/util/Constants.java b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
index 5c1314296..5c1314296 100644
--- a/common/src/at/gv/egovernment/moa/util/Constants.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
diff --git a/common/src/at/gv/egovernment/moa/util/DOMUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java
index 5be0bb500..5be0bb500 100644
--- a/common/src/at/gv/egovernment/moa/util/DOMUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/DOMUtils.java
diff --git a/common/src/at/gv/egovernment/moa/util/DateTimeUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/DateTimeUtils.java
index 58cc04c4c..58cc04c4c 100644
--- a/common/src/at/gv/egovernment/moa/util/DateTimeUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/DateTimeUtils.java
diff --git a/common/src/at/gv/egovernment/moa/util/EntityResolverChain.java b/common/src/main/java/at/gv/egovernment/moa/util/EntityResolverChain.java
index e7008a701..e7008a701 100644
--- a/common/src/at/gv/egovernment/moa/util/EntityResolverChain.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/EntityResolverChain.java
diff --git a/common/src/at/gv/egovernment/moa/util/FileUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
index a5e777c2d..a5e777c2d 100644
--- a/common/src/at/gv/egovernment/moa/util/FileUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
diff --git a/common/src/at/gv/egovernment/moa/util/KeyStoreUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/KeyStoreUtils.java
index d6a34a7b2..d6a34a7b2 100644
--- a/common/src/at/gv/egovernment/moa/util/KeyStoreUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/KeyStoreUtils.java
diff --git a/common/src/at/gv/egovernment/moa/util/MOADefaultHandler.java b/common/src/main/java/at/gv/egovernment/moa/util/MOADefaultHandler.java
index 0474d92cd..0474d92cd 100644
--- a/common/src/at/gv/egovernment/moa/util/MOADefaultHandler.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/MOADefaultHandler.java
diff --git a/common/src/at/gv/egovernment/moa/util/MOAEntityResolver.java b/common/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java
index 9406612e2..9406612e2 100644
--- a/common/src/at/gv/egovernment/moa/util/MOAEntityResolver.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/MOAEntityResolver.java
diff --git a/common/src/at/gv/egovernment/moa/util/MOAErrorHandler.java b/common/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java
index 1f7757c8f..1f7757c8f 100644
--- a/common/src/at/gv/egovernment/moa/util/MOAErrorHandler.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/MOAErrorHandler.java
diff --git a/common/src/at/gv/egovernment/moa/util/MOATimer.java b/common/src/main/java/at/gv/egovernment/moa/util/MOATimer.java
index d8bf64fc3..d8bf64fc3 100644
--- a/common/src/at/gv/egovernment/moa/util/MOATimer.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/MOATimer.java
diff --git a/common/src/at/gv/egovernment/moa/util/MessageProvider.java b/common/src/main/java/at/gv/egovernment/moa/util/MessageProvider.java
index f5117e390..f5117e390 100644
--- a/common/src/at/gv/egovernment/moa/util/MessageProvider.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/MessageProvider.java
diff --git a/common/src/at/gv/egovernment/moa/util/Messages.java b/common/src/main/java/at/gv/egovernment/moa/util/Messages.java
index a0139ae93..a0139ae93 100644
--- a/common/src/at/gv/egovernment/moa/util/Messages.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/Messages.java
diff --git a/common/src/at/gv/egovernment/moa/util/NodeIteratorAdapter.java b/common/src/main/java/at/gv/egovernment/moa/util/NodeIteratorAdapter.java
index f71aa472d..f71aa472d 100644
--- a/common/src/at/gv/egovernment/moa/util/NodeIteratorAdapter.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/NodeIteratorAdapter.java
diff --git a/common/src/at/gv/egovernment/moa/util/NodeListAdapter.java b/common/src/main/java/at/gv/egovernment/moa/util/NodeListAdapter.java
index 7102cadca..7102cadca 100644
--- a/common/src/at/gv/egovernment/moa/util/NodeListAdapter.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/NodeListAdapter.java
diff --git a/common/src/at/gv/egovernment/moa/util/OutputXML2File.java b/common/src/main/java/at/gv/egovernment/moa/util/OutputXML2File.java
index f9d330d41..f9d330d41 100644
--- a/common/src/at/gv/egovernment/moa/util/OutputXML2File.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/OutputXML2File.java
diff --git a/common/src/at/gv/egovernment/moa/util/ResourceBundleChain.java b/common/src/main/java/at/gv/egovernment/moa/util/ResourceBundleChain.java
index 90b28548a..90b28548a 100644
--- a/common/src/at/gv/egovernment/moa/util/ResourceBundleChain.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/ResourceBundleChain.java
diff --git a/common/src/at/gv/egovernment/moa/util/SSLUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java
index ada21b412..ada21b412 100644
--- a/common/src/at/gv/egovernment/moa/util/SSLUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/SSLUtils.java
diff --git a/common/src/at/gv/egovernment/moa/util/StreamEntityResolver.java b/common/src/main/java/at/gv/egovernment/moa/util/StreamEntityResolver.java
index 38c4e863c..38c4e863c 100644
--- a/common/src/at/gv/egovernment/moa/util/StreamEntityResolver.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/StreamEntityResolver.java
diff --git a/common/src/at/gv/egovernment/moa/util/StreamUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/StreamUtils.java
index a22f1c2a8..a22f1c2a8 100644
--- a/common/src/at/gv/egovernment/moa/util/StreamUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/StreamUtils.java
diff --git a/common/src/at/gv/egovernment/moa/util/StringUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/StringUtils.java
index 61b1a18ea..61b1a18ea 100644
--- a/common/src/at/gv/egovernment/moa/util/StringUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/StringUtils.java
diff --git a/common/src/at/gv/egovernment/moa/util/URLDecoder.java b/common/src/main/java/at/gv/egovernment/moa/util/URLDecoder.java
index a20820f7e..a20820f7e 100644
--- a/common/src/at/gv/egovernment/moa/util/URLDecoder.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/URLDecoder.java
diff --git a/common/src/at/gv/egovernment/moa/util/URLEncoder.java b/common/src/main/java/at/gv/egovernment/moa/util/URLEncoder.java
index 840c0c3bc..840c0c3bc 100644
--- a/common/src/at/gv/egovernment/moa/util/URLEncoder.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/URLEncoder.java
diff --git a/common/src/at/gv/egovernment/moa/util/XPathException.java b/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java
index e10c882e5..e10c882e5 100644
--- a/common/src/at/gv/egovernment/moa/util/XPathException.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/XPathException.java
diff --git a/common/src/at/gv/egovernment/moa/util/XPathUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java
index 5212ed13e..5212ed13e 100644
--- a/common/src/at/gv/egovernment/moa/util/XPathUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java
diff --git a/id.oa/.classpath b/id.oa/.classpath
deleted file mode 100644
index 5af765a17..000000000
--- a/id.oa/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path=""/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/id.oa/.cvsignore b/id.oa/.cvsignore
deleted file mode 100644
index a9a5aecf4..000000000
--- a/id.oa/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tmp
diff --git a/id.oa/.project b/id.oa/.project
deleted file mode 100644
index e49130a5f..000000000
--- a/id.oa/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>id.oa</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.etools.ctc.serviceprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.ibm.etools.ctc.javaprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/id.oa/build.xml b/id.oa/build.xml
deleted file mode 100644
index adb191e76..000000000
--- a/id.oa/build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  Ant Buildfile for MOA ID Auth component
-
-  $Id$
-
--->
-<project name="id.oa" default="package" basedir=".">
-  <property name="tmp" value="tmp"/>
-  <property name="dist" value="${tmp}/dist"/>
-                   
-  <!-- set up directories etc. -->
-  <target name="init">
-    <tstamp/>
-    <echo>Time (hhmm): ${TSTAMP}</echo>
-    <mkdir dir="${tmp}"/>
-    <mkdir dir="${dist}"/>
-  </target>
-
-  <!-- package oa.war -->
-  <target name="package" depends="init">
-    <war warfile="${dist}/oa.war" webxml="web.xml">
-      <fileset dir="html"/>
-    </war>
-  </target>
-
-  <!-- clean temporary files -->
-  <target name="clean">
-    <delete dir="${tmp}"/>
-  </target>
-</project>
diff --git a/id.server/doc/MOA-ID-Configuration-1.2.xsd b/id.server/doc/MOA-ID-Configuration-1.2.xsd
deleted file mode 100644
index 4b018db64..000000000
--- a/id.server/doc/MOA-ID-Configuration-1.2.xsd
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rudolf Schamberger (Stabsstelle IKT-Strategie) (Bundesrechenzentrum GmbH) -->

-<xsd:schema targetNamespace="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1.1">

-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

-	<xsd:import namespace="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" schemaLocation="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.20020225.xsd"/>

-	<xsd:element name="Configuration">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element name="LoginType" type="LoginType" default="stateful"/>

-				<xsd:element name="Binding" minOccurs="0" maxOccurs="1">

-				<xsd:simpleType>

-					<xsd:restriction base="xsd:string">

-						<xsd:enumeration value="full"/>

-						<xsd:enumeration value="userName"/>

-						<xsd:enumeration value="none"/>

-					</xsd:restriction>

-				</xsd:simpleType>

-				</xsd:element>

-				<xsd:choice>

-					<xsd:element ref="ParamAuth"/>

-					<xsd:element ref="BasicAuth"/>

-					<xsd:element ref="HeaderAuth"/>

-				</xsd:choice>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:simpleType name="LoginType">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="stateless"/>

-			<xsd:enumeration value="stateful"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:element name="ParamAuth">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element ref="Parameter" maxOccurs="unbounded"/>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="Parameter">

-		<xsd:complexType>

-			<xsd:attribute name="Name" type="xsd:token" use="required"/>

-			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="BasicAuth">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element name="UserID" type="MOAAuthDataType"/>

-				<xsd:element name="Password" type="MOAAuthDataType"/>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="HeaderAuth">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element ref="Header" maxOccurs="unbounded"/>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="Header">

-		<xsd:complexType>

-			<xsd:attribute name="Name" type="xsd:token" use="required"/>

-			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:simpleType name="MOAAuthDataType">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="MOAGivenName"/>

-			<xsd:enumeration value="MOAFamilyName"/>

-			<xsd:enumeration value="MOADateOfBirth"/>

-			<xsd:enumeration value="MOABPK"/>

-			<xsd:enumeration value="MOAPublicAuthority"/>

-			<xsd:enumeration value="MOABKZ"/>

-			<xsd:enumeration value="MOAQualifiedCertificate"/>

-			<xsd:enumeration value="MOAStammzahl"/>

-			<xsd:enumeration value="MOAIdentificationValueType"/>

-			<xsd:enumeration value="MOAIPAddress"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:simpleType name="MOAKeyBoxSelector">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="SecureSignatureKeypair"/>

-			<xsd:enumeration value="CertifiedKeypair"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<!--Konfiguration für Authentisierungs- und Proxy-Komponente und Online-Applikation-->

-	<xsd:element name="MOA-IDConfiguration">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element name="AuthComponent" type="AuthComponentType" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>enthält Parameter der 

-							Authentisierungs-Komponente</xsd:documentation>

-					</xsd:annotation>

-				</xsd:element>

-				<xsd:element name="ProxyComponent" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>enthält Konfigurationsparameter der 

-							Proxy-Komponente</xsd:documentation>

-					</xsd:annotation>

-					<xsd:complexType>

-						<xsd:sequence>

-							<xsd:element name="AuthComponent">

-								<xsd:annotation>

-									<xsd:documentation>enthält Parameter für die Kommunikation zw. 

-										Proxykomponente und Authenttisierungskomponente</xsd:documentation>

-								</xsd:annotation>

-								<xsd:complexType>

-									<xsd:sequence>

-										<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">

-											<xsd:annotation>

-												<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der 

-													Proxy-Komponente zur Auth-Komponente (vgl. 

-													AuthComponent/MOA-SP/ConnectionParameter)</xsd:documentation>

-											</xsd:annotation>

-										</xsd:element>

-									</xsd:sequence>

-								</xsd:complexType>

-							</xsd:element>

-						</xsd:sequence>

-					</xsd:complexType>

-				</xsd:element>

-				<xsd:element name="OnlineApplication" maxOccurs="unbounded">

-					<xsd:annotation>

-						<xsd:documentation>enthält Parameter für die OA</xsd:documentation>

-					</xsd:annotation>

-					<xsd:complexType>

-						<xsd:complexContent>

-							<xsd:extension base="OnlineApplicationType">

-								<xsd:attribute name="publicURLPrefix" type="xsd:anyURI" use="required"/>

-								<xsd:attribute name="keyBoxIdentifier" type="MOAKeyBoxSelector" use="optional" default="SecureSignatureKeypair"/>

-							</xsd:extension>

-						</xsd:complexContent>

-					</xsd:complexType>

-				</xsd:element>

-				<xsd:element name="ChainingModes" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>spezifiziert den Algorithmus ("pkix" oder "chaining") für die 

-							Zertifikatspfadvalidierung</xsd:documentation>

-					</xsd:annotation>

-					<xsd:complexType>

-						<xsd:sequence minOccurs="0" maxOccurs="unbounded">

-							<xsd:element name="TrustAnchor">

-								<xsd:annotation>

-									<xsd:documentation>ein vom SystemDefaultMode abweichender ChiningMode kann 

-										für jeden TrustAnchor gesetzt werden</xsd:documentation>

-								</xsd:annotation>

-								<xsd:complexType>

-									<xsd:complexContent>

-										<xsd:extension base="dsig:X509IssuerSerialType">

-											<xsd:attribute name="mode" type="ChainingModeType" use="required"/>

-										</xsd:extension>

-									</xsd:complexContent>

-								</xsd:complexType>

-							</xsd:element>

-						</xsd:sequence>

-						<xsd:attribute name="systemDefaultMode" type="ChainingModeType" use="optional" default="pkix"/>

-					</xsd:complexType>

-				</xsd:element>

-				<xsd:element name="TrustedCACertificates" type="xsd:anyURI" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>verweist auf ein Verzeichnis, das vertrauenswürdige CA 

-							(Zwischen-CA, Wurzel-CA) Zertifikate enthält.</xsd:documentation>

-					</xsd:annotation>

-				</xsd:element>

-				<xsd:element name="GenericConfiguration" minOccurs="0" maxOccurs="unbounded">

-					<xsd:complexType>

-						<xsd:attribute name="name" type="xsd:string" use="required"/>

-						<xsd:attribute name="value" type="xsd:string" use="required"/>

-					</xsd:complexType>

-				</xsd:element>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:complexType name="AuthComponentType">

-		<xsd:sequence>

-			<xsd:element name="BKUSelection" minOccurs="0">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="ConnectionParameter" type="ConnectionParameterServerAuthType"/>

-					</xsd:sequence>

-					<xsd:attribute name="BKUSelectionAlternative" type="BKUSelectionType" use="optional" default="HTMLComplete"/>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="SecurityLayer">

-				<xsd:annotation>

-					<xsd:documentation>enthält Parameter für die Kommunikation mit dem 

-						Security-Layer</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="TransformsInfo" maxOccurs="unbounded">

-							<xsd:annotation>

-								<xsd:documentation>das Attribut filename verweist auf eine Datei mit globalem 

-									Element TransformsInfo vom Typ sl10:TransformsInfo; diese TransformsInfo 

-									werden in den CreateXMLSignatureRequest für die Signatur des AUTH-Blocks 

-									inkludiert</xsd:documentation>

-							</xsd:annotation>

-							<xsd:complexType>

-								<xsd:attribute name="filename" type="xsd:anyURI" use="required"/>

-							</xsd:complexType>

-						</xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="MOA-SP">

-				<xsd:annotation>

-					<xsd:documentation>enthält Konfiguratiosnparameter für die Kommunikation mit dem MOA 

-						SP Modul</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der 

-									AUTH-Komponente zu MOA-SP; das Attribut URL enthält den Endpunkt des Server; 

-									wird das Schema "https" verwendet müssen die Kind-Elemente angegeben werden; 

-									wird das Schema "http" verwendet dürfen keine Kind-Elemente angegeben 

-									werden; wird das Element nicht verwendet dann wird MOA-SP über das API 

-									aufgerufen</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-						<xsd:element name="VerifyIdentityLink">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter für die Überprüfung der 

-									Personenbindung</xsd:documentation>

-							</xsd:annotation>

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:element ref="TrustProfileID"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element>

-						<xsd:element name="VerifyAuthBlock">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter für die Überprüfung des 

-									AUTH-Blocks</xsd:documentation>

-							</xsd:annotation>

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:element ref="TrustProfileID"/>

-									<xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string" maxOccurs="unbounded"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="IdentityLinkSigners">

-				<xsd:annotation>

-					<xsd:documentation>enthält Informationen über akzeptierte Signers des 

-						IdentityLinks</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="X509SubjectName" type="xsd:string" maxOccurs="unbounded">

-							<xsd:annotation>

-								<xsd:documentation>akzeptierte Signer des IdentityLinks werden per 

-									X509SubjectName (Kodierung nach RFC 2253) identifiziert</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="ProxyComponentType"/>

-	<xsd:complexType name="OnlineApplicationType">

-		<xsd:sequence>

-			<xsd:element name="AuthComponent" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>enthält Parameter über die OA, die die 

-						Authentisierungs-Komponente betreffen</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:attribute name="provideStammzahl" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideAUTHBlock" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideIdentityLink" type="xsd:boolean" use="optional" default="false"/>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="ProxyComponent" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente 

-						betreffen</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente 

-									betreffen</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-					</xsd:sequence>

-					<xsd:attribute name="configFileURL" type="xsd:anyURI" use="optional"/>

-					<xsd:attribute name="sessionTimeOut" type="xsd:int" use="optional"/>

-					<xsd:attribute name="loginParameterResolverImpl" type="xsd:string" use="optional"/>

-					<xsd:attribute name="loginParameterResolverConfiguration" type="xsd:string" use="optional"/>

-					<xsd:attribute name="connectionBuilderImpl" type="xsd:string" use="optional"/>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="ConnectionParameterServerAuthType">

-		<xsd:sequence>

-			<xsd:element name="AcceptedServerCertificates" type="xsd:anyURI" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>URL zu einem Verzeichnis, das akzeptierte Server-Zertifikate der 

-						TLS-Verbindung enthält (keine CA-Zertifikate)</xsd:documentation>

-				</xsd:annotation>

-			</xsd:element>

-		</xsd:sequence>

-		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>

-	</xsd:complexType>

-	<xsd:complexType name="ConnectionParameterClientAuthType">

-		<xsd:complexContent>

-			<xsd:extension base="ConnectionParameterServerAuthType">

-				<xsd:sequence>

-					<xsd:element name="ClientKeyStore" minOccurs="0">

-						<xsd:annotation>

-							<xsd:documentation>URL zu einem KeyStore, der den privaten Schlüssel, der für 

-								die TLS-Client-Authentisierung verwendetwird, enthält</xsd:documentation>

-						</xsd:annotation>

-						<xsd:complexType>

-							<xsd:simpleContent>

-								<xsd:extension base="xsd:anyURI">

-									<xsd:attribute name="password" type="xsd:string" use="optional"/>

-								</xsd:extension>

-							</xsd:simpleContent>

-						</xsd:complexType>

-					</xsd:element>

-				</xsd:sequence>

-			</xsd:extension>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<xsd:element name="TrustProfileID" type="xsd:string"/>

-	<xsd:simpleType name="ChainingModeType">

-		<xsd:restriction base="xsd:string">

-			<xsd:enumeration value="chaining"/>

-			<xsd:enumeration value="pkix"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:simpleType name="BKUSelectionType">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="HTMLComplete"/>

-			<xsd:enumeration value="HTMLSelect"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-</xsd:schema>

diff --git a/id.server/doc/MOA-ID-Configuration-1.3.xsd b/id.server/doc/MOA-ID-Configuration-1.3.xsd
deleted file mode 100644
index 66c6e1832..000000000
--- a/id.server/doc/MOA-ID-Configuration-1.3.xsd
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rudolf Schamberger (Stabsstelle IKT-Strategie) (Bundesrechenzentrum GmbH) -->

-<xsd:schema targetNamespace="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1.1">

-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

-	<xsd:import namespace="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" schemaLocation="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.20020225.xsd"/>

-	<xsd:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="PersonData_20_en_moaWID.xsd"/>

-	<xsd:element name="Configuration">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element name="LoginType" type="LoginType" default="stateful"/>

-				<xsd:element name="Binding" minOccurs="0">

-					<xsd:simpleType>

-						<xsd:restriction base="xsd:string">

-							<xsd:enumeration value="full"/>

-							<xsd:enumeration value="userName"/>

-							<xsd:enumeration value="none"/>

-						</xsd:restriction>

-					</xsd:simpleType>

-				</xsd:element>

-				<xsd:choice>

-					<xsd:element ref="ParamAuth"/>

-					<xsd:element ref="BasicAuth"/>

-					<xsd:element ref="HeaderAuth"/>

-				</xsd:choice>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:simpleType name="LoginType">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="stateless"/>

-			<xsd:enumeration value="stateful"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:element name="ParamAuth">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element ref="Parameter" maxOccurs="unbounded"/>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="Parameter">

-		<xsd:complexType>

-			<xsd:attribute name="Name" type="xsd:token" use="required"/>

-			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="BasicAuth">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element name="UserID" type="MOAAuthDataType"/>

-				<xsd:element name="Password" type="MOAAuthDataType"/>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="HeaderAuth">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element ref="Header" maxOccurs="unbounded"/>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="Header">

-		<xsd:complexType>

-			<xsd:attribute name="Name" type="xsd:token" use="required"/>

-			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:simpleType name="MOAAuthDataType">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="MOAGivenName"/>

-			<xsd:enumeration value="MOAFamilyName"/>

-			<xsd:enumeration value="MOADateOfBirth"/>

-			<xsd:enumeration value="MOABPK"/>

-			<xsd:enumeration value="MOAWBPK"/>

-			<xsd:enumeration value="MOAPublicAuthority"/>

-			<xsd:enumeration value="MOABKZ"/>

-			<xsd:enumeration value="MOAQualifiedCertificate"/>

-			<xsd:enumeration value="MOAStammzahl"/>

-			<xsd:enumeration value="MOAIdentificationValueType"/>

-			<xsd:enumeration value="MOAIPAddress"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:simpleType name="MOAKeyBoxSelector">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="SecureSignatureKeypair"/>

-			<xsd:enumeration value="CertifiedKeypair"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<!--Konfiguration für Authentisierungs- und Proxy-Komponente und Online-Applikation-->

-	<xsd:element name="MOA-IDConfiguration">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element name="AuthComponent" type="AuthComponentType" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>enthält Parameter der 

-							Authentisierungs-Komponente</xsd:documentation>

-					</xsd:annotation>

-				</xsd:element>

-				<xsd:element name="ProxyComponent" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>enthält Konfigurationsparameter der 

-							Proxy-Komponente</xsd:documentation>

-					</xsd:annotation>

-					<xsd:complexType>

-						<xsd:sequence>

-							<xsd:element name="AuthComponent">

-								<xsd:annotation>

-									<xsd:documentation>enthält Parameter für die Kommunikation zw. 

-										Proxykomponente und Authenttisierungskomponente</xsd:documentation>

-								</xsd:annotation>

-								<xsd:complexType>

-									<xsd:sequence>

-										<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">

-											<xsd:annotation>

-												<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der 

-													Proxy-Komponente zur Auth-Komponente (vgl. 

-													AuthComponent/MOA-SP/ConnectionParameter)</xsd:documentation>

-											</xsd:annotation>

-										</xsd:element>

-									</xsd:sequence>

-								</xsd:complexType>

-							</xsd:element>

-						</xsd:sequence>

-					</xsd:complexType>

-				</xsd:element>

-				<xsd:element name="OnlineApplication" maxOccurs="unbounded">

-					<xsd:annotation>

-						<xsd:documentation>enthält Parameter für die OA</xsd:documentation>

-					</xsd:annotation>

-					<xsd:complexType>

-						<xsd:complexContent>

-							<xsd:extension base="OnlineApplicationType">

-								<xsd:attribute name="publicURLPrefix" type="xsd:anyURI" use="required"/>

-								<xsd:attribute name="keyBoxIdentifier" type="MOAKeyBoxSelector" use="optional" default="SecureSignatureKeypair"/>

-								<xsd:attribute name="type" use="optional" default="publicService">

-									<xsd:simpleType>

-										<xsd:restriction base="xsd:NMTOKEN">

-											<xsd:enumeration value="businessService"/>

-											<xsd:enumeration value="publicService"/>

-										</xsd:restriction>

-									</xsd:simpleType>

-								</xsd:attribute>

-							</xsd:extension>

-						</xsd:complexContent>

-					</xsd:complexType>

-				</xsd:element>

-				<xsd:element name="ChainingModes" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>spezifiziert den Algorithmus ("pkix" oder "chaining") für die 

-							Zertifikatspfadvalidierung</xsd:documentation>

-					</xsd:annotation>

-					<xsd:complexType>

-						<xsd:sequence minOccurs="0" maxOccurs="unbounded">

-							<xsd:element name="TrustAnchor">

-								<xsd:annotation>

-									<xsd:documentation>ein vom SystemDefaultMode abweichender ChiningMode kann 

-										für jeden TrustAnchor gesetzt werden</xsd:documentation>

-								</xsd:annotation>

-								<xsd:complexType>

-									<xsd:complexContent>

-										<xsd:extension base="dsig:X509IssuerSerialType">

-											<xsd:attribute name="mode" type="ChainingModeType" use="required"/>

-										</xsd:extension>

-									</xsd:complexContent>

-								</xsd:complexType>

-							</xsd:element>

-						</xsd:sequence>

-						<xsd:attribute name="systemDefaultMode" type="ChainingModeType" use="optional" default="pkix"/>

-					</xsd:complexType>

-				</xsd:element>

-				<xsd:element name="TrustedCACertificates" type="xsd:anyURI" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>verweist auf ein Verzeichnis, das vertrauenswürdige CA 

-							(Zwischen-CA, Wurzel-CA) Zertifikate enthält.</xsd:documentation>

-					</xsd:annotation>

-				</xsd:element>

-				<xsd:element name="GenericConfiguration" minOccurs="0" maxOccurs="unbounded">

-					<xsd:complexType>

-						<xsd:attribute name="name" use="required">

-							<xsd:simpleType>

-								<xsd:restriction base="xsd:string">

-									<xsd:enumeration value="DirectoryCertStoreParameters.RootDir"/>

-									<xsd:enumeration value="AuthenticationSession.TimeOut"/>

-									<xsd:enumeration value="AuthenticationData.TimeOut"/>

-									<xsd:enumeration value="TrustManager.RevocationChecking"/>

-									<xsd:enumeration value="FrontendServlets.EnableHTTPConnection"/>

-									<xsd:enumeration value="FrontendServlets.DataURLPrefix"/>

-								</xsd:restriction>

-							</xsd:simpleType>

-						</xsd:attribute>

-						<xsd:attribute name="value" type="xsd:string" use="required"/>

-					</xsd:complexType>

-				</xsd:element>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:complexType name="AuthComponentType">

-		<xsd:sequence>

-			<xsd:element name="BKUSelection" minOccurs="0">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="ConnectionParameter" type="ConnectionParameterServerAuthType"/>

-					</xsd:sequence>

-					<xsd:attribute name="BKUSelectionAlternative" type="BKUSelectionType" use="optional" default="HTMLComplete"/>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Templates" type="TemplatesType" minOccurs="0" maxOccurs="1" />

-			<xsd:element name="SecurityLayer">

-				<xsd:annotation>

-					<xsd:documentation>enthält Parameter für die Kommunikation mit dem 

-						Security-Layer</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="TransformsInfo" type="TransformsInfoType" maxOccurs="unbounded"/>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="MOA-SP">

-				<xsd:annotation>

-					<xsd:documentation>enthält Konfiguratiosnparameter für die Kommunikation mit dem MOA 

-						SP Modul</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der 

-									AUTH-Komponente zu MOA-SP; das Attribut URL enthält den Endpunkt des Server; 

-									wird das Schema "https" verwendet müssen die Kind-Elemente angegeben werden; 

-									wird das Schema "http" verwendet dürfen keine Kind-Elemente angegeben 

-									werden; wird das Element nicht verwendet dann wird MOA-SP über das API 

-									aufgerufen</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-						<xsd:element name="VerifyIdentityLink">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter für die Überprüfung der 

-									Personenbindung</xsd:documentation>

-							</xsd:annotation>

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:element ref="TrustProfileID"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element>

-						<xsd:element name="VerifyAuthBlock">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter für die Überprüfung des 

-									AUTH-Blocks</xsd:documentation>

-							</xsd:annotation>

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:element ref="TrustProfileID"/>

-									<xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="IdentityLinkSigners">

-				<xsd:annotation>

-					<xsd:documentation>enthält Informationen über akzeptierte Signers des 

-						IdentityLinks</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="X509SubjectName" type="xsd:string" maxOccurs="unbounded">

-							<xsd:annotation>

-								<xsd:documentation>akzeptierte Signer des IdentityLinks werden per 

-									X509SubjectName (Kodierung nach RFC 2253) identifiziert</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="TransformsInfoType">

-		<xsd:annotation>

-			<xsd:documentation>das Attribut filename verweist auf eine Datei mit globalem 

-				Element TransformsInfo vom Typ sl10:TransformsInfo; diese TransformsInfo 

-				werden in den CreateXMLSignatureRequest für die Signatur des AUTH-Blocks 

-				inkludiert</xsd:documentation>

-		</xsd:annotation>

-		<xsd:attribute name="filename" type="xsd:anyURI" use="required"/>

-	</xsd:complexType>

-	<xsd:complexType name="TemplatesType">

-		<xsd:sequence>

-			<xsd:element name="BKUSelectionTemplate" type="TemplateType" minOccurs="0" maxOccurs="1"/>

-			<xsd:element name="Template" type="TemplateType" minOccurs="0" maxOccurs="1"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="TemplateType">

-		<xsd:annotation>

-			<xsd:documentation>das Attribut URL spezifiziert die Lage des Templates</xsd:documentation>

-		</xsd:annotation>

-		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>

-	</xsd:complexType>

-	<xsd:complexType name="ProxyComponentType"/>

-	<xsd:complexType name="OnlineApplicationType">

-		<xsd:sequence>

-			<xsd:element name="AuthComponent" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>enthält Parameter über die OA, die die 

-						Authentisierungs-Komponente betreffen</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<!--xsd:element name="IdentificationNumber" minOccurs="0">

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:element ref="pr:AbstractSimpleIdentification"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element-->						

-						<xsd:element name="IdentificationNumber" minOccurs="0">

-							<xsd:complexType>

-								<xsd:choice>

-									<xsd:element ref="pr:Firmenbuchnummer"/>

-									<xsd:element ref="pr:ZMRzahl"/>

-									<xsd:element ref="pr:Vereinsnummer"/>

-									<xsd:element ref="pr:ERJPZahl"/>

-									<xsd:element name="AnyNumber">

-										<xsd:complexType>

-											<xsd:simpleContent>

-												<xsd:extension base="xsd:string">

-													<xsd:attribute name="Identifier" type="xsd:string" use="required"/>

-												</xsd:extension>

-											</xsd:simpleContent>

-										</xsd:complexType>

-									</xsd:element>

-								</xsd:choice>

-							</xsd:complexType>

-						</xsd:element>

-						<xsd:element name="Templates" type="TemplatesType" minOccurs="0" maxOccurs="1" />

-						<xsd:element name="TransformsInfo" type="TransformsInfoType" minOccurs="0" maxOccurs="unbounded"/>

-					</xsd:sequence>

-					<xsd:attribute name="slVersion" use="optional" default="1.1">

-						<xsd:simpleType>

-							<xsd:restriction base="xsd:string">

-								<xsd:enumeration value="1.1"/>

-								<xsd:enumeration value="1.2"/>

-							</xsd:restriction>

-						</xsd:simpleType>

-					</xsd:attribute>

-					<xsd:attribute name="provideStammzahl" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideAUTHBlock" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideIdentityLink" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideCertificate" type="xsd:boolean" use="optional" default="false"/>

-					<!--xsd:element ref="pr:AbstractSimpleIdentification" minOccurs="0" maxOccurs="1"/-->

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="ProxyComponent" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente 

-						betreffen</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente 

-									betreffen</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-					</xsd:sequence>

-					<xsd:attribute name="configFileURL" type="xsd:anyURI" use="optional"/>

-					<xsd:attribute name="sessionTimeOut" type="xsd:int" use="optional"/>

-					<xsd:attribute name="loginParameterResolverImpl" type="xsd:string" use="optional"/>

-					<xsd:attribute name="loginParameterResolverConfiguration" type="xsd:string" use="optional"/>

-					<xsd:attribute name="connectionBuilderImpl" type="xsd:string" use="optional"/>

-				</xsd:complexType>

-			</xsd:element>

-			<!--xsd:element ref="pr:CorporateBody" minOccurs="0" maxOccurs="1"/-->

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="ConnectionParameterServerAuthType">

-		<xsd:sequence>

-			<xsd:element name="AcceptedServerCertificates" type="xsd:anyURI" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>URL zu einem Verzeichnis, das akzeptierte Server-Zertifikate der 

-						TLS-Verbindung enthält (keine CA-Zertifikate)</xsd:documentation>

-				</xsd:annotation>

-			</xsd:element>

-		</xsd:sequence>

-		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>

-	</xsd:complexType>

-	<xsd:complexType name="ConnectionParameterClientAuthType">

-		<xsd:complexContent>

-			<xsd:extension base="ConnectionParameterServerAuthType">

-				<xsd:sequence>

-					<xsd:element name="ClientKeyStore" minOccurs="0">

-						<xsd:annotation>

-							<xsd:documentation>URL zu einem KeyStore, der den privaten Schlüssel, der für 

-								die TLS-Client-Authentisierung verwendetwird, enthält</xsd:documentation>

-						</xsd:annotation>

-						<xsd:complexType>

-							<xsd:simpleContent>

-								<xsd:extension base="xsd:anyURI">

-									<xsd:attribute name="password" type="xsd:string" use="optional"/>

-								</xsd:extension>

-							</xsd:simpleContent>

-						</xsd:complexType>

-					</xsd:element>

-				</xsd:sequence>

-			</xsd:extension>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<xsd:element name="TrustProfileID" type="xsd:string"/>

-	<xsd:simpleType name="ChainingModeType">

-		<xsd:restriction base="xsd:string">

-			<xsd:enumeration value="chaining"/>

-			<xsd:enumeration value="pkix"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:simpleType name="BKUSelectionType">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="HTMLComplete"/>

-			<xsd:enumeration value="HTMLSelect"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-</xsd:schema>

diff --git a/id.server/doc/MOA-ID-Configuration-1.4.xsd b/id.server/doc/MOA-ID-Configuration-1.4.xsd
deleted file mode 100644
index 66a9c0ed4..000000000
--- a/id.server/doc/MOA-ID-Configuration-1.4.xsd
+++ /dev/null
@@ -1,505 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rudolf Schamberger (Stabsstelle IKT-Strategie) (Bundesrechenzentrum GmbH) -->

-<xsd:schema xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" targetNamespace="http://www.buergerkarte.at/namespaces/moaconfig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1.1">

-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

-	<xsd:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="PersonData_20_en_moaWID.xsd"/>

-	<xsd:element name="Configuration">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element name="LoginType" type="LoginType" default="stateful"/>

-				<xsd:element name="Binding" minOccurs="0">

-					<xsd:simpleType>

-						<xsd:restriction base="xsd:string">

-							<xsd:enumeration value="full"/>

-							<xsd:enumeration value="userName"/>

-							<xsd:enumeration value="none"/>

-						</xsd:restriction>

-					</xsd:simpleType>

-				</xsd:element>

-				<xsd:choice>

-					<xsd:element ref="ParamAuth"/>

-					<xsd:element ref="BasicAuth"/>

-					<xsd:element ref="HeaderAuth"/>

-				</xsd:choice>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:simpleType name="LoginType">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="stateless"/>

-			<xsd:enumeration value="stateful"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:element name="ParamAuth">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element ref="Parameter" maxOccurs="unbounded"/>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="Parameter">

-		<xsd:complexType>

-			<xsd:attribute name="Name" type="xsd:token" use="required"/>

-			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="BasicAuth">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element name="UserID" type="MOAAuthDataType"/>

-				<xsd:element name="Password" type="MOAAuthDataType"/>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="HeaderAuth">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element ref="Header" maxOccurs="unbounded"/>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:element name="Header">

-		<xsd:complexType>

-			<xsd:attribute name="Name" type="xsd:token" use="required"/>

-			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:simpleType name="MOAAuthDataType">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="MOAGivenName"/>

-			<xsd:enumeration value="MOAFamilyName"/>

-			<xsd:enumeration value="MOADateOfBirth"/>

-			<xsd:enumeration value="MOABPK"/>

-			<xsd:enumeration value="MOAWBPK"/>

-			<xsd:enumeration value="MOAPublicAuthority"/>

-			<xsd:enumeration value="MOABKZ"/>

-			<xsd:enumeration value="MOAQualifiedCertificate"/>

-			<xsd:enumeration value="MOAStammzahl"/>

-			<xsd:enumeration value="MOAIdentificationValueType"/>

-			<xsd:enumeration value="MOAIPAddress"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:simpleType name="MOAKeyBoxSelector">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="SecureSignatureKeypair"/>

-			<xsd:enumeration value="CertifiedKeypair"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<!--Konfiguration für Authentisierungs- und Proxy-Komponente und Online-Applikation-->

-	<xsd:element name="MOA-IDConfiguration">

-		<xsd:complexType>

-			<xsd:sequence>

-				<xsd:element name="AuthComponent" type="AuthComponentType" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>enthält Parameter der 

-							Authentisierungs-Komponente</xsd:documentation>

-					</xsd:annotation>

-				</xsd:element>

-				<xsd:element name="ProxyComponent" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>enthält Konfigurationsparameter der 

-							Proxy-Komponente</xsd:documentation>

-					</xsd:annotation>

-					<xsd:complexType>

-						<xsd:sequence>

-							<xsd:element name="AuthComponent">

-								<xsd:annotation>

-									<xsd:documentation>enthält Parameter für die Kommunikation zw. 

-										Proxykomponente und Authenttisierungskomponente</xsd:documentation>

-								</xsd:annotation>

-								<xsd:complexType>

-									<xsd:sequence>

-										<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">

-											<xsd:annotation>

-												<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der 

-													Proxy-Komponente zur Auth-Komponente (vgl. 

-													AuthComponent/MOA-SP/ConnectionParameter)</xsd:documentation>

-											</xsd:annotation>

-										</xsd:element>

-									</xsd:sequence>

-								</xsd:complexType>

-							</xsd:element>

-						</xsd:sequence>

-					</xsd:complexType>

-				</xsd:element>

-				<xsd:element name="OnlineApplication" maxOccurs="unbounded">

-					<xsd:annotation>

-						<xsd:documentation>enthält Parameter für die OA</xsd:documentation>

-					</xsd:annotation>

-					<xsd:complexType>

-						<xsd:complexContent>

-							<xsd:extension base="OnlineApplicationType">

-								<xsd:attribute name="publicURLPrefix" type="xsd:anyURI" use="required"/>

-								<xsd:attribute name="keyBoxIdentifier" type="MOAKeyBoxSelector" use="optional" default="SecureSignatureKeypair"/>

-								<xsd:attribute name="type" use="optional" default="publicService">

-									<xsd:simpleType>

-										<xsd:restriction base="xsd:NMTOKEN">

-											<xsd:enumeration value="businessService"/>

-											<xsd:enumeration value="publicService"/>

-										</xsd:restriction>

-									</xsd:simpleType>

-								</xsd:attribute>

-								<xsd:attribute name="calculateHPI" type="xsd:boolean" use="optional" default="false"/>

-							</xsd:extension>

-						</xsd:complexContent>

-					</xsd:complexType>

-				</xsd:element>

-				<xsd:element name="ChainingModes" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>spezifiziert den Algorithmus ("pkix" oder "chaining") für die 

-							Zertifikatspfadvalidierung</xsd:documentation>

-					</xsd:annotation>

-					<xsd:complexType>

-						<xsd:sequence minOccurs="0" maxOccurs="unbounded">

-							<xsd:element name="TrustAnchor">

-								<xsd:annotation>

-									<xsd:documentation>ein vom SystemDefaultMode abweichender ChiningMode kann 

-										für jeden TrustAnchor gesetzt werden</xsd:documentation>

-								</xsd:annotation>

-								<xsd:complexType>

-									<xsd:complexContent>

-										<xsd:extension base="dsig:X509IssuerSerialType">

-											<xsd:attribute name="mode" type="ChainingModeType" use="required"/>

-										</xsd:extension>

-									</xsd:complexContent>

-								</xsd:complexType>

-							</xsd:element>

-						</xsd:sequence>

-						<xsd:attribute name="systemDefaultMode" type="ChainingModeType" use="optional" default="pkix"/>

-					</xsd:complexType>

-				</xsd:element>

-				<xsd:element name="TrustedCACertificates" type="xsd:anyURI" minOccurs="0">

-					<xsd:annotation>

-						<xsd:documentation>verweist auf ein Verzeichnis, das vertrauenswürdige CA 

-							(Zwischen-CA, Wurzel-CA) Zertifikate enthält.</xsd:documentation>

-					</xsd:annotation>

-				</xsd:element>

-				<xsd:element name="GenericConfiguration" minOccurs="0" maxOccurs="unbounded">

-					<xsd:complexType>

-						<xsd:attribute name="name" use="required">

-							<xsd:simpleType>

-								<xsd:restriction base="xsd:string">

-									<xsd:enumeration value="DirectoryCertStoreParameters.RootDir"/>

-									<xsd:enumeration value="AuthenticationSession.TimeOut"/>

-									<xsd:enumeration value="AuthenticationData.TimeOut"/>

-									<xsd:enumeration value="TrustManager.RevocationChecking"/>

-									<xsd:enumeration value="FrontendServlets.EnableHTTPConnection"/>

-									<xsd:enumeration value="FrontendServlets.DataURLPrefix"/>

-								</xsd:restriction>

-							</xsd:simpleType>

-						</xsd:attribute>

-						<xsd:attribute name="value" type="xsd:string" use="required"/>

-					</xsd:complexType>

-				</xsd:element>

-			</xsd:sequence>

-		</xsd:complexType>

-	</xsd:element>

-	<xsd:complexType name="AuthComponentType">

-		<xsd:sequence>

-			<xsd:element name="BKUSelection" minOccurs="0">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="ConnectionParameter" type="ConnectionParameterServerAuthType"/>

-					</xsd:sequence>

-					<xsd:attribute name="BKUSelectionAlternative" type="BKUSelectionType" use="optional" default="HTMLComplete"/>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Templates" type="TemplatesType" minOccurs="0"/>

-			<xsd:element name="SecurityLayer">

-				<xsd:annotation>

-					<xsd:documentation>enthält Parameter für die Kommunikation mit dem 

-						Security-Layer</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="TransformsInfo" type="TransformsInfoType" maxOccurs="unbounded"/>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="MOA-SP">

-				<xsd:annotation>

-					<xsd:documentation>enthält Konfiguratiosnparameter für die Kommunikation mit dem MOA 

-						SP Modul</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der 

-									AUTH-Komponente zu MOA-SP; das Attribut URL enthält den Endpunkt des Server; 

-									wird das Schema "https" verwendet müssen die Kind-Elemente angegeben werden; 

-									wird das Schema "http" verwendet dürfen keine Kind-Elemente angegeben 

-									werden; wird das Element nicht verwendet dann wird MOA-SP über das API 

-									aufgerufen</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-						<xsd:element name="VerifyIdentityLink">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter für die Überprüfung der 

-									Personenbindung</xsd:documentation>

-							</xsd:annotation>

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:element ref="TrustProfileID"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element>

-						<xsd:element name="VerifyAuthBlock">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter für die Überprüfung des 

-									AUTH-Blocks</xsd:documentation>

-							</xsd:annotation>

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:element ref="TrustProfileID"/>

-									<xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="IdentityLinkSigners" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>enthält Informationen über akzeptierte Signers des 

-						IdentityLinks</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="X509SubjectName" type="xsd:string" maxOccurs="unbounded">

-							<xsd:annotation>

-								<xsd:documentation>akzeptierte Signer des IdentityLinks werden per 

-									X509SubjectName (Kodierung nach RFC 2253) identifiziert</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="VerifyInfoboxes" type="VerifyInfoboxesType" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>enthält Defaultparameter für die Überprüfung weiterer Infoboxen</xsd:documentation>

-				</xsd:annotation>

-			</xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="TransformsInfoType">

-		<xsd:annotation>

-			<xsd:documentation>das Attribut filename verweist auf eine Datei mit globalem 

-				Element TransformsInfo vom Typ sl10:TransformsInfo; diese TransformsInfo 

-				werden in den CreateXMLSignatureRequest für die Signatur des AUTH-Blocks 

-				inkludiert</xsd:documentation>

-		</xsd:annotation>

-		<xsd:attribute name="filename" type="xsd:anyURI" use="required"/>

-	</xsd:complexType>

-	<xsd:complexType name="TemplatesType">

-		<xsd:sequence>

-			<xsd:element name="BKUSelectionTemplate" type="TemplateType" minOccurs="0"/>

-			<xsd:element name="Template" type="TemplateType" minOccurs="0"/>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="TemplateType">

-		<xsd:annotation>

-			<xsd:documentation>das Attribut URL spezifiziert die Lage des Templates</xsd:documentation>

-		</xsd:annotation>

-		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>

-	</xsd:complexType>

-	<xsd:complexType name="VerifyInfoboxesType">

-		<xsd:annotation>

-			<xsd:documentation>Verifikation zusätzlicher Infoboxen</xsd:documentation>

-		</xsd:annotation>

-		<xsd:sequence>

-			<xsd:element name="DefaultTrustProfile" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>Optionales DefaultTrustprofil für die Überprüfung aller weiteren Infoboxen</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element ref="TrustProfileID"/>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Infobox" maxOccurs="unbounded">

-				<xsd:annotation>

-					<xsd:documentation>Parameter für Überprüfung weiterer Infoboxen</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="FriendlyName" type="xsd:string" minOccurs="0">

-							<xsd:annotation>

-								<xsd:documentation>optionalervName, der für Fehlermeldungen verwendet werden soll;

-								z.B.: "Stellvertretungen" für "Mandates"; fehlt dieser Parameter, dann wird

-								das Identifier-Attribut verwendet</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-						<xsd:element name="TrustProfileID" type="xsd:string" minOccurs="0">

-							<xsd:annotation>

-								<xsd:documentation>TrustProfil, das für die Überprüfung der Infobox

-								verwendet werden soll</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-						<xsd:element name="ValidatorClass" type="xsd:string" minOccurs="0">

-							<xsd:annotation>

-								<xsd:documentation>Validatorklasse, die für die Prüfung der Infobox

-								verwendet werden soll; muss gesetzt werden, wenn Package- und Klassenname

-								vom Default Package- und Klassennamen abweichen</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-						<xsd:element name="SchemaLocations" type="SchemaLocationType" minOccurs="0"/>

-						<xsd:element name="ApplicationSpecificParameters" minOccurs="0">

-							<xsd:annotation>

-								<xsd:documentation>Infobox spezifische Parameter, die der jeweiligen Prüfapplikation

-									 übergeben werden</xsd:documentation>

-							</xsd:annotation>

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:any namespace="##any" processContents="skip" maxOccurs="unbounded"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element>

-					</xsd:sequence>

-					<xsd:attribute name="Identifier" type="xsd:string" use="required"/>

-					<xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideStammzahl" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideIdentityLink" type="xsd:boolean" use="optional" default="false"/>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="SchemaLocationType">

-		<xsd:annotation>

-			<xsd:documentation>Spezifiziert die Lage von XML Schemas</xsd:documentation>

-		</xsd:annotation>

-		<xsd:sequence>

-			<xsd:element name="Schema" maxOccurs="unbounded">

-				<xsd:complexType>

-					<xsd:attribute name="namespace" type="xsd:anyURI" use="required"/>

-					<xsd:attribute name="schemaLocation" type="xsd:anyURI" use="required"/>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="ProxyComponentType"/>

-	<xsd:complexType name="OnlineApplicationType">

-		<xsd:sequence>

-			<xsd:element name="AuthComponent" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>enthält Parameter über die OA, die die 

-						Authentisierungs-Komponente betreffen</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<!--xsd:element name="IdentificationNumber" minOccurs="0">

-							<xsd:complexType>

-								<xsd:sequence>

-									<xsd:element ref="pr:AbstractSimpleIdentification"/>

-								</xsd:sequence>

-							</xsd:complexType>

-						</xsd:element-->

-						<xsd:element name="IdentificationNumber" minOccurs="0">

-							<xsd:complexType>

-								<xsd:choice>

-									<xsd:element ref="pr:Firmenbuchnummer"/>

-									<xsd:element ref="pr:ZMRzahl"/>

-									<xsd:element ref="pr:Vereinsnummer"/>

-									<xsd:element ref="pr:ERJPZahl"/>

-									<xsd:element name="AnyNumber">

-										<xsd:complexType>

-											<xsd:simpleContent>

-												<xsd:extension base="xsd:string">

-													<xsd:attribute name="Identifier" type="xsd:string" use="required"/>

-												</xsd:extension>

-											</xsd:simpleContent>

-										</xsd:complexType>

-									</xsd:element>

-								</xsd:choice>

-							</xsd:complexType>

-						</xsd:element>

-						<xsd:element name="Templates" type="TemplatesType" minOccurs="0"/>

-						<xsd:element name="TransformsInfo" type="TransformsInfoType" minOccurs="0" maxOccurs="unbounded"/>

-						<xsd:element name="VerifyInfoboxes" type="VerifyInfoboxesType" minOccurs="0"/>

-					</xsd:sequence>

-					<xsd:attribute name="slVersion" use="optional" default="1.1">

-						<xsd:simpleType>

-							<xsd:restriction base="xsd:string">

-								<xsd:enumeration value="1.1"/>

-								<xsd:enumeration value="1.2"/>

-							</xsd:restriction>

-						</xsd:simpleType>

-					</xsd:attribute>

-					<xsd:attribute name="provideStammzahl" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideAUTHBlock" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideIdentityLink" type="xsd:boolean" use="optional" default="false"/>

-					<xsd:attribute name="provideCertificate" type="xsd:boolean" use="optional" default="false"/>

-					<!--xsd:element ref="pr:AbstractSimpleIdentification" minOccurs="0" maxOccurs="1"/-->

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="ProxyComponent" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente 

-						betreffen</xsd:documentation>

-				</xsd:annotation>

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType">

-							<xsd:annotation>

-								<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente 

-									betreffen</xsd:documentation>

-							</xsd:annotation>

-						</xsd:element>

-					</xsd:sequence>

-					<xsd:attribute name="configFileURL" type="xsd:anyURI" use="optional"/>

-					<xsd:attribute name="sessionTimeOut" type="xsd:int" use="optional"/>

-					<xsd:attribute name="loginParameterResolverImpl" type="xsd:string" use="optional"/>

-					<xsd:attribute name="loginParameterResolverConfiguration" type="xsd:string" use="optional"/>

-					<xsd:attribute name="connectionBuilderImpl" type="xsd:string" use="optional"/>

-				</xsd:complexType>

-			</xsd:element>

-			<!--xsd:element ref="pr:CorporateBody" minOccurs="0" maxOccurs="1"/-->

-		</xsd:sequence>

-	</xsd:complexType>

-	<xsd:complexType name="ConnectionParameterServerAuthType">

-		<xsd:sequence>

-			<xsd:element name="AcceptedServerCertificates" type="xsd:anyURI" minOccurs="0">

-				<xsd:annotation>

-					<xsd:documentation>URL zu einem Verzeichnis, das akzeptierte Server-Zertifikate der 

-						TLS-Verbindung enthält (keine CA-Zertifikate)</xsd:documentation>

-				</xsd:annotation>

-			</xsd:element>

-		</xsd:sequence>

-		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>

-	</xsd:complexType>

-	<xsd:complexType name="ConnectionParameterClientAuthType">

-		<xsd:complexContent>

-			<xsd:extension base="ConnectionParameterServerAuthType">

-				<xsd:sequence>

-					<xsd:element name="ClientKeyStore" minOccurs="0">

-						<xsd:annotation>

-							<xsd:documentation>URL zu einem KeyStore, der den privaten Schlüssel, der für 

-								die TLS-Client-Authentisierung verwendetwird, enthält</xsd:documentation>

-						</xsd:annotation>

-						<xsd:complexType>

-							<xsd:simpleContent>

-								<xsd:extension base="xsd:anyURI">

-									<xsd:attribute name="password" type="xsd:string" use="optional"/>

-								</xsd:extension>

-							</xsd:simpleContent>

-						</xsd:complexType>

-					</xsd:element>

-				</xsd:sequence>

-			</xsd:extension>

-		</xsd:complexContent>

-	</xsd:complexType>

-	<xsd:element name="TrustProfileID" type="xsd:string"/>

-	<xsd:simpleType name="ChainingModeType">

-		<xsd:restriction base="xsd:string">

-			<xsd:enumeration value="chaining"/>

-			<xsd:enumeration value="pkix"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-	<xsd:simpleType name="BKUSelectionType">

-		<xsd:restriction base="xsd:token">

-			<xsd:enumeration value="HTMLComplete"/>

-			<xsd:enumeration value="HTMLSelect"/>

-		</xsd:restriction>

-	</xsd:simpleType>

-</xsd:schema>

diff --git a/id.server/doc/cs-sstc-schema-assertion-01.xsd b/id.server/doc/cs-sstc-schema-assertion-01.xsd
deleted file mode 100644
index 8bc5af147..000000000
--- a/id.server/doc/cs-sstc-schema-assertion-01.xsd
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Phill Hallam-Baker (VeriSign Inc.) -->

-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">

-        <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

-        <annotation>

-                <documentation>

-                Document identifier: cs-sstc-schema-assertion-01

-                Location: http://www.oasis-open.org/committees/security/docs/

-                </documentation>

-        </annotation>

-        <simpleType name="IDType">

-                <restriction base="string"/>

-        </simpleType>

-        <simpleType name="IDReferenceType">

-                <restriction base="string"/>

-        </simpleType>

-        <simpleType name="DecisionType">

-                <restriction base="string">

-                        <enumeration value="Permit"/>

-                        <enumeration value="Deny"/>

-                        <enumeration value="Indeterminate"/>

-                </restriction>

-        </simpleType>

-        <element name="AssertionIDReference" type="saml:IDReferenceType"/>

-        <element name="Assertion" type="saml:AssertionType"/>

-        <complexType name="AssertionType">

-                <sequence>

-                        <element ref="saml:Conditions" minOccurs="0"/>

-                        <element ref="saml:Advice" minOccurs="0"/>

-                        <choice maxOccurs="unbounded">

-                                <element ref="saml:Statement"/>

-                                <element ref="saml:SubjectStatement"/>

-                                <element ref="saml:AuthenticationStatement"/>

-                                <element ref="saml:AuthorizationDecisionStatement"/>

-                                <element ref="saml:AttributeStatement"/>

-                        </choice>

-                        <element ref="ds:Signature" minOccurs="0"/>

-                </sequence>

-                <attribute name="MajorVersion" type="integer" use="required"/>

-                <attribute name="MinorVersion" type="integer" use="required"/>

-                <attribute name="AssertionID" type="saml:IDType" use="required"/>

-                <attribute name="Issuer" type="string" use="required"/>

-                <attribute name="IssueInstant" type="dateTime" use="required"/>

-        </complexType>

-        <element name="Conditions" type="saml:ConditionsType"/>

-        <complexType name="ConditionsType">

-                <choice minOccurs="0" maxOccurs="unbounded">

-                        <element ref="saml:AudienceRestrictionCondition"/>

-                        <element ref="saml:Condition"/>

-                </choice>

-                <attribute name="NotBefore" type="dateTime" use="optional"/>

-                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>

-        </complexType>

-        <element name="Condition" type="saml:ConditionAbstractType"/>

-        <complexType name="ConditionAbstractType" abstract="true"/>

-        <element name="AudienceRestrictionCondition" type="saml:AudienceRestrictionConditionType"/>

-        <complexType name="AudienceRestrictionConditionType">

-                <complexContent>

-                        <extension base="saml:ConditionAbstractType">

-                                <sequence>

-                                        <element ref="saml:Audience" maxOccurs="unbounded"/>

-                                </sequence>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="Audience" type="anyURI"/>

-        <element name="Advice" type="saml:AdviceType"/>

-        <complexType name="AdviceType">

-                <choice minOccurs="0" maxOccurs="unbounded">

-                        <element ref="saml:AssertionIDReference"/>

-                        <element ref="saml:Assertion"/>

-                        <any namespace="##other" processContents="lax"/>

-                </choice>

-        </complexType>

-        <element name="Statement" type="saml:StatementAbstractType"/>

-        <complexType name="StatementAbstractType" abstract="true"/>

-        <element name="SubjectStatement" type="saml:SubjectStatementAbstractType"/>

-        <complexType name="SubjectStatementAbstractType" abstract="true">

-                <complexContent>

-                        <extension base="saml:StatementAbstractType">

-                                <sequence>

-                                        <element ref="saml:Subject"/>

-                                </sequence>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="Subject" type="saml:SubjectType"/>

-        <complexType name="SubjectType">

-                <choice>

-                        <sequence>

-                                <element ref="saml:NameIdentifier"/>

-                                <element ref="saml:SubjectConfirmation" minOccurs="0"/>

-                        </sequence>

-                        <element ref="saml:SubjectConfirmation"/>

-                </choice>

-        </complexType>

-        <element name="NameIdentifier" type="saml:NameIdentifierType"/>

-        <complexType name="NameIdentifierType">

-                <simpleContent>

-                        <extension base="string">

-                                <attribute name="NameQualifier" type="string" use="optional"/>

-                                <attribute name="Format" type="anyURI" use="optional"/>

-                        </extension>

-                </simpleContent>

-        </complexType>

-        <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>

-        <complexType name="SubjectConfirmationType">

-                <sequence>

-                        <element ref="saml:ConfirmationMethod" maxOccurs="unbounded"/>

-                        <element ref="saml:SubjectConfirmationData" minOccurs="0"/>

-                        <element ref="ds:KeyInfo" minOccurs="0"/>

-                </sequence>

-        </complexType>

-        <element name="SubjectConfirmationData" type="anyType"/>

-        <element name="ConfirmationMethod" type="anyURI"/>

-        <element name="AuthenticationStatement" type="saml:AuthenticationStatementType"/>

-        <complexType name="AuthenticationStatementType">

-                <complexContent>

-                        <extension base="saml:SubjectStatementAbstractType">

-                                <sequence>

-                                        <element ref="saml:SubjectLocality" minOccurs="0"/>

-                                        <element ref="saml:AuthorityBinding" minOccurs="0" maxOccurs="unbounded"/>

-                                </sequence>

-                                <attribute name="AuthenticationMethod" type="anyURI" use="required"/>

-                                <attribute name="AuthenticationInstant" type="dateTime" use="required"/>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="SubjectLocality" type="saml:SubjectLocalityType"/>

-        <complexType name="SubjectLocalityType">

-                <attribute name="IPAddress" type="string" use="optional"/>

-                <attribute name="DNSAddress" type="string" use="optional"/>

-        </complexType>

-        <element name="AuthorityBinding" type="saml:AuthorityBindingType"/>

-        <complexType name="AuthorityBindingType">

-                <attribute name="AuthorityKind" type="QName" use="required"/>

-                <attribute name="Location" type="anyURI" use="required"/>

-                <attribute name="Binding" type="anyURI" use="required"/>

-        </complexType>

-        <element name="AuthorizationDecisionStatement" type="saml:AuthorizationDecisionStatementType"/>

-        <complexType name="AuthorizationDecisionStatementType">

-                <complexContent>

-                        <extension base="saml:SubjectStatementAbstractType">

-                                <sequence>

-                                        <element ref="saml:Action" maxOccurs="unbounded"/>

-                                        <element ref="saml:Evidence" minOccurs="0"/>

-                                </sequence>

-                                <attribute name="Resource" type="anyURI" use="required"/>

-                                <attribute name="Decision" type="saml:DecisionType" use="required"/>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="Action" type="saml:ActionType"/>

-        <complexType name="ActionType">

-                <simpleContent>

-                        <extension base="string">

-                                <attribute name="Namespace" type="anyURI"/>

-                        </extension>

-                </simpleContent>

-        </complexType>

-        <element name="Evidence" type="saml:EvidenceType"/>

-        <complexType name="EvidenceType">

-                <choice maxOccurs="unbounded">

-                        <element ref="saml:AssertionIDReference"/>

-                        <element ref="saml:Assertion"/>

-                </choice>

-        </complexType>

-        <element name="AttributeStatement" type="saml:AttributeStatementType"/>

-        <complexType name="AttributeStatementType">

-                <complexContent>

-                        <extension base="saml:SubjectStatementAbstractType">

-                                <sequence>

-                                        <element ref="saml:Attribute" maxOccurs="unbounded"/>

-                                </sequence>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="AttributeDesignator" type="saml:AttributeDesignatorType"/>

-        <complexType name="AttributeDesignatorType">

-                <attribute name="AttributeName" type="string" use="required"/>

-                <attribute name="AttributeNamespace" type="anyURI" use="required"/>

-        </complexType>

-        <element name="Attribute" type="saml:AttributeType"/>

-        <complexType name="AttributeType">

-                <complexContent>

-                        <extension base="saml:AttributeDesignatorType">

-                                <sequence>

-                                        <element ref="saml:AttributeValue" maxOccurs="unbounded"/>

-                                </sequence>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="AttributeValue" type="anyType"/>

-</schema>

diff --git a/id.server/doc/cs-sstc-schema-protocol-01.xsd b/id.server/doc/cs-sstc-schema-protocol-01.xsd
deleted file mode 100644
index ecad05b0f..000000000
--- a/id.server/doc/cs-sstc-schema-protocol-01.xsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- edited with XML Spy v4.2 U (http://www.xmlspy.com) by Phillip Hallam-Baker (Phillip Hallam-Baker) -->

-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">

-        <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-01.xsd"/>

-        <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

-        <annotation>

-                <documentation>

-                Document identifier: cs-sstc-schema-protocol-01

-                Location: http://www.oasis-open.org/committees/security/docs/

-                </documentation>

-        </annotation>

-        <complexType name="RequestAbstractType" abstract="true">

-                <sequence>

-                        <element ref="samlp:RespondWith" minOccurs="0" maxOccurs="unbounded"/>

-                        <element ref="ds:Signature" minOccurs="0"/>

-                </sequence>

-                <attribute name="RequestID" type="saml:IDType" use="required"/>

-                <attribute name="MajorVersion" type="integer" use="required"/>

-                <attribute name="MinorVersion" type="integer" use="required"/>

-                <attribute name="IssueInstant" type="dateTime" use="required"/>

-        </complexType>

-        <element name="RespondWith" type="QName"/>

-        <element name="Request" type="samlp:RequestType"/>

-        <complexType name="RequestType">

-                <complexContent>

-                        <extension base="samlp:RequestAbstractType">

-                                <choice>

-                                        <element ref="samlp:Query"/>

-                                        <element ref="samlp:SubjectQuery"/>

-                                        <element ref="samlp:AuthenticationQuery"/>

-                                        <element ref="samlp:AttributeQuery"/>

-                                        <element ref="samlp:AuthorizationDecisionQuery"/>

-                                        <element ref="saml:AssertionIDReference" maxOccurs="unbounded"/>

-                                        <element ref="samlp:AssertionArtifact" maxOccurs="unbounded"/>

-                                </choice>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="AssertionArtifact" type="string"/>

-        <element name="Query" type="samlp:QueryAbstractType"/>

-        <complexType name="QueryAbstractType" abstract="true"/>

-        <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>

-        <complexType name="SubjectQueryAbstractType" abstract="true">

-                <complexContent>

-                        <extension base="samlp:QueryAbstractType">

-                                <sequence>

-                                        <element ref="saml:Subject"/>

-                                </sequence>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="AuthenticationQuery" type="samlp:AuthenticationQueryType"/>

-        <complexType name="AuthenticationQueryType">

-                <complexContent>

-                        <extension base="samlp:SubjectQueryAbstractType">

-                                <attribute name="AuthenticationMethod" type="anyURI"/>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="AttributeQuery" type="samlp:AttributeQueryType"/>

-        <complexType name="AttributeQueryType">

-                <complexContent>

-                        <extension base="samlp:SubjectQueryAbstractType">

-                                <sequence>

-                                        <element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>

-                                </sequence>

-                                <attribute name="Resource" type="anyURI" use="optional"/>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="AuthorizationDecisionQuery" type="samlp:AuthorizationDecisionQueryType"/>

-        <complexType name="AuthorizationDecisionQueryType">

-                <complexContent>

-                        <extension base="samlp:SubjectQueryAbstractType">

-                                <sequence>

-                                        <element ref="saml:Action" maxOccurs="unbounded"/>

-                                        <element ref="saml:Evidence" minOccurs="0" maxOccurs="1"/>

-                                </sequence>

-                                <attribute name="Resource" type="anyURI" use="required"/>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <complexType name="ResponseAbstractType" abstract="true">

-                <sequence>

-                        <element ref="ds:Signature" minOccurs="0"/>

-                </sequence>

-                <attribute name="ResponseID" type="saml:IDType" use="required"/>

-                <attribute name="InResponseTo" type="saml:IDReferenceType" use="optional"/>

-                <attribute name="MajorVersion" type="integer" use="required"/>

-                <attribute name="MinorVersion" type="integer" use="required"/>

-                <attribute name="IssueInstant" type="dateTime" use="required"/>

-                <attribute name="Recipient" type="anyURI" use="optional"/>

-        </complexType>

-        <element name="Response" type="samlp:ResponseType"/>

-        <complexType name="ResponseType">

-                <complexContent>

-                        <extension base="samlp:ResponseAbstractType">

-                                <sequence>

-                                        <element ref="samlp:Status"/>

-                                        <element ref="saml:Assertion" minOccurs="0" maxOccurs="unbounded"/>

-                                </sequence>

-                        </extension>

-                </complexContent>

-        </complexType>

-        <element name="Status" type="samlp:StatusType"/>

-        <complexType name="StatusType">

-                <sequence>

-                        <element ref="samlp:StatusCode"/>

-                        <element ref="samlp:StatusMessage" minOccurs="0" maxOccurs="1"/>

-                        <element ref="samlp:StatusDetail" minOccurs="0"/>

-                </sequence>

-        </complexType>

-        <element name="StatusCode" type="samlp:StatusCodeType"/>

-        <complexType name="StatusCodeType">

-                <sequence>

-                        <element ref="samlp:StatusCode" minOccurs="0"/>

-                </sequence>

-                <attribute name="Value" type="QName" use="required"/>

-        </complexType>

-        <element name="StatusMessage" type="string"/>

-        <element name="StatusDetail" type="samlp:StatusDetailType"/>

-        <complexType name="StatusDetailType">

-                <sequence>

-                        <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-                </sequence>

-        </complexType>

-</schema>

diff --git a/id.templates/.project b/id.templates/.project
deleted file mode 100644
index 055d6569e..000000000
--- a/id.templates/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>id.templates</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.etools.ctc.serviceprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.ibm.etools.ctc.javaprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/id.templates/build.xml b/id.templates/build.xml
deleted file mode 100644
index 696616eaa..000000000
--- a/id.templates/build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  Ant Buildfile for MOA ID templates component
-
-  $Id$
-
--->
-<project name="id.templates" default="package" basedir=".">
-  <property name="tmp" value="tmp"/>
-  <property name="dist" value="${tmp}/dist"/>
-                   
-  <!-- set up directories etc. -->
-  <target name="init">
-    <tstamp/>
-    <echo>Time (hhmm): ${TSTAMP}</echo>
-    <mkdir dir="${tmp}"/>
-    <mkdir dir="${dist}"/>
-  </target>
-
-  <!-- package templates.war -->
-  <target name="package" depends="init">
-    <war warfile="${dist}/moaid-templates.war" webxml="web.xml">
-      <fileset dir="html"/>
-    </war>
-  </target>
-
-  <!-- clean temporary files -->
-  <target name="clean">
-    <delete dir="${tmp}"/>
-  </target>
-</project>
diff --git a/id.oa/web.xml b/id/oa/src/main/webapp/WEB-INF/web.xml
index 13158fdaa..13158fdaa 100644
--- a/id.oa/web.xml
+++ b/id/oa/src/main/webapp/WEB-INF/web.xml
diff --git a/id.oa/html/auth.jsp b/id/oa/src/main/webapp/auth.jsp
index 0b563a83e..0b563a83e 100644
--- a/id.oa/html/auth.jsp
+++ b/id/oa/src/main/webapp/auth.jsp
diff --git a/id.oa/html/chooseBKU.jsp b/id/oa/src/main/webapp/chooseBKU.jsp
index 0135b6fdf..0135b6fdf 100644
--- a/id.oa/html/chooseBKU.jsp
+++ b/id/oa/src/main/webapp/chooseBKU.jsp
diff --git a/id.oa/html/form.jsp b/id/oa/src/main/webapp/form.jsp
index d439fa84d..d439fa84d 100644
--- a/id.oa/html/form.jsp
+++ b/id/oa/src/main/webapp/form.jsp
diff --git a/id.oa/html/getBKUSelectTag.jsp b/id/oa/src/main/webapp/getBKUSelectTag.jsp
index 028dbd348..028dbd348 100644
--- a/id.oa/html/getBKUSelectTag.jsp
+++ b/id/oa/src/main/webapp/getBKUSelectTag.jsp
diff --git a/id.oa/html/index.jsp b/id/oa/src/main/webapp/index.jsp
index 35e49d743..35e49d743 100644
--- a/id.oa/html/index.jsp
+++ b/id/oa/src/main/webapp/index.jsp
diff --git a/id.oa/html/stateful_login.jsp b/id/oa/src/main/webapp/stateful_login.jsp
index eaede507f..eaede507f 100644
--- a/id.oa/html/stateful_login.jsp
+++ b/id/oa/src/main/webapp/stateful_login.jsp
diff --git a/id.server/html/auth/WEB-INF/server-config.wsdd b/id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd
index 0f0eb49d1..0f0eb49d1 100644
--- a/id.server/html/auth/WEB-INF/server-config.wsdd
+++ b/id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd
diff --git a/id.server/html/auth/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 603758fb8..603758fb8 100644
--- a/id.server/html/auth/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
diff --git a/id.server/html/auth/errorpage-auth.jsp b/id/server/auth/src/main/webapp/errorpage-auth.jsp
index 07f3e7f69..07f3e7f69 100644
--- a/id.server/html/auth/errorpage-auth.jsp
+++ b/id/server/auth/src/main/webapp/errorpage-auth.jsp
diff --git a/id.server/html/auth/index.jsp b/id/server/auth/src/main/webapp/index.jsp
index 733ba317f..733ba317f 100644
--- a/id.server/html/auth/index.jsp
+++ b/id/server/auth/src/main/webapp/index.jsp
diff --git a/id.server/html/auth/message-auth.jsp b/id/server/auth/src/main/webapp/message-auth.jsp
index 0c28c1ba7..0c28c1ba7 100644
--- a/id.server/html/auth/message-auth.jsp
+++ b/id/server/auth/src/main/webapp/message-auth.jsp
diff --git a/id.server/data/deploy/conf/Catalina/localhost/proxy.xml b/id/server/data/deploy/conf/Catalina/localhost/proxy.xml
index eef60b953..eef60b953 100644
--- a/id.server/data/deploy/conf/Catalina/localhost/proxy.xml
+++ b/id/server/data/deploy/conf/Catalina/localhost/proxy.xml
diff --git a/id.server/data/deploy/conf/moa-id/MOAIdentities.xsd b/id/server/data/deploy/conf/moa-id/MOAIdentities.xsd
index 91c7a6cc0..91c7a6cc0 100644
--- a/id.server/data/deploy/conf/moa-id/MOAIdentities.xsd
+++ b/id/server/data/deploy/conf/moa-id/MOAIdentities.xsd
diff --git a/id.server/data/deploy/conf/moa-id/SampleIdentities.xml b/id/server/data/deploy/conf/moa-id/SampleIdentities.xml
index fc6dc2ccf..fc6dc2ccf 100644
--- a/id.server/data/deploy/conf/moa-id/SampleIdentities.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleIdentities.xml
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
index f8dbd4b13..f8dbd4b13 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml
index 51d62bd72..51d62bd72 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml
index 8a9898792..8a9898792 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml
index b859fe758..b859fe758 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml
index e5b49bbe1..e5b49bbe1 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml
index 4e7a8ae54..4e7a8ae54 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml
index 1d5c410ec..1d5c410ec 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml
index 2afa97e77..2afa97e77 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml
diff --git a/id.server/data/deploy/conf/moa-id/log4j.properties b/id/server/data/deploy/conf/moa-id/log4j.properties
index debdb146c..debdb146c 100644
--- a/id.server/data/deploy/conf/moa-id/log4j.properties
+++ b/id/server/data/deploy/conf/moa-id/log4j.properties
diff --git a/id.server/data/deploy/conf/moa-id/oa/BasicOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/BasicOAConfiguration.xml
index fc99cea79..fc99cea79 100644
--- a/id.server/data/deploy/conf/moa-id/oa/BasicOAConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-id/oa/BasicOAConfiguration.xml
diff --git a/id.server/data/deploy/conf/moa-id/oa/HeaderOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/HeaderOAConfiguration.xml
index 4d34c3646..4d34c3646 100644
--- a/id.server/data/deploy/conf/moa-id/oa/HeaderOAConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-id/oa/HeaderOAConfiguration.xml
diff --git a/id.server/data/deploy/conf/moa-id/oa/ParamOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/ParamOAConfiguration.xml
index 979faca95..979faca95 100644
--- a/id.server/data/deploy/conf/moa-id/oa/ParamOAConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-id/oa/ParamOAConfiguration.xml
diff --git a/id.server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml
index edbfe7aa5..edbfe7aa5 100644
--- a/id.server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml
diff --git a/id.server/data/deploy/conf/moa-id/oa/SamplewbPKOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/SamplewbPKOAConfiguration.xml
index 2cff3bd67..2cff3bd67 100644
--- a/id.server/data/deploy/conf/moa-id/oa/SamplewbPKOAConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-id/oa/SamplewbPKOAConfiguration.xml
diff --git a/id.server/data/deploy/conf/moa-id/sampleTemplates/LIESMICH_TEMPLATES.txt b/id/server/data/deploy/conf/moa-id/sampleTemplates/LIESMICH_TEMPLATES.txt
index 01f724cc4..01f724cc4 100644
--- a/id.server/data/deploy/conf/moa-id/sampleTemplates/LIESMICH_TEMPLATES.txt
+++ b/id/server/data/deploy/conf/moa-id/sampleTemplates/LIESMICH_TEMPLATES.txt
diff --git a/id.server/data/deploy/conf/moa-id/sampleTemplates/SampleBKUSelectionTemplate.html b/id/server/data/deploy/conf/moa-id/sampleTemplates/SampleBKUSelectionTemplate.html
index 2f2ea6552..2f2ea6552 100644
--- a/id.server/data/deploy/conf/moa-id/sampleTemplates/SampleBKUSelectionTemplate.html
+++ b/id/server/data/deploy/conf/moa-id/sampleTemplates/SampleBKUSelectionTemplate.html
diff --git a/id.server/data/deploy/conf/moa-id/sampleTemplates/SampleTemplate.html b/id/server/data/deploy/conf/moa-id/sampleTemplates/SampleTemplate.html
index 83a6639e6..83a6639e6 100644
--- a/id.server/data/deploy/conf/moa-id/sampleTemplates/SampleTemplate.html
+++ b/id/server/data/deploy/conf/moa-id/sampleTemplates/SampleTemplate.html
diff --git a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml
index 915a6bf2f..915a6bf2f 100644
--- a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml
diff --git a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
index 5089140b4..5089140b4 100644
--- a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
diff --git a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml
index 07d926d14..07d926d14 100644
--- a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml
diff --git a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock_deprecated.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock_deprecated.xml
index 05f91750c..05f91750c 100644
--- a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock_deprecated.xml
diff --git a/id.server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
index 008a59d8e..008a59d8e 100644
--- a/id.server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
diff --git a/id.server/data/deploy/conf/moa-spss/keys/common/moa-signaturdienst-allekunden(pwd=allekunden).p12 b/id/server/data/deploy/conf/moa-spss/keys/common/moa-signaturdienst-allekunden(pwd=allekunden).p12
index 8827ed99c..8827ed99c 100644
--- a/id.server/data/deploy/conf/moa-spss/keys/common/moa-signaturdienst-allekunden(pwd=allekunden).p12
+++ b/id/server/data/deploy/conf/moa-spss/keys/common/moa-signaturdienst-allekunden(pwd=allekunden).p12
diff --git a/id.server/data/deploy/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der b/id/server/data/deploy/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der
index 332aa817a..332aa817a 100644
--- a/id.server/data/deploy/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der
+++ b/id/server/data/deploy/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der
diff --git a/id.server/data/deploy/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1(pwd=kunde1).p12 b/id/server/data/deploy/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1(pwd=kunde1).p12
index 4499ab52b..4499ab52b 100644
--- a/id.server/data/deploy/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1(pwd=kunde1).p12
+++ b/id/server/data/deploy/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1(pwd=kunde1).p12
diff --git a/id.server/data/deploy/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der b/id/server/data/deploy/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der
index 63ba5cce5..63ba5cce5 100644
--- a/id.server/data/deploy/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der
+++ b/id/server/data/deploy/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der
diff --git a/id.server/data/deploy/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2(pwd=kunde2).p12 b/id/server/data/deploy/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2(pwd=kunde2).p12
index 5b7631133..5b7631133 100644
--- a/id.server/data/deploy/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2(pwd=kunde2).p12
+++ b/id/server/data/deploy/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2(pwd=kunde2).p12
diff --git a/id.server/data/deploy/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der b/id/server/data/deploy/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der
index 4f87134e7..4f87134e7 100644
--- a/id.server/data/deploy/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der
+++ b/id/server/data/deploy/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der
diff --git a/id.server/data/deploy/conf/moa-spss/keys/customerBMI/moa-signaturdienst-strafregisterbescheinigung.p12 b/id/server/data/deploy/conf/moa-spss/keys/customerBMI/moa-signaturdienst-strafregisterbescheinigung.p12
index c5a43deca..c5a43deca 100644
--- a/id.server/data/deploy/conf/moa-spss/keys/customerBMI/moa-signaturdienst-strafregisterbescheinigung.p12
+++ b/id/server/data/deploy/conf/moa-spss/keys/customerBMI/moa-signaturdienst-strafregisterbescheinigung.p12
diff --git a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml
index 6ed91ddc3..6ed91ddc3 100644
--- a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml
diff --git a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml
index b116152c8..b116152c8 100644
--- a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml
diff --git a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml
index 10854242e..10854242e 100644
--- a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml
diff --git a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock_deprecated.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock_deprecated.xml
index 0c079da71..0c079da71 100644
--- a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock_deprecated.xml
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1(pwd=kunde1).p12 b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1(pwd=kunde1).p12
index 33f76bf9c..33f76bf9c 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1(pwd=kunde1).p12
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1(pwd=kunde1).p12
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1.der b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1.der
index b6091332c..b6091332c 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1.der
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/moa-ssl-kunde1.der
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/customer1/trustedServers(pwd=servers).keystore b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/trustedServers(pwd=servers).keystore
index 9c6c55359..9c6c55359 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/customer1/trustedServers(pwd=servers).keystore
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer1/trustedServers(pwd=servers).keystore
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2(pwd=kunde2).p12 b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2(pwd=kunde2).p12
index ec7bf8e48..ec7bf8e48 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2(pwd=kunde2).p12
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2(pwd=kunde2).p12
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der
index 20bc38e14..20bc38e14 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/moa-ssl-kunde2.der
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/customer2/trustedServers(pwd=servers).keystore b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/trustedServers(pwd=servers).keystore
index d32a22f0f..d32a22f0f 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/customer2/trustedServers(pwd=servers).keystore
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/customer2/trustedServers(pwd=servers).keystore
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/server/moa-ssl-server(pwd=server).p12 b/id/server/data/deploy/conf/moa-spss/sslKeys/server/moa-ssl-server(pwd=server).p12
index af524d060..af524d060 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/server/moa-ssl-server(pwd=server).p12
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/server/moa-ssl-server(pwd=server).p12
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/server/moa-ssl-server.der b/id/server/data/deploy/conf/moa-spss/sslKeys/server/moa-ssl-server.der
index c3b3003d9..c3b3003d9 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/server/moa-ssl-server.der
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/server/moa-ssl-server.der
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/tomcat/tomcat(pwd=server).keystore b/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/tomcat(pwd=server).keystore
index 780e58934..780e58934 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/tomcat/tomcat(pwd=server).keystore
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/tomcat(pwd=server).keystore
diff --git a/id.server/data/deploy/conf/moa-spss/sslKeys/tomcat/trustedClients(pwd=clients).keystore b/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/trustedClients(pwd=clients).keystore
index 908e00b42..908e00b42 100644
--- a/id.server/data/deploy/conf/moa-spss/sslKeys/tomcat/trustedClients(pwd=clients).keystore
+++ b/id/server/data/deploy/conf/moa-spss/sslKeys/tomcat/trustedClients(pwd=clients).keystore
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20011130-20041130.SerNo01f6(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20011130-20041130.SerNo01f6(SecureSignatureKeypair).cer
index d361d919f..d361d919f 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20011130-20041130.SerNo01f6(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20011130-20041130.SerNo01f6(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20011215-20041215.SerNo021e(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20011215-20041215.SerNo021e(SecureSignatureKeypair).cer
index ad13d7b28..ad13d7b28 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20011215-20041215.SerNo021e(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20011215-20041215.SerNo021e(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo0291(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo0291(SecureSignatureKeypair).cer
index f9f27442b..f9f27442b 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo0291(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo0291(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
index b6f39e354..b6f39e354 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20041201-20141201.SerNoE243(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20041201-20141201.SerNoE243(SecureSignatureKeypair).cer
index f9fef65fc..f9fef65fc 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20041201-20141201.SerNoE243(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20041201-20141201.SerNoE243(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-02.20041203-20141203.SerNoE248(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-02.20041203-20141203.SerNoE248(SecureSignatureKeypair).cer
index 36a442b89..36a442b89 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-02.20041203-20141203.SerNoE248(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-02.20041203-20141203.SerNoE248(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-TrustSignTest-Enc-01-SN0450(CertifiedKeypair_alt).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-TrustSignTest-Enc-01-SN0450(CertifiedKeypair_alt).cer
index 836ba3767..836ba3767 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-TrustSignTest-Enc-01-SN0450(CertifiedKeypair_alt).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-TrustSignTest-Enc-01-SN0450(CertifiedKeypair_alt).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-TrustSignTest-Sig-01-SN0588(SecureSignatureKeypair_alt).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-TrustSignTest-Sig-01-SN0588(SecureSignatureKeypair_alt).cer
index 28cb48bb0..28cb48bb0 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-TrustSignTest-Sig-01-SN0588(SecureSignatureKeypair_alt).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-TrustSignTest-Sig-01-SN0588(SecureSignatureKeypair_alt).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01-20011201-20041201.SerNo0213(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01-20011201-20041201.SerNo0213(CertifiedKeypair).cer
index 289fc2198..289fc2198 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01-20011201-20041201.SerNo0213(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01-20011201-20041201.SerNo0213(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20010427-20040427.SerNo006f(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20010427-20040427.SerNo006f(CertifiedKeypair).cer
index b7d4b08a6..b7d4b08a6 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20010427-20040427.SerNo006f(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20010427-20040427.SerNo006f(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0213(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0213(CertifiedKeypair).cer
index 289fc2198..289fc2198 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0213(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0213(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0218(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0218(CertifiedKeypair).cer
index 69de75609..69de75609 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0218(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0218(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
index 8c434777e..8c434777e 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20041201-20141201.SerNoe242(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20041201-20141201.SerNoe242(CertifiedKeypair).cer
index efa28178e..efa28178e 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20041201-20141201.SerNoe242(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20041201-20141201.SerNoe242(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
index 33e776369..33e776369 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
index 3be7b6a06..3be7b6a06 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/Stabsstelle-TestCACrypt-SN04(CertifiedKeypair).der b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/Stabsstelle-TestCACrypt-SN04(CertifiedKeypair).der
index d3c213711..d3c213711 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/Stabsstelle-TestCACrypt-SN04(CertifiedKeypair).der
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/Stabsstelle-TestCACrypt-SN04(CertifiedKeypair).der
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/Stabsstelle-TestCASig-SN03(SecureSignatureKeypair).der b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/Stabsstelle-TestCASig-SN03(SecureSignatureKeypair).der
index 807fa786c..807fa786c 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/Stabsstelle-TestCASig-SN03(SecureSignatureKeypair).der
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/Stabsstelle-TestCASig-SN03(SecureSignatureKeypair).der
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Enc-01SN16f8(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Enc-01SN16f8(CertifiedKeypair).cer
index fc5bd433b..fc5bd433b 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Enc-01SN16f8(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Enc-01SN16f8(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Enc-01SN4848(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Enc-01SN4848(CertifiedKeypair).cer
index f3cf5e676..f3cf5e676 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Enc-01SN4848(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Enc-01SN4848(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Sig-01SN16f9(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Sig-01SN16f9(SecureSignatureKeypair).cer
index 28fbdf42f..28fbdf42f 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Sig-01SN16f9(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Sig-01SN16f9(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Sig-01SN484a(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Sig-01SN484a(SecureSignatureKeypair).cer
index c9da41583..c9da41583 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Sig-01SN484a(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-TEST-Premium-Sig-01SN484a(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom.A1 Signatur.20040326-20140326.SerNo6646(SecureSignatureKeypair_CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom.A1 Signatur.20040326-20140326.SerNo6646(SecureSignatureKeypair_CertifiedKeypair).cer
index 06b40aa67..06b40aa67 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom.A1 Signatur.20040326-20140326.SerNo6646(SecureSignatureKeypair_CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom.A1 Signatur.20040326-20140326.SerNo6646(SecureSignatureKeypair_CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
index 7e9fd5b0b..7e9fd5b0b 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
index da38ce028..da38ce028 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20011130-20041130.SerNo01f6(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20011130-20041130.SerNo01f6(SecureSignatureKeypair).cer
index d361d919f..d361d919f 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20011130-20041130.SerNo01f6(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20011130-20041130.SerNo01f6(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20011215-20041215.SerNo021e(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20011215-20041215.SerNo021e(SecureSignatureKeypair).cer
index ad13d7b28..ad13d7b28 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20011215-20041215.SerNo021e(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20011215-20041215.SerNo021e(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo0291(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo0291(SecureSignatureKeypair).cer
index f9f27442b..f9f27442b 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo0291(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo0291(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
index b6f39e354..b6f39e354 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20041201-20141201.SerNoE243(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20041201-20141201.SerNoE243(SecureSignatureKeypair).cer
index f9fef65fc..f9fef65fc 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20041201-20141201.SerNoE243(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20041201-20141201.SerNoE243(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-02.20041203-20141203.SerNoE248(SecureSignatureKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-02.20041203-20141203.SerNoE248(SecureSignatureKeypair).cer
index 36a442b89..36a442b89 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-02.20041203-20141203.SerNoE248(SecureSignatureKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-02.20041203-20141203.SerNoE248(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01-20011201-20041201.SerNo0213(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01-20011201-20041201.SerNo0213(CertifiedKeypair).cer
index 289fc2198..289fc2198 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01-20011201-20041201.SerNo0213(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01-20011201-20041201.SerNo0213(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20010427-20040427.SerNo006f(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20010427-20040427.SerNo006f(CertifiedKeypair).cer
index b7d4b08a6..b7d4b08a6 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20010427-20040427.SerNo006f(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20010427-20040427.SerNo006f(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0213(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0213(CertifiedKeypair).cer
index 289fc2198..289fc2198 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0213(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0213(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0218(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0218(CertifiedKeypair).cer
index 69de75609..69de75609 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0218(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20011212-20041212.SerNo0218(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
index 8c434777e..8c434777e 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20041201-20141201.SerNoe242(CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20041201-20141201.SerNoe242(CertifiedKeypair).cer
index efa28178e..efa28178e 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20041201-20141201.SerNoe242(CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20041201-20141201.SerNoe242(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
index 33e776369..33e776369 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
index 3be7b6a06..3be7b6a06 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom.A1 Signatur.20040326-20140326.SerNo6646(SecureSignatureKeypair_CertifiedKeypair).cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom.A1 Signatur.20040326-20140326.SerNo6646(SecureSignatureKeypair_CertifiedKeypair).cer
index 06b40aa67..06b40aa67 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom.A1 Signatur.20040326-20140326.SerNo6646(SecureSignatureKeypair_CertifiedKeypair).cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom.A1 Signatur.20040326-20140326.SerNo6646(SecureSignatureKeypair_CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
index 7e9fd5b0b..7e9fd5b0b 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
index da38ce028..da38ce028 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
index 376d0753f..376d0753f 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/a-sign-corporate-light-03-20051114-20151114.SerNo01AAED.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/a-sign-corporate-light-03-20051114-20151114.SerNo01AAED.cer
index 5171276f4..5171276f4 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/a-sign-corporate-light-03-20051114-20151114.SerNo01AAED.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/a-sign-corporate-light-03-20051114-20151114.SerNo01AAED.cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
index 376d0753f..376d0753f 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/a-sign-corporate-light-03-20051114-20151114.SerNo01AAED.cer b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/a-sign-corporate-light-03-20051114-20151114.SerNo01AAED.cer
index 5171276f4..5171276f4 100644
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/a-sign-corporate-light-03-20051114-20151114.SerNo01AAED.cer
+++ b/id/server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/a-sign-corporate-light-03-20051114-20151114.SerNo01AAED.cer
diff --git a/id.server/data/deploy/templates/LIESMICH_TEMPLATES.txt b/id/server/data/deploy/templates/LIESMICH_TEMPLATES.txt
index e23ebad6e..e23ebad6e 100644
--- a/id.server/data/deploy/templates/LIESMICH_TEMPLATES.txt
+++ b/id/server/data/deploy/templates/LIESMICH_TEMPLATES.txt
diff --git a/id.server/data/deploy/templates/moaid-templates.war b/id/server/data/deploy/templates/moaid-templates.war
index 72b034d5c..72b034d5c 100644
--- a/id.server/data/deploy/templates/moaid-templates.war
+++ b/id/server/data/deploy/templates/moaid-templates.war
diff --git a/id.server/data/deploy/tomcat/server.mod_jk.xml b/id/server/data/deploy/tomcat/server.mod_jk.xml
index b32cf7844..b32cf7844 100644
--- a/id.server/data/deploy/tomcat/server.mod_jk.xml
+++ b/id/server/data/deploy/tomcat/server.mod_jk.xml
diff --git a/id.server/data/deploy/tomcat/server.xml b/id/server/data/deploy/tomcat/server.xml
index 2fd7b6439..2fd7b6439 100644
--- a/id.server/data/deploy/tomcat/server.xml
+++ b/id/server/data/deploy/tomcat/server.xml
diff --git a/id.server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar b/id/server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar
index 62c7645b9..62c7645b9 100644
--- a/id.server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar
+++ b/id/server/data/deploy/tomcat/tomcat-util-4.1.27-patched/tomcat-util.jar
diff --git a/id.server/data/deploy/tomcat/unix/tomcat-start.sh b/id/server/data/deploy/tomcat/unix/tomcat-start.sh
index 6dc0289d5..6dc0289d5 100644
--- a/id.server/data/deploy/tomcat/unix/tomcat-start.sh
+++ b/id/server/data/deploy/tomcat/unix/tomcat-start.sh
diff --git a/id.server/data/deploy/tomcat/unix/tomcat-stop.sh b/id/server/data/deploy/tomcat/unix/tomcat-stop.sh
index 82e4ffcfe..82e4ffcfe 100644
--- a/id.server/data/deploy/tomcat/unix/tomcat-stop.sh
+++ b/id/server/data/deploy/tomcat/unix/tomcat-stop.sh
diff --git a/id.server/data/deploy/tomcat/uriworkermap.properties b/id/server/data/deploy/tomcat/uriworkermap.properties
index 32b4c1f50..32b4c1f50 100644
--- a/id.server/data/deploy/tomcat/uriworkermap.properties
+++ b/id/server/data/deploy/tomcat/uriworkermap.properties
diff --git a/id.server/data/deploy/tomcat/win32/startTomcat.bat b/id/server/data/deploy/tomcat/win32/startTomcat.bat
index f6ebc3613..f6ebc3613 100644
--- a/id.server/data/deploy/tomcat/win32/startTomcat.bat
+++ b/id/server/data/deploy/tomcat/win32/startTomcat.bat
diff --git a/id.server/data/deploy/tomcat/win32/stopTomcat.bat b/id/server/data/deploy/tomcat/win32/stopTomcat.bat
index 09dd83f2d..09dd83f2d 100644
--- a/id.server/data/deploy/tomcat/win32/stopTomcat.bat
+++ b/id/server/data/deploy/tomcat/win32/stopTomcat.bat
diff --git a/id.server/data/deploy/tomcat/workers.properties b/id/server/data/deploy/tomcat/workers.properties
index 9350ddc77..9350ddc77 100644
--- a/id.server/data/deploy/tomcat/workers.properties
+++ b/id/server/data/deploy/tomcat/workers.properties
diff --git a/id.server/doc/Architektur ID.vsd b/id/server/doc/Architektur ID.vsd
index d4678007a..d4678007a 100644
--- a/id.server/doc/Architektur ID.vsd
+++ b/id/server/doc/Architektur ID.vsd
diff --git a/id.server/doc/MOA ID 1.x.wsdl b/id/server/doc/MOA ID 1.x.wsdl
index 06daae8f1..06daae8f1 100644
--- a/id.server/doc/MOA ID 1.x.wsdl
+++ b/id/server/doc/MOA ID 1.x.wsdl
diff --git a/id.server/doc/MOA-ID Feinspezifikation.doc b/id/server/doc/MOA-ID Feinspezifikation.doc
index e71ffa8e6..e71ffa8e6 100644
--- a/id.server/doc/MOA-ID Feinspezifikation.doc
+++ b/id/server/doc/MOA-ID Feinspezifikation.doc
diff --git a/common/res/resources/schemas/MOA-ID-Configuration-1.2.xsd b/id/server/doc/MOA-ID-Configuration-1.2.xsd
index 4b018db64..4b018db64 100644
--- a/common/res/resources/schemas/MOA-ID-Configuration-1.2.xsd
+++ b/id/server/doc/MOA-ID-Configuration-1.2.xsd
diff --git a/common/res/resources/schemas/MOA-ID-Configuration-1.3.xsd b/id/server/doc/MOA-ID-Configuration-1.3.xsd
index 66c6e1832..66c6e1832 100644
--- a/common/res/resources/schemas/MOA-ID-Configuration-1.3.xsd
+++ b/id/server/doc/MOA-ID-Configuration-1.3.xsd
diff --git a/common/res/resources/schemas/MOA-ID-Configuration-1.4.xsd b/id/server/doc/MOA-ID-Configuration-1.4.xsd
index 66a9c0ed4..66a9c0ed4 100644
--- a/common/res/resources/schemas/MOA-ID-Configuration-1.4.xsd
+++ b/id/server/doc/MOA-ID-Configuration-1.4.xsd
diff --git a/id.server/doc/MOA_ID_1.2_20040315.pdf b/id/server/doc/MOA_ID_1.2_20040315.pdf
index 0c89c2730..0c89c2730 100644
--- a/id.server/doc/MOA_ID_1.2_20040315.pdf
+++ b/id/server/doc/MOA_ID_1.2_20040315.pdf
diff --git a/id.server/doc/MOA_ID_1.3_20060315.pdf b/id/server/doc/MOA_ID_1.3_20060315.pdf
index c9b0d160c..c9b0d160c 100644
--- a/id.server/doc/MOA_ID_1.3_20060315.pdf
+++ b/id/server/doc/MOA_ID_1.3_20060315.pdf
diff --git a/id.server/doc/MOA_ID_1.4_20070802.pdf b/id/server/doc/MOA_ID_1.4_20070802.pdf
index a3a2f1177..a3a2f1177 100644
--- a/id.server/doc/MOA_ID_1.4_20070802.pdf
+++ b/id/server/doc/MOA_ID_1.4_20070802.pdf
diff --git a/id.server/doc/OID-1-0-3.pdf b/id/server/doc/OID-1-0-3.pdf
index 4beab3e41..4beab3e41 100644
--- a/id.server/doc/OID-1-0-3.pdf
+++ b/id/server/doc/OID-1-0-3.pdf
diff --git a/id.server/doc/api-doc/allclasses-frame.html b/id/server/doc/api-doc/allclasses-frame.html
index 114c4b426..114c4b426 100644
--- a/id.server/doc/api-doc/allclasses-frame.html
+++ b/id/server/doc/api-doc/allclasses-frame.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
index 313defcbc..313defcbc 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
index 7aaad7c68..7aaad7c68 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
index ece0242d9..ece0242d9 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
index 96ff7f4af..96ff7f4af 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
index ec020b79d..ec020b79d 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
index c41742f7a..c41742f7a 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
index 0a0906e25..0a0906e25 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
index 1822504b5..1822504b5 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
index 7d9bcef1d..7d9bcef1d 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
index 717ab1ee6..717ab1ee6 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
index c40b34e9f..c40b34e9f 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html b/id/server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
index 9bad43a2a..9bad43a2a 100644
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
+++ b/id/server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
diff --git a/id.server/doc/api-doc/deprecated-list.html b/id/server/doc/api-doc/deprecated-list.html
index 78f7d881f..78f7d881f 100644
--- a/id.server/doc/api-doc/deprecated-list.html
+++ b/id/server/doc/api-doc/deprecated-list.html
diff --git a/id.server/doc/api-doc/help-doc.html b/id/server/doc/api-doc/help-doc.html
index 79438069d..79438069d 100644
--- a/id.server/doc/api-doc/help-doc.html
+++ b/id/server/doc/api-doc/help-doc.html
diff --git a/id.server/doc/api-doc/index-all.html b/id/server/doc/api-doc/index-all.html
index a66b0252e..a66b0252e 100644
--- a/id.server/doc/api-doc/index-all.html
+++ b/id/server/doc/api-doc/index-all.html
diff --git a/id.server/doc/api-doc/index.html b/id/server/doc/api-doc/index.html
index 7eb5deff7..7eb5deff7 100644
--- a/id.server/doc/api-doc/index.html
+++ b/id/server/doc/api-doc/index.html
diff --git a/id.server/doc/api-doc/overview-tree.html b/id/server/doc/api-doc/overview-tree.html
index bcd54df75..bcd54df75 100644
--- a/id.server/doc/api-doc/overview-tree.html
+++ b/id/server/doc/api-doc/overview-tree.html
diff --git a/id.server/doc/api-doc/package-list b/id/server/doc/api-doc/package-list
index e69de29bb..e69de29bb 100644
--- a/id.server/doc/api-doc/package-list
+++ b/id/server/doc/api-doc/package-list
diff --git a/id.server/doc/api-doc/packages.html b/id/server/doc/api-doc/packages.html
index f5dd01736..f5dd01736 100644
--- a/id.server/doc/api-doc/packages.html
+++ b/id/server/doc/api-doc/packages.html
diff --git a/id.server/doc/api-doc/serialized-form.html b/id/server/doc/api-doc/serialized-form.html
index 09311e7c2..09311e7c2 100644
--- a/id.server/doc/api-doc/serialized-form.html
+++ b/id/server/doc/api-doc/serialized-form.html
diff --git a/id.server/doc/api-doc/stylesheet.css b/id/server/doc/api-doc/stylesheet.css
index 74a3534ae..74a3534ae 100644
--- a/id.server/doc/api-doc/stylesheet.css
+++ b/id/server/doc/api-doc/stylesheet.css
diff --git a/id.server/doc/bku-auswahl.20030408.pdf b/id/server/doc/bku-auswahl.20030408.pdf
index 39efe315f..39efe315f 100644
--- a/id.server/doc/bku-auswahl.20030408.pdf
+++ b/id/server/doc/bku-auswahl.20030408.pdf
diff --git a/common/res/resources/schemas/cs-sstc-schema-assertion-01.xsd b/id/server/doc/cs-sstc-schema-assertion-01.xsd
index 8bc5af147..8bc5af147 100644
--- a/common/res/resources/schemas/cs-sstc-schema-assertion-01.xsd
+++ b/id/server/doc/cs-sstc-schema-assertion-01.xsd
diff --git a/common/res/resources/schemas/cs-sstc-schema-protocol-01.xsd b/id/server/doc/cs-sstc-schema-protocol-01.xsd
index ecad05b0f..ecad05b0f 100644
--- a/common/res/resources/schemas/cs-sstc-schema-protocol-01.xsd
+++ b/id/server/doc/cs-sstc-schema-protocol-01.xsd
diff --git a/id.server/doc/moa-id.htm b/id/server/doc/moa-id.htm
index 82e5adc19..82e5adc19 100644
--- a/id.server/doc/moa-id.htm
+++ b/id/server/doc/moa-id.htm
diff --git a/id.server/doc/moa_id/api-doc/allclasses-frame.html b/id/server/doc/moa_id/api-doc/allclasses-frame.html
index 9e051d7b1..9e051d7b1 100644
--- a/id.server/doc/moa_id/api-doc/allclasses-frame.html
+++ b/id/server/doc/moa_id/api-doc/allclasses-frame.html
diff --git a/id.server/doc/moa_id/api-doc/allclasses-noframe.html b/id/server/doc/moa_id/api-doc/allclasses-noframe.html
index dc5c0fb5f..dc5c0fb5f 100644
--- a/id.server/doc/moa_id/api-doc/allclasses-noframe.html
+++ b/id/server/doc/moa_id/api-doc/allclasses-noframe.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
index a11ad6242..a11ad6242 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
index b5be8a054..b5be8a054 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
index 53f0912b1..53f0912b1 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-frame.html
index 013ac6e16..013ac6e16 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-frame.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-frame.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-summary.html
index 1fadccfd1..1fadccfd1 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-summary.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-summary.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-tree.html
index ed050ad9e..ed050ad9e 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-tree.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-tree.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-use.html
index 54bd8b9fb..54bd8b9fb 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-use.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-use.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
index d844f1ac0..d844f1ac0 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
index afeb1a482..afeb1a482 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
index 5e33084ad..5e33084ad 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-frame.html
index 442356ce1..442356ce1 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-frame.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-frame.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-summary.html
index 482aecc48..482aecc48 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-summary.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-summary.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-tree.html
index e66568757..e66568757 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-tree.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-tree.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-use.html
index 184fcb226..184fcb226 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-use.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-use.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
index d6bc30647..d6bc30647 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
index 44c47942a..44c47942a 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-frame.html
index b3be4f39a..b3be4f39a 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-frame.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-frame.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-summary.html
index 28b8dd351..28b8dd351 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-summary.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-summary.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-tree.html
index 6911edcdb..6911edcdb 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-tree.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-tree.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-use.html
index c90a703c9..c90a703c9 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-use.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-use.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-frame.html
index 9c4352356..9c4352356 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-frame.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-frame.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-summary.html
index 3750976f2..3750976f2 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-summary.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-summary.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-tree.html
index ebf3b1498..ebf3b1498 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-tree.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-tree.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-use.html
index bc895c974..bc895c974 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-use.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-use.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
index 398be7e71..398be7e71 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
index 0b2926e55..0b2926e55 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html
index fd4dd84d2..fd4dd84d2 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/NotAllowedException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/NotAllowedException.html
index 7c01bd12f..7c01bd12f 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/NotAllowedException.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/NotAllowedException.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
index 69af13810..69af13810 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
index aca06fa02..aca06fa02 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolverException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolverException.html
index ccd7d50cf..ccd7d50cf 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolverException.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolverException.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/NotAllowedException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/NotAllowedException.html
index fa0e1f24e..fa0e1f24e 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/NotAllowedException.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/NotAllowedException.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-frame.html
index a8afe874e..a8afe874e 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-frame.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-frame.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-summary.html
index 9c6f09843..9c6f09843 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-summary.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-summary.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-tree.html
index 90e057ebc..90e057ebc 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-tree.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-tree.html
diff --git a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-use.html
index a8c6c026b..a8c6c026b 100644
--- a/id.server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-use.html
+++ b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-use.html
diff --git a/id.server/doc/moa_id/api-doc/constant-values.html b/id/server/doc/moa_id/api-doc/constant-values.html
index bc145c359..bc145c359 100644
--- a/id.server/doc/moa_id/api-doc/constant-values.html
+++ b/id/server/doc/moa_id/api-doc/constant-values.html
diff --git a/id.server/doc/moa_id/api-doc/deprecated-list.html b/id/server/doc/moa_id/api-doc/deprecated-list.html
index d760f28ee..d760f28ee 100644
--- a/id.server/doc/moa_id/api-doc/deprecated-list.html
+++ b/id/server/doc/moa_id/api-doc/deprecated-list.html
diff --git a/id.server/doc/moa_id/api-doc/help-doc.html b/id/server/doc/moa_id/api-doc/help-doc.html
index bbdccd6b5..bbdccd6b5 100644
--- a/id.server/doc/moa_id/api-doc/help-doc.html
+++ b/id/server/doc/moa_id/api-doc/help-doc.html
diff --git a/id.server/doc/moa_id/api-doc/index-all.html b/id/server/doc/moa_id/api-doc/index-all.html
index b6ccf5c68..b6ccf5c68 100644
--- a/id.server/doc/moa_id/api-doc/index-all.html
+++ b/id/server/doc/moa_id/api-doc/index-all.html
diff --git a/id.server/doc/moa_id/api-doc/index.html b/id/server/doc/moa_id/api-doc/index.html
index 61c644160..61c644160 100644
--- a/id.server/doc/moa_id/api-doc/index.html
+++ b/id/server/doc/moa_id/api-doc/index.html
diff --git a/id.server/doc/moa_id/api-doc/overview-frame.html b/id/server/doc/moa_id/api-doc/overview-frame.html
index 58e79621c..58e79621c 100644
--- a/id.server/doc/moa_id/api-doc/overview-frame.html
+++ b/id/server/doc/moa_id/api-doc/overview-frame.html
diff --git a/id.server/doc/moa_id/api-doc/overview-summary.html b/id/server/doc/moa_id/api-doc/overview-summary.html
index 0d16ca82c..0d16ca82c 100644
--- a/id.server/doc/moa_id/api-doc/overview-summary.html
+++ b/id/server/doc/moa_id/api-doc/overview-summary.html
diff --git a/id.server/doc/moa_id/api-doc/overview-tree.html b/id/server/doc/moa_id/api-doc/overview-tree.html
index 583aeddde..583aeddde 100644
--- a/id.server/doc/moa_id/api-doc/overview-tree.html
+++ b/id/server/doc/moa_id/api-doc/overview-tree.html
diff --git a/id.server/doc/moa_id/api-doc/package-list b/id/server/doc/moa_id/api-doc/package-list
index 4cafbedb3..4cafbedb3 100644
--- a/id.server/doc/moa_id/api-doc/package-list
+++ b/id/server/doc/moa_id/api-doc/package-list
diff --git a/id.server/doc/moa_id/api-doc/packages.html b/id/server/doc/moa_id/api-doc/packages.html
index dc4a5e004..dc4a5e004 100644
--- a/id.server/doc/moa_id/api-doc/packages.html
+++ b/id/server/doc/moa_id/api-doc/packages.html
diff --git a/id.server/doc/moa_id/api-doc/resources/inherit.gif b/id/server/doc/moa_id/api-doc/resources/inherit.gif
index c814867a1..c814867a1 100644
--- a/id.server/doc/moa_id/api-doc/resources/inherit.gif
+++ b/id/server/doc/moa_id/api-doc/resources/inherit.gif
diff --git a/id.server/doc/moa_id/api-doc/serialized-form.html b/id/server/doc/moa_id/api-doc/serialized-form.html
index feb57f861..feb57f861 100644
--- a/id.server/doc/moa_id/api-doc/serialized-form.html
+++ b/id/server/doc/moa_id/api-doc/serialized-form.html
diff --git a/id.server/doc/moa_id/api-doc/stylesheet.css b/id/server/doc/moa_id/api-doc/stylesheet.css
index 14c3737e8..14c3737e8 100644
--- a/id.server/doc/moa_id/api-doc/stylesheet.css
+++ b/id/server/doc/moa_id/api-doc/stylesheet.css
diff --git a/id.server/doc/moa_id/examples/BKUSelectionTemplate.html b/id/server/doc/moa_id/examples/BKUSelectionTemplate.html
index 5536226a8..5536226a8 100644
--- a/id.server/doc/moa_id/examples/BKUSelectionTemplate.html
+++ b/id/server/doc/moa_id/examples/BKUSelectionTemplate.html
diff --git a/id.server/doc/moa_id/examples/ChainingModes.txt b/id/server/doc/moa_id/examples/ChainingModes.txt
index 820b60d06..820b60d06 100644
--- a/id.server/doc/moa_id/examples/ChainingModes.txt
+++ b/id/server/doc/moa_id/examples/ChainingModes.txt
diff --git a/id.server/doc/moa_id/examples/IdentityLinkSigners.txt b/id/server/doc/moa_id/examples/IdentityLinkSigners.txt
index 15269ad79..15269ad79 100644
--- a/id.server/doc/moa_id/examples/IdentityLinkSigners.txt
+++ b/id/server/doc/moa_id/examples/IdentityLinkSigners.txt
diff --git a/id.server/doc/moa_id/examples/LoginServletExample.txt b/id/server/doc/moa_id/examples/LoginServletExample.txt
index 587ef5e97..587ef5e97 100644
--- a/id.server/doc/moa_id/examples/LoginServletExample.txt
+++ b/id/server/doc/moa_id/examples/LoginServletExample.txt
diff --git a/id.server/doc/moa_id/examples/SampleMOAIDVerifyInfoboxesConfiguration.xml b/id/server/doc/moa_id/examples/SampleMOAIDVerifyInfoboxesConfiguration.xml
index 09e60c6f1..09e60c6f1 100644
--- a/id.server/doc/moa_id/examples/SampleMOAIDVerifyInfoboxesConfiguration.xml
+++ b/id/server/doc/moa_id/examples/SampleMOAIDVerifyInfoboxesConfiguration.xml
diff --git a/id.server/doc/moa_id/examples/Template.html b/id/server/doc/moa_id/examples/Template.html
index 5074f5beb..5074f5beb 100644
--- a/id.server/doc/moa_id/examples/Template.html
+++ b/id/server/doc/moa_id/examples/Template.html
diff --git a/id.server/doc/moa_id/examples/TransformsInfoAuthBlock.txt b/id/server/doc/moa_id/examples/TransformsInfoAuthBlock.txt
index edbde0073..edbde0073 100644
--- a/id.server/doc/moa_id/examples/TransformsInfoAuthBlock.txt
+++ b/id/server/doc/moa_id/examples/TransformsInfoAuthBlock.txt
diff --git a/id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml b/id/server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml
index db43b0c1d..db43b0c1d 100644
--- a/id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml
+++ b/id/server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml
diff --git a/id.server/doc/moa_id/examples/conf/OAConfBasicAuth.xml b/id/server/doc/moa_id/examples/conf/OAConfBasicAuth.xml
index fc99cea79..fc99cea79 100644
--- a/id.server/doc/moa_id/examples/conf/OAConfBasicAuth.xml
+++ b/id/server/doc/moa_id/examples/conf/OAConfBasicAuth.xml
diff --git a/id.server/doc/moa_id/examples/conf/OAConfHeaderAuth.xml b/id/server/doc/moa_id/examples/conf/OAConfHeaderAuth.xml
index 4d34c3646..4d34c3646 100644
--- a/id.server/doc/moa_id/examples/conf/OAConfHeaderAuth.xml
+++ b/id/server/doc/moa_id/examples/conf/OAConfHeaderAuth.xml
diff --git a/id.server/doc/moa_id/examples/conf/OAConfParamAuth.xml b/id/server/doc/moa_id/examples/conf/OAConfParamAuth.xml
index 979faca95..979faca95 100644
--- a/id.server/doc/moa_id/examples/conf/OAConfParamAuth.xml
+++ b/id/server/doc/moa_id/examples/conf/OAConfParamAuth.xml
diff --git a/id.server/doc/moa_id/examples/moa-id-env.sh.txt b/id/server/doc/moa_id/examples/moa-id-env.sh.txt
index 1ccca10c1..1ccca10c1 100644
--- a/id.server/doc/moa_id/examples/moa-id-env.sh.txt
+++ b/id/server/doc/moa_id/examples/moa-id-env.sh.txt
diff --git a/id.server/doc/moa_id/examples/startTomcat.bat.txt b/id/server/doc/moa_id/examples/startTomcat.bat.txt
index 29588120c..29588120c 100644
--- a/id.server/doc/moa_id/examples/startTomcat.bat.txt
+++ b/id/server/doc/moa_id/examples/startTomcat.bat.txt
diff --git a/id.server/doc/moa_id/faqs.htm b/id/server/doc/moa_id/faqs.htm
index effc21637..effc21637 100644
--- a/id.server/doc/moa_id/faqs.htm
+++ b/id/server/doc/moa_id/faqs.htm
diff --git a/id.server/doc/moa_id/id-admin.htm b/id/server/doc/moa_id/id-admin.htm
index 19fa3562c..19fa3562c 100644
--- a/id.server/doc/moa_id/id-admin.htm
+++ b/id/server/doc/moa_id/id-admin.htm
diff --git a/id.server/doc/moa_id/id-admin_1.htm b/id/server/doc/moa_id/id-admin_1.htm
index 289c52d8a..289c52d8a 100644
--- a/id.server/doc/moa_id/id-admin_1.htm
+++ b/id/server/doc/moa_id/id-admin_1.htm
diff --git a/id.server/doc/moa_id/id-admin_2.htm b/id/server/doc/moa_id/id-admin_2.htm
index aa7809425..aa7809425 100644
--- a/id.server/doc/moa_id/id-admin_2.htm
+++ b/id/server/doc/moa_id/id-admin_2.htm
diff --git a/id.server/doc/moa_id/id-admin_3.htm b/id/server/doc/moa_id/id-admin_3.htm
index 14c8aecce..14c8aecce 100644
--- a/id.server/doc/moa_id/id-admin_3.htm
+++ b/id/server/doc/moa_id/id-admin_3.htm
diff --git a/id.server/doc/moa_id/id-anwendung.htm b/id/server/doc/moa_id/id-anwendung.htm
index 6e33f40e8..6e33f40e8 100644
--- a/id.server/doc/moa_id/id-anwendung.htm
+++ b/id/server/doc/moa_id/id-anwendung.htm
diff --git a/id.server/doc/moa_id/id-anwendung_1.htm b/id/server/doc/moa_id/id-anwendung_1.htm
index 27da073a5..27da073a5 100644
--- a/id.server/doc/moa_id/id-anwendung_1.htm
+++ b/id/server/doc/moa_id/id-anwendung_1.htm
diff --git a/id.server/doc/moa_id/id-anwendung_2.htm b/id/server/doc/moa_id/id-anwendung_2.htm
index 45a815379..45a815379 100644
--- a/id.server/doc/moa_id/id-anwendung_2.htm
+++ b/id/server/doc/moa_id/id-anwendung_2.htm
diff --git a/id.server/doc/moa_id/links.htm b/id/server/doc/moa_id/links.htm
index c5a9b7113..c5a9b7113 100644
--- a/id.server/doc/moa_id/links.htm
+++ b/id/server/doc/moa_id/links.htm
diff --git a/id.server/doc/moa_id/moa-id-ablauf.jpg b/id/server/doc/moa_id/moa-id-ablauf.jpg
index 0585664f4..0585664f4 100644
--- a/id.server/doc/moa_id/moa-id-ablauf.jpg
+++ b/id/server/doc/moa_id/moa-id-ablauf.jpg
diff --git a/id.server/doc/moa_id/moa.htm b/id/server/doc/moa_id/moa.htm
index 05a2d3007..05a2d3007 100644
--- a/id.server/doc/moa_id/moa.htm
+++ b/id/server/doc/moa_id/moa.htm
diff --git a/id.server/doc/moa_images/east.gif b/id/server/doc/moa_images/east.gif
index e76117cb0..e76117cb0 100644
--- a/id.server/doc/moa_images/east.gif
+++ b/id/server/doc/moa_images/east.gif
diff --git a/id.server/doc/moa_images/idle.gif b/id/server/doc/moa_images/idle.gif
index 28b8148e5..28b8148e5 100644
--- a/id.server/doc/moa_images/idle.gif
+++ b/id/server/doc/moa_images/idle.gif
diff --git a/id.server/doc/moa_images/moa_diagramm1.jpg b/id/server/doc/moa_images/moa_diagramm1.jpg
index 776331fb8..776331fb8 100644
--- a/id.server/doc/moa_images/moa_diagramm1.jpg
+++ b/id/server/doc/moa_images/moa_diagramm1.jpg
diff --git a/id.server/doc/moa_images/moa_thema.gif b/id/server/doc/moa_images/moa_thema.gif
index f59075528..f59075528 100644
--- a/id.server/doc/moa_images/moa_thema.gif
+++ b/id/server/doc/moa_images/moa_thema.gif
diff --git a/id.server/doc/moa_images/north.gif b/id/server/doc/moa_images/north.gif
index b4316b5d7..b4316b5d7 100644
--- a/id.server/doc/moa_images/north.gif
+++ b/id/server/doc/moa_images/north.gif
diff --git a/id.server/doc/moa_images/pfeil.gif b/id/server/doc/moa_images/pfeil.gif
index e4eeb1740..e4eeb1740 100644
--- a/id.server/doc/moa_images/pfeil.gif
+++ b/id/server/doc/moa_images/pfeil.gif
diff --git a/id.server/doc/moa_images/print.gif b/id/server/doc/moa_images/print.gif
index b8e59144e..b8e59144e 100644
--- a/id.server/doc/moa_images/print.gif
+++ b/id/server/doc/moa_images/print.gif
diff --git a/id.server/doc/moa_images/select.gif b/id/server/doc/moa_images/select.gif
index 59a1694c5..59a1694c5 100644
--- a/id.server/doc/moa_images/select.gif
+++ b/id/server/doc/moa_images/select.gif
diff --git a/id.server/doc/moa_images/south.gif b/id/server/doc/moa_images/south.gif
index c70ab3e97..c70ab3e97 100644
--- a/id.server/doc/moa_images/south.gif
+++ b/id/server/doc/moa_images/south.gif
diff --git a/id.server/doc/moa_images/transdot.gif b/id/server/doc/moa_images/transdot.gif
index e31aba280..e31aba280 100644
--- a/id.server/doc/moa_images/transdot.gif
+++ b/id/server/doc/moa_images/transdot.gif
diff --git a/id.server/doc/moa_images/west.gif b/id/server/doc/moa_images/west.gif
index 135698ee7..135698ee7 100644
--- a/id.server/doc/moa_images/west.gif
+++ b/id/server/doc/moa_images/west.gif
diff --git a/id.server/src/at/gv/egovernment/moa/id/AuthenticationException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java
index 96a5e0673..96a5e0673 100644
--- a/id.server/src/at/gv/egovernment/moa/id/AuthenticationException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/BuildException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java
index 785dce7a3..785dce7a3 100644
--- a/id.server/src/at/gv/egovernment/moa/id/BuildException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/ECDSAConverterException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java
index 682395a83..682395a83 100644
--- a/id.server/src/at/gv/egovernment/moa/id/ECDSAConverterException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/MOAIDException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java
index bce2c4778..bce2c4778 100644
--- a/id.server/src/at/gv/egovernment/moa/id/MOAIDException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/ParseException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java
index a5e0088d9..a5e0088d9 100644
--- a/id.server/src/at/gv/egovernment/moa/id/ParseException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/ServiceException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java
index 9e6ab2361..9e6ab2361 100644
--- a/id.server/src/at/gv/egovernment/moa/id/ServiceException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index 5f4ec2d29..5f4ec2d29 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationSessionCleaner.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationSessionCleaner.java
index 7e5ed6ec7..7e5ed6ec7 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationSessionCleaner.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationSessionCleaner.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java
index 43e88e7b5..43e88e7b5 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
index 7964e2fb6..7964e2fb6 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/WrongParametersException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java
index 3ce2798ea..3ce2798ea 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/WrongParametersException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationAssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationAssertionBuilder.java
index 241cf0afc..241cf0afc 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationAssertionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationAssertionBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
index 60cd11ed6..60cd11ed6 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
index 53520c846..53520c846 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
index 6cc8c1be8..6cc8c1be8 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/Builder.java
index 3a2ee07de..3a2ee07de 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/Builder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
index 06c81f49e..06c81f49e 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
index e9a9f308d..e9a9f308d 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
index 30cc1df5a..30cc1df5a 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index 0d0595b69..0d0595b69 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
index c2bafe43b..c2bafe43b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxValidatorParamsBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxValidatorParamsBuilder.java
index 038e549be..038e549be 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxValidatorParamsBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxValidatorParamsBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
index 819ed79bb..819ed79bb 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java
index 27e19e830..27e19e830 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java
index 64cb16181..64cb16181 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
index 312179e73..312179e73 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java
index 758f28150..758f28150 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
index 90d79a46d..90d79a46d 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/CreateXMLSignatureResponse.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/CreateXMLSignatureResponse.java
index d121f2c55..d121f2c55 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/CreateXMLSignatureResponse.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/CreateXMLSignatureResponse.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttribute.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttribute.java
index 795079227..795079227 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttribute.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttribute.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttributeImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttributeImpl.java
index e7e490924..e7e490924 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttributeImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/ExtendedSAMLAttributeImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/IdentityLink.java
index 844451035..844451035 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/IdentityLink.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxToken.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxToken.java
index 6b1f24aba..6b1f24aba 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxToken.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxToken.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxTokenImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxTokenImpl.java
index f1ff30a8a..f1ff30a8a 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxTokenImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxTokenImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResult.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResult.java
index b8dd7f18e..b8dd7f18e 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResult.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResult.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResultImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResultImpl.java
index 97f52fb55..97f52fb55 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResultImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxValidationResultImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java
index c7a557290..c7a557290 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParams.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParamsImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParamsImpl.java
index 80ba5995f..80ba5995f 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParamsImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/InfoboxValidatorParamsImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java
index 76ba6366d..76ba6366d 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/Schema.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/Schema.java
index c113f16b8..c113f16b8 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/Schema.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/Schema.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/SchemaImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/SchemaImpl.java
index 964725416..964725416 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/SchemaImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/SchemaImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/VerifyXMLSignatureResponse.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/VerifyXMLSignatureResponse.java
index 8233d1478..8233d1478 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/VerifyXMLSignatureResponse.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/VerifyXMLSignatureResponse.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java
index a18cf7322..a18cf7322 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
index a8b870f04..a8b870f04 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java
index e3c54095d..e3c54095d 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ExtendedInfoboxReadResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/ExtendedInfoboxReadResponseParser.java
index e493f07fb..e493f07fb 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ExtendedInfoboxReadResponseParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/ExtendedInfoboxReadResponseParser.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
index d8a57fd2f..d8a57fd2f 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
index e59c88ddc..e59c88ddc 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParser.java
index 7c4c01abe..7c4c01abe 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParser.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java
index 4c49afb76..4c49afb76 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
index 96e8e6dd6..96e8e6dd6 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java
index f33377547..f33377547 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java
index c41b514c8..c41b514c8 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java
index 4dc69c70b..4dc69c70b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
index 6098f5138..6098f5138 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
index 6ec4a247d..6ec4a247d 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
index 2134c1444..2134c1444 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
index e6c9f4bee..e6c9f4bee 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java
index 444f706e4..444f706e4 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java
index c776418ab..c776418ab 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/InfoboxValidator.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/ValidateException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java
index a6685fca8..a6685fca8 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/ValidateException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
index 1f2ebc37c..1f2ebc37c 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
index 90b780526..90b780526 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java
index 2ebec0398..2ebec0398 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
index e65c47bad..e65c47bad 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConnectionParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConnectionParameter.java
index 30b09cfe0..30b09cfe0 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConnectionParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConnectionParameter.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/OAParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
index 19a27b463..19a27b463 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/OAParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index b4af6592c..b4af6592c 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index ba3b61f9d..ba3b61f9d 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java
index fbd42f975..fbd42f975 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java
index 15c0c328c..15c0c328c 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
index d25cb3b2b..d25cb3b2b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
index 83ab73dcd..83ab73dcd 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationBuilder.java
index f578ea634..f578ea634 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
index 572ce5708..572ce5708 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/AuthenticationData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java
index 4fc35c1e6..4fc35c1e6 100644
--- a/id.server/src/at/gv/egovernment/moa/id/data/AuthenticationData.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/Cookie.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/Cookie.java
index 6ed133c5a..6ed133c5a 100644
--- a/id.server/src/at/gv/egovernment/moa/id/data/Cookie.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/Cookie.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/CookieManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/CookieManager.java
index 1762a52b7..1762a52b7 100644
--- a/id.server/src/at/gv/egovernment/moa/id/data/CookieManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/CookieManager.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/IssuerAndSerial.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IssuerAndSerial.java
index a47dd8b29..a47dd8b29 100644
--- a/id.server/src/at/gv/egovernment/moa/id/data/IssuerAndSerial.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IssuerAndSerial.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/SAMLStatus.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/SAMLStatus.java
index ed61827b6..ed61827b6 100644
--- a/id.server/src/at/gv/egovernment/moa/id/data/SAMLStatus.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/SAMLStatus.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
index c338e96fc..c338e96fc 100644
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/LoggerConfigImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/LoggerConfigImpl.java
index 3cd02a2b5..3cd02a2b5 100644
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/LoggerConfigImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/LoggerConfigImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/PKIConfigurationImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/PKIConfigurationImpl.java
index b41de3c44..b41de3c44 100644
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/PKIConfigurationImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/PKIConfigurationImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/RevocationConfigurationImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/RevocationConfigurationImpl.java
index fff75775d..fff75775d 100644
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/RevocationConfigurationImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/RevocationConfigurationImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/ValidationConfigurationImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/ValidationConfigurationImpl.java
index c500e2e8e..c500e2e8e 100644
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/ValidationConfigurationImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/ValidationConfigurationImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/pki/PKIProfileImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/pki/PKIProfileImpl.java
index 3c37706e1..3c37706e1 100644
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/pki/PKIProfileImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/pki/PKIProfileImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/pki/jsse/MOAIDTrustManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/pki/jsse/MOAIDTrustManager.java
index 9da006d35..9da006d35 100644
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/pki/jsse/MOAIDTrustManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/pki/jsse/MOAIDTrustManager.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/servertools/observer/ObservableImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/servertools/observer/ObservableImpl.java
index 8f36ac5c0..8f36ac5c0 100644
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/servertools/observer/ObservableImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/servertools/observer/ObservableImpl.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java
index 731212ef8..731212ef8 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilderFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ConnectionBuilderFactory.java
index ff7787839..ff7787839 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilderFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ConnectionBuilderFactory.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultConnectionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultConnectionBuilder.java
index 151b1cec3..151b1cec3 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultConnectionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultConnectionBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
index 3df76656b..3df76656b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java
index 909e2d51e..909e2d51e 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/EnhancedConnectionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/EnhancedConnectionBuilder.java
index f934ab80b..f934ab80b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/EnhancedConnectionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/EnhancedConnectionBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java
index b47389950..b47389950 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java
index 3aa2368bf..3aa2368bf 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverFactory.java
index 8edd23438..8edd23438 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverFactory.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
index 3f615b01c..3f615b01c 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/NotAllowedException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java
index 849160a7b..849160a7b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/NotAllowedException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverEncryptedData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverEncryptedData.java
index 9bfd9de9b..9bfd9de9b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverEncryptedData.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverEncryptedData.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverPlainData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverPlainData.java
index aedafdf85..aedafdf85 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverPlainData.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverPlainData.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilder.java
index e0e1fde4a..e0e1fde4a 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/invoke/GetAuthenticationDataInvoker.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/invoke/GetAuthenticationDataInvoker.java
index f7e5299ab..f7e5299ab 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/invoke/GetAuthenticationDataInvoker.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/invoke/GetAuthenticationDataInvoker.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
index 6bf5da02b..6bf5da02b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParser.java
index 9f77578fd..9f77578fd 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParser.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java
index 4ab2e2cf7..4ab2e2cf7 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java
index 0080c010e..0080c010e 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
index 6d215c35e..6d215c35e 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/AxisSecureSocketFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/AxisSecureSocketFactory.java
index 954a87e62..954a87e62 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/AxisSecureSocketFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/AxisSecureSocketFactory.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/ECDSAConstants.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAConstants.java
index c5dad8bc4..c5dad8bc4 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/ECDSAConstants.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAConstants.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java
index 6fb78edb7..6fb78edb7 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ECDSAKeyValueConverter.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/HTTPRequestJSPForwarder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPRequestJSPForwarder.java
index 7c4731555..7c4731555 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/HTTPRequestJSPForwarder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPRequestJSPForwarder.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/HTTPUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPUtils.java
index 035c47eb9..035c47eb9 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/HTTPUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPUtils.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/InOrderServletRequestWrapper.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/InOrderServletRequestWrapper.java
index 4330133f0..4330133f0 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/InOrderServletRequestWrapper.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/InOrderServletRequestWrapper.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/MOAIDMessageProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/MOAIDMessageProvider.java
index d31aa6ec1..d31aa6ec1 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/MOAIDMessageProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/MOAIDMessageProvider.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/ParameterInOrderFilter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParameterInOrderFilter.java
index 3f5fddba2..3f5fddba2 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/ParameterInOrderFilter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParameterInOrderFilter.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/Random.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/Random.java
index da75b4213..da75b4213 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/Random.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/Random.java
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/SSLUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
index 9fa0803c4..9fa0803c4 100644
--- a/id.server/src/at/gv/egovernment/moa/id/util/SSLUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
diff --git a/id.server/src/test/MOAIDTestCase.java b/id/server/idserverlib/src/test/java/test/MOAIDTestCase.java
index 725fa1386..725fa1386 100644
--- a/id.server/src/test/MOAIDTestCase.java
+++ b/id/server/idserverlib/src/test/java/test/MOAIDTestCase.java
diff --git a/id.server/src/test/abnahme/A/Test100StartAuthentication.java b/id/server/idserverlib/src/test/java/test/abnahme/A/Test100StartAuthentication.java
index 0d72691aa..0d72691aa 100644
--- a/id.server/src/test/abnahme/A/Test100StartAuthentication.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/A/Test100StartAuthentication.java
diff --git a/id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java b/id/server/idserverlib/src/test/java/test/abnahme/A/Test200VerifyIdentityLink.java
index 043f51398..043f51398 100644
--- a/id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/A/Test200VerifyIdentityLink.java
diff --git a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java b/id/server/idserverlib/src/test/java/test/abnahme/A/Test300VerifyAuthBlock.java
index 9bf92e54b..9bf92e54b 100644
--- a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/A/Test300VerifyAuthBlock.java
diff --git a/id.server/src/test/abnahme/A/Test400GetAuthenticationData.java b/id/server/idserverlib/src/test/java/test/abnahme/A/Test400GetAuthenticationData.java
index 3db0a6d69..3db0a6d69 100644
--- a/id.server/src/test/abnahme/A/Test400GetAuthenticationData.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/A/Test400GetAuthenticationData.java
diff --git a/id.server/src/test/abnahme/A/Test500StartAuthenticationServlet.java b/id/server/idserverlib/src/test/java/test/abnahme/A/Test500StartAuthenticationServlet.java
index f4f37a871..f4f37a871 100644
--- a/id.server/src/test/abnahme/A/Test500StartAuthenticationServlet.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/A/Test500StartAuthenticationServlet.java
diff --git a/id.server/src/test/abnahme/A/Test600GetAuthenticationDataService.java b/id/server/idserverlib/src/test/java/test/abnahme/A/Test600GetAuthenticationDataService.java
index b44852346..b44852346 100644
--- a/id.server/src/test/abnahme/A/Test600GetAuthenticationDataService.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/A/Test600GetAuthenticationDataService.java
diff --git a/id.server/src/test/abnahme/A/Test700SelectBKU.java b/id/server/idserverlib/src/test/java/test/abnahme/A/Test700SelectBKU.java
index 9cfa47033..9cfa47033 100644
--- a/id.server/src/test/abnahme/A/Test700SelectBKU.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/A/Test700SelectBKU.java
diff --git a/id.server/src/test/abnahme/AbnahmeTestCase.java b/id/server/idserverlib/src/test/java/test/abnahme/AbnahmeTestCase.java
index e0e6fc183..e0e6fc183 100644
--- a/id.server/src/test/abnahme/AbnahmeTestCase.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/AbnahmeTestCase.java
diff --git a/id.server/src/test/abnahme/AllTests.java b/id/server/idserverlib/src/test/java/test/abnahme/AllTests.java
index 56a38be28..56a38be28 100644
--- a/id.server/src/test/abnahme/AllTests.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/AllTests.java
diff --git a/id.server/src/test/abnahme/C/Test100Konfiguration.java b/id/server/idserverlib/src/test/java/test/abnahme/C/Test100Konfiguration.java
index 7da5a7449..7da5a7449 100644
--- a/id.server/src/test/abnahme/C/Test100Konfiguration.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/C/Test100Konfiguration.java
diff --git a/id.server/src/test/abnahme/P/Test100LoginParameterResolver.java b/id/server/idserverlib/src/test/java/test/abnahme/P/Test100LoginParameterResolver.java
index 21958a367..21958a367 100644
--- a/id.server/src/test/abnahme/P/Test100LoginParameterResolver.java
+++ b/id/server/idserverlib/src/test/java/test/abnahme/P/Test100LoginParameterResolver.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/AllTests.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/AllTests.java
index 69ed3d12b..69ed3d12b 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/AllTests.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/AllTests.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/UnitTestCase.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/UnitTestCase.java
index 8309a4f7e..8309a4f7e 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/UnitTestCase.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/UnitTestCase.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java
index 5acb23dc2..5acb23dc2 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java
index 81cdfb9f8..81cdfb9f8 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AllTests.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AllTests.java
index 2940f0ec7..2940f0ec7 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AllTests.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AllTests.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java
index 8cc8797ef..8cc8797ef 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java
index 1f4890dc9..1f4890dc9 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java
index c146984d0..c146984d0 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java
index 24d01f96f..24d01f96f 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java
index 504679fd5..504679fd5 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java
index 3ec73ee4c..3ec73ee4c 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java
index 5b3bb5906..5b3bb5906 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java
index 7ae6f70ef..7ae6f70ef 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java
index 0648163d5..0648163d5 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/AllTests.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/AllTests.java
index 84f5110b0..84f5110b0 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/AllTests.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/AllTests.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java
index c29c1eedf..c29c1eedf 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java
index 9a878be2c..9a878be2c 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java
index 992e799bd..992e799bd 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataServiceTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataServiceTest.java
index c78651fdb..c78651fdb 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataServiceTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataServiceTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java
index 655c33fd9..655c33fd9 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java
index ec6a65581..ec6a65581 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/AllTests.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/AllTests.java
index 2dd6cd35e..2dd6cd35e 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/AllTests.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/AllTests.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/DOMTreeCompare.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/builder/DOMTreeCompare.java
index aec14ce1c..aec14ce1c 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/DOMTreeCompare.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/builder/DOMTreeCompare.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java
index b6eda3c39..b6eda3c39 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestCompare.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestCompare.java
index 5685129a1..5685129a1 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestCompare.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestCompare.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java
index 68b5d4ee3..68b5d4ee3 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/util/SSLUtilsTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/util/SSLUtilsTest.java
index 351ca0bd5..351ca0bd5 100644
--- a/id.server/src/test/at/gv/egovernment/moa/id/util/SSLUtilsTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/util/SSLUtilsTest.java
diff --git a/id.server/src/test/lasttest/Dispatcher.java b/id/server/idserverlib/src/test/java/test/lasttest/Dispatcher.java
index ad8f10fb4..ad8f10fb4 100644
--- a/id.server/src/test/lasttest/Dispatcher.java
+++ b/id/server/idserverlib/src/test/java/test/lasttest/Dispatcher.java
diff --git a/id.server/src/test/lasttest/HostnameVerifierHack.java b/id/server/idserverlib/src/test/java/test/lasttest/HostnameVerifierHack.java
index cf34b621a..cf34b621a 100644
--- a/id.server/src/test/lasttest/HostnameVerifierHack.java
+++ b/id/server/idserverlib/src/test/java/test/lasttest/HostnameVerifierHack.java
diff --git a/id.server/src/test/lasttest/LasttestClient.java b/id/server/idserverlib/src/test/java/test/lasttest/LasttestClient.java
index bad5161ba..bad5161ba 100644
--- a/id.server/src/test/lasttest/LasttestClient.java
+++ b/id/server/idserverlib/src/test/java/test/lasttest/LasttestClient.java
diff --git a/id.server/src/test/lasttest/TestThread.java b/id/server/idserverlib/src/test/java/test/lasttest/TestThread.java
index 0d2973c7f..0d2973c7f 100644
--- a/id.server/src/test/lasttest/TestThread.java
+++ b/id/server/idserverlib/src/test/java/test/lasttest/TestThread.java
diff --git a/id.server/html/proxy/WEB-INF/web.xml b/id/server/proxy/src/main/webapp/WEB-INF/web.xml
index b11606fe0..b11606fe0 100644
--- a/id.server/html/proxy/WEB-INF/web.xml
+++ b/id/server/proxy/src/main/webapp/WEB-INF/web.xml
diff --git a/id.server/html/proxy/errorpage-proxy.jsp b/id/server/proxy/src/main/webapp/errorpage-proxy.jsp
index 07f3e7f69..07f3e7f69 100644
--- a/id.server/html/proxy/errorpage-proxy.jsp
+++ b/id/server/proxy/src/main/webapp/errorpage-proxy.jsp
diff --git a/id.server/html/proxy/message-proxy.jsp b/id/server/proxy/src/main/webapp/message-proxy.jsp
index 0d970898a..0d970898a 100644
--- a/id.server/html/proxy/message-proxy.jsp
+++ b/id/server/proxy/src/main/webapp/message-proxy.jsp
diff --git a/id.server/res/resources/properties/id_messages_de.properties b/id/server/resources/properties/id_messages_de.properties
index 4dc2ac3ae..4dc2ac3ae 100644
--- a/id.server/res/resources/properties/id_messages_de.properties
+++ b/id/server/resources/properties/id_messages_de.properties
diff --git a/id.server/res/resources/wsdl/MOA-ID-1.0.wsdl b/id/server/resources/wsdl/MOA-ID-1.0.wsdl
index 5751b3e58..5751b3e58 100644
--- a/id.server/res/resources/wsdl/MOA-ID-1.0.wsdl
+++ b/id/server/resources/wsdl/MOA-ID-1.0.wsdl
diff --git a/id.server/res/resources/wsdl/MOA-ID-1.x.wsdl b/id/server/resources/wsdl/MOA-ID-1.x.wsdl
index 45152cb38..45152cb38 100644
--- a/id.server/res/resources/wsdl/MOA-ID-1.x.wsdl
+++ b/id/server/resources/wsdl/MOA-ID-1.x.wsdl
diff --git a/id.server/res/resources/wsdl/MOA-SPSS-1.2.xsd b/id/server/resources/wsdl/MOA-SPSS-1.2.xsd
index d7a06d6e7..d7a06d6e7 100644
--- a/id.server/res/resources/wsdl/MOA-SPSS-1.2.xsd
+++ b/id/server/resources/wsdl/MOA-SPSS-1.2.xsd
diff --git a/id.server/res/resources/xmldata/CertInfoDsigSignature.xml b/id/server/resources/xmldata/CertInfoDsigSignature.xml
index bf35dc73f..bf35dc73f 100644
--- a/id.server/res/resources/xmldata/CertInfoDsigSignature.xml
+++ b/id/server/resources/xmldata/CertInfoDsigSignature.xml
diff --git a/id.server/res/META-INF/services/org.apache.axis.components.net.SecureSocketFactory b/id/server/services/org.apache.axis.components.net.SecureSocketFactory
index c4547e804..c4547e804 100644
--- a/id.server/res/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
+++ b/id/server/services/org.apache.axis.components.net.SecureSocketFactory
diff --git a/id.templates/html/SampleBKUSelectionTemplate.html b/id/templates/src/main/webapp/SampleBKUSelectionTemplate.html
index 5536226a8..5536226a8 100644
--- a/id.templates/html/SampleBKUSelectionTemplate.html
+++ b/id/templates/src/main/webapp/SampleBKUSelectionTemplate.html
diff --git a/id.templates/html/SampleLogo.gif b/id/templates/src/main/webapp/SampleLogo.gif
index 4b7c682b1..4b7c682b1 100644
--- a/id.templates/html/SampleLogo.gif
+++ b/id/templates/src/main/webapp/SampleLogo.gif
diff --git a/id.templates/html/SampleTemplate.html b/id/templates/src/main/webapp/SampleTemplate.html
index e9756a036..e9756a036 100644
--- a/id.templates/html/SampleTemplate.html
+++ b/id/templates/src/main/webapp/SampleTemplate.html
diff --git a/id.templates/web.xml b/id/templates/src/main/webapp/WEB-INF/web.xml
index 6954e9c87..6954e9c87 100644
--- a/id.templates/web.xml
+++ b/id/templates/src/main/webapp/WEB-INF/web.xml
diff --git a/id.templates/html/css/display.css b/id/templates/src/main/webapp/css/display.css
index fc6da85b0..fc6da85b0 100644
--- a/id.templates/html/css/display.css
+++ b/id/templates/src/main/webapp/css/display.css
diff --git a/id.templates/html/css/main.css b/id/templates/src/main/webapp/css/main.css
index bcad5589c..bcad5589c 100644
--- a/id.templates/html/css/main.css
+++ b/id/templates/src/main/webapp/css/main.css
diff --git a/id.templates/html/valid-html401.gif b/id/templates/src/main/webapp/valid-html401.gif
index 1270561e1..1270561e1 100644
--- a/id.templates/html/valid-html401.gif
+++ b/id/templates/src/main/webapp/valid-html401.gif
diff --git a/spss.handbook/clients/api/lib/commons-discovery-0.2/commons-discovery.jar b/spss.handbook/clients/api/lib/commons-discovery-0.2/commons-discovery.jar
deleted file mode 100644
index b88554847..000000000
--- a/spss.handbook/clients/api/lib/commons-discovery-0.2/commons-discovery.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging-api.jar b/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging-api.jar
deleted file mode 100644
index ade9a13c7..000000000
--- a/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging-api.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging.jar b/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging.jar
deleted file mode 100644
index b73a80fab..000000000
--- a/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_Pkcs11Provider.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_Pkcs11Provider.jar
deleted file mode 100644
index af39b42b1..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_Pkcs11Provider.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_Pkcs11Wrapper.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_Pkcs11Wrapper.jar
deleted file mode 100644
index 43342ef7c..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_Pkcs11Wrapper.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_cms.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_cms.jar
deleted file mode 100644
index 7264a68f3..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_cms.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_ecc.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_ecc.jar
deleted file mode 100644
index 4cd73391d..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_ecc.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_ixsil.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_ixsil.jar
deleted file mode 100644
index 5279f2247..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_ixsil.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_jce_full.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_jce_full.jar
deleted file mode 100644
index fe14dbb2a..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_jce_full.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_moa_full.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_moa_full.jar
deleted file mode 100644
index 539988fba..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/iaik_moa_full.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/linux/libpkcs11wrapper.so b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/linux/libpkcs11wrapper.so
deleted file mode 100644
index 11852511b..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/linux/libpkcs11wrapper.so
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/linux_x64/libpkcs11wrapper.so b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/linux_x64/libpkcs11wrapper.so
deleted file mode 100644
index 393946053..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/linux_x64/libpkcs11wrapper.so
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/signed/iaik_Pkcs11Provider.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/signed/iaik_Pkcs11Provider.jar
deleted file mode 100644
index a348db04e..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/signed/iaik_Pkcs11Provider.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/signed/iaik_ecc.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/signed/iaik_ecc.jar
deleted file mode 100644
index b8a4f190b..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/signed/iaik_ecc.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/signed/iaik_jce_full.jar b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/signed/iaik_jce_full.jar
deleted file mode 100644
index 7288bc39d..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/signed/iaik_jce_full.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/solaris_sparc/libpkcs11wrapper.so b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/solaris_sparc/libpkcs11wrapper.so
deleted file mode 100644
index 0b19f10c1..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/solaris_sparc/libpkcs11wrapper.so
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/solaris_sparcv9/libpkcs11wrapper.so b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/solaris_sparcv9/libpkcs11wrapper.so
deleted file mode 100644
index 11f928b0b..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/solaris_sparcv9/libpkcs11wrapper.so
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/win32/pkcs11wrapper.dll b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/win32/pkcs11wrapper.dll
deleted file mode 100644
index 3789b8d7a..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/win32/pkcs11wrapper.dll
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/wince30arm/pkcs11wrapper.dll b/spss.handbook/clients/api/lib/iaik-moa-20070503/full/wince30arm/pkcs11wrapper.dll
deleted file mode 100644
index d98e48d80..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070503/full/wince30arm/pkcs11wrapper.dll
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_Pkcs11Wrapper.jar b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_Pkcs11Wrapper.jar
deleted file mode 100644
index 43342ef7c..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_Pkcs11Wrapper.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_cms.jar b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_cms.jar
deleted file mode 100644
index 7264a68f3..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_cms.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_ixsil.jar b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_ixsil.jar
deleted file mode 100644
index 003df0066..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_ixsil.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_moa_full.jar b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_moa_full.jar
deleted file mode 100644
index 35ffc2d06..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/iaik_moa_full.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/linux/libpkcs11wrapper.so b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/linux/libpkcs11wrapper.so
deleted file mode 100644
index 11852511b..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/linux/libpkcs11wrapper.so
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/linux_x64/libpkcs11wrapper.so b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/linux_x64/libpkcs11wrapper.so
deleted file mode 100644
index 393946053..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/linux_x64/libpkcs11wrapper.so
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/signed/iaik_Pkcs11Provider.jar b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/signed/iaik_Pkcs11Provider.jar
deleted file mode 100644
index a348db04e..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/signed/iaik_Pkcs11Provider.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/signed/iaik_ecc.jar b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/signed/iaik_ecc.jar
deleted file mode 100644
index b8a4f190b..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/signed/iaik_ecc.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/signed/iaik_jce_full.jar b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/signed/iaik_jce_full.jar
deleted file mode 100644
index 7288bc39d..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/signed/iaik_jce_full.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/solaris_sparc/libpkcs11wrapper.so b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/solaris_sparc/libpkcs11wrapper.so
deleted file mode 100644
index 0b19f10c1..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/solaris_sparc/libpkcs11wrapper.so
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/solaris_sparcv9/libpkcs11wrapper.so b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/solaris_sparcv9/libpkcs11wrapper.so
deleted file mode 100644
index 11f928b0b..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/solaris_sparcv9/libpkcs11wrapper.so
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/win32/pkcs11wrapper.dll b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/win32/pkcs11wrapper.dll
deleted file mode 100644
index 3789b8d7a..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/win32/pkcs11wrapper.dll
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/wince30arm/pkcs11wrapper.dll b/spss.handbook/clients/api/lib/iaik-moa-20070801/full/wince30arm/pkcs11wrapper.dll
deleted file mode 100644
index d98e48d80..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20070801/full/wince30arm/pkcs11wrapper.dll
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-core.jar b/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-core.jar
deleted file mode 100644
index e52bf679c..000000000
--- a/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-core.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-dom.jar b/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-dom.jar
deleted file mode 100644
index 1a9926357..000000000
--- a/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-dom.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/jaxen-1.0/saxpath.jar b/spss.handbook/clients/api/lib/jaxen-1.0/saxpath.jar
deleted file mode 100644
index 2b43955ba..000000000
--- a/spss.handbook/clients/api/lib/jaxen-1.0/saxpath.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/jaxp-1.2_01/dom.jar b/spss.handbook/clients/api/lib/jaxp-1.2_01/dom.jar
deleted file mode 100644
index f91f80a8b..000000000
--- a/spss.handbook/clients/api/lib/jaxp-1.2_01/dom.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/jaxp-1.2_01/jaxp-api.jar b/spss.handbook/clients/api/lib/jaxp-1.2_01/jaxp-api.jar
deleted file mode 100644
index 7a3295ee6..000000000
--- a/spss.handbook/clients/api/lib/jaxp-1.2_01/jaxp-api.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/jaxp-1.2_01/sax.jar b/spss.handbook/clients/api/lib/jaxp-1.2_01/sax.jar
deleted file mode 100644
index 9ffb844e5..000000000
--- a/spss.handbook/clients/api/lib/jaxp-1.2_01/sax.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/log4j-1.2.7/log4j-1.2.7.jar b/spss.handbook/clients/api/lib/log4j-1.2.7/log4j-1.2.7.jar
deleted file mode 100644
index 1595a56ef..000000000
--- a/spss.handbook/clients/api/lib/log4j-1.2.7/log4j-1.2.7.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/postgres-jdbc2-7.3/pg73jdbc2.jar b/spss.handbook/clients/api/lib/postgres-jdbc2-7.3/pg73jdbc2.jar
deleted file mode 100644
index 8bf46dd8e..000000000
--- a/spss.handbook/clients/api/lib/postgres-jdbc2-7.3/pg73jdbc2.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/lib/xalan-j-2.5.1/xalan.jar b/spss.handbook/clients/api/lib/xalan-j-2.5.1/xalan.jar
deleted file mode 100644
index 44d4d094d..000000000
--- a/spss.handbook/clients/api/lib/xalan-j-2.5.1/xalan.jar
+++ /dev/null
diff --git a/spss.handbook/clients/api/signatures/SimpleSignature.xml b/spss.handbook/clients/api/signatures/SimpleSignature.xml
deleted file mode 100644
index 9ecd215c1..000000000
--- a/spss.handbook/clients/api/signatures/SimpleSignature.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature>
\ No newline at end of file
diff --git a/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.java b/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.java
deleted file mode 100644
index 2534e4913..000000000
--- a/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.api;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.SignatureCreationService;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * Dieses einfache Beispiel demonstriert grundlegend den Gebrauch der API von MOA SP/SS. Es wird damit eine
- * einfach aufgebaute XML-Signatur erzeugt.
- */
-public class CreateXMLSignature
-{
-  /**
-   * Methode main.
-   * 
-   * Enthält beispielhaften Code zum grundlegenden Gebrauch der API von MOA SP/SS. Es wird damit eine
-   * einfach aufgebaute XML-Signatur erzeugt.
-   * 
-   * ACHTUNG: Stellen Sie bei Verwendung von J2SE 1.4.x bzw. 5.x sicher, dass Sie die System-Property 
-   * <code>java.endorsed.dirs</code> auf jenes Verzeichnis gesetzt haben, in dem sich die XPath-
-   * und XSLT-Bibliothek <em>Xalan-J</em> befindet.
-   * 
-   * @param args <ul>
-   *             <li>
-   *             args[0] enthält einen Verweis auf die Konfigurations-Datei von MOA SP/SS Der Verweis 
-   *             enthält entweder eine absolute oder eine relative Pfadangabe, wobei eine relative 
-   *             Angabe als relativ zum Arbeitsverzeichnis der Java VM interpretiert wird. 
-   *             </li>
-   *             <li>
-   *             args[1] enthält einen Verweis auf die Konfigurations-Datei von Log4J, dem Logging-
-   *             Framework, das von MOA SP/SS verwendet wird. Der Verweis enthält entweder eine 
-   *             absolute oder eine relative Pfadangabe, wobei eine relative Angabe als relativ zum
-   *             Arbeitsverzeichnis der Java VM interpretiert wird. 
-   *             </li>
-   *             </ul>
-   * 
-   * @throws Exception Sollten Fehler auftreten werden die Fehler an die Java-VM weitergeleitet.
-   */
-  public static void main(String[] args) throws Exception
-  {
-    // Setzen der System-Properties
-    init(args);
-
-    // Serverfunktionshandler instanzieren
-    SPSSFactory spf = SPSSFactory.getInstance();
-
-    // Zu signierende Daten in ein Contentobjekt einbinden (die Daten werden hier explizit angegeben,
-    // sollen aber in der Signatur mittels URL "http://uri.data.org" referenziert werden
-    byte[] data = "Diese Daten werden signiert.".getBytes("UTF-8");
-    ByteArrayInputStream bis = new ByteArrayInputStream(data);
-    Content cont = spf.createContent(bis, null);
-
-    // Metainformationen zu den zu signierenden Daten erstellen
-    MetaInfo mi = spf.createMetaInfo("text/plain", null, null, null);
-
-    // Transformationen erstellen (hier werden keine Transformationen angewandt)
-    CreateTransformsInfo cti = spf.createCreateTransformsInfo(null, mi);
-    CreateTransformsInfoProfile ct = spf.createCreateTransformsInfoProfile(cti, null);
-
-    // Datenobjekt aufbauen
-    DataObjectInfo doi = spf.createDataObjectInfo(DataObjectInfo.STRUCTURE_ENVELOPING, false, cont, ct);
-
-    // Erstellen eines SingleSignatureInfo-Containers
-    // Enthält alle Angaben zur Erstellung *einer* Signatur
-    List dataobjectinfolist = new ArrayList();
-    dataobjectinfolist.add(doi);
-    SingleSignatureInfo ssi = spf.createSingleSignatureInfo(dataobjectinfolist, null, false);
-
-    // Erstellen des Request-Objekts (Schlüsselbezeichner, Liste von SingleSignatureInfo-Containern)
-    List singlesignatureinfolist = new ArrayList();
-    singlesignatureinfolist.add(ssi);
-    CreateXMLSignatureRequest cxsreq = spf.createCreateXMLSignatureRequest("KG_allgemein",
-      singlesignatureinfolist);
-
-    // Signatureerstellungsservice instanzieren und aufrufen
-    SignatureCreationService scs = SignatureCreationService.getInstance();
-    CreateXMLSignatureResponse cxsres = scs.createXMLSignature(cxsreq);
-
-    // Response auswerten
-    List elements = cxsres.getResponseElements();
-    SignatureEnvironmentResponse ser = (SignatureEnvironmentResponse) elements.get(0);
-
-    // Auswertung des ersten (und einzigen) SignatureEnvironmentResponse-Containers
-    int response_type = ser.getResponseType();
-
-    if (response_type == SignatureEnvironmentResponse.ERROR_RESPONSE)
-    {
-      // Fehlerfall
-      System.out.println("Bei der Erstellung der Signatur ist ein Fehler aufgetreten.");
-    }
-    else
-    {
-      // Signaturerstellung erfolgreich
-      System.out.println("Signaturerstellung erfolgreich:");
-
-      Element se = ser.getSignatureEnvironment();
-      System.out.println(DOMUtils.serializeNode(se));
-    }
-  }
-
-  /**
-   * Setzt die notwendigen System-Properties für die Konfiguration der MOA SP/SS API. 
-   * 
-   * @param args Siehe @link CreateXMLSignature#main(String[]).
-   */
-  private static void init(String[] args)
-  {
-    if (args == null || args.length != 2)
-    {
-      System.out.println("Verwendung: CreateXMLSignature <MOASPSSConfigFile> <Log4JConfigFile>");
-    }
-    System.setProperty("moa.spss.server.configuration", args[0]);
-    System.setProperty("log4j.configuration", "file:" + args[1]);
-  }
-}
\ No newline at end of file
diff --git a/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.java b/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.java
deleted file mode 100644
index fed8ba9f2..000000000
--- a/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.api;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.HashMap;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.SignatureVerificationService;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
-/**
- * Dieses einfache Beispiel demonstriert grundlegend den Gebrauch der API von MOA SP/SS. 
- * Es wird damit eine einfach aufgebaute XML-Signatur geprüft.
- */
-
-public class VerifyXMLSignature
-{
-  /**
-   * Methode main.
-   * 
-   * Enthält beispielhaften Code zum grundlegenden Gebrauch der API von MOA SP/SS. 
-   * Es wird damit eine einfach aufgebaute XML-Signatur geprüft.
-   * 
-   * ACHTUNG: Stellen Sie bei Verwendung von J2SE 1.4.x bzw. 5.x sicher, dass Sie die System-Property 
-   * <code>java.endorsed.dirs</code> auf jenes Verzeichnis gesetzt haben, in dem sich die XPath-
-   * und XSLT-Bibliothek <em>Xalan-J</em> befindet.
-   * 
-   * @param args <ul>
-   *             <li>
-   *             args[0] enthält einen Verweis auf die Konfigurations-Datei von MOA SP/SS Der Verweis 
-   *             enthält entweder eine absolute oder eine relative Pfadangabe, wobei eine relative 
-   *             Angabe als relativ zum Arbeitsverzeichnis der Java VM interpretiert wird. 
-   *             </li>
-   *             <li>
-   *             args[1] enthält einen Verweis auf die Konfigurations-Datei von Log4J, dem Logging-
-   *             Framework, das von MOA SP/SS verwendet wird. Der Verweis enthält entweder eine 
-   *             absolute oder eine relative Pfadangabe, wobei eine relative Angabe als relativ zum
-   *             Arbeitsverzeichnis der Java VM interpretiert wird. 
-   *             </li>
-   *             <li>
-   *             args[2] enthält Pfad und Dateiname des XML-Dokuments mit der darin enthaltenen, zu
-   *             prüfenden XML-Signatur. Verwenden Sie z.B. das mit diesem Handbuch mitgelieferte
-   *             Beispiel <code>clients/api/signatures/SimpleSignature.xml</code>.
-   *             </li>
-   *             </ul>
-   */
-  public static void main(String[] args)
-  {
-    // Setzen der System-Properties
-    init(args);
-
-    // Factory und Service instanzieren
-    SPSSFactory spssFac = SPSSFactory.getInstance();
-    SignatureVerificationService sigVerifyService = SignatureVerificationService.getInstance();
-    
-    // Content aus Dokument mit zu prüfender Signatur erstellen
-    FileInputStream sigDocFIS = null;
-    try
-    {
-      sigDocFIS = new FileInputStream(args[2]);
-    }
-    catch (FileNotFoundException e1)
-    {
-      System.err.println("XML-Dokument mit zu prüfender Signatur nicht gefunden: " + args[2]);
-      System.exit(-1);
-    }
-    Content sigDocContent = spssFac.createContent(sigDocFIS, null);
-    
-    // Position der zu prüfenden Signatur im Dokument angeben
-    // (Nachdem im XPath-Ausdruck ein NS-Präfix verwendet wird, muss in einer Lookup-Tabelle
-    // der damit bezeichnete Namenraum mitgegeben werden)
-    HashMap nSMap = new HashMap();
-    nSMap.put("dsig", "http://www.w3.org/2000/09/xmldsig#");
-    VerifySignatureLocation sigLocation = spssFac.createVerifySignatureLocation("//dsig:Signature", nSMap);
-    
-    // Zu prüfendes Dokument und Signaturposition zusammenfassen
-    VerifySignatureInfo sigInfo = spssFac.createVerifySignatureInfo(sigDocContent, sigLocation);
-    
-    // Prüfrequest zusammenstellen
-    VerifyXMLSignatureRequest verifyRequest = spssFac.createVerifyXMLSignatureRequest(
-      null,    // Wird Prüfzeit nicht angegeben, wird aktuelle Zeit verwendet 
-      sigInfo, 
-      null,    // Keine Ergänzungsobjekte notwendig
-      null,    // Signaturmanifest-Prüfung soll nicht durchgeführt werden
-      false,   // Hash-Inputdaten, d.h. tatsächlich signierte Daten werden nicht zurückgeliefert
-      "Test-Signaturdienste");  // ID des verwendeten Vertrauensprofils
-    
-    VerifyXMLSignatureResponse verifyResponse = null;
-    try
-    {
-      // Aufruf der Signaturprüfung
-      verifyResponse = sigVerifyService.verifyXMLSignature(verifyRequest);
-    }
-    catch (MOAException e)
-    {
-      // Service liefert Fehler
-      System.err.println("Die Signaturprüfung hat folgenden Fehler geliefert:");
-      System.err.println("Fehlercode: " + e.getMessageId());
-      System.err.println("Fehlernachricht: " + e.getMessage());
-      System.exit(-1);
-    }
-    
-    // Auswertung der Response
-    System.out.println();
-    System.out.println("Ergebnisse der Signaturprüfung:");
-    System.out.println();
-    
-    // Besondere Eigenschaften des Signatorzertifikats
-    SignerInfo signerInfo = verifyResponse.getSignerInfo();
-    System.out.println("*** Ist Zertifikat des Signators qualifiziert? " + ((signerInfo.isQualifiedCertificate()) ? "ja" : "nein"));
-    System.out.println("*** Ist Zertifikat des Signators von einer Behörde? " + ((signerInfo.isPublicAuthority()) ? "ja" : "nein"));
-    
-    // Ergebnisse von Signatur- und Zertifikatsprüfung
-    System.out.println();
-    System.out.println("Ergebniscode der Signaturprüfung: " + verifyResponse.getSignatureCheck().getCode());
-    System.out.println("Ergebniscode der Zertifikatsprüfung: " + verifyResponse.getCertificateCheck().getCode());
-    
-    // Signatorzertifikat
-    System.out.println();
-    System.out.println("*** Zertifikat des Signators:");
-    System.out.println("Aussteller: " + signerInfo.getSignerCertificate().getIssuerDN());
-    System.out.println("Subject: " + signerInfo.getSignerCertificate().getSubjectDN());
-    System.out.println("Seriennummer: " + signerInfo.getSignerCertificate().getSerialNumber());
-  }
-
-  /**
-   * Setzt die notwendigen System-Properties für die Konfiguration der MOA SP/SS API. 
-   * 
-   * @param args Siehe @link VerifyXMLSignature#main(String[]).
-   */
-  private static void init(String[] args)
-  {
-    if (args == null || args.length != 3)
-    {
-      System.out.println("Verwendung: VerifyXMLSignature <MOASPSSConfigFile> <Log4JConfigFile> <XMLDocWithSignature>");
-      System.exit(-1);
-    }
-    System.setProperty("moa.spss.server.configuration", args[0]);
-    System.setProperty("log4j.configuration", "file:" + args[1]);
-  }
-}
\ No newline at end of file
diff --git a/spss.handbook/clients/common/referencedData/Text.b64 b/spss.handbook/clients/common/referencedData/Text.b64
deleted file mode 100644
index 0f4636b9a..000000000
--- a/spss.handbook/clients/common/referencedData/Text.b64
+++ /dev/null
@@ -1 +0,0 @@
-RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu
\ No newline at end of file
diff --git a/spss.handbook/clients/common/referencedData/Text.txt b/spss.handbook/clients/common/referencedData/Text.txt
deleted file mode 100644
index 3a75c06b3..000000000
--- a/spss.handbook/clients/common/referencedData/Text.txt
+++ /dev/null
@@ -1 +0,0 @@
-Diese Daten sind reiner Text.
\ No newline at end of file
diff --git a/spss.handbook/clients/common/referencedData/WEB-INF/web.xml b/spss.handbook/clients/common/referencedData/WEB-INF/web.xml
deleted file mode 100644
index 002520ba5..000000000
--- a/spss.handbook/clients/common/referencedData/WEB-INF/web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-  <display-name>MOA Webservice Client: Referenzierte Web-Daten</display-name>
-  <description>MOA Webservice Client: Referenzierte Web-Daten</description>
-</web-app>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.Para.xsl b/spss.handbook/clients/common/referencedData/XMLDocument.Para.xsl
deleted file mode 100644
index 11d6dd6f9..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.Para.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="urn:document" xmlns="http://www.w3.org/1999/xhtml">
-  <xsl:output encoding="UTF-8" method="xml" indent="yes"/>
-  <xsl:template match="/">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-      <head>
-        <title>HTML-Dokument</title>
-      </head>
-      <body>
-        <xsl:apply-templates/> 
-      </body>
-    </html>
-  </xsl:template>  
-  <xsl:template match="doc:Paragraph">
-    <p>
-      <xsl:value-of select="child::text()"/>
-    </p>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.signed.xml b/spss.handbook/clients/common/referencedData/XMLDocument.signed.xml
deleted file mode 100644
index 897b3c896..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.signed.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>30zsZMPn1mR5G5oIGJvTRmCik3WuepfZF6AhLwxgJDMJlPQ8rheBWCaKihzXnHaS</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument>
\ No newline at end of file
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.withResolvableSchemaHint.xml b/spss.handbook/clients/common/referencedData/XMLDocument.withResolvableSchemaHint.xml
deleted file mode 100644
index 4f1124637..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.withResolvableSchemaHint.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:XMLDocument xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document http://localhost:8080/referencedData/XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.withSchemaHint.xml b/spss.handbook/clients/common/referencedData/XMLDocument.withSchemaHint.xml
deleted file mode 100644
index 82f65d99e..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.withSchemaHint.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:XMLDocument xmlns:doc="urn:document" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document urn:XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.xml b/spss.handbook/clients/common/referencedData/XMLDocument.xml
deleted file mode 100644
index 1c48dce36..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.xsd b/spss.handbook/clients/common/referencedData/XMLDocument.xsd
deleted file mode 100644
index a2930f1da..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xs:schema targetNamespace="urn:document" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:document" elementFormDefault="qualified" attributeFormDefault="unqualified">

-  <xs:element name="XMLDocument">

-    <xs:complexType>

-      <xs:sequence>

-        <xs:element name="Paragraph" maxOccurs="unbounded">

-          <xs:complexType mixed="true">

-            <xs:attribute name="ParaId" type="xs:ID" use="optional"/>

-          </xs:complexType>

-        </xs:element>

-        <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>

-      </xs:sequence>

-    </xs:complexType>

-  </xs:element>

-</xs:schema>

diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.xsl b/spss.handbook/clients/common/referencedData/XMLDocument.xsl
deleted file mode 100644
index 85755c2e6..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="urn:document">
-  <xsl:output encoding="UTF-8" method="xml" indent="yes"/>
-  <xsl:template match="/doc:XMLDocument">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-      <head>
-        <title>HTML-Dokument</title>
-      </head>
-      <body>
-        <xsl:for-each select="doc:Paragraph">
-          <p>
-            <xsl:value-of select="child::text()"/>
-          </p>
-        </xsl:for-each>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocumentRef.xsl b/spss.handbook/clients/common/referencedData/XMLDocumentRef.xsl
deleted file mode 100644
index c385f9d1f..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocumentRef.xsl
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet>
diff --git a/spss.handbook/clients/common/referencedData/referencedData.war b/spss.handbook/clients/common/referencedData/referencedData.war
deleted file mode 100644
index 6a05d6c7a..000000000
--- a/spss.handbook/clients/common/referencedData/referencedData.war
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/conf/http.properties b/spss.handbook/clients/webservice/conf/http.properties
deleted file mode 100644
index 1506169ed..000000000
--- a/spss.handbook/clients/webservice/conf/http.properties
+++ /dev/null
@@ -1,74 +0,0 @@
-###
-# Properties für den HTTP(S) Client
-###
-
-#
-# Signieren
-#
-
-# Name des Webservices, fix "SignatureCreation"
-signServiceQName = SignatureCreation
-
-# Zugangspunkt des Webservices
-signServiceEndPoint = http://localhost:8080/moa-spss/services/SignatureCreation
-#signServiceEndPoint = https://localhost:8443/moa-spss/services/SignatureCreation
-
-# Name des zu sendenden Signaturerstellungsrequests (entweder absolute
-# oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-# Arbeitsverzeichnis der Java VM interpretiert)
-signRequest = clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml
-#signRequest=clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml
-#signRequest=clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml
-#signRequest=clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml
-
-
-#
-# Verifizieren
-#
-
-# Name des Webservices, fix "SignatureVerification"
-verifyServiceQName = SignatureVerification
-
-# Zugangspunkt des Webservices
-verifyServiceEndPoint = http://localhost:8080/moa-spss/services/SignatureVerification
-#verifyServiceEndPoint = https://localhost:8443/moa-spss/services/SignatureVerification
-
-# Name des zu sendenden Signaturprüfrequests (entweder absolute
-# oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-# Arbeitsverzeichnis der Java VM interpretiert)
-verifyRequest=clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
-
-#
-# JSSE-Konfiguration
-#
-
-# Typ des JSSE-Truststores (entweder "JKS" für einen Java Key Store oder 
-# "PKCS12" für eine PKCS#12-Datei).
-ssl.truststore.type = JKS
-
-# Relativer oder absoluter Pfad zum JSSE-Truststore. Ein relativer Pfad 
-# wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-ssl.truststore.loc = clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
-#ssl.truststore.loc = clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
-
-# Passwort für den JSSE-Truststore.
-ssl.truststore.pwd = servers
-
-# Typ des JSSE-Keystores (entweder "JKS" für einen Java Key Store oder 
-# "PKCS12" für eine PKCS#12-Datei).
-ssl.keystore.type = PKCS12
-
-# Relativer oder absoluter Pfad zum JSSE-Keystore. Ein relativer Pfad 
-# wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-ssl.keystore.loc = clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
-#ssl.keystore.loc = clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
-
-# Passwort für den JSSE-Keystore.
-ssl.keystore.pwd = kunde1
-#ssl.keystore.pwd = kunde2
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/axis-ant.jar b/spss.handbook/clients/webservice/lib/axis-1_1/axis-ant.jar
deleted file mode 100644
index 9cb30a98a..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/axis-ant.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/axis.jar b/spss.handbook/clients/webservice/lib/axis-1_1/axis.jar
deleted file mode 100644
index 869ee16f5..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/axis.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/commons-discovery.jar b/spss.handbook/clients/webservice/lib/axis-1_1/commons-discovery.jar
deleted file mode 100644
index b88554847..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/commons-discovery.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging-api.jar b/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging-api.jar
deleted file mode 100644
index ade9a13c7..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging-api.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging.jar b/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging.jar
deleted file mode 100644
index b73a80fab..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/jaxrpc.jar b/spss.handbook/clients/webservice/lib/axis-1_1/jaxrpc.jar
deleted file mode 100644
index 5f6a56f02..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/jaxrpc.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/log4j-1.2.8.jar b/spss.handbook/clients/webservice/lib/axis-1_1/log4j-1.2.8.jar
deleted file mode 100644
index 493a3ccc1..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/log4j-1.2.8.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/saaj.jar b/spss.handbook/clients/webservice/lib/axis-1_1/saaj.jar
deleted file mode 100644
index f2242abe5..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/saaj.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/wsdl4j.jar b/spss.handbook/clients/webservice/lib/axis-1_1/wsdl4j.jar
deleted file mode 100644
index 820abd082..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/wsdl4j.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jcert.jar b/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jcert.jar
deleted file mode 100644
index d33134214..000000000
--- a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jcert.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jnet.jar b/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jnet.jar
deleted file mode 100644
index e1d340093..000000000
--- a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jnet.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jsse.jar b/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jsse.jar
deleted file mode 100644
index 123188c5e..000000000
--- a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jsse.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xercesImpl.jar b/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xercesImpl.jar
deleted file mode 100644
index bff9af0c4..000000000
--- a/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xercesImpl.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xmlParserAPIs.jar b/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xmlParserAPIs.jar
deleted file mode 100644
index 6ba4ff805..000000000
--- a/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xmlParserAPIs.jar
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml
deleted file mode 100644
index bad31d170..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-2" URI="#xpointer(id(&apos;signed-data-1-2-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>A8ml6/aZKCmj1hONwvLItIwGHoc=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-3" URI="#xpointer(id(&apos;signed-data-1-3-1&apos;)/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-4" URI="#xpointer(id(&apos;signed-data-1-4-1&apos;)/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-6" URI="NichtAufloesbareReferenz1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-7" URI="http://localhost:8080/referencedData/Text.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-8" URI="NichtAufloesbareReferenz2"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-9" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>mNsxUkFoF46XZVBivBo4aasFCTQ=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>kaAiAZgnUMYb3/IV5mmJinrH3et5M+o4OWMhgA3C9SZSPsE+ptWUAPU1VKl1G2AF</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-2-1"><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument></dsig:Object><dsig:Object Id="signed-data-1-3-1">RGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4=</dsig:Object><dsig:Object Id="signed-data-1-4-1">RGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4=</dsig:Object><dsig:Object Id="signed-data-1-1-1">RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</dsig:Object><dsig:Object><dsig:Manifest Id="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>a53jOsL7KbyltpByAK87FoMZphI=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-5" URI="http://localhost:8080/referencedData/Text.b64"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>a53jOsL7KbyltpByAK87FoMZphI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml
deleted file mode 100644
index f4dd2dbb6..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <!--Enveloping Data, direkte Angabe der Daten in base64 kodierter Form; Manifest-Referenz-->
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="true">
-      <DataObject>
-        <Base64Content>RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</Base64Content>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Enveloping Data, direkte Angabe der Daten als XML-Fragment; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
-      <DataObject>
-        <XMLContent><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument></XMLContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>application/xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Enveloping Data,  Angabe der Daten als Referenz mittels Reference-Attribut, die von MOA aufgelöst wird; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
-      <DataObject Reference="http://localhost:8080/referencedData/Text.txt"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Enveloping Data,  Angabe der Daten als Referenz mittels LocRefContent, die von MOA aufgelöst wird; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
-      <DataObject>
-        <LocRefContent>http://localhost:8080/referencedData/Text.txt</LocRefContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten; direkte Angabe der Daten in base64 kodierter Form; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; Manifest-Referenz-->
-    <DataObjectInfo Structure="detached" ChildOfManifest="true">
-      <DataObject Reference="http://localhost:8080/referencedData/Text.b64">
-        <Base64Content>RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</Base64Content>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten; direkte Angabe der Daten als XML-Fragment; Referenzierung in der Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="detached" ChildOfManifest="false">
-      <DataObject Reference="NichtAufloesbareReferenz1">
-        <XMLContent><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument></XMLContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>application/xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten;Angabe der Daten als Referenz über das Reference-Attribut, die von MOA aufgelöst wird; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="detached" ChildOfManifest="false">
-      <DataObject Reference="http://localhost:8080/referencedData/Text.txt">
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten;Angabe der Daten als Referenz mittels LocRefContent, die von MOA aufgelöst wird; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="detached" ChildOfManifest="false">
-      <DataObject Reference="NichtAufloesbareReferenz2">
-        <LocRefContent>http://localhost:8080/referencedData/Text.txt</LocRefContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten, Verweis auf jenes Dokument, das die Signatur beinhalten wird; Angabe der Daten als Referenz über das Reference-Attribut, die von MOA aufgelöst wird; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference=""/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>application/xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <CreateSignatureInfo>
-      <CreateSignatureEnvironment>
-        <LocRefContent>http://localhost:8080/referencedData/XMLDocument.xml</LocRefContent>
-      </CreateSignatureEnvironment>
-      <CreateSignatureEnvironmentProfile>
-        <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
-      </CreateSignatureEnvironmentProfile>
-    </CreateSignatureInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml
deleted file mode 100644
index edcb03c09..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml
deleted file mode 100644
index 3344b4709..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<KeyIdentifier>KG_allgemein</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="enveloping">
-			<DataObject>
-				<XMLContent>Diese Daten werden signiert.</XMLContent>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<FinalDataMetaInfo>
-						<MimeType>text/plain</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml
deleted file mode 100644
index def0daf25..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document urn:XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>vGVimRmUHwrDR8feQCK1DZ2kyDw0CCrXimJi/yCrIoqSkUKFlKrtAyP2RUBXXjye</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml
deleted file mode 100644
index 9144e83f8..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference="#Para2"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
-              <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet>              
-            </dsig:Transform>
-            <dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>application/xhtml+xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-        <Supplement>
-          <Content Reference="XMLDocument.Para.xsl">
-            <LocRefContent>http://localhost:8080/referencedData/XMLDocument.Para.xsl</LocRefContent>
-          </Content>
-        </Supplement>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <CreateSignatureInfo>
-      <CreateSignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.withSchemaHint.xml"/>
-      <CreateSignatureEnvironmentProfile>
-        <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
-        <Supplement>
-          <Content Reference="urn:XMLDocument.xsd">
-            <LocRefContent>http://localhost:8080/referencedData/XMLDocument.xsd</LocRefContent>
-          </Content>
-        </Supplement>
-      </CreateSignatureEnvironmentProfile>
-    </CreateSignatureInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml
deleted file mode 100644
index 1d5bd65ea..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/referencedData/Text.b64"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>a53jOsL7KbyltpByAK87FoMZphI=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-2" URI="http://localhost:8080/referencedData/XMLDocument.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2"><xp2:XPath Filter="subtract" xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xf2="http://www.w3.org/2002/06/xmldsig-filter2" xmlns:xp2="http://www.w3.org/2002/06/xmldsig-filter2">/doc:XMLDocument/doc:Paragraph[2]</xp2:XPath></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:doc="urn:document" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output encoding="UTF-8" indent="yes" method="xml"/>
-  <xsl:template match="/doc:XMLDocument">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-      <head>
-        <title>HTML-Dokument</title>
-      </head>
-      <body>
-        <xsl:for-each select="doc:Paragraph">
-          <p>
-            <xsl:value-of select="child::text()"/>
-          </p>
-        </xsl:for-each>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>fIPwneCpjVqTXwHMN9DFfx6tJIU=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>kWm9iFL5UngH8uDG6094K99J/WB/PdlqzfI6WtGpJ3jiCTV7mn/mzYWMv09b3vee</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml
deleted file mode 100644
index 6375365b2..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference="http://localhost:8080/referencedData/Text.b64"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference="http://localhost:8080/referencedData/XMLDocument.xml"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2">
-              <xp2:XPath xmlns:xp2="http://www.w3.org/2002/06/xmldsig-filter2" xmlns:doc="urn:document" Filter="subtract">/doc:XMLDocument/doc:Paragraph[2]</xp2:XPath>
-            </dsig:Transform>
-            <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="urn:document">
-  <xsl:output encoding="UTF-8" method="xml" indent="yes"/>
-  <xsl:template match="/doc:XMLDocument">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-      <head>
-        <title>HTML-Dokument</title>
-      </head>
-      <body>
-        <xsl:for-each select="doc:Paragraph">
-          <p>
-            <xsl:value-of select="child::text()"/>
-          </p>
-        </xsl:for-each>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet></dsig:Transform>
-            <dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>application/xhtml+xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml
deleted file mode 100644
index daa22bdb3..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>serialNumber=615536615920,givenName=Gregor,SN=Karlinger,CN=Gregor Karlinger,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=TrustSignTest-Sig-01,OU=TrustSignTest-Sig-01,O=A-Trust Ges. für Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>2892</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIFLjCCBBagAwIBAgICC0wwDQYJKoZIhvcNAQEFBQAwgdkxCzAJBgNVBAYTAkFU
-MYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwAcgAg
-AFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAAZQBs
-AGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIASDEd
-MBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNVBAMTFFRydXN0U2ln
-blRlc3QtU2lnLTAxMB4XDTAzMDgyNzEyMDEyNFoXDTA2MDgyNzEyMDEyNFowZDEL
-MAkGA1UEBhMCQVQxGTAXBgNVBAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQT
-CUthcmxpbmdlcjEPMA0GA1UEKhMGR3JlZ29yMRUwEwYDVQQFEww2MTU1MzY2MTU5
-MjAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDSK1XaYK0Ydbk6V58g7QzQ
-Ysk0A6C2JyhiZy3078DJ1EkwzBMVejTNq1e9wp+BmeZ2YpiftNyRFfu/Gg8ksOUQ
-2oCn9A9pZLUGvtajA3aL8f182GQODRqQmelvYSUL/u9vAChOlcT+UEqj5jW4xjd4
-XsCotX4Kz+ofkD+SAlf1AgMBAAGjggH2MIIB8jATBgNVHSMEDDAKgAhKfsjmnWR0
-6TA+BggrBgEFBQcBAwEB/wQvMC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVIC
-AQACAQAwCgYIKwYBBQUHCwEwgYIGCCsGAQUFBwEBBHYwdDAvBggrBgEFBQcwAYYj
-aHR0cDovL29jc3AtdGVzdC5hLXRydXN0LmF0OjgyL29jc3AwQQYIKwYBBQUHMAKG
-NWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9UcnVzdFNpZ25UZXN0LVNpZy0w
-MWMuY3J0MFEGA1UdIARKMEgwPAYGKigAEQEDMDIwMAYIKwYBBQUHAgEWJGh0dHA6
-Ly93d3cuYS10cnVzdC5hdC9kb2NzL1RydXN0VGVzdDAIBgYEAIswAQEwbgYDVR0f
-BGcwZTBjoGGgX4ZdbGRhcDovL2xkYXAtdGVzdC5hLXRydXN0LmF0L291PVRydXN0
-U2lnblRlc3QtU2lnLTAxLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2Nh
-dGlvbmxpc3Q/MBEGA1UdDgQKBAhNa9QR1H4T3zAOBgNVHQ8BAf8EBAMCBsAwJQYD
-VR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8uZ3YuYXQwCQYDVR0TBAIwADAN
-BgkqhkiG9w0BAQUFAAOCAQEALi2DEl6whJsiQF+bsNVR8CQhXg6ZuzTGlPhyCBum
-765Y5gMRLEfAx2D8Wv4XXPHasAxZ/NKZRwbfLWN7IxPeVHF+vCShlXmYGWVj75fE
-EGStIKyULqZB7jOJdsFHNdvp8yQaexR9olO3neXjrFmcXFVhpZFJomBH6JEL0uRa
-LsPlN97OTa1NKkdj92SX8IkcV2k9yQ3Nl2KgicZDlxdYtSDGh9P0KddJZZJTRAdm
-ixWb4Y2cGkRDhXoHzvHcZQ7eqJYHPapm3NTZ428I7LCKma8859rMwRSNTN14yIVL
-KkgBtxvmstGVa33Ki53LBkSSuBMH3Pa+4xbnYSkJA4phaA==</dsig:X509Certificate><QualifiedCertificate/></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>1</Code></CertificateCheck></VerifyCMSSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml b/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml
deleted file mode 100644
index 16e961b96..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" Signatories="1">
-  <DateTime>2004-08-17T08:00:00+02:00</DateTime>
-  <CMSSignature>MIIHiwYJKoZIhvcNAQcCoIIHfDCCB3gCAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCCBTIw
-ggUuMIIEFqADAgECAgILTDANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UEBhMCQVQxgYswgYgGA1UE
-Ch6BgABBAC0AVAByAHUAcwB0ACAARwBlAHMALgAgAGYA/AByACAAUwBpAGMAaABlAHIAaABlAGkA
-dABzAHMAeQBzAHQAZQBtAGUAIABpAG0AIABlAGwAZQBrAHQAcgAuACAARABhAHQAZQBuAHYAZQBy
-AGsAZQBoAHIAIABHAG0AYgBIMR0wGwYDVQQLExRUcnVzdFNpZ25UZXN0LVNpZy0wMTEdMBsGA1UE
-AxMUVHJ1c3RTaWduVGVzdC1TaWctMDEwHhcNMDMwODI3MTIwMTI0WhcNMDYwODI3MTIwMTI0WjBk
-MQswCQYDVQQGEwJBVDEZMBcGA1UEAxMQR3JlZ29yIEthcmxpbmdlcjESMBAGA1UEBBMJS2FybGlu
-Z2VyMQ8wDQYDVQQqEwZHcmVnb3IxFTATBgNVBAUTDDYxNTUzNjYxNTkyMDCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAoNIrVdpgrRh1uTpXnyDtDNBiyTQDoLYnKGJnLfTvwMnUSTDMExV6NM2r
-V73Cn4GZ5nZimJ+03JEV+78aDySw5RDagKf0D2lktQa+1qMDdovx/XzYZA4NGpCZ6W9hJQv+728A
-KE6VxP5QSqPmNbjGN3hewKi1fgrP6h+QP5ICV/UCAwEAAaOCAfYwggHyMBMGA1UdIwQMMAqACEp+
-yOadZHTpMD4GCCsGAQUFBwEDAQH/BC8wLTAIBgYEAI5GAQEwFQYGBACORgECMAsTA0VVUgIBAAIB
-ADAKBggrBgEFBQcLATCBggYIKwYBBQUHAQEEdjB0MC8GCCsGAQUFBzABhiNodHRwOi8vb2NzcC10
-ZXN0LmEtdHJ1c3QuYXQ6ODIvb2NzcDBBBggrBgEFBQcwAoY1aHR0cDovL3d3dy5hLXRydXN0LmF0
-L2NlcnRzL1RydXN0U2lnblRlc3QtU2lnLTAxYy5jcnQwUQYDVR0gBEowSDA8BgYqKAARAQMwMjAw
-BggrBgEFBQcCARYkaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvVHJ1c3RUZXN0MAgGBgQAizAB
-ATBuBgNVHR8EZzBlMGOgYaBfhl1sZGFwOi8vbGRhcC10ZXN0LmEtdHJ1c3QuYXQvb3U9VHJ1c3RT
-aWduVGVzdC1TaWctMDEsbz1BLVRydXN0LGM9QVQ/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdD8w
-EQYDVR0OBAoECE1r1BHUfhPfMA4GA1UdDwEB/wQEAwIGwDAlBgNVHREEHjAcgRpncmVnb3Iua2Fy
-bGluZ2VyQGNpby5ndi5hdDAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBBQUAA4IBAQAuLYMSXrCEmyJA
-X5uw1VHwJCFeDpm7NMaU+HIIG6bvrljmAxEsR8DHYPxa/hdc8dqwDFn80plHBt8tY3sjE95UcX68
-JKGVeZgZZWPvl8QQZK0grJQupkHuM4l2wUc12+nzJBp7FH2iU7ed5eOsWZxcVWGlkUmiYEfokQvS
-5Fouw+U33s5NrU0qR2P3ZJfwiRxXaT3JDc2XYqCJxkOXF1i1IMaH0/Qp10llklNEB2aLFZvhjZwa
-REOFegfO8dxlDt6olgc9qmbc1NnjbwjssIqZrzzn2szBFI1M3XjIhUsqSAG3G+ay0ZVrfcqLncsG
-RJK4Ewfc9r7jFudhKQkDimFoMYICITCCAh0CAQEwgeAwgdkxCzAJBgNVBAYTAkFUMYGLMIGIBgNV
-BAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwAcgAgAFMAaQBjAGgAZQByAGgAZQBp
-AHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAAZQBsAGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUA
-cgBrAGUAaAByACAARwBtAGIASDEdMBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNV
-BAMTFFRydXN0U2lnblRlc3QtU2lnLTAxAgILTDAJBgUrDgMCGgUAoIGXMCMGCSqGSIb3DQEJBDEW
-BBRrneM6wvspvKW2kHIArzsWgxmmEjAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMCkGCyqGSIb3
-DQEJEAIEMRowGAwLdGV4dC9wbGFpbhsGCSqGSIb3DQEHATArBgsqhkiG9w0BCRACEzEcMBowGDAW
-BBQdhdZ+dQSz53K2vT9KOGCxp6+qIDANBgkqhkiG9w0BAQEFAASBgFTEY4mMXQx2fNk9zo64MRxI
-mS38vuD7W7LjBoUQ/w6mPi60kiqA/Pnf5I7fvM2epuo4xHpft1diuTY0fa9VqSv+q13Lr1x+l3ON
-oxX27oCPLcJq6sFipZj50Bx5BHhgTX+59cNIT3eTRLenBzrJ/ccNd5OLqgkfiwsvqSk48lou</CMSSignature>
-  <DataObject>
-    <Content>
-      <Base64Content>RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</Base64Content>
-    </Content>
-  </DataObject>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml
deleted file mode 100644
index daa22bdb3..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>serialNumber=615536615920,givenName=Gregor,SN=Karlinger,CN=Gregor Karlinger,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=TrustSignTest-Sig-01,OU=TrustSignTest-Sig-01,O=A-Trust Ges. für Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>2892</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIFLjCCBBagAwIBAgICC0wwDQYJKoZIhvcNAQEFBQAwgdkxCzAJBgNVBAYTAkFU
-MYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwAcgAg
-AFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAAZQBs
-AGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIASDEd
-MBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNVBAMTFFRydXN0U2ln
-blRlc3QtU2lnLTAxMB4XDTAzMDgyNzEyMDEyNFoXDTA2MDgyNzEyMDEyNFowZDEL
-MAkGA1UEBhMCQVQxGTAXBgNVBAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQT
-CUthcmxpbmdlcjEPMA0GA1UEKhMGR3JlZ29yMRUwEwYDVQQFEww2MTU1MzY2MTU5
-MjAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDSK1XaYK0Ydbk6V58g7QzQ
-Ysk0A6C2JyhiZy3078DJ1EkwzBMVejTNq1e9wp+BmeZ2YpiftNyRFfu/Gg8ksOUQ
-2oCn9A9pZLUGvtajA3aL8f182GQODRqQmelvYSUL/u9vAChOlcT+UEqj5jW4xjd4
-XsCotX4Kz+ofkD+SAlf1AgMBAAGjggH2MIIB8jATBgNVHSMEDDAKgAhKfsjmnWR0
-6TA+BggrBgEFBQcBAwEB/wQvMC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVIC
-AQACAQAwCgYIKwYBBQUHCwEwgYIGCCsGAQUFBwEBBHYwdDAvBggrBgEFBQcwAYYj
-aHR0cDovL29jc3AtdGVzdC5hLXRydXN0LmF0OjgyL29jc3AwQQYIKwYBBQUHMAKG
-NWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9UcnVzdFNpZ25UZXN0LVNpZy0w
-MWMuY3J0MFEGA1UdIARKMEgwPAYGKigAEQEDMDIwMAYIKwYBBQUHAgEWJGh0dHA6
-Ly93d3cuYS10cnVzdC5hdC9kb2NzL1RydXN0VGVzdDAIBgYEAIswAQEwbgYDVR0f
-BGcwZTBjoGGgX4ZdbGRhcDovL2xkYXAtdGVzdC5hLXRydXN0LmF0L291PVRydXN0
-U2lnblRlc3QtU2lnLTAxLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2Nh
-dGlvbmxpc3Q/MBEGA1UdDgQKBAhNa9QR1H4T3zAOBgNVHQ8BAf8EBAMCBsAwJQYD
-VR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8uZ3YuYXQwCQYDVR0TBAIwADAN
-BgkqhkiG9w0BAQUFAAOCAQEALi2DEl6whJsiQF+bsNVR8CQhXg6ZuzTGlPhyCBum
-765Y5gMRLEfAx2D8Wv4XXPHasAxZ/NKZRwbfLWN7IxPeVHF+vCShlXmYGWVj75fE
-EGStIKyULqZB7jOJdsFHNdvp8yQaexR9olO3neXjrFmcXFVhpZFJomBH6JEL0uRa
-LsPlN97OTa1NKkdj92SX8IkcV2k9yQ3Nl2KgicZDlxdYtSDGh9P0KddJZZJTRAdm
-ixWb4Y2cGkRDhXoHzvHcZQ7eqJYHPapm3NTZ428I7LCKma8859rMwRSNTN14yIVL
-KkgBtxvmstGVa33Ki53LBkSSuBMH3Pa+4xbnYSkJA4phaA==</dsig:X509Certificate><QualifiedCertificate/></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>1</Code></CertificateCheck></VerifyCMSSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml b/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml
deleted file mode 100644
index d41b0e278..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <CMSSignature>MIIHsAYJKoZIhvcNAQcCoIIHoTCCB50CAQExCzAJBgUrDgMCGgUAMDAGCSqGSIb3DQEHAaAjBCFE
-aWVzZSBEYXRlbiB3YXJlbiBiYXNlNjQga29kaWVydC6gggUyMIIFLjCCBBagAwIBAgICC0wwDQYJ
-KoZIhvcNAQEFBQAwgdkxCzAJBgNVBAYTAkFUMYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAg
-AEcAZQBzAC4AIABmAPwAcgAgAFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAA
-aQBtACAAZQBsAGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIASDEd
-MBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNVBAMTFFRydXN0U2lnblRlc3QtU2ln
-LTAxMB4XDTAzMDgyNzEyMDEyNFoXDTA2MDgyNzEyMDEyNFowZDELMAkGA1UEBhMCQVQxGTAXBgNV
-BAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQTCUthcmxpbmdlcjEPMA0GA1UEKhMGR3JlZ29y
-MRUwEwYDVQQFEww2MTU1MzY2MTU5MjAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDSK1Xa
-YK0Ydbk6V58g7QzQYsk0A6C2JyhiZy3078DJ1EkwzBMVejTNq1e9wp+BmeZ2YpiftNyRFfu/Gg8k
-sOUQ2oCn9A9pZLUGvtajA3aL8f182GQODRqQmelvYSUL/u9vAChOlcT+UEqj5jW4xjd4XsCotX4K
-z+ofkD+SAlf1AgMBAAGjggH2MIIB8jATBgNVHSMEDDAKgAhKfsjmnWR06TA+BggrBgEFBQcBAwEB
-/wQvMC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVICAQACAQAwCgYIKwYBBQUHCwEwgYIGCCsG
-AQUFBwEBBHYwdDAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AtdGVzdC5hLXRydXN0LmF0OjgyL29j
-c3AwQQYIKwYBBQUHMAKGNWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9UcnVzdFNpZ25UZXN0
-LVNpZy0wMWMuY3J0MFEGA1UdIARKMEgwPAYGKigAEQEDMDIwMAYIKwYBBQUHAgEWJGh0dHA6Ly93
-d3cuYS10cnVzdC5hdC9kb2NzL1RydXN0VGVzdDAIBgYEAIswAQEwbgYDVR0fBGcwZTBjoGGgX4Zd
-bGRhcDovL2xkYXAtdGVzdC5hLXRydXN0LmF0L291PVRydXN0U2lnblRlc3QtU2lnLTAxLG89QS1U
-cnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/MBEGA1UdDgQKBAhNa9QR1H4T3zAO
-BgNVHQ8BAf8EBAMCBsAwJQYDVR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8uZ3YuYXQwCQYD
-VR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEALi2DEl6whJsiQF+bsNVR8CQhXg6ZuzTGlPhyCBum
-765Y5gMRLEfAx2D8Wv4XXPHasAxZ/NKZRwbfLWN7IxPeVHF+vCShlXmYGWVj75fEEGStIKyULqZB
-7jOJdsFHNdvp8yQaexR9olO3neXjrFmcXFVhpZFJomBH6JEL0uRaLsPlN97OTa1NKkdj92SX8Ikc
-V2k9yQ3Nl2KgicZDlxdYtSDGh9P0KddJZZJTRAdmixWb4Y2cGkRDhXoHzvHcZQ7eqJYHPapm3NTZ
-428I7LCKma8859rMwRSNTN14yIVLKkgBtxvmstGVa33Ki53LBkSSuBMH3Pa+4xbnYSkJA4phaDGC
-AiEwggIdAgEBMIHgMIHZMQswCQYDVQQGEwJBVDGBizCBiAYDVQQKHoGAAEEALQBUAHIAdQBzAHQA
-IABHAGUAcwAuACAAZgD8AHIAIABTAGkAYwBoAGUAcgBoAGUAaQB0AHMAcwB5AHMAdABlAG0AZQAg
-AGkAbQAgAGUAbABlAGsAdAByAC4AIABEAGEAdABlAG4AdgBlAHIAawBlAGgAcgAgAEcAbQBiAEgx
-HTAbBgNVBAsTFFRydXN0U2lnblRlc3QtU2lnLTAxMR0wGwYDVQQDExRUcnVzdFNpZ25UZXN0LVNp
-Zy0wMQICC0wwCQYFKw4DAhoFAKCBlzAjBgkqhkiG9w0BCQQxFgQUa53jOsL7KbyltpByAK87FoMZ
-phIwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATApBgsqhkiG9w0BCRACBDEaMBgMC3RleHQvcGxh
-aW4bBgkqhkiG9w0BBwEwKwYLKoZIhvcNAQkQAhMxHDAaMBgwFgQUHYXWfnUEs+dytr0/Sjhgsaev
-qiAwDQYJKoZIhvcNAQEBBQAEgYBUxGOJjF0MdnzZPc6OuDEcSJkt/L7g+1uy4waFEP8Opj4utJIq
-gPz53+SO37zNnqbqOMR6X7dXYrk2NH2vVakr/qtdy69cfpdzjaMV9u6Ajy3CaurBYqWY+dAceQR4
-YE1/ufXDSE93k0S3pwc6yf3HDXeTi6oJH4sLL6kpOPJaLg==</CMSSignature>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml
deleted file mode 100644
index f4db026fe..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><HashInputData PartOf="SignedInfo"><Base64Content>PGRvYzpYTUxEb2N1bWVudCB4bWxuczpkb2M9InVybjpkb2N1bWVudCI+CiAgPGRv
-YzpQYXJhZ3JhcGg+SWNoIGJpbiBkZXIgZXJzdGUgQWJzYXR6IGluIGRpZXNlbSBE
-b2t1bWVudC48L2RvYzpQYXJhZ3JhcGg+CiAgPGRvYzpQYXJhZ3JhcGggUGFyYUlk
-PSJQYXJhMiI+VW5kIGljaCBiaW4gZGVyIHp3ZWl0ZSBBYnNhdHogaW4gZGllc2Vt
-IERva3VtZW50LgpJY2ggaGFiZSB3ZWl0ZXJzIGVpbiBlaWdlbmVucyBJRC1BdHRy
-aWJ1dCBiZWtvbW1lbi48L2RvYzpQYXJhZ3JhcGg+CjwvZG9jOlhNTERvY3VtZW50Pg==</Base64Content></HashInputData><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
deleted file mode 100644
index d97e76f78..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <DateTime>2004-08-18T17:00:00+02:00</DateTime>
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.signed.xml"/>
-    <VerifySignatureLocation xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/doc:XMLDocument/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <ReturnHashInputData/>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml
deleted file mode 100644
index 3798b2706..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><ReferenceInputData PartOf="SignedInfo"><XMLContent xml:space="preserve"><doc:Paragraph ParaId="Para2" xmlns:doc="urn:document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph></XMLContent></ReferenceInputData><ReferenceInputData PartOf="SignedInfo"><XMLContent xml:space="preserve"><dsig:Manifest Id="manifest-1-1" xmlns:doc="urn:document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dsig:Reference URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>B9nRChTbct68n9h5+Cb2mfNkASI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData PartOf="SignedInfo"><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:doc="urn:document" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><etsi:SignedSignatureProperties><etsi:SigningTime>2004-08-20T12:42:21</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>FOWcAqaHew69LEIDiGuiWVnB0mc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>application/xhtml+xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData><SignatureCheck><Code>0</Code></SignatureCheck><SignatureManifestCheck><Code>0</Code></SignatureManifestCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
deleted file mode 100644
index 657beca77..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent><doc:XMLDocument xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document http://localhost:8080/referencedData/XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest" URI="#manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>1aSV+vFkwG6NZCk5ZUzZV3J4eSo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id(&apos;etsi-signed-1-1&apos;)/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Dy1xXsV2LgSFJlGwYiunav1KC7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>f1v/vi1S7xiL+7ofWOUqBfoqOy42EnlXYFoTYcaUZaBiAecDvyX9StPRWTUls/j2</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest Id="manifest-1-1"><dsig:Reference URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>B9nRChTbct68n9h5+Cb2mfNkASI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2005-03-29T09:55:29</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>FOWcAqaHew69LEIDiGuiWVnB0mc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>application/xhtml+xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature>
-</doc:XMLDocument></XMLContent>
-    </VerifySignatureEnvironment>
-    <VerifySignatureLocation xmlns:doc="urn:document">/doc:XMLDocument/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <SignatureManifestCheckParams ReturnReferenceInputData="true">
-    <ReferenceInfo>
-      <VerifyTransformsInfoProfile>
-        <dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms>
-        <TransformParameter URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-      </VerifyTransformsInfoProfile>
-      <VerifyTransformsInfoProfile>
-        <dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms>
-      </VerifyTransformsInfoProfile>
-    </ReferenceInfo>
-  </SignatureManifestCheckParams>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml
deleted file mode 100644
index 2fab33b20..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml
deleted file mode 100644
index 5565601d8..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
-    <VerifySignatureLocation xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml
deleted file mode 100644
index 2fab33b20..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.response.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.response.xml
deleted file mode 100644
index 2fab33b20..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.response.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml
deleted file mode 100644
index 50ddbc1da..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent><doc:XMLDocument xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document urn:XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>vGVimRmUHwrDR8feQCK1DZ2kyDw0CCrXimJi/yCrIoqSkUKFlKrtAyP2RUBXXjye</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument></XMLContent>
-    </VerifySignatureEnvironment>
-    <VerifySignatureLocation xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/doc:XMLDocument/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <SupplementProfile>
-    <Content Reference="XMLDocument.Para.xsl">
-      <LocRefContent>http://localhost:8080/referencedData/XMLDocument.Para.xsl</LocRefContent>
-    </Content>
-  </SupplementProfile>
-  <SupplementProfile>
-    <Content Reference="urn:XMLDocument.xsd">
-      <XMLContent><xs:schema targetNamespace="urn:document" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:document" elementFormDefault="qualified" attributeFormDefault="unqualified">
-  <xs:element name="XMLDocument">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="Paragraph" maxOccurs="unbounded">
-          <xs:complexType mixed="true">
-            <xs:attribute name="ParaId" type="xs:ID" use="optional"/>
-          </xs:complexType>
-        </xs:element>
-        <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
-
-</XMLContent>
-    </Content>
-  </SupplementProfile>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml
deleted file mode 100644
index 9d3b6dea7..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><XMLDSIGManifestCheck><Code>0</Code><Info><ReferringSigReference>1</ReferringSigReference></Info></XMLDSIGManifestCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
deleted file mode 100644
index a57fbb934..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>nUUaW6OtcsNvV/QhqmkU2QXT1Mw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pzI1j60BNsnS+zjXYtXlh109HjJGEMrMzTzkUB54rReOpI1ynNkG2RE7AiOlvpPh</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten sind signiert.</dsig:Object><dsig:Object><dsig:Manifest Id="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>EYxznGxNRAIcHQeUsj+zsK+uaHA=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></XMLContent>
-    </VerifySignatureEnvironment>
-    <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml
deleted file mode 100644
index be2eb37ad..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>30zsZMPn1mR5G5oIGJvTRmCik3WuepfZF6AhLwxgJDMJlPQ8rheBWCaKihzXnHaS</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml
deleted file mode 100644
index 7f89028c6..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference=""/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>text/xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <CreateSignatureInfo>
-      <CreateSignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.xml"/>
-      <CreateSignatureEnvironmentProfile>
-        <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
-      </CreateSignatureEnvironmentProfile>
-    </CreateSignatureInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml
deleted file mode 100644
index fb4204a09..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document http://localhost:8080/referencedData/XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest" URI="#manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>1aSV+vFkwG6NZCk5ZUzZV3J4eSo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id(&apos;etsi-signed-1-1&apos;)/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Dy1xXsV2LgSFJlGwYiunav1KC7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>f1v/vi1S7xiL+7ofWOUqBfoqOy42EnlXYFoTYcaUZaBiAecDvyX9StPRWTUls/j2</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest Id="manifest-1-1"><dsig:Reference URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>B9nRChTbct68n9h5+Cb2mfNkASI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2005-03-29T09:55:29</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>FOWcAqaHew69LEIDiGuiWVnB0mc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>application/xhtml+xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml
deleted file mode 100644
index b19f66b61..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="true">
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference="#Para2"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
-              <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet>              
-            </dsig:Transform>
-            <dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>application/xhtml+xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <CreateSignatureInfo>
-      <CreateSignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.withResolvableSchemaHint.xml"/>
-      <CreateSignatureEnvironmentProfile>
-        <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
-      </CreateSignatureEnvironmentProfile>
-    </CreateSignatureInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml
deleted file mode 100644
index a465e2126..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>nUUaW6OtcsNvV/QhqmkU2QXT1Mw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pzI1j60BNsnS+zjXYtXlh109HjJGEMrMzTzkUB54rReOpI1ynNkG2RE7AiOlvpPh</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten sind signiert.</dsig:Object><dsig:Object><dsig:Manifest Id="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>EYxznGxNRAIcHQeUsj+zsK+uaHA=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml
deleted file mode 100644
index da7e82025..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="true">
-      <DataObject>
-        <XMLContent>Diese Daten sind signiert.</XMLContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt b/spss.handbook/clients/webservice/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt
deleted file mode 100644
index f8527bb6d..000000000
--- a/spss.handbook/clients/webservice/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:doc="urn:document">
-<head>
-<title>HTML-Dokument</title>
-</head>
-<body>
-<p>Ich bin der erste Absatz in diesem Dokument.</p>
-</body>
-</html>
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1.der b/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1.der
deleted file mode 100644
index b6091332c..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1.der
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12 b/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
deleted file mode 100644
index 33f76bf9c..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore b/spss.handbook/clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
deleted file mode 100644
index 9c6c55359..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2.der b/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2.der
deleted file mode 100644
index 20bc38e14..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2.der
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12 b/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
deleted file mode 100644
index ec7bf8e48..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore b/spss.handbook/clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
deleted file mode 100644
index d32a22f0f..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
+++ /dev/null
diff --git a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.java b/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.java
deleted file mode 100644
index 00ae94c11..000000000
--- a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.webservice;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.Properties;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-
-import org.apache.axis.message.SOAPBodyElement;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-
-/**
- * Diese Klasse implementiert einen einfachen Client für das MOA SP/SS Webservice mittels Apache Axis. Die
- * Verbindung erfolgt ungesichert über HTTP.
- */
-public class HTTP
-{
-  protected Properties props_;
-
-  /**
-   * Methode main.
-   * 
-   * Enthält den Beispielcode der nötig ist um von Java aus auf MOA-SPSS zugreifen zu können. Der Zugriff
-   * passiert über das AXIS-Framework. Die Verbindung erfolgt ungesichert über HTTP.
-   * 
-   * @param args <ul>
-   *             <li>
-   *             args[0] enthält entweder die Bezeichnung "sign" oder "verify" zur Kennzeichnung,
-   *             ob ein Signaturerstellungsrequest, oder ein Signaturprüfrequest gesendet werden soll.
-   *             </li>
-   *             <li>
-   *             args[1] enthält einen Verweis auf eine Property-Datei, die die nähere Konfiguration
-   *             für dieses Beispiel enthält. Der Verweis enthält entweder eine absolute oder eine
-   *             relative Pfadangabe, wobei eine relative Angabe als relativ zum Arbeitsverzeichnis der
-   *             Java VM interpretiert wird. Folgende Properties müssen in der Property-Datei vorhanden
-   *             sein: 
-   *             <ul>
-   *             <li>
-   *             <code>signServiceQName</code>: Name des Webservices, fix "SignatureCreation"
-   *             </li>
-   *             <li>
-   *             <code>signServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
-   *             </li>
-   *             <li>
-   *             <code>signRequest</code>: Name des zu sendenden Signaturerstellungsrequests (entweder
-   *             absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-   *             Arbeitsverzeichnis der Java VM interpretiert)
-   *             </li>
-   *             <li>
-   *             <code>verifyServiceQName</code>: Name des Webservices, fix "SignatureVerification"
-   *             </li>
-   *             <li>
-   *             <code>verifyServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
-   *             </li>
-   *             <li>
-   *             <code>verifyRequest</code>: Name des zu sendenden Signaturprüfrequests (entweder
-   *             absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-   *             Arbeitsverzeichnis der Java VM interpretiert)
-   *             </li>
-   *             </ul>
-   *             </li>
-   *             </ul>
-   */
-  public static void main(String[] args)
-  {
-    try
-    {
-      // Prüfen, ob Beispiel korrekt verwendet wird
-      checkArgs(args, "HTTP");
-      
-      // Initialisieren des Clients
-      HTTP httpClient = new HTTP(args);
-      
-      // Ausführen der Serviceabfrage
-      httpClient.execute(args[0]);
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-  
-  /** 
-   * Prüft, ob das Beispiel korrekt verwendet wird.
-   * 
-   * @param args Die Aufrufparameter für das Beispiel. Siehe {@link HTTP#main(String[])}.
-   * 
-   * @param exampleName Der Name dieses Beispiels, der im Hilfetext gedruckt wird.
-   */
-  protected static void checkArgs(String[] args, String exampleName)
-  {
-    if (args == null || args.length != 2 || (!"sign".equals(args[0]) && !"verify".equals(args[0])))
-    {
-      System.out.println("Verwendung: " + exampleName + " \"sign\"|\"verify\" Properties-Datei");
-    }
-  }
-  
-  /**
-   * Erzeugt den MOA Client. Es erfolgt die Auswertung der übergebenen Aufrufparameter.
-   * 
-   * @param args Die Aufrufparameter für das Beispiel. Siehe {@link HTTP#main(String[])}.
-   * 
-   * @throws Exception wenn der MOA Client mit den übergebenen Aufrufparametern nicht korrekt erzeugt
-   *         werden konnte. 
-   */
-  protected HTTP(String[] args) throws Exception
-  {
-    props_ = new Properties();
-    props_.load(new FileInputStream(args[1]));
-  }
-  
-  /**
-   * Führt die Abfrage beim MOA-Service aus.
-   * 
-   * @param mode Steuert, ob eine Signatur erstellt ("sign") oder geprüft ("verify") werden soll.
-   * 
-   * @throws Exception wenn dabei etwas schiegeht.
-   */
-  protected void execute(String mode) throws Exception
-  {
-    // Datei mit Request einlesen
-    FileInputStream inputStream = new FileInputStream(getProperty(mode + "Request"));
-
-    // Parser/DOMBuilder instanzieren
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-    factory.setNamespaceAware(true);
-    DocumentBuilder builder = factory.newDocumentBuilder();
-
-    // XML Datei in einen DOM-Baum umwandeln
-    Document xmlRequest = builder.parse(inputStream);
-
-    // AXIS-Server instanzieren
-    Service service = ServiceFactory.newInstance().createService(new QName(getProperty(mode + "ServiceQName")));
-
-    // Call öffnen
-    Call call = service.createCall();
-
-    // Neues BodyElement anlegen und mit dem DOM-Baum füllen
-    SOAPBodyElement body = new SOAPBodyElement(xmlRequest.getDocumentElement());
-    SOAPBodyElement[] params = new SOAPBodyElement[]
-    {
-      body
-    };
-
-    // Call mit Endpoint verknüpfen
-    call.setTargetEndpointAddress(getProperty(mode + "ServiceEndPoint"));
-
-    // Call auslösen und die Antworten speichern
-    System.out.println("Calling ...");
-    Vector responses = (Vector) call.invoke(params);
-
-    // Erstes Body Element auslesen
-    SOAPBodyElement response = (SOAPBodyElement) responses.get(0);
-
-    // Aus der Response den DOM-Baum lesen
-    Document root_response = response.getAsDocument();
-    System.out.println("Return ...");
-
-    // XML-Formatierung konfiguieren
-    OutputFormat format = new OutputFormat((Document) root_response);
-    format.setLineSeparator("\n");
-    format.setIndenting(false);
-    format.setPreserveSpace(true);
-    format.setOmitXMLDeclaration(false);
-    format.setEncoding("UTF-8");
-
-    // Ausgabe der Webservice-Antwort auf die Konsole
-    XMLSerializer conSerializer = new XMLSerializer(System.out, format);
-    conSerializer.serialize(root_response);
-
-    // Ausgabe der Webservice-Antwort in Datei
-    String responseFile = getProperty(mode + "Request").substring(0, getProperty(mode + "Request").lastIndexOf('.'))
-      + ".response.xml";
-    XMLSerializer fileSerializer = new XMLSerializer(new FileOutputStream(responseFile), format);
-    fileSerializer.serialize(root_response);
-  }
-  
-  /**
-   * Prüft ob die Property mit dem angegebenen Namen in den Konfigurations-Properties enthalten ist.
-   *  
-   * @param propName Name der zu untersuchenden Property.
-   * 
-   * @return den Wert der gesuchten Property.
-   * 
-   * @throws Exception wenn die gesuchte Property nicht vorhanden ist.
-   */
-  protected String getProperty(String propName) throws Exception
-  {
-    String propValue = props_.getProperty(propName);
-    if ((propValue == null) || "".equals(propValue.trim()))
-    {
-      throw new Exception("Property named \"" + propName + "\" does not exist.");
-    }
-    return propValue;
-  }
-}
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.java b/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.java
deleted file mode 100644
index ef509088a..000000000
--- a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.webservice;
-
-
-/**
- * Diese Klasse implementiert einen einfachen Client für das MOA SP/SS Webservice mittels Apache Axis. Die
- * Verbindung erfolgt gesichert über SSL, und zwar sowohl mit Server- und Clientauthentisierung.
- */
-public class HTTPSClientAuth extends HTTPSServerAuth
-{
-  // JSSE Konstanten
-  public static final String KEYSTORE = "javax.net.ssl.keyStore";
-  public static final String KEYSTOREPASSWORD = "javax.net.ssl.keyStorePassword";
-  public static final String KEYSTORETYPE = "javax.net.ssl.keyStoreType";
-
-  /**
-   * Methode main.
-   * 
-   * Enthält den Beispielcode der nötig ist um von Java aus auf MOA-SPSS zugreifen zu können. Der Zugriff
-   * passiert über das AXIS-Framework. Die Verbindung erfolgt gesichert über SSL, und zwar sowohl mit 
-   * Server- und Clientauthentisierung.
-   * 
-   * @param args <ul>
-   *             <li>
-   *             args[0] enthält entweder die Bezeichnung "sign" oder "verify" zur Kennzeichnung,
-   *             ob ein Signaturerstellungsrequest, oder ein Signaturprüfrequest gesendet werden soll.
-   *             </li>
-   *             <li>
-   *             args[1] enthält einen Verweis auf eine Property-Datei, die die nähere Konfiguration
-   *             für dieses Beispiel enthält. Der Verweis enthält entweder eine absolute oder eine
-   *             relative Pfadangabe, wobei eine relative Angabe als relativ zum Arbeitsverzeichnis der
-   *             Java VM interpretiert wird. Folgende Properties müssen in der Properties-Datei vorhanden
-   *             sein: 
-   *             <ul>
-   *             <li>
-   *             <code>signServiceQName</code>: Name des Webservices, fix "SignatureCreation"
-   *             </li>
-   *             <li>
-   *             <code>signServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
-   *             </li>
-   *             <li>
-   *             <code>signRequest</code>: Name des zu sendenden Signaturerstellungsrequests (entweder
-   *             absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-   *             Arbeitsverzeichnis der Java VM interpretiert)
-   *             </li>
-   *             <li>
-   *             <code>verifyServiceQName</code>: Name des Webservices, fix "SignatureVerification"
-   *             </li>
-   *             <li>
-   *             <code>verifyServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
-   *             </li>
-   *             <li>
-   *             <code>verifyRequest</code>: Name des zu sendenden Signaturprüfrequests (entweder
-   *             absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-   *             Arbeitsverzeichnis der Java VM interpretiert)
-   *             </li>
-   *             <li>
-   *             <code>ssl.truststore.type</code>: Typ des JSSE-Truststores (entweder "JKS" für einen
-   *             Java Key Store oder "PKCS12" für eine PKCS#12-Datei).
-   *             </li>
-   *             <li><code>ssl.truststore.type</code>: Relativer oder absoluter Pfad zum JSSE-Truststore.
-   *             Ein relativer Pfad wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-   *             </li>
-   *             <li><code>ssl.truststore.pwd</code>: Passwort für den JSSE-Truststore.
-   *             </li>
-   *             <li>
-   *             <code>ssl.keystore.type</code>: Typ des JSSE-Keystores (entweder "JKS" für einen
-   *             Java Key Store oder "PKCS12" für eine PKCS#12-Datei).
-   *             </li>
-   *             <li><code>ssl.keystore.type</code>: Relativer oder absoluter Pfad zum JSSE-Keystore.
-   *             Ein relativer Pfad wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-   *             </li>
-   *             <li><code>ssl.keystore.pwd</code>: Passwort für den JSSE-Keystore.
-   *             </li>
-   *             </ul>
-   *             </li>
-   *             </ul>
-   */
-  public static void main(String[] args)
-  {
-    try
-    {
-      // Prüfen, ob Beispiel korrekt verwendet wird
-      checkArgs(args, "HTTP");
-      
-      // Initialisieren des Clients
-      HTTPSClientAuth httpClient = new HTTPSClientAuth(args);
-      
-      // Ausführen der Serviceabfrage
-      httpClient.execute(args[0]);
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-  
-  /**
-   * Erzeugt den MOA Client. Es erfolgt die Auswertung der übergebenen Aufrufparameter.
-   * 
-   * @param args Die Aufrufparameter für das Beispiel. Siehe {@link HTTPSClientAuth#main(String[])}.
-   * 
-   * @throws Exception wenn der MOA Client mit den übergebenen Aufrufparametern nicht korrekt erzeugt
-   *         werden konnte. 
-   */
-  protected HTTPSClientAuth(String[] args) throws Exception
-  {
-    super(args);
-  }
-  
-  /**
-   * Konfiguriert JSSE für eine SSL-Verbindung mit Client- und Serverauthentisierung.
-   */
-  protected void configureSSL() throws Exception
-  {
-    super.configureSSL();
-    
-    // Konfiguriere Key-Store (enthält privaten Schlüssel und Zertifikat des Clients)
-    System.setProperty(KEYSTORETYPE, getProperty("ssl.keystore.type"));
-    System.setProperty(KEYSTORE, getProperty("ssl.keystore.loc"));
-    System.setProperty(KEYSTOREPASSWORD, getProperty("ssl.keystore.pwd"));
-  }
-}
\ No newline at end of file
diff --git a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java b/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java
deleted file mode 100644
index 712c9dbe7..000000000
--- a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.webservice;
-
-import java.security.Security;
-
-import com.sun.net.ssl.internal.ssl.Provider;
-
-/**
- * Diese Klasse implementiert einen einfachen Client für das MOA SP/SS Webservice mittels Apache Axis. Die
- * Verbindung erfolgt gesichert über SSL, und zwar nur mit Serverauthentisierung.
- */
-public class HTTPSServerAuth extends HTTP
-{
-  // JSSE Konstanten
-  public static final String HANDLER = "java.protocol.handler.pkgs";
-  public static final String TRUSTSTORE = "javax.net.ssl.trustStore";
-  public static final String TRUSTSTOREPASSWORD = "javax.net.ssl.trustStorePassword";
-  public static final String TRUSTSTORETYPE = "javax.net.ssl.trustStoreType";
-
-  /**
-   * Methode main.
-   * 
-   * Enthält den Beispielcode der nötig ist um von Java aus auf MOA-SPSS zugreifen zu können. Der Zugriff
-   * passiert über das AXIS-Framework. Die Verbindung erfolgt gesichert über SSL, und zwar nur mit 
-   * Serverauthentisierung.
-   * 
-   * @param args <ul>
-   *             <li>
-   *             args[0] enthält entweder die Bezeichnung "sign" oder "verify" zur Kennzeichnung,
-   *             ob ein Signaturerstellungsrequest, oder ein Signaturprüfrequest gesendet werden soll.
-   *             </li>
-   *             <li>
-   *             args[1] enthält einen Verweis auf eine Property-Datei, die die nähere Konfiguration
-   *             für dieses Beispiel enthält. Der Verweis enthält entweder eine absolute oder eine
-   *             relative Pfadangabe, wobei eine relative Angabe als relativ zum Arbeitsverzeichnis der
-   *             Java VM interpretiert wird. Folgende Properties müssen in der Properties-Datei vorhanden
-   *             sein: 
-   *             <ul>
-   *             <li>
-   *             <code>signServiceQName</code>: Name des Webservices, fix "SignatureCreation"
-   *             </li>
-   *             <li>
-   *             <code>signServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
-   *             </li>
-   *             <li>
-   *             <code>signRequest</code>: Name des zu sendenden Signaturerstellungsrequests (entweder
-   *             absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-   *             Arbeitsverzeichnis der Java VM interpretiert)
-   *             </li>
-   *             <li>
-   *             <code>verifyServiceQName</code>: Name des Webservices, fix "SignatureVerification"
-   *             </li>
-   *             <li>
-   *             <code>verifyServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
-   *             </li>
-   *             <li>
-   *             <code>verifyRequest</code>: Name des zu sendenden Signaturprüfrequests (entweder
-   *             absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-   *             Arbeitsverzeichnis der Java VM interpretiert)
-   *             </li>
-   *             <li>
-   *             <code>ssl.truststore.type</code>: Typ des JSSE-Truststores (entweder "JKS" für einen
-   *             Java Key Store oder "PKCS12" für eine PKCS#12-Datei).
-   *             </li>
-   *             <li><code>ssl.truststore.type</code>: Relativer oder absoluter Pfad zum JSSE-Truststore.
-   *             Ein relativer Pfad wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-   *             </li>
-   *             <li><code>ssl.truststore.pwd</code>: Passwort für den JSSE-Truststore.
-   *             </li>
-   *             </ul>
-   *             </li>
-   *             </ul>
-   */
-  public static void main(String[] args)
-  {
-    try
-    {
-      // Prüfen, ob Beispiel korrekt verwendet wird
-      checkArgs(args, "HTTP");
-      
-      // Initialisieren des Clients
-      HTTPSServerAuth httpClient = new HTTPSServerAuth(args);
-      
-      // Ausführen der Serviceabfrage
-      httpClient.execute(args[0]);
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-  
-  /**
-   * Erzeugt den MOA Client. Es erfolgt die Auswertung der übergebenen Aufrufparameter.
-   * 
-   * @param args Die Aufrufparameter für das Beispiel. Siehe {@link HTTPSServerAuth#main(String[])}.
-   * 
-   * @throws Exception wenn der MOA Client mit den übergebenen Aufrufparametern nicht korrekt erzeugt
-   *         werden konnte. 
-   */
-  protected HTTPSServerAuth(String[] args) throws Exception
-  {
-    super(args);
-    configureSSL();
-  }
-  
-  /**
-   * Konfiguriert JSSE für eine SSL-Verbindung mit Serverauthentisierung.
-   * 
-   * @throws Exception wenn die Konfiguration von JSSE fehlschlägt.
-   */
-  protected void configureSSL() throws Exception
-  {
-    // Aktivieren Sie die nächste Zeile für detailliertes Logging des SSL-Verbindungsaufbaus
-    // System.setProperty("javax.net.debug", "all");
-    
-    // Setzen des korrekten Protokoll-Handlers für https
-    Security.addProvider(new Provider());
-    System.setProperty(HANDLER, "com.sun.net.ssl.internal.www.protocol");
-
-    // Konfiguriere Trust-Store (enthält SSL-Zertifikat des MOA Services, dem vertraut wird)
-    System.setProperty(TRUSTSTORETYPE, getProperty("ssl.truststore.type"));
-    System.setProperty(TRUSTSTORE, getProperty("ssl.truststore.loc"));
-    System.setProperty(TRUSTSTOREPASSWORD, getProperty("ssl.truststore.pwd"));
-  }
-}
\ No newline at end of file
diff --git a/spss.server/res/resources/wsdl/MOA-SPSS-1.3.xsd b/spss.server/res/resources/wsdl/MOA-SPSS-1.3.xsd
deleted file mode 100644
index 756b51279..000000000
--- a/spss.server/res/resources/wsdl/MOA-SPSS-1.3.xsd
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  MOA SP/SS 1.3 Schema

--->

-<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">

-  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>

-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>

-  <!--########## Create XML Signature ###-->

-  <!--### Create XML Signature Request ###-->

-  <xsd:element name="CreateXMLSignatureRequest">

-    <xsd:complexType>

-      <xsd:complexContent>

-        <xsd:extension base="CreateXMLSignatureRequestType"/>

-      </xsd:complexContent>

-    </xsd:complexType>

-  </xsd:element>

-  <xsd:complexType name="CreateXMLSignatureRequestType">

-    <xsd:sequence>

-      <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>

-      <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">

-        <xsd:annotation>

-          <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>

-        </xsd:annotation>

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="DataObjectInfo" maxOccurs="unbounded">

-              <xsd:complexType>

-                <xsd:complexContent>

-                  <xsd:extension base="DataObjectInfoType">

-                    <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>

-                  </xsd:extension>

-                </xsd:complexContent>

-              </xsd:complexType>

-            </xsd:element>

-            <xsd:element name="CreateSignatureInfo" minOccurs="0">

-              <xsd:complexType>

-                <xsd:sequence>

-                  <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>

-                  <xsd:choice>

-                    <xsd:annotation>

-                      <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>

-                    </xsd:annotation>

-                    <xsd:element ref="CreateSignatureEnvironmentProfile"/>

-                    <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>

-                  </xsd:choice>

-                </xsd:sequence>

-              </xsd:complexType>

-            </xsd:element>

-          </xsd:sequence>

-          <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>

-        </xsd:complexType>

-      </xsd:element>

-    </xsd:sequence>

-  </xsd:complexType>

-  <!--### Create XML Signature Response ###-->

-  <xsd:complexType name="CreateXMLSignatureResponseType">

-    <xsd:choice maxOccurs="unbounded">

-      <xsd:annotation>

-        <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>

-      </xsd:annotation>

-      <xsd:element name="SignatureEnvironment">

-        <xsd:annotation>

-          <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>

-        </xsd:annotation>

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:any namespace="##any" processContents="lax"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element ref="ErrorResponse"/>

-    </xsd:choice>

-  </xsd:complexType>

-  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>

-  <!--########## Verify CMS Signature ###-->

-  <!--### Verifiy CMS Signature Request ###-->

-  <xsd:element name="VerifyCMSSignatureRequest">

-    <xsd:complexType>

-      <xsd:complexContent>

-        <xsd:extension base="VerifyCMSSignatureRequestType">

-          <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>

-        </xsd:extension>

-      </xsd:complexContent>

-    </xsd:complexType>

-  </xsd:element>

-  <xsd:complexType name="VerifyCMSSignatureRequestType">

-    <xsd:sequence>

-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

-      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>

-      <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>

-      <xsd:element name="TrustProfileID" type="xsd:token">

-        <xsd:annotation>

-          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>

-        </xsd:annotation>

-      </xsd:element>

-    </xsd:sequence>

-  </xsd:complexType>

-  <!--### Verify CMS Signature Response ###-->

-  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>

-  <xsd:complexType name="VerifyCMSSignatureResponseType">

-    <xsd:sequence maxOccurs="unbounded">

-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">

-        <xsd:annotation>

-          <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>

-        </xsd:annotation>

-      </xsd:element>

-      <xsd:element name="SignatureCheck" type="CheckResultType"/>

-      <xsd:element name="CertificateCheck" type="CheckResultType"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <!--########## Verify XML Signature ###-->

-  <!--### Verify XML Signature Request ###-->

-  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>

-  <xsd:complexType name="VerifyXMLSignatureRequestType">

-    <xsd:sequence>

-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>

-      <xsd:element name="VerifySignatureInfo">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>

-            <xsd:element name="VerifySignatureLocation" type="xsd:token"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:choice minOccurs="0" maxOccurs="unbounded">

-        <xsd:element ref="SupplementProfile"/>

-        <xsd:element name="SupplementProfileID" type="xsd:string"/>

-      </xsd:choice>

-      <xsd:element name="SignatureManifestCheckParams" minOccurs="0">

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">

-              <xsd:annotation>

-                <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>

-              </xsd:annotation>

-            </xsd:element>

-          </xsd:sequence>

-          <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:element name="ReturnHashInputData" minOccurs="0"/>

-      <xsd:element name="TrustProfileID" type="xsd:token">

-        <xsd:annotation>

-          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>

-        </xsd:annotation>

-      </xsd:element>

-    </xsd:sequence>

-  </xsd:complexType>

-  <!--### Verify XML Signature Response ###-->

-  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>

-  <xsd:complexType name="VerifyXMLSignatureResponseType">

-    <xsd:sequence>

-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">

-        <xsd:annotation>

-          <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>

-        </xsd:annotation>

-      </xsd:element>

-      <xsd:element name="HashInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>

-      <xsd:element name="ReferenceInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>

-      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>

-      <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>

-      <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>

-      <xsd:element name="CertificateCheck" type="CheckResultType"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:simpleType name="ProfileIdentifierType">

-    <xsd:restriction base="xsd:token"/>

-  </xsd:simpleType>

-  <xsd:complexType name="InputDataType">

-    <xsd:complexContent>

-      <xsd:extension base="ContentExLocRefBaseType">

-        <xsd:attribute name="PartOf" use="optional" default="SignedInfo">

-          <xsd:simpleType>

-            <xsd:restriction base="xsd:token">

-              <xsd:enumeration value="SignedInfo"/>

-              <xsd:enumeration value="XMLDSIGManifest"/>

-            </xsd:restriction>

-          </xsd:simpleType>

-        </xsd:attribute>

-        <xsd:attribute name="ReferringSigReference" type="xsd:nonNegativeInteger" use="optional"/>

-      </xsd:extension>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="MetaInfoType">

-    <xsd:sequence>

-      <xsd:element name="MimeType" type="MimeTypeType"/>

-      <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>

-      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:complexType name="FinalDataMetaInfoType">

-    <xsd:complexContent>

-      <xsd:extension base="MetaInfoType">

-        <xsd:sequence>

-          <xsd:element name="Type" type="xsd:anyURI" minOccurs="0"/>

-        </xsd:sequence>

-      </xsd:extension>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="DataObjectInfoType">

-    <xsd:sequence>

-      <xsd:element name="DataObject">

-        <xsd:complexType>

-          <xsd:complexContent>

-            <xsd:extension base="ContentOptionalRefType"/>

-          </xsd:complexContent>

-        </xsd:complexType>

-      </xsd:element>

-      <xsd:choice>

-        <xsd:annotation>

-          <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>

-        </xsd:annotation>

-        <xsd:element ref="CreateTransformsInfoProfile"/>

-        <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>

-      </xsd:choice>

-    </xsd:sequence>

-    <xsd:attribute name="Structure" use="required">

-      <xsd:simpleType>

-        <xsd:restriction base="xsd:string">

-          <xsd:enumeration value="detached"/>

-          <xsd:enumeration value="enveloping"/>

-        </xsd:restriction>

-      </xsd:simpleType>

-    </xsd:attribute>

-  </xsd:complexType>

-  <xsd:complexType name="TransformsInfoType">

-    <xsd:sequence>

-      <xsd:element ref="dsig:Transforms" minOccurs="0"/>

-      <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:complexType name="XMLDataObjectAssociationType">

-    <xsd:sequence>

-      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>

-      <xsd:element name="Content" type="ContentRequiredRefType"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:complexType name="CMSDataObjectOptionalMetaType">

-    <xsd:sequence>

-      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>

-      <xsd:element name="Content" type="CMSContentBaseType"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:complexType name="CMSContentBaseType">

-    <xsd:complexContent>

-      <xsd:restriction base="ContentOptionalRefType">

-        <xsd:choice minOccurs="0">

-          <xsd:element name="Base64Content" type="xsd:base64Binary"/>

-        </xsd:choice>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="CheckResultType">

-    <xsd:sequence>

-      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

-      <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:complexType name="ReferencesCheckResultType">

-    <xsd:complexContent>

-      <xsd:restriction base="CheckResultType">

-        <xsd:sequence>

-          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

-          <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>

-        </xsd:sequence>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">

-    <xsd:complexContent mixed="true">

-      <xsd:restriction base="AnyChildrenType">

-        <xsd:sequence>

-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>

-        </xsd:sequence>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="ManifestRefsCheckResultType">

-    <xsd:complexContent>

-      <xsd:restriction base="CheckResultType">

-        <xsd:sequence>

-          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>

-          <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>

-        </xsd:sequence>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">

-    <xsd:complexContent mixed="true">

-      <xsd:restriction base="AnyChildrenType">

-        <xsd:sequence>

-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>

-          <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>

-        </xsd:sequence>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <!--########## Error Response ###-->

-  <xsd:element name="ErrorResponse" type="ErrorResponseType">

-    <xsd:annotation>

-      <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>

-    </xsd:annotation>

-  </xsd:element>

-  <xsd:complexType name="ErrorResponseType">

-    <xsd:sequence>

-      <xsd:element name="ErrorCode" type="xsd:integer"/>

-      <xsd:element name="Info" type="xsd:string"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <!--########## Auxiliary Types ###-->

-  <xsd:simpleType name="KeyIdentifierType">

-    <xsd:restriction base="xsd:string"/>

-  </xsd:simpleType>

-  <xsd:simpleType name="KeyStorageType">

-    <xsd:restriction base="xsd:string">

-      <xsd:enumeration value="Software"/>

-      <xsd:enumeration value="Hardware"/>

-    </xsd:restriction>

-  </xsd:simpleType>

-  <xsd:simpleType name="MimeTypeType">

-    <xsd:restriction base="xsd:token"/>

-  </xsd:simpleType>

-  <xsd:complexType name="AnyChildrenType" mixed="true">

-    <xsd:sequence>

-      <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:complexType name="XMLContentType" mixed="true">

-    <xsd:complexContent mixed="true">

-      <xsd:extension base="AnyChildrenType">

-        <xsd:attribute ref="xml:space" use="optional"/>

-      </xsd:extension>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="ContentBaseType">

-    <xsd:choice minOccurs="0">

-      <xsd:element name="Base64Content" type="xsd:base64Binary"/>

-      <xsd:element name="XMLContent" type="XMLContentType"/>

-      <xsd:element name="LocRefContent" type="xsd:anyURI"/>

-    </xsd:choice>

-  </xsd:complexType>

-  <xsd:complexType name="ContentExLocRefBaseType">

-    <xsd:complexContent>

-      <xsd:restriction base="ContentBaseType">

-        <xsd:choice minOccurs="0">

-          <xsd:element name="Base64Content" type="xsd:base64Binary"/>

-          <xsd:element name="XMLContent" type="XMLContentType"/>

-        </xsd:choice>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="ContentOptionalRefType">

-    <xsd:complexContent>

-      <xsd:extension base="ContentBaseType">

-        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>

-      </xsd:extension>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="ContentRequiredRefType">

-    <xsd:complexContent>

-      <xsd:restriction base="ContentOptionalRefType">

-        <xsd:choice minOccurs="0">

-          <xsd:element name="Base64Content" type="xsd:base64Binary"/>

-          <xsd:element name="XMLContent" type="XMLContentType"/>

-          <xsd:element name="LocRefContent" type="xsd:anyURI"/>

-        </xsd:choice>

-        <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>

-      </xsd:restriction>

-    </xsd:complexContent>

-  </xsd:complexType>

-  <xsd:complexType name="VerifyTransformsDataType">

-    <xsd:choice maxOccurs="unbounded">

-      <xsd:annotation>

-        <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>

-      </xsd:annotation>

-      <xsd:element ref="VerifyTransformsInfoProfile"/>

-      <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">

-        <xsd:annotation>

-          <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>

-        </xsd:annotation>

-      </xsd:element>

-    </xsd:choice>

-  </xsd:complexType>

-  <xsd:element name="QualifiedCertificate"/>

-  <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>

-  <xsd:complexType name="PublicAuthorityType">

-    <xsd:sequence>

-      <xsd:element name="Code" type="xsd:string" minOccurs="0"/>

-    </xsd:sequence>

-  </xsd:complexType>

-  <xsd:simpleType name="SignatoriesType">

-    <xsd:union memberTypes="AllSignatoriesType">

-      <xsd:simpleType>

-        <xsd:list itemType="xsd:positiveInteger"/>

-      </xsd:simpleType>

-    </xsd:union>

-  </xsd:simpleType>

-  <xsd:simpleType name="AllSignatoriesType">

-    <xsd:restriction base="xsd:string">

-      <xsd:enumeration value="all"/>

-    </xsd:restriction>

-  </xsd:simpleType>

-  <xsd:complexType name="CreateSignatureLocationType">

-    <xsd:simpleContent>

-      <xsd:extension base="xsd:token">

-        <xsd:attribute name="Index" type="xsd:integer" use="required"/>

-      </xsd:extension>

-    </xsd:simpleContent>

-  </xsd:complexType>

-  <xsd:complexType name="TransformParameterType">

-    <xsd:choice minOccurs="0">

-      <xsd:annotation>

-        <xsd:documentation>Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann.</xsd:documentation>

-      </xsd:annotation>

-      <xsd:element name="Base64Content" type="xsd:base64Binary">

-        <xsd:annotation>

-          <xsd:documentation>Der Transformationsparameter explizit angegeben.</xsd:documentation>

-        </xsd:annotation>

-      </xsd:element>

-      <xsd:element name="Hash">

-        <xsd:annotation>

-          <xsd:documentation>Der Hashwert des Transformationsparameters.</xsd:documentation>

-        </xsd:annotation>

-        <xsd:complexType>

-          <xsd:sequence>

-            <xsd:element ref="dsig:DigestMethod"/>

-            <xsd:element ref="dsig:DigestValue"/>

-          </xsd:sequence>

-        </xsd:complexType>

-      </xsd:element>

-    </xsd:choice>

-    <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>

-  </xsd:complexType>

-  <xsd:element name="CreateSignatureEnvironmentProfile">

-    <xsd:complexType>

-      <xsd:sequence>

-        <xsd:element name="CreateSignatureLocation" type="CreateSignatureLocationType"/>

-        <xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>

-      </xsd:sequence>

-    </xsd:complexType>

-  </xsd:element>

-  <xsd:element name="VerifyTransformsInfoProfile">

-    <xsd:annotation>

-      <xsd:documentation>Explizite Angabe des Transformationswegs</xsd:documentation>

-    </xsd:annotation>

-    <xsd:complexType>

-      <xsd:sequence>

-        <xsd:element ref="dsig:Transforms" minOccurs="0"/>

-        <xsd:element name="TransformParameter" type="TransformParameterType" minOccurs="0" maxOccurs="unbounded">

-          <xsd:annotation>

-            <xsd:documentation>Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird.</xsd:documentation>

-          </xsd:annotation>

-        </xsd:element>

-      </xsd:sequence>

-    </xsd:complexType>

-  </xsd:element>

-  <xsd:element name="Supplement" type="XMLDataObjectAssociationType"/>

-  <xsd:element name="SupplementProfile" type="XMLDataObjectAssociationType"/>

-  <xsd:element name="CreateTransformsInfoProfile">

-    <xsd:complexType>

-      <xsd:sequence>

-        <xsd:element name="CreateTransformsInfo" type="TransformsInfoType"/>

-        <xsd:element ref="Supplement" minOccurs="0" maxOccurs="unbounded"/>

-      </xsd:sequence>

-    </xsd:complexType>

-  </xsd:element>

-</xsd:schema>

diff --git a/spss.handbook/conf/moa-spss/certstore/01540E2704537AA810D671E1C4106FD8821EB52A/C2556DADDF68A9EEF7F5C14A24CA33BCA930B201 b/spss/handbook/conf/moa-spss/certstore/01540E2704537AA810D671E1C4106FD8821EB52A/C2556DADDF68A9EEF7F5C14A24CA33BCA930B201
index 592c96230..592c96230 100644
--- a/spss.handbook/conf/moa-spss/certstore/01540E2704537AA810D671E1C4106FD8821EB52A/C2556DADDF68A9EEF7F5C14A24CA33BCA930B201
+++ b/spss/handbook/conf/moa-spss/certstore/01540E2704537AA810D671E1C4106FD8821EB52A/C2556DADDF68A9EEF7F5C14A24CA33BCA930B201
diff --git a/spss.handbook/conf/moa-spss/certstore/032F2123890A879585CE96674CA4C37B55986729/E1201A308CC10323C27D9084B048996E44B8F710 b/spss/handbook/conf/moa-spss/certstore/032F2123890A879585CE96674CA4C37B55986729/E1201A308CC10323C27D9084B048996E44B8F710
index a7948e488..a7948e488 100644
--- a/spss.handbook/conf/moa-spss/certstore/032F2123890A879585CE96674CA4C37B55986729/E1201A308CC10323C27D9084B048996E44B8F710
+++ b/spss/handbook/conf/moa-spss/certstore/032F2123890A879585CE96674CA4C37B55986729/E1201A308CC10323C27D9084B048996E44B8F710
diff --git a/spss.handbook/conf/moa-spss/certstore/04462EF01783744F9F4CDE3705FD86D488697C9F/D44EED7580C7792242D73E267A89C7DB25E4BD08 b/spss/handbook/conf/moa-spss/certstore/04462EF01783744F9F4CDE3705FD86D488697C9F/D44EED7580C7792242D73E267A89C7DB25E4BD08
index 73434134e..73434134e 100644
--- a/spss.handbook/conf/moa-spss/certstore/04462EF01783744F9F4CDE3705FD86D488697C9F/D44EED7580C7792242D73E267A89C7DB25E4BD08
+++ b/spss/handbook/conf/moa-spss/certstore/04462EF01783744F9F4CDE3705FD86D488697C9F/D44EED7580C7792242D73E267A89C7DB25E4BD08
diff --git a/spss.handbook/conf/moa-spss/certstore/083E1A0528C48475951A6610360D813E2713DCC7/7E691392F741B7E4B4AA9A76D75851BDE18BE5A7 b/spss/handbook/conf/moa-spss/certstore/083E1A0528C48475951A6610360D813E2713DCC7/7E691392F741B7E4B4AA9A76D75851BDE18BE5A7
index 8c434777e..8c434777e 100644
--- a/spss.handbook/conf/moa-spss/certstore/083E1A0528C48475951A6610360D813E2713DCC7/7E691392F741B7E4B4AA9A76D75851BDE18BE5A7
+++ b/spss/handbook/conf/moa-spss/certstore/083E1A0528C48475951A6610360D813E2713DCC7/7E691392F741B7E4B4AA9A76D75851BDE18BE5A7
diff --git a/spss.handbook/conf/moa-spss/certstore/0889EBEC55D9E34E782E6D3C250840EB932EEA2F/9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726 b/spss/handbook/conf/moa-spss/certstore/0889EBEC55D9E34E782E6D3C250840EB932EEA2F/9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726
index 3af27c013..3af27c013 100644
--- a/spss.handbook/conf/moa-spss/certstore/0889EBEC55D9E34E782E6D3C250840EB932EEA2F/9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726
+++ b/spss/handbook/conf/moa-spss/certstore/0889EBEC55D9E34E782E6D3C250840EB932EEA2F/9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726
diff --git a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/0F843FB1E0C626540BE638B79A2987E2611CE630 b/spss/handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/0F843FB1E0C626540BE638B79A2987E2611CE630
index 29d93550e..29d93550e 100644
--- a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/0F843FB1E0C626540BE638B79A2987E2611CE630
+++ b/spss/handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/0F843FB1E0C626540BE638B79A2987E2611CE630
diff --git a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/69F21C82DC9A7A940ACEC414593E59C9E61E522F b/spss/handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/69F21C82DC9A7A940ACEC414593E59C9E61E522F
index 2a88295a7..2a88295a7 100644
--- a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/69F21C82DC9A7A940ACEC414593E59C9E61E522F
+++ b/spss/handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/69F21C82DC9A7A940ACEC414593E59C9E61E522F
diff --git a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/FC72939DC06EDDF8C51549ECF00AC92BF2B39F35 b/spss/handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/FC72939DC06EDDF8C51549ECF00AC92BF2B39F35
index 84a1690d2..84a1690d2 100644
--- a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/FC72939DC06EDDF8C51549ECF00AC92BF2B39F35
+++ b/spss/handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/FC72939DC06EDDF8C51549ECF00AC92BF2B39F35
diff --git a/spss.handbook/conf/moa-spss/certstore/0FE419AB943E7E5C6A7190CC6BBE8E3F914C658A/FB356CEF4406D1F135E3FC59026B338D3F518F9A b/spss/handbook/conf/moa-spss/certstore/0FE419AB943E7E5C6A7190CC6BBE8E3F914C658A/FB356CEF4406D1F135E3FC59026B338D3F518F9A
index 04c6ea363..04c6ea363 100644
--- a/spss.handbook/conf/moa-spss/certstore/0FE419AB943E7E5C6A7190CC6BBE8E3F914C658A/FB356CEF4406D1F135E3FC59026B338D3F518F9A
+++ b/spss/handbook/conf/moa-spss/certstore/0FE419AB943E7E5C6A7190CC6BBE8E3F914C658A/FB356CEF4406D1F135E3FC59026B338D3F518F9A
diff --git a/spss.handbook/conf/moa-spss/certstore/10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D/E7340D1FB627D8917A9C0D23F21515C441BF1214 b/spss/handbook/conf/moa-spss/certstore/10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D/E7340D1FB627D8917A9C0D23F21515C441BF1214
index fd23a38d6..fd23a38d6 100644
--- a/spss.handbook/conf/moa-spss/certstore/10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D/E7340D1FB627D8917A9C0D23F21515C441BF1214
+++ b/spss/handbook/conf/moa-spss/certstore/10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D/E7340D1FB627D8917A9C0D23F21515C441BF1214
diff --git a/spss.handbook/conf/moa-spss/certstore/125E4AC6B38C1E0BF34BF7D927CBB947E35141E8/2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7D b/spss/handbook/conf/moa-spss/certstore/125E4AC6B38C1E0BF34BF7D927CBB947E35141E8/2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7D
index 1a3106742..1a3106742 100644
--- a/spss.handbook/conf/moa-spss/certstore/125E4AC6B38C1E0BF34BF7D927CBB947E35141E8/2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7D
+++ b/spss/handbook/conf/moa-spss/certstore/125E4AC6B38C1E0BF34BF7D927CBB947E35141E8/2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7D
diff --git a/spss.handbook/conf/moa-spss/certstore/1607988A938D3D339F40AFB567384BC5B7540935/9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2 b/spss/handbook/conf/moa-spss/certstore/1607988A938D3D339F40AFB567384BC5B7540935/9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2
index 28cb48bb0..28cb48bb0 100644
--- a/spss.handbook/conf/moa-spss/certstore/1607988A938D3D339F40AFB567384BC5B7540935/9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2
+++ b/spss/handbook/conf/moa-spss/certstore/1607988A938D3D339F40AFB567384BC5B7540935/9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2
diff --git a/spss.handbook/conf/moa-spss/certstore/1A283D1183DB82A548427B4F19E99E7A8EA728D7/49969819654C230ECDF779ABB9629A211FCC43D6 b/spss/handbook/conf/moa-spss/certstore/1A283D1183DB82A548427B4F19E99E7A8EA728D7/49969819654C230ECDF779ABB9629A211FCC43D6
index bdfcb7ab1..bdfcb7ab1 100644
--- a/spss.handbook/conf/moa-spss/certstore/1A283D1183DB82A548427B4F19E99E7A8EA728D7/49969819654C230ECDF779ABB9629A211FCC43D6
+++ b/spss/handbook/conf/moa-spss/certstore/1A283D1183DB82A548427B4F19E99E7A8EA728D7/49969819654C230ECDF779ABB9629A211FCC43D6
diff --git a/spss.handbook/conf/moa-spss/certstore/1BF3C1D2767F5C333AD5531531FEE3A712935B73/D0AF386E182F00983637F97C0A5F4708F9F641A7 b/spss/handbook/conf/moa-spss/certstore/1BF3C1D2767F5C333AD5531531FEE3A712935B73/D0AF386E182F00983637F97C0A5F4708F9F641A7
index eaac3518b..eaac3518b 100644
--- a/spss.handbook/conf/moa-spss/certstore/1BF3C1D2767F5C333AD5531531FEE3A712935B73/D0AF386E182F00983637F97C0A5F4708F9F641A7
+++ b/spss/handbook/conf/moa-spss/certstore/1BF3C1D2767F5C333AD5531531FEE3A712935B73/D0AF386E182F00983637F97C0A5F4708F9F641A7
diff --git a/spss.handbook/conf/moa-spss/certstore/20DD04B052D2D364E5FF851A3FD314F0FD91253E/6814C7316CEA7191C9CB3BE58199B4A957210D9C b/spss/handbook/conf/moa-spss/certstore/20DD04B052D2D364E5FF851A3FD314F0FD91253E/6814C7316CEA7191C9CB3BE58199B4A957210D9C
index 4dd2c49bf..4dd2c49bf 100644
--- a/spss.handbook/conf/moa-spss/certstore/20DD04B052D2D364E5FF851A3FD314F0FD91253E/6814C7316CEA7191C9CB3BE58199B4A957210D9C
+++ b/spss/handbook/conf/moa-spss/certstore/20DD04B052D2D364E5FF851A3FD314F0FD91253E/6814C7316CEA7191C9CB3BE58199B4A957210D9C
diff --git a/spss.handbook/conf/moa-spss/certstore/22973CFC20EA68162A0B2E837D45FB8266ACDBCF/C529469053D9F95810A8F7F2DB9A6596A7655732 b/spss/handbook/conf/moa-spss/certstore/22973CFC20EA68162A0B2E837D45FB8266ACDBCF/C529469053D9F95810A8F7F2DB9A6596A7655732
index 13abede5c..13abede5c 100644
--- a/spss.handbook/conf/moa-spss/certstore/22973CFC20EA68162A0B2E837D45FB8266ACDBCF/C529469053D9F95810A8F7F2DB9A6596A7655732
+++ b/spss/handbook/conf/moa-spss/certstore/22973CFC20EA68162A0B2E837D45FB8266ACDBCF/C529469053D9F95810A8F7F2DB9A6596A7655732
diff --git a/spss.handbook/conf/moa-spss/certstore/238ACC1D03DA5A2E7E580D760FB3EE218FDC5A97/D3C063F219ED073E34AD5D750B327629FFD59AF2 b/spss/handbook/conf/moa-spss/certstore/238ACC1D03DA5A2E7E580D760FB3EE218FDC5A97/D3C063F219ED073E34AD5D750B327629FFD59AF2
index 33e776369..33e776369 100644
--- a/spss.handbook/conf/moa-spss/certstore/238ACC1D03DA5A2E7E580D760FB3EE218FDC5A97/D3C063F219ED073E34AD5D750B327629FFD59AF2
+++ b/spss/handbook/conf/moa-spss/certstore/238ACC1D03DA5A2E7E580D760FB3EE218FDC5A97/D3C063F219ED073E34AD5D750B327629FFD59AF2
diff --git a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/1C43C0BA36CC8DE659180B2FAC9A6F54430D5941 b/spss/handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/1C43C0BA36CC8DE659180B2FAC9A6F54430D5941
index d2e7db667..d2e7db667 100644
--- a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/1C43C0BA36CC8DE659180B2FAC9A6F54430D5941
+++ b/spss/handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/1C43C0BA36CC8DE659180B2FAC9A6F54430D5941
diff --git a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/AC36A78C66FEC87CC0FD2C32B49214C65676E0C5 b/spss/handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/AC36A78C66FEC87CC0FD2C32B49214C65676E0C5
index f2f1c6562..f2f1c6562 100644
--- a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/AC36A78C66FEC87CC0FD2C32B49214C65676E0C5
+++ b/spss/handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/AC36A78C66FEC87CC0FD2C32B49214C65676E0C5
diff --git a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/C92238A7178A6C61F8BACA22D6CF7E50772BA9F0 b/spss/handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/C92238A7178A6C61F8BACA22D6CF7E50772BA9F0
index 476a3efb2..476a3efb2 100644
--- a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/C92238A7178A6C61F8BACA22D6CF7E50772BA9F0
+++ b/spss/handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/C92238A7178A6C61F8BACA22D6CF7E50772BA9F0
diff --git a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/DFAE695342AC81A521025904406884399822B233 b/spss/handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/DFAE695342AC81A521025904406884399822B233
index 5c88b668a..5c88b668a 100644
--- a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/DFAE695342AC81A521025904406884399822B233
+++ b/spss/handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/DFAE695342AC81A521025904406884399822B233
diff --git a/spss.handbook/conf/moa-spss/certstore/2962CDAADFA0BF8EE53B80870C53E551A43EA72A/12B06E039F1A36D8238AFC508009E1ADF88BF66F b/spss/handbook/conf/moa-spss/certstore/2962CDAADFA0BF8EE53B80870C53E551A43EA72A/12B06E039F1A36D8238AFC508009E1ADF88BF66F
index 4d1852203..4d1852203 100644
--- a/spss.handbook/conf/moa-spss/certstore/2962CDAADFA0BF8EE53B80870C53E551A43EA72A/12B06E039F1A36D8238AFC508009E1ADF88BF66F
+++ b/spss/handbook/conf/moa-spss/certstore/2962CDAADFA0BF8EE53B80870C53E551A43EA72A/12B06E039F1A36D8238AFC508009E1ADF88BF66F
diff --git a/spss.handbook/conf/moa-spss/certstore/2C976220B378E08DF5E68CBC54C05CE41224FD29/0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38 b/spss/handbook/conf/moa-spss/certstore/2C976220B378E08DF5E68CBC54C05CE41224FD29/0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38
index 69a8e4872..69a8e4872 100644
--- a/spss.handbook/conf/moa-spss/certstore/2C976220B378E08DF5E68CBC54C05CE41224FD29/0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38
+++ b/spss/handbook/conf/moa-spss/certstore/2C976220B378E08DF5E68CBC54C05CE41224FD29/0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38
diff --git a/spss.handbook/conf/moa-spss/certstore/2F5DA022AAFF668F34C35A80049D690F3CFE3040/D62327E6B19B7968A8BE6588DEAB0BC0DB684D8D b/spss/handbook/conf/moa-spss/certstore/2F5DA022AAFF668F34C35A80049D690F3CFE3040/D62327E6B19B7968A8BE6588DEAB0BC0DB684D8D
index 807fa786c..807fa786c 100644
--- a/spss.handbook/conf/moa-spss/certstore/2F5DA022AAFF668F34C35A80049D690F3CFE3040/D62327E6B19B7968A8BE6588DEAB0BC0DB684D8D
+++ b/spss/handbook/conf/moa-spss/certstore/2F5DA022AAFF668F34C35A80049D690F3CFE3040/D62327E6B19B7968A8BE6588DEAB0BC0DB684D8D
diff --git a/spss.handbook/conf/moa-spss/certstore/31B5BA02D476873C5220CDCFA0C095C4A31DEFDF/88D6151358A5E3C81D7AE1A536121DC03011BC03 b/spss/handbook/conf/moa-spss/certstore/31B5BA02D476873C5220CDCFA0C095C4A31DEFDF/88D6151358A5E3C81D7AE1A536121DC03011BC03
index 376d0753f..376d0753f 100644
--- a/spss.handbook/conf/moa-spss/certstore/31B5BA02D476873C5220CDCFA0C095C4A31DEFDF/88D6151358A5E3C81D7AE1A536121DC03011BC03
+++ b/spss/handbook/conf/moa-spss/certstore/31B5BA02D476873C5220CDCFA0C095C4A31DEFDF/88D6151358A5E3C81D7AE1A536121DC03011BC03
diff --git a/spss.handbook/conf/moa-spss/certstore/3314CE3E42175EACC28D57C35F192430BBADAC1A/B1D0BC027906A3B7E7518C93ACB26D978233ED27 b/spss/handbook/conf/moa-spss/certstore/3314CE3E42175EACC28D57C35F192430BBADAC1A/B1D0BC027906A3B7E7518C93ACB26D978233ED27
index 5171276f4..5171276f4 100644
--- a/spss.handbook/conf/moa-spss/certstore/3314CE3E42175EACC28D57C35F192430BBADAC1A/B1D0BC027906A3B7E7518C93ACB26D978233ED27
+++ b/spss/handbook/conf/moa-spss/certstore/3314CE3E42175EACC28D57C35F192430BBADAC1A/B1D0BC027906A3B7E7518C93ACB26D978233ED27
diff --git a/spss.handbook/conf/moa-spss/certstore/337F895A0435AA7E2629C5282B5A0DBBE19EE1C7/75F792DE2CF544007F470F1B924961C2BD2EF517 b/spss/handbook/conf/moa-spss/certstore/337F895A0435AA7E2629C5282B5A0DBBE19EE1C7/75F792DE2CF544007F470F1B924961C2BD2EF517
index f8a8957ac..f8a8957ac 100644
--- a/spss.handbook/conf/moa-spss/certstore/337F895A0435AA7E2629C5282B5A0DBBE19EE1C7/75F792DE2CF544007F470F1B924961C2BD2EF517
+++ b/spss/handbook/conf/moa-spss/certstore/337F895A0435AA7E2629C5282B5A0DBBE19EE1C7/75F792DE2CF544007F470F1B924961C2BD2EF517
diff --git a/spss.handbook/conf/moa-spss/certstore/3A095C38EB5D5824FE61BE43F9CDF6515DC94805/65698A39E03FF00FD552D4AD99FB290C2B9D4BEA b/spss/handbook/conf/moa-spss/certstore/3A095C38EB5D5824FE61BE43F9CDF6515DC94805/65698A39E03FF00FD552D4AD99FB290C2B9D4BEA
index 836ba3767..836ba3767 100644
--- a/spss.handbook/conf/moa-spss/certstore/3A095C38EB5D5824FE61BE43F9CDF6515DC94805/65698A39E03FF00FD552D4AD99FB290C2B9D4BEA
+++ b/spss/handbook/conf/moa-spss/certstore/3A095C38EB5D5824FE61BE43F9CDF6515DC94805/65698A39E03FF00FD552D4AD99FB290C2B9D4BEA
diff --git a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F b/spss/handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F
index 69de75609..69de75609 100644
--- a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F
+++ b/spss/handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F
diff --git a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AE b/spss/handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AE
index efa28178e..efa28178e 100644
--- a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AE
+++ b/spss/handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AE
diff --git a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733 b/spss/handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733
index 289fc2198..289fc2198 100644
--- a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733
+++ b/spss/handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733
diff --git a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6 b/spss/handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6
index b7d4b08a6..b7d4b08a6 100644
--- a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6
+++ b/spss/handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6
diff --git a/spss.handbook/conf/moa-spss/certstore/3B76D7A5CE7EC6022D7990CFEA534C908717DF54/C0C699EFE6E837CB5E4CFC3A61077617A22C1A9E b/spss/handbook/conf/moa-spss/certstore/3B76D7A5CE7EC6022D7990CFEA534C908717DF54/C0C699EFE6E837CB5E4CFC3A61077617A22C1A9E
index b2beddaa5..b2beddaa5 100644
--- a/spss.handbook/conf/moa-spss/certstore/3B76D7A5CE7EC6022D7990CFEA534C908717DF54/C0C699EFE6E837CB5E4CFC3A61077617A22C1A9E
+++ b/spss/handbook/conf/moa-spss/certstore/3B76D7A5CE7EC6022D7990CFEA534C908717DF54/C0C699EFE6E837CB5E4CFC3A61077617A22C1A9E
diff --git a/spss.handbook/conf/moa-spss/certstore/3C627C9D89A5BFB5E4E385982DF33B7E7F6E8D2D/C5AC86EC5B771BEBDF8B6E040F109A1186E229B9 b/spss/handbook/conf/moa-spss/certstore/3C627C9D89A5BFB5E4E385982DF33B7E7F6E8D2D/C5AC86EC5B771BEBDF8B6E040F109A1186E229B9
index 54893c9d6..54893c9d6 100644
--- a/spss.handbook/conf/moa-spss/certstore/3C627C9D89A5BFB5E4E385982DF33B7E7F6E8D2D/C5AC86EC5B771BEBDF8B6E040F109A1186E229B9
+++ b/spss/handbook/conf/moa-spss/certstore/3C627C9D89A5BFB5E4E385982DF33B7E7F6E8D2D/C5AC86EC5B771BEBDF8B6E040F109A1186E229B9
diff --git a/spss.handbook/conf/moa-spss/certstore/3C7CE93947421CB66603DC7DBAB0F04C4788382F/23E594945195F2414803B4D564D2A3A3F5D88B8C b/spss/handbook/conf/moa-spss/certstore/3C7CE93947421CB66603DC7DBAB0F04C4788382F/23E594945195F2414803B4D564D2A3A3F5D88B8C
index 8588ce58a..8588ce58a 100644
--- a/spss.handbook/conf/moa-spss/certstore/3C7CE93947421CB66603DC7DBAB0F04C4788382F/23E594945195F2414803B4D564D2A3A3F5D88B8C
+++ b/spss/handbook/conf/moa-spss/certstore/3C7CE93947421CB66603DC7DBAB0F04C4788382F/23E594945195F2414803B4D564D2A3A3F5D88B8C
diff --git a/spss.handbook/conf/moa-spss/certstore/4224231A54F64581FBA2AB6ED82ADE467F144BDC/65EF37033859C2F709A64086D3A5BD1B8F1A85A4 b/spss/handbook/conf/moa-spss/certstore/4224231A54F64581FBA2AB6ED82ADE467F144BDC/65EF37033859C2F709A64086D3A5BD1B8F1A85A4
index 6e17b9db5..6e17b9db5 100644
--- a/spss.handbook/conf/moa-spss/certstore/4224231A54F64581FBA2AB6ED82ADE467F144BDC/65EF37033859C2F709A64086D3A5BD1B8F1A85A4
+++ b/spss/handbook/conf/moa-spss/certstore/4224231A54F64581FBA2AB6ED82ADE467F144BDC/65EF37033859C2F709A64086D3A5BD1B8F1A85A4
diff --git a/spss.handbook/conf/moa-spss/certstore/45E2F3F807C6EAB9EDC1B3250F7558CA12A063DE/3A77E9B577661D99F9BBA5A352B29C7FF58A3D26 b/spss/handbook/conf/moa-spss/certstore/45E2F3F807C6EAB9EDC1B3250F7558CA12A063DE/3A77E9B577661D99F9BBA5A352B29C7FF58A3D26
index 55707d69f..55707d69f 100644
--- a/spss.handbook/conf/moa-spss/certstore/45E2F3F807C6EAB9EDC1B3250F7558CA12A063DE/3A77E9B577661D99F9BBA5A352B29C7FF58A3D26
+++ b/spss/handbook/conf/moa-spss/certstore/45E2F3F807C6EAB9EDC1B3250F7558CA12A063DE/3A77E9B577661D99F9BBA5A352B29C7FF58A3D26
diff --git a/spss.handbook/conf/moa-spss/certstore/47ED4C584F9DCD54A6C2925252C5603ADAC93F49/84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923E b/spss/handbook/conf/moa-spss/certstore/47ED4C584F9DCD54A6C2925252C5603ADAC93F49/84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923E
index 3be7b6a06..3be7b6a06 100644
--- a/spss.handbook/conf/moa-spss/certstore/47ED4C584F9DCD54A6C2925252C5603ADAC93F49/84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923E
+++ b/spss/handbook/conf/moa-spss/certstore/47ED4C584F9DCD54A6C2925252C5603ADAC93F49/84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923E
diff --git a/spss.handbook/conf/moa-spss/certstore/487F4DEE9E63DADEB4CAAB07E0E166ACC9F584B6/9891BBEA9FDA665EEEC31C403A00A5CA5628D0FA b/spss/handbook/conf/moa-spss/certstore/487F4DEE9E63DADEB4CAAB07E0E166ACC9F584B6/9891BBEA9FDA665EEEC31C403A00A5CA5628D0FA
index 4e18de8d7..4e18de8d7 100644
--- a/spss.handbook/conf/moa-spss/certstore/487F4DEE9E63DADEB4CAAB07E0E166ACC9F584B6/9891BBEA9FDA665EEEC31C403A00A5CA5628D0FA
+++ b/spss/handbook/conf/moa-spss/certstore/487F4DEE9E63DADEB4CAAB07E0E166ACC9F584B6/9891BBEA9FDA665EEEC31C403A00A5CA5628D0FA
diff --git a/spss.handbook/conf/moa-spss/certstore/52B42552A440A54C21A39D46D7F176AF28BEB5AA/51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4 b/spss/handbook/conf/moa-spss/certstore/52B42552A440A54C21A39D46D7F176AF28BEB5AA/51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4
index 9b2ee0fc6..9b2ee0fc6 100644
--- a/spss.handbook/conf/moa-spss/certstore/52B42552A440A54C21A39D46D7F176AF28BEB5AA/51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4
+++ b/spss/handbook/conf/moa-spss/certstore/52B42552A440A54C21A39D46D7F176AF28BEB5AA/51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4
diff --git a/spss.handbook/conf/moa-spss/certstore/550E9627E9094A2D1BB6385821334D02122BCF26/B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0F b/spss/handbook/conf/moa-spss/certstore/550E9627E9094A2D1BB6385821334D02122BCF26/B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0F
index 5dd9558d0..5dd9558d0 100644
--- a/spss.handbook/conf/moa-spss/certstore/550E9627E9094A2D1BB6385821334D02122BCF26/B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0F
+++ b/spss/handbook/conf/moa-spss/certstore/550E9627E9094A2D1BB6385821334D02122BCF26/B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0F
diff --git a/spss.handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/620127A8E5886A4805403977C3EF7D5EAF881526 b/spss/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/620127A8E5886A4805403977C3EF7D5EAF881526
index da38ce028..da38ce028 100644
--- a/spss.handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/620127A8E5886A4805403977C3EF7D5EAF881526
+++ b/spss/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/620127A8E5886A4805403977C3EF7D5EAF881526
diff --git a/spss.handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830 b/spss/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830
index 7e9fd5b0b..7e9fd5b0b 100644
--- a/spss.handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830
+++ b/spss/handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830
diff --git a/spss.handbook/conf/moa-spss/certstore/58090A698038FEDAD56B4B976F23C29950D1D5A5/6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25B b/spss/handbook/conf/moa-spss/certstore/58090A698038FEDAD56B4B976F23C29950D1D5A5/6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25B
index b15880c29..b15880c29 100644
--- a/spss.handbook/conf/moa-spss/certstore/58090A698038FEDAD56B4B976F23C29950D1D5A5/6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25B
+++ b/spss/handbook/conf/moa-spss/certstore/58090A698038FEDAD56B4B976F23C29950D1D5A5/6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25B
diff --git a/spss.handbook/conf/moa-spss/certstore/59484253C7D4C5BEAB7D2BABFAC13DDD1CA53FCC/341EA32E448659125A67DD04177FD17468FCFCB1 b/spss/handbook/conf/moa-spss/certstore/59484253C7D4C5BEAB7D2BABFAC13DDD1CA53FCC/341EA32E448659125A67DD04177FD17468FCFCB1
index 6da18c620..6da18c620 100644
--- a/spss.handbook/conf/moa-spss/certstore/59484253C7D4C5BEAB7D2BABFAC13DDD1CA53FCC/341EA32E448659125A67DD04177FD17468FCFCB1
+++ b/spss/handbook/conf/moa-spss/certstore/59484253C7D4C5BEAB7D2BABFAC13DDD1CA53FCC/341EA32E448659125A67DD04177FD17468FCFCB1
diff --git a/spss.handbook/conf/moa-spss/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD b/spss/handbook/conf/moa-spss/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD
index c19647ad8..c19647ad8 100644
--- a/spss.handbook/conf/moa-spss/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD
+++ b/spss/handbook/conf/moa-spss/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD
diff --git a/spss.handbook/conf/moa-spss/certstore/6144BFC0CBE85C63DEFB6F208D80385B89F68046/D031945D982820B92FADBC7F71F6D1D9DFFDA2C9 b/spss/handbook/conf/moa-spss/certstore/6144BFC0CBE85C63DEFB6F208D80385B89F68046/D031945D982820B92FADBC7F71F6D1D9DFFDA2C9
index 39f88d881..39f88d881 100644
--- a/spss.handbook/conf/moa-spss/certstore/6144BFC0CBE85C63DEFB6F208D80385B89F68046/D031945D982820B92FADBC7F71F6D1D9DFFDA2C9
+++ b/spss/handbook/conf/moa-spss/certstore/6144BFC0CBE85C63DEFB6F208D80385B89F68046/D031945D982820B92FADBC7F71F6D1D9DFFDA2C9
diff --git a/spss.handbook/conf/moa-spss/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2B b/spss/handbook/conf/moa-spss/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2B
index d361d919f..d361d919f 100644
--- a/spss.handbook/conf/moa-spss/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2B
+++ b/spss/handbook/conf/moa-spss/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2B
diff --git a/spss.handbook/conf/moa-spss/certstore/6F86F897C45679B45F03C67D44B6447EFF43B758/53CB69CF933C2D28FB9DF91F2852A99EC3352EA0 b/spss/handbook/conf/moa-spss/certstore/6F86F897C45679B45F03C67D44B6447EFF43B758/53CB69CF933C2D28FB9DF91F2852A99EC3352EA0
index 89cfe44fd..89cfe44fd 100644
--- a/spss.handbook/conf/moa-spss/certstore/6F86F897C45679B45F03C67D44B6447EFF43B758/53CB69CF933C2D28FB9DF91F2852A99EC3352EA0
+++ b/spss/handbook/conf/moa-spss/certstore/6F86F897C45679B45F03C67D44B6447EFF43B758/53CB69CF933C2D28FB9DF91F2852A99EC3352EA0
diff --git a/spss.handbook/conf/moa-spss/certstore/728C819D737EE42627F96F839C33BB6E68E85F68/00845B74CA13FE0A9056E6C0B5126FECF73B0D8C b/spss/handbook/conf/moa-spss/certstore/728C819D737EE42627F96F839C33BB6E68E85F68/00845B74CA13FE0A9056E6C0B5126FECF73B0D8C
index cc8b505ec..cc8b505ec 100644
--- a/spss.handbook/conf/moa-spss/certstore/728C819D737EE42627F96F839C33BB6E68E85F68/00845B74CA13FE0A9056E6C0B5126FECF73B0D8C
+++ b/spss/handbook/conf/moa-spss/certstore/728C819D737EE42627F96F839C33BB6E68E85F68/00845B74CA13FE0A9056E6C0B5126FECF73B0D8C
diff --git a/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/474BC41135FB88BF58B5A8D976A1D5583378D85E b/spss/handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/474BC41135FB88BF58B5A8D976A1D5583378D85E
index c9da41583..c9da41583 100644
--- a/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/474BC41135FB88BF58B5A8D976A1D5583378D85E
+++ b/spss/handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/474BC41135FB88BF58B5A8D976A1D5583378D85E
diff --git a/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01 b/spss/handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01
index 28fbdf42f..28fbdf42f 100644
--- a/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01
+++ b/spss/handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01
diff --git a/spss.handbook/conf/moa-spss/certstore/76011AE57123CC4E476C094C48C461DC37A0DEDD/FDC348410699803DE7D8276813BC2232EA99A878 b/spss/handbook/conf/moa-spss/certstore/76011AE57123CC4E476C094C48C461DC37A0DEDD/FDC348410699803DE7D8276813BC2232EA99A878
index 424f849a1..424f849a1 100644
--- a/spss.handbook/conf/moa-spss/certstore/76011AE57123CC4E476C094C48C461DC37A0DEDD/FDC348410699803DE7D8276813BC2232EA99A878
+++ b/spss/handbook/conf/moa-spss/certstore/76011AE57123CC4E476C094C48C461DC37A0DEDD/FDC348410699803DE7D8276813BC2232EA99A878
diff --git a/spss.handbook/conf/moa-spss/certstore/7A9DC855647136050A8D75D6571AC64739F36C6C/BF648929E7DAABD8D97B3202F48D6C4A19C78F6C b/spss/handbook/conf/moa-spss/certstore/7A9DC855647136050A8D75D6571AC64739F36C6C/BF648929E7DAABD8D97B3202F48D6C4A19C78F6C
index 4989f3e73..4989f3e73 100644
--- a/spss.handbook/conf/moa-spss/certstore/7A9DC855647136050A8D75D6571AC64739F36C6C/BF648929E7DAABD8D97B3202F48D6C4A19C78F6C
+++ b/spss/handbook/conf/moa-spss/certstore/7A9DC855647136050A8D75D6571AC64739F36C6C/BF648929E7DAABD8D97B3202F48D6C4A19C78F6C
diff --git a/spss.handbook/conf/moa-spss/certstore/88D9F0C0EBB72C58516EC96AEED397FA86B40E39/6DCD5118D1542E6C205C580775C5420B7509506B b/spss/handbook/conf/moa-spss/certstore/88D9F0C0EBB72C58516EC96AEED397FA86B40E39/6DCD5118D1542E6C205C580775C5420B7509506B
index 06b40aa67..06b40aa67 100644
--- a/spss.handbook/conf/moa-spss/certstore/88D9F0C0EBB72C58516EC96AEED397FA86B40E39/6DCD5118D1542E6C205C580775C5420B7509506B
+++ b/spss/handbook/conf/moa-spss/certstore/88D9F0C0EBB72C58516EC96AEED397FA86B40E39/6DCD5118D1542E6C205C580775C5420B7509506B
diff --git a/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/3B8484BF1370941BF03F206B5C4958DA4E1559BB b/spss/handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/3B8484BF1370941BF03F206B5C4958DA4E1559BB
index 6f97837a2..6f97837a2 100644
--- a/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/3B8484BF1370941BF03F206B5C4958DA4E1559BB
+++ b/spss/handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/3B8484BF1370941BF03F206B5C4958DA4E1559BB
diff --git a/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/C0EF3E7A54B4C501295F77974B1995E36B25C92B b/spss/handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/C0EF3E7A54B4C501295F77974B1995E36B25C92B
index 508f7f076..508f7f076 100644
--- a/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/C0EF3E7A54B4C501295F77974B1995E36B25C92B
+++ b/spss/handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/C0EF3E7A54B4C501295F77974B1995E36B25C92B
diff --git a/spss.handbook/conf/moa-spss/certstore/8FDB1CB752D82C88C89F9E9DA7AD2F54C6FA6F3B/842B3870A64001CDD90978D0E554DAF94D9ABDFE b/spss/handbook/conf/moa-spss/certstore/8FDB1CB752D82C88C89F9E9DA7AD2F54C6FA6F3B/842B3870A64001CDD90978D0E554DAF94D9ABDFE
index a0e3fdda1..a0e3fdda1 100644
--- a/spss.handbook/conf/moa-spss/certstore/8FDB1CB752D82C88C89F9E9DA7AD2F54C6FA6F3B/842B3870A64001CDD90978D0E554DAF94D9ABDFE
+++ b/spss/handbook/conf/moa-spss/certstore/8FDB1CB752D82C88C89F9E9DA7AD2F54C6FA6F3B/842B3870A64001CDD90978D0E554DAF94D9ABDFE
diff --git a/spss.handbook/conf/moa-spss/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/679A4F81FC705DDEC419778DD2EBD875F4C242C6 b/spss/handbook/conf/moa-spss/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/679A4F81FC705DDEC419778DD2EBD875F4C242C6
index 36a442b89..36a442b89 100644
--- a/spss.handbook/conf/moa-spss/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/679A4F81FC705DDEC419778DD2EBD875F4C242C6
+++ b/spss/handbook/conf/moa-spss/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/679A4F81FC705DDEC419778DD2EBD875F4C242C6
diff --git a/spss.handbook/conf/moa-spss/certstore/91C4DD783D6D38F0325FE74930BF61F656364EA9/53A6B611F8CEE0315BCCE5D59898931ED390E400 b/spss/handbook/conf/moa-spss/certstore/91C4DD783D6D38F0325FE74930BF61F656364EA9/53A6B611F8CEE0315BCCE5D59898931ED390E400
index 6c0216239..6c0216239 100644
--- a/spss.handbook/conf/moa-spss/certstore/91C4DD783D6D38F0325FE74930BF61F656364EA9/53A6B611F8CEE0315BCCE5D59898931ED390E400
+++ b/spss/handbook/conf/moa-spss/certstore/91C4DD783D6D38F0325FE74930BF61F656364EA9/53A6B611F8CEE0315BCCE5D59898931ED390E400
diff --git a/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/45B43346251FDF9E95DCB7F36928785D46D63913 b/spss/handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/45B43346251FDF9E95DCB7F36928785D46D63913
index f3cf5e676..f3cf5e676 100644
--- a/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/45B43346251FDF9E95DCB7F36928785D46D63913
+++ b/spss/handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/45B43346251FDF9E95DCB7F36928785D46D63913
diff --git a/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/E33619C88426E4FE956041E6751ADDEC9C10F0BC b/spss/handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/E33619C88426E4FE956041E6751ADDEC9C10F0BC
index fc5bd433b..fc5bd433b 100644
--- a/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/E33619C88426E4FE956041E6751ADDEC9C10F0BC
+++ b/spss/handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/E33619C88426E4FE956041E6751ADDEC9C10F0BC
diff --git a/spss.handbook/conf/moa-spss/certstore/975729FFAF7EB667BCF68E9B886EA876E44F46D0/35202B14F69409EAA51CD8AB547AC0CD5E993F3F b/spss/handbook/conf/moa-spss/certstore/975729FFAF7EB667BCF68E9B886EA876E44F46D0/35202B14F69409EAA51CD8AB547AC0CD5E993F3F
index 3beb4529a..3beb4529a 100644
--- a/spss.handbook/conf/moa-spss/certstore/975729FFAF7EB667BCF68E9B886EA876E44F46D0/35202B14F69409EAA51CD8AB547AC0CD5E993F3F
+++ b/spss/handbook/conf/moa-spss/certstore/975729FFAF7EB667BCF68E9B886EA876E44F46D0/35202B14F69409EAA51CD8AB547AC0CD5E993F3F
diff --git a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6 b/spss/handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6
index 781d1e4f2..781d1e4f2 100644
--- a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6
+++ b/spss/handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6
diff --git a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/9D4CB7E3DBF24AE596972D59C375DD6384BB5E8B b/spss/handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/9D4CB7E3DBF24AE596972D59C375DD6384BB5E8B
index 8286cabbc..8286cabbc 100644
--- a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/9D4CB7E3DBF24AE596972D59C375DD6384BB5E8B
+++ b/spss/handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/9D4CB7E3DBF24AE596972D59C375DD6384BB5E8B
diff --git a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/A562C4B99E2847251CB4A1F05DA1FF43E7296F0B b/spss/handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/A562C4B99E2847251CB4A1F05DA1FF43E7296F0B
index a0148f63b..a0148f63b 100644
--- a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/A562C4B99E2847251CB4A1F05DA1FF43E7296F0B
+++ b/spss/handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/A562C4B99E2847251CB4A1F05DA1FF43E7296F0B
diff --git a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8C b/spss/handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8C
index 61d346a8f..61d346a8f 100644
--- a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8C
+++ b/spss/handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8C
diff --git a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9F0E0FBB25F66FF88C8E033EFF358923C84A2926 b/spss/handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9F0E0FBB25F66FF88C8E033EFF358923C84A2926
index 9ae7ffa0c..9ae7ffa0c 100644
--- a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9F0E0FBB25F66FF88C8E033EFF358923C84A2926
+++ b/spss/handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9F0E0FBB25F66FF88C8E033EFF358923C84A2926
diff --git a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/C87D1855227D995C332C4C9072A2E2053F2CC623 b/spss/handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/C87D1855227D995C332C4C9072A2E2053F2CC623
index a68ae2db7..a68ae2db7 100644
--- a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/C87D1855227D995C332C4C9072A2E2053F2CC623
+++ b/spss/handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/C87D1855227D995C332C4C9072A2E2053F2CC623
diff --git a/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/42AD1897A4643D2AA634D980F16349E6694F3B1B b/spss/handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/42AD1897A4643D2AA634D980F16349E6694F3B1B
index f1d7b6a28..f1d7b6a28 100644
--- a/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/42AD1897A4643D2AA634D980F16349E6694F3B1B
+++ b/spss/handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/42AD1897A4643D2AA634D980F16349E6694F3B1B
diff --git a/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/FE7891B6ED7B178F528A28B21478299F865889BD b/spss/handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/FE7891B6ED7B178F528A28B21478299F865889BD
index c1b90c0f4..c1b90c0f4 100644
--- a/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/FE7891B6ED7B178F528A28B21478299F865889BD
+++ b/spss/handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/FE7891B6ED7B178F528A28B21478299F865889BD
diff --git a/spss.handbook/conf/moa-spss/certstore/A15B5DBE14A19CF859F48E2DA2A29A4C3DB4D680/3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02B b/spss/handbook/conf/moa-spss/certstore/A15B5DBE14A19CF859F48E2DA2A29A4C3DB4D680/3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02B
index e27a87038..e27a87038 100644
--- a/spss.handbook/conf/moa-spss/certstore/A15B5DBE14A19CF859F48E2DA2A29A4C3DB4D680/3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02B
+++ b/spss/handbook/conf/moa-spss/certstore/A15B5DBE14A19CF859F48E2DA2A29A4C3DB4D680/3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02B
diff --git a/spss.handbook/conf/moa-spss/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/8784ED81F5A22779EB0B081945FD151992557FBE b/spss/handbook/conf/moa-spss/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/8784ED81F5A22779EB0B081945FD151992557FBE
index cc35ba691..cc35ba691 100644
--- a/spss.handbook/conf/moa-spss/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/8784ED81F5A22779EB0B081945FD151992557FBE
+++ b/spss/handbook/conf/moa-spss/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/8784ED81F5A22779EB0B081945FD151992557FBE
diff --git a/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/20CAECDCA766243AAD6FA1327618FC81BA65DC0F b/spss/handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/20CAECDCA766243AAD6FA1327618FC81BA65DC0F
index b596d82e3..b596d82e3 100644
--- a/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/20CAECDCA766243AAD6FA1327618FC81BA65DC0F
+++ b/spss/handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/20CAECDCA766243AAD6FA1327618FC81BA65DC0F
diff --git a/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/96D5D179016A5A6546973BA63733617EE1F1540D b/spss/handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/96D5D179016A5A6546973BA63733617EE1F1540D
index 4adc3b7ec..4adc3b7ec 100644
--- a/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/96D5D179016A5A6546973BA63733617EE1F1540D
+++ b/spss/handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/96D5D179016A5A6546973BA63733617EE1F1540D
diff --git a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7A b/spss/handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7A
index b6f39e354..b6f39e354 100644
--- a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7A
+++ b/spss/handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7A
diff --git a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/E619D25B380B7B13FDA33E8A58CD82D8A88E0515 b/spss/handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/E619D25B380B7B13FDA33E8A58CD82D8A88E0515
index f9fef65fc..f9fef65fc 100644
--- a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/E619D25B380B7B13FDA33E8A58CD82D8A88E0515
+++ b/spss/handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/E619D25B380B7B13FDA33E8A58CD82D8A88E0515
diff --git a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92 b/spss/handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92
index f9f27442b..f9f27442b 100644
--- a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92
+++ b/spss/handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92
diff --git a/spss.handbook/conf/moa-spss/certstore/AAB27F0E98B28AF253454415F6490CB5F43A4B49/A9D28607928FA8615E2615CC9D71B535C5D0D419 b/spss/handbook/conf/moa-spss/certstore/AAB27F0E98B28AF253454415F6490CB5F43A4B49/A9D28607928FA8615E2615CC9D71B535C5D0D419
index 10a1f7141..10a1f7141 100644
--- a/spss.handbook/conf/moa-spss/certstore/AAB27F0E98B28AF253454415F6490CB5F43A4B49/A9D28607928FA8615E2615CC9D71B535C5D0D419
+++ b/spss/handbook/conf/moa-spss/certstore/AAB27F0E98B28AF253454415F6490CB5F43A4B49/A9D28607928FA8615E2615CC9D71B535C5D0D419
diff --git a/spss.handbook/conf/moa-spss/certstore/AC1B67D7D5A300767C0944ACE8458DD49960F1BD/4D523730501ADB80A76B0B473A4D21C7D86F8374 b/spss/handbook/conf/moa-spss/certstore/AC1B67D7D5A300767C0944ACE8458DD49960F1BD/4D523730501ADB80A76B0B473A4D21C7D86F8374
index 61a7ccb15..61a7ccb15 100644
--- a/spss.handbook/conf/moa-spss/certstore/AC1B67D7D5A300767C0944ACE8458DD49960F1BD/4D523730501ADB80A76B0B473A4D21C7D86F8374
+++ b/spss/handbook/conf/moa-spss/certstore/AC1B67D7D5A300767C0944ACE8458DD49960F1BD/4D523730501ADB80A76B0B473A4D21C7D86F8374
diff --git a/spss.handbook/conf/moa-spss/certstore/B310CEED301C503EDB15720F94D5D7E76BF423DA/AA94FD422AEB8F5B6E8508314CE0DC68BCD53305 b/spss/handbook/conf/moa-spss/certstore/B310CEED301C503EDB15720F94D5D7E76BF423DA/AA94FD422AEB8F5B6E8508314CE0DC68BCD53305
index ea3512e3d..ea3512e3d 100644
--- a/spss.handbook/conf/moa-spss/certstore/B310CEED301C503EDB15720F94D5D7E76BF423DA/AA94FD422AEB8F5B6E8508314CE0DC68BCD53305
+++ b/spss/handbook/conf/moa-spss/certstore/B310CEED301C503EDB15720F94D5D7E76BF423DA/AA94FD422AEB8F5B6E8508314CE0DC68BCD53305
diff --git a/spss.handbook/conf/moa-spss/certstore/B3EB7B59ECFF1E25E16C64BB24993D1B20DCFC28/07A6DEED70213CCF598F278789680DA4C04A0331 b/spss/handbook/conf/moa-spss/certstore/B3EB7B59ECFF1E25E16C64BB24993D1B20DCFC28/07A6DEED70213CCF598F278789680DA4C04A0331
index 46dd968f0..46dd968f0 100644
--- a/spss.handbook/conf/moa-spss/certstore/B3EB7B59ECFF1E25E16C64BB24993D1B20DCFC28/07A6DEED70213CCF598F278789680DA4C04A0331
+++ b/spss/handbook/conf/moa-spss/certstore/B3EB7B59ECFF1E25E16C64BB24993D1B20DCFC28/07A6DEED70213CCF598F278789680DA4C04A0331
diff --git a/spss.handbook/conf/moa-spss/certstore/BAA9ADD095E87E0B490B6DD933AA2F450C6B9492/7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2 b/spss/handbook/conf/moa-spss/certstore/BAA9ADD095E87E0B490B6DD933AA2F450C6B9492/7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2
index 63ba5cce5..63ba5cce5 100644
--- a/spss.handbook/conf/moa-spss/certstore/BAA9ADD095E87E0B490B6DD933AA2F450C6B9492/7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2
+++ b/spss/handbook/conf/moa-spss/certstore/BAA9ADD095E87E0B490B6DD933AA2F450C6B9492/7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2
diff --git a/spss.handbook/conf/moa-spss/certstore/BE47A5DA41A35F740D98305DA8FF4096B71492BE/D1474E7D99512D05B98DD37B3FE86496A03D088D b/spss/handbook/conf/moa-spss/certstore/BE47A5DA41A35F740D98305DA8FF4096B71492BE/D1474E7D99512D05B98DD37B3FE86496A03D088D
index 0bab77032..0bab77032 100644
--- a/spss.handbook/conf/moa-spss/certstore/BE47A5DA41A35F740D98305DA8FF4096B71492BE/D1474E7D99512D05B98DD37B3FE86496A03D088D
+++ b/spss/handbook/conf/moa-spss/certstore/BE47A5DA41A35F740D98305DA8FF4096B71492BE/D1474E7D99512D05B98DD37B3FE86496A03D088D
diff --git a/spss.handbook/conf/moa-spss/certstore/BED4C70D83B5042F4254459064FDEACD43DD1EDF/7BE0C8E441786C69A3CB35BDBEF235F8B5310E04 b/spss/handbook/conf/moa-spss/certstore/BED4C70D83B5042F4254459064FDEACD43DD1EDF/7BE0C8E441786C69A3CB35BDBEF235F8B5310E04
index 0a8de4bb9..0a8de4bb9 100644
--- a/spss.handbook/conf/moa-spss/certstore/BED4C70D83B5042F4254459064FDEACD43DD1EDF/7BE0C8E441786C69A3CB35BDBEF235F8B5310E04
+++ b/spss/handbook/conf/moa-spss/certstore/BED4C70D83B5042F4254459064FDEACD43DD1EDF/7BE0C8E441786C69A3CB35BDBEF235F8B5310E04
diff --git a/spss.handbook/conf/moa-spss/certstore/C15FFFE6EFAD484909C9EFC6CD5C20435E326685/DDBAE68B1FF60FFBB2854C78727B76C95EC83BBE b/spss/handbook/conf/moa-spss/certstore/C15FFFE6EFAD484909C9EFC6CD5C20435E326685/DDBAE68B1FF60FFBB2854C78727B76C95EC83BBE
index 6428b8256..6428b8256 100644
--- a/spss.handbook/conf/moa-spss/certstore/C15FFFE6EFAD484909C9EFC6CD5C20435E326685/DDBAE68B1FF60FFBB2854C78727B76C95EC83BBE
+++ b/spss/handbook/conf/moa-spss/certstore/C15FFFE6EFAD484909C9EFC6CD5C20435E326685/DDBAE68B1FF60FFBB2854C78727B76C95EC83BBE
diff --git a/spss.handbook/conf/moa-spss/certstore/C2A7CAE9E68EB7945828D193CB22CDD246BC7F95/6955D95F6B0799F7D96F4FC28E6E6C64758C1240 b/spss/handbook/conf/moa-spss/certstore/C2A7CAE9E68EB7945828D193CB22CDD246BC7F95/6955D95F6B0799F7D96F4FC28E6E6C64758C1240
index f11bd6247..f11bd6247 100644
--- a/spss.handbook/conf/moa-spss/certstore/C2A7CAE9E68EB7945828D193CB22CDD246BC7F95/6955D95F6B0799F7D96F4FC28E6E6C64758C1240
+++ b/spss/handbook/conf/moa-spss/certstore/C2A7CAE9E68EB7945828D193CB22CDD246BC7F95/6955D95F6B0799F7D96F4FC28E6E6C64758C1240
diff --git a/spss.handbook/conf/moa-spss/certstore/C52E4A04A22D98C70E19F1969AD71C838E4371B3/F96FE4F59166EFA9000B21A16EF22CF14468890C b/spss/handbook/conf/moa-spss/certstore/C52E4A04A22D98C70E19F1969AD71C838E4371B3/F96FE4F59166EFA9000B21A16EF22CF14468890C
index 348257122..348257122 100644
--- a/spss.handbook/conf/moa-spss/certstore/C52E4A04A22D98C70E19F1969AD71C838E4371B3/F96FE4F59166EFA9000B21A16EF22CF14468890C
+++ b/spss/handbook/conf/moa-spss/certstore/C52E4A04A22D98C70E19F1969AD71C838E4371B3/F96FE4F59166EFA9000B21A16EF22CF14468890C
diff --git a/spss.handbook/conf/moa-spss/certstore/C7E1D3604D2A960201D70F29B8A80EDA11475EEB/C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3ED b/spss/handbook/conf/moa-spss/certstore/C7E1D3604D2A960201D70F29B8A80EDA11475EEB/C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3ED
index a3f8a7409..a3f8a7409 100644
--- a/spss.handbook/conf/moa-spss/certstore/C7E1D3604D2A960201D70F29B8A80EDA11475EEB/C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3ED
+++ b/spss/handbook/conf/moa-spss/certstore/C7E1D3604D2A960201D70F29B8A80EDA11475EEB/C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3ED
diff --git a/spss.handbook/conf/moa-spss/certstore/C976280EC7FECF169577E31D8CA0BB00967904B1/7666A8BD2C2513DE489C06D08D566F177ECE84AA b/spss/handbook/conf/moa-spss/certstore/C976280EC7FECF169577E31D8CA0BB00967904B1/7666A8BD2C2513DE489C06D08D566F177ECE84AA
index 3c1f2f8a2..3c1f2f8a2 100644
--- a/spss.handbook/conf/moa-spss/certstore/C976280EC7FECF169577E31D8CA0BB00967904B1/7666A8BD2C2513DE489C06D08D566F177ECE84AA
+++ b/spss/handbook/conf/moa-spss/certstore/C976280EC7FECF169577E31D8CA0BB00967904B1/7666A8BD2C2513DE489C06D08D566F177ECE84AA
diff --git a/spss.handbook/conf/moa-spss/certstore/CABD2EA6CA438084840DCCAE875F341E2D3A2C43/02A0E6456442E35198532ACFFB6FEE3B606D9FA3 b/spss/handbook/conf/moa-spss/certstore/CABD2EA6CA438084840DCCAE875F341E2D3A2C43/02A0E6456442E35198532ACFFB6FEE3B606D9FA3
index 5026d395f..5026d395f 100644
--- a/spss.handbook/conf/moa-spss/certstore/CABD2EA6CA438084840DCCAE875F341E2D3A2C43/02A0E6456442E35198532ACFFB6FEE3B606D9FA3
+++ b/spss/handbook/conf/moa-spss/certstore/CABD2EA6CA438084840DCCAE875F341E2D3A2C43/02A0E6456442E35198532ACFFB6FEE3B606D9FA3
diff --git a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/8AB0A3519AFA7F3C04074522678BAA1CB3DC734F b/spss/handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/8AB0A3519AFA7F3C04074522678BAA1CB3DC734F
index c34d0f380..c34d0f380 100644
--- a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/8AB0A3519AFA7F3C04074522678BAA1CB3DC734F
+++ b/spss/handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/8AB0A3519AFA7F3C04074522678BAA1CB3DC734F
diff --git a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/DF47B3040E7632614464BD2EC4ECD1B8030F53E3 b/spss/handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/DF47B3040E7632614464BD2EC4ECD1B8030F53E3
index d894e92ca..d894e92ca 100644
--- a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/DF47B3040E7632614464BD2EC4ECD1B8030F53E3
+++ b/spss/handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/DF47B3040E7632614464BD2EC4ECD1B8030F53E3
diff --git a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/E117479B4A41D7F3223FCAE50560B0D57B22217D b/spss/handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/E117479B4A41D7F3223FCAE50560B0D57B22217D
index 380486f65..380486f65 100644
--- a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/E117479B4A41D7F3223FCAE50560B0D57B22217D
+++ b/spss/handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/E117479B4A41D7F3223FCAE50560B0D57B22217D
diff --git a/spss.handbook/conf/moa-spss/certstore/D4D40BD33958CD9169A7AB6304AA2BBAD22DC595/07976A2A16EC182670161B46886B05E1FEAC16B1 b/spss/handbook/conf/moa-spss/certstore/D4D40BD33958CD9169A7AB6304AA2BBAD22DC595/07976A2A16EC182670161B46886B05E1FEAC16B1
index 22d64fb5f..22d64fb5f 100644
--- a/spss.handbook/conf/moa-spss/certstore/D4D40BD33958CD9169A7AB6304AA2BBAD22DC595/07976A2A16EC182670161B46886B05E1FEAC16B1
+++ b/spss/handbook/conf/moa-spss/certstore/D4D40BD33958CD9169A7AB6304AA2BBAD22DC595/07976A2A16EC182670161B46886B05E1FEAC16B1
diff --git a/spss.handbook/conf/moa-spss/certstore/D708C897515970D33EF7CD0C2474449D3AB6AA83/52ED0FAFBD38A868C678174D7EB03D266ADB221C b/spss/handbook/conf/moa-spss/certstore/D708C897515970D33EF7CD0C2474449D3AB6AA83/52ED0FAFBD38A868C678174D7EB03D266ADB221C
index 42a64da07..42a64da07 100644
--- a/spss.handbook/conf/moa-spss/certstore/D708C897515970D33EF7CD0C2474449D3AB6AA83/52ED0FAFBD38A868C678174D7EB03D266ADB221C
+++ b/spss/handbook/conf/moa-spss/certstore/D708C897515970D33EF7CD0C2474449D3AB6AA83/52ED0FAFBD38A868C678174D7EB03D266ADB221C
diff --git a/spss.handbook/conf/moa-spss/certstore/DD29E76659D18371B78E61E7DF4D4B8FEDCAF8E7/8BA5C0847597612C7E16970EAE55EF58D32E9CF3 b/spss/handbook/conf/moa-spss/certstore/DD29E76659D18371B78E61E7DF4D4B8FEDCAF8E7/8BA5C0847597612C7E16970EAE55EF58D32E9CF3
index 010c5d5b6..010c5d5b6 100644
--- a/spss.handbook/conf/moa-spss/certstore/DD29E76659D18371B78E61E7DF4D4B8FEDCAF8E7/8BA5C0847597612C7E16970EAE55EF58D32E9CF3
+++ b/spss/handbook/conf/moa-spss/certstore/DD29E76659D18371B78E61E7DF4D4B8FEDCAF8E7/8BA5C0847597612C7E16970EAE55EF58D32E9CF3
diff --git a/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/27337257493B86B9BFF78D569F938D692A430EAE b/spss/handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/27337257493B86B9BFF78D569F938D692A430EAE
index 5375c57c3..5375c57c3 100644
--- a/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/27337257493B86B9BFF78D569F938D692A430EAE
+++ b/spss/handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/27337257493B86B9BFF78D569F938D692A430EAE
diff --git a/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/4832F0A28C3724A92F6CB3314F747D0E74FC7344 b/spss/handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/4832F0A28C3724A92F6CB3314F747D0E74FC7344
index 7085c5ac9..7085c5ac9 100644
--- a/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/4832F0A28C3724A92F6CB3314F747D0E74FC7344
+++ b/spss/handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/4832F0A28C3724A92F6CB3314F747D0E74FC7344
diff --git a/spss.handbook/conf/moa-spss/certstore/E6A4C843059A6043B4DC967F9EF892B695990777/B4B77C83465979E3679E3A33F972F48EE3730A18 b/spss/handbook/conf/moa-spss/certstore/E6A4C843059A6043B4DC967F9EF892B695990777/B4B77C83465979E3679E3A33F972F48EE3730A18
index 6225c0ca7..6225c0ca7 100644
--- a/spss.handbook/conf/moa-spss/certstore/E6A4C843059A6043B4DC967F9EF892B695990777/B4B77C83465979E3679E3A33F972F48EE3730A18
+++ b/spss/handbook/conf/moa-spss/certstore/E6A4C843059A6043B4DC967F9EF892B695990777/B4B77C83465979E3679E3A33F972F48EE3730A18
diff --git a/spss.handbook/conf/moa-spss/certstore/EA7E6D37E678C1BCA5060F97DAF09F559DFD04B7/3AAD23B00CA10E54E6368DF7952E3F4B5108B65C b/spss/handbook/conf/moa-spss/certstore/EA7E6D37E678C1BCA5060F97DAF09F559DFD04B7/3AAD23B00CA10E54E6368DF7952E3F4B5108B65C
index a3aa0000d..a3aa0000d 100644
--- a/spss.handbook/conf/moa-spss/certstore/EA7E6D37E678C1BCA5060F97DAF09F559DFD04B7/3AAD23B00CA10E54E6368DF7952E3F4B5108B65C
+++ b/spss/handbook/conf/moa-spss/certstore/EA7E6D37E678C1BCA5060F97DAF09F559DFD04B7/3AAD23B00CA10E54E6368DF7952E3F4B5108B65C
diff --git a/spss.handbook/conf/moa-spss/certstore/EEE6351C5C6EBD8644AB88E7648D44FA07C72A80/14E59C02A6877B0EBD2C4203886BA25959C1D267 b/spss/handbook/conf/moa-spss/certstore/EEE6351C5C6EBD8644AB88E7648D44FA07C72A80/14E59C02A6877B0EBD2C4203886BA25959C1D267
index 332aa817a..332aa817a 100644
--- a/spss.handbook/conf/moa-spss/certstore/EEE6351C5C6EBD8644AB88E7648D44FA07C72A80/14E59C02A6877B0EBD2C4203886BA25959C1D267
+++ b/spss/handbook/conf/moa-spss/certstore/EEE6351C5C6EBD8644AB88E7648D44FA07C72A80/14E59C02A6877B0EBD2C4203886BA25959C1D267
diff --git a/spss.handbook/conf/moa-spss/certstore/F1B84756A1EAB09C171B2783DD163B42A9BD0BBB/ED5608CE67EA5CB79AC024CEA7445F9BCBE48703 b/spss/handbook/conf/moa-spss/certstore/F1B84756A1EAB09C171B2783DD163B42A9BD0BBB/ED5608CE67EA5CB79AC024CEA7445F9BCBE48703
index 069640ffc..069640ffc 100644
--- a/spss.handbook/conf/moa-spss/certstore/F1B84756A1EAB09C171B2783DD163B42A9BD0BBB/ED5608CE67EA5CB79AC024CEA7445F9BCBE48703
+++ b/spss/handbook/conf/moa-spss/certstore/F1B84756A1EAB09C171B2783DD163B42A9BD0BBB/ED5608CE67EA5CB79AC024CEA7445F9BCBE48703
diff --git a/spss.handbook/conf/moa-spss/certstore/F3DA7C495789E656FA27E611CCAFA05F232ADEA0/F3AE9FEA4DECEE5330770A2520BD86909929E7BE b/spss/handbook/conf/moa-spss/certstore/F3DA7C495789E656FA27E611CCAFA05F232ADEA0/F3AE9FEA4DECEE5330770A2520BD86909929E7BE
index c3fc91352..c3fc91352 100644
--- a/spss.handbook/conf/moa-spss/certstore/F3DA7C495789E656FA27E611CCAFA05F232ADEA0/F3AE9FEA4DECEE5330770A2520BD86909929E7BE
+++ b/spss/handbook/conf/moa-spss/certstore/F3DA7C495789E656FA27E611CCAFA05F232ADEA0/F3AE9FEA4DECEE5330770A2520BD86909929E7BE
diff --git a/spss.handbook/conf/moa-spss/certstore/F48B57F89BACD8687EBB12223A5B8E5EF3774583/CAF84A42305615AC2C582F6412BDA3E36DAC3D25 b/spss/handbook/conf/moa-spss/certstore/F48B57F89BACD8687EBB12223A5B8E5EF3774583/CAF84A42305615AC2C582F6412BDA3E36DAC3D25
index 83aeb1fce..83aeb1fce 100644
--- a/spss.handbook/conf/moa-spss/certstore/F48B57F89BACD8687EBB12223A5B8E5EF3774583/CAF84A42305615AC2C582F6412BDA3E36DAC3D25
+++ b/spss/handbook/conf/moa-spss/certstore/F48B57F89BACD8687EBB12223A5B8E5EF3774583/CAF84A42305615AC2C582F6412BDA3E36DAC3D25
diff --git a/spss.handbook/conf/moa-spss/certstore/F613568C1D7A1300B32609998288211959DBDFB0/D7EDAF7381F7FC93B4C28FA372190D7A59CFA696 b/spss/handbook/conf/moa-spss/certstore/F613568C1D7A1300B32609998288211959DBDFB0/D7EDAF7381F7FC93B4C28FA372190D7A59CFA696
index 5631441a9..5631441a9 100644
--- a/spss.handbook/conf/moa-spss/certstore/F613568C1D7A1300B32609998288211959DBDFB0/D7EDAF7381F7FC93B4C28FA372190D7A59CFA696
+++ b/spss/handbook/conf/moa-spss/certstore/F613568C1D7A1300B32609998288211959DBDFB0/D7EDAF7381F7FC93B4C28FA372190D7A59CFA696
diff --git a/spss.handbook/conf/moa-spss/certstore/F7D331850EC13D22284909E0FC3493A65FFA7F30/EC988340526163D5B7AC80481B2AC76828EDDC6C b/spss/handbook/conf/moa-spss/certstore/F7D331850EC13D22284909E0FC3493A65FFA7F30/EC988340526163D5B7AC80481B2AC76828EDDC6C
index 585047fa2..585047fa2 100644
--- a/spss.handbook/conf/moa-spss/certstore/F7D331850EC13D22284909E0FC3493A65FFA7F30/EC988340526163D5B7AC80481B2AC76828EDDC6C
+++ b/spss/handbook/conf/moa-spss/certstore/F7D331850EC13D22284909E0FC3493A65FFA7F30/EC988340526163D5B7AC80481B2AC76828EDDC6C
diff --git a/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der b/spss/handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der
index 332aa817a..332aa817a 100644
--- a/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der
+++ b/spss/handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der
diff --git a/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden[pwd=allekunden].p12 b/spss/handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden[pwd=allekunden].p12
index 8827ed99c..8827ed99c 100644
--- a/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden[pwd=allekunden].p12
+++ b/spss/handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden[pwd=allekunden].p12
diff --git a/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der b/spss/handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der
index 63ba5cce5..63ba5cce5 100644
--- a/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der
+++ b/spss/handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der
diff --git a/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1[pwd=kunde1].p12 b/spss/handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1[pwd=kunde1].p12
index 4499ab52b..4499ab52b 100644
--- a/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1[pwd=kunde1].p12
+++ b/spss/handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1[pwd=kunde1].p12
diff --git a/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der b/spss/handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der
index 4f87134e7..4f87134e7 100644
--- a/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der
+++ b/spss/handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der
diff --git a/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2[pwd=kunde2].p12 b/spss/handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2[pwd=kunde2].p12
index 5b7631133..5b7631133 100644
--- a/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2[pwd=kunde2].p12
+++ b/spss/handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2[pwd=kunde2].p12
diff --git a/spss.handbook/conf/moa-spss/log4j.properties b/spss/handbook/conf/moa-spss/log4j.properties
index f6abfd495..f6abfd495 100644
--- a/spss.handbook/conf/moa-spss/log4j.properties
+++ b/spss/handbook/conf/moa-spss/log4j.properties
diff --git a/spss.handbook/conf/moa-spss/sp.minimum.config.xml b/spss/handbook/conf/moa-spss/sp.minimum.config.xml
index e2a556677..e2a556677 100644
--- a/spss.handbook/conf/moa-spss/sp.minimum.config.xml
+++ b/spss/handbook/conf/moa-spss/sp.minimum.config.xml
diff --git a/spss.handbook/conf/moa-spss/spss.config.xml b/spss/handbook/conf/moa-spss/spss.config.xml
index d792f9478..d792f9478 100644
--- a/spss.handbook/conf/moa-spss/spss.config.xml
+++ b/spss/handbook/conf/moa-spss/spss.config.xml
diff --git a/spss.handbook/conf/moa-spss/ss.minimum.config.xml b/spss/handbook/conf/moa-spss/ss.minimum.config.xml
index 8ab10a994..8ab10a994 100644
--- a/spss.handbook/conf/moa-spss/ss.minimum.config.xml
+++ b/spss/handbook/conf/moa-spss/ss.minimum.config.xml
diff --git a/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server.der b/spss/handbook/conf/moa-spss/sslKeys/server/moa-ssl-server.der
index c3b3003d9..c3b3003d9 100644
--- a/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server.der
+++ b/spss/handbook/conf/moa-spss/sslKeys/server/moa-ssl-server.der
diff --git a/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server[pwd=server].p12 b/spss/handbook/conf/moa-spss/sslKeys/server/moa-ssl-server[pwd=server].p12
index af524d060..af524d060 100644
--- a/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server[pwd=server].p12
+++ b/spss/handbook/conf/moa-spss/sslKeys/server/moa-ssl-server[pwd=server].p12
diff --git a/spss.handbook/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore b/spss/handbook/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore
index 780e58934..780e58934 100644
--- a/spss.handbook/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore
+++ b/spss/handbook/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore
diff --git a/spss.handbook/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore b/spss/handbook/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore
index b3673b45d..b3673b45d 100644
--- a/spss.handbook/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore
+++ b/spss/handbook/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
index 8c434777e..8c434777e 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
index efa28178e..efa28178e 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
index 33e776369..33e776369 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
index b7d4b08a6..b7d4b08a6 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
index 289fc2198..289fc2198 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
index 69de75609..69de75609 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.TrustSignTest-Enc-01.20011206-20041206.SerNo0450[CertifiedKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.TrustSignTest-Enc-01.20011206-20041206.SerNo0450[CertifiedKeypair].cer
index 836ba3767..836ba3767 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.TrustSignTest-Enc-01.20011206-20041206.SerNo0450[CertifiedKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.TrustSignTest-Enc-01.20011206-20041206.SerNo0450[CertifiedKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20021120-20051120.SerNo16f8[CertifiedKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20021120-20051120.SerNo16f8[CertifiedKeypair].cer
index fc5bd433b..fc5bd433b 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20021120-20051120.SerNo16f8[CertifiedKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20021120-20051120.SerNo16f8[CertifiedKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20030903-20060903.SerNo4848[CertifiedKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20030903-20060903.SerNo4848[CertifiedKeypair].cer
index f3cf5e676..f3cf5e676 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20030903-20060903.SerNo4848[CertifiedKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20030903-20060903.SerNo4848[CertifiedKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
index 3be7b6a06..3be7b6a06 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Stabsstelle.TestCA-Verschluesselung-Buerger.20040518-20100101.SerNo0004[CertifiedKeypair].der b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Stabsstelle.TestCA-Verschluesselung-Buerger.20040518-20100101.SerNo0004[CertifiedKeypair].der
index d3c213711..d3c213711 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Stabsstelle.TestCA-Verschluesselung-Buerger.20040518-20100101.SerNo0004[CertifiedKeypair].der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Stabsstelle.TestCA-Verschluesselung-Buerger.20040518-20100101.SerNo0004[CertifiedKeypair].der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
index 06b40aa67..06b40aa67 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
index 7e9fd5b0b..7e9fd5b0b 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
index da38ce028..da38ce028 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
index 8c434777e..8c434777e 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
index efa28178e..efa28178e 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
index 33e776369..33e776369 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
index b7d4b08a6..b7d4b08a6 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
index 289fc2198..289fc2198 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
index 69de75609..69de75609 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
index 3be7b6a06..3be7b6a06 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646.cer
index 06b40aa67..06b40aa67 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
index 7e9fd5b0b..7e9fd5b0b 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
index da38ce028..da38ce028 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Dr. Waltraut Kotschy.20070119-20120119.SerNo02de1c.cer b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Dr. Waltraut Kotschy.20070119-20120119.SerNo02de1c.cer
index 592c96230..592c96230 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Dr. Waltraut Kotschy.20070119-20120119.SerNo02de1c.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Dr. Waltraut Kotschy.20070119-20120119.SerNo02de1c.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
index 376d0753f..376d0753f 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/MOA-Test-CA-Signaturdienste.cer b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/MOA-Test-CA-Signaturdienste.cer
index 424f849a1..424f849a1 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/MOA-Test-CA-Signaturdienste.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/MOA-Test-CA-Signaturdienste.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
index 376d0753f..376d0753f 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-03-20051114-20151114.SerNo01aaed.der b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-03-20051114-20151114.SerNo01aaed.der
index 5171276f4..5171276f4 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-03-20051114-20151114.SerNo01aaed.der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-03-20051114-20151114.SerNo01aaed.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Dr. Waltraut Kotschy-20070119-20120119.SerNo02de1c.der b/spss/handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Dr. Waltraut Kotschy-20070119-20120119.SerNo02de1c.der
index 592c96230..592c96230 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Dr. Waltraut Kotschy-20070119-20120119.SerNo02de1c.der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Dr. Waltraut Kotschy-20070119-20120119.SerNo02de1c.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer b/spss/handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
index 376d0753f..376d0753f 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/Nikolaus-Schwab-BM-f-Inneres-20040219-20070219.SerNo5c39.der b/spss/handbook/conf/moa-spss/trustProfiles/identityLink/Nikolaus-Schwab-BM-f-Inneres-20040219-20070219.SerNo5c39.der
index 376d0753f..376d0753f 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/Nikolaus-Schwab-BM-f-Inneres-20040219-20070219.SerNo5c39.der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/identityLink/Nikolaus-Schwab-BM-f-Inneres-20040219-20070219.SerNo5c39.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-03-20051114-20151114.SerNo01aaed.der b/spss/handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-03-20051114-20151114.SerNo01aaed.der
index 5171276f4..5171276f4 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-03-20051114-20151114.SerNo01aaed.der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-03-20051114-20151114.SerNo01aaed.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
index f9fef65fc..f9fef65fc 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
index 36a442b89..36a442b89 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
index d361d919f..d361d919f 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
index ad13d7b28..ad13d7b28 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
index f9f27442b..f9f27442b 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
index b6f39e354..b6f39e354 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.TrustSignTest-Sig-01.20011206-20041206.SerNo0588[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.TrustSignTest-Sig-01.20011206-20041206.SerNo0588[SecureSignatureKeypair].cer
index 28cb48bb0..28cb48bb0 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.TrustSignTest-Sig-01.20011206-20041206.SerNo0588[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.TrustSignTest-Sig-01.20011206-20041206.SerNo0588[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20021120-20051120.SerNo16f9[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20021120-20051120.SerNo16f9[SecureSignatureKeypair].cer
index 28fbdf42f..28fbdf42f 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20021120-20051120.SerNo16f9[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20021120-20051120.SerNo16f9[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20030903-20060903.SerNo484a[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20030903-20060903.SerNo484a[SecureSignatureKeypair].cer
index c9da41583..c9da41583 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20030903-20060903.SerNo484a[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20030903-20060903.SerNo484a[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
index 3be7b6a06..3be7b6a06 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Stabsstelle.TestCA_Signatur_Buerger.20040518-20100101.SerNo0003[CertifiedKeypair].der b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Stabsstelle.TestCA_Signatur_Buerger.20040518-20100101.SerNo0003[CertifiedKeypair].der
index 807fa786c..807fa786c 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Stabsstelle.TestCA_Signatur_Buerger.20040518-20100101.SerNo0003[CertifiedKeypair].der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Stabsstelle.TestCA_Signatur_Buerger.20040518-20100101.SerNo0003[CertifiedKeypair].der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
index 06b40aa67..06b40aa67 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
index 7e9fd5b0b..7e9fd5b0b 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
index da38ce028..da38ce028 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-01.20041201-20141201.SerNoE243[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-01.20041201-20141201.SerNoE243[SecureSignatureKeypair].cer
index f9fef65fc..f9fef65fc 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-01.20041201-20141201.SerNoE243[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-01.20041201-20141201.SerNoE243[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-02.20041203-20141203.SerNoE248[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-02.20041203-20141203.SerNoE248[SecureSignatureKeypair].cer
index 36a442b89..36a442b89 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-02.20041203-20141203.SerNoE248[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-02.20041203-20141203.SerNoE248[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
index d361d919f..d361d919f 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
index ad13d7b28..ad13d7b28 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
index f9f27442b..f9f27442b 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
index b6f39e354..b6f39e354 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
index f9fef65fc..f9fef65fc 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
index 36a442b89..36a442b89 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
index d361d919f..d361d919f 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
index ad13d7b28..ad13d7b28 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
index f9f27442b..f9f27442b 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
index b6f39e354..b6f39e354 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
index 3be7b6a06..3be7b6a06 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
index 06b40aa67..06b40aa67 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
index 7e9fd5b0b..7e9fd5b0b 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
index da38ce028..da38ce028 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
+++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20070501-20120501_SerNo6650.cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/test/signaturdienst.der b/spss/handbook/conf/moa-spss/trustProfiles/test/signaturdienst.der
index 55707d69f..55707d69f 100644
--- a/spss.handbook/conf/moa-spss/trustProfiles/test/signaturdienst.der
+++ b/spss/handbook/conf/moa-spss/trustProfiles/test/signaturdienst.der
diff --git a/spss.handbook/handbook.html b/spss/handbook/handbook.html
index 2497d7f70..2497d7f70 100644
--- a/spss.handbook/handbook.html
+++ b/spss/handbook/handbook.html
diff --git a/spss.handbook/handbook/common/LogoBKA.png b/spss/handbook/handbook/common/LogoBKA.png
index 6a92647fd..6a92647fd 100644
--- a/spss.handbook/handbook/common/LogoBKA.png
+++ b/spss/handbook/handbook/common/LogoBKA.png
diff --git a/spss.handbook/handbook/common/LogoMoa4c.3148x3545.jpg b/spss/handbook/handbook/common/LogoMoa4c.3148x3545.jpg
index a5ba135ef..a5ba135ef 100644
--- a/spss.handbook/handbook/common/LogoMoa4c.3148x3545.jpg
+++ b/spss/handbook/handbook/common/LogoMoa4c.3148x3545.jpg
diff --git a/spss.handbook/handbook/common/LogoMoa4c.jpg b/spss/handbook/handbook/common/LogoMoa4c.jpg
index a1102090b..a1102090b 100644
--- a/spss.handbook/handbook/common/LogoMoa4c.jpg
+++ b/spss/handbook/handbook/common/LogoMoa4c.jpg
diff --git a/spss.handbook/handbook/common/LogoMoaBw.jpg b/spss/handbook/handbook/common/LogoMoaBw.jpg
index 5a31e3e15..5a31e3e15 100644
--- a/spss.handbook/handbook/common/LogoMoaBw.jpg
+++ b/spss/handbook/handbook/common/LogoMoaBw.jpg
diff --git a/spss.handbook/handbook/common/MOA.css b/spss/handbook/handbook/common/MOA.css
index 81e0a3f8d..81e0a3f8d 100644
--- a/spss.handbook/handbook/common/MOA.css
+++ b/spss/handbook/handbook/common/MOA.css
diff --git a/spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd b/spss/handbook/handbook/config/MOA-SPSS-config-1.3.xsd
index 1521b4f1b..1521b4f1b 100644
--- a/spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd
+++ b/spss/handbook/handbook/config/MOA-SPSS-config-1.3.xsd
diff --git a/spss.handbook/handbook/config/config.html b/spss/handbook/handbook/config/config.html
index f1097e55a..f1097e55a 100644
--- a/spss.handbook/handbook/config/config.html
+++ b/spss/handbook/handbook/config/config.html
diff --git a/spss.handbook/handbook/faq/faq.html b/spss/handbook/handbook/faq/faq.html
index 74f26e70a..74f26e70a 100644
--- a/spss.handbook/handbook/faq/faq.html
+++ b/spss/handbook/handbook/faq/faq.html
diff --git a/spss.handbook/handbook/index.html b/spss/handbook/handbook/index.html
index 4fa5728f6..4fa5728f6 100644
--- a/spss.handbook/handbook/index.html
+++ b/spss/handbook/handbook/index.html
diff --git a/spss.handbook/handbook/install/install.html b/spss/handbook/handbook/install/install.html
index eb287ee8a..eb287ee8a 100644
--- a/spss.handbook/handbook/install/install.html
+++ b/spss/handbook/handbook/install/install.html
diff --git a/spss.handbook/handbook/intro/intro.html b/spss/handbook/handbook/intro/intro.html
index 8b1bc381f..8b1bc381f 100644
--- a/spss.handbook/handbook/intro/intro.html
+++ b/spss/handbook/handbook/intro/intro.html
diff --git a/spss.handbook/handbook/spec/MOA-SPSS-1.3.pdf b/spss/handbook/handbook/spec/MOA-SPSS-1.3.pdf
index 6709a4081..6709a4081 100644
--- a/spss.handbook/handbook/spec/MOA-SPSS-1.3.pdf
+++ b/spss/handbook/handbook/spec/MOA-SPSS-1.3.pdf
diff --git a/spss.handbook/handbook/spec/MOA-SPSS-1.3.wsdl b/spss/handbook/handbook/spec/MOA-SPSS-1.3.wsdl
index cc7aec4dc..cc7aec4dc 100644
--- a/spss.handbook/handbook/spec/MOA-SPSS-1.3.wsdl
+++ b/spss/handbook/handbook/spec/MOA-SPSS-1.3.wsdl
diff --git a/spss.handbook/handbook/spec/MOA-SPSS-1.3.xsd b/spss/handbook/handbook/spec/MOA-SPSS-1.3.xsd
index 9c40d8153..9c40d8153 100644
--- a/spss.handbook/handbook/spec/MOA-SPSS-1.3.xsd
+++ b/spss/handbook/handbook/spec/MOA-SPSS-1.3.xsd
diff --git a/spss.handbook/handbook/usage/usage.html b/spss/handbook/handbook/usage/usage.html
index 69e21d5f0..69e21d5f0 100644
--- a/spss.handbook/handbook/usage/usage.html
+++ b/spss/handbook/handbook/usage/usage.html
diff --git a/spss.server/data/deploy/tomcat/server.mod_jk.xml b/spss/server/serverlib/resources/data/deploy/tomcat/server.mod_jk.xml
index e6035b8be..e6035b8be 100644
--- a/spss.server/data/deploy/tomcat/server.mod_jk.xml
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/server.mod_jk.xml
diff --git a/spss.server/data/deploy/tomcat/server.xml b/spss/server/serverlib/resources/data/deploy/tomcat/server.xml
index 3e5966ca9..3e5966ca9 100644
--- a/spss.server/data/deploy/tomcat/server.xml
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/server.xml
diff --git a/spss.server/data/deploy/tomcat/unix/moa-env.sh b/spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh
index 49d6723a3..49d6723a3 100644
--- a/spss.server/data/deploy/tomcat/unix/moa-env.sh
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh
diff --git a/spss.server/data/deploy/tomcat/uriworkermap.properties b/spss/server/serverlib/resources/data/deploy/tomcat/uriworkermap.properties
index 673acf65d..673acf65d 100644
--- a/spss.server/data/deploy/tomcat/uriworkermap.properties
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/uriworkermap.properties
diff --git a/spss.server/data/deploy/tomcat/win32/startTomcat.bat b/spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat
index b7d740d12..b7d740d12 100644
--- a/spss.server/data/deploy/tomcat/win32/startTomcat.bat
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat
diff --git a/spss.server/data/deploy/tomcat/win32/stopTomcat.bat b/spss/server/serverlib/resources/data/deploy/tomcat/win32/stopTomcat.bat
index 09dd83f2d..09dd83f2d 100644
--- a/spss.server/data/deploy/tomcat/win32/stopTomcat.bat
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/win32/stopTomcat.bat
diff --git a/spss.server/data/deploy/tomcat/workers.properties b/spss/server/serverlib/resources/data/deploy/tomcat/workers.properties
index 9350ddc77..9350ddc77 100644
--- a/spss.server/data/deploy/tomcat/workers.properties
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/workers.properties
diff --git a/spss.server/data/deploy/tools/certtool.bat b/spss/server/serverlib/resources/data/deploy/tools/certtool.bat
index 0504211b8..0504211b8 100644
--- a/spss.server/data/deploy/tools/certtool.bat
+++ b/spss/server/serverlib/resources/data/deploy/tools/certtool.bat
diff --git a/spss.server/data/deploy/tools/certtool.sh b/spss/server/serverlib/resources/data/deploy/tools/certtool.sh
index c7ff374f4..c7ff374f4 100644
--- a/spss.server/data/deploy/tools/certtool.sh
+++ b/spss/server/serverlib/resources/data/deploy/tools/certtool.sh
diff --git a/spss.server/data/deploy/tools/configtool.bat b/spss/server/serverlib/resources/data/deploy/tools/configtool.bat
index 868df11f0..868df11f0 100644
--- a/spss.server/data/deploy/tools/configtool.bat
+++ b/spss/server/serverlib/resources/data/deploy/tools/configtool.bat
diff --git a/spss.server/data/deploy/tools/configtool.sh b/spss/server/serverlib/resources/data/deploy/tools/configtool.sh
index f7f29bae1..f7f29bae1 100644
--- a/spss.server/data/deploy/tools/configtool.sh
+++ b/spss/server/serverlib/resources/data/deploy/tools/configtool.sh
diff --git a/spss.server/licenses/Apache-2.0.txt b/spss/server/serverlib/resources/licenses/Apache-2.0.txt
index 57bc88a15..57bc88a15 100644
--- a/spss.server/licenses/Apache-2.0.txt
+++ b/spss/server/serverlib/resources/licenses/Apache-2.0.txt
diff --git a/spss.server/licenses/IAIK-License.txt b/spss/server/serverlib/resources/licenses/IAIK-License.txt
index c0db63b22..c0db63b22 100644
--- a/spss.server/licenses/IAIK-License.txt
+++ b/spss/server/serverlib/resources/licenses/IAIK-License.txt
diff --git a/spss.server/licenses/Jaxen.txt b/spss/server/serverlib/resources/licenses/Jaxen.txt
index bef65a520..bef65a520 100644
--- a/spss.server/licenses/Jaxen.txt
+++ b/spss/server/serverlib/resources/licenses/Jaxen.txt
diff --git a/spss.server/licenses/PostgreSQL-JDBC.txt b/spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt
index 30d54d778..30d54d778 100644
--- a/spss.server/licenses/PostgreSQL-JDBC.txt
+++ b/spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/MOAApplicationException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAApplicationException.java
index 0d7abd1d3..0d7abd1d3 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/MOAApplicationException.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAApplicationException.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/MOAException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java
index f9eb12d63..f9eb12d63 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/MOAException.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/MOARuntimeException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java
index 0ff175b50..0ff175b50 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/MOARuntimeException.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOARuntimeException.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/MOASystemException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOASystemException.java
index 5a49b6852..5a49b6852 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/MOASystemException.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOASystemException.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/Configurator.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
index a0efa8924..a0efa8924 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/Configurator.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
index e306127b3..e306127b3 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureCreationService.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureCreationService.java
index a84ca2a83..a84ca2a83 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureCreationService.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureCreationService.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java
index d0fcb029a..d0fcb029a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContent.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/CMSContent.java
index b4ecb3937..b4ecb3937 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContent.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/CMSContent.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentExcplicit.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentExcplicit.java
index 58c2b0259..58c2b0259 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentExcplicit.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentExcplicit.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentReference.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentReference.java
index 7c4e6d913..7c4e6d913 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentReference.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentReference.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSDataObject.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/CMSDataObject.java
index 37f6fd396..37f6fd396 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSDataObject.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/CMSDataObject.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java
index 6d1f389af..6d1f389af 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponse.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponse.java
index 5f2e6d255..5f2e6d255 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponse.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponse.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java
index 49ddb9419..49ddb9419 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Base64Transform.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/Base64Transform.java
index 94785727d..94785727d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Base64Transform.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/Base64Transform.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java
index 352461e52..352461e52 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/CheckResult.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/CheckResult.java
index 974483d82..974483d82 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/CheckResult.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/CheckResult.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/Content.java
index 0777c3d65..0777c3d65 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/Content.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentBinary.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentBinary.java
index 664afa406..664afa406 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentBinary.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentBinary.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java
index f640f2b92..f640f2b92 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentReference.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentReference.java
index c10f0c2f8..c10f0c2f8 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentReference.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentReference.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentXML.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentXML.java
index ad5930452..ad5930452 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentXML.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ContentXML.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ElementSelector.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ElementSelector.java
index 862cb84da..862cb84da 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ElementSelector.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ElementSelector.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/EnvelopedSignatureTransform.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/EnvelopedSignatureTransform.java
index f951e35c0..f951e35c0 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/EnvelopedSignatureTransform.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/EnvelopedSignatureTransform.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java
index 369270259..369270259 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/InputData.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/InputData.java
index fd2b69c6d..fd2b69c6d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/InputData.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/InputData.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/MetaInfo.java
index 56a1793af..56a1793af 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/MetaInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/SignerInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/SignerInfo.java
index c3b4aaadc..c3b4aaadc 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/SignerInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/SignerInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Transform.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/Transform.java
index 49a4e7c35..49a4e7c35 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Transform.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/Transform.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/X509IssuerSerial.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/X509IssuerSerial.java
index d2ea88968..d2ea88968 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/X509IssuerSerial.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/X509IssuerSerial.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java
index e1e034222..e1e034222 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathFilter.java
index 247776ce0..247776ce0 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathFilter.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter2Transform.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathFilter2Transform.java
index 335d37dbf..335d37dbf 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter2Transform.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathFilter2Transform.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathTransform.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathTransform.java
index f1cc1a2bc..f1cc1a2bc 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathTransform.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathTransform.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XSLTTransform.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XSLTTransform.java
index 7f44bb060..7f44bb060 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XSLTTransform.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/common/XSLTTransform.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/Base64TransformImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/Base64TransformImpl.java
index 4af075da2..4af075da2 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/Base64TransformImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/Base64TransformImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentExplicitImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSContentExplicitImpl.java
index dd700cf21..dd700cf21 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentExplicitImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSContentExplicitImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentReferenceImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSContentReferenceImpl.java
index f9c080a0d..f9c080a0d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentReferenceImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSContentReferenceImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java
index 6eec4e847..6eec4e847 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CanonicalizationTransformImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CanonicalizationTransformImpl.java
index cf446d1b4..cf446d1b4 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CanonicalizationTransformImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CanonicalizationTransformImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CheckResultImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CheckResultImpl.java
index 2acb12e51..2acb12e51 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CheckResultImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CheckResultImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java
index bbed6bf8b..bbed6bf8b 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentImpl.java
index 7f331d2cd..7f331d2cd 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java
index 902f7bd72..902f7bd72 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentReferenceImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentReferenceImpl.java
index 50609aa0e..50609aa0e 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentReferenceImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentReferenceImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentXMLImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentXMLImpl.java
index c03f5edde..c03f5edde 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentXMLImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentXMLImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java
index 22e4cd61d..22e4cd61d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileIDImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileIDImpl.java
index 1c7dc6439..1c7dc6439 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileIDImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileIDImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureInfoImpl.java
index 097af7fff..097af7fff 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureLocationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureLocationImpl.java
index c0b36f505..c0b36f505 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureLocationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureLocationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoImpl.java
index ff4108248..ff4108248 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileExplicitImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileExplicitImpl.java
index 508b6c083..508b6c083 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileExplicitImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileExplicitImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileIDImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileIDImpl.java
index 5cd1fcc48..5cd1fcc48 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileIDImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileIDImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java
index 08f94cc31..08f94cc31 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureResponseImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureResponseImpl.java
index 590258e30..590258e30 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureResponseImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureResponseImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/DataObjectInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/DataObjectInfoImpl.java
index 8ab2241de..8ab2241de 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/DataObjectInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/DataObjectInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ElementSelectorImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ElementSelectorImpl.java
index e460bd584..e460bd584 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ElementSelectorImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ElementSelectorImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/EnvelopedSignatureTransformImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/EnvelopedSignatureTransformImpl.java
index a1be3d86a..a1be3d86a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/EnvelopedSignatureTransformImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/EnvelopedSignatureTransformImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ErrorResponseImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ErrorResponseImpl.java
index d7047ab44..d7047ab44 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ErrorResponseImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ErrorResponseImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ExclusiveCanonicalizationTransformImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ExclusiveCanonicalizationTransformImpl.java
index bf21c8634..bf21c8634 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ExclusiveCanonicalizationTransformImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ExclusiveCanonicalizationTransformImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataBinaryImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/InputDataBinaryImpl.java
index 42d61559e..42d61559e 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataBinaryImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/InputDataBinaryImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataXMLImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/InputDataXMLImpl.java
index 029a402f5..029a402f5 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataXMLImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/InputDataXMLImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultImpl.java
index 9174e3a46..9174e3a46 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultInfoImpl.java
index 0071a14f3..0071a14f3 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java
index 93aceb033..93aceb033 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferenceInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ReferenceInfoImpl.java
index 923a4bce1..923a4bce1 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferenceInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ReferenceInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultImpl.java
index 6bb4d30ac..6bb4d30ac 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultInfoImpl.java
index a21b417ae..a21b417ae 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
index bf15bf37e..bf15bf37e 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureEnvironmentResponseImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SignatureEnvironmentResponseImpl.java
index 57d30ad3b..57d30ad3b 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureEnvironmentResponseImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SignatureEnvironmentResponseImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureManifestCheckParamsImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SignatureManifestCheckParamsImpl.java
index 5924f8447..5924f8447 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureManifestCheckParamsImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SignatureManifestCheckParamsImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignerInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SignerInfoImpl.java
index 277f1a008..277f1a008 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignerInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SignerInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SingleSignatureInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SingleSignatureInfoImpl.java
index b50a65c68..b50a65c68 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SingleSignatureInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SingleSignatureInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileExplicitImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SupplementProfileExplicitImpl.java
index 78723fec2..78723fec2 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileExplicitImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SupplementProfileExplicitImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileIDImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SupplementProfileIDImpl.java
index 320827fad..320827fad 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileIDImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SupplementProfileIDImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformImpl.java
index 51c7a543f..51c7a543f 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterBinaryImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformParameterBinaryImpl.java
index 2901fb1bb..2901fb1bb 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterBinaryImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformParameterBinaryImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformParameterImpl.java
index 9fe60638e..9fe60638e 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformParameterImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterURIImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformParameterURIImpl.java
index 25449504c..25449504c 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterURIImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformParameterURIImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformPatameterHashImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformPatameterHashImpl.java
index a7843e68c..a7843e68c 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformPatameterHashImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TransformPatameterHashImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
index a3c37aaef..a3c37aaef 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
index 40dc04683..40dc04683 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSinatureResponseImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSinatureResponseImpl.java
index f258380e0..f258380e0 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSinatureResponseImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSinatureResponseImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureInfoImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifySignatureInfoImpl.java
index 2653e2fd2..2653e2fd2 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureInfoImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifySignatureInfoImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureLocationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifySignatureLocationImpl.java
index 933e42987..933e42987 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureLocationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifySignatureLocationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java
index 594f9c246..594f9c246 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileExplicitImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileExplicitImpl.java
index d9a864499..d9a864499 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileExplicitImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileExplicitImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileIDImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileIDImpl.java
index fb1f10cea..fb1f10cea 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileIDImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileIDImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java
index 26d7def4c..26d7def4c 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
index 989dbfb4a..989dbfb4a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/X509IssuerSerialImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/X509IssuerSerialImpl.java
index e6d644fd9..e6d644fd9 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/X509IssuerSerialImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/X509IssuerSerialImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XMLDataObjectAssociationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XMLDataObjectAssociationImpl.java
index b603c3367..b603c3367 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XMLDataObjectAssociationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XMLDataObjectAssociationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilter2TransformImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XPathFilter2TransformImpl.java
index a96a8f161..a96a8f161 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilter2TransformImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XPathFilter2TransformImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilterImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XPathFilterImpl.java
index 72d91bc58..72d91bc58 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilterImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XPathFilterImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathTransformImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XPathTransformImpl.java
index 1c9817ecc..1c9817ecc 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathTransformImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XPathTransformImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XSLTransformImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XSLTransformImpl.java
index c6ddc0fd6..c6ddc0fd6 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XSLTransformImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/impl/XSLTransformImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java
index 319d3ac9d..319d3ac9d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java
index eec9c4882..eec9c4882 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java
index 66c08e0ab..66c08e0ab 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
index 9e8c7d0e2..9e8c7d0e2 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
index 44134a70c..44134a70c 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java
index 2d01f2a0f..2d01f2a0f 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
index 74d14b7cc..74d14b7cc 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
index 3fc8f223d..3fc8f223d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java
index e736af522..e736af522 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
index 960d9571d..960d9571d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfile.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfile.java
index 425c410ad..425c410ad 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfile.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfile.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileExplicit.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileExplicit.java
index 6aebd102b..6aebd102b 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileExplicit.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileExplicit.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileID.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileID.java
index 1c0d87adc..1c0d87adc 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileID.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileID.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureInfo.java
index 5ceae4d0a..5ceae4d0a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureLocation.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureLocation.java
index 81374ceaa..81374ceaa 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureLocation.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureLocation.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfo.java
index 94152434e..94152434e 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfile.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfile.java
index 40acfd317..40acfd317 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfile.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfile.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileExplicit.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileExplicit.java
index aeb74445f..aeb74445f 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileExplicit.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileExplicit.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileID.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileID.java
index 3631ead29..3631ead29 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileID.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileID.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureRequest.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureRequest.java
index b8157fdfb..b8157fdfb 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureRequest.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureRequest.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponse.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponse.java
index 6bf54e6a5..6bf54e6a5 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponse.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponse.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponseElement.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponseElement.java
index 2162d82fd..2162d82fd 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponseElement.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponseElement.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/DataObjectInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/DataObjectInfo.java
index 43d49c587..43d49c587 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/DataObjectInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/DataObjectInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/ErrorResponse.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/ErrorResponse.java
index 30fa4fb52..30fa4fb52 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/ErrorResponse.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/ErrorResponse.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SignatureEnvironmentResponse.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/SignatureEnvironmentResponse.java
index 449349a68..449349a68 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SignatureEnvironmentResponse.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/SignatureEnvironmentResponse.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SingleSignatureInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/SingleSignatureInfo.java
index 9c74c5157..9c74c5157 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SingleSignatureInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlsign/SingleSignatureInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResult.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResult.java
index 1984ba349..1984ba349 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResult.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResult.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResultInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResultInfo.java
index 258840162..258840162 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResultInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResultInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferenceInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ReferenceInfo.java
index 4c644583b..4c644583b 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferenceInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ReferenceInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResult.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResult.java
index 7b5488613..7b5488613 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResult.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResult.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResultInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResultInfo.java
index be21b61c2..be21b61c2 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResultInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResultInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SignatureManifestCheckParams.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/SignatureManifestCheckParams.java
index 8f0efacf3..8f0efacf3 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SignatureManifestCheckParams.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/SignatureManifestCheckParams.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfile.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfile.java
index 569e691ca..569e691ca 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfile.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfile.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileExplicit.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileExplicit.java
index 7dd37a2d1..7dd37a2d1 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileExplicit.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileExplicit.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileID.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileID.java
index 5b5083be9..5b5083be9 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileID.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileID.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameter.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameter.java
index 3e173e0cd..3e173e0cd 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameter.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameter.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterBinary.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterBinary.java
index 600227dfd..600227dfd 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterBinary.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterBinary.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterHash.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterHash.java
index ec45ea4f4..ec45ea4f4 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterHash.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterHash.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterURI.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterURI.java
index 4a6f0a58f..4a6f0a58f 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterURI.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterURI.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureInfo.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureInfo.java
index 386651c47..386651c47 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureInfo.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureInfo.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureLocation.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureLocation.java
index f05e3e889..f05e3e889 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureLocation.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureLocation.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfile.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfile.java
index 909fc58a2..909fc58a2 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfile.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfile.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileExplicit.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileExplicit.java
index ff19683da..ff19683da 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileExplicit.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileExplicit.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileID.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileID.java
index 0df3664da..0df3664da 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileID.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileID.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java
index eb71f500b..eb71f500b 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java
index 14ac71e67..14ac71e67 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/overview.htm b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/overview.htm
index 9b17bbf91..9b17bbf91 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/overview.htm
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/overview.htm
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
index bd78012ef..bd78012ef 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java
index 4c2b3aea3..4c2b3aea3 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
index 14ceb71cd..14ceb71cd 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
index 57f06326a..57f06326a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/DistributionPoint.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/DistributionPoint.java
index 5c0646449..5c0646449 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/DistributionPoint.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/DistributionPoint.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareCryptoModule.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/HardwareCryptoModule.java
index 62e8d63a6..62e8d63a6 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareCryptoModule.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/HardwareCryptoModule.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareKeyModule.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/HardwareKeyModule.java
index 622c8d110..622c8d110 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareKeyModule.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/HardwareKeyModule.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/IssuerAndSerial.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/IssuerAndSerial.java
index 0814c90d6..0814c90d6 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/IssuerAndSerial.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/IssuerAndSerial.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroup.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/KeyGroup.java
index 5fd108e1a..5fd108e1a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroup.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/KeyGroup.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroupEntry.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/KeyGroupEntry.java
index 2e39d6aa3..2e39d6aa3 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroupEntry.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/KeyGroupEntry.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyModule.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/KeyModule.java
index 412516d82..412516d82 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyModule.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/KeyModule.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/OCSPDistributionPoint.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/OCSPDistributionPoint.java
index e4509ac97..e4509ac97 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/OCSPDistributionPoint.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/OCSPDistributionPoint.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/SoftwareKeyModule.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/SoftwareKeyModule.java
index 479e98ca5..479e98ca5 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/SoftwareKeyModule.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/SoftwareKeyModule.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/TrustProfile.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/TrustProfile.java
index 929d5ce2b..929d5ce2b 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/TrustProfile.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/TrustProfile.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java
index eaee58d3f..eaee58d3f 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractKeyModuleConfigurationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/AbstractKeyModuleConfigurationImpl.java
index 713891714..713891714 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractKeyModuleConfigurationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/AbstractKeyModuleConfigurationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractObservableConfiguration.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/AbstractObservableConfiguration.java
index 88d53d6ad..88d53d6ad 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractObservableConfiguration.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/AbstractObservableConfiguration.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java
index bf56d437c..bf56d437c 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
index 71b8680c8..71b8680c8 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
index e6e084e11..e6e084e11 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImpl.java
index 7aa4cbe4b..7aa4cbe4b 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java
index d67523944..d67523944 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DirectoryCertStoreParametersImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/DirectoryCertStoreParametersImpl.java
index 2b00d6766..2b00d6766 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DirectoryCertStoreParametersImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/DirectoryCertStoreParametersImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareCryptoModuleConfigurationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/HardwareCryptoModuleConfigurationImpl.java
index 3c8f4c002..3c8f4c002 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareCryptoModuleConfigurationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/HardwareCryptoModuleConfigurationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareKeyModuleConfigurationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/HardwareKeyModuleConfigurationImpl.java
index d905588c6..d905588c6 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareKeyModuleConfigurationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/HardwareKeyModuleConfigurationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
index 2508b7946..2508b7946 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java
index 9679e8d18..9679e8d18 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java
index 1c42cc4af..1c42cc4af 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
index bccb04a09..bccb04a09 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java
index 343f096ef..343f096ef 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ValidationConfigurationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ValidationConfigurationImpl.java
index f6fbad215..f6fbad215 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ValidationConfigurationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/ValidationConfigurationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java
index 76f03ae07..76f03ae07 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/pathvalidation/ValidationProfileImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/pathvalidation/ValidationProfileImpl.java
index a4d7ea7fa..a4d7ea7fa 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/pathvalidation/ValidationProfileImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/pathvalidation/ValidationProfileImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/revocation/RevocationProfileImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/revocation/RevocationProfileImpl.java
index c8809b0d8..c8809b0d8 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/revocation/RevocationProfileImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/revocation/RevocationProfileImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java
index c49f7fe8c..c49f7fe8c 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/Base64TransformationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/Base64TransformationImpl.java
index e076fe1eb..e076fe1eb 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/Base64TransformationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/Base64TransformationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteArrayDataObjectImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/ByteArrayDataObjectImpl.java
index 921b10cb6..921b10cb6 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteArrayDataObjectImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/ByteArrayDataObjectImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteStreamDataObjectImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/ByteStreamDataObjectImpl.java
index ce400e61a..ce400e61a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteStreamDataObjectImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/ByteStreamDataObjectImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/CanonicalizationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/CanonicalizationImpl.java
index a597b214d..a597b214d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/CanonicalizationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/CanonicalizationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/DataObjectImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/DataObjectImpl.java
index 875d82613..875d82613 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/DataObjectImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/DataObjectImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/EnvelopedSignatureTransformationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/EnvelopedSignatureTransformationImpl.java
index 41a47d0a1..41a47d0a1 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/EnvelopedSignatureTransformationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/EnvelopedSignatureTransformationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java
index b38fbe128..b38fbe128 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/SigningTimeImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/SigningTimeImpl.java
index 19ca3dadf..19ca3dadf 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/SigningTimeImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/SigningTimeImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/TransformationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/TransformationImpl.java
index 59a414b69..59a414b69 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/TransformationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/TransformationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLDataObjectImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XMLDataObjectImpl.java
index bc31d694e..bc31d694e 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLDataObjectImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XMLDataObjectImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLNodeListDataObjectImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XMLNodeListDataObjectImpl.java
index c855a922a..c855a922a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLNodeListDataObjectImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XMLNodeListDataObjectImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLSignatureImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XMLSignatureImpl.java
index 4fca907f3..4fca907f3 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLSignatureImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XMLSignatureImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2FilterImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2FilterImpl.java
index 034d4b653..034d4b653 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2FilterImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2FilterImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2TransformationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2TransformationImpl.java
index c7496c2cd..c7496c2cd 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2TransformationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2TransformationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPathTransformationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XPathTransformationImpl.java
index ccedbadb2..ccedbadb2 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPathTransformationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XPathTransformationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
index d38da650b..d38da650b 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/DataObjectTreatmentImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/DataObjectTreatmentImpl.java
index a14b83b7d..a14b83b7d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/DataObjectTreatmentImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/DataObjectTreatmentImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java
index fb3ff4931..fb3ff4931 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureInsertionLocationImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureInsertionLocationImpl.java
index d55f61303..d55f61303 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureInsertionLocationImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureInsertionLocationImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlverify/XMLSignatureVerificationProfileImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlverify/XMLSignatureVerificationProfileImpl.java
index 216596dc3..216596dc3 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlverify/XMLSignatureVerificationProfileImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xmlverify/XMLSignatureVerificationProfileImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
index caf17db66..caf17db66 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
index 4871ac4fe..4871ac4fe 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
index f7a322d11..f7a322d11 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java
index 442921850..442921850 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CreateXMLSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CreateXMLSignatureResponseBuilder.java
index 6302cadfd..6302cadfd 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CreateXMLSignatureResponseBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CreateXMLSignatureResponseBuilder.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
index 1386d5c2d..1386d5c2d 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ExternalURIResolver.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ExternalURIResolver.java
index 106742067..106742067 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ExternalURIResolver.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ExternalURIResolver.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java
index 60f573e5a..60f573e5a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java
index 0c3b45539..0c3b45539 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ProfileMapper.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ProfileMapper.java
index 158a3ddb5..158a3ddb5 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ProfileMapper.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ProfileMapper.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java
index 11f05a2f1..11f05a2f1 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureCreationServiceImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/SignatureCreationServiceImpl.java
index dc5ceb21e..dc5ceb21e 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureCreationServiceImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/SignatureCreationServiceImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureVerificationServiceImpl.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/SignatureVerificationServiceImpl.java
index 94cdea5d9..94cdea5d9 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureVerificationServiceImpl.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/SignatureVerificationServiceImpl.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/TransformationFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/TransformationFactory.java
index 9984a95a5..9984a95a5 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/TransformationFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/TransformationFactory.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
index 55e2e1505..55e2e1505 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
index d6f58a560..d6f58a560 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java
index fd207ddea..fd207ddea 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
index 7ac971da8..7ac971da8 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
index 4642593eb..4642593eb 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationProfileFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationProfileFactory.java
index 5df13a337..5df13a337 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationProfileFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationProfileFactory.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLog.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
index 068fab5ca..068fab5ca 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
index a0e4def86..a0e4def86 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java
index 75fb388a9..75fb388a9 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/TransactionId.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/logging/TransactionId.java
index 9e0239464..9e0239464 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/TransactionId.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/logging/TransactionId.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
index befbd58dd..befbd58dd 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
index 7783ed3f6..7783ed3f6 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java
index 26d79dbd8..26d79dbd8 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
index 4224f5665..4224f5665 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
index 2d548ea3a..2d548ea3a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
index b335a6e23..b335a6e23 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/tools/CertTool.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
index 9fe17eae2..9fe17eae2 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/tools/CertTool.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
index d5c3b48c1..d5c3b48c1 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
index 774880d26..774880d26 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContextManager.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContextManager.java
index 13127c3ae..13127c3ae 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContextManager.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContextManager.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionIDGenerator.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionIDGenerator.java
index 6eb07defe..6eb07defe 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionIDGenerator.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionIDGenerator.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/util/IdGenerator.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/util/IdGenerator.java
index 2dfd22140..2dfd22140 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/util/IdGenerator.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/util/IdGenerator.java
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/util/MessageProvider.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/util/MessageProvider.java
index a6f6c1d4a..a6f6c1d4a 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/util/MessageProvider.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/util/MessageProvider.java
diff --git a/spss.server/res/resources/properties/spss_messages_de.properties b/spss/server/serverlib/src/main/resources/properties/spss_messages_de.properties
index febcf01a9..febcf01a9 100644
--- a/spss.server/res/resources/properties/spss_messages_de.properties
+++ b/spss/server/serverlib/src/main/resources/properties/spss_messages_de.properties
diff --git a/spss.server/res/resources/security/cacerts b/spss/server/serverlib/src/main/resources/security/cacerts
index 6eeaba418..6eeaba418 100644
--- a/spss.server/res/resources/security/cacerts
+++ b/spss/server/serverlib/src/main/resources/security/cacerts
diff --git a/spss.server/res/resources/wsdl/MOA-SPSS-1.3.wsdl b/spss/server/serverlib/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl
index c5cd8fc0f..c5cd8fc0f 100644
--- a/spss.server/res/resources/wsdl/MOA-SPSS-1.3.wsdl
+++ b/spss/server/serverlib/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl
diff --git a/common/res/resources/schemas/MOA-SPSS-1.3.xsd b/spss/server/serverlib/src/main/resources/wsdl/MOA-SPSS-1.3.xsd
index 756b51279..756b51279 100644
--- a/common/res/resources/schemas/MOA-SPSS-1.3.xsd
+++ b/spss/server/serverlib/src/main/resources/wsdl/MOA-SPSS-1.3.xsd
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/AllTests.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/AllTests.java
index c670b5e55..c670b5e55 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/AllTests.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/AllTests.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/SPSSTestCase.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
index a585e30a0..a585e30a0 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java
index 28f79729e..28f79729e 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java
index 7ce705b01..7ce705b01 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java
index f580f86bc..f580f86bc 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
index 4be7667eb..4be7667eb 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
index 3b8e8b00e..3b8e8b00e 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/AllTests.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/config/AllTests.java
index 131f38c19..131f38c19 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/AllTests.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/config/AllTests.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
index 474a387ad..474a387ad 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
index adf02809b..adf02809b 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
index 7da2165cb..7da2165cb 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
index be1090e4a..be1090e4a 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java
index 3b403dc19..3b403dc19 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java
index 65fa2bf72..65fa2bf72 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
index 3024730f4..3024730f4 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
index 7de2add33..7de2add33 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
index 13a80cbf1..13a80cbf1 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
index 28cd3805a..28cd3805a 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
index 56e3d541b..56e3d541b 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
index b46c20086..b46c20086 100644
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
+++ b/spss/server/serverlib/src/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
diff --git a/spss.server/spec/MOA-SPSS-1.3.doc b/spss/server/serverws/spec/MOA-SPSS-1.3.doc
index fabc4248e..fabc4248e 100644
--- a/spss.server/spec/MOA-SPSS-1.3.doc
+++ b/spss/server/serverws/spec/MOA-SPSS-1.3.doc
diff --git a/spss.server/server-config.wsdd b/spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd
index 088fe76fd..088fe76fd 100644
--- a/spss.server/server-config.wsdd
+++ b/spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd
diff --git a/spss.server/web.xml b/spss/server/serverws/src/main/webapp/WEB-INF/web.xml
index b68ee850e..b68ee850e 100644
--- a/spss.server/web.xml
+++ b/spss/server/serverws/src/main/webapp/WEB-INF/web.xml
diff --git a/spss.server/res/resources/tools/ConfigurationMapper.xsl b/spss/server/serverws/tools/ConfigurationMapper.xsl
index fd47cbf84..fd47cbf84 100644
--- a/spss.server/res/resources/tools/ConfigurationMapper.xsl
+++ b/spss/server/serverws/tools/ConfigurationMapper.xsl