This commit was manufactured by cvs2svn to create tag 'Build_002'.tags/Build_002

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/tags/Build_002@88 d688527b-c9ab-4aba-bd8d-4036d912da1d
author: (no author) <(no author)@d688527b-c9ab-4aba-bd8d-4036d912da1d> 2003-12-22 17:51:40 +0000
committer: (no author) <(no author)@d688527b-c9ab-4aba-bd8d-4036d912da1d> 2003-12-22 17:51:40 +0000
commit: b9e7df0cbe67b486ce3a1a2177bd08c0ced9e005 (patch)
tree: 7c3ebc612f89ce28ce75c8e7c06f92aca3ad5501 /common
parent: 296f2afedb9bef1bc71aeaa3407128094de7a523 (diff)
download: moa-id-spss-b9e7df0cbe67b486ce3a1a2177bd08c0ced9e005.tar.gz
moa-id-spss-b9e7df0cbe67b486ce3a1a2177bd08c0ced9e005.tar.bz2
moa-id-spss-b9e7df0cbe67b486ce3a1a2177bd08c0ced9e005.zip
116 files changed, 0 insertions, 9873 deletions
diff --git a/common/.checkstyle b/common/.checkstyle
deleted file mode 100644
index 4c2833e81..000000000
--- a/common/.checkstyle
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<checkstyle>
-    <file-filters>
-        <file-filter value="src/test/*"/>
-        <file-filter value="tmp/*"/>
-    </file-filters>
-</checkstyle>
diff --git a/common/.classpath b/common/.classpath
deleted file mode 100644
index ea4983052..000000000
--- a/common/.classpath
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="res"/>
-    <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
-    <classpathentry kind="lib" path="lib/commons-logging-1.0.2/commons-logging-api.jar"/>
-    <classpathentry kind="lib" path="lib/jaxen-1.0/jaxen-core.jar"/>
-    <classpathentry kind="lib" path="lib/xerces-j-2.0.2/xmlParserAPIs.jar"/>
-    <classpathentry kind="lib" path="lib/jaxp-1.2_01/dom.jar"/>
-    <classpathentry kind="lib" path="lib/xalan-j-2.2/xalan.jar"/>
-    <classpathentry kind="lib" path="lib/jaxen-1.0/jaxen-dom.jar"/>
-    <classpathentry kind="lib" path="lib/jaxp-1.2_01/jaxp-api.jar"/>
-    <classpathentry kind="lib" path="lib/jaxen-1.0/saxpath.jar"/>
-    <classpathentry kind="lib" path="lib/xerces-j-2.0.2/xercesImpl.jar"/>
-    <classpathentry kind="lib" path="lib/junit-3.8.1/junit.jar"/>
-    <classpathentry kind="lib" path="lib/iaik-jce-3.01/iaik_jce_full.jar"/>
-    <classpathentry kind="lib" path="lib/iaik-ecc/iaik_ecc.jar"/>
-    <classpathentry kind="lib" path="lib/jsse-1.0.3_01/jcert.jar"/>
-    <classpathentry kind="lib" path="lib/jsse-1.0.3_01/jnet.jar"/>
-    <classpathentry kind="lib" path="lib/jsse-1.0.3_01/jsse.jar"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/common/.cvsignore b/common/.cvsignore
deleted file mode 100644
index 7c18d5ded..000000000
--- a/common/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-tmp
diff --git a/common/.project b/common/.project
deleted file mode 100644
index 16d715d11..000000000
--- a/common/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-  <name>MOA common</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
diff --git a/common/build.xml b/common/build.xml
deleted file mode 100644
index cc9ff17f2..000000000
--- a/common/build.xml
+++ /dev/null
@@ -1,78 +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="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.0.2"/>
-  <property name="lib.xalan" value="${lib}/xalan-j-2.2"/>
-  <property name="lib.iaik-jce" value="${lib}/iaik-jce-3.01"/>
-  <property name="lib.jsse" value="${lib}/jsse-1.0.3_01"/>
-  <property name="lib.junit" value="${lib}/junit-3.8.1"/>
-  <property name="lib.commons-logging" value="${lib}/commons-logging-1.0.2"/>
-  <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">
-    <jar destfile="${env.MOA_COMMON_JAR}">
-      <fileset dir="${compile}" excludes="test/**"/>
-      <fileset dir="${res}"/>
-    </jar>
-    <jar destfile="${env.MOA_COMMON_TEST_JAR}">
-      <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>
-</project>
diff --git a/common/data/test/security/cacerts b/common/data/test/security/cacerts
deleted file mode 100644
index 6eeaba418..000000000
--- a/common/data/test/security/cacerts
+++ /dev/null
diff --git a/common/data/test/security/cacerts+gt_cybertrust_root b/common/data/test/security/cacerts+gt_cybertrust_root
deleted file mode 100644
index a639bfe44..000000000
--- a/common/data/test/security/cacerts+gt_cybertrust_root
+++ /dev/null
diff --git a/common/data/test/security/client-certs/sicher-demo(buergerkarte).p12 b/common/data/test/security/client-certs/sicher-demo(buergerkarte).p12
deleted file mode 100644
index 362b610d1..000000000
--- a/common/data/test/security/client-certs/sicher-demo(buergerkarte).p12
+++ /dev/null
diff --git a/common/data/test/security/client-certs/sicher-demo.cer b/common/data/test/security/client-certs/sicher-demo.cer
deleted file mode 100644
index 46268923a..000000000
--- a/common/data/test/security/client-certs/sicher-demo.cer
+++ /dev/null
diff --git a/common/data/test/security/client.keystore b/common/data/test/security/client.keystore
deleted file mode 100644
index 9882db636..000000000
--- a/common/data/test/security/client.keystore
+++ /dev/null
diff --git a/common/data/test/security/server-certs/baltimore.cer b/common/data/test/security/server-certs/baltimore.cer
deleted file mode 100644
index 514c65c51..000000000
--- a/common/data/test/security/server-certs/baltimore.cer
+++ /dev/null
diff --git a/common/data/test/security/server-certs/gte_cybertrust_root.cer b/common/data/test/security/server-certs/gte_cybertrust_root.cer
deleted file mode 100644
index bcbddd2f3..000000000
--- a/common/data/test/security/server-certs/gte_cybertrust_root.cer
+++ /dev/null
diff --git a/common/data/test/security/server.keystore.tomcat b/common/data/test/security/server.keystore.tomcat
deleted file mode 100644
index 37e7cf47d..000000000
--- a/common/data/test/security/server.keystore.tomcat
+++ /dev/null
diff --git a/common/data/test/xml/CreateXMLSignature/CreateXMLSignatureResponse.xml b/common/data/test/xml/CreateXMLSignature/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 5a4759b7a..000000000
--- a/common/data/test/xml/CreateXMLSignature/CreateXMLSignatureResponse.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl11:CreateXMLSignatureResponse xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#"><saml:Assertion AssertionID="any" IssueInstant="2003-04-02T14:55:27+02:00" Issuer="Hermann Muster" MajorVersion="1" MinorVersion="0" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
-	<saml:AttributeStatement>
-		<saml:Subject>
-			<saml:NameIdentifier>http://localhost:8080/moa-id-auth/</saml:NameIdentifier>
-		</saml:Subject>
-		<saml:Attribute AttributeName="Geschäftsbereich" AttributeNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#">
-			<saml:AttributeValue>gb</saml:AttributeValue>
-		</saml:Attribute>
-		<saml:Attribute AttributeName="OA" AttributeNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#">
-			<saml:AttributeValue>https://localhost:9443/</saml:AttributeValue>
-		</saml:Attribute>
-	</saml:AttributeStatement><dsig:Signature Id="HS_signature" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-data-1" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:template match="/" xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<body>
-Bitte bestätigen Sie mit Ihrer Unterschrift folgende Angaben:
-<br/>
-<table border="1">
-<tr><td><b>Name:</b></td><td><xsl:value-of select="//@Issuer"/></td></tr>
-<tr><td><b>Zeit:</b></td><td><xsl:value-of select="//@IssueInstant"/></td></tr>
-<tr><td><b>Applikation:</b></td><td><xsl:value-of select="//saml:Attribute[@AttributeName=&apos;OA&apos;]/saml:AttributeValue"/></td></tr>
-<tr><td><b>Geschäftsbereich:</b></td><td><xsl:value-of select="//saml:Attribute[@AttributeName=&apos;Geschäftsbereich&apos;]/saml:AttributeValue"/></td></tr>
-<tr><td><b>Anmeldeserver:</b></td><td><xsl:value-of select="//saml:NameIdentifier"/></td></tr>
-</table>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>us9gT0wkEOgg2KCLGT5Z4i0tW30=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#refetsi"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2"><xf2:XPath Filter="intersect" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" xmlns:xf2="http://www.w3.org/2002/06/xmldsig-filter2">id(&apos;refetsi&apos;)/etsi:QualifyingProperties/etsi:SignedProperties</xf2:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>c/r6XEssLoHZerXUdQQUKvZ/aVY=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>fCl9QrTFBxygAnRFEJZU/mHuKNgQip50IrjBJKI79+L2XBR1W0M41akciraauQ0n
-FkIJPL4wnoupoXeWrpt7ycp9xMHVdZUNYXiPStHhi0ElhFppPjaN6Mn+1W25ofy0
-YRapLXeDdGIxe5wSgTTBhAWbJAgusQ8bQY9vZnyW8TU=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIFJTCCBA2gAwIBAgICGTcwDQYJKoZIhvcNAQEFBQAwgaExCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIzAhBgNVBAsTGmEtc2lnbi1URVNU
-LVByZW1pdW0tRW5jLTAxMSMwIQYDVQQDExphLXNpZ24tVEVTVC1QcmVtaXVtLUVu
-Yy0wMTAeFw0wMzAyMTAxMzIwNThaFw0wNjAyMTAxMzIwNThaMGoxCzAJBgNVBAYT
-AkFUMRwwGgYDVQQDExNUZXN0cGVyc29uIE1PQTQgQlJaMQwwCgYDVQQEEwNCUlox
-GDAWBgNVBCoTD1Rlc3RwZXJzb24gTU9BNDEVMBMGA1UEBRMMNzkwMTg3NDYxNjMz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDS/UW1/tZeCh7HHQmj8auUTEc4
-edAgRDkUVKOm0tF3kE3WZlhGDZL0p84xsdIKyI+bwDCMATATkQwDo/Xxn9jJMi4/
-t80bNyRsHk9giA0wcvz9NgmEcDwKNqawGsR9gNeK8TyIC8AuDkj1EwtkAObMvtp/
-Z1phi47x3JxDDfGDpQIDAQABo4ICHzCCAhswEwYDVR0jBAwwCoAIS7OAw3GTPNgw
-JwYIKwYBBQUHAQMBAf8EGDAWMAgGBgQAjkYBATAKBggrBgEFBQcLATCBggYIKwYB
-BQUHAQEEdjB0MCkGCCsGAQUFBzABhh1odHRwOi8vd3d3LmEtdHJ1c3QuYXQ6ODIv
-b2NzcDBHBggrBgEFBQcwAoY7aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Et
-c2lnbi1URVNULVByZW1pdW0tU2lnLTAxYS5jcnQwgZQGA1UdIASBjDCBiTB9BgYq
-KAARAQQwczA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3Mv
-Y3AvYS1zaWduLVRFU1QwOgYIKwYBBQUHAgIwLhosRGllc2VzIFplcnRpZmlrYXQg
-ZGllbnQgbnVyIHp1IFRlc3R6d2Vja2VuICEwCAYGBACLMAEBMG8GA1UdHwRoMGYw
-ZKBioGCGXmxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLVRFU1QtUHJl
-bWl1bS1FbmMtMDEsbz1BLVRydXN0LGM9QVQ/Y2VydGlmaWNhdGVyZXZvY2F0aW9u
-bGlzdD8wEQYDVR0OBAoECE4DxL9ky4M+MA4GA1UdDwEB/wQEAwIGwDAgBgNVHREE
-GTAXgRV0ZXN0cGVyc29uNEBicnouZ3YuYXQwCQYDVR0TBAIwADANBgkqhkiG9w0B
-AQUFAAOCAQEAioVvsZN+NnQxXMTGdjKveTBMRTYzHflkSC8lI9XXltP5+mjIuoB2
-Tn6voovA8dXz9jTsnQt8f8ye0CL2bSS9UVD1jv8So3bavquW+HlkZBAZvL39APNL
-PjUUnWn0QOnrQAJ6W47UwGAUgEw3KcBcJaEa4Xb/8kUj618xGzWl6X0mKsVpxkrf
-+5Cj+nmwDqChll08/90MmhSY4M5FrvmQ9GjAN5FHVsk0FPp02tKCRzoBJtzpB1DW
-KHlgiDHUAXy5eD0XI7PXebPNZ4InvY/jC/IH8PRLdJT249YQmUxZ4neTtFDvb8C1
-Qh6k725fh3hVxqX8ZwwWj9+iGQVk53K3CA==</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="refetsi"><etsi:QualifyingProperties Target="#HS_signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-04-02T12:55:33Z</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>Frhu1o4mL4gQHdJcU0xSA/h4COE=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=a-sign-TEST-Premium-Enc-01,OU=a-sign-TEST-Premium-Enc-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>6455</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-data-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature>
-</saml:Assertion></sl11:CreateXMLSignatureResponse>
-\ No newline at end of file
diff --git a/common/data/test/xml/CreateXMLSignature/Req000.xml b/common/data/test/xml/CreateXMLSignature/Req000.xml
deleted file mode 100644
index ea250dab6..000000000
--- a/common/data/test/xml/CreateXMLSignature/Req000.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" 
-	xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xml="http://www.w3.org/XML/1998/namespace">
-	<KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="detached" ChildOfManifest="false">
-			<DataObject>
-				<XMLContent><Data>my xml data</Data></XMLContent>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<FinalDataMetaInfo>
-						<MimeType>text/plain</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-\ No newline at end of file
diff --git a/common/data/test/xml/CreateXMLSignature/Req001.xml b/common/data/test/xml/CreateXMLSignature/Req001.xml
deleted file mode 100644
index bc8f976a0..000000000
--- a/common/data/test/xml/CreateXMLSignature/Req001.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Stephan Grill (Anecon) -->
-<!-- Req001 shows a Req000 request extended with additional transformation information;
-it must return a valid signature -->
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<KeyIdentifier>validKeyIdentifier(RSAinPKCS12)</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<!-- @todo wozu braucht man SingleSignatureInfo/@CreateSignatureManifest wenn in DataObjectInfo/@ChildOfManifest angegeben wird ob das Datenobjekt in das Manifest kommt oder nicht ? -->
-		<DataObjectInfo Structure="detached" ChildOfManifest="false">
-			<DataObject>
-				<XMLContent>testdaten</XMLContent>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<dsig:Transforms>
-						<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116 ">
-							<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-								<!--@todo HR the actual stylesheet-->
-							</xsl:stylesheet>
-						</dsig:Transform>
-					</dsig:Transforms>
-					<FinalDataMetaInfo>
-						<MimeType>text/xml</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-<!--the following modifications (individually and in combination) must return a valid signature
-* empty dsig:Transform element
-* Transform/@Algorithm = "http://www.w3.org/TR/1999/REC-xpath-19991116"
-* Transform/@Algorithm = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
-* Transform/@Algorithm = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
-* Transform/@Algorithm = "http://www.w3.org/2001/10/xml-exc-c14n#"
-* Transform/@Algorithm = "http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
-* Transform/@Algorithm = "http://www.w3.org/2000/09/xmldsig#enveloped-signature"
-* 2 dsig:Transform elements
-* Description: URI that resolves
-* a Supplement/Content/XMLContent is available where Supplement/Content/@Reference is referenced from the content of dsig: Transform
-* a Supplement/Content/XMLContent is available in a different DataObjectInfo where Supplement/Content/@Reference is referenced from the 
-content of dsig: Transform
-* 2 Supplement elements
-* CreateTransformsInfoID: validID
-Total: 14 Testcases-->
-<!--each of the following modifications (individually) must return an error code
-* Transform/@Algorithm = "...xslt..." and Transform contains an XPath element
-* Transform/@Algorithm = "...xpath..." and Transform contains an XSLT
-* Description: URI that does not resolve
-* an URI of a Transform parameter does not resolve and no Supplement object is available
-* CreateTransformsInfoID: invalidID
-Total: 5 Testcases-->
diff --git a/common/data/test/xml/CreateXMLSignature/Req002.xml b/common/data/test/xml/CreateXMLSignature/Req002.xml
deleted file mode 100644
index 1fb5ea72d..000000000
--- a/common/data/test/xml/CreateXMLSignature/Req002.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Stephan Grill (Anecon) -->
-<!--Req002 shows a Req000 request extended with CreateSignatureInfo data;
-it must return a valid signature-->
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<KeyIdentifier>validKeyIdentifier(RSAinPKCS12)</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<!-- @todo wozu braucht man SingleSignatureInfo/@CreateSignatureManifest wenn in DataObjectInfo/@ChildOfManifest angegeben wird ob das Datenobjekt in das Manifest kommt oder nicht ? -->
-		<DataObjectInfo Structure="detached" ChildOfManifest="false">
-			<DataObject>
-				<XMLContent>testdaten</XMLContent>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<FinalDataMetaInfo>
-						<MimeType>text/xml</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-		<CreateSignatureInfo>
-				<CreateSignatureEnvironment>
-					<XMLContent>
-						<Envelop>daten</Envelop>
-					</XMLContent>
-				</CreateSignatureEnvironment>
-				<CreateSignatureEnvironmentProfile>
-					<CreateSignatureLocation Index="0">/Envelop</CreateSignatureLocation>
-				</CreateSignatureEnvironmentProfile>
-		</CreateSignatureInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-
-<!--the following modifications (individually and in combination) must return a valid signature
-* CreateSignatureEnvironment/@Reference = "validURI"
-* CreateSignatureEnvironment/Base64Content: validBase64Data
-* CreateSignatureInfo/Supplement/Content: valid @Reference and valid (XMLContent|Base64Content)
-* 2 Supplement
-* CreateSignatureEnvironmentProfileID: "validID"
-Total: 5 Testcases-->
-<!--each of the following modifications (individually) must return an error code
-* CreateSignatureEnvironment/XMLContent: invalidXMLData
-* CreateSignatureEnvironment/Base64Content: invalidBase64Data
-* no CreateSignatureEnvironment/@Reference and no CreateSignatureEnvironment/(Base64Content|XMLContent)
-* SignatureLocation: invalidXPathExpression
-* CreateSignatureInfo/Supplement/Content: valid @Reference and invalid (XMLContent|Base64Content)
-* CreateSignatureEnvironmentProfileID: "invalidID"
-Total: 6 Testcases-->
diff --git a/common/data/test/xml/CreateXMLSignature/Req004.xml b/common/data/test/xml/CreateXMLSignature/Req004.xml
deleted file mode 100644
index dfc9c11fe..000000000
--- a/common/data/test/xml/CreateXMLSignature/Req004.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<KeyIdentifier>pkcs12rsakey1</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="detached" ChildOfManifest="false">
-			<DataObject Reference="file:/C:/eclipse/workspace/TestDatenGenerator/resources/BookData.xsl">
-				<XMLContent>
-					<data:book xmlns:data="http://uri.data.org" data:hardback="yes">
-						<data:title>Gesundheitliche Auswirkungen elektronischer Signaturen</data:title>
-						<data:first-name>Ellipse</data:first-name>
-						<data:last-name>Kurvenreich</data:last-name>
-						<data:birth-date>1951-04-16</data:birth-date>
-						<data:birth-location>Hinterm Berg</data:birth-location>
-						<data:register-number>6-930-21512-12</data:register-number>
-					</data:book>
-				</XMLContent>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<dsig:Transforms>
-						<dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2">
-							<xp2:XPath Filter="subtract" xmlns:xp2="http://www.w3.org/2002/06/xmldsig-filter2">/data:book/data:first-name</xp2:XPath>
-						</dsig:Transform>
-					</dsig:Transforms>
-					<FinalDataMetaInfo>
-						<MimeType>text/html</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-				<!-- insert supp -->
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-		<!-- insert data2 -->
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.001.Req.xml b/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.001.Req.xml
deleted file mode 100644
index f32a6e4e1..000000000
--- a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.001.Req.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><CreateXMLSignatureRequest
-   xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
-   xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xml="http://www.w3.org/XML/1998/namespace">
-   <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="detached" ChildOfManifest="false">
-			<DataObject Reference="http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt"/>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<FinalDataMetaInfo>
-						<MimeType>text/plain</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-\ No newline at end of file
diff --git a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.007.Req.xml b/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.007.Req.xml
deleted file mode 100644
index ad98c02fb..000000000
--- a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.007.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><CreateXMLSignatureRequest
-   xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
-   xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-   <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="detached" ChildOfManifest="false">
-			<DataObject Reference="file:/C:/eclipse/workspace/TestDatenGenerator/testDatenFalsch.txt">
-				<XMLContent>Dies sind Testdaten</XMLContent>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<FinalDataMetaInfo>
-						<MimeType>text/plain</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-\ No newline at end of file
diff --git a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.008.Req.xml b/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.008.Req.xml
deleted file mode 100644
index ace117fd9..000000000
--- a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.008.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><CreateXMLSignatureRequest
-   xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
-   xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-   <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="detached" ChildOfManifest="false">
-			<DataObject Reference="file:/d:/patrick/projects/moa/TestDatenGenerator/testDatenFalsch.txt">
-				<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<FinalDataMetaInfo>
-						<MimeType>text/plain</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-\ No newline at end of file
diff --git a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.010.Req.xml b/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.010.Req.xml
deleted file mode 100644
index 120f76ee0..000000000
--- a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.010.Req.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest
-   xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xml="http://www.w3.org/XML/1998/namespace"
-   xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-   <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="enveloping" ChildOfManifest="false">
-			<DataObject>
-				<XMLContent><Testdaten>Dies sind Testdaten</Testdaten></XMLContent>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<FinalDataMetaInfo>
-						<MimeType>text/plain</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-\ No newline at end of file
diff --git a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX2.005.Req.xml b/common/data/test/xml/CreateXMLSignature/TestGeneratorCX2.005.Req.xml
deleted file mode 100644
index f12a6f587..000000000
--- a/common/data/test/xml/CreateXMLSignature/TestGeneratorCX2.005.Req.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><KeyIdentifier>PKCS12RSAKey1</KeyIdentifier><SingleSignatureInfo SecurityLayerConformity="false"><DataObjectInfo Structure="detached" ChildOfManifest="false"><DataObject Reference="#document"></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment><XMLContent xml:space="preserve"><data:Document attr="document" xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://uri.data.org http://tollesSchema.org">Dies sind Testdaten</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><Supplement><Content Reference="http://tollesSchema.org"><XMLContent xml:space="preserve"><xsd:schema targetNamespace="data" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://uri.data.org" elementFormDefault="qualified" attributeFormDefault="unqualified" id="tollesSchema"><xsd:element name="Document"><xsd:complexType><xsd:sequence maxOccurs="unbounded"><xsd:any namespace="##any" processContents="lax"/></xsd:sequence><xsd:attribute name="attr" type="xsd:ID" use="required"/></xsd:complexType></xsd:element></xsd:schema></XMLContent></Content></Supplement></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest>
-\ No newline at end of file
diff --git a/common/data/test/xml/CreateXMLSignature/invalid.xml b/common/data/test/xml/CreateXMLSignature/invalid.xml
deleted file mode 100644
index ea635b943..000000000
--- a/common/data/test/xml/CreateXMLSignature/invalid.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" 
-	xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<KeyIdentifier>validKeyIdentifier(RSAinPKCS12)</KeyIdentifier>
-	<invalid>some invalid element</invalid>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="detached" ChildOfManifest="false">
-			<DataObject>
-				<XMLContent>testdaten</XMLContent>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<FinalDataMetaInfo>
-						<MimeType>text/plain</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-\ No newline at end of file
diff --git a/common/data/test/xml/Infobox/InfoboxReadResponse.xml b/common/data/test/xml/Infobox/InfoboxReadResponse.xml
deleted file mode 100644
index a35b7f209..000000000
--- a/common/data/test/xml/Infobox/InfoboxReadResponse.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<sl10:InfoboxReadResponse xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#"><sl10:BinaryFileData><sl10:XMLContent><saml:Assertion AssertionID="zmr.bmi.gv.at-AssertionID-2003-02-12T20:28:34.474" IssueInstant="2003-02-12T20:28:34.474" Issuer="http://zmr.bmi.gv.at/zmra/names#Issuer" MajorVersion="1" MinorVersion="0" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <saml:AttributeStatement>
-    <saml:Subject>
-      <saml:SubjectConfirmation>
-        <saml:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:sender-vouches</saml:ConfirmationMethod>
-        <saml:SubjectConfirmationData>
-          <pr:Person xsi:type="pr:PhysicalPersonType">
-            <pr:Identification>
-              <pr:Value>123456789012</pr:Value>
-              <pr:Type>http://reference.e-government.gv.at/names/persondata/20020228#zmr-zahl</pr:Type>
-            </pr:Identification>
-            <pr:Name>
-              <pr:GivenName>Hermann</pr:GivenName>
-              <pr:FamilyName primary="undefined">Muster</pr:FamilyName>
-            </pr:Name>
-            <pr:DateOfBirth>1968-10-22</pr:DateOfBirth>
-          </pr:Person>
-        </saml:SubjectConfirmationData>
-      </saml:SubjectConfirmation>
-    </saml:Subject>
-    <saml:Attribute AttributeName="CitizenPublicKey" AttributeNamespace="http://www.buergerkarte.at/namespaces/personenbindung/20020506#">
-      <saml:AttributeValue>
-        <dsig:RSAKeyValue xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-          <dsig:Modulus>0v1Ftf7WXgoexx0Jo/GrlExHOHnQIEQ5FFSjptLRd5BN1mZYRg2S9KfOMbHSCsiPm8AwjAEwE5EM
-A6P18Z/YyTIuP7fNGzckbB5PYIgNMHL8/TYJhHA8CjamsBrEfYDXivE8iAvALg5I9RMLZADmzL7a
-f2daYYuO8dycQw3xg6U=</dsig:Modulus>
-          <dsig:Exponent>AQAB</dsig:Exponent>
-        </dsig:RSAKeyValue>
-      </saml:AttributeValue>
-    </saml:Attribute>
-    <saml:Attribute AttributeName="CitizenPublicKey" AttributeNamespace="http://www.buergerkarte.at/namespaces/personenbindung/20020506#">
-      <saml:AttributeValue>
-        <dsig:RSAKeyValue xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-          <dsig:Modulus>i2qa56X4fpYeXqFLXAcQljGU3+DWnVgNrAxI9gn2bMeFWtLXE2SFa6qvl9EymUl0noBlFn0q9DWp
-AsyeLnRhzCAXJeSxiwsUEloOvcQCV0DfW2UVq0Y9bVlJ8KifJ2AS+5BxZ21mkc/VYx5Qz6EYjPrn
-pIpdAwR9sw5xnIvTySc=</dsig:Modulus>
-          <dsig:Exponent>AQAB</dsig:Exponent>
-        </dsig:RSAKeyValue>
-      </saml:AttributeValue>
-    </saml:Attribute></saml:AttributeStatement>
-<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>not(ancestor-or-self::pr:Identification)</dsig:XPath></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>s7TfoZrYo36OMdlxGxuIfAw/wr8=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>ancestor-or-self::dsig:Manifest</dsig:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>dO+RSn4xLHT3cuq8uopFtZyUBqo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>MFbZ5wA5cq0UezYFDXted5uqXubWFxxRwZawGh73XEAGxAbJsT/IEQmrTQThPRHNWW5RPGxVlPDz
-5BmjberdaWlgJlbyKf3b/WpNNJYptQ7ijrXlsQoCzjfiQy37NEfvHEcxHQOA6sa42C+dFKsKIvmP
-3mZkRYWJDxxsVzI7E+Y=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIDaDCCAtWgAwIBAgIBADAJBgUrDgMCHQUAMIGOMQswCQYDVQQGEwJBVDE9MDsG
-A1UEChQ0QnVuZGVzbWluaXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5n
-IHVuZCBTcG9ydDEjMCEGA1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMx
-GzAZBgNVBAMTEk1PQSBUZXN0IENBIC0gUm9vdDAeFw0wMzAyMTExNTE5NDRaFw0w
-MzEyMzEyMjU5MzBaMIGOMQswCQYDVQQGEwJBVDE9MDsGA1UEChQ0QnVuZGVzbWlu
-aXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5nIHVuZCBTcG9ydDEjMCEG
-A1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMxGzAZBgNVBAMTEk1PQSBU
-ZXN0IENBIC0gUm9vdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAjHuFphE3
-+UkTe2OcIFWUDLzhPl1j2dH4sMPAhDK09/0i+aWrdtQW9yHktu/7+LTiCiPeevT0
-lGMGDcWMSoSm66tYmpxei6YojCFIaVdJFtXZ7x1o7e7jTDVRLMfdZ5lI1sQ7loIY
-hOE0OmlYOkn4AI6xMtJtsca45rV8wW7qm8kCAwEAAaOB2zCB2DAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjBdBgNVHSAEVjBUMFIGDCsGAQQBlRIBAnsB
-ATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0IGlzdCBudXIgZvxy
-IFRlc3R6d2Vja2UgZ2VlaWduZXQuMB0GA1UdDgQWBBRDC612dCgZetTmAKyV6DII
-NkOoYTAWBgcqKAAKAQEBBAsMCUJNT0xTLUlLVDAfBgNVHSMEGDAWgBRDC612dCgZ
-etTmAKyV6DIINkOoYTAJBgUrDgMCHQUAA4GBAHj0xBNWGYLijaocjOX1AkL+r+G2
-fZsX4z3S/2eEvtUp+EUHaOPMLTS0MIP1nwj5f4ZluAIrDLXihqMdi4xRv0W6QYbN
-aDxICNz3/QbrzMlFPeC8odesdRlT+GGswX0ZGUtVIZm1HVhxRk5ZEW2pr2afo5c0
-Btxup/kgjGMnnS7C</dsig:X509Certificate><dsig:X509Certificate>MIIDiTCCAvagAwIBAgIBADAJBgUrDgMCHQUAMIGOMQswCQYDVQQGEwJBVDE9MDsG
-A1UEChQ0QnVuZGVzbWluaXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5n
-IHVuZCBTcG9ydDEjMCEGA1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMx
-GzAZBgNVBAMTEk1PQSBUZXN0IENBIC0gUm9vdDAeFw0wMzAyMTExNTI1MTRaFw0w
-MzEyMzEyMjU5MzBaMIGZMQswCQYDVQQGEwJBVDE9MDsGA1UEChQ0QnVuZGVzbWlu
-aXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5nIHVuZCBTcG9ydDEjMCEG
-A1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMxJjAkBgNVBAMTHU1PQSBU
-ZXN0IENBIC0gU2lnbmF0dXJkaWVuc3RlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCw7ULOYSNji09Ein7Ar4j3Rjxjq05spBmZDmbSomEZMnGEtVTyIRzKc8ia
-2kcXUMz5MEoFaVmvqRim31m20T21uvHFIs86gqzC/prOAz7V7HWok5F+9M/5gR1S
-BvpdqiEAXYeRXFPiOe8XSmpwhic7+n2jfuoBeYiRBEMGoP1DkwIDAQABo4HxMIHu
-MBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgHGMBEGCWCGSAGG+EIB
-AQQEAwIBAjBdBgNVHSAEVjBUMFIGDCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwIC
-MDQaMkRpZXNlcyBaZXJ0aWZpa2F0IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2Vl
-aWduZXQuMB0GA1UdDgQWBBSeRWvUfxEjKZSfxImJr/fpBDtMmTAWBgcqKAAKAQEB
-BAsMCUJNT0xTLUlLVDAfBgNVHSMEGDAWgBRDC612dCgZetTmAKyV6DIINkOoYTAJ
-BgUrDgMCHQUAA4GBAIMa4C2z3SbkcjEiMNAsHKaKUCJkBbMtNaab6U/cwwYmG6nl
-ga7xyEmbfY2SKzOqkcIwuv83Tma3rcr1f+OLUeGUaGLHt2Pl1a/s8BZGQZHWvLXv
-7hV4RceEUHzVGAfvDD8iBJqBmfq/z/fBPFsgSup4nO1YECkDYfQ+sqCIP4ik</dsig:X509Certificate><dsig:X509Certificate>MIIDZzCCAtSgAwIBAgIBADAJBgUrDgMCHQUAMIGZMQswCQYDVQQGEwJBVDE9MDsG
-A1UEChQ0QnVuZGVzbWluaXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5n
-IHVuZCBTcG9ydDEjMCEGA1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMx
-JjAkBgNVBAMTHU1PQSBUZXN0IENBIC0gU2lnbmF0dXJkaWVuc3RlMB4XDTAzMDIx
-MTE1MzI0NVoXDTAzMDgxMTE0MzI0NVowgYUxCzAJBgNVBAYTAkFUMSYwJAYDVQQK
-FB1CdW5kZXNtaW5pc3Rlcml1bSBm/HIgSW5uZXJlczEgMB4GA1UECxMXWmVudHJh
-bGVzIE1lbGRlcmVnaXN0ZXIxLDAqBgNVBAMTI1Rlc3QgU2lnbmF0dXJkaWVuc3Qg
-UGVyc29uZW5iaW5kdW5nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEzkpk
-QjbGjZwssN1+vMBE/ALMcA8LWFcILI3uxXaTSWGfTiLo9ECfzjuwYJG7FjEaeWrW
-nPEcp4VfMNocrm3T7Hw/ikpE5/+FsfTzD4MpIwwUPd/CUfA5vDNXK5CiP7qKKR1e
-vATO2s6lfDul+CS/eEbwzKmUQvZGrJggxg2m5wIDAQABo4HYMIHVMAwGA1UdEwEB
-/wQCMAAwDgYDVR0PAQH/BAQDAgbAMF0GA1UdIARWMFQwUgYMKwYBBAGVEgECAwEB
-MEIwQAYIKwYBBQUHAgIwNBoyRGllc2VzIFplcnRpZmlrYXQgaXN0IG51ciBm/HIg
-VGVzdHp3ZWNrZSBnZWVpZ25ldC4wHQYDVR0OBBYEFIpEyv43H3EtiGr4I7Z34bWj
-v2z6MBYGByooAAoBAQEECwwJQk1PTFMtSUtUMB8GA1UdIwQYMBaAFJ5Fa9R/ESMp
-lJ/EiYmv9+kEO0yZMAkGBSsOAwIdBQADgYEAfMBJRy/kp8HQa0lGIBfFrWNpxVPv
-RsIu+N4IiFrswrsoQoMAh6IqNyzSdq7rJC08xsDkXe5HOwkb+2zGKYoC3aQ/J/zr
-BGkg6ec4tOaS/VSdEQeTL1L30r2faTffWLUV3GrzL7pM7jN470hB1w8F6Hc3LCI7
-kFfp23o/juVtJNw=</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>BqzfCB7dNg4G3u4YaxpD1tALdKI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></saml:Assertion></sl10:XMLContent></sl10:BinaryFileData></sl10:InfoboxReadResponse>
-\ No newline at end of file
diff --git a/common/data/test/xml/Infobox/InfoboxReadResponseMOA4.xml b/common/data/test/xml/Infobox/InfoboxReadResponseMOA4.xml
deleted file mode 100644
index 8d7b5afde..000000000
--- a/common/data/test/xml/Infobox/InfoboxReadResponseMOA4.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<sl10:InfoboxReadResponse 
-xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#">
-<sl10:BinaryFileData><sl10:XMLContent>
-<saml:Assertion AssertionID="zmr.bmi.gv.at-AssertionID-2003-02-12T20:28:34.474" 
-IssueInstant="2003-02-12T20:28:34.474" Issuer="http://zmr.bmi.gv.at/zmra/names#Issuer" 
-MajorVersion="1" MinorVersion="0" 
-xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#"          
-xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <saml:AttributeStatement>
-    <saml:Subject>
-      <saml:SubjectConfirmation>
-        <saml:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:sender-vouches</saml:ConfirmationMethod>
-        <saml:SubjectConfirmationData>
-          <pr:Person xsi:type="pr:PhysicalPersonType">
-            <pr:Identification>
-              <pr:Value>123456789012</pr:Value>
-              <pr:Type>http://reference.e-government.gv.at/names/persondata/20020228#zmr-zahl</pr:Type>
-            </pr:Identification>
-            <pr:Name>
-              <pr:GivenName>Hermann</pr:GivenName>
-              <pr:FamilyName primary="undefined">Muster</pr:FamilyName>
-            </pr:Name>
-            <pr:DateOfBirth>1968-10-22</pr:DateOfBirth>
-          </pr:Person>
-        </saml:SubjectConfirmationData>
-      </saml:SubjectConfirmation>
-    </saml:Subject>
-    <saml:Attribute AttributeName="CitizenPublicKey" AttributeNamespace="http://www.buergerkarte.at/namespaces/personenbindung/20020506#">
-      <saml:AttributeValue>
-        <dsig:RSAKeyValue xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-          <dsig:Modulus>0v1Ftf7WXgoexx0Jo/GrlExHOHnQIEQ5FFSjptLRd5BN1mZYRg2S9KfOMbHSCsiPm8AwjAEwE5EM
-A6P18Z/YyTIuP7fNGzckbB5PYIgNMHL8/TYJhHA8CjamsBrEfYDXivE8iAvALg5I9RMLZADmzL7a
-f2daYYuO8dycQw3xg6U=</dsig:Modulus>
-          <dsig:Exponent>AQAB</dsig:Exponent>
-        </dsig:RSAKeyValue>
-      </saml:AttributeValue>
-    </saml:Attribute>
-    <saml:Attribute AttributeName="CitizenPublicKey" AttributeNamespace="http://www.buergerkarte.at/namespaces/personenbindung/20020506#">
-      <saml:AttributeValue>
-        <dsig:RSAKeyValue xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-          <dsig:Modulus>i2qa56X4fpYeXqFLXAcQljGU3+DWnVgNrAxI9gn2bMeFWtLXE2SFa6qvl9EymUl0noBlFn0q9DWp
-AsyeLnRhzCAXJeSxiwsUEloOvcQCV0DfW2UVq0Y9bVlJ8KifJ2AS+5BxZ21mkc/VYx5Qz6EYjPrn
-pIpdAwR9sw5xnIvTySc=</dsig:Modulus>
-          <dsig:Exponent>AQAB</dsig:Exponent>
-        </dsig:RSAKeyValue>
-      </saml:AttributeValue>
-    </saml:Attribute></saml:AttributeStatement>
-<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>not(ancestor-or-self::pr:Identification)</dsig:XPath></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>s7TfoZrYo36OMdlxGxuIfAw/wr8=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>ancestor-or-self::dsig:Manifest</dsig:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>dO+RSn4xLHT3cuq8uopFtZyUBqo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>MFbZ5wA5cq0UezYFDXted5uqXubWFxxRwZawGh73XEAGxAbJsT/IEQmrTQThPRHNWW5RPGxVlPDz
-5BmjberdaWlgJlbyKf3b/WpNNJYptQ7ijrXlsQoCzjfiQy37NEfvHEcxHQOA6sa42C+dFKsKIvmP
-3mZkRYWJDxxsVzI7E+Y=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIDaDCCAtWgAwIBAgIBADAJBgUrDgMCHQUAMIGOMQswCQYDVQQGEwJBVDE9MDsG
-A1UEChQ0QnVuZGVzbWluaXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5n
-IHVuZCBTcG9ydDEjMCEGA1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMx
-GzAZBgNVBAMTEk1PQSBUZXN0IENBIC0gUm9vdDAeFw0wMzAyMTExNTE5NDRaFw0w
-MzEyMzEyMjU5MzBaMIGOMQswCQYDVQQGEwJBVDE9MDsGA1UEChQ0QnVuZGVzbWlu
-aXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5nIHVuZCBTcG9ydDEjMCEG
-A1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMxGzAZBgNVBAMTEk1PQSBU
-ZXN0IENBIC0gUm9vdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAjHuFphE3
-+UkTe2OcIFWUDLzhPl1j2dH4sMPAhDK09/0i+aWrdtQW9yHktu/7+LTiCiPeevT0
-lGMGDcWMSoSm66tYmpxei6YojCFIaVdJFtXZ7x1o7e7jTDVRLMfdZ5lI1sQ7loIY
-hOE0OmlYOkn4AI6xMtJtsca45rV8wW7qm8kCAwEAAaOB2zCB2DAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjBdBgNVHSAEVjBUMFIGDCsGAQQBlRIBAnsB
-ATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0IGlzdCBudXIgZvxy
-IFRlc3R6d2Vja2UgZ2VlaWduZXQuMB0GA1UdDgQWBBRDC612dCgZetTmAKyV6DII
-NkOoYTAWBgcqKAAKAQEBBAsMCUJNT0xTLUlLVDAfBgNVHSMEGDAWgBRDC612dCgZ
-etTmAKyV6DIINkOoYTAJBgUrDgMCHQUAA4GBAHj0xBNWGYLijaocjOX1AkL+r+G2
-fZsX4z3S/2eEvtUp+EUHaOPMLTS0MIP1nwj5f4ZluAIrDLXihqMdi4xRv0W6QYbN
-aDxICNz3/QbrzMlFPeC8odesdRlT+GGswX0ZGUtVIZm1HVhxRk5ZEW2pr2afo5c0
-Btxup/kgjGMnnS7C</dsig:X509Certificate><dsig:X509Certificate>MIIDiTCCAvagAwIBAgIBADAJBgUrDgMCHQUAMIGOMQswCQYDVQQGEwJBVDE9MDsG
-A1UEChQ0QnVuZGVzbWluaXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5n
-IHVuZCBTcG9ydDEjMCEGA1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMx
-GzAZBgNVBAMTEk1PQSBUZXN0IENBIC0gUm9vdDAeFw0wMzAyMTExNTI1MTRaFw0w
-MzEyMzEyMjU5MzBaMIGZMQswCQYDVQQGEwJBVDE9MDsGA1UEChQ0QnVuZGVzbWlu
-aXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5nIHVuZCBTcG9ydDEjMCEG
-A1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMxJjAkBgNVBAMTHU1PQSBU
-ZXN0IENBIC0gU2lnbmF0dXJkaWVuc3RlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCw7ULOYSNji09Ein7Ar4j3Rjxjq05spBmZDmbSomEZMnGEtVTyIRzKc8ia
-2kcXUMz5MEoFaVmvqRim31m20T21uvHFIs86gqzC/prOAz7V7HWok5F+9M/5gR1S
-BvpdqiEAXYeRXFPiOe8XSmpwhic7+n2jfuoBeYiRBEMGoP1DkwIDAQABo4HxMIHu
-MBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgHGMBEGCWCGSAGG+EIB
-AQQEAwIBAjBdBgNVHSAEVjBUMFIGDCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwIC
-MDQaMkRpZXNlcyBaZXJ0aWZpa2F0IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2Vl
-aWduZXQuMB0GA1UdDgQWBBSeRWvUfxEjKZSfxImJr/fpBDtMmTAWBgcqKAAKAQEB
-BAsMCUJNT0xTLUlLVDAfBgNVHSMEGDAWgBRDC612dCgZetTmAKyV6DIINkOoYTAJ
-BgUrDgMCHQUAA4GBAIMa4C2z3SbkcjEiMNAsHKaKUCJkBbMtNaab6U/cwwYmG6nl
-ga7xyEmbfY2SKzOqkcIwuv83Tma3rcr1f+OLUeGUaGLHt2Pl1a/s8BZGQZHWvLXv
-7hV4RceEUHzVGAfvDD8iBJqBmfq/z/fBPFsgSup4nO1YECkDYfQ+sqCIP4ik</dsig:X509Certificate><dsig:X509Certificate>MIIDZzCCAtSgAwIBAgIBADAJBgUrDgMCHQUAMIGZMQswCQYDVQQGEwJBVDE9MDsG
-A1UEChQ0QnVuZGVzbWluaXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5n
-IHVuZCBTcG9ydDEjMCEGA1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMx
-JjAkBgNVBAMTHU1PQSBUZXN0IENBIC0gU2lnbmF0dXJkaWVuc3RlMB4XDTAzMDIx
-MTE1MzI0NVoXDTAzMDgxMTE0MzI0NVowgYUxCzAJBgNVBAYTAkFUMSYwJAYDVQQK
-FB1CdW5kZXNtaW5pc3Rlcml1bSBm/HIgSW5uZXJlczEgMB4GA1UECxMXWmVudHJh
-bGVzIE1lbGRlcmVnaXN0ZXIxLDAqBgNVBAMTI1Rlc3QgU2lnbmF0dXJkaWVuc3Qg
-UGVyc29uZW5iaW5kdW5nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEzkpk
-QjbGjZwssN1+vMBE/ALMcA8LWFcILI3uxXaTSWGfTiLo9ECfzjuwYJG7FjEaeWrW
-nPEcp4VfMNocrm3T7Hw/ikpE5/+FsfTzD4MpIwwUPd/CUfA5vDNXK5CiP7qKKR1e
-vATO2s6lfDul+CS/eEbwzKmUQvZGrJggxg2m5wIDAQABo4HYMIHVMAwGA1UdEwEB
-/wQCMAAwDgYDVR0PAQH/BAQDAgbAMF0GA1UdIARWMFQwUgYMKwYBBAGVEgECAwEB
-MEIwQAYIKwYBBQUHAgIwNBoyRGllc2VzIFplcnRpZmlrYXQgaXN0IG51ciBm/HIg
-VGVzdHp3ZWNrZSBnZWVpZ25ldC4wHQYDVR0OBBYEFIpEyv43H3EtiGr4I7Z34bWj
-v2z6MBYGByooAAoBAQEECwwJQk1PTFMtSUtUMB8GA1UdIwQYMBaAFJ5Fa9R/ESMp
-lJ/EiYmv9+kEO0yZMAkGBSsOAwIdBQADgYEAfMBJRy/kp8HQa0lGIBfFrWNpxVPv
-RsIu+N4IiFrswrsoQoMAh6IqNyzSdq7rJC08xsDkXe5HOwkb+2zGKYoC3aQ/J/zr
-BGkg6ec4tOaS/VSdEQeTL1L30r2faTffWLUV3GrzL7pM7jN470hB1w8F6Hc3LCI7
-kFfp23o/juVtJNw=</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>BqzfCB7dNg4G3u4YaxpD1tALdKI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></saml:Assertion></sl10:XMLContent></sl10:BinaryFileData></sl10:InfoboxReadResponse>
-\ No newline at end of file
diff --git a/common/data/test/xml/VerifyCMSSignature/Req000.xml b/common/data/test/xml/VerifyCMSSignature/Req000.xml
deleted file mode 100644
index 9866113ea..000000000
--- a/common/data/test/xml/VerifyCMSSignature/Req000.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Stephan Grill (Anecon) -->
-<!--the given XML Data shows a sample request (containing all optional elementsand attributes)-->
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" Signatories="1">
-	<DateTime>2001-12-17T09:30:47-05:00</DateTime>
-	<CMSSignature>U3Zlbg==</CMSSignature>
-	<DataObject>
-		<MetaInfo>
-			<MimeType>text/plain</MimeType>
-			<Description>anyURI</Description>
-		</MetaInfo>
-		<Content Reference="anyURI">
-			<Base64Content>U3Zlbg==</Base64Content>
-		</Content>
-	</DataObject>
-	<TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyCMSSignatureRequest>
-<!--the following modifications (individually and in combination) must return a valid response
-* no XML/@encoding
-* XML/@encoding = "ISO-8859-1"
-* no xsi:schemaLocation="...moa/20020822# ..."
-* VerifyCMSSignatureRequest/@Signatories = "oneValidInteger"
-* VerifyCMSSignatureRequest/@Signatories = "twoValidIntegers"
-* VerifyCMSSignatureRequest/@Signatories = "all"
-* no DateTime
-* a DateTime that is in the past and within the certificate validity period
-* no DataObject and CMSSignature w/ attached signature
-* no MetaInfo
-* attached/detached CMSSignature and no DataObject/@Reference but DataObject content
-* attached/detached CMSSignature and no DataObject content but DataObject/@Reference
-* attached CMSSignature and a DataObject representing different data (using Base64Content or @Reference)
-Total: 14 Testcases-->
-<!--each of the following modifications (individually) must return an error code
-* a request which does not validate against the Schema
-* no XML/@version
-* XML/@version = "wrongValue"
-* XML/@encoding = "wrongValue"
-* CreateXMLSigantureRequest/@xmlns="wrongValue"
-* VerifyCMSSignatureRequest/@Signatories = "0"
-* VerifyCMSSignatureRequest/@Signatories = "invalidInteger(tooLarge)"
-* DateTime: in the future
-* CMSSignature: invalidBase64Data
-* detached CMSSignature and no DataObject content and no DataObject/@Reference
-* detached CMSSignature and DataObject/@Reference or DataObject content representing different data
-* TrustProfileID: invalidTrustProfileID
-Total: 12 Testcases-->
diff --git a/common/data/test/xml/VerifyCMSSignature/Req001.xml b/common/data/test/xml/VerifyCMSSignature/Req001.xml
deleted file mode 100644
index 17c2b0879..000000000
--- a/common/data/test/xml/VerifyCMSSignature/Req001.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" Signatories="1">
-	<DateTime>2001-12-17T09:30:47-05:00</DateTime>
-	<CMSSignature>MIIF5QYJKoZIhvcNAQcCoIIF1jCCBdICAQExCzAJBgUrDgMCGgUAMCAGCSqGSIb3DQEHAaATBBFUaGlzIGlzIGEgbWVzc2FnZaCCA9swggPXMIIDRKADAgECAgYA8yR9NTswCQYFKw4DAh0FADCBrDELMAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UECxMMSUFJSyBUZXN0IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0EwHhcNMDMwMjAzMTYyMDU1WhcNMDMxMjMwMjI1OTMwWjCBmDELMAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEYMBYGA1UEAxQPSXNvbGRlIEL8cmdlcmluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDnebSqeDo73NUgC4nbY+z3Vf6l12EyID0/RC6wx7FD5ASR97jecQUhOhRne66gBAV36fgxczoPry1ly0ZTk7hbkCr9sSMjh58gdLQROHOA0DKaqZP1n0ggSGqb/WOFDhJdNbffLdefeXHboOJN4Cl+25AHfzxiVX5Gz6tPIX2JFQIDAQABo4IBHDCCARgwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYJYIZIAYb4QgEBBAQDAgUgMGcGA1UdIARgMF4wXAYMKwYBBAGVEgECewEBMEwwSgYIKwYBBQUHAgIwPho8VGhpcyBjZXJ0aWZpY2F0ZSBvbmx5IG1heSBiZSB1c2VkIGZvciBkZW1vbnN0cmF0aW9uIHB1cnBvc2VzMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly93d3cuaWFpay5hdC90ZXN0Q0EvaWFpa190ZXN0X3NpZy5jcmwwHQYDVR0OBBYEFCg66gjFLwzWj8NNmQlSzSWc3kDtMB8GA1UdIwQYMBaAFEwgsFYCDPeICpaIpRS0Ucw6tfK/MAkGBSsOAwIdBQADgYEAJjzWjybNvxgK5MyB6mXJKbmcCTGOy/VPmf8fPPVwt9IMlnQfI1NXH8YOzNj4PHbwx1b7oMuj2dY9IT/g/6T0dcl7/ATIC/jg6uO+nMYYqOqhzdfy/ivMyjowFE2W67SbfLWmS1NX+rhqJYP+dsZd2uf8CgoC85IBDdB7pf51P/UxggG9MIIBuQIBATCBtzCBrDELMAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UECxMMSUFJSyBUZXN0IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0ECBgDzJH01OzAJBgUrDgMCGgUAoF0wGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMwMjI1MTIzMzI1WjAjBgkqhkiG9w0BCQQxFgQUssrSHofb1X8aGSjkATtW+1U7uCowDQYJKoZIhvcNAQEBBQAEgYAoTw/ezMjs4lYuIEWfx3YRHHbOuzgcVtNp97SaViu4GXCoGR6EetYT2ZhNNJq34BkUXV1DTSc1pPRZhkXy5WjpsXX96QDyBjvoev+0NLfdsogNTfVjlcOfBol3+btuwyNz/4KK/owRYsmxqaFKyA3PAgsq4fje2jyxiwtkZWa1eA==</CMSSignature>
-	<DataObject>
-		<MetaInfo>
-			<MimeType>text/plain</MimeType>
-			<Description>http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt</Description>
-		</MetaInfo>
-		<Content Reference="http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt">
-			<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>
-		</Content>
-	</DataObject>
-	<TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.001.Req.xml b/common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.001.Req.xml
deleted file mode 100644
index 573677265..000000000
--- a/common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.001.Req.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xml="http://www.w3.org/XML/1998/namespace" Signatories="1">
-	<DateTime>2003-04-04T09:30:47-05:00</DateTime>
-	<CMSSignature>MIIF0AYJKoZIhvcNAQcCoIIFwTCCBb0CAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCCA9sw
-ggPXMIIDRKADAgECAgYA8yR9NTswCQYFKw4DAh0FADCBrDELMAkGA1UEBhMCQVQxJjAkBgNVBAoT
-HUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBw
-bGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UECxMM
-SUFJSyBUZXN0IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0EwHhcNMDMwMjAzMTYyMDU1WhcNMDMx
-MjMwMjI1OTMwWjCBmDELMAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5JVkVSU0lUWSBPRiBU
-RUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZvcm1hdGlvbiBQcm9j
-ZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEYMBYGA1UEAxQPSXNvbGRlIEL8cmdlcmluMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDnebSqeDo73NUgC4nbY+z3Vf6l12EyID0/RC6wx7FD5ASR
-97jecQUhOhRne66gBAV36fgxczoPry1ly0ZTk7hbkCr9sSMjh58gdLQROHOA0DKaqZP1n0ggSGqb
-/WOFDhJdNbffLdefeXHboOJN4Cl+25AHfzxiVX5Gz6tPIX2JFQIDAQABo4IBHDCCARgwDAYDVR0T
-AQH/BAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYJYIZIAYb4QgEBBAQDAgUgMGcGA1UdIARgMF4wXAYM
-KwYBBAGVEgECewEBMEwwSgYIKwYBBQUHAgIwPho8VGhpcyBjZXJ0aWZpY2F0ZSBvbmx5IG1heSBi
-ZSB1c2VkIGZvciBkZW1vbnN0cmF0aW9uIHB1cnBvc2VzMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6
-Ly93d3cuaWFpay5hdC90ZXN0Q0EvaWFpa190ZXN0X3NpZy5jcmwwHQYDVR0OBBYEFCg66gjFLwzW
-j8NNmQlSzSWc3kDtMB8GA1UdIwQYMBaAFEwgsFYCDPeICpaIpRS0Ucw6tfK/MAkGBSsOAwIdBQAD
-gYEAJjzWjybNvxgK5MyB6mXJKbmcCTGOy/VPmf8fPPVwt9IMlnQfI1NXH8YOzNj4PHbwx1b7oMuj
-2dY9IT/g/6T0dcl7/ATIC/jg6uO+nMYYqOqhzdfy/ivMyjowFE2W67SbfLWmS1NX+rhqJYP+dsZd
-2uf8CgoC85IBDdB7pf51P/UxggG9MIIBuQIBATCBtzCBrDELMAkGA1UEBhMCQVQxJjAkBgNVBAoT
-HUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBw
-bGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UECxMM
-SUFJSyBUZXN0IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0ECBgDzJH01OzAJBgUrDgMCGgUAoF0w
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMwMzEwMTIyMDE2WjAj
-BgkqhkiG9w0BCQQxFgQUssrSHofb1X8aGSjkATtW+1U7uCowDQYJKoZIhvcNAQEBBQAEgYAB5j4u
-NwEqAlqe96QnWAN98k8u3LcvrtliV0GaneScHShHWKOlM9V+Eqr+IeU0PSEOHb6iat5E3FiRgW0k
-9lh9brJcdW9YxnUVbJ1VKIAR4+IcTVBBjAxgBYtWPpYmxjPyFIW8rt1losrppGPVDCQWQUnewUHx
-fY5lsQ35KJpqWw==</CMSSignature>
-	<DataObject>
-		<MetaInfo>
-			<MimeType>text/plain</MimeType>
-			<Description>http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt</Description>
-		</MetaInfo>
-		<Content Reference="http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt">
-			<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>
-		</Content>
-	</DataObject>
-	<TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.002.Req.xml b/common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.002.Req.xml
deleted file mode 100644
index 9752e2b91..000000000
--- a/common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.002.Req.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" Signatories="1 2">
-	<DateTime>2001-12-17T09:30:47-05:00</DateTime>
-	<CMSSignature>MIIHPwYJKoZIhvcNAQcCoIIHMDCCBywCAQExGTAJBgUrDgMCGgUAMAwGCCqGSIb3DQIFBQAwCwYJ
-KoZIhvcNAQcBoIID2zCCA9cwggNEoAMCAQICBgDzJH01OzAJBgUrDgMCHQUAMIGsMQswCQYDVQQG
-EwJBVDEmMCQGA1UEChMdR1JBWiBVTklWRVJTSVRZIE9GIFRFQ0hOT0xPR1kxRzBFBgNVBAsTPklu
-c2l0dXRlIGZvciBBcHBsaWVkIEluZm9ybWF0aW9uIFByb2Nlc3NpbmcgYW5kIENvbW11bmljYXRp
-b25zMRUwEwYDVQQLEwxJQUlLIFRlc3QgQ0ExFTATBgNVBAMTDElBSUsgVGVzdCBDQTAeFw0wMzAy
-MDMxNjIwNTVaFw0wMzEyMzAyMjU5MzBaMIGYMQswCQYDVQQGEwJBVDEmMCQGA1UEChMdR1JBWiBV
-TklWRVJTSVRZIE9GIFRFQ0hOT0xPR1kxRzBFBgNVBAsTPkluc2l0dXRlIGZvciBBcHBsaWVkIElu
-Zm9ybWF0aW9uIFByb2Nlc3NpbmcgYW5kIENvbW11bmljYXRpb25zMRgwFgYDVQQDFA9Jc29sZGUg
-QvxyZ2VyaW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOd5tKp4Ojvc1SALidtj7PdV/qXX
-YTIgPT9ELrDHsUPkBJH3uN5xBSE6FGd7rqAEBXfp+DFzOg+vLWXLRlOTuFuQKv2xIyOHnyB0tBE4
-c4DQMpqpk/WfSCBIapv9Y4UOEl01t98t1595cdug4k3gKX7bkAd/PGJVfkbPq08hfYkVAgMBAAGj
-ggEcMIIBGDAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGwDARBglghkgBhvhCAQEEBAMCBSAw
-ZwYDVR0gBGAwXjBcBgwrBgEEAZUSAQJ7AQEwTDBKBggrBgEFBQcCAjA+GjxUaGlzIGNlcnRpZmlj
-YXRlIG9ubHkgbWF5IGJlIHVzZWQgZm9yIGRlbW9uc3RyYXRpb24gcHVycG9zZXMwPAYDVR0fBDUw
-MzAxoC+gLYYraHR0cDovL3d3dy5pYWlrLmF0L3Rlc3RDQS9pYWlrX3Rlc3Rfc2lnLmNybDAdBgNV
-HQ4EFgQUKDrqCMUvDNaPw02ZCVLNJZzeQO0wHwYDVR0jBBgwFoAUTCCwVgIM94gKloilFLRRzDq1
-8r8wCQYFKw4DAh0FAAOBgQAmPNaPJs2/GArkzIHqZckpuZwJMY7L9U+Z/x889XC30gyWdB8jU1cf
-xg7M2Pg8dvDHVvugy6PZ1j0hP+D/pPR1yXv8BMgL+ODq476cxhio6qHN1/L+K8zKOjAUTZbrtJt8
-taZLU1f6uGolg/52xl3a5/wKCgLzkgEN0Hul/nU/9TGCAx4wggG5AgEBMIG3MIGsMQswCQYDVQQG
-EwJBVDEmMCQGA1UEChMdR1JBWiBVTklWRVJTSVRZIE9GIFRFQ0hOT0xPR1kxRzBFBgNVBAsTPklu
-c2l0dXRlIGZvciBBcHBsaWVkIEluZm9ybWF0aW9uIFByb2Nlc3NpbmcgYW5kIENvbW11bmljYXRp
-b25zMRUwEwYDVQQLEwxJQUlLIFRlc3QgQ0ExFTATBgNVBAMTDElBSUsgVGVzdCBDQQIGAPMkfTU7
-MAkGBSsOAwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0w
-MzAzMDMxNDQyMTNaMCMGCSqGSIb3DQEJBDEWBBSyytIeh9vVfxoZKOQBO1b7VTu4KjANBgkqhkiG
-9w0BAQEFAASBgH9XPWNyTcZiKDGu72e58cm/hGLIHc8UZvIda2LClBFRLnTbCRQj4vnPCwmek34C
-UGbwpxoK8e/DVfXit1ggk6c/Ce+W6hZOHYaW9lypozvPOuwmyT4wehR+tW0/qfy5OO7VDcHvl5Js
-2lXpuDqWzPuvikZjXsNmmV3IuKHRTBfaMIIBXQIBATCBtzCBrDELMAkGA1UEBhMCQVQxJjAkBgNV
-BAoTHUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3Ig
-QXBwbGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UE
-CxMMSUFJSyBUZXN0IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0ECBgDzJH01OzAMBggqhkiG9w0C
-BQUAMA0GCSqGSIb3DQEBAQUABIGAO/8oo+LJbhlUrsbfF/phaqu7MaMcxlBR8F2xsLbvs+YuZ42c
-xFwAUN1lGwKY+GvDmB97XQQxnuMGjFDaaBSWmMhlkJ56u7x8lYQhmbD79kMJgOdMcNdJ6nMxf5ZW
-yFMx3nKvQgDlF8ReKZsDvmd/vcMMvB+lVEEPkNpHtqGLBAQ=</CMSSignature>
-	<DataObject>
-		<MetaInfo>
-			<MimeType>text/plain</MimeType>
-			<Description>http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt</Description>
-		</MetaInfo>
-		<Content Reference="http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt">
-			<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>
-		</Content>
-	</DataObject>
-	<TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.006.Req.xml b/common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.006.Req.xml
deleted file mode 100644
index 9f8b3c9a4..000000000
--- a/common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.006.Req.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" Signatories="1">
-	<DateTime>2001-12-17T09:30:47-05:00</DateTime>
-	<CMSSignature>MIIF5QYJKoZIhvcNAQcCoIIF1jCCBdICAQExCzAJBgUrDgMCGgUAMCAGCSqGSIb3DQEHAaATBBFU
-aGlzIGlzIGEgbWVzc2FnZaCCA9swggPXMIIDRKADAgECAgYA8yR9NTswCQYFKw4DAh0FADCBrDEL
-MAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYD
-VQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21t
-dW5pY2F0aW9uczEVMBMGA1UECxMMSUFJSyBUZXN0IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0Ew
-HhcNMDMwMjAzMTYyMDU1WhcNMDMxMjMwMjI1OTMwWjCBmDELMAkGA1UEBhMCQVQxJjAkBgNVBAoT
-HUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBw
-bGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEYMBYGA1UEAxQP
-SXNvbGRlIEL8cmdlcmluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDnebSqeDo73NUgC4nb
-Y+z3Vf6l12EyID0/RC6wx7FD5ASR97jecQUhOhRne66gBAV36fgxczoPry1ly0ZTk7hbkCr9sSMj
-h58gdLQROHOA0DKaqZP1n0ggSGqb/WOFDhJdNbffLdefeXHboOJN4Cl+25AHfzxiVX5Gz6tPIX2J
-FQIDAQABo4IBHDCCARgwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYJYIZIAYb4QgEB
-BAQDAgUgMGcGA1UdIARgMF4wXAYMKwYBBAGVEgECewEBMEwwSgYIKwYBBQUHAgIwPho8VGhpcyBj
-ZXJ0aWZpY2F0ZSBvbmx5IG1heSBiZSB1c2VkIGZvciBkZW1vbnN0cmF0aW9uIHB1cnBvc2VzMDwG
-A1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly93d3cuaWFpay5hdC90ZXN0Q0EvaWFpa190ZXN0X3NpZy5j
-cmwwHQYDVR0OBBYEFCg66gjFLwzWj8NNmQlSzSWc3kDtMB8GA1UdIwQYMBaAFEwgsFYCDPeICpaI
-pRS0Ucw6tfK/MAkGBSsOAwIdBQADgYEAJjzWjybNvxgK5MyB6mXJKbmcCTGOy/VPmf8fPPVwt9IM
-lnQfI1NXH8YOzNj4PHbwx1b7oMuj2dY9IT/g/6T0dcl7/ATIC/jg6uO+nMYYqOqhzdfy/ivMyjow
-FE2W67SbfLWmS1NX+rhqJYP+dsZd2uf8CgoC85IBDdB7pf51P/UxggG9MIIBuQIBATCBtzCBrDEL
-MAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYD
-VQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21t
-dW5pY2F0aW9uczEVMBMGA1UECxMMSUFJSyBUZXN0IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0EC
-BgDzJH01OzAJBgUrDgMCGgUAoF0wGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0B
-CQUxDxcNMDMwMzAzMTQ0MjEzWjAjBgkqhkiG9w0BCQQxFgQUssrSHofb1X8aGSjkATtW+1U7uCow
-DQYJKoZIhvcNAQEBBQAEgYB/Vz1jck3GYigxru9nufHJv4RiyB3PFGbyHWtiwpQRUS502wkUI+L5
-zwsJnpN+AlBm8KcaCvHvw1X14rdYIJOnPwnvluoWTh2GlvZcqaM7zzrsJsk+MHoUfrVtP6n8uTju
-1Q3B75eSbNpV6bg6lsz7r4pGY17DZpldyLih0UwX2g==</CMSSignature>
-	<TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/common/data/test/xml/VerifyXMLSignature/CertInfoVerifyXMLSignatureRequest.xml b/common/data/test/xml/VerifyXMLSignature/CertInfoVerifyXMLSignatureRequest.xml
deleted file mode 100644
index 304ac576f..000000000
--- a/common/data/test/xml/VerifyXMLSignature/CertInfoVerifyXMLSignatureRequest.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl11:VerifyXMLSignatureRequest xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<sl11:SignatureInfo>
-		<sl11:SignatureEnvironment>
-			<sl10:XMLContent xml:space="preserve">
-				<dsig:Signature Id="HS_signature" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-					<dsig:SignedInfo>
-						<dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-						<dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-						<dsig:Reference Id="reference-data-1" URI="#signed-data">
-							<dsig:Transforms>
-								<dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2">
-									<xf2:XPath Filter="intersect" xmlns:xf2="http://www.w3.org/2002/06/xmldsig-filter2">id(&apos;signed-data&apos;)/node()</xf2:XPath>
-								</dsig:Transform>
-							</dsig:Transforms>
-							<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-							<dsig:DigestValue>joe8kJGuT6HW64VyPcsGYShbqI4=</dsig:DigestValue>
-						</dsig:Reference>
-						<dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#refetsi">
-							<dsig:Transforms>
-								<dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2">
-									<xf2:XPath Filter="intersect" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" xmlns:xf2="http://www.w3.org/2002/06/xmldsig-filter2">id(&apos;refetsi&apos;)/etsi:QualifyingProperties/etsi:SignedProperties</xf2:XPath>
-								</dsig:Transform>
-							</dsig:Transforms>
-							<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-							<dsig:DigestValue>SMDKSVy/XjV5JUn7V6XHvmazk2A=</dsig:DigestValue>
-						</dsig:Reference>
-					</dsig:SignedInfo>
-					<dsig:SignatureValue>OELjlPDvKq4WE8PseUz7jhYdfDXl1u/5v150wwLomtBVFgdjoBpcS8DGbinmh/86
-HdH0lsZXDIiaQokxy8kEV68rgo1w9FnVXbrBu6CSGBJlF4jtpJPcMct3Nh4Mus2G
-DKe+75vELbvdQQO3OlVlX8n9hYR5Q0OhmJCZkxxvYZo=</dsig:SignatureValue>
-					<dsig:KeyInfo>
-						<dsig:X509Data>
-							<dsig:X509Certificate>MIIFJTCCBA2gAwIBAgICGTcwDQYJKoZIhvcNAQEFBQAwgaExCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIzAhBgNVBAsTGmEtc2lnbi1URVNU
-LVByZW1pdW0tRW5jLTAxMSMwIQYDVQQDExphLXNpZ24tVEVTVC1QcmVtaXVtLUVu
-Yy0wMTAeFw0wMzAyMTAxMzIwNThaFw0wNjAyMTAxMzIwNThaMGoxCzAJBgNVBAYT
-AkFUMRwwGgYDVQQDExNUZXN0cGVyc29uIE1PQTQgQlJaMQwwCgYDVQQEEwNCUlox
-GDAWBgNVBCoTD1Rlc3RwZXJzb24gTU9BNDEVMBMGA1UEBRMMNzkwMTg3NDYxNjMz
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDS/UW1/tZeCh7HHQmj8auUTEc4
-edAgRDkUVKOm0tF3kE3WZlhGDZL0p84xsdIKyI+bwDCMATATkQwDo/Xxn9jJMi4/
-t80bNyRsHk9giA0wcvz9NgmEcDwKNqawGsR9gNeK8TyIC8AuDkj1EwtkAObMvtp/
-Z1phi47x3JxDDfGDpQIDAQABo4ICHzCCAhswEwYDVR0jBAwwCoAIS7OAw3GTPNgw
-JwYIKwYBBQUHAQMBAf8EGDAWMAgGBgQAjkYBATAKBggrBgEFBQcLATCBggYIKwYB
-BQUHAQEEdjB0MCkGCCsGAQUFBzABhh1odHRwOi8vd3d3LmEtdHJ1c3QuYXQ6ODIv
-b2NzcDBHBggrBgEFBQcwAoY7aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Et
-c2lnbi1URVNULVByZW1pdW0tU2lnLTAxYS5jcnQwgZQGA1UdIASBjDCBiTB9BgYq
-KAARAQQwczA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3Mv
-Y3AvYS1zaWduLVRFU1QwOgYIKwYBBQUHAgIwLhosRGllc2VzIFplcnRpZmlrYXQg
-ZGllbnQgbnVyIHp1IFRlc3R6d2Vja2VuICEwCAYGBACLMAEBMG8GA1UdHwRoMGYw
-ZKBioGCGXmxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLVRFU1QtUHJl
-bWl1bS1FbmMtMDEsbz1BLVRydXN0LGM9QVQ/Y2VydGlmaWNhdGVyZXZvY2F0aW9u
-bGlzdD8wEQYDVR0OBAoECE4DxL9ky4M+MA4GA1UdDwEB/wQEAwIGwDAgBgNVHREE
-GTAXgRV0ZXN0cGVyc29uNEBicnouZ3YuYXQwCQYDVR0TBAIwADANBgkqhkiG9w0B
-AQUFAAOCAQEAioVvsZN+NnQxXMTGdjKveTBMRTYzHflkSC8lI9XXltP5+mjIuoB2
-Tn6voovA8dXz9jTsnQt8f8ye0CL2bSS9UVD1jv8So3bavquW+HlkZBAZvL39APNL
-PjUUnWn0QOnrQAJ6W47UwGAUgEw3KcBcJaEa4Xb/8kUj618xGzWl6X0mKsVpxkrf
-+5Cj+nmwDqChll08/90MmhSY4M5FrvmQ9GjAN5FHVsk0FPp02tKCRzoBJtzpB1DW
-KHlgiDHUAXy5eD0XI7PXebPNZ4InvY/jC/IH8PRLdJT249YQmUxZ4neTtFDvb8C1
-Qh6k725fh3hVxqX8ZwwWj9+iGQVk53K3CA==</dsig:X509Certificate>
-						</dsig:X509Data>
-					</dsig:KeyInfo>
-					<dsig:Object Id="signed-data">
-						<html>
-							<body>
-Information über Wurzelzertifikate
-</body>
-						</html>
-					</dsig:Object>
-					<dsig:Object Id="refetsi">
-						<etsi:QualifyingProperties Target="#HS_signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#">
-							<etsi:SignedProperties>
-								<etsi:SignedSignatureProperties>
-									<etsi:SigningTime>2003-04-10T06:29:52Z</etsi:SigningTime>
-									<etsi:SigningCertificate>
-										<etsi:Cert>
-											<etsi:CertDigest>
-												<etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-												<etsi:DigestValue>Frhu1o4mL4gQHdJcU0xSA/h4COE=</etsi:DigestValue>
-											</etsi:CertDigest>
-											<etsi:IssuerSerial>
-												<dsig:X509IssuerName>CN=a-sign-TEST-Premium-Enc-01,OU=a-sign-TEST-Premium-Enc-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName>
-												<dsig:X509SerialNumber>6455</dsig:X509SerialNumber>
-											</etsi:IssuerSerial>
-										</etsi:Cert>
-									</etsi:SigningCertificate>
-									<etsi:SignaturePolicyIdentifier>
-										<etsi:SignaturePolicyImplied/>
-									</etsi:SignaturePolicyIdentifier>
-								</etsi:SignedSignatureProperties>
-								<etsi:SignedDataObjectProperties>
-									<etsi:DataObjectFormat ObjectReference="#reference-data-1">
-										<etsi:MimeType>text/html</etsi:MimeType>
-									</etsi:DataObjectFormat>
-								</etsi:SignedDataObjectProperties>
-							</etsi:SignedProperties>
-						</etsi:QualifyingProperties>
-					</dsig:Object>
-				</dsig:Signature>
-			</sl10:XMLContent>
-		</sl11:SignatureEnvironment>
-		<sl11:SignatureLocation>//dsig:Signature</sl11:SignatureLocation>
-	</sl11:SignatureInfo>
-</sl11:VerifyXMLSignatureRequest>
diff --git a/common/data/test/xml/VerifyXMLSignature/Req000.xml b/common/data/test/xml/VerifyXMLSignature/Req000.xml
deleted file mode 100644
index 2ed8acff9..000000000
--- a/common/data/test/xml/VerifyXMLSignature/Req000.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Stephan Grill (Anecon) -->
-<!--the given XML Data shows a simple request (w/o Supplement and w/o SignatureManifestCheckParams) which must return valid return codes-->
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<DateTime>2002-12-01T09:30:47-05:00</DateTime>
-	<VerifySignatureInfo>
-		<VerifySignatureEnvironment>
-		    <XMLContent>
-				<dsig:Signature>
-					<dsig:SignedInfo>
-						<dsig:CanonicalizationMethod Algorithm="aValidURI"/>
-						<dsig:SignatureMethod Algorithm="anValidURI"/>
-						<dsig:Reference>
-							<dsig:DigestMethod Algorithm="aValidURI"/>
-							<dsig:DigestValue>U3Zlbg==</dsig:DigestValue>
-						</dsig:Reference>
-					</dsig:SignedInfo>
-					<dsig:SignatureValue>U3Zlbg==</dsig:SignatureValue>
-				</dsig:Signature>
-			</XMLContent>
-		</VerifySignatureEnvironment>
-		<VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
-	</VerifySignatureInfo>
-	<ReturnHashInputData/>
-	<TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
-<!--the following modifications (individually and in combination) must return a valid response
-* no XML/@encoding
-* XML/@encoding = "ISO-8859-1"
-* no xsi:schemaLocation="...moa/20020822# ..."
-* no DateTime
-* a DateTime that is in the past and within the signing certificate validity period
-* no ReturnHashInputData
-Total: 6 Testcases-->
-<!--each of the following modifications (individually) must return an error code
-* a request which does not validate against the Schema
-* no XML/@version
-* XML/@version = "wrongValue"
-* XML/@encoding = "wrongValue"
-* VerifyXMLSignatureRequest/@xmlns="wrongValue"
-* DateTime: in the future
-* SignatureEnvironment with invalid signature that does not validate against XMLDSig-Schema
-* VerifySignatureLocation: syntactically invalid XPath expression
-* VerifySignatureLocation: XPath expression that does not reference a dsig:signature element
-* TrustProfileID: invalidTrustProfileID
-Total: 10 Testcases-->
diff --git a/common/data/test/xml/VerifyXMLSignature/Req001.xml b/common/data/test/xml/VerifyXMLSignature/Req001.xml
deleted file mode 100644
index 7cb71f6d2..000000000
--- a/common/data/test/xml/VerifyXMLSignature/Req001.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Stephan Grill (Anecon) -->
-<!--the given XML Data shows a simple request w/ Supplement (but w/o SignatureManifestCheckParams) which must return a valid return codes-->
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<DateTime>2002-12-01T09:30:47-05:00</DateTime>
-	<VerifySignatureInfo>
-		<VerifySignatureEnvironment>
-			<XMLContent>
-				<dsig:Signature>
-					<dsig:SignedInfo>
-						<dsig:CanonicalizationMethod Algorithm="aValidURI"/>
-						<dsig:SignatureMethod Algorithm="anValidURI"/>
-						<dsig:Reference>
-							<dsig:DigestMethod Algorithm="aValidURI"/>
-							<dsig:DigestValue>U3Zlbg==</dsig:DigestValue>
-						</dsig:Reference>
-					</dsig:SignedInfo>
-					<dsig:SignatureValue>U3Zlbg==</dsig:SignatureValue>
-				</dsig:Signature>
-			</XMLContent>
-		</VerifySignatureEnvironment>
-		<VerifySignatureLocation>anValidXPathExpression</VerifySignatureLocation>
-	</VerifySignatureInfo>
-	
-	<SupplementProfile>
-		<MetaInfo>
-			<MimeType>text/plain</MimeType>
-			<Description>aValidURI</Description>
-		</MetaInfo>
-		<Content Reference="aValidURI">
-			<Base64Content>U3Zlbg==</Base64Content>
-		</Content>
-	</SupplementProfile>
-
-	<SupplementProfileID>aValidSupplementProfileID</SupplementProfileID>
-	<TrustProfileID>aValidTrustProfileID</TrustProfileID>
-</VerifyXMLSignatureRequest>
-<!--the following modifications (individually and in combination) must return a valid response
-* no Supplement/MetaInfo/Description
-* no Supplement/MetaInfo
-* Supplement/Content/XMLContent instead of Supplement/Content/Base64Content
-* 2 Supplement elements
-* 2 SupplementProfileID elements
-Total: 5 Testcases-->
-<!--each of the following modifications (individually) must return an error code
-* an URI referenced in dsig:Signature does not resolve and no Supplement object is available
-* invalid MimeType
-* invalid SupplementProfileID
-Total: 3 Testcases-->
diff --git a/common/data/test/xml/VerifyXMLSignature/Req002.xml b/common/data/test/xml/VerifyXMLSignature/Req002.xml
deleted file mode 100644
index a834f1225..000000000
--- a/common/data/test/xml/VerifyXMLSignature/Req002.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Stephan Grill (Anecon) -->
-<!--the given XML Data shows a simple request w/ SignatureManifestCheckParams (but w/o Supplement) which must return a valid return codes-->
-<VerifyXMLSignatureRequest 
-	xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" 
-	xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">	
-	<DateTime>2002-12-01T09:30:47-05:00</DateTime>
-	<VerifySignatureInfo>
-		<VerifySignatureEnvironment>
-			<XMLContent>
-				<dsig:Signature>
-					<dsig:SignedInfo>
-						<dsig:CanonicalizationMethod Algorithm="aValidURI"/>
-						<dsig:SignatureMethod Algorithm="anValidURI"/>
-						<dsig:Reference>
-							<dsig:DigestMethod Algorithm="aValidURI"/>
-							<dsig:DigestValue>U3Zlbg==</dsig:DigestValue>
-						</dsig:Reference>
-					</dsig:SignedInfo>
-					<dsig:SignatureValue>U3Zlbg==</dsig:SignatureValue>
-				</dsig:Signature>
-			</XMLContent>
-		</VerifySignatureEnvironment>
-		<VerifySignatureLocation>anValidXPathExpression</VerifySignatureLocation>
-	</VerifySignatureInfo>
-	<SignatureManifestCheckParams ReturnReferenceInputData="true">
-		<ReferenceInfo>
-			<VerifyTransformsInfoProfile>
-				<dsig:Transforms>
-					<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
-						<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
-					</dsig:Transform>
-				</dsig:Transforms>
-				<TransformParameter URI="validURI">
-					<Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8dGVzdD48L3Rlc3Q+</Base64Content>
-				</TransformParameter>
-			</VerifyTransformsInfoProfile>
-			<VerifyTransformsInfoProfileID>validID</VerifyTransformsInfoProfileID>
-		</ReferenceInfo>
-	</SignatureManifestCheckParams>
-	<TrustProfileID>aValidTrustProfileID</TrustProfileID>
-</VerifyXMLSignatureRequest>
-<!--the following modifications (individually and in combination) must return a valid response
-* no SignatureManifestCheckParams/@ReturnReferenceInputData
-* SignatureManifestCheckParams/@ReturnReferenceInputData = false
-* no content of dsig:Transform
-* 2 dsig:Transform elements
-* TransformParameter/Hash statt TransformParameter/Base64Content
-* TransformParameter/@URI und TranformParameter/Base64Content liefern unterschiedliche Werte - es wird der Wert aus Base64Content verwendet
-* weder Base64Content noch Hash wird verwendet
-* 0 TransformParameter
-* 2 TransformParameter
-* 2 VerifyTransformsInfoID
-* 2 ReferenceInfo (for 2 dsig:Reference)
-Total: 11 Testcases-->
-<!--each of the following modifications (individually) must return an error code
-* VerifyTransformsInfoID: invalidID
-* number of ReferenceInfo is different from number of dsig:Reference in the signature
-* mismatching dsig:Transform/@Algorithm and dsig:Transform content
-* TransformParameter/@URI resolves but Hash does not match - which hashing algorithm?
-* kein TransformParameter element obwohl in Transforms URIs referenziert werden
-  (Referenz-Eingangsdaten sind KEIN impliziter Transformationsparameter)
-Total: 5 Testcases-->
diff --git a/common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.001.Req.xml b/common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.001.Req.xml
deleted file mode 100644
index d6e7390e9..000000000
--- a/common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.001.Req.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 001-->
-<VerifyXMLSignatureRequest
-   xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
-   xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-   <DateTime>2003-03-04T13:40:03+01:00</DateTime>
-		<VerifySignatureInfo>
-		<VerifySignatureEnvironment>
-		<XMLContent>
-<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI="http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>uBvOjC5KqIE1kJlrmm6BarlFxN5Hw8CIOQirPNQaFhasC8CoRtV6I8nC3ukIfbGv
-ZgrB8pAomCB7iRx26ofjKyl853IsJEd8Vba5dDopFMRkgUs5F6p9VWc/P4mtmG2T
-PhRggb9/vc385obikEPop1MqlgyPFojyiZrLxeRRtrQ=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIDbzCCAtygAwIBAgIGAPMkA4ZsMAkGBSsOAwIdBQAwgawxCzAJBgNVBAYTAkFU
-MSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVDSE5PTE9HWTFHMEUGA1UE
-CxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRpb24gUHJvY2Vzc2luZyBh
-bmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsgVGVzdCBDQTEVMBMGA1UE
-AxMMSUFJSyBUZXN0IENBMB4XDTAzMDIwMzE0MDc0NVoXDTAzMTIzMDIyNTkzMFow
-gawxCzAJBgNVBAYTAkFUMSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVD
-SE5PTE9HWTFHMEUGA1UECxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRp
-b24gUHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsg
-VGVzdCBDQTEVMBMGA1UEAxMMSUFJSyBUZXN0IENBMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQCUWKl6uyR/isty2DLVdBzx074qOfJ+OP8J6PVi9GX527u0TTWT
-+LLL8bgYCwPOFQSrpqSmb2wOdxWwYQfhatKvzvUw4Ub/BfwEstfXs/xf6z4IF2KO
-mmRMDI1z8SE1701SFTUoYd9ZB8KUtyp6dFd4cIujO84DME+6RAZxtsGWLwIDAQAB
-o4GhMIGeMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgHGMDgGA1Ud
-HwQxMC8wLaAroCmGJ2h0dHA6Ly93d3cuaWFpay5hdC90ZXN0LWNhL3Rlc3RQQ0Eu
-Y3JsbDAdBgNVHQ4EFgQUTCCwVgIM94gKloilFLRRzDq18r8wHwYDVR0jBBgwFoAU
-TCCwVgIM94gKloilFLRRzDq18r8wCQYFKw4DAh0FAAOBgQCCx6VPjmUdeqGctQTh
-Sg2dEYdlal/X5k523nQ54SsoX2shIQK/8zJOGzQdMjebupIK+tPiZ7SJzsAaMUi4
-Hgqq3j1FK+KxLiqtt35twofVYOu15Zj0XIu8EMzvE05yntlPjtGbp9ll8dwMvabP
-+jWhCXAn6w2c2xdphL8nokSNLA==</dsig:X509Certificate><dsig:X509Certificate>MIID1zCCA0SgAwIBAgIGAPMkfTU7MAkGBSsOAwIdBQAwgawxCzAJBgNVBAYTAkFU
-MSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVDSE5PTE9HWTFHMEUGA1UE
-CxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRpb24gUHJvY2Vzc2luZyBh
-bmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsgVGVzdCBDQTEVMBMGA1UE
-AxMMSUFJSyBUZXN0IENBMB4XDTAzMDIwMzE2MjA1NVoXDTAzMTIzMDIyNTkzMFow
-gZgxCzAJBgNVBAYTAkFUMSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVD
-SE5PTE9HWTFHMEUGA1UECxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRp
-b24gUHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxGDAWBgNVBAMUD0lzb2xk
-ZSBC/HJnZXJpbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA53m0qng6O9zV
-IAuJ22Ps91X+pddhMiA9P0QusMexQ+QEkfe43nEFIToUZ3uuoAQFd+n4MXM6D68t
-ZctGU5O4W5Aq/bEjI4efIHS0EThzgNAymqmT9Z9IIEhqm/1jhQ4SXTW33y3Xn3lx
-26DiTeApftuQB388YlV+Rs+rTyF9iRUCAwEAAaOCARwwggEYMAwGA1UdEwEB/wQC
-MAAwDgYDVR0PAQH/BAQDAgbAMBEGCWCGSAGG+EIBAQQEAwIFIDBnBgNVHSAEYDBe
-MFwGDCsGAQQBlRIBAnsBATBMMEoGCCsGAQUFBwICMD4aPFRoaXMgY2VydGlmaWNh
-dGUgb25seSBtYXkgYmUgdXNlZCBmb3IgZGVtb25zdHJhdGlvbiBwdXJwb3NlczA8
-BgNVHR8ENTAzMDGgL6AthitodHRwOi8vd3d3LmlhaWsuYXQvdGVzdENBL2lhaWtf
-dGVzdF9zaWcuY3JsMB0GA1UdDgQWBBQoOuoIxS8M1o/DTZkJUs0lnN5A7TAfBgNV
-HSMEGDAWgBRMILBWAgz3iAqWiKUUtFHMOrXyvzAJBgUrDgMCHQUAA4GBACY81o8m
-zb8YCuTMgeplySm5nAkxjsv1T5n/Hzz1cLfSDJZ0HyNTVx/GDszY+Dx28MdW+6DL
-o9nWPSE/4P+k9HXJe/wEyAv44OrjvpzGGKjqoc3X8v4rzMo6MBRNluu0m3y1pktT
-V/q4aiWD/nbGXdrn/AoKAvOSAQ3Qe6X+dT/1</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature></XMLContent></VerifySignatureEnvironment>
-		<VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
-		</VerifySignatureInfo>
-		<ReturnHashInputData/>
-		<TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.002.Req.xml b/common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.002.Req.xml
deleted file mode 100644
index 7178fe842..000000000
--- a/common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.002.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 002-->
-<VerifyXMLSignatureRequest
-   xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
-   xmlns:xml="http://www.w3.org/XML/1998/namespace"   xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-		<VerifySignatureInfo>
-		<VerifySignatureEnvironment >
-		<XMLContent xml:space="preserve">
-<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI="http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>uBvOjC5KqIE1kJlrmm6BarlFxN5Hw8CIOQirPNQaFhasC8CoRtV6I8nC3ukIfbGv
-ZgrB8pAomCB7iRx26ofjKyl853IsJEd8Vba5dDopFMRkgUs5F6p9VWc/P4mtmG2T
-PhRggb9/vc385obikEPop1MqlgyPFojyiZrLxeRRtrQ=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIDbzCCAtygAwIBAgIGAPMkA4ZsMAkGBSsOAwIdBQAwgawxCzAJBgNVBAYTAkFU
-MSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVDSE5PTE9HWTFHMEUGA1UE
-CxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRpb24gUHJvY2Vzc2luZyBh
-bmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsgVGVzdCBDQTEVMBMGA1UE
-AxMMSUFJSyBUZXN0IENBMB4XDTAzMDIwMzE0MDc0NVoXDTAzMTIzMDIyNTkzMFow
-gawxCzAJBgNVBAYTAkFUMSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVD
-SE5PTE9HWTFHMEUGA1UECxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRp
-b24gUHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsg
-VGVzdCBDQTEVMBMGA1UEAxMMSUFJSyBUZXN0IENBMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQCUWKl6uyR/isty2DLVdBzx074qOfJ+OP8J6PVi9GX527u0TTWT
-+LLL8bgYCwPOFQSrpqSmb2wOdxWwYQfhatKvzvUw4Ub/BfwEstfXs/xf6z4IF2KO
-mmRMDI1z8SE1701SFTUoYd9ZB8KUtyp6dFd4cIujO84DME+6RAZxtsGWLwIDAQAB
-o4GhMIGeMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgHGMDgGA1Ud
-HwQxMC8wLaAroCmGJ2h0dHA6Ly93d3cuaWFpay5hdC90ZXN0LWNhL3Rlc3RQQ0Eu
-Y3JsbDAdBgNVHQ4EFgQUTCCwVgIM94gKloilFLRRzDq18r8wHwYDVR0jBBgwFoAU
-TCCwVgIM94gKloilFLRRzDq18r8wCQYFKw4DAh0FAAOBgQCCx6VPjmUdeqGctQTh
-Sg2dEYdlal/X5k523nQ54SsoX2shIQK/8zJOGzQdMjebupIK+tPiZ7SJzsAaMUi4
-Hgqq3j1FK+KxLiqtt35twofVYOu15Zj0XIu8EMzvE05yntlPjtGbp9ll8dwMvabP
-+jWhCXAn6w2c2xdphL8nokSNLA==</dsig:X509Certificate><dsig:X509Certificate>MIID1zCCA0SgAwIBAgIGAPMkfTU7MAkGBSsOAwIdBQAwgawxCzAJBgNVBAYTAkFU
-MSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVDSE5PTE9HWTFHMEUGA1UE
-CxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRpb24gUHJvY2Vzc2luZyBh
-bmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsgVGVzdCBDQTEVMBMGA1UE
-AxMMSUFJSyBUZXN0IENBMB4XDTAzMDIwMzE2MjA1NVoXDTAzMTIzMDIyNTkzMFow
-gZgxCzAJBgNVBAYTAkFUMSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVD
-SE5PTE9HWTFHMEUGA1UECxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRp
-b24gUHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxGDAWBgNVBAMUD0lzb2xk
-ZSBC/HJnZXJpbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA53m0qng6O9zV
-IAuJ22Ps91X+pddhMiA9P0QusMexQ+QEkfe43nEFIToUZ3uuoAQFd+n4MXM6D68t
-ZctGU5O4W5Aq/bEjI4efIHS0EThzgNAymqmT9Z9IIEhqm/1jhQ4SXTW33y3Xn3lx
-26DiTeApftuQB388YlV+Rs+rTyF9iRUCAwEAAaOCARwwggEYMAwGA1UdEwEB/wQC
-MAAwDgYDVR0PAQH/BAQDAgbAMBEGCWCGSAGG+EIBAQQEAwIFIDBnBgNVHSAEYDBe
-MFwGDCsGAQQBlRIBAnsBATBMMEoGCCsGAQUFBwICMD4aPFRoaXMgY2VydGlmaWNh
-dGUgb25seSBtYXkgYmUgdXNlZCBmb3IgZGVtb25zdHJhdGlvbiBwdXJwb3NlczA8
-BgNVHR8ENTAzMDGgL6AthitodHRwOi8vd3d3LmlhaWsuYXQvdGVzdENBL2lhaWtf
-dGVzdF9zaWcuY3JsMB0GA1UdDgQWBBQoOuoIxS8M1o/DTZkJUs0lnN5A7TAfBgNV
-HSMEGDAWgBRMILBWAgz3iAqWiKUUtFHMOrXyvzAJBgUrDgMCHQUAA4GBACY81o8m
-zb8YCuTMgeplySm5nAkxjsv1T5n/Hzz1cLfSDJZ0HyNTVx/GDszY+Dx28MdW+6DL
-o9nWPSE/4P+k9HXJe/wEyAv44OrjvpzGGKjqoc3X8v4rzMo6MBRNluu0m3y1pktT
-V/q4aiWD/nbGXdrn/AoKAvOSAQ3Qe6X+dT/1</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature></XMLContent></VerifySignatureEnvironment>
-		<VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
-		</VerifySignatureInfo>
-		<ReturnHashInputData/>
-		<TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.006.Req.xml b/common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.006.Req.xml
deleted file mode 100644
index f1d2829a9..000000000
--- a/common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.006.Req.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 006-->
-<VerifyXMLSignatureRequest
-   xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
-   xmlns:xml="http://www.w3.org/XML/1998/namespace"   xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-   <DateTime>2003-03-12T18:14:19+01:00</DateTime>
-		<VerifySignatureInfo>
-		<VerifySignatureEnvironment >
-		<XMLContent xml:space="preserve">
-<data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://10.16.46.109/TestDatenGenerator/resources/VX.006Schema.xsd"><dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#xpointer(id('manifestObject'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>W3OgtGHJLYYnhOXqmZIW05FU5oo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>KRE56cFvvz8z3CO6JGcSLVnfzBk8onz2Ri6P5q+oNLUuP/7Pzl9kImZTophZyDkW
-dh70iJ1XOKJM69WKzEtd0MhgGh4JkW6hjoaIxCjPjfE6RhUJpNSdzXSCt3izf+/p
-B9dQ6nukJrDJP73qUxtBo/j/tUmbG2sxANwCtvXmHBk=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIDbzCCAtygAwIBAgIGAPMkA4ZsMAkGBSsOAwIdBQAwgawxCzAJBgNVBAYTAkFU
-MSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVDSE5PTE9HWTFHMEUGA1UE
-CxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRpb24gUHJvY2Vzc2luZyBh
-bmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsgVGVzdCBDQTEVMBMGA1UE
-AxMMSUFJSyBUZXN0IENBMB4XDTAzMDIwMzE0MDc0NVoXDTAzMTIzMDIyNTkzMFow
-gawxCzAJBgNVBAYTAkFUMSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVD
-SE5PTE9HWTFHMEUGA1UECxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRp
-b24gUHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsg
-VGVzdCBDQTEVMBMGA1UEAxMMSUFJSyBUZXN0IENBMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQCUWKl6uyR/isty2DLVdBzx074qOfJ+OP8J6PVi9GX527u0TTWT
-+LLL8bgYCwPOFQSrpqSmb2wOdxWwYQfhatKvzvUw4Ub/BfwEstfXs/xf6z4IF2KO
-mmRMDI1z8SE1701SFTUoYd9ZB8KUtyp6dFd4cIujO84DME+6RAZxtsGWLwIDAQAB
-o4GhMIGeMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgHGMDgGA1Ud
-HwQxMC8wLaAroCmGJ2h0dHA6Ly93d3cuaWFpay5hdC90ZXN0LWNhL3Rlc3RQQ0Eu
-Y3JsbDAdBgNVHQ4EFgQUTCCwVgIM94gKloilFLRRzDq18r8wHwYDVR0jBBgwFoAU
-TCCwVgIM94gKloilFLRRzDq18r8wCQYFKw4DAh0FAAOBgQCCx6VPjmUdeqGctQTh
-Sg2dEYdlal/X5k523nQ54SsoX2shIQK/8zJOGzQdMjebupIK+tPiZ7SJzsAaMUi4
-Hgqq3j1FK+KxLiqtt35twofVYOu15Zj0XIu8EMzvE05yntlPjtGbp9ll8dwMvabP
-+jWhCXAn6w2c2xdphL8nokSNLA==</dsig:X509Certificate><dsig:X509Certificate>MIID1zCCA0SgAwIBAgIGAPMkfTU7MAkGBSsOAwIdBQAwgawxCzAJBgNVBAYTAkFU
-MSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVDSE5PTE9HWTFHMEUGA1UE
-CxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRpb24gUHJvY2Vzc2luZyBh
-bmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsgVGVzdCBDQTEVMBMGA1UE
-AxMMSUFJSyBUZXN0IENBMB4XDTAzMDIwMzE2MjA1NVoXDTAzMTIzMDIyNTkzMFow
-gZgxCzAJBgNVBAYTAkFUMSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVD
-SE5PTE9HWTFHMEUGA1UECxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRp
-b24gUHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxGDAWBgNVBAMUD0lzb2xk
-ZSBC/HJnZXJpbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA53m0qng6O9zV
-IAuJ22Ps91X+pddhMiA9P0QusMexQ+QEkfe43nEFIToUZ3uuoAQFd+n4MXM6D68t
-ZctGU5O4W5Aq/bEjI4efIHS0EThzgNAymqmT9Z9IIEhqm/1jhQ4SXTW33y3Xn3lx
-26DiTeApftuQB388YlV+Rs+rTyF9iRUCAwEAAaOCARwwggEYMAwGA1UdEwEB/wQC
-MAAwDgYDVR0PAQH/BAQDAgbAMBEGCWCGSAGG+EIBAQQEAwIFIDBnBgNVHSAEYDBe
-MFwGDCsGAQQBlRIBAnsBATBMMEoGCCsGAQUFBwICMD4aPFRoaXMgY2VydGlmaWNh
-dGUgb25seSBtYXkgYmUgdXNlZCBmb3IgZGVtb25zdHJhdGlvbiBwdXJwb3NlczA8
-BgNVHR8ENTAzMDGgL6AthitodHRwOi8vd3d3LmlhaWsuYXQvdGVzdENBL2lhaWtf
-dGVzdF9zaWcuY3JsMB0GA1UdDgQWBBQoOuoIxS8M1o/DTZkJUs0lnN5A7TAfBgNV
-HSMEGDAWgBRMILBWAgz3iAqWiKUUtFHMOrXyvzAJBgUrDgMCHQUAA4GBACY81o8m
-zb8YCuTMgeplySm5nAkxjsv1T5n/Hzz1cLfSDJZ0HyNTVx/GDszY+Dx28MdW+6DL
-o9nWPSE/4P+k9HXJe/wEyAv44OrjvpzGGKjqoc3X8v4rzMo6MBRNluu0m3y1pktT
-V/q4aiWD/nbGXdrn/AoKAvOSAQ3Qe6X+dT/1</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest Id="manifestObject"><dsig:Reference URI="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2jmj7l5rSw0yVb/vlWAYkK/YBwk=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="envelopedData">Dies sind Testdaten</dsig:Object></dsig:Signature>
-daten
-</data:Document>
-</XMLContent></VerifySignatureEnvironment>
-		<VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
-		</VerifySignatureInfo>
-		<SupplementProfile>
-			<Content Reference="http://10.16.46.109/TestDatenGenerator/resources/VX.006Schema.xsd">
-				<XMLContent xml:space="preserve">
-<xsd:schema targetNamespace="http://uri.data.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://uri.data.org" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xsd:element name="Document">
-		<xsd:complexType>
-			<xsd:sequence maxOccurs="unbounded">
-				<xsd:any namespace="##any" processContents="lax"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-</xsd:schema></XMLContent>
-			</Content>
-		</SupplementProfile>
-		<TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/common/data/test/xml/VerifyXMLSignature/VerifySAMLRequest.xml b/common/data/test/xml/VerifyXMLSignature/VerifySAMLRequest.xml
deleted file mode 100644
index 49a6e946c..000000000
--- a/common/data/test/xml/VerifyXMLSignature/VerifySAMLRequest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xml="http://www.w3.org/XML/1998/namespace">  <VerifySignatureInfo>    <VerifySignatureEnvironment>      <XMLContent xml:space="preserve"><saml:Assertion AssertionID="zmr.bmi.gv.at-AssertionID-2003-02-12T20:28:34.474" IssueInstant="2003-02-12T20:28:34.474" Issuer="http://zmr.bmi.gv.at/zmra/names#Issuer" MajorVersion="1" MinorVersion="0" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <saml:AttributeStatement>
-    <saml:Subject>
-      <saml:SubjectConfirmation>
-        <saml:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:sender-vouches</saml:ConfirmationMethod>
-        <saml:SubjectConfirmationData>
-          <pr:Person xsi:type="pr:PhysicalPersonType">
-            <pr:Identification>
-              <pr:Value>123456789012</pr:Value>
-              <pr:Type>http://reference.e-government.gv.at/names/persondata/20020228#zmr-zahl</pr:Type>
-            </pr:Identification>
-            <pr:Name>
-              <pr:GivenName>Hermann</pr:GivenName>
-              <pr:FamilyName primary="undefined">Muster</pr:FamilyName>
-            </pr:Name>
-            <pr:DateOfBirth>1968-10-22</pr:DateOfBirth>
-          </pr:Person>
-        </saml:SubjectConfirmationData>
-      </saml:SubjectConfirmation>
-    </saml:Subject>
-    <saml:Attribute AttributeName="CitizenPublicKey" AttributeNamespace="http://www.buergerkarte.at/namespaces/personenbindung/20020506#">
-      <saml:AttributeValue>
-        <dsig:RSAKeyValue xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-          <dsig:Modulus>0v1Ftf7WXgoexx0Jo/GrlExHOHnQIEQ5FFSjptLRd5BN1mZYRg2S9KfOMbHSCsiPm8AwjAEwE5EM A6P18Z/YyTIuP7fNGzckbB5PYIgNMHL8/TYJhHA8CjamsBrEfYDXivE8iAvALg5I9RMLZADmzL7a f2daYYuO8dycQw3xg6U=</dsig:Modulus>
-          <dsig:Exponent>AQAB</dsig:Exponent>
-        </dsig:RSAKeyValue>
-      </saml:AttributeValue>
-    </saml:Attribute>
-    <saml:Attribute AttributeName="CitizenPublicKey" AttributeNamespace="http://www.buergerkarte.at/namespaces/personenbindung/20020506#">
-      <saml:AttributeValue>
-        <dsig:RSAKeyValue xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-          <dsig:Modulus>i2qa56X4fpYeXqFLXAcQljGU3+DWnVgNrAxI9gn2bMeFWtLXE2SFa6qvl9EymUl0noBlFn0q9DWp AsyeLnRhzCAXJeSxiwsUEloOvcQCV0DfW2UVq0Y9bVlJ8KifJ2AS+5BxZ21mkc/VYx5Qz6EYjPrn pIpdAwR9sw5xnIvTySc=</dsig:Modulus>
-          <dsig:Exponent>AQAB</dsig:Exponent>
-        </dsig:RSAKeyValue>
-      </saml:AttributeValue>
-    </saml:Attribute></saml:AttributeStatement>
-<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>not(ancestor-or-self::pr:Identification)</dsig:XPath></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>s7TfoZrYo36OMdlxGxuIfAw/wr8=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>ancestor-or-self::dsig:Manifest</dsig:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>dO+RSn4xLHT3cuq8uopFtZyUBqo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>MFbZ5wA5cq0UezYFDXted5uqXubWFxxRwZawGh73XEAGxAbJsT/IEQmrTQThPRHNWW5RPGxVlPDz 5BmjberdaWlgJlbyKf3b/WpNNJYptQ7ijrXlsQoCzjfiQy37NEfvHEcxHQOA6sa42C+dFKsKIvmP 3mZkRYWJDxxsVzI7E+Y=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIDaDCCAtWgAwIBAgIBADAJBgUrDgMCHQUAMIGOMQswCQYDVQQGEwJBVDE9MDsG A1UEChQ0QnVuZGVzbWluaXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5n IHVuZCBTcG9ydDEjMCEGA1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMx GzAZBgNVBAMTEk1PQSBUZXN0IENBIC0gUm9vdDAeFw0wMzAyMTExNTE5NDRaFw0w MzEyMzEyMjU5MzBaMIGOMQswCQYDVQQGEwJBVDE9MDsGA1UEChQ0QnVuZGVzbWlu aXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5nIHVuZCBTcG9ydDEjMCEG A1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMxGzAZBgNVBAMTEk1PQSBU ZXN0IENBIC0gUm9vdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAjHuFphE3 +UkTe2OcIFWUDLzhPl1j2dH4sMPAhDK09/0i+aWrdtQW9yHktu/7+LTiCiPeevT0 lGMGDcWMSoSm66tYmpxei6YojCFIaVdJFtXZ7x1o7e7jTDVRLMfdZ5lI1sQ7loIY hOE0OmlYOkn4AI6xMtJtsca45rV8wW7qm8kCAwEAAaOB2zCB2DAPBgNVHRMBAf8E BTADAQH/MA4GA1UdDwEB/wQEAwIBBjBdBgNVHSAEVjBUMFIGDCsGAQQBlRIBAnsB ATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0IGlzdCBudXIgZvxy IFRlc3R6d2Vja2UgZ2VlaWduZXQuMB0GA1UdDgQWBBRDC612dCgZetTmAKyV6DII NkOoYTAWBgcqKAAKAQEBBAsMCUJNT0xTLUlLVDAfBgNVHSMEGDAWgBRDC612dCgZ etTmAKyV6DIINkOoYTAJBgUrDgMCHQUAA4GBAHj0xBNWGYLijaocjOX1AkL+r+G2 fZsX4z3S/2eEvtUp+EUHaOPMLTS0MIP1nwj5f4ZluAIrDLXihqMdi4xRv0W6QYbN aDxICNz3/QbrzMlFPeC8odesdRlT+GGswX0ZGUtVIZm1HVhxRk5ZEW2pr2afo5c0 Btxup/kgjGMnnS7C</dsig:X509Certificate><dsig:X509Certificate>MIIDiTCCAvagAwIBAgIBADAJBgUrDgMCHQUAMIGOMQswCQYDVQQGEwJBVDE9MDsG A1UEChQ0QnVuZGVzbWluaXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5n IHVuZCBTcG9ydDEjMCEGA1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMx GzAZBgNVBAMTEk1PQSBUZXN0IENBIC0gUm9vdDAeFw0wMzAyMTExNTI1MTRaFw0w MzEyMzEyMjU5MzBaMIGZMQswCQYDVQQGEwJBVDE9MDsGA1UEChQ0QnVuZGVzbWlu aXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5nIHVuZCBTcG9ydDEjMCEG A1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMxJjAkBgNVBAMTHU1PQSBU ZXN0IENBIC0gU2lnbmF0dXJkaWVuc3RlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB iQKBgQCw7ULOYSNji09Ein7Ar4j3Rjxjq05spBmZDmbSomEZMnGEtVTyIRzKc8ia 2kcXUMz5MEoFaVmvqRim31m20T21uvHFIs86gqzC/prOAz7V7HWok5F+9M/5gR1S BvpdqiEAXYeRXFPiOe8XSmpwhic7+n2jfuoBeYiRBEMGoP1DkwIDAQABo4HxMIHu MBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgHGMBEGCWCGSAGG+EIB AQQEAwIBAjBdBgNVHSAEVjBUMFIGDCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwIC MDQaMkRpZXNlcyBaZXJ0aWZpa2F0IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2Vl aWduZXQuMB0GA1UdDgQWBBSeRWvUfxEjKZSfxImJr/fpBDtMmTAWBgcqKAAKAQEB BAsMCUJNT0xTLUlLVDAfBgNVHSMEGDAWgBRDC612dCgZetTmAKyV6DIINkOoYTAJ BgUrDgMCHQUAA4GBAIMa4C2z3SbkcjEiMNAsHKaKUCJkBbMtNaab6U/cwwYmG6nl ga7xyEmbfY2SKzOqkcIwuv83Tma3rcr1f+OLUeGUaGLHt2Pl1a/s8BZGQZHWvLXv 7hV4RceEUHzVGAfvDD8iBJqBmfq/z/fBPFsgSup4nO1YECkDYfQ+sqCIP4ik</dsig:X509Certificate><dsig:X509Certificate>MIIDZzCCAtSgAwIBAgIBADAJBgUrDgMCHQUAMIGZMQswCQYDVQQGEwJBVDE9MDsG A1UEChQ0QnVuZGVzbWluaXN0ZXJpdW0gZvxyIPZmZmVudGxpY2hlIExlaXN0dW5n IHVuZCBTcG9ydDEjMCEGA1UECxMaSUtULVN0YWJzc3RlbGxlIGRlcyBCdW5kZXMx JjAkBgNVBAMTHU1PQSBUZXN0IENBIC0gU2lnbmF0dXJkaWVuc3RlMB4XDTAzMDIx MTE1MzI0NVoXDTAzMDgxMTE0MzI0NVowgYUxCzAJBgNVBAYTAkFUMSYwJAYDVQQK FB1CdW5kZXNtaW5pc3Rlcml1bSBm/HIgSW5uZXJlczEgMB4GA1UECxMXWmVudHJh bGVzIE1lbGRlcmVnaXN0ZXIxLDAqBgNVBAMTI1Rlc3QgU2lnbmF0dXJkaWVuc3Qg UGVyc29uZW5iaW5kdW5nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEzkpk QjbGjZwssN1+vMBE/ALMcA8LWFcILI3uxXaTSWGfTiLo9ECfzjuwYJG7FjEaeWrW nPEcp4VfMNocrm3T7Hw/ikpE5/+FsfTzD4MpIwwUPd/CUfA5vDNXK5CiP7qKKR1e vATO2s6lfDul+CS/eEbwzKmUQvZGrJggxg2m5wIDAQABo4HYMIHVMAwGA1UdEwEB /wQCMAAwDgYDVR0PAQH/BAQDAgbAMF0GA1UdIARWMFQwUgYMKwYBBAGVEgECAwEB MEIwQAYIKwYBBQUHAgIwNBoyRGllc2VzIFplcnRpZmlrYXQgaXN0IG51ciBm/HIg VGVzdHp3ZWNrZSBnZWVpZ25ldC4wHQYDVR0OBBYEFIpEyv43H3EtiGr4I7Z34bWj v2z6MBYGByooAAoBAQEECwwJQk1PTFMtSUtUMB8GA1UdIwQYMBaAFJ5Fa9R/ESMp lJ/EiYmv9+kEO0yZMAkGBSsOAwIdBQADgYEAfMBJRy/kp8HQa0lGIBfFrWNpxVPv RsIu+N4IiFrswrsoQoMAh6IqNyzSdq7rJC08xsDkXe5HOwkb+2zGKYoC3aQ/J/zr BGkg6ec4tOaS/VSdEQeTL1L30r2faTffWLUV3GrzL7pM7jN470hB1w8F6Hc3LCI7 kFfp23o/juVtJNw=</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>BqzfCB7dNg4G3u4YaxpD1tALdKI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></saml:Assertion></XMLContent>    </VerifySignatureEnvironment>    <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>  </VerifySignatureInfo>  <ReturnHashInputData/>  <TrustProfileID>TrustProfile1</TrustProfileID></VerifyXMLSignatureRequest>
diff --git a/common/lib/commons-logging-1.0.2/commons-logging-api.jar b/common/lib/commons-logging-1.0.2/commons-logging-api.jar
deleted file mode 100644
index d6ad90330..000000000
--- a/common/lib/commons-logging-1.0.2/commons-logging-api.jar
+++ /dev/null
diff --git a/common/lib/commons-logging-1.0.2/commons-logging.jar b/common/lib/commons-logging-1.0.2/commons-logging.jar
deleted file mode 100644
index aca1e4132..000000000
--- a/common/lib/commons-logging-1.0.2/commons-logging.jar
+++ /dev/null
diff --git a/common/lib/iaik-ecc/iaik_ecc.jar b/common/lib/iaik-ecc/iaik_ecc.jar
deleted file mode 100644
index c4771bbe8..000000000
--- a/common/lib/iaik-ecc/iaik_ecc.jar
+++ /dev/null
diff --git a/common/lib/iaik-jce-3.01/iaik_jce_full.jar b/common/lib/iaik-jce-3.01/iaik_jce_full.jar
deleted file mode 100644
index e560d2621..000000000
--- a/common/lib/iaik-jce-3.01/iaik_jce_full.jar
+++ /dev/null
diff --git a/common/lib/jaxen-1.0/jaxen-core.jar b/common/lib/jaxen-1.0/jaxen-core.jar
deleted file mode 100644
index e52bf679c..000000000
--- a/common/lib/jaxen-1.0/jaxen-core.jar
+++ /dev/null
diff --git a/common/lib/jaxen-1.0/jaxen-dom.jar b/common/lib/jaxen-1.0/jaxen-dom.jar
deleted file mode 100644
index 1a9926357..000000000
--- a/common/lib/jaxen-1.0/jaxen-dom.jar
+++ /dev/null
diff --git a/common/lib/jaxen-1.0/saxpath.jar b/common/lib/jaxen-1.0/saxpath.jar
deleted file mode 100644
index 2b43955ba..000000000
--- a/common/lib/jaxen-1.0/saxpath.jar
+++ /dev/null
diff --git a/common/lib/jaxp-1.2_01/dom.jar b/common/lib/jaxp-1.2_01/dom.jar
deleted file mode 100644
index f91f80a8b..000000000
--- a/common/lib/jaxp-1.2_01/dom.jar
+++ /dev/null
diff --git a/common/lib/jaxp-1.2_01/jaxp-api.jar b/common/lib/jaxp-1.2_01/jaxp-api.jar
deleted file mode 100644
index 7a3295ee6..000000000
--- a/common/lib/jaxp-1.2_01/jaxp-api.jar
+++ /dev/null
diff --git a/common/lib/jaxp-1.2_01/sax.jar b/common/lib/jaxp-1.2_01/sax.jar
deleted file mode 100644
index 9ffb844e5..000000000
--- a/common/lib/jaxp-1.2_01/sax.jar
+++ /dev/null
diff --git a/common/lib/jsse-1.0.3_01/jcert.jar b/common/lib/jsse-1.0.3_01/jcert.jar
deleted file mode 100644
index d33134214..000000000
--- a/common/lib/jsse-1.0.3_01/jcert.jar
+++ /dev/null
diff --git a/common/lib/jsse-1.0.3_01/jnet.jar b/common/lib/jsse-1.0.3_01/jnet.jar
deleted file mode 100644
index e1d340093..000000000
--- a/common/lib/jsse-1.0.3_01/jnet.jar
+++ /dev/null
diff --git a/common/lib/jsse-1.0.3_01/jsse.jar b/common/lib/jsse-1.0.3_01/jsse.jar
deleted file mode 100644
index 123188c5e..000000000
--- a/common/lib/jsse-1.0.3_01/jsse.jar
+++ /dev/null
diff --git a/common/lib/junit-3.8.1/junit.jar b/common/lib/junit-3.8.1/junit.jar
deleted file mode 100644
index 674d71e89..000000000
--- a/common/lib/junit-3.8.1/junit.jar
+++ /dev/null
diff --git a/common/lib/xalan-j-2.2/xalan.jar b/common/lib/xalan-j-2.2/xalan.jar
deleted file mode 100644
index 8dd6dca25..000000000
--- a/common/lib/xalan-j-2.2/xalan.jar
+++ /dev/null
diff --git a/common/lib/xerces-j-2.0.2/xercesImpl.jar b/common/lib/xerces-j-2.0.2/xercesImpl.jar
deleted file mode 100644
index f25d73cd7..000000000
--- a/common/lib/xerces-j-2.0.2/xercesImpl.jar
+++ /dev/null
diff --git a/common/lib/xerces-j-2.0.2/xmlParserAPIs.jar b/common/lib/xerces-j-2.0.2/xmlParserAPIs.jar
deleted file mode 100644
index c1fa1d645..000000000
--- a/common/lib/xerces-j-2.0.2/xmlParserAPIs.jar
+++ /dev/null
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.20020225.xsd b/common/res/resources/schemas/Core.20020225.xsd
deleted file mode 100644
index 2797cf612..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 targetNamespace="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" 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#" 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="lax"/>
-    </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.xsd b/common/res/resources/schemas/ECDSAKeyValue.xsd
deleted file mode 100644
index 833d327f2..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.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/MOA-ID-Configuration-1.1.xsd b/common/res/resources/schemas/MOA-ID-Configuration-1.1.xsd
deleted file mode 100644
index 59bd6562f..000000000
--- a/common/res/resources/schemas/MOA-ID-Configuration-1.1.xsd
+++ /dev/null
@@ -1,348 +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)  -->
-<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: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="MOAVPK"/>
-			<xsd:enumeration value="MOAPublicAuthority"/>
-			<xsd:enumeration value="MOABKZ"/>
-			<xsd:enumeration value="MOAQualifiedCertificate"/>
-			<xsd:enumeration value="MOAZMRZahl"/>
-			<xsd:enumeration value="MOAIPAddress"/>
-		</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: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="provideZMRZahl" 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>
-\ No newline at end of file
diff --git a/common/res/resources/schemas/MOA-SPSS-1.2.xsd b/common/res/resources/schemas/MOA-SPSS-1.2.xsd
deleted file mode 100644
index d7a06d6e7..000000000
--- a/common/res/resources/schemas/MOA-SPSS-1.2.xsd
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  MOA SP/SS 1.2 Schema
--->
-<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" 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#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="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 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">
-        <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">
-        <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="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ReferenceInputData" type="ContentExLocRefBaseType" 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="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:nonNegativeInteger" 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-Configuration-1.0.xsd b/common/res/resources/schemas/MOA-SPSS-Configuration-1.0.xsd
deleted file mode 100644
index 8eb488f48..000000000
--- a/common/res/resources/schemas/MOA-SPSS-Configuration-1.0.xsd
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stephan G (Comp) -->
-<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" 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" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<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="CanonicalizationAlgorithm" minOccurs="0">
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:anyURI" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="DigestMethodAlgorithm" minOccurs="0">
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:anyURI" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="SignatureAlgorithm" minOccurs="0">
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:anyURI" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="GenericConfiguration" minOccurs="0" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:string" use="required"/>
-						<xs:attribute name="value" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="HardwareCryptoModule" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>dient zum Konfigurieren von HW Crypto-Module via PKCS#11 (s. iaik.server.modules.crypto.HarwwareCryptoModuleConfiguration)</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="name" type="xs:string" use="required"/>
-						<xs:attribute name="slotID" type="xs:string" use="optional"/>
-						<xs:attribute name="userPIN" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="HardwareKeyModule" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>dient zum Konfigurieren von HW Key-Module via PKCS#11 (s. iaik.server. modules.crypto.HardwareKeyModuleConfiguration</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="id" type="xs:token" use="required"/>
-						<xs:attribute name="name" type="xs:string" use="required"/>
-						<xs:attribute name="slotID" type="xs:string" use="optional"/>
-						<xs:attribute name="userPIN" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="SoftwareKeyModule" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>dient zum Konfigurieren von SW Key-Module via PKCS#12 Dateien (s. iaik. server.modules.crypto.SoftwareKeyModuleConfiguration</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="id" type="xs:token" use="required"/>
-						<xs:attribute name="filename" type="xs:string" use="required"/>
-						<xs:attribute name="password" type="xs:string" use="optional"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="KeyGroup" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>definiert eine Gruppe von Keys</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:sequence maxOccurs="unbounded">
-							<xs:element name="Key">
-								<xs:annotation>
-									<xs:documentation>Ein Schlüssel wird bezeichnet durch ein Tripel bestehend aus der ID des KeyModules (siehe z.B. SoftwareKeyModule/@id), sowie Issuer und Seriennummer des zum Schlüssel gehörigen Zertifikats</xs:documentation>
-								</xs:annotation>
-								<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:attribute name="id" type="xs:token" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="KeyGroupMapping" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>ordnet oben definierte KeyGroups Online-Applikationen zu, die diese KeyGroups verwenden dürfen</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="X509IssuerSerial" type="dsig:X509IssuerSerialType" minOccurs="0">
-								<xs:annotation>
-									<xs:documentation>wenn das Element nicht auftritt, dann können die zugeordneten KeyGroups von allen Online-Applikationen verwendet werden</xs:documentation>
-								</xs:annotation>
-							</xs:element>
-							<xs:element name="KeyGroup" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:attribute name="id" type="xs:token" use="required"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="ChainingModes" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>spezifiziert den Algorithmus ("pkix" oder "chaining") für die Zertifikatspfadvalidierung</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:sequence minOccurs="0" maxOccurs="unbounded">
-							<xs:element name="TrustAnchor">
-								<xs:annotation>
-									<xs:documentation>ein vom SystemDefaultMode abweichender ChiningMode kann für jeden TrustAnchor gesetzt werden</xs:documentation>
-								</xs:annotation>
-								<xs:complexType>
-									<xs:complexContent>
-										<xs:extension base="dsig:X509IssuerSerialType">
-											<xs:attribute name="mode" type="config:ChainingModeType" use="required"/>
-										</xs:extension>
-									</xs:complexContent>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-						<xs:attribute name="systemDefaultMode" type="config:ChainingModeType" use="optional" default="pkix"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="CRLArchive" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>spezifiziert die Dauer, die Revozierungsinformation archiviert werden muss in Tagen</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="duration" type="xs:nonNegativeInteger" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="CRLDistributionPoint" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>spezifiziert  CRL Distribution Points</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="CAIssuerDN" type="xs:string">
-								<xs:annotation>
-									<xs:documentation>spezifiziert die CA, für die der u.a. DP verwendet werden soll</xs:documentation>
-								</xs:annotation>
-							</xs:element>
-							<xs:element name="DistributionPoint" maxOccurs="unbounded">
-								<xs:annotation>
-									<xs:documentation>das Attribut reasonCodes enthält eine Liste von möglichen reasonCodes lt. RFC 3280: unspecified, keyCompromise, cACompromise, affiliationChanged, superseded, cessationOfOperation, certificateHold, removeFromCRL, privilegeWithdrawn, aACompromise
-</xs:documentation>
-								</xs:annotation>
-								<xs:complexType>
-									<xs:attribute name="reasonCodes" type="xs:NMTOKENS" use="optional"/>
-									<xs:attribute name="uri" type="xs:anyURI" use="required"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="CreateTransformsInfoProfile" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>ordnet eine Datei, die ein CreateTransformsInfoProfile-Element enthält, einer id zu</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="id" type="xs:token" use="required"/>
-						<xs:attribute name="filename" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="CreateSignatureEnvironmentProfile" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>ordnet eine Datei, die ein CreateSignatureEnvironmentProfile-Element enthält, einer id zu</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="id" type="xs:token" use="required"/>
-						<xs:attribute name="filename" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="VerifyTransformsInfoProfile" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>ordnet eine Datei, die ein VerifyTransformsInfoProfile-Element enthält, einer id zu</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="id" type="xs:token" use="required"/>
-						<xs:attribute name="filename" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="SupplementProfile" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>ordnet eine Datei, die ein SupplementProfile-Element enthält, einer id zu</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="id" type="xs:token" use="required"/>
-						<xs:attribute name="filename" type="xs:string" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="TrustProfile" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>ordnet ein Verzeichnis, das vertrauenswürdige Zertifikate enthält einer id zu</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="id" type="xs:token" use="required"/>
-						<xs:attribute name="uri" type="xs:anyURI" use="required"/>
-					</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:schema>
diff --git a/common/res/resources/schemas/MOAIdentities.xsd b/common/res/resources/schemas/MOAIdentities.xsd
deleted file mode 100644
index f2aa8f8e0..000000000
--- a/common/res/resources/schemas/MOAIdentities.xsd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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:element>
-	
-	<xs:element name="MappingType">
-	<xs:complexType>
-		<xs:sequence maxOccurs="unbounded">
-			<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: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: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/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/at/gv/egovernment/moa/logging/LogMsg.java
deleted file mode 100644
index 4d04fc72d..000000000
--- a/common/src/at/gv/egovernment/moa/logging/LogMsg.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.gv.egovernment.moa.logging;
-
-/**
- * A unified message type to log messages from inside the MOA subsystem.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class LogMsg {
-  /** The message to log. */
-  private Object message;
-
-  /**
-   * Create a <code>LogMsg</code> object.
-   * 
-   * @param message The actual message to log. May be <code>null</code>. 
-   */
-  public LogMsg(Object message) {
-    this.message = message;
-  }
-
-  /**
-   * Convert this log message to a <code>String</code>.
-   * 
-   * @return The <code>String</code> representation of this log message. 
-   */
-  public String toString() {
-    StringBuffer msg = new StringBuffer();
-    LoggingContext ctx =
-      LoggingContextManager.getInstance().getLoggingContext();
-    String tid = ctx != null ? ctx.getTransactionID() : null;
-    String nodeId = ctx != null ? ctx.getNodeID() : null;
-    
-    msg.append("TID=");
-    msg.append(tid != null ? tid : "<null>");
-    msg.append(" NID=");
-    msg.append(nodeId != null ? nodeId : "<null>");
-    msg.append(" MSG=");
-    msg.append(message != null ? message.toString() : "<null>");
-
-    return msg.toString();
-  }
-}
diff --git a/common/src/at/gv/egovernment/moa/logging/Logger.java b/common/src/at/gv/egovernment/moa/logging/Logger.java
deleted file mode 100644
index eb7aa5634..000000000
--- a/common/src/at/gv/egovernment/moa/logging/Logger.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package at.gv.egovernment.moa.logging;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A utility class acting as a facade to the logging subsystem.
- * 
- * Configure the logging defaultHierarchy that the <code>Logger</code> uses by
- * calling <code>setHierarchy</code> once before calling any of the logging
- * output functions.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class Logger {
-  
-  /** The default logging hierarchy. */
-  private static String defaultHierarchy = "";
-  
-  /**
-   * Get the <code>Log</code> object for the default hierarchy.
-   * 
-   * @return The <code>Log</code> object to write log messages to.
-   */
-  private static Log getLog() {
-    return LogFactory.getLog(defaultHierarchy);
-  }
-
-  /**
-   * Get the <code>Log</code> object for a given hierarchy.
-   * 
-   * @param hierarchy The logging hierarchy for which to return the logger. 
-   * @return The <code>Log</code> object to write log messages to.
-   */
-  private static Log getLog(String hierarchy) {
-    return LogFactory.getLog(hierarchy);
-  }
-  
-  /**
-   * Set the default hierarchy to which the <code>Logger</code> should send its
-   * logging output.
-   * @param hierarchy The logging defaultHierarchy.
-   */
-  public static void setHierarchy(String hierarchy) {
-    defaultHierarchy = hierarchy;
-  }
-
-  /**
-   * Test, if the trace log level is enabled.
-   * 
-   * @return boolean <code>true</code>, if tracing output is enabled
-   * <code>false</code> otherwise.
-   */
-  public static boolean isTraceEnabled() {
-    return getLog().isTraceEnabled();
-  }
-  
-  /**
-   * Test, if the trace log level is enabled for a given hierarchy.
-   * 
-   * @param hierarchy requested log hierarchy
-   * @return boolean <code>true</code>, if tracing output is enabled
-   * <code>false</code> otherwise.
-   */
-  public static boolean isTraceEnabled(String hierarchy) {
-    return getLog(hierarchy).isTraceEnabled();
-  }
-  
-  /**
-   * Trace a message.
-   * 
-   * @param message The message to trace.
-   */
-  public static void trace(Object message) {
-    getLog().trace(message);
-  }
-  
-  /**
-   * Test, if the debug log level is enabled.
-   * 
-   * @return boolean <code>true</code>, if debug output is enabled
-   * <code>false</code> otherwise.
-   */
-  public static boolean isDebugEnabled() {
-    return getLog().isDebugEnabled();
-  }
-  
-  /**
-   * Test, if the debug log level is enabled for a given hierarchy.
-   * 
-   * @param hierarchy requested log hierarchy
-   * @return boolean <code>true</code>, if debug output is enabled
-   * <code>false</code> otherwise.
-   */
-  public static boolean isDebugEnabled(String hierarchy) {
-    return getLog(hierarchy).isDebugEnabled();
-  }
-  
-  /**
-   * Log a debug message.
-   * 
-   * @param message The message to log.
-   */
-  public static void debug(Object message) {
-    getLog().debug(message);
-  }
-  
-  /**
-   * Log an info message.
-   * 
-   * @param message The message to log.
-   */
-  public static void info(Object message) {
-    getLog().info(message);
-  }
-  
-  /**
-   * Log a warning message.
-   * 
-   * @param message The message to log.
-   */
-  public static void warn(Object message) {
-    getLog().warn(message);
-  }
-
-  /**
-   * Log a warning message.
-   * 
-   * @param message The message to log.
-   * @param t An exception that may be the cause of the warning.
-   */
-  public static void warn(Object message, Throwable t) {
-    getLog().warn(message, t);
-  }
-  
-  /**
-   * Log an error message.
-   * 
-   * @param message The message to log.
-   */
-  public static void error(Object message) {
-    getLog().error(message);
-  }
-
-  /**
-   * Log an error message.
-   * 
-   * @param message The message to log.
-   * @param t An exception that may be the cause of the error.
-   */
-  public static void error(Object message, Throwable t) {
-    getLog().error(message, t);
-  }
-  
-  /**
-   * Log a fatal error message.
-   * 
-   * @param message The message to log.
-   */
-  public static void fatal(Object message) {
-    getLog().fatal(message);
-  }
-
-  /**
-   * Log a fatal error message.
-   * 
-   * @param message The message to log.
-   * @param t An exception that may be the cause of the error.
-   */
-  public static void fatal(Object message, Throwable t) {
-    getLog().fatal(message, t);
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/logging/LoggingContext.java b/common/src/at/gv/egovernment/moa/logging/LoggingContext.java
deleted file mode 100644
index 42d8db06e..000000000
--- a/common/src/at/gv/egovernment/moa/logging/LoggingContext.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package at.gv.egovernment.moa.logging;
-
-/**
- * Encapsulates contextual information (i.e. per request information) for
- * logging purposes.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class LoggingContext {
-  /** The name of the node ID system property. */
-  public static final String NODE_ID_PROPERTY = "moa.node-id";
-  
-  /** The current transaction ID. */
-  private String transactionID;
-  /** The node ID. */
-  private String nodeID;
-  
-  /**
-   * Create a new <code>LoggingContext</code>.
-   * 
-   * @param transactionID The transaction ID. May be <code>null</code>.
-   */
-  public LoggingContext(String transactionID) {
-    this.transactionID = transactionID;
-    this.nodeID = System.getProperty(NODE_ID_PROPERTY);
-  }
-  
-  /**
-   * Return the transaction ID.
-   * 
-   * @return The transaction ID.
-   */
-  public String getTransactionID() {
-    return transactionID;
-  }
-  
-  /**
-   * Return the node ID.
-   * 
-   * @return The node ID.
-   */
-  public String getNodeID() {
-    return nodeID;
-  }
-}
diff --git a/common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java b/common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java
deleted file mode 100644
index 2bbe6caa1..000000000
--- a/common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package at.gv.egovernment.moa.logging;
-
-/**
- * Provides each thread with a single instance of <code>LoggingContext</code>.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class LoggingContextManager {
-  /** The single instance of this class. */
-  private static LoggingContextManager instance = null;
-  
-  /** The <code>LoggingContext</code> for each thread. */
-  private ThreadLocal context;
-  
-  /**
-   * Get the single instance of the <code>LoggingContextManager</code> class.
-   * 
-   * @return LoggingContextManager The single instance.
-   */
-  public static synchronized LoggingContextManager getInstance() {
-    if (instance == null) {
-      instance = new LoggingContextManager();
-    }
-    return instance;
-  }
-  
-  /**
-   * Creates a new <code>LoggingContextManager</code>.
-   * 
-   * Protected to disallow direct instantiation.
-   */
-  protected LoggingContextManager() {
-    context = new ThreadLocal();
-  }
-  
-  /**
-   * Set the <code>LoggingContext</code> context for the current thread.
-   * 
-   * @param ctx The <code>LoggingContext</code> for the current thread.
-   */
-  public void setLoggingContext(LoggingContext ctx) {
-    context.set(ctx);
-  }
-  
-  /**
-   * Return the <code>LoggingContext</code> for the current thread.
-   * 
-   * @return LoggingContext The <code>LoggingContext</code> for the current
-   * thread, or <code>null</code> if none has been set.
-   */
-  public LoggingContext getLoggingContext() {
-    return (LoggingContext) context.get();
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/Base64Utils.java b/common/src/at/gv/egovernment/moa/util/Base64Utils.java
deleted file mode 100644
index ba2c4fb0e..000000000
--- a/common/src/at/gv/egovernment/moa/util/Base64Utils.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import iaik.utils.Base64InputStream;
-import iaik.utils.Base64OutputStream;
-
-/**
- * Utitility functions for encoding/decoding Base64 strings.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class Base64Utils {
-
-  /**
-   * Read the bytes encoded in a Base64 encoded <code>String</code>. 
-   * 
-   * @param base64String The <code>String</code> containing the Base64 encoded
-   * bytes.
-   * @param ignoreInvalidChars Whether to ignore invalid Base64 characters.
-   * @return byte[] The raw bytes contained in the <code>base64String</code>.
-   * @throws IOException Failed to read the Base64 data.
-   */
-  public static byte[] decode(String base64String, boolean ignoreInvalidChars)
-    throws IOException {
-
-    Base64InputStream in =
-      new Base64InputStream(
-        new ByteArrayInputStream(base64String.getBytes("UTF-8")),
-        ignoreInvalidChars);
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    byte[] bytes = new byte[256];
-    int bytesRead;
-
-    while ((bytesRead = in.read(bytes)) > 0) {
-      out.write(bytes, 0, bytesRead);
-    }
-
-    return out.toByteArray();
-  }
-
-  /**
-   * Read the bytes encoded in a Base64 encoded <code>String</code> and provide
-   * them via an <code>InputStream</code>.
-   * 
-   * @param base64String The <code>String</code> containing the Base64 encoded
-   * bytes.
-   * @param ignoreInvalidChars Whether to ignore invalid Base64 characters.
-   * @return The <code>InputStream</code> from which the binary content of the
-   * <code>base64String</code> can be read.
-   */
-  public static InputStream decodeToStream(
-    String base64String,
-    boolean ignoreInvalidChars) {
-
-    try {
-      ByteArrayInputStream bin = 
-        new ByteArrayInputStream(base64String.getBytes("UTF-8"));
-      Base64InputStream in = new Base64InputStream(bin, ignoreInvalidChars);
-      
-      return in;
-    } catch (UnsupportedEncodingException e) {
-      // cannot occur, since UTF-8 is required to be supported by every JRE
-      return null; 
-    }
-  }
-
-  /**
-   * Convert a byte array to a Base64 encoded <code>String</code>.
-   * 
-   * @param bytes The bytes to encode.
-   * @return String The Base64 encoded representation of the <code>bytes</code>.
-   * @throws IOException Failed to write the bytes as Base64 data.
-   */
-  public static String encode(byte[] bytes) throws IOException {
-    return encode(new ByteArrayInputStream(bytes));
-  }
-
-  /**
-   * Convert the data contained in the given stream to a Base64 encoded
-   * <code>String</code>.
-   * 
-   * @param inputStream The stream containing the data to encode.
-   * @return The Base64 encoded data of <code>inputStream</code>, as a 
-   * <code>String</code>.
-   * @throws IOException Failed to convert the data in the stream.
-   */
-  public static String encode(InputStream inputStream) throws IOException {
-    ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-    Base64OutputStream base64Stream = new Base64OutputStream(byteStream);
-    byte[] bytes = new byte[256];
-    int bytesRead;
-
-    while ((bytesRead = inputStream.read(bytes)) > 0) {
-      base64Stream.write(bytes, 0, bytesRead);
-    }
-    base64Stream.flush();
-    base64Stream.close();
-    inputStream.close();
-
-    return byteStream.toString("UTF-8");
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/BoolUtils.java b/common/src/at/gv/egovernment/moa/util/BoolUtils.java
deleted file mode 100644
index fcd39b4dd..000000000
--- a/common/src/at/gv/egovernment/moa/util/BoolUtils.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-/**
- * Utility class for parsing XML schema boolean values.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class BoolUtils {
-  
-  /**
-   * Return the boolean value of an <code>xsd:boolean</code> type of DOM 
-   * element/attribute.
-   * 
-   * @param boolStr The value of the <code>xsd:boolean</code> element/attribute.
-   * @return <code>true</code>, if <code>boolStr</code> equals 
-   * <code>&quot;true&quot;</code> or <code>&quot;1;&quot;</code>. Otherwise,
-   * <code>false</code> is returned.
-   */
-  public static boolean valueOf(String boolStr) {
-    return "true".equals(boolStr) || "1".equals(boolStr);
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/CollectionUtils.java b/common/src/at/gv/egovernment/moa/util/CollectionUtils.java
deleted file mode 100644
index 5329dcbd2..000000000
--- a/common/src/at/gv/egovernment/moa/util/CollectionUtils.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Various utility methods for dealing with <code>java.util.Collection</code> 
- * classes. 
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class CollectionUtils {
-  
-  /**
-   * Convert a <code>List</code> of <code>Number</code> objects to an 
-   * <code>int</code> array.
-   * 
-   * @param nums The <code>List</code> containing the numbers whose integer
-   * value to put into the result. 
-   * @return The <code>int</code> values of the <code>Number</code>s contained
-   * in <code>nums</code>.
-   */
-  public static int[] toIntArray(List nums) {
-    int[] result = new int[nums.size()];
-    Iterator iter;
-    int i;
-    
-    for (i = 0, iter = nums.iterator(); iter.hasNext(); i++) {
-      Number num = (Number) iter.next();
-      result[i] = num.intValue();
-    }
-    
-    return result;
-  }
-}
diff --git a/common/src/at/gv/egovernment/moa/util/Constants.java b/common/src/at/gv/egovernment/moa/util/Constants.java
deleted file mode 100644
index 77a830c76..000000000
--- a/common/src/at/gv/egovernment/moa/util/Constants.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-/**
- * Contains various constants used throughout the system.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public interface Constants {
-  /** Root location of the schema files. */
-  public static final String SCHEMA_ROOT = "/resources/schemas/";
-
-  /** URI of the MOA XML namespace. */
-  public static final String MOA_NS_URI =
-    "http://reference.e-government.gv.at/namespace/moa/20020822#";
-
-  /** Prefix used for the MOA XML namespace */
-  public static final String MOA_PREFIX = "moa";
-
-  /** Local location of the MOA XML schema definition. */
-  public static final String MOA_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "MOA-SPSS-1.2.xsd";
-
-  /** URI of the MOA configuration XML namespace. */
-  public static final String MOA_CONFIG_NS_URI =
-    "http://reference.e-government.gv.at/namespace/moaconfig/20021122#";
-
-  /** URI of the MOA ID configuration XML namespace. */
-  public static final String MOA_ID_CONFIG_NS_URI =
-    "http://www.buergerkarte.at/namespaces/moaconfig#";
-
-  /** Prefix used for the MOA configuration XML namespace */
-  public static final String MOA_CONFIG_PREFIX = "conf";
-
-  /** Prefix used for the MOA configuration XML namespace */
-  public static final String MOA_ID_CONFIG_PREFIX = "confID";
-
-  /** Local location of the MOA configuration XML schema definition. */
-  public static final String MOA_CONFIG_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "MOA-SPSS-Configuration-1.0.xsd";
-
-  /** Local location of the MOA ID configuration XML schema definition. */
-  public static final String MOA_ID_CONFIG_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "MOA-ID-Configuration-1.1.xsd";
-
-  /** URI of the Security Layer 1.0 namespace. */
-  public static final String SL10_NS_URI =
-    "http://www.buergerkarte.at/namespaces/securitylayer/20020225#";
-
-  /** Prefix used for the Security Layer 1.0 XML namespace */
-  public static final String SL10_PREFIX = "sl10";
-
-  /** Local location of the Security Layer 1.0 XML schema definition */
-  public static final String SL10_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "Core.20020225.xsd";
-
-  /** URI of the Security Layer 1.1 XML namespace */
-  public static final String SL11_NS_URI =
-    "http://www.buergerkarte.at/namespaces/securitylayer/20020831#";
-
-  /** Prefix used for the Security Layer 1.1 XML namespace */
-  public static final String SL11_PREFIX = "sl11";
-
-  /** Local location of the Security Layer 1.1 XML schema definition */
-  public static final String SL11_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "Core.20020831.xsd";
-
-  /** URI of the ECDSA XML namespace */
-  public static final String ECDSA_NS_URI =
-    "http://www.buergerkarte.at/namespaces/ecdsa/200206030#";
-
-  /** Prefix used for ECDSA namespace */
-  public static final String ECDSA_PREFIX = "ecdsa";
-
-  /** Local location of ECDSA XML schema definition */
-  public static final String ECDSA_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "ECDSAKeyValue.xsd";
-
-  /** URI of the PersonData XML namespace. */
-  public static final String PD_NS_URI =
-    "http://reference.e-government.gv.at/namespace/persondata/20020228#";
-
-  /** Prefix used for the PersonData XML namespace */
-  public static final String PD_PREFIX = "pr";
-
-  /** Local location of the PersonData XML schema definition */
-  public static final String PD_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "PersonData.xsd";
-
-  /** URI of the SAML namespace. */
-  public static final String SAML_NS_URI =
-    "urn:oasis:names:tc:SAML:1.0:assertion";
-
-  /** Prefix used for the SAML XML namespace */
-  public static final String SAML_PREFIX = "saml";
-
-  /** Local location of the SAML XML schema definition. */
-  public static final String SAML_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "cs-sstc-schema-assertion-01.xsd";
-
-  /** URI of the SAML request-response protocol namespace. */
-  public static final String SAMLP_NS_URI =
-    "urn:oasis:names:tc:SAML:1.0:protocol";
-
-  /** Prefix used for the SAML request-response protocol namespace */
-  public static final String SAMLP_PREFIX = "samlp";
-
-  /** Local location of the SAML request-response protocol schema definition. */
-  public static final String SAMLP_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "cs-sstc-schema-protocol-01.xsd";
-
-  /** URI of the XML namespace. */
-  public static final String XML_NS_URI =
-    "http://www.w3.org/XML/1998/namespace";
-
-  /** Prefix used for the XML namespace */
-  public static final String XML_PREFIX = "xml";
-
-  /** Local location of the XML schema definition. */
-  public static final String XML_SCHEMA_LOCATION = SCHEMA_ROOT + "xml.xsd";
-
-  /** URI of the XMLNS namespace */
-  public static final String XMLNS_NS_URI = "http://www.w3.org/2000/xmlns/";
-
-  /** Prefix used for the XSI namespace */
-  public static final String XSI_PREFIX = "xsi";
-
-  /** Local location of the XSI schema definition. */
-  public static final String XSI_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "XMLSchema-instance.xsd";
-
-  /** URI of the XSI XMLNS namespace */
-  public static final String XSI_NS_URI =
-    "http://www.w3.org/2001/XMLSchema-instance";
-
-  /** URI of the XSLT XML namespace */
-  public static final String XSLT_NS_URI =
-    "http://www.w3.org/1999/XSL/Transform";
-
-  /** Prefix used for the XSLT XML namespace */
-  public static final String XSLT_PREFIX = "xsl";
-
-  /** URI of the XMLDSig XML namespace. */
-  public static final String DSIG_NS_URI = "http://www.w3.org/2000/09/xmldsig#";
-
-  /** Prefix used for the XMLDSig XML namespace */
-  public static final String DSIG_PREFIX = "dsig";
-
-  /** Local location of the XMLDSig XML schema. */
-  public static final String DSIG_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "xmldsig-core-schema.xsd";
-
-  /** URI of the XMLDSig XPath Filter XML namespace. */
-  public static final String DSIG_FILTER2_NS_URI =
-    "http://www.w3.org/2002/06/xmldsig-filter2";
-
-  /** Prefix used for the XMLDSig XPath Filter XML namespace */
-  public static final String DSIG_FILTER2_PREFIX = "dsig-filter2";
-
-  /** Local location of the XMLDSig XPath Filter XML schema definition. */
-  public static final String DSIG_FILTER2_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "xmldsig-filter2.xsd";
-
-  /** URI of the Exclusive Canonicalization XML namespace */
-  public static final String DSIG_EC_NS_URI =
-    "http://www.w3.org/2001/10/xml-exc-c14n#";
-
-  /** Prefix used for the Exclusive Canonicalization XML namespace */
-  public static final String DSIG_EC_PREFIX = "ec";
-
-  /** Local location of the Exclusive Canonicalizaion XML schema definition */
-  public static final String DSIG_EC_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "exclusive-canonicalization.xsd";
-
-  /**
-   * Contains all namespaces and local schema locations for XML schema
-   * definitions relevant for MOA. For use in validating XML parsers.
-   */
-  public static final String ALL_SCHEMA_LOCATIONS =
-    (MOA_NS_URI + " " + MOA_SCHEMA_LOCATION + " ")
-      + (MOA_CONFIG_NS_URI + " " + MOA_CONFIG_SCHEMA_LOCATION + " ")
-      + (MOA_ID_CONFIG_NS_URI + " " + MOA_ID_CONFIG_SCHEMA_LOCATION + " ")
-      + (SL10_NS_URI + " " + SL10_SCHEMA_LOCATION + " ")
-      + (SL11_NS_URI + " " + SL11_SCHEMA_LOCATION + " ")
-      + (ECDSA_NS_URI + " " + ECDSA_SCHEMA_LOCATION + " ")
-      + (PD_NS_URI + " " + PD_SCHEMA_LOCATION + " ")
-      + (SAML_NS_URI + " " + SAML_SCHEMA_LOCATION + " ")
-      + (SAMLP_NS_URI + " " + SAMLP_SCHEMA_LOCATION + " ")
-      + (XML_NS_URI + " " + XML_SCHEMA_LOCATION + " ")
-      + (XSI_NS_URI + " " + XSI_SCHEMA_LOCATION + " ")
-      + (DSIG_NS_URI + " " + DSIG_SCHEMA_LOCATION + " ")
-      + (DSIG_FILTER2_NS_URI + " " + DSIG_FILTER2_SCHEMA_LOCATION + " ")
-      + (DSIG_EC_NS_URI + " " + DSIG_EC_SCHEMA_LOCATION);
-
-  /** Security Layer manifest type URI. */
-  public static final String SL_MANIFEST_TYPE_URI =
-    "http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest";
-
-  /** URI of the SHA1 digest algorithm */
-  public static final String SHA1_URI =
-    "http://www.w3.org/2000/09/xmldsig#sha1";
-
-  /** URI of the Canonical XML algorithm */
-  public static final String C14N_URI =
-    "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
-
-  /** URI of the Canoncial XML with comments algorithm */
-  public static final String C14N_WITH_COMMENTS_URI =
-    "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments";
-
-  /** URI of the Exclusive Canonical XML algorithm */
-  public static final String EXC_C14N_URI =
-    "http://www.w3.org/2001/10/xml-exc-c14n#";
-  
-  /** URI of the Exclusive Canonical XML with commments algorithm */
-  public static final String EXC_C14N_WITH_COMMENTS_URI =
-    "http://www.w3.org/2001/10/xml-exc-c14n#WithComments";
-    
-  //
-  // Local names for elements of the MOA SPSS schema
-  //
-  
-  /** 
-   * Local name of request for creating an XML signature.
-   */
-  public static final String MOA_SPSS_CREATE_XML_REQUEST = "CreateXMLSignatureRequest";
-  
-  /** 
-   * Local name of request for verifying an XML signature.
-   */
-  public static final String MOA_SPSS_VERIFY_XML_REQUEST = "VerifiyXMLSignatureRequest";
-    
-}
diff --git a/common/src/at/gv/egovernment/moa/util/DOMUtils.java b/common/src/at/gv/egovernment/moa/util/DOMUtils.java
deleted file mode 100644
index 8e6394445..000000000
--- a/common/src/at/gv/egovernment/moa/util/DOMUtils.java
+++ /dev/null
@@ -1,810 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.parsers.SAXParser;
-import org.apache.xerces.parsers.XMLGrammarPreparser;
-import org.apache.xerces.util.SymbolTable;
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * Various utility functions for handling XML DOM trees.
- * 
- * The parsing methods in this class make use of some features internal to the
- * Xerces DOM parser, mainly for performance reasons. As soon as JAXP
- * (currently at version 1.2) is better at schema handling, it should be used as
- * the parser interface.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class DOMUtils {
-
-  /** Feature URI for namespace aware parsing. */
-  private static final String NAMESPACES_FEATURE =
-    "http://xml.org/sax/features/namespaces";
-  /** Feature URI for validating parsing. */
-  private static final String VALIDATION_FEATURE =
-    "http://xml.org/sax/features/validation";
-  /** Feature URI for schema validating parsing. */
-  private static final String SCHEMA_VALIDATION_FEATURE =
-    "http://apache.org/xml/features/validation/schema";
-  /** Feature URI for normalization of element/attribute values. */
-  private static final String NORMALIZED_VALUE_FEATURE =
-    "http://apache.org/xml/features/validation/schema/normalized-value";
-  /** Feature URI for parsing ignorable whitespace. */
-  private static final String INCLUDE_IGNORABLE_WHITESPACE_FEATURE =
-    "http://apache.org/xml/features/dom/include-ignorable-whitespace";
-  /** Feature URI for creating EntityReference nodes in the DOM tree. */
-  private static final String CREATE_ENTITY_REF_NODES_FEATURE =
-    "http://apache.org/xml/features/dom/create-entity-ref-nodes";
-  /** Property URI for providing external schema locations. */
-  private static final String EXTERNAL_SCHEMA_LOCATION_PROPERTY =
-    "http://apache.org/xml/properties/schema/external-schemaLocation";
-  /** Property URI for providing the external schema location for elements 
-   * without a namespace. */
-  private static final String EXTERNAL_NO_NAMESPACE_SCHEMA_LOCATION_PROPERTY =
-    "http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation";
-  /** Property URI for the Xerces grammar pool. */
-  private static final String GRAMMAR_POOL =
-    org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX
-      + org.apache.xerces.impl.Constants.XMLGRAMMAR_POOL_PROPERTY;
-  /** A prime number for initializing the symbol table. */
-  private static final int BIG_PRIME = 2039;
-  /** Symbol table for the grammar pool. */
-  private static SymbolTable symbolTable = new SymbolTable(BIG_PRIME);
-  /** Xerces schema grammar pool. */
-  private static XMLGrammarPool grammarPool = new XMLGrammarPoolImpl();
-  
-  static {
-    grammarPool.lockPool();
-  }
-
-  /**
-   * Preparse a schema and add it to the schema pool.
-   * 
-   * @param inputStream An <code>InputStream</code> providing the contents of
-   * the schema.
-   * @param systemId The systemId to use for the schema.
-   * @throws IOException An error occurred reading the schema.
-   */
-  public static void addSchemaToPool(InputStream inputStream, String systemId)
-    throws IOException {
-    XMLGrammarPreparser preparser;
-
-    // unlock the pool so that we can add another grammar
-    grammarPool.unlockPool();
-
-    // prepare the preparser
-    preparser = new XMLGrammarPreparser(symbolTable);
-    preparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA, null);
-    preparser.setProperty(GRAMMAR_POOL, grammarPool);
-    preparser.setFeature(NAMESPACES_FEATURE, true);
-    preparser.setFeature(VALIDATION_FEATURE, true);
-
-    // add the grammar to the pool
-    preparser.preparseGrammar(
-      XMLGrammarDescription.XML_SCHEMA,
-      new XMLInputSource(null, systemId, null, inputStream, null));
-
-    // lock the pool again so that schemas are not added automatically
-    grammarPool.lockPool();
-  }
-
-  /**
-   * Parse an XML document from an <code>InputStream</code>.
-   * 
-   * @param inputStream The <code>InputStream</code> containing the XML
-   * document.
-   * @param validating If <code>true</code>, parse validating.
-   * @param externalSchemaLocations A <code>String</code> containing namespace
-   * URI to schema location pairs, the same way it is accepted by the <code>xsi:
-   * schemaLocation</code> attribute. 
-   * @param externalNoNamespaceSchemaLocation The schema location of the
-   * schema for elements without a namespace, the same way it is accepted by the
-   * <code>xsi:noNamespaceSchemaLocation</code> attribute.
-   * @param entityResolver An <code>EntityResolver</code> to resolve external
-   * entities (schemas and DTDs). If <code>null</code>, it will not be set.
-   * @param errorHandler An <code>ErrorHandler</code> to decide what to do
-   * with parsing errors. If <code>null</code>, it will not be set.
-   * @return The parsed XML document as a DOM tree.
-   * @throws SAXException An error occurred parsing the document.
-   * @throws IOException An error occurred reading the document.
-   * @throws ParserConfigurationException An error occurred configuring the XML
-   * parser.
-   */
-  public static Document parseDocument(
-    InputStream inputStream,
-    boolean validating,
-    String externalSchemaLocations,
-    String externalNoNamespaceSchemaLocation,
-    EntityResolver entityResolver,
-    ErrorHandler errorHandler)
-    throws SAXException, IOException, ParserConfigurationException {
-
-    DOMParser parser;
-
-    // create the DOM parser
-    if (symbolTable != null) {
-      parser = new DOMParser(symbolTable, grammarPool);
-    } else {
-      parser = new DOMParser();
-    }
-
-    // set parser features and properties
-    parser.setFeature(NAMESPACES_FEATURE, true);
-    parser.setFeature(VALIDATION_FEATURE, validating);
-    parser.setFeature(SCHEMA_VALIDATION_FEATURE, validating);
-    parser.setFeature(NORMALIZED_VALUE_FEATURE, false);
-    parser.setFeature(INCLUDE_IGNORABLE_WHITESPACE_FEATURE, true);
-    parser.setFeature(CREATE_ENTITY_REF_NODES_FEATURE, false);
-
-    if (validating) {
-      if (externalSchemaLocations != null) {
-        parser.setProperty(
-          EXTERNAL_SCHEMA_LOCATION_PROPERTY,
-          externalSchemaLocations);
-      }
-      if (externalNoNamespaceSchemaLocation != null) {
-        parser.setProperty(
-          EXTERNAL_NO_NAMESPACE_SCHEMA_LOCATION_PROPERTY,
-          externalNoNamespaceSchemaLocation);
-      }
-    }
-
-    // set entity resolver and error handler
-    if (entityResolver != null) {
-      parser.setEntityResolver(entityResolver);
-    }
-    if (errorHandler != null) {
-      parser.setErrorHandler(errorHandler);
-    }
-
-    // parse the document and return it
-    parser.parse(new InputSource(inputStream));
-
-    return parser.getDocument();
-  }
-
-  /**
-   * Parse an XML document from an <code>InputStream</code>.
-   * 
-   * It uses a <code>MOAEntityResolver</code> as the <code>EntityResolver</code>
-   * and a <code>MOAErrorHandler</code> as the <code>ErrorHandler</code>.
-   * 
-   * @param inputStream The <code>InputStream</code> containing the XML
-   * document.
-   * @param validating If <code>true</code>, parse validating.
-   * @param externalSchemaLocations A <code>String</code> containing namespace
-   * URI to schema location pairs, the same way it is accepted by the <code>xsi:
-   * schemaLocation</code> attribute. 
-   * @param externalNoNamespaceSchemaLocation The schema location of the
-   * schema for elements without a namespace, the same way it is accepted by the
-   * <code>xsi:noNamespaceSchemaLocation</code> attribute.
-   * @return The parsed XML document as a DOM tree.
-   * @throws SAXException An error occurred parsing the document.
-   * @throws IOException An error occurred reading the document.
-   * @throws ParserConfigurationException An error occurred configuring the XML
-   * parser.
-   */
-  public static Document parseDocument(
-    InputStream inputStream,
-    boolean validating,
-    String externalSchemaLocations,
-    String externalNoNamespaceSchemaLocation)
-    throws SAXException, IOException, ParserConfigurationException {
-
-    return parseDocument(
-      inputStream,
-      validating,
-      externalSchemaLocations,
-      externalNoNamespaceSchemaLocation,
-      new MOAEntityResolver(),
-      new MOAErrorHandler());
-  }
-
-  /**
-   * Parse an XML document from a <code>String</code>.
-   * 
-   * It uses a <code>MOAEntityResolver</code> as the <code>EntityResolver</code>
-   * and a <code>MOAErrorHandler</code> as the <code>ErrorHandler</code>.
-   * 
-   * @param xmlString The <code>String</code> containing the XML document.
-   * @param encoding The encoding of the XML document.
-   * @param validating If <code>true</code>, parse validating.
-   * @param externalSchemaLocations A <code>String</code> containing namespace
-   * URI to schema location pairs, the same way it is accepted by the <code>xsi:
-   * schemaLocation</code> attribute. 
-   * @param externalNoNamespaceSchemaLocation The schema location of the
-   * schema for elements without a namespace, the same way it is accepted by the
-   * <code>xsi:noNamespaceSchemaLocation</code> attribute.
-   * @return The parsed XML document as a DOM tree.
-   * @throws SAXException An error occurred parsing the document.
-   * @throws IOException An error occurred reading the document.
-   * @throws ParserConfigurationException An error occurred configuring the XML
-   * parser.
-   */
-  public static Document parseDocument(
-    String xmlString,
-    String encoding,
-    boolean validating,
-    String externalSchemaLocations,
-    String externalNoNamespaceSchemaLocation)
-    throws SAXException, IOException, ParserConfigurationException {
-
-    InputStream in = new ByteArrayInputStream(xmlString.getBytes(encoding));
-    return parseDocument(
-      in,
-      validating,
-      externalSchemaLocations,
-      externalNoNamespaceSchemaLocation);
-  }
-
-  /**
-   * Parse an UTF-8 encoded XML document from a <code>String</code>.
-   * 
-   * @param xmlString The <code>String</code> containing the XML document.
-   * @param validating If <code>true</code>, parse validating.
-   * @param externalSchemaLocations A <code>String</code> containing namespace
-   * URI to schema location pairs, the same way it is accepted by the <code>xsi:
-   * schemaLocation</code> attribute. 
-   * @param externalNoNamespaceSchemaLocation The schema location of the
-   * schema for elements without a namespace, the same way it is accepted by the
-   * <code>xsi:noNamespaceSchemaLocation</code> attribute.
-   * @return The parsed XML document as a DOM tree.
-   * @throws SAXException An error occurred parsing the document.
-   * @throws IOException An error occurred reading the document.
-   * @throws ParserConfigurationException An error occurred configuring the XML
-   * parser.
-   */
-  public static Document parseDocument(
-    String xmlString,
-    boolean validating,
-    String externalSchemaLocations,
-    String externalNoNamespaceSchemaLocation)
-    throws SAXException, IOException, ParserConfigurationException {
-
-    return parseDocument(
-      xmlString,
-      "UTF-8",
-      validating,
-      externalSchemaLocations,
-      externalNoNamespaceSchemaLocation);
-  }
-
-  /**
-   * A convenience method to parse an XML document validating.
-   * 
-   * @param inputStream The <code>InputStream</code> containing the XML
-   * document.
-   * @return The root element of the parsed XML document.
-   * @throws SAXException An error occurred parsing the document.
-   * @throws IOException An error occurred reading the document.
-   * @throws ParserConfigurationException An error occurred configuring the XML
-   * parser.
-   */
-  public static Element parseXmlValidating(InputStream inputStream)
-    throws ParserConfigurationException, SAXException, IOException {
-    return DOMUtils
-      .parseDocument(inputStream, true, Constants.ALL_SCHEMA_LOCATIONS, null)
-      .getDocumentElement();
-  }
-
-  /**
-   * Schema validate a given DOM element.
-   * 
-   * @param element The element to validate.
-   * @param externalSchemaLocations A <code>String</code> containing namespace
-   * URI to schema location pairs, the same way it is accepted by the <code>xsi:
-   * schemaLocation</code> attribute. 
-   * @param externalNoNamespaceSchemaLocation The schema location of the
-   * schema for elements without a namespace, the same way it is accepted by the
-   * <code>xsi:noNamespaceSchemaLocation</code> attribute.
-   * @return <code>true</code>, if the <code>element</code> validates against
-   * the schemas declared in it.
-   * @throws SAXException An error occurred parsing the document.
-   * @throws IOException An error occurred reading the document from its
-   * serialized representation.
-   * @throws ParserConfigurationException An error occurred configuring the XML
-   * @throws TransformerException An error occurred serializing the element.
-   */
-  public static boolean validateElement(
-    Element element,
-    String externalSchemaLocations,
-    String externalNoNamespaceSchemaLocation)
-    throws
-      ParserConfigurationException,
-      IOException,
-      SAXException,
-      TransformerException {
-
-    byte[] docBytes;
-    SAXParser parser;
-
-    // create the SAX parser
-    if (symbolTable != null) {
-      parser = new SAXParser(symbolTable, grammarPool);
-    } else {
-      parser = new SAXParser();
-    }
-
-    // serialize the document
-    docBytes = serializeNode(element, "UTF-8");
-
-    // set up parser features and attributes
-    parser.setFeature(NAMESPACES_FEATURE, true);
-    parser.setFeature(VALIDATION_FEATURE, true);
-    parser.setFeature(SCHEMA_VALIDATION_FEATURE, true);
-    if (externalSchemaLocations != null) {
-      parser.setProperty(
-        EXTERNAL_SCHEMA_LOCATION_PROPERTY,
-        externalSchemaLocations);
-    }
-    if (externalNoNamespaceSchemaLocation != null) {
-      parser.setProperty(
-        EXTERNAL_NO_NAMESPACE_SCHEMA_LOCATION_PROPERTY,
-        "externalNoNamespaceSchemaLocation");
-    }
-
-    // set up entity resolver and error handler
-    parser.setEntityResolver(new MOAEntityResolver());
-    parser.setErrorHandler(new MOAErrorHandler());
-
-    // parse validating
-    parser.parse(new InputSource(new ByteArrayInputStream(docBytes)));
-    return true;
-  }
-
-  /**
-   * Serialize the given DOM node.
-   * 
-   * The node will be serialized using the UTF-8 encoding.
-   * 
-   * @param node The node to serialize.
-   * @return String The <code>String</code> representation of the given DOM
-   * node.
-   * @throws TransformerException An error occurred transforming the
-   * node to a <code>String</code>.
-   * @throws IOException An IO error occurred writing the node to a byte array.
-   */
-  public static String serializeNode(Node node)
-    throws TransformerException, IOException {
-    return new String(serializeNode(node, "UTF-8"), "UTF-8");
-  }
-
-  /**
-   * Serialize the given DOM node to a byte array.
-   * 
-   * @param node The node to serialize.
-   * @param xmlEncoding The XML encoding to use.
-   * @return The serialized node, as a byte array. Using a compatible encoding
-   * this can easily be converted into a <code>String</code>.
-   * @throws TransformerException An error occurred transforming the node to a 
-   * byte array.
-   * @throws IOException An IO error occurred writing the node to a byte array.
-   */
-  public static byte[] serializeNode(Node node, String xmlEncoding)
-    throws TransformerException, IOException {
-
-    TransformerFactory transformerFactory = TransformerFactory.newInstance();
-    Transformer transformer = transformerFactory.newTransformer();
-    ByteArrayOutputStream bos = new ByteArrayOutputStream(16384);
-
-    transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-    transformer.setOutputProperty(OutputKeys.ENCODING, xmlEncoding);
-    transformer.transform(new DOMSource(node), new StreamResult(bos));
-
-    bos.flush();
-    bos.close();
-
-    return bos.toByteArray();
-  }
-
-  /**
-    * Return the text that a node contains. 
-    * 
-    * This routine:
-    * <ul>
-    * <li>Ignores comments and processing instructions.</li>
-    * <li>Concatenates TEXT nodes, CDATA nodes, and the results recursively
-    * processing EntityRef nodes.</li>
-    * <li>Ignores any element nodes in the sublist. (Other possible options are
-    * to recurse into element sublists or throw an exception.)</li>
-    * </ul>
-    * 
-    * @param node A DOM node from which to extract text.
-    * @return A String representing its contents.
-    */
-  public static String getText(Node node) {
-    if (!node.hasChildNodes()) {
-      return "";
-    }
-
-    StringBuffer result = new StringBuffer();
-    NodeList list = node.getChildNodes();
-
-    for (int i = 0; i < list.getLength(); i++) {
-      Node subnode = list.item(i);
-      if (subnode.getNodeType() == Node.TEXT_NODE) {
-        result.append(subnode.getNodeValue());
-      } else if (subnode.getNodeType() == Node.CDATA_SECTION_NODE) {
-        result.append(subnode.getNodeValue());
-      } else if (subnode.getNodeType() == Node.ENTITY_REFERENCE_NODE) {
-        // Recurse into the subtree for text
-        // (and ignore comments)
-        result.append(getText(subnode));
-      }
-    }
-    return result.toString();
-  }
-
-  /**
-   * Build the namespace prefix to namespace URL mapping in effect for a given
-   * node.
-   * 
-   * @param node The context node for which build the map.
-   * @return The namespace prefix to namespace URL mapping (
-   * a <code>String</code> value to <code>String</code> value mapping).
-   */
-  public static Map getNamespaceDeclarations(Node node) {
-    Map nsDecls = new HashMap();
-    int i;
-
-    do {
-      if (node.hasAttributes()) {
-        NamedNodeMap attrs = node.getAttributes();
-
-        for (i = 0; i < attrs.getLength(); i++) {
-          Attr attr = (Attr) attrs.item(i);
-
-          // add prefix mapping if none exists
-          if ("xmlns".equals(attr.getPrefix())
-            || "xmlns".equals(attr.getName())) {
-
-            String nsPrefix =
-              attr.getPrefix() != null ? attr.getLocalName() : "";
-
-            if (nsDecls.get(nsPrefix) == null) {
-              nsDecls.put(nsPrefix, attr.getValue());
-            }
-          }
-        }
-      }
-    } while ((node = node.getParentNode()) != null);
-
-    return nsDecls;
-  }
-
-  /**
-   * Add all namespace declarations declared in the parent(s) of a given
-   * element and used in the subtree of the given element to the given element.  
-   * 
-   * @param context The element to which to add the namespaces.
-   */
-  public static void localizeNamespaceDeclarations(Element context) {
-    Node parent = context.getParentNode();
-
-    if (parent != null) {
-      Map namespaces = getNamespaceDeclarations(context.getParentNode());
-      Set nsUris = collectNamespaceURIs(context);
-      Iterator iter;
-
-      for (iter = namespaces.entrySet().iterator(); iter.hasNext();) {
-        Map.Entry e = (Map.Entry) iter.next();
-
-        if (nsUris.contains(e.getValue())) {
-          String prefix = (String) e.getKey();
-          String nsUri = (String) e.getValue();
-          String nsAttrName = "".equals(prefix) ? "xmlns" : "xmlns:" + prefix;
-
-          context.setAttributeNS(Constants.XMLNS_NS_URI, nsAttrName, nsUri);
-        }
-      }
-    }
-  }
-
-  /**
-   * Collect all the namespace URIs used in the subtree of a given element.
-   * 
-   * @param context The element that should be searched for namespace URIs.
-   * @return All namespace URIs used in the subtree of <code>context</code>,
-   * including the ones used in <code>context</code> itself.
-   */
-  public static Set collectNamespaceURIs(Element context) {
-    Set result = new HashSet();
-
-    collectNamespaceURIsImpl(context, result);
-    return result;
-  }
-
-  /**
-   * A recursive method to do the work of <code>collectNamespaceURIs</code>.
-   * 
-   * @param context The context element to evaluate.
-   * @param result The result, passed as a parameter to avoid unnecessary
-   * instantiations of <code>Set</code>.
-   */
-  private static void collectNamespaceURIsImpl(Element context, Set result) {
-    NamedNodeMap attrs = context.getAttributes();
-    NodeList childNodes = context.getChildNodes();
-    String nsUri;
-    int i;
-
-    // add the namespace of the context element
-    nsUri = context.getNamespaceURI();
-    if (nsUri != null && nsUri != Constants.XMLNS_NS_URI) {
-      result.add(nsUri);
-    }
-
-    // add all namespace URIs from attributes
-    for (i = 0; i < attrs.getLength(); i++) {
-      nsUri = attrs.item(i).getNamespaceURI();
-      if (nsUri != null && nsUri != Constants.XMLNS_NS_URI) {
-        result.add(nsUri);
-      }
-    }
-
-    // add all namespaces from subelements
-    for (i = 0; i < childNodes.getLength(); i++) {
-      Node node = childNodes.item(i);
-
-      if (node.getNodeType() == Node.ELEMENT_NODE) {
-        collectNamespaceURIsImpl((Element) node, result);
-      }
-    }
-  }
-
-  /**
-   * Check, that each attribute node in the given <code>NodeList</code> has its
-   * parent in the <code>NodeList</code> as well.
-   * 
-   * @param nodes The <code>NodeList</code> to check.
-   * @return <code>true</code>, if each attribute node in <code>nodes</code>
-   * has its parent in <code>nodes</code> as well.
-   */
-  public static boolean checkAttributeParentsInNodeList(NodeList nodes) {
-    Set nodeSet = new HashSet();
-    int i;
-
-    // put the nodes into the nodeSet
-    for (i = 0; i < nodes.getLength(); i++) {
-      nodeSet.add(nodes.item(i));
-    }
-
-    // check that each attribute node's parent is in the node list
-    for (i = 0; i < nodes.getLength(); i++) {
-      Node n = nodes.item(i);
-
-      if (n.getNodeType() == Node.ATTRIBUTE_NODE) {
-        Attr attr = (Attr) n;
-        Element owner = attr.getOwnerElement();
-
-        if (owner == null) {
-          if (!isNamespaceDeclaration(attr)) {
-            return false;
-          }
-        }
-
-        if (!nodeSet.contains(owner) && !isNamespaceDeclaration(attr)) {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Convert an unstructured <code>NodeList</code> into a 
-   * <code>DocumentFragment</code>.
-   *
-   * @param nodeList Contains the node list to be converted into a DOM 
-   * DocumentFragment.
-   * @return the resulting DocumentFragment. The DocumentFragment will be 
-   * backed by a new DOM Document, i.e. all noded of the node list will be 
-   * cloned.
-   * @throws ParserConfigurationException An error occurred creating the
-   * DocumentFragment.
-   * @precondition The nodes in the node list appear in document order.
-   * @precondition For each Attr node in the node list, the owning Element is 
-   * in the node list as well.
-   * @precondition Each Element or Attr node in the node list is namespace 
-   * aware.
-   */
-  public static DocumentFragment nodeList2DocumentFragment(NodeList nodeList)
-    throws ParserConfigurationException {
-
-    DocumentBuilder builder =
-      DocumentBuilderFactory.newInstance().newDocumentBuilder();
-    Document doc = builder.newDocument();
-    DocumentFragment result = doc.createDocumentFragment();
-
-    if (null == nodeList || nodeList.getLength() == 0) {
-      return result;
-    }
-
-    int currPos = 0;
-    currPos =
-      nodeList2DocumentFragment(nodeList, currPos, result, null, null) + 1;
-
-    while (currPos < nodeList.getLength()) {
-      currPos =
-        nodeList2DocumentFragment(nodeList, currPos, result, null, null) + 1;
-    }
-    return result;
-  }
-
-  /**
-   * Helper method for the <code>nodeList2DocumentFragment</code>.
-   * 
-   * @param nodeList The <code>NodeList</code> to convert.
-   * @param currPos The current position in the <code>nodeList</code>.
-   * @param result The resulting <code>DocumentFragment</code>.
-   * @param currOrgElem The current original element.
-   * @param currClonedElem The current cloned element.
-   * @return The current position.
-   */
-  private static int nodeList2DocumentFragment(
-    NodeList nodeList,
-    int currPos,
-    DocumentFragment result,
-    Element currOrgElem,
-    Element currClonedElem) {
-
-    while (currPos < nodeList.getLength()) {
-      Node currentNode = nodeList.item(currPos);
-      switch (currentNode.getNodeType()) {
-        case Node.COMMENT_NODE :
-        case Node.PROCESSING_INSTRUCTION_NODE :
-        case Node.TEXT_NODE :
-          {
-            // Append current node either to resulting DocumentFragment or to 
-            // current cloned Element
-            if (null == currClonedElem) {
-              result.appendChild(
-                result.getOwnerDocument().importNode(currentNode, false));
-            } else {
-              // Stop processing if current Node is not a descendant of 
-              // current Element
-              if (!isAncestor(currOrgElem, currentNode)) {
-                return --currPos;
-              }
-
-              currClonedElem.appendChild(
-                result.getOwnerDocument().importNode(currentNode, false));
-            }
-            break;
-          }
-
-        case Node.ELEMENT_NODE :
-          {
-            Element nextCurrOrgElem = (Element) currentNode;
-            Element nextCurrClonedElem =
-              result.getOwnerDocument().createElementNS(
-                nextCurrOrgElem.getNamespaceURI(),
-                nextCurrOrgElem.getNodeName());
-
-            // Append current Node either to resulting DocumentFragment or to 
-            // current cloned Element
-            if (null == currClonedElem) {
-              result.appendChild(nextCurrClonedElem);
-              currOrgElem = nextCurrOrgElem;
-              currClonedElem = nextCurrClonedElem;
-            } else {
-              // Stop processing if current Node is not a descendant of
-              // current Element
-              if (!isAncestor(currOrgElem, currentNode)) {
-                return --currPos;
-              }
-
-              currClonedElem.appendChild(nextCurrClonedElem);
-            }
-
-            // Process current Node (of type Element) recursively
-            currPos =
-              nodeList2DocumentFragment(
-                nodeList,
-                ++currPos,
-                result,
-                nextCurrOrgElem,
-                nextCurrClonedElem);
-
-            break;
-          }
-
-        case Node.ATTRIBUTE_NODE :
-          {
-            Attr currAttr = (Attr) currentNode;
-
-            // GK 20030411: Hack to overcome problems with IAIK IXSIL
-            if (currAttr.getOwnerElement() == null)
-              break;
-            if (currClonedElem == null)
-              break;
-
-            // currClonedElem must be the owner Element of currAttr if 
-            // preconditions are met
-            currClonedElem.setAttributeNS(
-              currAttr.getNamespaceURI(),
-              currAttr.getNodeName(),
-              currAttr.getValue());
-            break;
-          }
-
-        default :
-          {
-            // All other nodes will be ignored
-          }
-      }
-
-      currPos++;
-    }
-
-    return currPos;
-  }
-
-  /**
-   * Check, if the given attribute is a namespace declaration.
-   * 
-   * @param attr The attribute to check.
-   * @return <code>true</code>, if the attribute is a namespace declaration,
-   * <code>false</code> otherwise.
-   */
-  private static boolean isNamespaceDeclaration(Attr attr) {
-    return Constants.XMLNS_NS_URI.equals(attr.getNamespaceURI());
-  }
-
-  /**
-   * Check, if a given DOM element is an ancestor of a given node.
-   * 
-   * @param candAnc The DOM element to check for being the ancestor.
-   * @param cand The node to check for being the child.
-   * @return <code>true</code>, if <code>candAnc</code> is an (indirect) 
-   * ancestor of <code>cand</code>; <code>false</code> otherwise.
-   */
-  public static boolean isAncestor(Element candAnc, Node cand) {
-    Node currPar = cand.getParentNode();
-
-    while (currPar != null) {
-      if (candAnc == currPar)
-        return true;
-      currPar = currPar.getParentNode();
-    }
-    return false;
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/DateTimeUtils.java b/common/src/at/gv/egovernment/moa/util/DateTimeUtils.java
deleted file mode 100644
index 58cc04c4c..000000000
--- a/common/src/at/gv/egovernment/moa/util/DateTimeUtils.java
+++ /dev/null
@@ -1,326 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.StringWriter;
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-
-/**
- * Utility for parsing and building XML type <code>dateTime</code>,
- * according to ISO 8601.
- * 
- * @author Patrick Peck
- * @version $Id$
- * @see <code>http://www.w3.org/2001/XMLSchema-datatypes"</code>
- */
-public class DateTimeUtils {
-  /** Error messages. */
-  private static MessageProvider msg = MessageProvider.getInstance();
-
-  /**
-   * Builds a <code>dateTime</code> value from a <code>Calendar</code> value.
-   * @param cal the <code>Calendar</code> value
-   * @return the <code>dateTime</code> value
-   */
-  public static String buildDateTime(Calendar cal) {
-    StringWriter out = new StringWriter();
-    out.write("" + cal.get(Calendar.YEAR));
-    out.write("-");
-    out.write(to2DigitString(cal.get(Calendar.MONTH) + 1));
-    out.write("-");
-    out.write(to2DigitString(cal.get(Calendar.DAY_OF_MONTH)));
-    out.write("T");
-    out.write(to2DigitString(cal.get(Calendar.HOUR_OF_DAY)));
-    out.write(":");
-    out.write(to2DigitString(cal.get(Calendar.MINUTE)));
-    out.write(":");
-    out.write(to2DigitString(cal.get(Calendar.SECOND)));
-    int tzOffsetMilliseconds =
-      cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET);
-    if (tzOffsetMilliseconds != 0) {
-      int tzOffsetMinutes = tzOffsetMilliseconds / (1000 * 60);
-      int tzOffsetHours = tzOffsetMinutes / 60;
-      tzOffsetMinutes -= tzOffsetHours * 60;
-      if (tzOffsetMilliseconds > 0) {
-        out.write("+");
-        out.write(to2DigitString(tzOffsetHours));
-        out.write(":");
-        out.write(to2DigitString(tzOffsetMinutes));
-      } else {
-        out.write("-");
-        out.write(to2DigitString(-tzOffsetHours));
-        out.write(":");
-        out.write(to2DigitString(-tzOffsetMinutes));
-      }
-    }
-    return out.toString();
-  }
-  
-  /**
-   * Converts month, day, hour, minute, or second value
-   * to a 2 digit String.
-   * @param number the month, day, hour, minute, or second value
-   * @return 2 digit String
-   */
-  private static String to2DigitString(int number) {
-    if (number < 10)
-      return "0" + number;
-    else
-      return "" + number;
-  }
-
-  /**
-   * Parse a <code>String</code> containing a date and time instant, given in
-   * ISO 8601 format.
-   * 
-   * @param dateTime The <code>String</code> to parse.
-   * @return The <code>Date</code> representation of the contents of
-   * <code>dateTime</code>.
-   * @throws ParseException Parsing the <code>dateTime</code> failed.
-   */
-  public static Date parseDateTime(String dateTime) throws ParseException {
-    GregorianCalendar calendar;
-    long time;
-    int yearSign = 1, year, month, day;
-    int hour, minute, second;
-    double fraction = 0.0;
-    int tzSign = 1, tzHour = 0, tzMinute = 0;
-    int curPos = 0;
-    String fractStr;
-    boolean localTime = false;
-    char c;
-
-    // parse year sign
-    ensureChars(dateTime, curPos, 1);
-    c = dateTime.charAt(curPos);
-    if (c == '+' || c == '-') {
-      yearSign = c == '+' ? 1 : -1;
-      curPos++;
-    }
-
-    // parse year
-    year = parseInt(dateTime, curPos, 4);
-    curPos += 4;
-
-    // parse '-'
-    ensureChar(dateTime, curPos, '-');
-    curPos++;
-
-    // parse month
-    month = parseInt(dateTime, curPos, 2);
-    ensureValue(month, 1, 12, curPos);
-    curPos += 2;
-
-    // parse '-'
-    ensureChar(dateTime, curPos, '-');
-    curPos++;
-
-    // parse day
-    day = parseInt(dateTime, curPos, 2);
-    ensureValue(day, 1, 31, curPos);
-    curPos += 2;
-
-    // parse 'T'
-    ensureChar(dateTime, curPos, 'T');
-    curPos++;
-
-    // parse hour
-    hour = parseInt(dateTime, curPos, 2);
-    ensureValue(hour, 0, 23, curPos);
-    curPos += 2;
-
-    // parse ':'
-    ensureChar(dateTime, curPos, ':');
-    curPos++;
-
-    // parse minute
-    minute = parseInt(dateTime, curPos, 2);
-    ensureValue(minute, 0, 59, curPos);
-    curPos += 2;
-
-    // parse ':'
-    ensureChar(dateTime, curPos, ':');
-    curPos++;
-
-    // parse second
-    second = parseInt(dateTime, curPos, 2);
-    ensureValue(second, 0, 59, curPos);
-    curPos += 2;
-
-    // parse a fraction
-    if (dateTime.length() > curPos && dateTime.charAt(curPos) == '.') {
-      curPos++;
-      ensureDigits(dateTime, curPos, 1);
-      fractStr = "0.";
-      fractStr
-        += dateTime.substring(curPos, curPos + countDigits(dateTime, curPos));
-      fraction = Double.parseDouble(fractStr);
-      curPos += countDigits(dateTime, curPos);
-    }
-
-    // parse a time zone
-    if (dateTime.length() > curPos) {
-      c = dateTime.charAt(curPos);
-      if (c == 'Z') {
-        curPos++;
-      } else if (c == '+' || c == '-') {
-        // parse time zone sign
-        tzSign = c == '+' ? 1 : -1;
-        curPos++;
-
-        // parse time zone hour
-        tzHour = parseInt(dateTime, curPos, 2);
-        ensureValue(tzHour, 0, 14, curPos);
-        curPos += 2;
-
-        // parse ':'
-        ensureChar(dateTime, curPos, ':');
-        curPos++;
-
-        // parse time zone minute
-        tzMinute = parseInt(dateTime, curPos, 2);
-        ensureValue(tzMinute, 0, 59, curPos);
-        curPos += 2;
-      }
-    } else {
-      localTime = true;
-    }
-
-    // if we have characters left, it's an error
-    if (dateTime.length() != curPos) {
-      throw new ParseException(msg.getMessage("datetime.00", null), curPos);
-    }
-
-    // build the Date object
-    year = year * yearSign;
-    try {
-      calendar = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
-      calendar.set(year, month - 1, day, hour, minute, second);
-      calendar.set(Calendar.MILLISECOND, 0);
-      time = calendar.getTime().getTime();
-      time += (long) (fraction * 1000.0);
-      time -= tzSign * ((tzHour * 60) + tzMinute) * 60 * 1000;
-      if (localTime) {
-        time -= TimeZone.getDefault().getRawOffset();        
-      }
-      return new Date(time);
-    } catch (IllegalArgumentException e) {
-      throw new ParseException(msg.getMessage("datetime.00", null), curPos);
-    }
-
-  }
-
-  /**
-   * Parse an integer value.
-   * 
-   * @param str The <code>String</code> containing the digits.
-   * @param curPos The starting position.
-   * @param digits The number of digist making up the integer value.
-   * @return int The integer representation of the digits contained in
-   * <code>str</code>.
-   * @throws ParseException Parsing the integer value failed.
-   */
-  private static int parseInt(String str, int curPos, int digits)
-    throws ParseException {
-
-    ensureDigits(str, curPos, digits);
-    return Integer.parseInt(str.substring(curPos, curPos + digits));
-  }
-
-  /**
-   * Count the number of digits following <code>curPos</code>.
-   * 
-   * @param str The <code>String</code> in which to count digits.
-   * @param curPos The starting position.
-   * @return int The number of digits.
-   */
-  private static int countDigits(String str, int curPos) {
-    int i;
-
-    for (i = curPos; i < str.length() && Character.isDigit(str.charAt(i)); i++);
-    return i - curPos;
-  }
-
-  /**
-   * Ensure that a value falls in a given min/max range.
-   * 
-   * @param value The value to check.
-   * @param min The minimum allowed value.
-   * @param max The maximum allowed value.
-   * @param curPos To indicate the parsing position in the
-   * <code>ParseException</code>.
-   * @throws ParseException Thrown, if <code>value &lt; min || value &gt;
-   * max</code>
-   */
-  private static void ensureValue(int value, int min, int max, int curPos)
-    throws ParseException {
-
-    if (value < min || value > max) {
-      throw new ParseException(msg.getMessage("datetime.00", null), curPos);
-    }
-  }
-
-  /**
-   * Ensure that the given <code>String</code> has a number of characters left.
-   * 
-   * @param str The <code>String</code> to check for its length.
-   * @param curPos The starting position.
-   * @param count The minimum number of characters that <code>str</code> must
-   * contain, starting at from <code>curPos</code>.
-   * @throws ParseException Thrown, if 
-   * <code>curPos + count &gt; str.length()</code>.
-   */
-  private static void ensureChars(String str, int curPos, int count)
-    throws ParseException {
-    if (curPos + count > str.length()) {
-      throw new ParseException(msg.getMessage("datetime.00", null), curPos);
-    }
-  }
-
-  /**
-   * Ensure that a given <code>String</code> contains a certain character at a
-   * certain position.
-   * 
-   * @param str The <code>String</code> in which to look up the character. 
-   * @param curPos The position in <code>str</code> that must contain the
-   * character.
-   * @param c The character value that must be contained at position
-   * <code>curPos</code>.
-   * @throws ParseException Thrown, if the characters do not match or
-   * <code>curPos</code> is out of range.
-   */
-  private static void ensureChar(String str, int curPos, char c)
-    throws ParseException {
-
-    ensureChars(str, curPos, 1);
-    if (str.charAt(curPos) != c) {
-      throw new ParseException(msg.getMessage("datetime.00", null), curPos);
-    }
-  }
-
-  /**
-   * Ensure that a given <code>String</code> contains a number of digits,
-   * starting at a given position.
-   * 
-   * @param str The <code>String</code> to scan for digits. 
-   * @param curPos The starting postion.
-   * @param count The number of digits that must be contained in
-   * <code>str</code>, starting at <code>curPos</code>.
-   * @throws ParseException Thrown, if <code>str</code> is not long enough, or
-   * one of the characters following <code>curPos</code> in <code>str</code> is
-   * not a digit.
-   */
-  private static void ensureDigits(String str, int curPos, int count)
-    throws ParseException {
-
-    ensureChars(str, curPos, count);
-    for (int i = curPos; i < curPos + count; i++) {
-      if (!Character.isDigit(str.charAt(i))) {
-        throw new ParseException(msg.getMessage("datetime.00", null), curPos);
-      }
-    }
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/EntityResolverChain.java b/common/src/at/gv/egovernment/moa/util/EntityResolverChain.java
deleted file mode 100644
index e7008a701..000000000
--- a/common/src/at/gv/egovernment/moa/util/EntityResolverChain.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * Implementation of the <code>org.xml.sax.EntityResolver</code>,
- * for use by a <code>org.apache.xerces.parsers.DOMParser</code>.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class EntityResolverChain implements EntityResolver {
-  /** The <code>EntityResolver</code>s in the chain. */
-  private List resolvers = new ArrayList();
-
-  /**
-   * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-   */
-  public InputSource resolveEntity(String publicId, String systemId)
-    throws SAXException, IOException {
-    
-    Iterator iter;
-    
-    for (iter = resolvers.iterator(); iter.hasNext(); ) {
-      EntityResolver resolver = (EntityResolver) iter.next();
-      InputSource is = resolver.resolveEntity(publicId, systemId);
-      
-      if (is != null) {
-        return is;
-      }
-    }
-    
-    return null;
-  }
-  
-  /**
-   * Add an <code>EntityResolver</code> to the chain.
-   * 
-   * @param entityResolver The <code>EntityResolver</code> to add.
-   */
-  public void addEntityResolver(EntityResolver entityResolver) {
-    resolvers.add(entityResolver);
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/FileUtils.java b/common/src/at/gv/egovernment/moa/util/FileUtils.java
deleted file mode 100644
index ae8d83834..000000000
--- a/common/src/at/gv/egovernment/moa/util/FileUtils.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-/**
- * Utility for accessing files on the file system, and for reading from input streams.
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class FileUtils {
-  
-  /**
-   * Reads a file, given by URL, into a byte array.
-   * @param urlString file URL
-   * @return file content
-   * @throws IOException on any exception thrown
-   */
-  public static byte[] readURL(String urlString) throws IOException {
-    URL url = new URL(urlString);
-    InputStream in = new BufferedInputStream(url.openStream());
-    byte[] content = StreamUtils.readStream(in);
-    in.close();
-    return content;
-  }
-  /**
-   * Reads a file, given by URL, into a String.
-   * @param urlString file URL
-   * @param encoding character encoding
-   * @return file content
-   * @throws IOException on any exception thrown
-   */
-  public static String readURL(String urlString, String encoding) throws IOException {
-    byte[] content = readURL(urlString);
-    return new String(content, encoding);
-  }
-  /**
-   * Reads a file, given by filename, into a byte array.
-   * @param filename filename
-   * @return file content
-   * @throws IOException on any exception thrown
-   */
-  public static byte[] readFile(String filename) throws IOException {
-    BufferedInputStream in = new BufferedInputStream(new FileInputStream(filename));
-    byte[] content = StreamUtils.readStream(in);
-    in.close();
-    return content;
-  }
-  /**
-   * Reads a file, given by filename, into a String.
-   * @param filename filename
-   * @param encoding character encoding
-   * @return file content
-   * @throws IOException on any exception thrown
-   */
-  public static String readFile(String filename, String encoding) throws IOException {
-    byte[] content = readFile(filename);
-    return new String(content, encoding);
-  }
-  /**
-   * Reads a file from a resource.
-   * @param name resource name
-   * @return file content as a byte array
-   * @throws IOException on any exception thrown
-   */
-  public static byte[] readResource(String name) throws IOException {
-    ClassLoader cl = FileUtils.class.getClassLoader();
-    BufferedInputStream in = new BufferedInputStream(cl.getResourceAsStream(name));
-    byte[] content = StreamUtils.readStream(in);
-    in.close();
-    return content;
-  }
-  /**
-   * Reads a file from a resource.
-   * @param name filename
-   * @param encoding character encoding
-   * @return file content
-   * @throws IOException on any exception thrown
-   */
-  public static String readResource(String name, String encoding) throws IOException {
-    byte[] content = readResource(name);
-    return new String(content, encoding);
-  }
-  
-	/**
-	 * Returns the absolute URL of a given url which is relative to the parameter root
-	 * @param url
-	 * @param root
-	 * @return String
-	 */
-	public static String makeAbsoluteURL(String url, String root) {
-		//if url is relative to rootConfigFileDirName make it absolute 					
-		
-    File keyFile;
-    String newURL = url;
-
-		if(null == url) return  null;
-
-    // check if absolute - if not make it absolute
-    keyFile = new File(url);
-    if (!keyFile.isAbsolute()) {
-      keyFile = new File(root, url);
-      newURL = keyFile.getPath();
-    }
-    return newURL;
-	}  
-  
-}
diff --git a/common/src/at/gv/egovernment/moa/util/KeyStoreUtils.java b/common/src/at/gv/egovernment/moa/util/KeyStoreUtils.java
deleted file mode 100644
index d6a34a7b2..000000000
--- a/common/src/at/gv/egovernment/moa/util/KeyStoreUtils.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import iaik.x509.X509Certificate;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.cert.Certificate;
-
-/**
- * Utility for creating and loading key stores.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class KeyStoreUtils {
-
-  /**
-   * Loads a key store from file.
-   * 
-   * @param keystoreType key store type
-   * @param urlString URL of key store
-   * @param password password protecting the key store
-   * @return key store loaded
-   * @throws IOException thrown while reading the key store from file
-   * @throws GeneralSecurityException thrown while creating the key store
-   */
-  public static KeyStore loadKeyStore(
-    String keystoreType,
-    String urlString,
-    String password)
-    throws IOException, GeneralSecurityException {
-
-    URL keystoreURL = new URL(urlString);
-    InputStream in = keystoreURL.openStream();
-    return loadKeyStore(keystoreType, in, password);
-  }
-  /**
-   * Loads a key store from an <code>InputStream</code>, and
-   * closes the <code>InputStream</code>.
-   * 
-   * @param keystoreType key store type
-   * @param in input stream
-   * @param password password protecting the key store
-   * @return key store loaded
-   * @throws IOException thrown while reading the key store from the stream
-   * @throws GeneralSecurityException thrown while creating the key store
-   */
-  public static KeyStore loadKeyStore(
-    String keystoreType,
-    InputStream in,
-    String password)
-    throws IOException, GeneralSecurityException {
-
-    char[] chPassword = null;
-    if (password != null)
-      chPassword = password.toCharArray();
-    KeyStore ks = KeyStore.getInstance(keystoreType);
-    ks.load(in, chPassword);
-    in.close();
-    return ks;
-  }
-  /**
-   * Creates a key store from X509 certificate files, aliasing them with
-   * the index in the <code>String[]</code>, starting with <code>"0"</code>.
-   * 
-   * @param keyStoreType key store type
-   * @param certFilenames certificate filenames
-   * @return key store created
-   * @throws IOException thrown while reading the certificates from file
-   * @throws GeneralSecurityException thrown while creating the key store
-   */
-  public static KeyStore createKeyStore(
-    String keyStoreType,
-    String[] certFilenames)
-    throws IOException, GeneralSecurityException {
-
-    KeyStore ks = KeyStore.getInstance(keyStoreType);
-    ks.load(null, null);
-    for (int i = 0; i < certFilenames.length; i++) {
-      Certificate cert = loadCertificate(certFilenames[i]);
-      ks.setCertificateEntry("" + i, cert);
-    }
-    return ks;
-  }
-  /**
-   * Creates a key store from a directory containg X509 certificate files, 
-   * aliasing them with the index in the <code>String[]</code>, starting with <code>"0"</code>.
-   * All the files in the directory are considered to be certificates.
-   * 
-   * @param keyStoreType key store type
-   * @param certDirURLString file URL of directory containing certificate filenames
-   * @return key store created
-   * @throws IOException thrown while reading the certificates from file
-   * @throws GeneralSecurityException thrown while creating the key store
-   */
-  public static KeyStore createKeyStoreFromCertificateDirectory(
-    String keyStoreType,
-    String certDirURLString)
-    throws IOException, GeneralSecurityException {
-
-    URL certDirURL = new URL(certDirURLString);
-    String certDirname = certDirURL.getFile();
-    File certDir = new File(certDirname);
-    String[] certFilenames = certDir.list();
-    String separator =
-      (certDirname.endsWith(File.separator) ? "" : File.separator);
-    for (int i = 0; i < certFilenames.length; i++) {
-      certFilenames[i] = certDirname + separator + certFilenames[i];
-    }
-    return createKeyStore(keyStoreType, certFilenames);
-  }
-
-  /**
-   * Loads an X509 certificate from file.
-   * @param certFilename filename
-   * @return the certificate loaded
-   * @throws IOException thrown while reading the certificate from file
-   * @throws GeneralSecurityException thrown while creating the certificate
-   */
-  private static Certificate loadCertificate(String certFilename)
-    throws IOException, GeneralSecurityException {
-
-    FileInputStream in = new FileInputStream(certFilename);
-    Certificate cert = new X509Certificate(in);
-    in.close();
-    return cert;
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/MOADefaultHandler.java b/common/src/at/gv/egovernment/moa/util/MOADefaultHandler.java
deleted file mode 100644
index 0474d92cd..000000000
--- a/common/src/at/gv/egovernment/moa/util/MOADefaultHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.IOException;
-
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * A <code>DefaultHandler</code> that uses a <code>MOAEntityResolver</code> and
- * a <code>MOAErrorHandler</code>.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class MOADefaultHandler extends DefaultHandler {
-  /** The <code>EntityResolver</code> to use. */
-  private EntityResolver entityResolver;
-  /** The <code>ErrorHandler</code> to use. */
-  private ErrorHandler errorHandler;
-
-  /**
-   * Create a new <code>MOADefaultHandler</code>.
-   */
-  public MOADefaultHandler() {
-    entityResolver = new MOAEntityResolver();
-    errorHandler = new MOAErrorHandler();
-  }
-
-  /**
-   * Create a new <code>MOADefaultHandler</code>.
-   * 
-   * @param entityResolver The <code>EntityResolver</code> to use for resolving
-   * external entities.
-   * @param errorHandler The <code>ErrorHandler</code> to use for reporting
-   * parsing errors.
-   */
-  public MOADefaultHandler(
-    EntityResolver entityResolver,
-    ErrorHandler errorHandler) {
-
-    this.entityResolver = entityResolver;
-    this.errorHandler = errorHandler;
-  }
-
-  /**
-   * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-   */
-  public InputSource resolveEntity(String publicId, String systemId)
-    throws SAXException {
-    try {
-      return entityResolver.resolveEntity(publicId, systemId);
-    } catch (IOException e) {
-      return null;
-    }
-  }
-
-  /**
-   * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-   */
-  public void warning(SAXParseException exception) throws SAXException {
-    errorHandler.warning(exception);
-  }
-
-  /**
-   * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-   */
-  public void error(SAXParseException exception) throws SAXException {
-    errorHandler.error(exception);
-  }
-
-  /**
-   * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-   */
-  public void fatalError(SAXParseException exception) throws SAXException {
-    errorHandler.fatalError(exception);
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/MOAEntityResolver.java b/common/src/at/gv/egovernment/moa/util/MOAEntityResolver.java
deleted file mode 100644
index 9406612e2..000000000
--- a/common/src/at/gv/egovernment/moa/util/MOAEntityResolver.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.InputStream;
-
-import org.apache.xerces.util.URI;
-import org.apache.xerces.util.URI.MalformedURIException;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * An <code>EntityResolver</code> that looks up entities stored as
- * local resources.
- * 
- * <p>The following DTDs are mapped to local resources: 
- * <ul>
- * <li>The XMLSchema.dtd</li>
- * <li>The datatypes.dtd</li>
- * </ul>
- * </p>
- * <p>For all other resources, an attempt is made to resolve them as resources,
- * either absolute or relative to <code>Constants.SCHEMA_ROOT</code>.
- * 
- * @author Patrick Peck
- * @author Sven Aigner
- */
-public class MOAEntityResolver implements EntityResolver {
-
-  /**
-   * Resolve an entity.
-   * 
-   * The <code>systemId</code> parameter is used to perform the lookup of the
-   * entity as a resource, either by interpreting the <code>systemId</code> as
-   * an absolute resource path, or by appending the last path component of
-   * <code>systemId</code> to <code>Constants.SCHEMA_ROOT</code>.
-   * 
-   * @param publicId The public ID of the resource.
-   * @param systemId The system ID of the resource.
-   * @return An <code>InputSource</code> from which the entity can be read, or
-   * <code>null</code>, if the entity could not be found.
-   * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-   */
-  public InputSource resolveEntity(String publicId, String systemId) {
-    InputStream stream;
-    int slashPos;
-
-    if (Logger.isDebugEnabled()) {
-      Logger.debug(
-        new LogMsg("resolveEntity: p=" + publicId + " s=" + systemId));
-    }
-
-    if (publicId != null) {
-      // check if we can resolve some standard dtd's
-      if (publicId.equalsIgnoreCase("-//W3C//DTD XMLSchema 200102//EN")) {
-        return new InputSource(
-          getClass().getResourceAsStream(
-            Constants.SCHEMA_ROOT + "XMLSchema.dtd"));
-      } else if (publicId.equalsIgnoreCase("datatypes")) {
-        return new InputSource(
-          getClass().getResourceAsStream(
-            Constants.SCHEMA_ROOT + "datatypes.dtd"));
-      }
-    } else if (systemId != null) {
-      // get the URI path
-      try {
-        URI uri = new URI(systemId);
-        systemId = uri.getPath();
-        if (!"file".equals(uri.getScheme()) || "".equals(systemId.trim())) {
-          return null;
-        }
-      } catch (MalformedURIException e) {
-        return null;
-      }
-      
-      // try to get the resource from the full path
-      stream = getClass().getResourceAsStream(systemId);
-      if (stream != null) {
-        InputSource source = new InputSource(stream);
-
-        source.setSystemId(systemId);
-        return source;
-      }
-
-      // try to get the resource from the last path component
-      slashPos = systemId.lastIndexOf('/');
-      if (slashPos >= 0 && systemId.length() > slashPos) {
-        systemId = systemId.substring(slashPos + 1, systemId.length());
-        stream =
-          getClass().getResourceAsStream(Constants.SCHEMA_ROOT + systemId);
-        if (stream != null) {
-          InputSource source = new InputSource(stream);
-
-          source.setSystemId(systemId);
-          return source;
-        }
-      }
-    }
-
-    return null; // nothing found - let the parser handle the entity
-  }
-}
-\ No newline at end of file
diff --git a/common/src/at/gv/egovernment/moa/util/MOAErrorHandler.java b/common/src/at/gv/egovernment/moa/util/MOAErrorHandler.java
deleted file mode 100644
index 1f7757c8f..000000000
--- a/common/src/at/gv/egovernment/moa/util/MOAErrorHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import org.apache.xml.utils.DefaultErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * An <code>ErrorHandler</code> that logs a message and throws a
- * <code>SAXException</code> upon <code>error</code> and <code>fatal</code>
- * parsing errors.
- * 
- * @author Patrick Peck
- * @author Sven Aigner
- */
-public class MOAErrorHandler extends DefaultErrorHandler {
-
-  /**
-   * Logs a warning message.
-   * 
-   * @see org.xml.sax.ErrorHandler#warning(SAXParseException)
-   */
-  public void warning(SAXParseException exception) throws SAXException {
-    warn("parser.00", messageParams(exception), null);
-  }
-
-  /**
-   * Logs a warning and rethrows the <code>exception</code>.
-   * 
-   * @see org.xml.sax.ErrorHandler#error(SAXParseException)
-   */
-  public void error(SAXParseException exception) throws SAXException {
-    warn("parser.01", messageParams(exception), null);
-    throw exception;
-  }
-
-  /**
-   * Logs a warning and rethrows the <code>exception</code>.
-   * 
-   * @see org.xml.sax.ErrorHandler#fatalError(SAXParseException)
-   */
-  public void fatalError(SAXParseException exception) throws SAXException {
-    warn("parser.02", messageParams(exception), null);
-    throw exception;
-  }
-
-  /**
-   * Log a warning message.
-   * 
-   * @param messageId The message ID to log.
-   * @param parameters Additional message parameters.
-   * @param t The <code>Throwable</code> to log; usually the cause of this
-   * warning.
-   */
-  private static void warn(
-    String messageId,
-    Object[] parameters,
-    Throwable t) {
-
-    MessageProvider msg = MessageProvider.getInstance();
-    Logger.warn(new LogMsg(msg.getMessage(messageId, parameters)), t);
-  }
-
-  /**
-   * Put the system id, line and column number information from the exception
-   * into an <code>Object</code> array, to provide it as a
-   * <code>MessageFormat</code> parameter.
-   * 
-   * @param e The <code>SAXParseException</code> containing the
-   * source system id and line/column numbers.
-   * @return An array containing the system id (a <code>String</code>) as well
-   * as line/column numbers (2 <code>Integer</code> objects) from the
-   * <code>SAXParseException</code>.
-   */
-  private static Object[] messageParams(SAXParseException e) {
-    return new Object[] {
-      e.getMessage(),
-      e.getSystemId(),
-      new Integer(e.getLineNumber()),
-      new Integer(e.getColumnNumber())};
-  }
-
-}
-\ No newline at end of file
diff --git a/common/src/at/gv/egovernment/moa/util/MOATimer.java b/common/src/at/gv/egovernment/moa/util/MOATimer.java
deleted file mode 100644
index d8bf64fc3..000000000
--- a/common/src/at/gv/egovernment/moa/util/MOATimer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.util.Map;
-import java.util.WeakHashMap;
-
-/**
- * A timer utility for named timers.
- * 
- * @author Sven Aigner
- */
-public class MOATimer {
-
-  /** The single instance of this class. */
-  private static MOATimer instance = null;
-  /** The starting points of single timings. */
-  private static Map timemapstart = new WeakHashMap();
-  /** The end points of single timings. */
-  private static Map timemapend = new WeakHashMap();
-
-  /**
-   * Return the single instance of this class.
-   * 
-   * @return The single instance of this class.
-   */
-  public static MOATimer getInstance() {
-    if (instance == null) {
-      instance = new MOATimer();
-    }
-    return instance;
-  }
-
-  /**
-   * Create a new <code>MOATimer</code>.
-   * 
-   * Protected to disallow multiple instances.
-   */
-  protected MOATimer() {
-    super();
-  }
-
-  /**
-   * Start timing a certain action.
-   * 
-   * The timing belonging to the action ID is garbage collected as soon as there
-   * exists no other reference to the action ID.
-   * 
-   * @param id The action ID.
-   */
-  public void startTiming(Object id) {
-    timemapstart.put(id, new Long(System.currentTimeMillis()));
-  }
-
-  /**
-   * Stop timing an action.
-   * 
-   * @param id The action ID.
-   */
-  public void stopTiming(Object id) {
-    timemapend.put(id, new Long(System.currentTimeMillis()));
-  }
-
-  /**
-   * Get the duration of an action.
-   * 
-   * @param id The action ID for which to compute the duration.
-   * @return long The duration in milliseconds between calls to
-   * <code>startTiming()</code> and <code>stopTiming()</code>. If
-   * only <code>startTiming()</code> has been called for the action, then
-   * current difference to the system time is returned. If no timing exists for
-   * the action, <code>- 1</code> is returned.
-   */
-  public long duration(Object id) {
-    if (timemapstart.containsKey(id)) {
-      long start = ((Long) timemapstart.get(id)).longValue();
-      if (timemapend.containsKey(id)) {
-        long end = ((Long) timemapend.get(id)).longValue();
-        return end - start;
-      } else {
-        return System.currentTimeMillis() - start;
-      }
-    } else
-      return -1;
-  }
-
-  /**
-   * Get the duration of an action, as a nicely formatted <code>String</code>.
-   * 
-   * @param id The action ID.
-   * @return String The <code>duration()</code> as a <code>String</code>.
-   */
-  public String durationAsString(Object id) {
-    long dur = duration(id);
-    long second = dur / 1000;
-    long mil = (dur) - (second * 1000);
-    return "Duration: " + second + "." + mil + " seconds";
-  }
-
-  /**
-   * Remove a timing.
-   * 
-   * @param id The action ID.
-   */
-  public void clearTiming(String id) {
-    if (timemapstart.containsKey(id))
-      timemapstart.remove(id);
-    if (timemapend.containsKey(id))
-      timemapend.remove(id);
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/MessageProvider.java b/common/src/at/gv/egovernment/moa/util/MessageProvider.java
deleted file mode 100644
index f5117e390..000000000
--- a/common/src/at/gv/egovernment/moa/util/MessageProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.util.Locale;
-
-/**
- * A singleton wrapper around a <code>Message</code> object.
- * 
- * Provides the messages used in the common project.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class MessageProvider {
-  /** The location of the default message resources. */
-  private static final String[] DEFAULT_MESSAGE_RESOURCES =
-    { "resources/properties/common_messages" };
-  /** The locale of the default message resources. */
-  private static final Locale[] DEFAULT_MESSAGE_LOCALES =
-    new Locale[] { new Locale("de", "AT") };
-  /** The single instance of this class. */
-  private static MessageProvider instance;
-  
-  /** The messages provided by this <code>MessageProvider</code>. */
-  private Messages messages;
-  
-  /**
-   * Return the single instance of the <code>MessageProvider</code>.
-   * 
-   * Intialilizes the <code>MessageProvider</code> with the default message
-   * locations: <code>/resources/properties/common_messages</code>.
-   * 
-   * @return The single <code>MessageProvider</code>.
-   */
-  public static synchronized MessageProvider getInstance() {
-    if (instance == null) {
-      instance =
-        new MessageProvider(DEFAULT_MESSAGE_RESOURCES, DEFAULT_MESSAGE_LOCALES);
-    }
-    return instance;
-  }
-
-  /**
-   * Create a <code>MessageProvider</code>.
-   * 
-   * @param resourceNames The names of the resources containing the messages.
-   * @param locales The corresponding locales.
-   */
-  protected MessageProvider(String[] resourceNames, Locale[] locales) {
-    this.messages = new Messages(resourceNames, locales);
-  }
-
-  /**
-   * Get the message corresponding to a given message ID.
-   *
-   * @param messageId The ID of the message.
-   * @param parameters The parameters to fill in into the message arguments.
-   * @return The formatted message. 
-   */
-  public String getMessage(String messageId, Object[] parameters) {
-    return messages.getMessage(messageId, parameters);
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/Messages.java b/common/src/at/gv/egovernment/moa/util/Messages.java
deleted file mode 100644
index a0139ae93..000000000
--- a/common/src/at/gv/egovernment/moa/util/Messages.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.PropertyResourceBundle;
-
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Provides access to the system messages resource used for exception handling
- * and logging messages.
- * 
- * Messages must be provided as a resource bundle at the path.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class Messages {
-  /** Error message indicating that no messages are avaiable. */
-  private static final String ERROR_MESSAGES_UNAVAILABLE =
-    "Fehler in der Server-Konfiguration. "
-      + "Die Fehlertexte konnten nicht geladen werden.";
-  /** Error message indicating that the message is not available. */
-  private static final String ERROR_NO_MESSAGE =
-    "Keine Fehlermeldung f�r Fehler-Nr.={0}";
-
-  /** The names of the resources containing the messages. */
-  private String[] resourceNames;
-  /** The corresponding <code>Locale</code>s of the resources. */
-  private Locale[] locales;
-  /** The <code>ResourceBundle</code>s containing the messages. */
-  private ResourceBundleChain messages;
-
-  /**
-   * Create a new <code>Message</code> object containing the messages
-   * in the given resources.
-   * 
-   * @param resourceNames The names of the resources containing the messages.
-   * @param locales The corresponding locales.
-   */
-  public Messages(String[] resourceNames, Locale[] locales) {
-    this.resourceNames = resourceNames;
-    this.locales = locales;
-    this.messages = null;
-  }
-
-  /**
-   * Get the message corresponding to a given message ID.
-   *
-   * @param messageId The ID of the message.
-   * @param parameters The parameters to fill in into the message arguments.
-   * @return The formatted message. 
-   */
-  public String getMessage(String messageId, Object[] parameters) {
-    // initialize messages
-    if (messages == null) {
-      initMessages();
-    }
-
-    // create the message
-    if (messages == null) {
-      return ERROR_MESSAGES_UNAVAILABLE;
-    } else {
-      try {
-        String rawMessage = messages.getString(messageId);
-        return MessageFormat.format(rawMessage, parameters);
-      } catch (MissingResourceException e2) {
-        // couldn't find any message -> set to default error message 
-        return MessageFormat.format(
-          ERROR_NO_MESSAGE,
-          new Object[] { messageId });
-      }
-    }
-  }
-
-  /**
-   * Return the names of the resources containing the messages.
-   * 
-   * @return String[] The names of the resource bundles containing the messages.
-   */
-  private String[] getResourceNames() {
-    return resourceNames;
-  }
-
-  /**
-   * Return the <code>Locale</code>s of the resources containing the messages.
-   * 
-   * @return Locale[] The <code>Locale</code>s of the resource bundles
-   * containing the messages.
-   */
-  private Locale[] getLocales() {
-    return locales;
-  }
-
-  /**
-   * Initialize the <code>messages</code> <code>ResourceBundle</code> containing
-   * the MOA error messages.
-   */
-  private void initMessages() {
-    messages = new ResourceBundleChain();
-    int i;
-
-    // initialize the message resources
-    for (i = 0; i < resourceNames.length; i++) {
-      try {
-        messages.addResourceBundle(
-          PropertyResourceBundle.getBundle(
-            getResourceNames()[i],
-            getLocales()[i]));
-      } catch (MissingResourceException e) {
-        Logger.error(ERROR_MESSAGES_UNAVAILABLE, e);
-      }
-    }
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/NodeIteratorAdapter.java b/common/src/at/gv/egovernment/moa/util/NodeIteratorAdapter.java
deleted file mode 100644
index f71aa472d..000000000
--- a/common/src/at/gv/egovernment/moa/util/NodeIteratorAdapter.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.util.ListIterator;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.traversal.NodeIterator;
-
-/**
- * A <code>NodeIterator</code> implementation based on a
- * <code>ListIterator</code>.
- * 
- * @see java.util.ListIterator
- * @see org.w3c.dom.traversal.NodeIterator
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class NodeIteratorAdapter implements NodeIterator {
-
-  /** The <code>ListIterator</code> to wrap. */
-  private ListIterator nodeIterator;
-
-  /**
-   * Create a new <code>NodeIteratorAdapter</code>.
-   * @param nodeIterator The <code>ListIterator</code> to iterate over.
-   */
-  public NodeIteratorAdapter(ListIterator nodeIterator) {
-    this.nodeIterator = nodeIterator;
-  }
-
-  /**
-   * @see org.w3c.dom.traversal.NodeIterator#getRoot()
-   */
-  public Node getRoot() {
-    return null;
-  }
-
-  /**
-   * @see org.w3c.dom.traversal.NodeIterator#getWhatToShow()
-   */
-  public int getWhatToShow() {
-    return NodeFilter.SHOW_ALL;
-  }
-
-  /**
-   * @see org.w3c.dom.traversal.NodeIterator#getFilter()
-   */
-  public NodeFilter getFilter() {
-    return null;
-  }
-
-  /**
-   * @see org.w3c.dom.traversal.NodeIterator#getExpandEntityReferences()
-   */
-  public boolean getExpandEntityReferences() {
-    return false;
-  }
-
-  /**
-   * @see org.w3c.dom.traversal.NodeIterator#nextNode()
-   */
-  public Node nextNode() throws DOMException {
-    if (nodeIterator.hasNext()) {
-      return (Node) nodeIterator.next();
-    }
-    return null;
-  }
-
-  /**
-   * @see org.w3c.dom.traversal.NodeIterator#previousNode()
-   */
-  public Node previousNode() throws DOMException {
-    if (nodeIterator.hasPrevious()) {
-      return (Node) nodeIterator.previous();
-    }
-    return null;
-  }
-
-  /**
-   * @see org.w3c.dom.traversal.NodeIterator#detach()
-   */
-  public void detach() {
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/NodeListAdapter.java b/common/src/at/gv/egovernment/moa/util/NodeListAdapter.java
deleted file mode 100644
index 7102cadca..000000000
--- a/common/src/at/gv/egovernment/moa/util/NodeListAdapter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.util.List;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * A <code>NodeList</code> implementation based on a <code>List</code>.
- * 
- * @see java.util.List
- * @see org.w3c.dom.NodeList
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class NodeListAdapter implements NodeList {
-  /** The <code>List</code> to wrap. */
-  private List nodeList;
-  
-  /**
-   * Create a new <code>NodeListAdapter</code>.
-   * 
-   * @param nodeList The <code>List</code> containing the nodes. 
-   */
-  public NodeListAdapter(List nodeList) {
-    this.nodeList = nodeList;
-  }
-
-  /**
-   * @see org.w3c.dom.NodeList#item(int)
-   */
-  public Node item(int index) {
-    return (Node) nodeList.get(index);
-  }
-
-  /**
-   * @see org.w3c.dom.NodeList#getLength()
-   */
-  public int getLength() {
-    return nodeList.size();
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/ResourceBundleChain.java b/common/src/at/gv/egovernment/moa/util/ResourceBundleChain.java
deleted file mode 100644
index 90b28548a..000000000
--- a/common/src/at/gv/egovernment/moa/util/ResourceBundleChain.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * A class to chain <code>ResourceBundle</code>s.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class ResourceBundleChain {
-  /** Error message indicating the resource is not available. */
-  private static final String ERROR_MISSING_RESOURCE = "Missing resource";
-  /** The <code>ResourceBundle</code>s contained in this chain. */
-  private List resourceBundles = new ArrayList();
-
-  /**
-   * Add a <code>ResourceBundle</code> to the chain.
-   * 
-   * @param resourceBundle The <code>ResourceBundle</code> to add.
-   */
-  public void addResourceBundle(ResourceBundle resourceBundle) {
-    resourceBundles.add(resourceBundle);
-  }
-
-  /**
-   * Return the value of the resource.
-   * 
-   * @param key The key to access the <code>String</code> resource.
-   * @return The resource value. All the registered <code>ResourceBundle</code>s
-   * are searched in the order in which they have previously been added to this
-   * <code>ResourceBundleChain</code>.
-   * @throws MissingResourceException The resource coult not be found in any of
-   * the bundles.
-   */
-  public String getString(String key) throws MissingResourceException {
-    MissingResourceException lastException = null;
-    Iterator iter;
-
-    // handle case where no resource bundles have been added
-    if (resourceBundles.size() == 0) {
-      throw new MissingResourceException(
-        ERROR_MISSING_RESOURCE,
-        this.getClass().getName(),
-        key);
-    }
-
-    // try to find the resource in one of the bundles; if it cannot be found,
-    // return the exception thrown by the last bundle in the list
-    for (iter = resourceBundles.iterator(); iter.hasNext();) {
-      ResourceBundle resourceBundle = (ResourceBundle) iter.next();
-      try {
-        String value = resourceBundle.getString(key);
-        return value;
-      } catch (MissingResourceException e) {
-        lastException = e;
-      }
-    }
-    throw lastException;
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/SSLUtils.java b/common/src/at/gv/egovernment/moa/util/SSLUtils.java
deleted file mode 100644
index 621562e2d..000000000
--- a/common/src/at/gv/egovernment/moa/util/SSLUtils.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import javax.net.ssl.SSLSocketFactory;
-
-import com.sun.net.ssl.KeyManager;
-import com.sun.net.ssl.KeyManagerFactory;
-import com.sun.net.ssl.SSLContext;
-import com.sun.net.ssl.TrustManager;
-import com.sun.net.ssl.TrustManagerFactory;
-
-/**
- * Utility for connecting to server applications via SSL.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SSLUtils {
-	
-	/**
-	 * Creates an <code>SSLSocketFactory</code> which utilizes the given trust store.
-	 * 
-   * @param trustStoreType key store type of trust store
-   * @param trustStoreInputStream input stream for reading JKS trust store containing
-   * 				 trusted server certificates; if <code>null</code>, the default
-   * 				 trust store will be utilized
-   * @param trustStorePassword if provided, it will be used to check 
-   * 				 the integrity of the trust store; if omitted, it will not be checked
-   * @return <code>SSLSocketFactory</code> to be used by an <code>HttpsURLConnection</code>
-   * @throws IOException thrown while reading from the input stream
-   * @throws GeneralSecurityException thrown while creating the socket factory
-	 */
-  public static SSLSocketFactory getSSLSocketFactory(
-  	String trustStoreType,
-  	InputStream trustStoreInputStream,
-  	String trustStorePassword)
- 	  throws IOException, GeneralSecurityException {
-  		
-	  TrustManager[] tms = getTrustManagers(trustStoreType, trustStoreInputStream, trustStorePassword);
-		SSLContext ctx = SSLContext.getInstance("TLS");
-		ctx.init(null, tms, null);
-
-    SSLSocketFactory sf = ctx.getSocketFactory();
-  	return sf;
-  }
-	/**
-	 * Creates an <code>SSLSocketFactory</code> which utilizes the
-	 * given trust store and keystore.
-	 * 
-   * @param trustStore trust store containing trusted server certificates; 
-   * 				 if <code>null</code>, the default trust store will be utilized
-   * @param clientKeyStoreType key store type of <code>clientKeyStore</code>
-   * @param clientKeyStoreURL URL of key store containing keys to be used for
-   * 				 client authentication; if <code>null</code>, the default key store will be utilized
-   * @param clientKeyStorePassword if provided, it will be used to check 
-   * 				 the integrity of the client key store; if omitted, it will not be checked
-   * @return <code>SSLSocketFactory</code> to be used by an <code>HttpsURLConnection</code>
-   * @throws IOException thrown while reading key store file
-   * @throws GeneralSecurityException thrown while creating the socket factory
-	 */
-  public static SSLSocketFactory getSSLSocketFactory(
-  	KeyStore trustStore,
-  	String clientKeyStoreType,
-  	String clientKeyStoreURL,
-  	String clientKeyStorePassword)
- 	  throws IOException, GeneralSecurityException {
-  		
-		SSLContext ctx = getSSLContext(
-			trustStore, clientKeyStoreType, clientKeyStoreURL, clientKeyStorePassword);
-    SSLSocketFactory sf = ctx.getSocketFactory();
-  	return sf;
-  }
-	/**
-	 * Creates an <code>SSLContext</code> initialized for the
-	 * given trust store and keystore.
-	 * 
-   * @param trustStore trust store containing trusted server certificates; 
-   * 				 if <code>null</code>, the default trust store will be utilized
-   * @param clientKeyStoreType key store type of <code>clientKeyStore</code>
-   * @param clientKeyStoreURL URL of key store containing keys to be used for
-   * 				 client authentication; if <code>null</code>, the default key store will be utilized
-   * @param clientKeyStorePassword if provided, it will be used to check 
-   * 				 the integrity of the client key store; if omitted, it will not be checked
-   * @return <code>SSLContext</code> to be used for creating an <code>SSLSocketFactory</code>
-   * @throws IOException thrown while reading key store file
-   * @throws GeneralSecurityException thrown while creating the SSL context
-	 */
-  public static SSLContext getSSLContext(
-  	KeyStore trustStore,
-  	String clientKeyStoreType,
-  	String clientKeyStoreURL,
-  	String clientKeyStorePassword)
- 	  throws IOException, GeneralSecurityException {
-  		
-    //System.setProperty("javax.net.debug", "all");
-	  TrustManager[] tms = getTrustManagers(trustStore);
-		KeyManager[] kms = getKeyManagers(clientKeyStoreType, clientKeyStoreURL, clientKeyStorePassword);
-		SSLContext ctx = SSLContext.getInstance("TLS");
-		ctx.init(kms, tms, null);
-		return ctx;
-  }
-  /**
-   * Loads the trust store from an input stream and gets the 
-   * <code>TrustManager</code>s from a default <code>TrustManagerFactory</code>,
-	 * initialized from the given trust store.
-   * @param trustStoreType key store type of trust store
-   * @param trustStoreInputStream input stream for reading JKS trust store containing
-   * 				 trusted server certificates; if <code>null</code>, the default
-   * 				 trust store will be utilized
-   * @param trustStorePassword if provided, it will be used to check 
-   * 				 the integrity of the trust store; if omitted, it will not be checked
-	 * @return <code>TrustManager</code>s to be used for creating an 
-	 * 				  <code>SSLSocketFactory</code> utilizing the given trust store
-   * @throws IOException thrown while reading from the input stream
-   * @throws GeneralSecurityException thrown while initializing the 
-   * 					default <code>TrustManagerFactory</code>
-   */
-	protected static TrustManager[] getTrustManagers(
-		String trustStoreType,
-		InputStream trustStoreInputStream,
-  	String trustStorePassword)
-	  throws IOException, GeneralSecurityException {
-	  	
-	  if (trustStoreInputStream == null)
-	  	return null;
-
-	  // Set up the TrustStore to use. We need to load the file into
-	  // a KeyStore instance.
-		KeyStore trustStore = KeyStoreUtils.loadKeyStore(trustStoreType, trustStoreInputStream, trustStorePassword);
-		return getTrustManagers(trustStore);
-	}
-	/**
-	 * Gets the <code>TrustManager</code>s from a default <code>TrustManagerFactory</code>,
-	 * initialized from the given trust store.
-	 * 
-	 * @param trustStore the trust store to use
-	 * @param trustStorePassword password protecting the given trust store
-	 * @return <code>TrustManager</code>s to be used for creating an 
-	 * 				  <code>SSLSocketFactory</code> utilizing the given trust store
-   * @throws GeneralSecurityException thrown while initializing the 
-   * 					default <code>TrustManagerFactory</code>
-	 */
-	protected static TrustManager[] getTrustManagers(KeyStore trustStore)
-	  throws GeneralSecurityException {
-	  	
-	  if (trustStore == null)
-	  	return null;
-
-	  // Initialize the default TrustManagerFactory with this KeyStore
-	  String alg=TrustManagerFactory.getDefaultAlgorithm();
-	  TrustManagerFactory tmFact=TrustManagerFactory.getInstance(alg);
-	  tmFact.init(trustStore);
-	
-	  // And now get the TrustManagers
-	  TrustManager[] tms=tmFact.getTrustManagers();
-	  return tms;
-	}
-  /**
-   * Loads the client key store from file and gets the 
-   * <code>KeyManager</code>s from a default <code>KeyManagerFactory</code>,
-	 * initialized from the given client key store.
-   * @param clientKeyStoreType key store type of <code>clientKeyStore</code>
-   * @param clientKeyStoreURL URL of key store containing keys to be used for
-   * 				 client authentication; if <code>null</code>, the default key store will be utilized
-   * @param clientKeyStorePassword password used to check the integrity of the client key store; 
-   * 				 if <code>null</code>, it will not be checked
-	 * @return <code>KeyManager</code>s to be used for creating an 
-	 * 				  <code>SSLSocketFactory</code> utilizing the given client key store
-   * @throws IOException thrown while reading from the key store file
-   * @throws GeneralSecurityException thrown while initializing the 
-   * 					default <code>KeyManagerFactory</code>
-   */
-  public static KeyManager[] getKeyManagers (
-		String clientKeyStoreType,
-		String clientKeyStoreURL,
-  	String clientKeyStorePassword)
-	  throws IOException, GeneralSecurityException {
-  
-  	if (clientKeyStoreURL == null)
-  		return null;
-  		
-	  // Set up the KeyStore to use. We need to load the file into
-	  // a KeyStore instance.
-	  KeyStore clientKeyStore = KeyStoreUtils.loadKeyStore(
-	  	clientKeyStoreType, clientKeyStoreURL, clientKeyStorePassword);
-		return getKeyManagers(clientKeyStore, clientKeyStorePassword);
-	}  
-  /**
-   * Gets the <code>KeyManager</code>s from a default <code>KeyManagerFactory</code>,
-	 * initialized from the given client key store.
-   * @param clientKeyStore client key store
-   * @param clientKeyStorePassword if provided, it will be used to check 
-   * 				 the integrity of the client key store; if omitted, it will not be checked
-	 * @return <code>KeyManager</code>s to be used for creating an 
-	 * 				  <code>SSLSocketFactory</code> utilizing the given client key store
-   * @throws GeneralSecurityException thrown while initializing the 
-   * 					default <code>KeyManagerFactory</code>
-   */
-	public static KeyManager[] getKeyManagers (
-		KeyStore clientKeyStore,
-  	String clientKeyStorePassword)
-	  throws GeneralSecurityException {
-  
-  	if (clientKeyStore == null)
-  		return null;
-  		
-	  // Now we initialize the default KeyManagerFactory with this KeyStore
-	  String alg=KeyManagerFactory.getDefaultAlgorithm();
-	  KeyManagerFactory kmFact=KeyManagerFactory.getInstance(alg);
-  	char[] password = null;
-  	if (clientKeyStorePassword != null)
-  		password = clientKeyStorePassword.toCharArray();
-	  kmFact.init(clientKeyStore, password);
-	
-	  // And now get the KeyManagers
-	  KeyManager[] kms=kmFact.getKeyManagers();
-	  return kms;
-	}  
-}
diff --git a/common/src/at/gv/egovernment/moa/util/StreamEntityResolver.java b/common/src/at/gv/egovernment/moa/util/StreamEntityResolver.java
deleted file mode 100644
index 38c4e863c..000000000
--- a/common/src/at/gv/egovernment/moa/util/StreamEntityResolver.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * An <code>EntityResolver</code> that maps system IDs to 
- * <code>InputStream</code>s.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class StreamEntityResolver implements EntityResolver {
-  
-  /** A mapping from Public ID or System ID to an <code>InputStream</code>
-   * containing the entity. */
-  private Map mappedEntities;
-  
-  /**
-   * Create a <code>StreamEntityResolver</code>.
-   * 
-   * @param mappedEntities A mapping from public or system IDs 
-   * (<code>String</code> objects) to <code>InputStream</code>s. 
-   */
-  public StreamEntityResolver(Map mappedEntities) {
-    this.mappedEntities = mappedEntities;
-  }
-
-  /**
-   * Resolve an entity by looking it up in the mapped entities.
-   * 
-   * First, the public ID is looked up in the mapping, then the system ID.
-   * 
-   * @param publicId The public ID of the entity.
-   * @param systemId The system ID of the entity.
-   * @return An <code>InputStream</code> containing the entity or 
-   * <code>null</code> if no entity could be found. 
-   * @throws SAXException Signalling a parsing exception.
-   * @throws IOException Error reading the entity.
-   */
-  public InputSource resolveEntity(String publicId, String systemId) 
-    throws SAXException, IOException {
-      
-    InputSource src = null;
-      
-    if (publicId != null && mappedEntities.get(publicId) != null) {
-      src = new InputSource((InputStream) mappedEntities.get(publicId));
-    } else if (systemId != null && mappedEntities.get(systemId) != null) {
-      src = new InputSource((InputStream) mappedEntities.get(systemId));
-    }
-    
-    if (src != null) {
-      src.setPublicId(publicId);
-      src.setSystemId(systemId);
-    }
-    
-    return src;
-  }
-}
diff --git a/common/src/at/gv/egovernment/moa/util/StreamUtils.java b/common/src/at/gv/egovernment/moa/util/StreamUtils.java
deleted file mode 100644
index 88db24504..000000000
--- a/common/src/at/gv/egovernment/moa/util/StreamUtils.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Utility methods for streams.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class StreamUtils {
-  
-  /**
-   * Compare the contents of two <code>InputStream</code>s.
-   * 
-   * @param is1 The 1st <code>InputStream</code> to compare.
-   * @param is2 The 2nd <code>InputStream</code> to compare.
-   * @return boolean <code>true</code>, if both streams contain the exactly the
-   * same content, <code>false</code> otherwise.
-   * @throws IOException An error occurred reading one of the streams.
-   */
-  public static boolean compareStreams(InputStream is1, InputStream is2) 
-    throws IOException {
-      
-    byte[] buf1 = new byte[256];
-    byte[] buf2 = new byte[256];
-    int length1;
-    int length2;
-  
-    try {
-      while (true) {
-        length1 = is1.read(buf1);
-        length2 = is2.read(buf2);
-        
-        if (length1 != length2) {
-          return false;
-        }
-        if (length1 <= 0) {
-          return true;
-        }
-        if (!compareBytes(buf1, buf2, length1)) {
-          return false;
-        }
-      }
-    } catch (IOException e) {
-      throw e;
-    } finally {
-      // close both streams
-      try {
-        is1.close();
-        is2.close();
-      } catch (IOException e) {
-        // ignore this
-      }
-    }
-  }
-  
-  /**
-   * Compare two byte arrays, up to a given maximum length.
-   * 
-   * @param b1 1st byte array to compare.
-   * @param b2 2nd byte array to compare.
-   * @param length The maximum number of bytes to compare.
-   * @return <code>true</code>, if the byte arrays are equal, <code>false</code>
-   * otherwise.
-   */
-  private static boolean compareBytes(byte[] b1, byte[] b2, int length) {
-    if (b1.length != b2.length) {
-      return false;
-    }
-  
-    for (int i = 0; i < b1.length && i < length; i++) {
-      if (b1[i] != b2[i]) {
-        return false;
-      }
-    }
-  
-    return true;
-  }
-
-  /**
-   * Reads a byte array from a stream.
-   * @param in The <code>InputStream</code> to read.
-   * @return The bytes contained in the given <code>InputStream</code>.
-   * @throws IOException on any exception thrown
-   */
-  public static byte[] readStream(InputStream in) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    int b;
-    while ((b = in.read()) >= 0)
-      out.write(b);
-    in.close();
-    return out.toByteArray();
-  }
-
-  /**
-   * Reads a <code>String</code> from a stream, using given encoding.
-   * @param in The <code>InputStream</code> to read.
-   * @param encoding The character encoding to use for converting the bytes
-   * of the <code>InputStream</code> into a <code>String</code>.
-   * @return The content of the given <code>InputStream</code> converted into
-   * a <code>String</code>.
-   * @throws IOException on any exception thrown
-   */
-  public static String readStream(InputStream in, String encoding) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    int b;
-    while ((b = in.read()) >= 0)
-      out.write(b);
-    in.close();
-    return out.toString(encoding);
-  }
- 
-}
diff --git a/common/src/at/gv/egovernment/moa/util/URLDecoder.java b/common/src/at/gv/egovernment/moa/util/URLDecoder.java
deleted file mode 100644
index a20820f7e..000000000
--- a/common/src/at/gv/egovernment/moa/util/URLDecoder.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-
-/**
- * Decodes an URL encoded String using a specified character encoding.
- * Provides a function missing in JDK 1.3. 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class URLDecoder {
-
-  /**
-   * Decodes an <code>application/x-www-form-urlencoded</code> string using a specific encoding scheme.
-   * @param s the string to decode
-   * @param encoding name of character encoding
-   * @return the newly decoded string
-   * @throws UnsupportedEncodingException if the encoding is not supported
-   */
-  public static String decode(String s, String encoding) throws UnsupportedEncodingException {
-    StringReader in = new StringReader(s);
-    ByteArrayOutputStream bout = new ByteArrayOutputStream();
-    for (int b = read(in); b >= 0; b = read(in))
-      bout.write(b);
-    return bout.toString(encoding);
-  }
-  /**
-   * Decodes the next byte from the string reader.
-   * @param in string reader
-   * @return the next byte decoded; 
-   *          -1 upon end of string, on erroneous data, and on any exception caught
-   * @todo syntax check on string
-   */
-  private static int read(StringReader in) {
-    try { 
-      int b = in.read();
-      if (b == '+')
-        return ' ';
-      if (b == '%') {
-        char[] hex = new char[2];
-        if (in.read(hex, 0, 2) >= 0) {
-          String hexString = new String(hex);
-          return Integer.valueOf(hexString, 16).intValue();
-        }
-        else
-          return -1;
-      }
-      return b;
-    } 
-    catch (IOException ex) { 
-      return -1; 
-    }
-    catch (NumberFormatException ex) { 
-      return -1; 
-    }
-  }
-}
diff --git a/common/src/at/gv/egovernment/moa/util/URLEncoder.java b/common/src/at/gv/egovernment/moa/util/URLEncoder.java
deleted file mode 100644
index 840c0c3bc..000000000
--- a/common/src/at/gv/egovernment/moa/util/URLEncoder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-
-/**
- * Translates a string into mime format "x-www-form-urlencoded".
- * Provides a function missing in JDK 1.3. 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class URLEncoder {
-  
-  /**
-   * Translates a string into x-www-form-urlencoded format.
-   * @param s the string to be translated
-   * @param encoding the encoding to use
-   * @return the translated string
-   * @throws UnsupportedEncodingException when the desired encoding is not supported
-   */
-  public static String encode(String s, String encoding) throws UnsupportedEncodingException {
-    byte[] barr = s.getBytes(encoding);
-    ByteArrayInputStream bin = new ByteArrayInputStream(barr);
-    StringWriter out = new StringWriter();
-    for (int b = bin.read(); b >= 0; b = bin.read())
-      encode(b, out);
-    return out.toString();
-  }
-  
-  /**
-   * Encode a character.
-   * @param ch The character to encode.
-   * @param out The <code>StringWriter</code> containing the result.
-   */
-  private static void encode(int ch, StringWriter out) {
-    if ((ch >= 'a' && ch <= 'z')
-      || (ch >= 'A' && ch <= 'Z')
-      || (ch >= '0' && ch <= '9')
-      || ch == '.' || ch == '-' || ch == '*' || ch == '_')
-      out.write(ch);
-    else if (ch == ' ')
-      out.write('+');
-    else
-      encodeHex(ch, out);
-  }
-  
-  /**
-   * Encode a character as an escaped hex value. 
-   * @param ch The character to encode.
-   * @param out The <code>StringWriter</code> containing the result.
-   */
-  private static void encodeHex(int ch, StringWriter out) {
-    out.write('%');
-    String hex = Integer.toHexString(ch).toUpperCase();
-    if (hex.length() < 2)
-      out.write('0');
-    else
-      out.write(hex.charAt(hex.length() - 2));
-    out.write(hex.charAt(hex.length() - 1));
-  }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/util/XPathException.java b/common/src/at/gv/egovernment/moa/util/XPathException.java
deleted file mode 100644
index e10c882e5..000000000
--- a/common/src/at/gv/egovernment/moa/util/XPathException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-/**
- * An exception occurred evaluating an XPath.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class XPathException extends RuntimeException {
-  /** The wrapped exception. */
-  private Throwable wrapped;
-  
-  /**
-   * Create a <code>XPathException</code>.
-   * 
-   * @param message The exception message.
-   * @param wrapped The exception being the likely cause of this exception.
-   */
-  public XPathException(String message, Throwable wrapped) {
-    super(message);
-    this.wrapped = wrapped; 
-  }
-  
-  /**
-   * Return the wrapped exception.
-   * 
-   * @return The wrapped exception being the likely cause of this exception.
-   */
-  public Throwable getWrapped() {
-    return wrapped;
-  }
-
-  /**
-   * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
-   */
-  public void printStackTrace(PrintStream s) {
-    super.printStackTrace(s);
-    if (getWrapped() != null) {
-      s.print("Caused by: ");
-      getWrapped().printStackTrace(s);
-    }
-  }
-
-  /**
-   * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
-   */
-  public void printStackTrace(PrintWriter s) {
-    super.printStackTrace(s);
-    if (getWrapped() != null) {
-      s.print("Caused by: ");
-      getWrapped().printStackTrace(s);
-    }
-  }
- 
-}
diff --git a/common/src/at/gv/egovernment/moa/util/XPathUtils.java b/common/src/at/gv/egovernment/moa/util/XPathUtils.java
deleted file mode 100644
index 0ed4fcda3..000000000
--- a/common/src/at/gv/egovernment/moa/util/XPathUtils.java
+++ /dev/null
@@ -1,415 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.traversal.NodeIterator;
-
-import org.jaxen.JaxenException;
-import org.jaxen.NamespaceContext;
-import org.jaxen.SimpleNamespaceContext;
-import org.jaxen.dom.DOMXPath;
-import org.jaxen.dom.DocumentNavigator;
-
-/**
- * Utility methods to evaluate XPath expressions on DOM nodes.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class XPathUtils {
-
-  /**
-   * The XPath expression selecting all nodes under a given root (including the
-   * root node itself).
-   */
-  public static final String ALL_NODES_XPATH =
-    "(.//. | .//@* | .//namespace::*)";
-
-  /** The <code>DocumentNavigator</code> to use for navigating the document. */
-  private static DocumentNavigator documentNavigator =
-    DocumentNavigator.getInstance();
-  /** The default namespace prefix to namespace URI mappings. */
-  private static NamespaceContext NS_CONTEXT;
-
-  static {
-    SimpleNamespaceContext ctx = new SimpleNamespaceContext();
-    ctx.addNamespace(Constants.MOA_PREFIX, Constants.MOA_NS_URI);
-    ctx.addNamespace(Constants.MOA_CONFIG_PREFIX, Constants.MOA_CONFIG_NS_URI);
-    ctx.addNamespace(
-      Constants.MOA_ID_CONFIG_PREFIX,
-      Constants.MOA_ID_CONFIG_NS_URI);
-    ctx.addNamespace(Constants.SL10_PREFIX, Constants.SL10_NS_URI);
-    ctx.addNamespace(Constants.SL11_PREFIX, Constants.SL11_NS_URI);
-    ctx.addNamespace(Constants.ECDSA_PREFIX, Constants.ECDSA_NS_URI);
-    ctx.addNamespace(Constants.PD_PREFIX, Constants.PD_NS_URI);
-    ctx.addNamespace(Constants.SAML_PREFIX, Constants.SAML_NS_URI);
-    ctx.addNamespace(Constants.SAMLP_PREFIX, Constants.SAMLP_NS_URI);
-    ctx.addNamespace(Constants.DSIG_PREFIX, Constants.DSIG_NS_URI);
-    ctx.addNamespace(Constants.XSLT_PREFIX, Constants.XSLT_NS_URI);
-    ctx.addNamespace(Constants.XSI_PREFIX, Constants.XSI_NS_URI);
-    ctx.addNamespace(
-      Constants.DSIG_FILTER2_PREFIX,
-      Constants.DSIG_FILTER2_NS_URI);
-    ctx.addNamespace(Constants.DSIG_EC_PREFIX, Constants.DSIG_EC_NS_URI);
-    NS_CONTEXT = ctx;
-  }
-
-  /**
-   * Return a <code>NodeIterator</code> over the nodes matching the XPath
-   * expression.
-   * 
-   * All namespace URIs and prefixes declared in the <code>Constants</code>
-   * interface are used for resolving namespaces.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param exp The XPath expression to evaluate.
-   * @return An iterator over the resulting nodes.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  public static NodeIterator selectNodeIterator(Node contextNode, String exp)
-    throws XPathException {
-
-    return selectNodeIterator(contextNode, NS_CONTEXT, exp);
-  }
-
-  /**
-   * Return a <code>NodeIterator</code> over the nodes matching the XPath
-   * expression.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param namespaceElement An element from which to build the
-   * namespace mapping for evaluating the XPath expression
-   * @param exp The XPath expression to evaluate.
-   * @return An iterator over the resulting nodes.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  public static NodeIterator selectNodeIterator(
-    Node contextNode,
-    Element namespaceElement,
-    String exp)
-    throws XPathException {
-
-    try {
-      SimpleNamespaceContext ctx = new SimpleNamespaceContext();
-      ctx.addElementNamespaces(documentNavigator, namespaceElement);
-      return selectNodeIterator(contextNode, ctx, exp);
-    } catch (JaxenException e) {
-      MessageProvider msg = MessageProvider.getInstance();
-      String message = msg.getMessage("xpath.00", new Object[] { exp });
-      throw new XPathException(message, e);
-    }
-  }
-
-  /**
-   * Return a <code>NodeIterator</code> over the nodes matching the XPath
-   * expression.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param namespaceMapping A namespace prefix to namespace URI mapping
-   * (<code>String</code> to <code>String</code>) for evaluating the XPath 
-   * expression.
-   * @param exp The XPath expression to evaluate.
-   * @return An iterator over the resulting nodes.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  public static NodeIterator selectNodeIterator(
-    Node contextNode,
-    Map namespaceMapping,
-    String exp)
-    throws XPathException {
-
-    SimpleNamespaceContext ctx = new SimpleNamespaceContext(namespaceMapping);
-
-    return selectNodeIterator(contextNode, ctx, exp);
-  }
-
-  /**
-   * Return a <code>NodeIterator</code> over the nodes matching the XPath
-   * expression.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param nsContext The <code>NamespaceContext</code> for resolving namespace
-   * prefixes to namespace URIs for evaluating the XPath expression.
-   * @param exp The XPath expression to evaluate.
-   * @return An iterator over the resulting nodes.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  private static NodeIterator selectNodeIterator(
-    Node contextNode,
-    NamespaceContext nsContext,
-    String exp)
-    throws XPathException {
-
-    try {
-      DOMXPath xpath = new DOMXPath(exp);
-      List nodes;
-
-      xpath.setNamespaceContext(nsContext);
-      nodes = xpath.selectNodes(contextNode);
-      return new NodeIteratorAdapter(nodes.listIterator());
-    } catch (JaxenException e) {
-      MessageProvider msg = MessageProvider.getInstance();
-      String message = msg.getMessage("xpath.00", new Object[] { exp });
-      throw new XPathException(message, e);
-    }
-  }
-
-  /**
-   * Return a <code>NodeList</code> of all the nodes matching the XPath
-   * expression.
-   * 
-   * All namespace URIs and prefixes declared in the <code>Constants</code>
-   * interface are used for resolving namespaces.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param exp The XPath expression to evaluate.
-   * @return A <code>NodeList</code> containing the matching nodes.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  public static NodeList selectNodeList(Node contextNode, String exp)
-    throws XPathException {
-
-    return selectNodeList(contextNode, NS_CONTEXT, exp);
-  }
-
-  /**
-   * Return a <code>NodeList</code> of all the nodes matching the XPath
-   * expression.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param namespaceElement An element from which to build the
-   * namespace mapping for evaluating the XPath expression
-   * @param exp The XPath expression to evaluate.
-   * @return A <code>NodeList</code> containing the matching nodes.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  public static NodeList selectNodeList(
-    Node contextNode,
-    Element namespaceElement,
-    String exp)
-    throws XPathException {
-
-    try {
-      SimpleNamespaceContext ctx = new SimpleNamespaceContext();
-
-      ctx.addElementNamespaces(documentNavigator, namespaceElement);
-      return selectNodeList(contextNode, ctx, exp);
-    } catch (JaxenException e) {
-      MessageProvider msg = MessageProvider.getInstance();
-      String message = msg.getMessage("xpath.00", new Object[] { exp });
-      throw new XPathException(message, e);
-    }
-  }
-
-  /**
-   * Return a <code>NodeList</code> of all the nodes matching the XPath
-   * expression.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param namespaceMapping A namespace prefix to namespace URI mapping
-   * (<code>String</code> to <code>String</code>) for evaluating the XPath 
-   * expression.
-   * @param exp The XPath expression to evaluate.
-   * @return A <code>NodeList</code> containing the matching nodes.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  public static NodeList selectNodeList(
-    Node contextNode,
-    Map namespaceMapping,
-    String exp)
-    throws XPathException {
-
-    SimpleNamespaceContext ctx = new SimpleNamespaceContext(namespaceMapping);
-
-    return selectNodeList(contextNode, ctx, exp);
-  }
-
-  /**
-   * Return a <code>NodeList</code> of all the nodes matching the XPath
-   * expression.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param nsContext The <code>NamespaceContext</code> for resolving namespace
-   * prefixes to namespace URIs for evaluating the XPath expression.
-   * @param exp The XPath expression to evaluate.
-   * @return A <code>NodeList</code> containing the matching nodes.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  private static NodeList selectNodeList(
-    Node contextNode,
-    NamespaceContext nsContext,
-    String exp)
-    throws XPathException {
-
-    try {
-      DOMXPath xpath = new DOMXPath(exp);
-      List nodes;
-
-      xpath.setNamespaceContext(nsContext);
-      nodes = xpath.selectNodes(contextNode);
-      return new NodeListAdapter(nodes);
-    } catch (JaxenException e) {
-      MessageProvider msg = MessageProvider.getInstance();
-      String message = msg.getMessage("xpath.00", new Object[] { exp });
-      throw new XPathException(message, e);
-    }
-  }
-
-  /**
-   * Select the first node matching an XPath expression.
-   * 
-   * All namespace URIs and prefixes declared in the <code>Constants</code>
-   * interface are used for resolving namespaces.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param exp The XPath expression to evaluate.
-   * @return Node The first node matching the XPath expression, or
-   * <code>null</code>, if no node matched.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  public static Node selectSingleNode(Node contextNode, String exp)
-    throws XPathException {
-
-    return selectSingleNode(contextNode, NS_CONTEXT, exp);
-  }
-
-  /**
-   * Select the first node matching an XPath expression.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param namespaceElement An element from which to build the
-   * namespace mapping for evaluating the XPath expression
-   * @param exp The XPath expression to evaluate.
-   * @return Node The first node matching the XPath expression, or
-   * <code>null</code>, if no node matched.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  public static Node selectSingleNode(
-    Node contextNode,
-    Element namespaceElement,
-    String exp)
-    throws XPathException {
-
-    try {
-      SimpleNamespaceContext ctx = new SimpleNamespaceContext();
-      ctx.addElementNamespaces(documentNavigator, namespaceElement);
-
-      return selectSingleNode(contextNode, ctx, exp);
-    } catch (JaxenException e) {
-      MessageProvider msg = MessageProvider.getInstance();
-      String message = msg.getMessage("xpath.00", new Object[] { exp });
-      throw new XPathException(message, e);
-    }
-  }
-
-  /**
-   * Select the first node matching an XPath expression.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param namespaceMapping A namespace prefix to namespace URI mapping
-   * (<code>String</code> to <code>String</code>) for evaluating the XPath 
-   * expression.
-   * @param exp The XPath expression to evaluate.
-   * @return Node The first node matching the XPath expression, or
-   * <code>null</code>, if no node matched.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  public static Node selectSingleNode(
-    Node contextNode,
-    Map namespaceMapping,
-    String exp)
-    throws XPathException {
-
-    SimpleNamespaceContext ctx = new SimpleNamespaceContext(namespaceMapping);
-
-    return selectSingleNode(contextNode, ctx, exp);
-  }
-
-  /**
-   * Select the first node matching an XPath expression.
-   * 
-   * @param contextNode The root node from which to evaluate the XPath
-   * expression.
-   * @param nsContext The <code>NamespaceContext</code> for resolving namespace
-   * prefixes to namespace URIs for evaluating the XPath expression.
-   * @param exp The XPath expression to evaluate.
-   * @return Node The first node matching the XPath expression, or
-   * <code>null</code>, if no node matched.
-   * @throws XPathException An error occurred evaluating the XPath expression.
-   */
-  private static Node selectSingleNode(
-    Node contextNode,
-    NamespaceContext nsContext,
-    String exp)
-    throws XPathException {
-
-    try {
-      DOMXPath xpath = new DOMXPath(exp);
-      xpath.setNamespaceContext(nsContext);
-      return (Node) xpath.selectSingleNode(contextNode);
-    } catch (JaxenException e) {
-      MessageProvider msg = MessageProvider.getInstance();
-      String message = msg.getMessage("xpath.00", new Object[] { exp });
-      throw new XPathException(message, e);
-    }
-  }
-
-  /**
-   * Return the value of a DOM element whose location is given by an XPath
-   * expression.
-   * 
-   * @param root The root element from which to evaluate the XPath.
-   * @param xpath The XPath expression pointing to the element whose value
-   * to return.
-   * @param def The default value to return, if no element can be found using
-   * the given <code>xpath</code>.
-   * @return The element value, if it can be located using the
-   * <code>xpath</code>. Otherwise, <code>def</code> is returned.
-   */
-  public static String getElementValue(
-    Element root,
-    String xpath,
-    String def) {
-
-    Element elem = (Element) XPathUtils.selectSingleNode(root, xpath);
-    return elem != null ? DOMUtils.getText(elem) : def;
-  }
-
-  /**
-   * Return the value of a DOM attribute whose location is given by an XPath
-   * expression.
-   * 
-   * @param root The root element from which to evaluate the XPath.
-   * @param xpath The XPath expression pointing to the attribute whose value to
-   * return.
-   * @param def The default value to return, if no attribute can be found using
-   * the given <code>xpath</code>.
-   * @return The element value, if it can be located using the
-   * <code>xpath</code>. Otherwise, <code>def</code> is returned.
-   */
-  public static String getAttributeValue(
-    Element root,
-    String xpath,
-    String def) {
-
-    Attr attr = (Attr) XPathUtils.selectSingleNode(root, xpath);
-    return attr != null ? attr.getValue() : def;
-  }
-
-}
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 06a72c570..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 enum = ks.aliases();
-  	String alias = (String)enum.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());
-  }
-
-}
author	(no author) <(no author)@d688527b-c9ab-4aba-bd8d-4036d912da1d>	2003-12-22 17:51:40 +0000
committer	(no author) <(no author)@d688527b-c9ab-4aba-bd8d-4036d912da1d>	2003-12-22 17:51:40 +0000
commit	b9e7df0cbe67b486ce3a1a2177bd08c0ced9e005 (patch)
tree	7c3ebc612f89ce28ce75c8e7c06f92aca3ad5501 /common
parent	296f2afedb9bef1bc71aeaa3407128094de7a523 (diff)
download	moa-id-spss-b9e7df0cbe67b486ce3a1a2177bd08c0ced9e005.tar.gz moa-id-spss-b9e7df0cbe67b486ce3a1a2177bd08c0ced9e005.tar.bz2 moa-id-spss-b9e7df0cbe67b486ce3a1a2177bd08c0ced9e005.zip