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

69 files changed, 0 insertions, 8102 deletions

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-ID-Configuration-1.2.xsd b/common/res/resources/schemas/MOA-ID-Configuration-1.2.xsd
deleted file mode 100644
index 4b018db64..000000000
--- a/common/res/resources/schemas/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/common/res/resources/schemas/MOA-ID-Configuration-1.3.xsd b/common/res/resources/schemas/MOA-ID-Configuration-1.3.xsd
deleted file mode 100644
index 66c6e1832..000000000
--- a/common/res/resources/schemas/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/common/res/resources/schemas/MOA-ID-Configuration-1.4.xsd b/common/res/resources/schemas/MOA-ID-Configuration-1.4.xsd
deleted file mode 100644
index 66a9c0ed4..000000000
--- a/common/res/resources/schemas/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/common/res/resources/schemas/MOA-SPSS-1.3.xsd b/common/res/resources/schemas/MOA-SPSS-1.3.xsd
deleted file mode 100644
index 756b51279..000000000
--- a/common/res/resources/schemas/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/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/cs-sstc-schema-assertion-01.xsd b/common/res/resources/schemas/cs-sstc-schema-assertion-01.xsd
deleted file mode 100644
index 8bc5af147..000000000
--- a/common/res/resources/schemas/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/common/res/resources/schemas/cs-sstc-schema-protocol-01.xsd b/common/res/resources/schemas/cs-sstc-schema-protocol-01.xsd
deleted file mode 100644
index ecad05b0f..000000000
--- a/common/res/resources/schemas/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/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/common/src/test/at/gv/egovernment/moa/AllTests.java b/common/src/test/at/gv/egovernment/moa/AllTests.java
deleted file mode 100644
index 00e2c505f..000000000
--- a/common/src/test/at/gv/egovernment/moa/AllTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package test.at.gv.egovernment.moa;
-
-import test.at.gv.egovernment.moa.util.DOMUtilsTest;
-import test.at.gv.egovernment.moa.util.DateTimeUtilsTest;
-import test.at.gv.egovernment.moa.util.KeyStoreUtilsTest;
-import test.at.gv.egovernment.moa.util.SSLUtilsTest;
-import test.at.gv.egovernment.moa.util.XPathUtilsTest;
-
-import junit.awtui.TestRunner;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author patrick
- * @version $Id$
- */
-public class AllTests {
-
-  public static Test suite() {
-    TestSuite suite = new TestSuite();
-    
-    suite.addTestSuite(DOMUtilsTest.class);
-    suite.addTestSuite(DateTimeUtilsTest.class);
-    suite.addTestSuite(XPathUtilsTest.class);
-    suite.addTestSuite(KeyStoreUtilsTest.class);
-    suite.addTestSuite(SSLUtilsTest.class);
-
-    return suite;
-  }
-
-  public static void main(String[] args) {
-    try {
-      TestRunner.run(AllTests.class);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-}
diff --git a/common/src/test/at/gv/egovernment/moa/MOATestCase.java b/common/src/test/at/gv/egovernment/moa/MOATestCase.java
deleted file mode 100644
index 86ea2ee6c..000000000
--- a/common/src/test/at/gv/egovernment/moa/MOATestCase.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package test.at.gv.egovernment.moa;
-
-import java.io.FileInputStream;
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-
-import org.xml.sax.InputSource;
-
-import junit.framework.TestCase;
-
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * Base class for MOA test cases.
- * 
- * Provides some utility functions.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class MOATestCase extends TestCase {
-
-  protected static final String TESTDATA_ROOT = "data/test/";
-
-  /**
-   * Constructor for MOATestCase.
-   * @param arg0
-   */
-  public MOATestCase(String name) {
-    super(name);
-  }
-
-  /**
-   * Parse an XML file non-validating.
-   */
-  public static Document parseXml(String fileName) throws Exception {
-    return DOMUtils.parseDocument(
-      new FileInputStream(fileName),
-      false,
-      null,
-      null);
-  }
-
-  /**
-   * Parse an XML validating with a given file name.
-   * 
-   * Uses the local schema resources.
-   */
-  public static Document parseXmlValidating(String fileName) throws Exception {
-    return DOMUtils.parseDocument(
-      new FileInputStream(fileName),
-      true,
-      Constants.ALL_SCHEMA_LOCATIONS,
-      null);
-  }
-
-  /**
-   * Parse an XML from a String.
-   */
-  public static Document parseXmlString(String xml) throws Exception {
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-    DocumentBuilder builder;
-    
-    factory.setNamespaceAware(true);
-    builder = factory.newDocumentBuilder();
-
-    return builder.parse(new InputSource(new StringReader(xml)));
-  }
-
-}
diff --git a/common/src/test/at/gv/egovernment/moa/util/DOMUtilsTest.java b/common/src/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
deleted file mode 100644
index eb3ad1a5c..000000000
--- a/common/src/test/at/gv/egovernment/moa/util/DOMUtilsTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package test.at.gv.egovernment.moa.util;
-import java.io.FileInputStream;
-import java.util.Map;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import test.at.gv.egovernment.moa.*;
-
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * @author Patrick Peck
- * @version $Id$
- */
-public class DOMUtilsTest extends MOATestCase {
-  private static final String TESTDATA_BASE = TESTDATA_ROOT + "xml/";
-  private static boolean grammarsInitialized = false;
-
-  /**
-   * Constructor for DOMUtilsTest.
-   * @param name
-   */
-  public DOMUtilsTest(String name) {
-    super(name);
-  }
-
-  protected void setUp() throws Exception {
-    if (!grammarsInitialized) {
-      // preparse XML schema
-      DOMUtils.addSchemaToPool(
-        getClass().getResourceAsStream(Constants.XML_SCHEMA_LOCATION),
-        Constants.XML_NS_URI);
-      // preparse XMLDsig Filter2 schema
-      DOMUtils.addSchemaToPool(
-        getClass().getResourceAsStream(Constants.DSIG_FILTER2_SCHEMA_LOCATION),
-        Constants.DSIG_FILTER2_NS_URI);
-      // preparse XMLDsig schema
-      DOMUtils.addSchemaToPool(
-        getClass().getResourceAsStream(Constants.DSIG_SCHEMA_LOCATION),
-        Constants.DSIG_NS_URI);
-      // preparse MOA schema
-      DOMUtils.addSchemaToPool(
-        getClass().getResourceAsStream(Constants.MOA_SCHEMA_LOCATION),
-        Constants.MOA_NS_URI);
-      grammarsInitialized = true;
-    }
-  }
-
-  private Document parse(String fileName) throws Exception {
-    return DOMUtils.parseDocument(
-      new FileInputStream(fileName),
-      true,
-      Constants.ALL_SCHEMA_LOCATIONS,
-      null);
-  }
-
-  public void testParseCreateXMLSignature() throws Exception {
-    parse(TESTDATA_BASE + "CreateXMLSignature/TestGeneratorCX2.005.Req.xml");
-    parse(TESTDATA_BASE + "CreateXMLSignature/Req000.xml");
-    parse(TESTDATA_BASE + "CreateXMLSignature/Req001.xml");
-    parse(TESTDATA_BASE + "CreateXMLSignature/Req002.xml");
-    parse(TESTDATA_BASE + "CreateXMLSignature/Req004.xml");
-  }
-
-  public void testParseVerifyCMSSignature() throws Exception {
-    parse(TESTDATA_BASE + "VerifyCMSSignature/Req000.xml");
-  }
-
-  public void testParseVerifyXMLSignature() throws Exception {
-    parse(TESTDATA_BASE + "VerifyXMLSignature/Req000.xml");
-    parse(TESTDATA_BASE + "VerifyXMLSignature/Req001.xml");
-    parse(TESTDATA_BASE + "VerifyXMLSignature/Req002.xml");
-    parse(TESTDATA_BASE + "VerifyXMLSignature/TestGeneratorVX.002.Req.xml");
-    //parse(TESTDATA_BASE + "VerifyXMLSignature/TestGeneratorVX.006.Req.xml");
-    parse(TESTDATA_BASE + "VerifyXMLSignature/VerifySAMLRequest.xml");
-  }
-  
-  public void testParseInfobox() throws Exception {
-    parse(TESTDATA_BASE + "Infobox/InfoboxReadResponseMOA4.xml");
-    parse(TESTDATA_BASE + "Infobox/InfoboxReadResponse.xml");  
-  }
- 
-
-  private Document parsePlain(String fileName) throws Exception {
-    return DOMUtils.parseDocument(
-      new FileInputStream(fileName),
-      false,
-      null,
-      null);
-  }
-
-  public void testValidateCreateXMLSignature() throws Exception {
-    Document doc;
-    boolean valid;
-
-    // test a valid request
-    doc = parsePlain(TESTDATA_BASE + "CreateXMLSignature/Req000.xml");
-    valid =
-      DOMUtils.validateElement(
-        doc.getDocumentElement(),
-        Constants.ALL_SCHEMA_LOCATIONS,
-        null);
-    assertTrue(valid);
-
-    // test an invalid request
-    doc = parsePlain(TESTDATA_BASE + "CreateXMLSignature/invalid.xml");
-    try {
-      valid =
-        DOMUtils.validateElement(
-          doc.getDocumentElement(),
-          Constants.ALL_SCHEMA_LOCATIONS,
-          null);
-      fail();
-    } catch (Exception e) {
-    }
-  }
-
-  public void testGetNamespaceDeclarations() throws Exception {
-    Document doc;
-    NodeList nl;
-    Element elem;
-    Map nsDecls;
-
-    doc = parse(TESTDATA_BASE + "VerifyXMLSignature/Req002.xml");
-    nl = doc.getElementsByTagNameNS(Constants.DSIG_NS_URI, "Reference");
-    elem = (Element) nl.item(0);
-    nsDecls = DOMUtils.getNamespaceDeclarations(elem);
-
-    assertEquals(2, nsDecls.size());
-    assertEquals(Constants.DSIG_NS_URI, nsDecls.get("dsig"));
-    assertEquals(Constants.MOA_NS_URI, nsDecls.get(""));
-  }
-
-}
diff --git a/common/src/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java b/common/src/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
deleted file mode 100644
index da6b29b1c..000000000
--- a/common/src/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package test.at.gv.egovernment.moa.util;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-
-import junit.framework.TestCase;
-
-import at.gv.egovernment.moa.util.DateTimeUtils;
-
-/**
- * @author Patrick Peck
- * @version $Id$
- */
-public class DateTimeUtilsTest extends TestCase {
-
-  /**
-   * Constructor for DateTimeUtilsTest.
-   * @param arg0
-   */
-  public DateTimeUtilsTest(String arg0) {
-    super(arg0);
-  }
-
-  public void testParseDateTimeValid() throws Exception {
-    Date date;
-    DateFormat format = SimpleDateFormat.getDateTimeInstance();
-    String dateStr;
-    
-    format.setTimeZone(TimeZone.getTimeZone("GMT"));    
-    date = DateTimeUtils.parseDateTime("+1971-12-12T06:30:15");
-    date.setTime(date.getTime() + TimeZone.getDefault().getRawOffset());
-    dateStr = format.format(date);
-    assertEquals("12.12.1971 06:30:15", dateStr);
-    
-    date = DateTimeUtils.parseDateTime("2000-01-01T23:59:59.012Z");
-    dateStr = format.format(date);
-    assertEquals("01.01.2000 23:59:59", dateStr);
-    
-    date = DateTimeUtils.parseDateTime("2003-05-20T12:17:30-05:00");
-    dateStr = format.format(date);
-    assertEquals("20.05.2003 17:17:30", dateStr);
-    
-    
-    date = DateTimeUtils.parseDateTime("2002-02-02T02:02:02.33+04:30");
-    dateStr = format.format(date);
-    assertEquals("01.02.2002 21:32:02", dateStr);
-  }
-  
-  public void testParseDateTimeInvalid() {
-    try {    
-      DateTimeUtils.parseDateTime("+1971-12-12T6:30:15");
-      fail();
-    } catch (ParseException e) {
-    }
-    
-    try {    
-      DateTimeUtils.parseDateTime("2000-01-0123:59:59.999999Z");
-      fail();
-    } catch (ParseException e) {
-    }
-    
-    try {    
-      DateTimeUtils.parseDateTime("2003-05-20T12:17:3005:00");
-      fail();
-    } catch (ParseException e) {
-    }
-    
-    try {    
-      DateTimeUtils.parseDateTime(" 2002-02-02T02:02:02.33+04:00");
-      fail();
-    } catch (ParseException e) {
-    }
-
-  }
-  
-  public void testBuildDateTimeGMTMinus3() {
-  	String should = "2002-01-01T01:01:01-03:00";
-  	doTestBuildDateTime(2002, 1, 1, 1, 1, 1, "GMT-03:00", should);
-  }
-  public void testBuildDateTimeMEZSommerzeit() {
-  	String should = "2002-07-31T23:59:59+02:00";
-  	doTestBuildDateTime(2002, 7, 31, 23, 59, 59, "GMT+01:00", should);
-  }
-  public void testBuildDateTimeGMT() {
-  	String should = "2002-01-01T01:01:01";
-  	doTestBuildDateTime(2002, 1, 1, 1, 1, 1, "GMT+00:00", should);
-  }
-  private void doTestBuildDateTime(
-  	int year, int month, int day, 
-  	int hour, int min, int sec, 
-  	String timeZone, String dateTimeShould) {
-  		
-  	Calendar cal = new GregorianCalendar(TimeZone.getTimeZone(timeZone));
-  	cal.set(year,month, day, hour, min, sec);
-  	cal.set(Calendar.MILLISECOND, 0);
-  	String dateTimeBuilt = DateTimeUtils.buildDateTime(cal);
-  	assertEquals(dateTimeShould, dateTimeBuilt);
-  }
-
-}
diff --git a/common/src/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java b/common/src/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
deleted file mode 100644
index a6d1847ce..000000000
--- a/common/src/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package test.at.gv.egovernment.moa.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.KeyStore;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.util.Enumeration;
-
-import at.gv.egovernment.moa.util.KeyStoreUtils;
-
-import junit.framework.TestCase;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class KeyStoreUtilsTest extends TestCase {
-	private String tmpDir = "tmp/KeyStoreUtilsTest";
-	private String tmpDirURL = "file:" + tmpDir;
-
-  public KeyStoreUtilsTest(String arg0) {
-    super(arg0);
-  }
-  
-  protected void setUp() throws Exception {
-    Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
-    new File(tmpDir).mkdirs();
-  }
-  protected void tearDown() throws Exception {
-  	new File(tmpDir).delete();
-  }
-  public void testCreateKeyStoreJKS() throws Exception {
-  	String[] certFilenames = new String[] {
-  		"data/test/security/server-certs/baltimore.cer"
-  	};
-  	KeyStore ks = KeyStoreUtils.createKeyStore("jks", certFilenames);
-  	assertEquals(1, ks.size());
-  	X509Certificate cert = (X509Certificate)ks.getCertificate("0");
-  	assertEquals(3424, cert.getSerialNumber().intValue());
-  }
-  public void testCreateKeyStorePKCS12() throws Exception {
-  	String[] certFilenames = new String[] {
-  		"data/test/security/server-certs/baltimore.cer"
-  	};
-  	KeyStore ks = KeyStoreUtils.createKeyStore("pkcs12", certFilenames);
-  	assertEquals(1, ks.size());
-  	X509Certificate cert = (X509Certificate)ks.getCertificate("0");
-  	assertEquals(3424, cert.getSerialNumber().intValue());
-  }
-  public void testCreateKeyStoreFromCertificateDirectory() throws Exception {
-    // copy certificate files to a temporary directory, 
-    // omitting the "CVS" directory in the source directory
-  	copyCertificates("data/test/security/server-certs", tmpDir);
-  	KeyStore ks = KeyStoreUtils.createKeyStoreFromCertificateDirectory("jks", tmpDirURL);
-  	assertEquals(2, ks.size());
-  	X509Certificate cert0 = (X509Certificate)ks.getCertificate("0");
-  	X509Certificate cert1 = (X509Certificate)ks.getCertificate("1");
-  	assertTrue(3424 == cert0.getSerialNumber().intValue() || 3424 == cert1.getSerialNumber().intValue());
-  }
-  private void copyCertificates(String from, String to) throws IOException {
-		String[] fromList = new File(from).list();
-		for (int i = 0; i < fromList.length; i++) {
-      File fromFile = new File(from + File.separator + fromList[i]);
-      if (fromFile.isFile()) {
-      	String toFile = to + "/" + fromList[i];
-      	FileInputStream in = new FileInputStream(fromFile);
-      	FileOutputStream out = new FileOutputStream(toFile);
-      	for (int ch = in.read(); ch >= 0; ch = in.read())
-      		out.write(ch);
-      	out.close();
-      	in.close();
-      }
-    }
-    
-  }
-  public void testLoadKeyStore() throws Exception {
-  	String keyStoreURL = "file:data/test/security/client-certs/sicher-demo(buergerkarte).p12";
-  	KeyStore ks = KeyStoreUtils.loadKeyStore("pkcs12", keyStoreURL, "buergerkarte");
-  	assertEquals(1, ks.size());
-  	Enumeration aliases = ks.aliases();
-  	String alias = (String)aliases.nextElement();
-  	X509Certificate cert = (X509Certificate)ks.getCertificate(alias);
-  	assertEquals(new BigInteger("1044289238331").intValue(), cert.getSerialNumber().intValue());
-  }
-
-}
diff --git a/common/src/test/at/gv/egovernment/moa/util/SSLUtilsTest.java b/common/src/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
deleted file mode 100644
index 7e55cb7d0..000000000
--- a/common/src/test/at/gv/egovernment/moa/util/SSLUtilsTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package test.at.gv.egovernment.moa.util;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.security.KeyStore;
-import java.security.Security;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocketFactory;
-
-import com.sun.net.ssl.HostnameVerifier;
-import com.sun.net.ssl.HttpsURLConnection;
-
-import at.gv.egovernment.moa.util.KeyStoreUtils;
-import at.gv.egovernment.moa.util.SSLUtils;
-
-import junit.framework.TestCase;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SSLUtilsTest extends TestCase {
-
-  public SSLUtilsTest(String arg0) {
-    super(arg0);
-  }
-
-	
-  protected void setUp() throws Exception {
-    //System.setProperty("javax.net.debug", "all");
-    Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
-    System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
-    System.setProperty("https.cipherSuites", "SSL_DHE_DSS_WITH_DES_CBC_SHA,SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA,SSL_RSA_WITH_DES_CBC_SHA,SSL_RSA_WITH_3DES_EDE_CBC_SHA,SSL_RSA_EXPORT_WITH_RC4_40_MD5");
-  }
-
-	public void testGetSSLSocketFactoryBaltimoreOK() throws Exception {
-		doTestGetSSLSocketFactory(
-			"GET",
-			"https://www.baltimore.com/",
-			false,
-			"file:data/test/security/cacerts+gt_cybertrust_root",
-			"changeit",
-			true);
-	}
-	public void testGetSSLSocketFactoryBaltimoreNOK() throws Exception {
-		doTestGetSSLSocketFactory(
-			"GET",
-			"https://www.baltimore.com/",
-			false,
-			"file:data/test/security/cacerts",
-			"changeit", 
-			false);
-	}
-	public void testGetSSLSocketFactoryVerisignOK() throws Exception {
-		doTestGetSSLSocketFactory(
-			"GET",
-			"https://www.verisign.com/",
-			false,
-			"file:data/test/security/cacerts",
-			"changeit",
-			true);
-	}
-	public void testGetSSLSocketFactoryVerisignNoTruststoreOK() throws Exception {
-		doTestGetSSLSocketFactory(
-			"GET",
-			"https://www.verisign.com/",
-			false,
-			null,
-			null,
-			true);
-	}
-	public void testGetSSLSocketFactoryLocalhostOK() throws Exception {
-		String urlString = "https://localhost:8443/moa-id-auth/index.jsp";
-		doTestGetSSLSocketFactory(
-			"GET",
-			urlString,
-			true,
-			"file:data/test/security/server.keystore.tomcat",
-			"changeit",
-			true);
-	}
-	public void testGetSSLSocketFactoryLocalhostNOK() throws Exception {
-		String urlString = "https://localhost:8443/moa-id-auth/index.jsp";
-		doTestGetSSLSocketFactory(
-			"GET",
-			urlString,
-			true,
-			null,
-			null,
-			false);
-	}
-		
-	public void doTestGetSSLSocketFactory(
-		String requestMethod,
-		String urlString, 
-		boolean useHostnameVerifierHack,
-		String truststoreurl,
-		String trustpassword,
-		boolean shouldOk
-		) throws Exception {
-
-		doTestGetSSLSocketFactory(
-			requestMethod, urlString, useHostnameVerifierHack, truststoreurl, trustpassword, null, null, null, shouldOk);
-		}
-	public void doTestGetSSLSocketFactory(
-		String requestMethod,
-		String urlString, 
-		boolean useHostnameVerifierHack,
-		String truststoreurl,
-		String trustpassword,
-		String keystoretype,
-		String keystoreurl,
-		String keypassword,
-		boolean shouldOk
-		) throws Exception {
-
-		KeyStore truststore = null;
-		if (truststoreurl != null)
-			truststore = KeyStoreUtils.loadKeyStore("jks", truststoreurl, trustpassword);
-		SSLSocketFactory sf = SSLUtils.getSSLSocketFactory(
-			truststore, keystoretype, keystoreurl, keypassword);
-		System.out.println(requestMethod + " " + urlString);
-
-		URL url = new URL(urlString);
-		HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
-		conn.setRequestMethod(requestMethod);
-		conn.setDoInput(true);
-		conn.setDoOutput(true);
-		conn.setUseCaches(false);
-		conn.setAllowUserInteraction(false);		
-  	conn.setSSLSocketFactory(sf);
-  	if (useHostnameVerifierHack)
-  		conn.setHostnameVerifier(new HostnameVerifierHack());
-  	try {
-			conn.connect();
-			assertTrue(shouldOk);
-			assertEquals(200, conn.getResponseCode());
-			conn.disconnect();
-  	}
-  	catch (SSLException ex) {
-  		assertFalse(shouldOk);
-  	}
-	}
-	private byte[] readTruststore(String filename) throws IOException {
-		if (filename == null)
-			return null;
-		FileInputStream in = new FileInputStream(filename);
-		byte[] buffer = new byte[in.available()];
-		in.read(buffer);
-		in.close();
-		return buffer;
-	}
-  private class HostnameVerifierHack implements HostnameVerifier {
-    public boolean verify(String arg0, String arg1) {
-      return true;
-    }
-	}
-}
diff --git a/common/src/test/at/gv/egovernment/moa/util/URLDecoderTest.java b/common/src/test/at/gv/egovernment/moa/util/URLDecoderTest.java
deleted file mode 100644
index b6ea0e152..000000000
--- a/common/src/test/at/gv/egovernment/moa/util/URLDecoderTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package test.at.gv.egovernment.moa.util;
-
-import java.net.URLEncoder;
-
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.URLDecoder;
-
-import junit.framework.TestCase;
-
-/*
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class URLDecoderTest extends TestCase {
-
-  public void test() throws Exception {
-    String s = "immerZUA0129<>%==$$%&/()@?{()=} \\\"äöüÄÖÜ?§";
-    String senc = URLEncoder.encode(s);
-    String sdec = URLDecoder.decode(senc, "ISO-8859-1");
-    assertEquals(s, sdec);
-  }
-  public void testUTF8() throws Exception {
-    String s = new String(FileUtils.readFile("data/test/xml/CreateXMLSignature/CreateXMLSignatureResponse.xml"));
-    String senc = URLEncoder.encode(s);
-    String sdec = URLDecoder.decode(senc, "UTF-8");
-    String sutf8 = FileUtils.readFile("data/test/xml/CreateXMLSignature/CreateXMLSignatureResponse.xml", "UTF-8");
-    assertEquals(sutf8, sdec);
-  }
-}
diff --git a/common/src/test/at/gv/egovernment/moa/util/URLEncoderTest.java b/common/src/test/at/gv/egovernment/moa/util/URLEncoderTest.java
deleted file mode 100644
index 43238c51f..000000000
--- a/common/src/test/at/gv/egovernment/moa/util/URLEncoderTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package test.at.gv.egovernment.moa.util;
-
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.URLDecoder;
-import at.gv.egovernment.moa.util.URLEncoder;
-import junit.framework.TestCase;
-
-/*
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class URLEncoderTest extends TestCase {
-
-  public void testUnchangedString() throws Exception {
-    String s = "AZaz0123456789.-*_";
-    String senc = URLEncoder.encode(s, "UTF-8");
-    assertEquals(s, senc);
-  }
-  public void testAumlUTF8() throws Exception {
-    String s = "ä";
-    String senc = URLEncoder.encode(s, "UTF-8");
-    assertEquals("%C3%A4", senc);
-  }
-  public void testEncodeDecode() throws Exception {
-    String s = "AZaz09.-*_ <>%=$%&/()@?{}[]\\\"'äöüÄÖÜߧ";
-    String senc = URLEncoder.encode(s, "UTF-8");
-    String sdec = URLDecoder.decode(senc, "UTF-8");
-    assertEquals(s, sdec);
-  }
-  public void testCertInfo() throws Exception {
-    String s = new String(FileUtils.readFile("data/test/xml/VerifyXMLSignature/CertInfoVerifyXMLSignatureRequest.xml", "UTF-8"));
-    String senc = URLEncoder.encode(s, "UTF-8");
-    String sdec = URLDecoder.decode(senc, "UTF-8");
-    assertEquals(s, sdec);
-  }
-  /*public void testJDK14() throws Exception {
-    String s = new String(FileUtils.readFile("data/test/xml/VerifyXMLSignature/CertInfoVerifyXMLSignatureRequest.xml", "UTF-8"));
-    String senc = URLEncoder.encode(s, "UTF-8");
-    String senc14 = java.net.URLEncoder.encode(s, "UTF-8");
-    assertEquals(senc, senc14);
-  }*/
-
-}
diff --git a/common/src/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java b/common/src/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
deleted file mode 100644
index 7986fe540..000000000
--- a/common/src/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package test.at.gv.egovernment.moa.util;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.parsers.XMLGrammarPreparser;
-import org.apache.xerces.util.SymbolTable;
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.grammars.Grammar;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.xml.sax.InputSource;
-
-import test.at.gv.egovernment.moa.MOATestCase;
-
-import at.gv.egovernment.moa.util.Constants;
-
-
-/**
- * Experimentation with Xerces grammar caching.
- * 
- * Used the Xerces sample 'XMLGrammarBuilder' as a starting point. 
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLGrammarBuilderTest extends MOATestCase {
-
-  private static final String GRAMMAR_POOL =
-    org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX
-      + org.apache.xerces.impl.Constants.XMLGRAMMAR_POOL_PROPERTY;
-
-  protected static final String NAMESPACES_FEATURE_ID =
-    "http://xml.org/sax/features/namespaces";
-  protected static final String VALIDATION_FEATURE_ID =
-    "http://xml.org/sax/features/validation";
-  protected static final String SCHEMA_VALIDATION_FEATURE_ID =
-    "http://apache.org/xml/features/validation/schema";
-  protected static final String SCHEMA_FULL_CHECKING_FEATURE_ID =
-    "http://apache.org/xml/features/validation/schema-full-checking";
-
-  private static final int BIG_PRIME = 2039;
-  private SymbolTable symbolTable;
-  private XMLGrammarPoolImpl grammarPool;
-
-  /**
-   * Constructor for XMLGrammarBuilderTest.
-   * @param name
-   */
-  public XMLGrammarBuilderTest(String name) {
-    super(name);
-  }
-
-  protected void setUp() throws Exception {
-    XMLGrammarPreparser preparser;
-
-    // set up symbol table and grammar pool
-    symbolTable = new SymbolTable(BIG_PRIME);
-    grammarPool = new XMLGrammarPoolImpl();
-    preparser = new XMLGrammarPreparser(symbolTable);
-    preparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA, null);
-    preparser.setProperty(GRAMMAR_POOL, grammarPool);
-    preparser.setFeature(NAMESPACES_FEATURE_ID, true);
-    preparser.setFeature(VALIDATION_FEATURE_ID, true);
-    // now we can still do schema features just in case, 
-    // so long as it's our configuraiton......
-    preparser.setFeature(SCHEMA_VALIDATION_FEATURE_ID, true);
-    preparseSchemaResource(
-      preparser,
-      Constants.DSIG_SCHEMA_LOCATION,
-      "/resources/schemas/xmldsig-core-schema.xsd");
-  }
-
-  private static Grammar preparseSchemaResource(
-    XMLGrammarPreparser preparser,
-    String systemId,
-    String resource)
-    throws Exception {
-
-    InputStream is = XMLGrammarBuilderTest.class.getResourceAsStream(resource);
-    return preparser.preparseGrammar(
-      XMLGrammarDescription.XML_SCHEMA,
-      new XMLInputSource(null, systemId, null, is, null));
-  }
-
-  public void testParseValidating() throws Exception {
-    DOMParser parser = new DOMParser(symbolTable, grammarPool);
-
-    parser.setFeature(NAMESPACES_FEATURE_ID, true);
-    parser.setFeature(VALIDATION_FEATURE_ID, true);
-    parser.setFeature(SCHEMA_VALIDATION_FEATURE_ID, true);
-
-    parser.parse(
-      new InputSource(
-        new FileInputStream(TESTDATA_ROOT + "xml/dsigTransform/base64.xml")));
-    parser.getDocument();
-  }
-
-}
diff --git a/common/src/test/at/gv/egovernment/moa/util/XPathUtilsTest.java b/common/src/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
deleted file mode 100644
index 559494300..000000000
--- a/common/src/test/at/gv/egovernment/moa/util/XPathUtilsTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package test.at.gv.egovernment.moa.util;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-import test.at.gv.egovernment.moa.MOATestCase;
-
-import at.gv.egovernment.moa.util.XPathUtils;
-
-
-/**
- * @author Patrick Peck
- * @version $Id$
- */
-public class XPathUtilsTest extends MOATestCase {
-
-  private Document doc1;
-
-  /**
-   * Constructor for XPathUtilsTest.
-   * @param name
-   */
-  public XPathUtilsTest(String name) {
-    super(name);
-  }
-
-  /**
-   * @see TestCase#setUp()
-   */
-  protected void setUp() throws Exception {
-    super.setUp();
-    doc1 =
-      parseXml(TESTDATA_ROOT + "xml/VerifyXMLSignature/Req000.xml");
-  }
-
-  public void testSelectNodeList() throws Exception {
-    NodeList nodes;
-
-    nodes =
-      XPathUtils.selectNodeList(
-        doc1.getDocumentElement(),
-        doc1.getDocumentElement(),
-        "/VerifyXMLSignatureRequest");
-    assertEquals(1, nodes.getLength());
-    nodes =
-      XPathUtils.selectNodeList(
-        doc1.getDocumentElement(),
-        "//dsig:Signature");
-    assertEquals(1, nodes.getLength());
-  }
-
-}