aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/.checkstyle2
-rw-r--r--build/.project17
-rw-r--r--build/README.txt80
-rw-r--r--build/scripts/build.bat64
-rw-r--r--build/scripts/build.sh34
-rw-r--r--build/scripts/runAnt.bat38
-rw-r--r--build/scripts/runAnt.sh31
-rw-r--r--build/tools/jakarta-ant-1.5.1/KEYS226
-rw-r--r--build/tools/jakarta-ant-1.5.1/LICENSE49
-rw-r--r--build/tools/jakarta-ant-1.5.1/LICENSE.dom71
-rw-r--r--build/tools/jakarta-ant-1.5.1/LICENSE.sax20
-rw-r--r--build/tools/jakarta-ant-1.5.1/LICENSE.xerces56
-rw-r--r--build/tools/jakarta-ant-1.5.1/README70
-rw-r--r--build/tools/jakarta-ant-1.5.1/WHATSNEW1301
-rw-r--r--build/tools/jakarta-ant-1.5.1/bin/ant192
-rw-r--r--build/tools/jakarta-ant-1.5.1/bin/ant.bat95
-rw-r--r--build/tools/jakarta-ant-1.5.1/bin/antRun12
-rw-r--r--build/tools/jakarta-ant-1.5.1/bin/antRun.bat31
-rw-r--r--build/tools/jakarta-ant-1.5.1/bin/antRun.pl51
-rw-r--r--build/tools/jakarta-ant-1.5.1/bin/complete-ant-cmd.pl102
-rw-r--r--build/tools/jakarta-ant-1.5.1/bin/lcp.bat16
-rw-r--r--build/tools/jakarta-ant-1.5.1/bin/runant.pl162
-rw-r--r--build/tools/jakarta-ant-1.5.1/bin/runant.py99
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/changelog.xsl184
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/checkstyle-frames.xsl324
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/coverage-frames.xsl533
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/jdepend-frames.xsl522
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/jdepend.xsl312
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/junit-frames.xsl741
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/junit-noframes.xsl519
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/log.xsl247
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/maudit-frames.xsl547
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/mmetrics-frames.xsl1070
-rw-r--r--build/tools/jakarta-ant-1.5.1/etc/tagdiff.xsl162
-rw-r--r--build/tools/jakarta-ant-1.5.1/lib/README15
-rw-r--r--build/tools/jakarta-ant-1.5.1/lib/ant.jarbin717666 -> 0 bytes
-rw-r--r--build/tools/jakarta-ant-1.5.1/lib/iContract-jdk1_2.jarbin531334 -> 0 bytes
-rw-r--r--build/tools/jakarta-ant-1.5.1/lib/optional.jarbin654735 -> 0 bytes
-rw-r--r--build/tools/jakarta-ant-1.5.1/lib/xercesImpl.jarbin831473 -> 0 bytes
-rw-r--r--build/tools/jakarta-ant-1.5.1/lib/xml-apis.jarbin108484 -> 0 bytes
-rw-r--r--build/tools/jakarta-ant-1.5.1/welcome.html124
-rw-r--r--common/.checkstyle7
-rw-r--r--common/.classpath22
-rw-r--r--common/.cvsignore2
-rw-r--r--common/.project17
-rw-r--r--common/build.xml78
-rw-r--r--common/data/test/security/cacertsbin7365 -> 0 bytes
-rw-r--r--common/data/test/security/cacerts+gt_cybertrust_rootbin7918 -> 0 bytes
-rw-r--r--common/data/test/security/client-certs/sicher-demo(buergerkarte).p12bin3804 -> 0 bytes
-rw-r--r--common/data/test/security/client-certs/sicher-demo.cerbin1870 -> 0 bytes
-rw-r--r--common/data/test/security/client.keystorebin2503 -> 0 bytes
-rw-r--r--common/data/test/security/server-certs/baltimore.cerbin693 -> 0 bytes
-rw-r--r--common/data/test/security/server-certs/gte_cybertrust_root.cerbin510 -> 0 bytes
-rw-r--r--common/data/test/security/server.keystore.tomcatbin1973 -> 0 bytes
-rw-r--r--common/data/test/xml/CreateXMLSignature/CreateXMLSignatureResponse.xml59
-rw-r--r--common/data/test/xml/CreateXMLSignature/Req000.xml19
-rw-r--r--common/data/test/xml/CreateXMLSignature/Req001.xml52
-rw-r--r--common/data/test/xml/CreateXMLSignature/Req002.xml48
-rw-r--r--common/data/test/xml/CreateXMLSignature/Req004.xml34
-rw-r--r--common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.001.Req.xml17
-rw-r--r--common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.007.Req.xml19
-rw-r--r--common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.008.Req.xml19
-rw-r--r--common/data/test/xml/CreateXMLSignature/TestGeneratorCX0.010.Req.xml20
-rw-r--r--common/data/test/xml/CreateXMLSignature/TestGeneratorCX2.005.Req.xml1
-rw-r--r--common/data/test/xml/CreateXMLSignature/invalid.xml20
-rw-r--r--common/data/test/xml/Infobox/InfoboxReadResponse.xml97
-rw-r--r--common/data/test/xml/Infobox/InfoboxReadResponseMOA4.xml105
-rw-r--r--common/data/test/xml/VerifyCMSSignature/Req000.xml46
-rw-r--r--common/data/test/xml/VerifyCMSSignature/Req001.xml15
-rw-r--r--common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.001.Req.xml41
-rw-r--r--common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.002.Req.xml47
-rw-r--r--common/data/test/xml/VerifyCMSSignature/TestGeneratorVC0.006.Req.xml32
-rw-r--r--common/data/test/xml/VerifyXMLSignature/CertInfoVerifyXMLSignatureRequest.xml105
-rw-r--r--common/data/test/xml/VerifyXMLSignature/Req000.xml46
-rw-r--r--common/data/test/xml/VerifyXMLSignature/Req001.xml49
-rw-r--r--common/data/test/xml/VerifyXMLSignature/Req002.xml63
-rw-r--r--common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.001.Req.xml54
-rw-r--r--common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.002.Req.xml53
-rw-r--r--common/data/test/xml/VerifyXMLSignature/TestGeneratorVX.006.Req.xml70
-rw-r--r--common/data/test/xml/VerifyXMLSignature/VerifySAMLRequest.xml38
-rw-r--r--common/lib/commons-logging-1.0.2/commons-logging-api.jarbin18404 -> 0 bytes
-rw-r--r--common/lib/commons-logging-1.0.2/commons-logging.jarbin26388 -> 0 bytes
-rw-r--r--common/lib/iaik-ecc/iaik_ecc.jarbin101004 -> 0 bytes
-rw-r--r--common/lib/iaik-jce-3.01/iaik_jce_full.jarbin630313 -> 0 bytes
-rw-r--r--common/lib/jaxen-1.0/jaxen-core.jarbin160967 -> 0 bytes
-rw-r--r--common/lib/jaxen-1.0/jaxen-dom.jarbin13707 -> 0 bytes
-rw-r--r--common/lib/jaxen-1.0/saxpath.jarbin23563 -> 0 bytes
-rw-r--r--common/lib/jaxp-1.2_01/dom.jarbin26710 -> 0 bytes
-rw-r--r--common/lib/jaxp-1.2_01/jaxp-api.jarbin27052 -> 0 bytes
-rw-r--r--common/lib/jaxp-1.2_01/sax.jarbin26206 -> 0 bytes
-rw-r--r--common/lib/jsse-1.0.3_01/jcert.jarbin11321 -> 0 bytes
-rw-r--r--common/lib/jsse-1.0.3_01/jnet.jarbin5830 -> 0 bytes
-rw-r--r--common/lib/jsse-1.0.3_01/jsse.jarbin512635 -> 0 bytes
-rw-r--r--common/lib/junit-3.8.1/junit.jarbin121070 -> 0 bytes
-rw-r--r--common/lib/xalan-j-2.2/xalan.jarbin923866 -> 0 bytes
-rw-r--r--common/lib/xerces-j-2.0.2/xercesImpl.jarbin933730 -> 0 bytes
-rw-r--r--common/lib/xerces-j-2.0.2/xmlParserAPIs.jarbin78440 -> 0 bytes
-rw-r--r--common/res/resources/properties/common_messages_de.properties16
-rw-r--r--common/res/resources/schemas/Core.20020225.xsd399
-rw-r--r--common/res/resources/schemas/Core.20020831.xsd153
-rw-r--r--common/res/resources/schemas/ECDSAKeyValue.xsd122
-rw-r--r--common/res/resources/schemas/MOA-ID-Configuration-1.1.xsd305
-rw-r--r--common/res/resources/schemas/MOA-SPSS-1.2.xsd454
-rw-r--r--common/res/resources/schemas/MOA-SPSS-Configuration-1.0.xsd208
-rw-r--r--common/res/resources/schemas/PersonData.xsd426
-rw-r--r--common/res/resources/schemas/PersonName-1_2.xsd115
-rw-r--r--common/res/resources/schemas/PostalAddress-1_2.xsd95
-rw-r--r--common/res/resources/schemas/TelcomNumber-1_0.xsd89
-rw-r--r--common/res/resources/schemas/XMLSchema-instance.xsd37
-rw-r--r--common/res/resources/schemas/XMLSchema.dtd402
-rw-r--r--common/res/resources/schemas/cs-sstc-schema-assertion-01.xsd194
-rw-r--r--common/res/resources/schemas/cs-sstc-schema-protocol-01.xsd127
-rw-r--r--common/res/resources/schemas/datatypes.dtd203
-rw-r--r--common/res/resources/schemas/exclusive-canonicalization.xsd22
-rw-r--r--common/res/resources/schemas/xml.xsd83
-rw-r--r--common/res/resources/schemas/xmldsig-core-schema.xsd264
-rw-r--r--common/res/resources/schemas/xmldsig-filter2.xsd38
-rw-r--r--common/src/at/gv/egovernment/moa/logging/LogMsg.java43
-rw-r--r--common/src/at/gv/egovernment/moa/logging/Logger.java175
-rw-r--r--common/src/at/gv/egovernment/moa/logging/LoggingContext.java46
-rw-r--r--common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java56
-rw-r--r--common/src/at/gv/egovernment/moa/util/Base64Utils.java109
-rw-r--r--common/src/at/gv/egovernment/moa/util/BoolUtils.java24
-rw-r--r--common/src/at/gv/egovernment/moa/util/CollectionUtils.java36
-rw-r--r--common/src/at/gv/egovernment/moa/util/Constants.java233
-rw-r--r--common/src/at/gv/egovernment/moa/util/DOMUtils.java810
-rw-r--r--common/src/at/gv/egovernment/moa/util/DateTimeUtils.java326
-rw-r--r--common/src/at/gv/egovernment/moa/util/EntityResolverChain.java52
-rw-r--r--common/src/at/gv/egovernment/moa/util/FileUtils.java87
-rw-r--r--common/src/at/gv/egovernment/moa/util/KeyStoreUtils.java134
-rw-r--r--common/src/at/gv/egovernment/moa/util/MOADefaultHandler.java82
-rw-r--r--common/src/at/gv/egovernment/moa/util/MOAEntityResolver.java103
-rw-r--r--common/src/at/gv/egovernment/moa/util/MOAErrorHandler.java85
-rw-r--r--common/src/at/gv/egovernment/moa/util/MOATimer.java110
-rw-r--r--common/src/at/gv/egovernment/moa/util/MessageProvider.java63
-rw-r--r--common/src/at/gv/egovernment/moa/util/Messages.java117
-rw-r--r--common/src/at/gv/egovernment/moa/util/NodeIteratorAdapter.java87
-rw-r--r--common/src/at/gv/egovernment/moa/util/NodeListAdapter.java44
-rw-r--r--common/src/at/gv/egovernment/moa/util/ResourceBundleChain.java66
-rw-r--r--common/src/at/gv/egovernment/moa/util/SSLUtils.java222
-rw-r--r--common/src/at/gv/egovernment/moa/util/StreamEntityResolver.java64
-rw-r--r--common/src/at/gv/egovernment/moa/util/StreamUtils.java116
-rw-r--r--common/src/at/gv/egovernment/moa/util/URLDecoder.java60
-rw-r--r--common/src/at/gv/egovernment/moa/util/URLEncoder.java63
-rw-r--r--common/src/at/gv/egovernment/moa/util/XPathException.java58
-rw-r--r--common/src/at/gv/egovernment/moa/util/XPathUtils.java415
-rw-r--r--common/src/test/at/gv/egovernment/moa/AllTests.java38
-rw-r--r--common/src/test/at/gv/egovernment/moa/MOATestCase.java75
-rw-r--r--common/src/test/at/gv/egovernment/moa/util/DOMUtilsTest.java137
-rw-r--r--common/src/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java104
-rw-r--r--common/src/test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java90
-rw-r--r--common/src/test/at/gv/egovernment/moa/util/SSLUtilsTest.java160
-rw-r--r--common/src/test/at/gv/egovernment/moa/util/URLDecoderTest.java29
-rw-r--r--common/src/test/at/gv/egovernment/moa/util/URLEncoderTest.java43
-rw-r--r--common/src/test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java99
-rw-r--r--common/src/test/at/gv/egovernment/moa/util/XPathUtilsTest.java51
-rw-r--r--id.oa/.classpath6
-rw-r--r--id.oa/.project23
-rw-r--r--id.oa/build.xml32
-rw-r--r--id.oa/html/AuthTemplate.jsp30
-rw-r--r--id.oa/html/BKUSelectionTemplate.jsp14
-rw-r--r--id.oa/html/auth.jsp48
-rw-r--r--id.oa/html/chooseBKU.jsp19
-rw-r--r--id.oa/html/form.jsp20
-rw-r--r--id.oa/html/getBKUSelectTag.jsp6
-rw-r--r--id.oa/html/index.jsp56
-rw-r--r--id.oa/html/stateful_login.jsp29
-rw-r--r--id.oa/web.xml9
-rw-r--r--id.server/.classpath36
-rw-r--r--id.server/.cvsignore2
-rw-r--r--id.server/.project18
-rw-r--r--id.server/.tomcatplugin8
-rw-r--r--id.server/MOA-ID_release_notes.txt89
-rw-r--r--id.server/build.xml359
-rw-r--r--id.server/data/abnahme-test/conf/CopyConfigAbnahme.bat40
-rw-r--r--id.server/data/abnahme-test/conf/OAConfBasicAuth.xml10
-rw-r--r--id.server/data/abnahme-test/conf/OAConfHeaderAuth.xml13
-rw-r--r--id.server/data/abnahme-test/conf/OAConfParamAuth.xml10
-rw-r--r--id.server/data/abnahme-test/conf/deploy_AUTH.bat12
-rw-r--r--id.server/data/abnahme-test/conf/log4j.properties41
-rw-r--r--id.server/data/abnahme-test/conf/moa-id/ConfigurationTest.xml64
-rw-r--r--id.server/data/abnahme-test/conf/moa/ConfigurationTest.xml136
-rw-r--r--id.server/data/abnahme-test/conf/moa/TrustProfile1/Buergerkarte01Root.cerbin876 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/TrustProfile1/IAIK_TestRoot.cerbin987 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/TrustProfile1/Max_Mustermann.cerbin965 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/TrustProfile1/TestPersonMOA1.cerbin1321 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/TrustProfile1/TestPersonMOA4.cerbin1321 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/TrustProfile1/test-ee2003_normal_inkl_verwaltungs_oid.derbin1886 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/TrustProfile2/Max_Mustermann.cerbin965 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/common/endorsed/xercesImpl.jarbin933730 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/common/endorsed/xmlParserAPIs.jarbin78440 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/keys/DSA.512.p12bin2467 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/keys/ecc(ego).p12bin1234 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/keys/normal-eeExpired.p12bin2797 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/keys/sicher-demo(buergerkarte).p12bin3077 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/keys/test-ee2003_normal(buergerkarte).p12bin3077 -> 0 bytes
-rw-r--r--id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile1MOAID.xml19
-rw-r--r--id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile2MOAID.xml3
-rw-r--r--id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile3MOAID.xml19
-rw-r--r--id.server/data/abnahme-test/conf/moa/runAbnahme.bat12
-rw-r--r--id.server/data/abnahme-test/conf/moa/server.xml423
-rw-r--r--id.server/data/abnahme-test/conf/transforms/TransformsInfosHTML.xml63
-rw-r--r--id.server/data/abnahme-test/ixsil/init/properties/algorithms.properties94
-rw-r--r--id.server/data/abnahme-test/ixsil/init/properties/init.properties214
-rw-r--r--id.server/data/abnahme-test/ixsil/init/properties/keyManager.properties74
-rw-r--r--id.server/data/abnahme-test/ixsil/init/schemas/Signature.xsd328
-rw-r--r--id.server/data/abnahme-test/ixsil/init/schemas/XMLSchema.dtd402
-rw-r--r--id.server/data/abnahme-test/ixsil/init/schemas/datatypes.dtd203
-rw-r--r--id.server/data/abnahme-test/xmldata/A100/A101/htmlForm.html177
-rw-r--r--id.server/data/abnahme-test/xmldata/A100/A102/htmlForm.html177
-rw-r--r--id.server/data/abnahme-test/xmldata/A100/A103/htmlForm.html177
-rw-r--r--id.server/data/abnahme-test/xmldata/A100/AuthTemplate.html30
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A201/CreateXMLSignatureRequest.xml88
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A254/InfoboxReadResponse.xml97
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A255/InfoboxReadResponse.xml97
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A256/InfoboxReadResponse.xml108
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A257/InfoboxReadResponse.xml97
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A258/InfoboxReadResponse.xml97
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A259/InfoboxReadResponse.xml87
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A260/InfoboxReadResponse.xml41
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A261/InfoboxReadResponse.xml97
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A262/Configuration.xml103
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A262/InfoboxReadResponse.xml98
-rw-r--r--id.server/data/abnahme-test/xmldata/A200/A263/InfoboxReadResponse.xml98
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A301/AuthenticationData.xml25
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A301/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A302/AuthenticationData.xml121
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A302/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A303/AuthenticationData.xml37
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A303/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A304/AuthenticationData.xml133
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A304/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A305/AuthenticationData.xml28
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A305/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A306/AuthenticationData.xml124
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A306/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A307/AuthenticationData.xml40
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A307/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A308/AuthenticationData.xml136
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A308/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A309/AuthenticationData.xml25
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A309/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A309/CreateXMLSignatureResponse.xml52
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A310/AuthenticationData.xml25
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A310/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A310/CreateXMLSignatureResponse.xml52
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A311/AuthenticationData.xml28
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A311/Configuration.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A311/CreateXMLSignatureResponse.xml52
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A355/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A356/CreateXMLSignatureResponse.xml62
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A357/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A358/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A359/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A360/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A361/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A362/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A363/CreateXMLSignatureResponse.xml13
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A364/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A366/Configuration.xml65
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A367/Configuration.xml65
-rw-r--r--id.server/data/abnahme-test/xmldata/A300/A367/CreateXMLSignatureResponse.xml94
-rw-r--r--id.server/data/abnahme-test/xmldata/A400/A401/AuthenticationData.xml136
-rw-r--r--id.server/data/abnahme-test/xmldata/A600/A601/GetAuthenticationDataWebServiceResponse.xml136
-rw-r--r--id.server/data/abnahme-test/xmldata/A700/A701/AuthTemplate.html30
-rw-r--r--id.server/data/abnahme-test/xmldata/A700/A701/BKUSelectionTemplate.html14
-rw-r--r--id.server/data/abnahme-test/xmldata/A700/A701/SelectBKUForm.html20
-rw-r--r--id.server/data/abnahme-test/xmldata/A700/A702/SelectBKUForm.html20
-rw-r--r--id.server/data/abnahme-test/xmldata/A700/A703/Configuration.xml35
-rw-r--r--id.server/data/abnahme-test/xmldata/A700/A703/SelectBKUForm.html1
-rw-r--r--id.server/data/abnahme-test/xmldata/A700/Configuration.xml35
-rw-r--r--id.server/data/abnahme-test/xmldata/A700/getBKUSelectTag.jsp6
-rw-r--r--id.server/data/abnahme-test/xmldata/C000/C001/Configuration.xml61
-rw-r--r--id.server/data/abnahme-test/xmldata/C000/C002/Configuration.xml24
-rw-r--r--id.server/data/abnahme-test/xmldata/C000/C003/Configuration.xml17
-rw-r--r--id.server/data/abnahme-test/xmldata/C000/C051/ConfigurationC051.xml12
-rw-r--r--id.server/data/abnahme-test/xmldata/Configuration.xml105
-rw-r--r--id.server/data/abnahme-test/xmldata/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/abnahme-test/xmldata/InfoboxReadResponse.xml97
-rw-r--r--id.server/data/abnahme-test/xmldata/L000/Configuration.xml105
-rw-r--r--id.server/data/abnahme-test/xmldata/L000/CreateXMLSignatureResponse.xml94
-rw-r--r--id.server/data/abnahme-test/xmldata/L000/InfoboxReadResponse.xml97
-rw-r--r--id.server/data/certs/TrustProfile1/A-Trust-Qual-01.cerbin1110 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/A-Trust-nQual-01.cerbin864 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/Buergerkarte01Root.cerbin876 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/C.CA.DS.cerbin1136 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/IAIKRoot.cerbin883 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/IAIKRootMusterbehoerde.cerbin863 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/TestPersonMOA4.cerbin1321 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/a-sign-TEST-Premium-Enc-01.cerbin1136 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/a-sign-TEST-nQual-01.cerbin994 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/ecdsaroot_der.cerbin540 -> 0 bytes
-rw-r--r--id.server/data/certs/TrustProfile1/hsm.cer13
-rw-r--r--id.server/data/certs/TrustProfile1/moahsmcert.cer13
-rw-r--r--id.server/data/certs/ca-certs/GTE CyberTrust Root.cerbin510 -> 0 bytes
-rw-r--r--id.server/data/certs/ca-certs/TrustMark-WebServer-01.cerbin1030 -> 0 bytes
-rw-r--r--id.server/data/certs/ca-certs/VeriSignRSA Secure Server CA.cerbin568 -> 0 bytes
-rw-r--r--id.server/data/certs/ca-certs/a-sign-corporate-light-01.cerbin1065 -> 0 bytes
-rw-r--r--id.server/data/certs/ca-certs/intermediate.cerbin890 -> 0 bytes
-rw-r--r--id.server/data/certs/ca-certs/root.cerbin881 -> 0 bytes
-rw-r--r--id.server/data/certs/client-certs/key.pem18
-rw-r--r--id.server/data/certs/client-certs/key2.pem18
-rw-r--r--id.server/data/certs/client-certs/req.cerbin746 -> 0 bytes
-rw-r--r--id.server/data/certs/client-certs/req.pem18
-rw-r--r--id.server/data/certs/client-certs/req2.pem18
-rw-r--r--id.server/data/certs/keystores/client.keystorebin814 -> 0 bytes
-rw-r--r--id.server/data/certs/keystores/client.p12bin1860 -> 0 bytes
-rw-r--r--id.server/data/certs/keystores/client2.p12bin1856 -> 0 bytes
-rw-r--r--id.server/data/certs/keystores/server.keystorebin1360 -> 0 bytes
-rw-r--r--id.server/data/certs/keystores/testlinux.keystorebin5417 -> 0 bytes
-rw-r--r--id.server/data/certs/keystores/testlinux_plus_client.keystorebin6199 -> 0 bytes
-rw-r--r--id.server/data/certs/keystores/testlinux_rev.keystorebin5417 -> 0 bytes
-rw-r--r--id.server/data/certs/server-certs/a-trust.cerbin1100 -> 0 bytes
-rw-r--r--id.server/data/certs/server-certs/baltimore.cerbin693 -> 0 bytes
-rw-r--r--id.server/data/certs/server-certs/cio.cerbin1185 -> 0 bytes
-rw-r--r--id.server/data/certs/server-certs/testlinux.crtbin1018 -> 0 bytes
-rw-r--r--id.server/data/certs/server-certs/testlinux_rev.crtbin1018 -> 0 bytes
-rw-r--r--id.server/data/certs/server-certs/testwin.cerbin1000 -> 0 bytes
-rw-r--r--id.server/data/certs/server-certs/testwin_rev.cerbin1000 -> 0 bytes
-rw-r--r--id.server/data/certs/server-certs/tomcat-server.crtbin580 -> 0 bytes
-rw-r--r--id.server/data/certs/server-certs/verisign.cerbin977 -> 0 bytes
-rw-r--r--id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml81
-rw-r--r--id.server/data/deploy/conf/moa-id/log4j.properties22
-rw-r--r--id.server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml10
-rw-r--r--id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml63
-rw-r--r--id.server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml14
-rw-r--r--id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8Fbin861 -> 0 bytes
-rw-r--r--id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733bin864 -> 0 bytes
-rw-r--r--id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6bin860 -> 0 bytes
-rw-r--r--id.server/data/deploy/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92bin1110 -> 0 bytes
-rw-r--r--id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml19
-rw-r--r--id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-Qual-01-SN0291.cerbin1110 -> 0 bytes
-rw-r--r--id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN0213.cerbin864 -> 0 bytes
-rw-r--r--id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN0218.cerbin861 -> 0 bytes
-rw-r--r--id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN6f.cerbin860 -> 0 bytes
-rw-r--r--id.server/data/deploy/tomcat/moa-id-env.bat1
-rw-r--r--id.server/data/deploy/tomcat/moa-id-env.sh1
-rw-r--r--id.server/data/deploy/tomcat/server.mod_jk.xml201
-rw-r--r--id.server/data/deploy/tomcat/server.xml157
-rw-r--r--id.server/data/deploy/tomcat/uriworkermap.properties7
-rw-r--r--id.server/data/deploy/tomcat/workers.properties6
-rw-r--r--id.server/data/test/conf/ConfigurationTest.xml103
-rw-r--r--id.server/data/test/conf/OAConfBasicAuth.xml10
-rw-r--r--id.server/data/test/conf/OAConfHeaderAuth.xml13
-rw-r--r--id.server/data/test/conf/OAConfParamAuth.xml10
-rw-r--r--id.server/data/test/conf/log4j.properties10
-rw-r--r--id.server/data/test/conf/transforms/TransformsInfosHTML.xml63
-rw-r--r--id.server/data/test/ixsil/init/properties/algorithms.properties94
-rw-r--r--id.server/data/test/ixsil/init/properties/init.properties214
-rw-r--r--id.server/data/test/ixsil/init/properties/keyManager.properties74
-rw-r--r--id.server/data/test/ixsil/init/schemas/Signature.xsd328
-rw-r--r--id.server/data/test/ixsil/init/schemas/XMLSchema.dtd402
-rw-r--r--id.server/data/test/ixsil/init/schemas/datatypes.dtd203
-rw-r--r--id.server/data/test/xmldata/ErrorResponse.xml4
-rw-r--r--id.server/data/test/xmldata/GetIdentityLinkForm.html20
-rw-r--r--id.server/data/test/xmldata/standard/AuthenticationDataAssertion.xml127
-rw-r--r--id.server/data/test/xmldata/standard/CreateXMLSignatureRequest.xml52
-rw-r--r--id.server/data/test/xmldata/standard/CreateXMLSignatureResponse.xml59
-rw-r--r--id.server/data/test/xmldata/standard/VerifyXMLSignaterResponse.xml2
-rw-r--r--id.server/data/test/xmldata/testperson1/InfoboxReadResponse.xml97
-rw-r--r--id.server/doc/Architektur ID.vsdbin318464 -> 0 bytes
-rw-r--r--id.server/doc/CIO X509ext-20030218.pdfbin137429 -> 0 bytes
-rw-r--r--id.server/doc/MOA ID 1.x.wsdl41
-rw-r--r--id.server/doc/MOA-ID Feinspezifikation.docbin260608 -> 0 bytes
-rw-r--r--id.server/doc/MOA-ID Testfalldokumentation.docbin532992 -> 0 bytes
-rw-r--r--id.server/doc/MOA-ID-1.1-20030630.pdfbin234509 -> 0 bytes
-rw-r--r--id.server/doc/MOA-ID-Configuration-1.1.xsd305
-rw-r--r--id.server/doc/api-doc/allclasses-frame.html35
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html171
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html259
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html114
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html194
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html526
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html126
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html751
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html152
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html204
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html364
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html91
-rw-r--r--id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html91
-rw-r--r--id.server/doc/api-doc/deprecated-list.html89
-rw-r--r--id.server/doc/api-doc/help-doc.html142
-rw-r--r--id.server/doc/api-doc/index-all.html422
-rw-r--r--id.server/doc/api-doc/index.html22
-rw-r--r--id.server/doc/api-doc/overview-tree.html101
-rw-r--r--id.server/doc/api-doc/package-list0
-rw-r--r--id.server/doc/api-doc/packages.html26
-rw-r--r--id.server/doc/api-doc/serialized-form.html89
-rw-r--r--id.server/doc/api-doc/stylesheet.css29
-rw-r--r--id.server/doc/bku-auswahl.20030408.pdfbin131587 -> 0 bytes
-rw-r--r--id.server/doc/cs-sstc-schema-assertion-01.xsd194
-rw-r--r--id.server/doc/cs-sstc-schema-protocol-01.xsd127
-rw-r--r--id.server/doc/moa-id.htm7
-rw-r--r--id.server/doc/moa_id/examples/BKUSelectionTemplate.html4
-rw-r--r--id.server/doc/moa_id/examples/ChainingModes.txt6
-rw-r--r--id.server/doc/moa_id/examples/IdentityLinkSigners.txt3
-rw-r--r--id.server/doc/moa_id/examples/LoginServletExample.txt171
-rw-r--r--id.server/doc/moa_id/examples/Template.html23
-rw-r--r--id.server/doc/moa_id/examples/TransformsInfoAuthBlock.txt63
-rw-r--r--id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml54
-rw-r--r--id.server/doc/moa_id/examples/conf/OAConfBasicAuth.xml12
-rw-r--r--id.server/doc/moa_id/examples/conf/OAConfHeaderAuth.xml17
-rw-r--r--id.server/doc/moa_id/examples/conf/OAConfParamAuth.xml14
-rw-r--r--id.server/doc/moa_id/examples/moa-id-env-linux.txt1
-rw-r--r--id.server/doc/moa_id/examples/moa-id-env-windows.txt1
-rw-r--r--id.server/doc/moa_id/faqs.htm109
-rw-r--r--id.server/doc/moa_id/id-admin.htm283
-rw-r--r--id.server/doc/moa_id/id-admin_1.htm400
-rw-r--r--id.server/doc/moa_id/id-admin_2.htm623
-rw-r--r--id.server/doc/moa_id/id-admin_3.htm187
-rw-r--r--id.server/doc/moa_id/id-anwendung.htm104
-rw-r--r--id.server/doc/moa_id/id-anwendung_1.htm182
-rw-r--r--id.server/doc/moa_id/id-anwendung_2.htm249
-rw-r--r--id.server/doc/moa_id/links.htm141
-rw-r--r--id.server/doc/moa_id/moa-id-ablauf.jpgbin15550 -> 0 bytes
-rw-r--r--id.server/doc/moa_id/moa.htm247
-rw-r--r--id.server/doc/moa_images/east.gifbin966 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/idle.gifbin869 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/moa_diagramm1.jpgbin60602 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/moa_thema.gifbin25120 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/north.gifbin967 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/pfeil.gifbin843 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/print.gifbin211 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/select.gifbin880 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/south.gifbin965 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/transdot.gifbin43 -> 0 bytes
-rw-r--r--id.server/doc/moa_images/west.gifbin966 -> 0 bytes
-rw-r--r--id.server/html/auth/WEB-INF/server-config.wsdd29
-rw-r--r--id.server/html/auth/WEB-INF/web.xml88
-rw-r--r--id.server/html/auth/errorpage.jsp33
-rw-r--r--id.server/html/auth/index.jsp40
-rw-r--r--id.server/html/proxy/WEB-INF/web.xml43
-rw-r--r--id.server/javadoc.xml18
-rw-r--r--id.server/lib/axis-1.1rc2/axis.jarbin1224774 -> 0 bytes
-rw-r--r--id.server/lib/axis-1.1rc2/commons-discovery.jarbin67334 -> 0 bytes
-rw-r--r--id.server/lib/axis-1.1rc2/jaxrpc.jarbin35658 -> 0 bytes
-rw-r--r--id.server/lib/axis-1.1rc2/saaj.jarbin18402 -> 0 bytes
-rw-r--r--id.server/lib/axis-1.1rc2/wsdl4j.jarbin113178 -> 0 bytes
-rw-r--r--id.server/lib/commons-logging-1.0.2/commons-logging-api.jarbin18404 -> 0 bytes
-rw-r--r--id.server/lib/commons-logging-1.0.2/commons-logging.jarbin26388 -> 0 bytes
-rw-r--r--id.server/lib/iaik-moa-1.06/iaik-moa-full.jarbin578556 -> 0 bytes
-rw-r--r--id.server/lib/iaik-moa-1.06/iaik_X509TrustManager.jarbin3835 -> 0 bytes
-rw-r--r--id.server/lib/iaik-moa-1.06/iaik_ecc.jarbin101004 -> 0 bytes
-rw-r--r--id.server/lib/iaik-moa-1.06/iaik_jce_full.jarbin637549 -> 0 bytes
-rw-r--r--id.server/lib/iaik-moa-1.06/iaik_ldap.jarbin4970 -> 0 bytes
-rw-r--r--id.server/lib/iaik-moa-1.06/ixsil.jarbin166976 -> 0 bytes
-rw-r--r--id.server/lib/jaxen-1.0/jaxen-core.jarbin160967 -> 0 bytes
-rw-r--r--id.server/lib/jaxen-1.0/jaxen-dom.jarbin13707 -> 0 bytes
-rw-r--r--id.server/lib/jaxen-1.0/saxpath.jarbin23563 -> 0 bytes
-rw-r--r--id.server/lib/jaxp-1.2_01/dom.jarbin26710 -> 0 bytes
-rw-r--r--id.server/lib/jaxp-1.2_01/jaxp-api.jarbin27052 -> 0 bytes
-rw-r--r--id.server/lib/jaxp-1.2_01/sax.jarbin26206 -> 0 bytes
-rw-r--r--id.server/lib/jsse-1.0.3_01/jcert.jarbin11321 -> 0 bytes
-rw-r--r--id.server/lib/jsse-1.0.3_01/jnet.jarbin5830 -> 0 bytes
-rw-r--r--id.server/lib/jsse-1.0.3_01/jsse.jarbin512635 -> 0 bytes
-rw-r--r--id.server/lib/junit-3.8.1/junit.jarbin121070 -> 0 bytes
-rw-r--r--id.server/lib/log4j-1.2.7/log4j-1.2.7.jarbin350677 -> 0 bytes
-rw-r--r--id.server/lib/moa-spss-1.0.8a/moa-common.jarbin76929 -> 0 bytes
-rw-r--r--id.server/lib/moa-spss-1.0.8a/moa-spss.jarbin258568 -> 0 bytes
-rw-r--r--id.server/lib/postgres-jdbc2-7.3/pg73jdbc2.jarbin163980 -> 0 bytes
-rw-r--r--id.server/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zipbin31362 -> 0 bytes
-rw-r--r--id.server/lib/xalan-j-2.2/bsf.jarbin105573 -> 0 bytes
-rw-r--r--id.server/lib/xalan-j-2.2/xalan.jarbin923866 -> 0 bytes
-rw-r--r--id.server/lib/xerces-j-2.0.2/xercesImpl.jarbin933730 -> 0 bytes
-rw-r--r--id.server/lib/xerces-j-2.0.2/xmlParserAPIs.jarbin78440 -> 0 bytes
-rw-r--r--id.server/res/META-INF/services/org.apache.axis.components.net.SecureSocketFactory1
-rw-r--r--id.server/res/resources/properties/id_messages_de.properties101
-rw-r--r--id.server/res/resources/wsdl/MOA-ID-1.0.wsdl40
-rw-r--r--id.server/res/resources/xmldata/CertInfoDsigSignature.xml139
-rw-r--r--id.server/res/resources/xmldata/CertInfoVerifyXMLSignatureRequest.xml9
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/AuthenticationException.java31
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/BuildException.java34
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/MOAIDException.java159
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/ParseException.java34
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/ServiceException.java34
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java648
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationSessionCleaner.java52
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java53
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java118
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/WrongParametersException.java21
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java56
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java114
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java30
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java51
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java58
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java55
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java137
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java39
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java58
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java60
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java100
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java63
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/VPKBuilder.java52
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java203
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java220
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/data/CreateXMLSignatureResponse.java71
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java189
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java78
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/data/VerifyXMLSignatureResponse.java177
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java91
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java140
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/parser/ECDSAKeyValueConverter.java350
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java89
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java266
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java110
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParser.java58
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java159
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java117
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java74
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java135
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java95
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java102
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java110
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java97
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java106
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java156
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/validator/ValidateException.java35
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java124
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java678
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/config/ConfigurationException.java31
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java105
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/config/ConnectionParameter.java106
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java341
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java93
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java145
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java160
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java170
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/data/AuthenticationData.java314
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/data/Cookie.java119
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/data/CookieManager.java114
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/data/IssuerAndSerial.java111
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/data/SAMLStatus.java59
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java91
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/iaik/config/LoggerConfigImpl.java51
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/iaik/config/PKIConfigurationImpl.java65
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/iaik/config/RevocationConfigurationImpl.java35
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/iaik/config/ValidationConfigurationImpl.java51
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/iaik/pki/PKIProfileImpl.java159
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/iaik/pki/jsse/MOAIDTrustManager.java119
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/iaik/servertools/observer/ObservableImpl.java46
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java54
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilderFactory.java68
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/DefaultConnectionBuilder.java119
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java118
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java72
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverFactory.java68
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java91
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/WebmailLoginParameterResolver.classbin3613 -> 0 bytes
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilder.java55
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/invoke/GetAuthenticationDataInvoker.java143
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java145
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParser.java100
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java73
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java35
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java531
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/util/AxisSecureSocketFactory.java213
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/util/MOAIDMessageProvider.java58
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/util/Random.java22
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/util/SSLUtils.java156
-rw-r--r--id.server/src/test/MOAIDTestCase.java203
-rw-r--r--id.server/src/test/abnahme/A/Test100StartAuthentication.java171
-rw-r--r--id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java336
-rw-r--r--id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java597
-rw-r--r--id.server/src/test/abnahme/A/Test400GetAuthenticationData.java129
-rw-r--r--id.server/src/test/abnahme/A/Test500StartAuthenticationServlet.java305
-rw-r--r--id.server/src/test/abnahme/A/Test600GetAuthenticationDataService.java281
-rw-r--r--id.server/src/test/abnahme/A/Test700SelectBKU.java63
-rw-r--r--id.server/src/test/abnahme/AbnahmeTestCase.java163
-rw-r--r--id.server/src/test/abnahme/AllTests.java49
-rw-r--r--id.server/src/test/abnahme/C/Test100Konfiguration.java60
-rw-r--r--id.server/src/test/abnahme/P/Test100LoginParameterResolver.java146
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/AllTests.java41
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/UnitTestCase.java35
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java50
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java55
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AllTests.java33
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java46
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java58
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java73
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java29
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java51
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java52
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java93
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java38
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java166
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/parser/AllTests.java29
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java137
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java67
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java55
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataServiceTest.java91
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java112
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java127
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/proxy/AllTests.java31
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/DOMTreeCompare.java462
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java32
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestCompare.java19
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java180
-rw-r--r--id.server/src/test/at/gv/egovernment/moa/id/util/SSLUtilsTest.java92
-rw-r--r--id.server/src/test/lasttest/Dispatcher.java64
-rw-r--r--id.server/src/test/lasttest/HostnameVerifierHack.java13
-rw-r--r--id.server/src/test/lasttest/LasttestClient.java218
-rw-r--r--id.server/src/test/lasttest/TestThread.java251
-rw-r--r--spss.server/.classpath36
-rw-r--r--spss.server/.cvsignore1
-rw-r--r--spss.server/doc/history.txt8
-rw-r--r--spss.server/res/resources/properties/spss_messages_de.properties6
-rw-r--r--spss.slinterface/.classpath21
-rw-r--r--spss.slinterface/.project18
-rw-r--r--spss.slinterface/.tomcatplugin10
-rw-r--r--spss.slinterface/WEB-INF/lib/axis-ant.jarbin385010 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/axis.jarbin1235721 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/commons-discovery.jarbin71442 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/commons-fileupload-1.0.jarbin22379 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/commons-logging.jarbin31605 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/jaxrpc.jarbin35759 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/log4j-1.2.7.jarbin350677 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/saaj.jarbin18501 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/wsdl4j.jarbin113853 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/xalan-2.5.1.jarbin2907319 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/xerces-2.4.0/xercesImpl-2.4.0.jarbin927669 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/lib/xerces-2.4.0/xmlParserAPIs-2.4.0.jarbin123705 -> 0 bytes
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/Constants.java66
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/Utils.java33
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/RequestWrapper.java57
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ResponseWrapper.java44
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/SL2MOAFilter.java332
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletInputStream.java55
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletOutputStream.java50
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/listeners/ContextListener.java157
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/moainvoker/MOAInvoker.java92
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/MOAServlet.java111
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/ResultServlet.java125
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/SLRequest.java19
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java88
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/QName.java51
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/SL2MOA.java88
-rw-r--r--spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/Utils.java129
-rw-r--r--spss.slinterface/WEB-INF/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLBean.java46
-rw-r--r--spss.slinterface/WEB-INF/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLServlet.java83
-rw-r--r--spss.slinterface/WEB-INF/web.xml67
-rw-r--r--spss.slinterface/constraints.txt2
-rw-r--r--spss.slinterface/pages/test/dataURL.jsp18
-rw-r--r--spss.slinterface/res/resources/properties/init.properties8
-rw-r--r--spss.slinterface/res/resources/schemas/Core.20020225.xsd399
-rw-r--r--spss.slinterface/res/resources/schemas/Core.20020831.xsd153
-rw-r--r--spss.slinterface/res/resources/schemas/Core.20031231.xsd58
-rw-r--r--spss.slinterface/res/resources/schemas/MOA-SPSS-1.2.xsd445
-rw-r--r--spss.slinterface/res/resources/schemas/xml.xsd81
-rw-r--r--spss.slinterface/res/resources/schemas/xmldsig-core-schema.xsd318
-rw-r--r--spss.slinterface/res/resources/simpleVerReq.moa.xml29
-rw-r--r--spss.slinterface/res/resources/simpleVerReq.xml100
-rw-r--r--spss.slinterface/res/resources/stylesheets/moa2sl.xsl96
-rw-r--r--spss.slinterface/res/resources/stylesheets/simpleVerReq.sl11.xml100
-rw-r--r--spss.slinterface/res/resources/stylesheets/simpleVerReq.sl12.locref.moa.xml1
-rw-r--r--spss.slinterface/res/resources/stylesheets/simpleVerReq.sl12.locref.xml20
-rw-r--r--spss.slinterface/res/resources/stylesheets/sl2moa.xsl218
-rw-r--r--spss.slinterface/res/resources/stylesheets/verifyresponse.moa.sl.xml25
-rw-r--r--spss.slinterface/res/resources/stylesheets/verifyresponse.moa.xml46
-rw-r--r--spss.slinterface/res/resources/test.xml2
-rw-r--r--spss.slinterface/res/resources/test.xsl14
-rw-r--r--spss.slinterface/test/forms/simpleForm.html25
-rw-r--r--spss.slinterface/test/slrequests/simpleVerReq.xml39
-rw-r--r--spss.test/.classpath37
-rw-r--r--spss.test/.project18
-rw-r--r--spss.test/Definitionen/Testfalldokumentation.docbin755200 -> 0 bytes
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.001.Req.xml17
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.001.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.002.Req.xml17
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.002.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.003.Req.xml17
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.003.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.005.Req.xml17
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.005.Res.xml14
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.007.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.007.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.008.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.008.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.009.Req.xml17
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.009.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.010.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.010.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.011.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.011.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.012.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.012.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.013.Req.xml17
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.013.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.014.Req.xml17
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.014.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.015.Req.xml27
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.015.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.016.Req.xml31
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.016.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.017.Req.xml29
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.017.Res.xml25
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.018.Req.xml29
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.018.Res.xml47
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.019.Req.xml17
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.019.Res.xml26
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.051.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.051.Req.xml18
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.052.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.052.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.053.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.053.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.054.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.054.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.055.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.055.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.056.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.056.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.057.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.057.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.058.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.058.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.059.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.059.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.060.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.060.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.062.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.062.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.064.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.064.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.065.ErrRes.xml1
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.065.Req.xml19
-rw-r--r--spss.test/data/CX0/TestGeneratorCX0.Config.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.001.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.001.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.002.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.002.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.003.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.003.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.004.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.004.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.005.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.005.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.006.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.006.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.007.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.007.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.008.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.008.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.009.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.009.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.010.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.010.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.011.Req.xml7
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.011.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.012.Req.xml7
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.012.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.013.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.013.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.014.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.014.Res.xml23
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.051.ErrRes.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.051.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.052.ErrRes.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.052.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.053.ErrRes.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.053.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.054.ErrRes.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.054.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.055.ErrRes.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.055.Req.xml1
-rw-r--r--spss.test/data/CX1/TestGeneratorCX1.Config.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.001.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.001.Res.xml23
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.002.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.002.Res.xml23
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.003.Req.xml3
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.003.Res.xml23
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.004.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.004.Res.xml23
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.005.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.005.Res.xml23
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.006.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.006.Res.xml23
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.007.Req.xml6
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.007.Res.xml23
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.008.Req.xml12
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.008.Res.xml23
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.009.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.009.Res.xml23
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.051.ErrRes.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.051.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.052.ErrRes.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.052.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.053.ErrRes.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.053.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.054.ErrRes.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.054.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.055.ErrRes.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.055.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.056.ErrRes.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.056.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.057.ErrRes.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.057.Req.xml1
-rw-r--r--spss.test/data/CX2/TestGeneratorCX2.Config.xml1
-rw-r--r--spss.test/data/CX3/TestGeneratorCX3.001.Req.xml17
-rw-r--r--spss.test/data/CX3/TestGeneratorCX3.001.Res.xml25
-rw-r--r--spss.test/data/CX3/TestGeneratorCX3.052.ErrRes.xml1
-rw-r--r--spss.test/data/CX3/TestGeneratorCX3.052.Req.xml17
-rw-r--r--spss.test/data/CX3/TestGeneratorCX3.Config.xml1
-rw-r--r--spss.test/data/CX4/TestGeneratorCX4.051.ErrRes.xml1
-rw-r--r--spss.test/data/CX4/TestGeneratorCX4.051.Req.xml17
-rw-r--r--spss.test/data/CX4/TestGeneratorCX4.Config.xml1
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.001.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.001.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.002.Req.xml33
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.002.Res.xml41
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.003.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.003.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.004.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.004.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.005.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.005.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.006.Req.xml28
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.006.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.007.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.007.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.008.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.008.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.009.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.009.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.010.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.010.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.012.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.012.Res.xml21
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.051.ErrRes.xml1
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.051.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.052.ErrRes.xml1
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.052.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.054.ErrRes.xml1
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.054.Req.xml1
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.055.ErrRes.xml1
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.055.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.056.ErrRes.xml1
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.056.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.057.ErrRes.xml1
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.057.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.058.ErrRes.xml1
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.058.Req.xml27
-rw-r--r--spss.test/data/VC0/TestGeneratorVC0.Config.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.001.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.001.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.002.Req.xml52
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.002.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.003.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.003.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.004.Req.xml52
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.004.Res.xml39
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.005.Req.xml12
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.005.Res.xml43
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.006.Req.xml58
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.006.Res.xml39
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.007.Req.xml86
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.007.Res.xml39
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.008.Req.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.008.Res.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.009.Req.xml58
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.009.Res.xml39
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.052.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.052.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.053.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.053.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.054.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.054.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.055.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.055.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.101.Req.xml58
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.101.Res.xml39
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.102.Req.xml58
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.102.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.103.Req.xml57
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.103.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.104.Req.xml57
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.104.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.105.Req.xml64
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.105.Res.xml40
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.106.Req.xml52
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.106.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.151.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.151.Req.xml52
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.153.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.153.Req.xml52
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.154.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.154.Req.xml58
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.201.Req.xml59
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.201.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.202.Req.xml59
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.202.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.203.Req.xml59
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.203.Res.xml42
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.205.Req.xml59
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.205.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.206.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.206.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.208.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.208.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.209.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.209.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.210.Req.xml70
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.210.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.211.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.211.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.212.Req.xml66
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.212.Res.xml60
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.213.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.213.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.214.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.214.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.215.Req.xml66
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.215.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.216.Req.xml59
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.216.Res.xml60
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.217.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.217.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.251.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.251.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.253.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.253.Req.xml59
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.301.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.301.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.302.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.302.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.303.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.303.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.304.Req.xml24
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.304.Res.xml29
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.305.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.305.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.307.Req.xml58
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.307.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.308.Req.xml57
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.308.Res.xml39
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.310.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.310.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.311.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.311.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.312.Req.xml52
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.312.Res.xml39
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.313.Req.xml35
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.313.Res.xml48
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.314.Req.xml52
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.314.Res.xml39
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.314_2.Req.xml57
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.314_2.Res.xml39
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.315.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.315.Res.xml44
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.316.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.316.Res.xml45
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.317.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.317.Res.xml44
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.318.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.318.Res.xml44
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.318_2.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.318_2.Res.xml44
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.319.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.319.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.320.Req.xml15
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.320.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.320_2.Req.xml64
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.320_2.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.321.Req.xml15
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.321.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.322.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.322.Res.xml50
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.323.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.323.Res.xml61
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.324.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.324.Res.xml55
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.325.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.325.Res.xml51
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.326.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.326.Res.xml43
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.327.Req.xml35
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.327.Res.xml41
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.351.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.351.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.352.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.352.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.354.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.354.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.356.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.356.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.357.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.357.Req.xml52
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.359.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.359.Req.xml18
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.360.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.360.Req.xml18
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.360_2.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.360_2.Req.xml18
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.362.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.362.Req.xml21
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.363.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.363.Req.xml21
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.364.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.364.Req.xml18
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.365.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.365.Req.xml18
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.366.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.366.Req.xml35
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.367.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.367.Req.xml35
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.369.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.369.Req.xml53
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.370.ErrRes.xml1
-rw-r--r--spss.test/data/VX0/TestGeneratorVX.370.Req.xml53
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.001.Req.xml27
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.001.Res.xml25
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.002.Req.xml27
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.002.Res.xml25
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.003.Req.xml32
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.003.Res.xml23
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.004.Req.xml42
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.004.Res.xml23
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.005.Req.xml46
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.005.Res.xml25
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.006.Req.xml19
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.006.Res.xml41
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.007.Req.xml67
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.007.Res.xml39
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.050.ErrRes.xml1
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.050.Req.xml27
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.051.ErrRes.xml1
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.051.Req.xml32
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.052.ErrRes.xml1
-rw-r--r--spss.test/data/feature41/TestGeneratorFeature41.052.Req.xml42
-rw-r--r--spss.test/data/feature41/readme.txt9
-rw-r--r--spss.test/lib/SignatureAlgorithmImplECDSA.jarbin6072 -> 0 bytes
-rw-r--r--spss.test/lib/axis-1.0/axis.jarbin1101593 -> 0 bytes
-rw-r--r--spss.test/lib/axis-1.0/jaxrpc.jarbin35635 -> 0 bytes
-rw-r--r--spss.test/lib/axis-1.0/saaj.jarbin18463 -> 0 bytes
-rw-r--r--spss.test/lib/axis-1.0/wsdl4j.jarbin109356 -> 0 bytes
-rw-r--r--spss.test/lib/commons-discovery-0.2/commons-discovery.jarbin71442 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/iaik-moa-full.jarbin579533 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/iaikPkcs11Provider.jarbin281608 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/iaikPkcs11Wrapper.jarbin250749 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/iaik_cms.jarbin195000 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/iaik_ecc.jarbin101004 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/iaik_jce_full.jarbin637549 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/ixsil.jarbin216616 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/signed/iaikPkcs11Provider_signed.jarbin292951 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/signed/iaik_ecc.jarbin85245 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/signed/iaik_jce_full.jarbin636153 -> 0 bytes
-rw-r--r--spss.test/lib/iaik-moa-20030703/win32/pkcs11wrapper.dllbin73728 -> 0 bytes
-rw-r--r--spss.test/lib/iaik_javax_crypto.jarbin28308 -> 0 bytes
-rw-r--r--spss.test/lib/jaxen-1.0/jaxen-core.jarbin160967 -> 0 bytes
-rw-r--r--spss.test/lib/jaxen-1.0/jaxen-dom.jarbin13707 -> 0 bytes
-rw-r--r--spss.test/lib/jaxen-1.0/saxpath.jarbin23563 -> 0 bytes
-rw-r--r--spss.test/lib/jaxp-1.2_01/dom.jarbin26710 -> 0 bytes
-rw-r--r--spss.test/lib/jaxp-1.2_01/jaxp-api.jarbin27052 -> 0 bytes
-rw-r--r--spss.test/lib/jaxp-1.2_01/sax.jarbin26206 -> 0 bytes
-rw-r--r--spss.test/lib/jce.jarbin158999 -> 0 bytes
-rw-r--r--spss.test/lib/jprov.jarbin329183 -> 0 bytes
-rw-r--r--spss.test/lib/jsse-1.0.3_01/jcert.jarbin11321 -> 0 bytes
-rw-r--r--spss.test/lib/jsse-1.0.3_01/jnet.jarbin5830 -> 0 bytes
-rw-r--r--spss.test/lib/jsse-1.0.3_01/jsse.jarbin512635 -> 0 bytes
-rw-r--r--spss.test/lib/xalan-j-2.2/bsf.jarbin105573 -> 0 bytes
-rw-r--r--spss.test/lib/xalan-j-2.2/xalan.jarbin923866 -> 0 bytes
-rw-r--r--spss.test/lib/xerces-j-2.0.2/xercesImpl.jarbin933730 -> 0 bytes
-rw-r--r--spss.test/lib/xerces-j-2.0.2/xmlParserAPIs.jarbin78440 -> 0 bytes
-rw-r--r--spss.test/resources/100kb.txt1
-rw-r--r--spss.test/resources/10kb.txt1
-rw-r--r--spss.test/resources/1kb.txt1
-rw-r--r--spss.test/resources/1mb.txt1
-rw-r--r--spss.test/resources/20kb.txt1
-rw-r--r--spss.test/resources/500kb.txt1
-rw-r--r--spss.test/resources/50kb.txt1
-rw-r--r--spss.test/resources/BookData.xml1
-rw-r--r--spss.test/resources/BookData_wo_NS.xml1
-rw-r--r--spss.test/resources/CSEP.xml1
-rw-r--r--spss.test/resources/CX1_book.xsl1
-rw-r--r--spss.test/resources/CX1_book_not_here.xsl1
-rw-r--r--spss.test/resources/CX1_bookprofile.xsl1
-rw-r--r--spss.test/resources/CX1_bookref.xsl1
-rw-r--r--spss.test/resources/CX1_bookref_not_here.xsl1
-rw-r--r--spss.test/resources/DSA.1024.p12bin2800 -> 0 bytes
-rw-r--r--spss.test/resources/DSA.512.p12bin2467 -> 0 bytes
-rw-r--r--spss.test/resources/HSMRSAKEY.cer13
-rw-r--r--spss.test/resources/IAIKRootMusterbehoerde.cerbin863 -> 0 bytes
-rw-r--r--spss.test/resources/Max_Mustermann (max).p12bin2975 -> 0 bytes
-rw-r--r--spss.test/resources/Max_Mustermann.cerbin965 -> 0 bytes
-rw-r--r--spss.test/resources/SignatureVX005.xml43
-rw-r--r--spss.test/resources/SignatureVX005Cert.xml21
-rw-r--r--spss.test/resources/SignatureVX006Document.xml43
-rw-r--r--spss.test/resources/TEMPX509Data.xml44
-rw-r--r--spss.test/resources/TestGeneratorVX.Config.xml2
-rw-r--r--spss.test/resources/VC0.011.cms.ber.b64.txt48
-rw-r--r--spss.test/resources/VX.006DTD.dtd1
-rw-r--r--spss.test/resources/VX.006Schema.xsd1
-rw-r--r--spss.test/resources/VX.006xmlData.xml2
-rw-r--r--spss.test/resources/VX.007DTD.dtd2
-rw-r--r--spss.test/resources/VX2_book0.xsl1
-rw-r--r--spss.test/resources/VX2_book1.xsl1
-rw-r--r--spss.test/resources/VX2_bookref2includes.xsl5
-rw-r--r--spss.test/resources/X509Data.xml44
-rw-r--r--spss.test/resources/algorithms.properties94
-rw-r--r--spss.test/resources/client.keystorebin1904 -> 0 bytes
-rw-r--r--spss.test/resources/cms.keystorebin34065 -> 0 bytes
-rw-r--r--spss.test/resources/documents/bookData.xml9
-rw-r--r--spss.test/resources/documents/simpleSignature.xml42
-rw-r--r--spss.test/resources/documents/testDaten.txt4
-rw-r--r--spss.test/resources/documents/testSimple.txt1
-rw-r--r--spss.test/resources/ecc(ego).p12bin1234 -> 0 bytes
-rw-r--r--spss.test/resources/ecc.p12bin1234 -> 0 bytes
-rw-r--r--spss.test/resources/ecdsa_root_cert.cerbin540 -> 0 bytes
-rw-r--r--spss.test/resources/envDoc.xml3
-rw-r--r--spss.test/resources/hsmc.cer13
-rw-r--r--spss.test/resources/init.properties214
-rw-r--r--spss.test/resources/keyManager.properties74
-rw-r--r--spss.test/resources/moahsm.cer13
-rw-r--r--spss.test/resources/schemas/testDocument.schema.xsd14
-rw-r--r--spss.test/resources/sicher-demo(buergerkarte).p12bin3077 -> 0 bytes
-rw-r--r--spss.test/resources/sicher-demo.derbin1870 -> 0 bytes
-rw-r--r--spss.test/resources/sl2002mmdd.ecard.normal.p12bin1232 -> 0 bytes
-rw-r--r--spss.test/resources/sl2002mmdd.ecard.sicher.p12bin1234 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/MOA-SPSS-Configuration.xml176
-rw-r--r--spss.test/resources/spss.configuration/keys/DSA.1024.p12bin2800 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/keys/DSA.512.p12bin2467 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/keys/Max_Mustermann (max).p12bin2975 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/keys/ecc(ego).p12bin1234 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/keys/ecc.p12bin1234 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/keys/sicher-demo(buergerkarte).p12bin3077 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/keys/sl2002mmdd.ecard.normal.p12bin1232 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/keys/sl2002mmdd.ecard.sicher.p12bin1234 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/keys/test-ee2003_normal(buergerkarte).p12bin3077 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/profiles/CSEP.xml5
-rw-r--r--spss.test/resources/spss.configuration/profiles/CX1_bookprofile.xsl1
-rw-r--r--spss.test/resources/spss.configuration/profiles/SupplementProfile1.xml10
-rw-r--r--spss.test/resources/spss.configuration/profiles/SupplementProfile2.xml8
-rw-r--r--spss.test/resources/spss.configuration/profiles/TransformsInfoProfile1.xml1
-rw-r--r--spss.test/resources/spss.configuration/profiles/TransformsInfoProfile1MOAID.xml19
-rw-r--r--spss.test/resources/spss.configuration/profiles/TransformsInfoProfile2.xml7
-rw-r--r--spss.test/resources/spss.configuration/profiles/TransformsInfoProfile2MOAID.xml3
-rw-r--r--spss.test/resources/spss.configuration/profiles/TrustProfile1/IAIKRoot.cerbin883 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/profiles/TrustProfile1/IAIKRootMusterbehörde.cerbin863 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/profiles/TrustProfile1/Max_Mustermann.cerbin965 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/profiles/TrustProfile1/a-sign-TEST-Premium-Enc-01.cerbin1136 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/profiles/TrustProfile1/a-sign-TEST-nQual-01.cerbin994 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/profiles/TrustProfile1/ecdsa_root_cert.cerbin540 -> 0 bytes
-rw-r--r--spss.test/resources/spss.configuration/profiles/TrustProfile1/test-ee2003_normal.derbin1870 -> 0 bytes
-rw-r--r--spss.test/resources/stylesheets/book.notavailable.xsl1
-rw-r--r--spss.test/resources/stylesheets/book.xsl12
-rw-r--r--spss.test/resources/stylesheets/ref.book.notavailable.xsl1
-rw-r--r--spss.test/resources/sven.cerbin762 -> 0 bytes
-rw-r--r--spss.test/resources/sven.keystorebin1216 -> 0 bytes
-rw-r--r--spss.test/resources/sven_tomcat-client.cer0
-rw-r--r--spss.test/resources/test-ee2003_normal(buergerkarte).p12bin3077 -> 0 bytes
-rw-r--r--spss.test/resources/test-ee2003_normal.derbin1870 -> 0 bytes
-rw-r--r--spss.test/resources/test-ee2003_normal.derbase64.enc21
-rw-r--r--spss.test/resources/test-ee2003_normal_extract.cerbin987 -> 0 bytes
-rw-r--r--spss.test/resources/testBase64.txt1
-rw-r--r--spss.test/resources/testDaten.txt4
-rw-r--r--spss.test/resources/testDaten.txtbase64.enc1
-rw-r--r--spss.test/resources/testDocument.xml2
-rw-r--r--spss.test/resources/testDocument.xmlbase64.enc3
-rw-r--r--spss.test/resources/testSimple.txt1
-rw-r--r--spss.test/resources/testSimple.txtbase64.enc1
-rw-r--r--spss.test/resources/testUTF8.txt1
-rw-r--r--spss.test/resources/testXML.txt4
-rw-r--r--spss.test/resources/testXML.txtbase64.enc2
-rw-r--r--spss.test/resources/test_w_canonicalisation.XML3
-rw-r--r--spss.test/resources/test_wo_canonicalisation.XML9
-rw-r--r--spss.test/resources/test_wo_canonicalisation.XMLbase64.enc7
-rw-r--r--spss.test/resources/tests.cer.b6427
-rw-r--r--spss.test/resources/tollesDTD.dtd4
-rw-r--r--spss.test/resources/tollesDTD.dtdbase64.enc2
-rw-r--r--spss.test/resources/tomcat-client.cerbin570 -> 0 bytes
-rw-r--r--spss.test/resources/tomcat-server.cerbin564 -> 0 bytes
-rw-r--r--spss.test/src/ExportECDSA.java249
-rw-r--r--spss.test/src/at/gv/egovernment/moa/spss/client/call/MOACaller.java38
-rw-r--r--spss.test/src/at/gv/egovernment/moa/spss/client/call/SignatureCreationCaller.java23
-rw-r--r--spss.test/src/at/gv/egovernment/moa/spss/client/call/SignatureVerificationCaller.java28
-rw-r--r--spss.test/src/testclient/LasttestClient.java389
-rw-r--r--spss.test/src/testclient/TestClient.java1665
-rw-r--r--spss.test/src/testgenerator/CMSKeyStore.java198
-rw-r--r--spss.test/src/testgenerator/CMSKeyStoreConstants.java51
-rw-r--r--spss.test/src/testgenerator/CreatePKCSSignature.java874
-rw-r--r--spss.test/src/testgenerator/DataGenerator.java45
-rw-r--r--spss.test/src/testgenerator/EtsiProperties.java113
-rw-r--r--spss.test/src/testgenerator/LauchAll.java28
-rw-r--r--spss.test/src/testgenerator/LaunchVX.java24
-rw-r--r--spss.test/src/testgenerator/Pass.java22
-rw-r--r--spss.test/src/testgenerator/SetupCMSKeyStore.java671
-rw-r--r--spss.test/src/testgenerator/SignatureManifestCheckParams.java176
-rw-r--r--spss.test/src/testgenerator/Supplement.java62
-rw-r--r--spss.test/src/testgenerator/TestCMS.java118
-rw-r--r--spss.test/src/testgenerator/TestCases.java611
-rw-r--r--spss.test/src/testgenerator/TestGeneratorCX0.java2940
-rw-r--r--spss.test/src/testgenerator/TestGeneratorCX1.java1054
-rw-r--r--spss.test/src/testgenerator/TestGeneratorCX2.java1050
-rw-r--r--spss.test/src/testgenerator/TestGeneratorFeature41.java1167
-rw-r--r--spss.test/src/testgenerator/TestGeneratorVC0.java1057
-rw-r--r--spss.test/src/testgenerator/TestGeneratorVX.java2793
-rw-r--r--spss.test/src/testgenerator/TestGeneratorVX2.java1600
-rw-r--r--spss.test/src/testgenerator/TestGeneratorVXErrors.java1775
-rw-r--r--spss.test/src/testgenerator/TestPKCS12.java107
-rw-r--r--spss.test/src/testgenerator/VXResponseBean.java180
1200 files changed, 12 insertions, 86511 deletions
diff --git a/build/.checkstyle b/build/.checkstyle
deleted file mode 100644
index c868508c2..000000000
--- a/build/.checkstyle
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.0.0"/>
diff --git a/build/.project b/build/.project
deleted file mode 100644
index 6f56803c2..000000000
--- a/build/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>MOA Build</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
- </natures>
-</projectDescription>
diff --git a/build/README.txt b/build/README.txt
deleted file mode 100644
index 4c8a1cf27..000000000
--- a/build/README.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-MOA BUILD-SYSTEM
-================
-
-
-Einleitung
-----------
-
-Das MOA Build-System bietet eine einheitliche Build-Umgebung für
-alle MOA Sub-Projekte.
-
-Es bietet folgende Vorteile:
- - zentrale Installation des Build-Tools (Ant)
- - zentrale Ablage der Build-Scripts
- - standardisiertes Build über alle Sub-Projekte
- - einfache Möglichkeit, alle Sub-Projekte auf einmal zu erzeugen
-
-
-Voraussetzungen
----------------
-
-Das MOA Build-System setzt ein JDK 1.3.1 oder höher voraus. Folgende
-Umgebungsvariablen müssen (required) oder können (optional) gesetzt
-sein:
-
- - JAVA_HOME (required): zeigt auf das vom Build-System zu verwendende
- JDK (ab Version 1.3.1)
- - CATALINA_HOME (optional): zeigt auf eine Tomcat-4.1 Installation; wird
- verwendet, um Web-Applikationen zu deployen
- - JMETER_HOME (optional): zeigt auf eine JMeter-1.8 Installation; wird
- verewndet, um das JMeter-Plugin zu deployen
-
-
-Aufruf
-------
-
-Unter Windows:
- build [project [targets]]
-
-Unter Unix:
- build.sh [project [targets]]
-
-Der Parameter 'project' spezifiziert das Sub-Projekt, für das das Build
-aufzurufen ist. Der Wert 'all' gibt an, dass das Build für alle MOA Sub-Projekte
-durchgeführt werden soll.
-
-Der Parameter 'targets' spezifiziert eine Liste von Build-Targets. Werden keine
-Targets angegeben, wird automatisch der Default-Target des jeweiligen Projekts
-ausgeführt.
-
-Ein Aufruf ohne Parameter wird wie ein Aufruf mit dem Parameter 'all' interpretiert.
-
-
-Sub-Projekte
-------------
-
-Als Sub-Projekte stehen derzeit zur Verfügung:
-
- - common
- - spss.client
- - spss.server
- - id.server
-
-Das MOA Build-System geht davon aus, dass die Sub-Projekte in der selben
-Verzeichnis-Ebene zu finden sind wie das Build-System selbst.
-
-
-Targets
--------
-
-Sub-Projekte stellen ihre Targets in einem Build-File namens 'build.xml' in
-ihrem Wurzelverzeichnis zur Verfügung. Jedes Sub-Projekt hat grundsätzlich
-die Freiheit, eigene Targets zu definieren. Für ein möglichst automatisiertes
-Build und Deployment aller Sub-Projekte auf einmal, sollten einige Top-Level
-Targets über alle Sub-Projekte hinweg standardisiert sein:
-
-dist-all: erzeugt deploy-fähige bzw. verteilbare Module
-
-deploy-catalina: führt das Deployment in einen Tomcat-4.1 durch
-
-deploy-all: führt das Deployment in Zielumgebungen durch
diff --git a/build/scripts/build.bat b/build/scripts/build.bat
deleted file mode 100644
index 8414bc02f..000000000
--- a/build/scripts/build.bat
+++ /dev/null
@@ -1,64 +0,0 @@
-@echo off
-
-rem
-rem Main build script for the MOA projects
-rem
-rem Author: Patrick Peck
-rem Version: $Id: build.bat,v 1.8 2003/05/07 18:52:02 peck Exp $
-rem
-
-
-rem set JAVA_HOME=C:\java\jdk1.3.1_09
-rem set CATALINA_HOME=C:\Programme\Apache\Tomcat-4_1_24
-
-
-if %OS%=="Windows_NT" @setlocal
-
-set PROJECTS=
-set TARGETS=
-
-set ALLPROJECTS=common spss.server id.server
-
-if "%JAVA_HOME%"=="" goto noJavaHome
-goto checkAllProjects
-
-:noJavaHome
-echo error: JAVA_HOME not defined
-goto end
-
-:checkAllProjects
-set PROJECTS=%1
-shift
-if not "%PROJECTS%"=="all" goto checkCommonProject
-set PROJECTS=%ALLPROJECTS%
-goto checkTargets
-
-:checkCommonProject
-if not "%PROJECTS%"=="common" goto checkProject
-set PROJECTS=common
-goto checkTargets
-
-:checkEmptyProject
-if not "%PROJECTS%"=="" goto checkProject
-set PROJECTS=%ALLPROJECTS%
-goto checkTargets
-
-:checkProject
-set PROJECTS=common %PROJECTS%
-
-:checkTargets
-if "%1"=="" goto runAnt
-set TARGETS=%TARGETS% %1
-shift
-goto checkTargets
-
-:runAnt
-echo.
-echo BUILDING PROJECT(S): %PROJECTS%
-echo BUILDING TARGET(S) : %TARGETS%
-
-for %%p in (%PROJECTS%) do call runAnt %%p %TARGETS%
-
-:end
-if %OS%=="Windows_NT" @endlocal
-
diff --git a/build/scripts/build.sh b/build/scripts/build.sh
deleted file mode 100644
index 33f5f78b3..000000000
--- a/build/scripts/build.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-#
-# Main build script for the MOA projects
-#
-# Author: Paul Ivancsics
-# Version: $Id: build.sh,v 1.13 2003/05/07 18:52:02 peck Exp $
-#
-
-
-PROJECTS=$1
-ALLPROJECTS="common spss.server id.server"
-
-shift
-TARGETS=$*
-
-if [ -z "$JAVA_HOME" ]; then
- echo "error: JAVA_HOME not defined";
- exit;
-fi
-
-if [ -z "$PROJECTS" ] || [ "$PROJECTS" = "all" ]; then
- PROJECTS=$ALLPROJECTS;
-elif ! [ "$PROJECTS" = "common" ]; then
- PROJECTS="common $PROJECTS";
-fi
-
-echo
-echo "BUILDING PROJECT(S): $PROJECTS"
-echo "BUILDING TARGET(S) : $TARGETS"
-
-for PROJ in $PROJECTS; do
- sh ./runAnt.sh $PROJ $TARGETS;
-done
diff --git a/build/scripts/runAnt.bat b/build/scripts/runAnt.bat
deleted file mode 100644
index 347ad8d21..000000000
--- a/build/scripts/runAnt.bat
+++ /dev/null
@@ -1,38 +0,0 @@
-@echo off
-
-rem
-rem Helper script for calling Ant
-rem
-rem Author: Patrick Peck
-rem Version: $Id: runAnt.bat,v 1.6 2003/03/24 10:36:35 peck Exp $
-rem
-
-
-if %OS%=="Windows_NT" @setlocal
-
-set ANT=..\build\tools\jakarta-ant-1.5.1\bin\ant.bat
-set BUILDFILE=build.xml
-set SCRIPT_SUFFIX=bat
-set MOA_COMMON_JAR=..\common\tmp\dist\moa-common.jar
-set MOA_COMMON_TEST_JAR=..\common\tmp\dist\moa-common-test.jar
-
-echo.
-echo.
-echo BUILDING %1
-echo.
-
-
-cd ..\..\%1
-
-:callCommon
-if not "%1"=="common" goto callOther
-call %ANT% -f %BUILDFILE% dist-all
-goto end
-
-:callOther
-call %ANT% -f %BUILDFILE% %2 %3 %4 %5 %6 %7 %8 %9
-
-:end
-cd ..\build\scripts
-if %OS%=="Windows_NT" @endlocal
-
diff --git a/build/scripts/runAnt.sh b/build/scripts/runAnt.sh
deleted file mode 100644
index b5fc92e24..000000000
--- a/build/scripts/runAnt.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-#
-# Helper script for calling Ant
-#
-# Author: Paul Ivancsics
-# Version: $Id: runAnt.sh,v 1.9 2003/04/07 13:36:43 peck Exp $
-#
-
-
-ANT=../build/tools/jakarta-ant-1.5.1/bin/ant
-PROJECT="$1"
-BUILDFILE=build.xml
-export SCRIPT_SUFFIX=sh
-export MOA_COMMON_JAR=../common/tmp/dist/moa-common.jar
-export MOA_COMMON_TEST_JAR=../common/tmp/dist/moa-common-test.jar
-
-echo
-echo
-echo BUILDING $PROJECT
-echo
-
-
-cd ../../$PROJECT
-
-if [ "$1" == "common" ]; then
- sh $ANT -f $BUILDFILE dist-all
-else
- sh $ANT -f $BUILDFILE $2 $3 $4 $5 $6 $7 $8 $9
-fi
-
diff --git a/build/tools/jakarta-ant-1.5.1/KEYS b/build/tools/jakarta-ant-1.5.1/KEYS
deleted file mode 100644
index 61bff0aec..000000000
--- a/build/tools/jakarta-ant-1.5.1/KEYS
+++ /dev/null
@@ -1,226 +0,0 @@
-This file contains the PGP keys of various developers.
-Please don't use them for email unless you have to. Their main
-purpose is code signing.
-
-Users: pgp < KEYS
-Developers:
- pgp -kxa <your name> and append it to this file.
- (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
- (gpg --list-sigs <your name>
- && gpg --armor --export <your name>) >> this file.
-
-Type Bits/KeyID Date User ID
-pub 1024/FEECAAED 1998/11/11 Stefan Bodewig <bodewig@bost.de>
- Stefan Bodewig <bodewig@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: 2.6.3i
-
-mQCNAzZJoiMAAAEEAMzhUxTOC20Nprp6K4nLTiARt+EXii/dovNWWcfzZcYXi/lX
-r3zpUTTZxlKQpd4RaHjFmGgoOraZE4jCRFARVcFJgYmGUKpcWJZO7YKL36WUizTM
-+dyB2ycOtzlty1W5VmRL3FGqo67pKA9F/QHg3NSu9hY1W9xPPK7Kq3f+7KrtAAUR
-tCBTdGVmYW4gQm9kZXdpZyA8Ym9kZXdpZ0Bib3N0LmRlPokAlQIFEDZSrGXHcgyK
-jiW9zQEBshEEAMlG4qVjKp4/agdJG56M6izx9oaKecFLXHQJrFUy3w2PvZHFYtXc
-osXKorX6bPrE8uB57MxbY2WapKeVRodlG0+j39vAf501duK8q2rktfWt9Cl4JjJ4
-DbWhSWfV1ci62u2gCxwYQe22F9Wh+vhOR5NK9RTbSKhupdlFsnrk/i7xiQCVAwUQ
-NkmiI67Kq3f+7KrtAQGdxQQAlcFOzSv7G6M4uGbgvw7IGgrhx7rawtIyv9hLXgVC
-7ua9xaZV8G0Fl9gh8RnbdcZ4R/aT+KIiAFaslfZ3t6hlC4MTbnAJqvdS/NO98ZkJ
-YvnzZSKHflAbd5gyE7IVxBC9/xRlF/Wls5sYNwb6RjoRCaOjxN/y3WCLa3Va101v
-zNy0I1N0ZWZhbiBCb2Rld2lnIDxib2Rld2lnQGFwYWNoZS5vcmc+iQCVAwUQOxIo
-BK7Kq3f+7KrtAQGn6gP/SBACdHakA4H//otpyESSrk4PmyOaYF0Kyok43Gee2mT+
-m9+jZ3jLcC0oav6iH+otL/lhk9t/JDM8LjD2kAkdWWoIvvuPyCx97gOzojIo0Ve2
-1wuxJTF/VIjwyOtE8FzE7p4tkc6EubVpeZkV9Pq9HFRBCUcyKJDLnF4tbstScLU=
-=OBLe
------END PGP PUBLIC KEY BLOCK-----
-
-
-
-
-pub 1024D/51898504 2001-05-29 Conor MacNeill <conor@cortexebusiness.com.au>
-uid Conor MacNeill <conor@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (MingW32)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDsTqygRBACiZckNdclTlQFonLaIKBFGhMy0KKByw0x8XA4iwdbCXuF6xNIc
-HIFHajJ74AHchQ4d8xtomBy6b8yvFgWVeaZensvn69BlLeqGdyeJRzfPt6TgRnzZ
-2eWhb0HXdG3JwxL/2BabDhHfs4YJOrgB/vhRFQku6oCMRiBPtJj2werD6wCg0/zp
-jacYTw6+CR+sVvneCNyySFED/R3j10c4RnR8djgv1jKT8CKPuHYraupI9INEe+I6
-7qWjtJ02GzvMO6TElAtUsf4aysu45GgwkwEBnuG6mYb3Pq0V2c5tJc2A3Tj3DrdR
-i3HUNwurbus76I0sPyyENPu12QPeC6mvWLEsxVJ9o0hRKFayGvYUmrwWK9UFLjvp
-p9cXBACDHgLn7MAVLqUdYhRrUj/M+GOUpvBikEgoJJrEUmb5X4+++dffMh5HBIO4
-5LA11qEKuM2xnKqOilP7NLYXz1Fe0ocqv0jsHB4SprFTTai7ma31uwuRQvCQXVv1
-yJ5CLqYda64h/UA2kmmR2dfopmvDogYEMz/HU5voozxe7BEI7bQhQ29ub3IgTWFj
-TmVpbGwgPGNvbm9yQGFwYWNoZS5vcmc+iFcEExECABcFAjsTqygFCwcKAwQDFQMC
-AxYCAQIXgAAKCRCBBGRPUYmFBDgIAKCZztXqKhK6kXOnoGy7opCNmWU0lwCgsPDa
-4m+ruW3ch0rfbqtR75S52R+0LUNvbm9yIE1hY05laWxsIDxjb25vckBjb3J0ZXhl
-YnVzaW5lc3MuY29tLmF1PohXBBMRAgAXBQI7E6xMBQsHCgMEAxUDAgMWAgECF4AA
-CgkQgQRkT1GJhQTY0ACgmZmKheHzjPJs5hybpyvnvEiPYqYAn2+ryxdtz8XyOMEx
-GRmHNlhG7svsuQENBDsTqy0QBACfsCxJ6iCtgX8zjlVtMsMfDqu72x5sYatWKn8c
-u+4Oj5mi0x6azZIhwCa+K3ihLVOyG1mCRnzztGTIxWYRhq3TESIVOfgm+NgLGrmA
-XUTFyCT+21TExLCpuVZKmUHsWXLxDtfQ1diPeQpiQ8+Fvb/4jLGFjFIrQ2VjtFQn
-kumkSwADBgP9H0bF4hdMuVEcSJ9imxSoJshcOOA3Vd2+YiCTZhBygWM49wY5jNos
-/DArIjNCE53IlOu/UtHB2jqkSqjF0soGYsUjeCWouiTP9hLuMKPjnqj9ryJPTDKz
-nTCZ4TuB5CtzrKTlWLmPCPpFsGqe4KjMeKg/mqGqjPKl97xgStK9N9GIRgQYEQIA
-BgUCOxOrLQAKCRCBBGRPUYmFBMM6AJsF3FFyZGEmbt9aGG1W/u0oI9mcLgCfQyJ+
-aalbspazea4J9zgi59SSwOM=
-=Icm2
------END PGP PUBLIC KEY BLOCK-----
-
-pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <stefan.bodewig@epost.de>
-sig 5F6B8B72 2002-01-11 Stefan Bodewig <stefan.bodewig@epost.de>
-uid Stefan Bodewig <bodewig@apache.org>
-sig 5F6B8B72 2001-05-28 Stefan Bodewig <stefan.bodewig@epost.de>
-sig 51898504 2002-01-11 Conor MacNeill <conor@cortexebusiness.com.au>
-uid Stefan Bodewig <bodewig@bost.de>
-sig 5F6B8B72 2001-05-28 Stefan Bodewig <stefan.bodewig@epost.de>
-sig 51898504 2002-01-11 Conor MacNeill <conor@cortexebusiness.com.au>
-sub 1024g/24774157 2001-05-28
-sig 5F6B8B72 2001-05-28 Stefan Bodewig <stefan.bodewig@epost.de>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (GNU/Linux)
-Comment: Weitere Infos: siehe http://www.gnupg.org
-
-mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ
-5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82
-EXwWOFuYMJisuxdT940iQzosm3GOv4MJdEg3oI2SgfEyRQQ6vO4Ob5rHDwCg5taZ
-nrHOrXx2dIGHxpxRZ0SUl30D/jmtttFjYOQ3LBMriikz5mh2sK3ZnoSRF4o5O0zW
-Ve6e2SFXOEjVjImKsH6KCbdQNelrAdgiyOoXClyQKsQ27pncbdWo6bO0E3POJZVm
-XaeW7iudHVr63rU5PViXObIQrdQl0D59j5brKj4vdlTyUw8kaHPvbKPDEOwvZq4Y
-LJQ5BACA1YilTeXRJqwFsNlpcxCHwlULD4QUVP496prQWf1B7Z6g0KvLGrQsO0Vn
-Jcn+fEqukysTJixSXCPebosltd4RalJIupVYkp4w6MJ7biaDAlLuNhDcI/AiXTmV
-dXUedVXIaM8I3Ne23gucwbAyc0Hvb+3cSAKRhl/azFQhuHBvlrQjU3RlZmFuIEJv
-ZGV3aWcgPGJvZGV3aWdAYXBhY2hlLm9yZz6IVwQTEQIAFwUCOxIiTgULBwoDBAMV
-AwIDFgIBAheAAAoJEKIRWuFfa4tyLJ4An2yKSQ1o+lIF2O6wR/E6NdgYAfkSAJ94
-8O9lic6ZQLUoVU5rjJURUvhVDYhGBBARAgAGBQI8PtWPAAoJEIEEZE9RiYUEnZIA
-njOkQx1BfxN9+E7Yiz4MOxqZjSUpAKDQi0Alv/VR61fmR7KHZ11J2g+HSLQgU3Rl
-ZmFuIEJvZGV3aWcgPGJvZGV3aWdAYm9zdC5kZT6IVwQTEQIAFwUCOxI5gQULBwoD
-BAMVAwIDFgIBAheAAAoJEKIRWuFfa4tyyboAoNoD/9Jgm/alxfAYELz05LMa/HLe
-AKDWTHqq7rMkppZoTUv2gWpVzrk5RIhGBBARAgAGBQI8PtWVAAoJEIEEZE9RiYUE
-0LMAn22/u01Lo3Bo5lDxxHSkayUkYq25AKCm20yaGFGtTDJW4Rdz50pfut1AwrQo
-U3RlZmFuIEJvZGV3aWcgPHN0ZWZhbi5ib2Rld2lnQGVwb3N0LmRlPohXBBMRAgAX
-BQI8Pto2BQsHCgMEAxUDAgMWAgECF4AACgkQohFa4V9ri3Kz/gCg0PlCER3JUjKk
-G8JQe/lIJoApx38AoMW2G1lOuMX54RiWS08tG0j3ON4TuQENBDsSIlQQBADNUpZL
-xCuTKzJ1tMm7b/XjAhvPYKiL3doAZ6XALBdLF/nQmlh1jcuRy93QWpPxtwSfPjcw
-JLHy+Uq5tC1SnH1YwYhviLG1KEsniUBroUmV2HJyHP92fFI3LPk3xbqxvLh1NXFp
-zSuWjGMA66sZqeEbtMy2B8OLRwQShdHIBWgrIwADBQP+PWkmbg2mraaUmgTswre8
-CGArBgcV+WYm6yaq9IC1G4V1PXmlswmsDlsAr6UDdJU46GFZMIi2WmFJHarEkIBw
-FN44ypSLmiEVwKRJE2/CYO0f7zQHcF6GUSwQo2TxneahrZyHs7GdvpcRcfm0YnlC
-/H1CJ3pl8FpfHttzzIrIJviIRgQYEQIABgUCOxIiVAAKCRCiEVrhX2uLcg0yAKCd
-zbaSPxN+OS1Tq7hJRSq53blllwCfQHZvTM+MqMa6LB0pKeQVs1wVLeA=
-=TAHR
------END PGP PUBLIC KEY BLOCK-----
-
-Type Bits/KeyID Date User ID
-pub 1024/697ECEDD 2000/04/06 Henri Gomez <hgomez@slib.fr>
- *** RPM SIGNING KEY ***
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: 2.6.3i
-
-mQCNAzjsydwAAAEEAMpwFU/ci3/wR3ryCGp9Exr+Rx/hTQ7hWAJcVw8ejlBXlT4T
-yITlRUs0HGfRWxME2J55PuXXsIEPZzjfozNtvOyq8WlLlJ7iaiyWxVRoPJ25sSEj
-C9etm6wjj4E66ZgzuElZkm1m69uEsCHPPNuz1oQ/g1O+SmIVxIYirlxpfs7dAAUR
-tBxIZW5yaSBHb21leiA8aGdvbWV6QHNsaWIuZnI+iQCVAwUQOOzJ3IYirlxpfs7d
-AQFQyQQAj0D9G0hEL7SQGaSCkkoXwvamQw42N8+tNm+jfWHWdE4HAiVlhJmI2GyD
-sdcXVAcR8R7ILIRB5AY7a3bF+qMk0r+vO6oR878RKKn9AvtaAIOnrh6tr0tiPwf5
-XDUMySxIWJEF3SmJAy9Lq3bAl5GMzZCFHiS0NW2gtWgmr/u1RuM=
-=6l+I
------END PGP PUBLIC KEY BLOCK-----
-pub 1024D/EDF62C35 2002-04-10 Magesh Umasankar <umagesh@apache.org>
-sig EDF62C35 2002-04-10 Magesh Umasankar <umagesh@apache.org>
-sub 1024g/B5FFC53F 2002-04-10
-sig EDF62C35 2002-04-10 Magesh Umasankar <umagesh@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6-2 (MingW32)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDy0ebgRBADuKIKD8PuJ4wKEV1h2AprwJjxCRx8vn48XNwfLZuvhw8cpArtK
-rZwhoGPPUPEEXgtTNerlKq4VwpAwcnvRz7oC/7aWkUbcR2sAyhfe2scohwPgw7Xv
-+isWC0NDPdrxvXG/PUOG/cnELunr51ymybBqBxUd2gMhYIxPo67D+YPYLwCgwcZp
-yc/6kJa116ESWHrti342GD8D/1srpnRs9CiS1DQF1uZ1wW4vzj4VD61tKsjdWD8D
-V573R22iMDLSj4oMB536WxUH7snz8XsAKm/peqJ6G9m0smtmWA1ago5yzQj70WqF
-xzWBhHn2I/YfAQ8pb2s9q1lClj8elnCxT65L27ydBAZteejb2VqjtQ6iGy86PUT2
-wRUvBADZmoV1eIZJEM5NnxBv1EtvRYZtIQEzZ8dO2A1LOS7qlVr8IypljNPLGhzX
-VHNvVsjC9QMUSWeBsDedvQHQ3hJpIMnTI32XE1V4gX06gfVTZdhf2fLTtwnsHZp0
-oumqshGDVRhNJJdDYLikxWOxOfkNveKEqJFvtuBR+ZqqluQKebQlTWFnZXNoIFVt
-YXNhbmthciA8dW1hZ2VzaEBhcGFjaGUub3JnPohXBBMRAgAXBQI8tHm4BQsHCgME
-AxUDAgMWAgECF4AACgkQ76Pnee32LDWSRwCfeASWXvpdt7bSFPMtszU/7uPEktsA
-n23mYUN5WKJA1ZreW+0CcZ2ESnOvuQENBDy0eb8QBACBVb9YDJRp9Irzmq71Jf9F
-IPw+4g/cWpF3t/Eb7eSzMcOvTAXyNIWzaaOjHre7lFctHfq8ls/6gR7uqajiAnfQ
-cfTcu7pp+F5KsU0Embt83SFzZ3aoJwETmB/LqUyrrGDiue3lU+flJO7UmcsRvtk0
-+BDkyCeB9HgfdpXbBLCyuwADBQP+PNxX4e1tg3ZJo/xNEnD2Re3HjmQRrr0RYJLU
-GjgQrAEONSgowx3IW8/JssmNJVjnYm0qjSKsb8rergCFJhPNZ8Dd/k00pKcrq+IN
-6j7WTYLqPce87zrGAZUtmDwDSp5mxy5ExWJJxsgBPk4YBQLzJt21A3BgK/i24Sze
-2VLbaZuIRgQYEQIABgUCPLR5vwAKCRDvo+d57fYsNa8xAJ4mLfonZbd64+YY9rfv
-hIh3Vsl3AACeLPPKtma2K6XCfhTBEDnjhzSr4vqZAaIEPLR5uBEEAO4ogoPw+4nj
-AoRXWHYCmvAmPEJHHy+fjxc3B8tm6+HDxykCu0qtnCGgY89Q8QReC1M16uUqrhXC
-kDBye9HPugL/tpaRRtxHawDKF97axyiHA+DDte/6KxYLQ0M92vG9cb89Q4b9ycQu
-6evnXKbJsGoHFR3aAyFgjE+jrsP5g9gvAKDBxmnJz/qQlrXXoRJYeu2LfjYYPwP/
-WyumdGz0KJLUNAXW5nXBbi/OPhUPrW0qyN1YPwNXnvdHbaIwMtKPigwHnfpbFQfu
-yfPxewAqb+l6onob2bSya2ZYDVqCjnLNCPvRaoXHNYGEefYj9h8BDylvaz2rWUKW
-Px6WcLFPrkvbvJ0EBm156NvZWqO1DqIbLzo9RPbBFS8EANmahXV4hkkQzk2fEG/U
-S29Fhm0hATNnx07YDUs5LuqVWvwjKmWM08saHNdUc29WyML1AxRJZ4GwN529AdDe
-EmkgydMjfZcTVXiBfTqB9VNl2F/Z8tO3CewdmnSi6aqyEYNVGE0kl0NguKTFY7E5
-+Q294oSokW+24FH5mqqW5Ap5tCVNYWdlc2ggVW1hc2Fua2FyIDx1bWFnZXNoQGFw
-YWNoZS5vcmc+iFcEExECABcFAjy0ebgFCwcKAwQDFQMCAxYCAQIXgAAKCRDvo+d5
-7fYsNZJHAJ94BJZe+l23ttIU8y2zNT/u48SS2wCfbeZhQ3lYokDVmt5b7QJxnYRK
-c6+5AQ0EPLR5vxAEAIFVv1gMlGn0ivOarvUl/0Ug/D7iD9xakXe38Rvt5LMxw69M
-BfI0hbNpo6Met7uUVy0d+ryWz/qBHu6pqOICd9Bx9Ny7umn4XkqxTQSZu3zdIXNn
-dqgnAROYH8upTKusYOK57eVT5+Uk7tSZyxG+2TT4EOTIJ4H0eB92ldsEsLK7AAMF
-A/483Ffh7W2Ddkmj/E0ScPZF7ceOZBGuvRFgktQaOBCsAQ41KCjDHchbz8myyY0l
-WOdibSqNIqxvyt6uAIUmE81nwN3+TTSkpyur4g3qPtZNguo9x7zvOsYBlS2YPANK
-nmbHLkTFYknGyAE+ThgFAvMm3bUDcGAr+LbhLN7ZUttpm4hGBBgRAgAGBQI8tHm/
-AAoJEO+j53nt9iw1rzEAniYt+idlt3rj5hj2t++EiHdWyXcAAJ4s88q2ZrYrpcJ+
-FMEQOeOHNKvi+g==
-=p5Yy
------END PGP PUBLIC KEY BLOCK-----
-Type Bits/KeyID Date User ID
-pub 1024/397DCAD5 2002/07/03 Henri Gomez <hgomez@users.sourceforge.net>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: 2.6.3i
-
-mQCNAz0i0UUAAAEEALXePN6IHne0W96YRMnR+4EXB6402QY5f8ZLcnSUZUH55Fb1
-qcZGBc3WRKlPiUvwBD+eVYgCpNSXF/H+oV1mawxNJN5XwqBEpfYmY8MRIPcqa61h
-bJc3LBSm1qNf05G5Cwxeed+OgVm0r1HBy6DAgDHAqNlkC8DZ/BVgqMA5fcrVAAUR
-tCpIZW5yaSBHb21leiA8aGdvbWV6QHVzZXJzLnNvdXJjZWZvcmdlLm5ldD6JAJUD
-BRA9ItFFFWCowDl9ytUBASNyA/458T84LUVhqq6Y9fPBAfcFMWY2kehuDWsQEXkO
-46XoK+AnFZCkKuyDLqPHchVUO5pK/gZYsDK/xJkfh3u4FTDTsecb9wFmIeyayVIN
-SI8o6l8EZzDX/PGwqEwzxHrbQkIgIktNn5ApIoazvdBpbkQfNj1vr2wWoMYPLAWM
-8xzecA==
-=UmZ8
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-mQGiBD02vbERBAC1v8fR6gjERpaz4UMfdy0hRVWCPSbOdF+Swm/IenjVzErco6zb
-MTa13umUNrDPBy/tTWiCCZrOnqi7fgDzWqPEqrXJjKAFVLEWE6MmKylPPEPG1/bm
-idkNGERSAZduvhKv777PzvEJJ/8eGe3wy/O8NbgIjCPtr4UklwCZS8cFuwCg8oMO
-UdT8qZRtzdxdAyu1m5fUb+MD/3IKJYWXsdtb6iBphCU4f/BoyjVC9EZJ1ywLuiVM
-siKbuaDUaXU9nWcbNKv+fx8uZ1NaadpfLokqqhnWcpnSiqw8HNR7SwsF1D33rkXK
-O4FSuVss/tIoqGdWFcJyPkP4yP5shxqR335narVw2vDa0+BiWkALbA2qVsSIdZDB
-LeFZA/47AMBS0U2BRk2rQT8LmMuFl7mR+wNBM4n7FUGdxsGn3TcYd4pXTNrEQPrV
-YNdooKlikgGk4hgFnIFX09Spmimqgq0goFue81rttVdZZ4uep8dTghY6gwmvcOxX
-jATbhWStBhdu9B35kzfHc+1QihD5Z94u4uyWIVBIzikcdiY8LbQqSGVucmkgR29t
-ZXogPGhnb21lekB1c2Vycy5zb3VyY2Vmb3JnZS5uZXQ+iFcEExECABcFAj02vbEF
-CwcKAwQDFQMCAxYCAQIXgAAKCRAZMdaEMHoQpYijAKCCP68ndU/kTXR9XAKLvibC
-3S8+1QCfUFQYte3Jo+MHKaWjsu9JGptRzo+5Ag0EPTa93RAIAKlsRJ5gOGTFsmaR
-W9k6MIh4c/MCy7J7HUxT5xTdHROa+3zUh+FAE/JaOx9ZtZtH863DFHA8cP4L+tpi
-PjBT6g2E94dwGcuH/OiSSCT4JSBukbGbOuLLdmFXqUl8+4gsL90Xal67FtNLwyLG
-1n7geLir0byD+OT7VLA5w+6G0NOpJEveV/FIa2qLgdRZ8vz73ybgMh18hBUrUmro
-jncp0rln2VU7VCH1C2aClKm7kK4mGAjIFIzKbguK+kM3b8NDHmXKpT6syyCtIM3h
-prkV1TUCAFqLI32aSdlTN79lpeA2zDga9k4/4X/RDHsFpRN2neRFGTNUtuUgYpQQ
-E5zWBmMAAwUH/RiGxyeBsad923IwE1+GAjxFl2tqF9xWk0J6yTnSK4nfhYAE9evV
-jwDEok9jRl4ILCcXx6YN/d/lWNuSbARKHz/3hLiTouPpwd3SSJ8is2x9PgpJz5JX
-cD0y1SkbPLvs3jH3ZmdcxZpuAmJeI/typqFKK5pWP44oXIH+XH/8nWDtmLEBkgKQ
-/ATQWenMTmZ6MIJ6aWKWGkO9QS6iYRz3PPPGQ1O8W02CeprM2wBtlb8J1Z3RxNhM
-rZcg/1Qi3V3D1HI4zw6tAFmDeBb8J4PaBQzqlhzx2EBTbfwNPhV8AlPvpxHEeGGn
-v+O1yhZr33SnyZdINNoNDn+owVMdmkobe9GIRgQYEQIABgUCPTa93QAKCRAZMdaE
-MHoQpRsTAJ4qst3MhLm48fBAEnzuzi/BIKr+AgCfYaCB/AvPoncQbHc8BcNGRimR
-P9A=
-=hQhz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/build/tools/jakarta-ant-1.5.1/LICENSE b/build/tools/jakarta-ant-1.5.1/LICENSE
deleted file mode 100644
index 0f8706c6f..000000000
--- a/build/tools/jakarta-ant-1.5.1/LICENSE
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * ============================================================================
- * The Apache Software License, Version 1.1
- * ============================================================================
- *
- * Copyright (C) 2000-2002 The Apache Software Foundation. All
- * rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any, must
- * include the following acknowledgment: "This product includes software
- * developed by the Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself, if
- * and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Ant" and "Apache Software Foundation" must not be used to
- * endorse or promote products derived from this software without prior
- * written permission. For written permission, please contact
- * apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache", nor may
- * "Apache" appear in their name, without prior written permission of the
- * Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * on behalf of the Apache Software Foundation. For more information on the
- * Apache Software Foundation, please see <http://www.apache.org/>.
- *
- */
diff --git a/build/tools/jakarta-ant-1.5.1/LICENSE.dom b/build/tools/jakarta-ant-1.5.1/LICENSE.dom
deleted file mode 100644
index 2959b704a..000000000
--- a/build/tools/jakarta-ant-1.5.1/LICENSE.dom
+++ /dev/null
@@ -1,71 +0,0 @@
-This license came from:
-http://www.w3.org/Consortium/Legal/copyright-software-19980720
-
-
-W3C® SOFTWARE NOTICE AND LICENSE
-Copyright © 1994-2001 World
-Wide Web Consortium, <a href="http://www.w3.org/">World
-Wide Web Consortium</a>, (<a href=
-"http://www.lcs.mit.edu/">Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/">Institut National de
-Recherche en Informatique et en Automatique</a>, <a href=
-"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, or other related
-items) is being 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, and distribute this software
-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:
-
-The full text of this NOTICE in a location viewable to users of
-the redistributed or derivative work.
-
-Any pre-existing intellectual property disclaimers, notices, or
-terms and conditions. If none exist, a short notice of the
-following form (hypertext is preferred, text is permitted) should
-be used within the body of any redistributed or derivative code:
-"Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/"
-
-Notice of any changes or modifications to the W3C files,
-including the date changes were made. (We recommend you provide
-URIs to the location from which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION 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.
-
-The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without
-specific, written prior permission. Title to copyright in this
-software and any associated documentation will at all times remain
-with copyright holders.
-____________________________________
-This formulation of W3C's notice and license became active on
-August 14 1998 so as to improve compatibility with GPL. This
-version ensures that W3C software licensing terms are no more
-restrictive than GPL and consequently W3C software may be
-distributed in GPL packages. See the older formulation for the
-policy prior to this date. Please see our Copyright FAQ for common
-questions about using materials from
-our site, including specific terms and conditions for packages like
-libwww, Amaya, and Jigsaw.
-Other questions about this notice can be
-directed to site-policy@w3.org.
-
-webmaster
diff --git a/build/tools/jakarta-ant-1.5.1/LICENSE.sax b/build/tools/jakarta-ant-1.5.1/LICENSE.sax
deleted file mode 100644
index 05bccc9ae..000000000
--- a/build/tools/jakarta-ant-1.5.1/LICENSE.sax
+++ /dev/null
@@ -1,20 +0,0 @@
-This license came from: http://www.megginson.com/SAX/copying.html
- However please note future versions of SAX may be covered
- under http://saxproject.org/?selected=pd
-
-
-This page is now out of date -- see the new SAX site at
-http://www.saxproject.org/ for more up-to-date
-releases and other information. Please change your bookmarks.
-
-
-SAX2 is Free!
-
-I hereby abandon any property rights to SAX 2.0 (the Simple API for
-XML), and release all of the SAX 2.0 source code, compiled code, and
-documentation contained in this distribution into the Public Domain.
-SAX comes with NO WARRANTY or guarantee of fitness for any
-purpose.
-
-David Megginson, david@megginson.com
-2000-05-05 \ No newline at end of file
diff --git a/build/tools/jakarta-ant-1.5.1/LICENSE.xerces b/build/tools/jakarta-ant-1.5.1/LICENSE.xerces
deleted file mode 100644
index 28282b456..000000000
--- a/build/tools/jakarta-ant-1.5.1/LICENSE.xerces
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
diff --git a/build/tools/jakarta-ant-1.5.1/README b/build/tools/jakarta-ant-1.5.1/README
deleted file mode 100644
index 311e96cac..000000000
--- a/build/tools/jakarta-ant-1.5.1/README
+++ /dev/null
@@ -1,70 +0,0 @@
-
- A N T
-
-
- What is it?
- -----------
-
- Ant is a Java based build tool. In theory it is kind of like "make"
- without makes wrinkles and with the full portability of pure java code.
-
-
- Why?
- ----
-
- Why another build tool when there is already make, gnumake, nmake, jam,
- and others? Because all of those tools have limitations that its original
- author couldn't live with when developing software across multiple platforms.
-
- Make-like tools are inherently shell based. They evaluate a set of
- dependencies and then execute commands not unlike what you would issue on a
- shell. This means that you can easily extend these tools by using or writing
- any program for the OS that you are working on. However, this also means that
- you limit yourself to the OS, or at least the OS type such as Unix, that you
- are working on.
-
- Makefiles are inherently evil as well. Anybody who has worked on them for any
- time has run into the dreaded tab problem. "Is my command not executing
- because I have a space in front of my tab!!!" said the original author of Ant
- way too many times. Tools like Jam took care of this to a great degree, but
- still use yet another format to use and remember.
-
- Ant is different. Instead a model where it is extended with shell based
- commands, it is extended using Java classes. Instead of writing shell
- commands, the configuration files are XML based calling out a target tree
- where various tasks get executed. Each task is run by an object which
- implements a particular Task interface.
-
- Granted, this removes some of the expressive power that is inherent by being
- able to construct a shell command such as `find . -name foo -exec rm {}` but
- it gives you the ability to be cross platform. To work anywhere and
- everywhere. And hey, if you really need to execute a shell command, Ant has
- an exec rule that allows different commands to be executed based on the OS
- that it is executing on.
-
- The Latest Version
- ------------------
-
- Details of the latest version can be found on the Apache Jakarta
- Project web site <http://jakarta.apache.org/>.
-
-
- Documentation
- -------------
-
- Documentation is available in HTML format, in the docs/ directory.
- For information about building and installing Ant, see
- docs/manual/index.html
-
-
- Licensing
- ---------
-
- This software is licensed under the terms you may find in the file
- named "LICENSE" in this directory.
-
-
- Thanks for using Ant.
-
- The Apache Jakarta Project
- <http://jakarta.apache.org/>
diff --git a/build/tools/jakarta-ant-1.5.1/WHATSNEW b/build/tools/jakarta-ant-1.5.1/WHATSNEW
deleted file mode 100644
index 4fb603c00..000000000
--- a/build/tools/jakarta-ant-1.5.1/WHATSNEW
+++ /dev/null
@@ -1,1301 +0,0 @@
-Changes from Ant 1.5.1Beta1 to 1.5.1
-====================================
-
-Fixed bugs:
------------
-
-* <tstamp>'s prefix attribute failed to apply to nested <format> elements.
-
-* <junitreport> created an empty junit-noframes.html if no format had
- been specified.
-
-* <basename> would remove more than it should if the file name
- contained more than one dot.
-
-* <filterset>s nested into <filterset>s didn't work.
-
-Other changes:
---------------
-
-* Shipped XML parser is now Xerces 2.2.0
-
-* Filesets now support a 'file' attribute, allowing a single-file
- fileset to be constructed without having to specify its parent
- directory separately.
-
-* <junit> will now return the result of a call to getName instead of
- "unknown" for Test implementations that don't extend TestCase but have
- a public String getName() method.
-
-Changes from Ant 1.5 to 1.5.1Beta1
-==================================
-
-Fixed bugs:
------------
-* Date/time in CvsChangeLog was in local timezone and 12 hour format leading
- to a problem when sorting by time. It is now UTC (GMT) and in 24-hour
- format as per cvs 'specifications'.
-
-* CvsTagDiff now supports ampersand modules or modules that have a different
- root directory than their name.
-
-* EjbJar threw NPEs for the Websphere element. The property 'websphere.home'
- was not documented.
-
-* Mail example in the documentation was not correct.
-
-* Checksum was broken in the following scenario:
- (using verifyproperty OR in a condition) AND using filesets
- with multiple files.
-
-* The ExpandProperties filter threw NPEs when defined using
- the <filterreader> format.
-
-* The sh wrapper script didn't work under Cygwin if ANT_HOME wasn't
- set with a Unix style filename.
-
-* The sh wrapper script could fail if you started Ant from a directory
- with whitespace in its name.
-
-* ant -diagnostics was not working properly when the task dependency
- was missing and was just printing the missing dependency.
-
-* If a task got redefined via <taskdef>, it lost its child elements.
-
-* <property>'s classpathref attribute was broken.
-
-* <arg line="''" /> would result in no command line argument, will now
- be a single empty argument. Use <arg value="''"/> if you need the
- quotes literally.
-
-* <replaceregexp> could append a newline character at the end of the
- file.
-
-Other changes:
---------------
-
-* Appendix E of Java Development with Ant (Loughran/Hatcher) was
- contributed to the docs.
-
-* <available> will only print deprecration warnings if it is actually
- used to change the value of a property.
-
-Changes from Ant 1.5beta3 to Ant 1.5
-====================================
-
-Changes that could break older environments:
---------------------------------------------
-
-* The filesetmanifest attribute added to <jar> after the 1.4.1
- release has been removed for now. This change may affect only
- the 1.5Beta/1.6Alpha users. An attempt will be made to add this
- feature back into Ant 1.6.
-
-Fixed bugs:
------------
-
-* <zip> and friends would always update existing archive if you set
- the update attribute to true.
-
-* To support backward compatibility with older versions, <pathconvert>
- will once again set the property, even if the result is the empty
- string, unless the new 'setonempty' attribute is set to false|no|off
- (default is "true").
-
-* The manifest task would crash XmlLogger
-
-Other changes:
---------------
-
-* added **/.svn and **/.svn/** to the default excludes
-
-Changes from Ant 1.5beta2 to Ant 1.5beta3
-=========================================
-
-Changes that could break older environments:
---------------------------------------------
-
-* Project.getBuildListeners now returns a clone of the listener
- list. Changes to the returned list will not affect the listeners
- currently attached to the Project. It also means that it is safe to
- iterate over the returned list if listeners are added or removed
- during the traversal.
-
-* <pvcs> default filenameformat has been different from Ant 1.4.1.
- Now it is different from 1.5beta1 and 1.5beta2.
-
-* Some messages that are printed during startup will not be
- written to the logfile specified via -logfile as they might destroy
- the format of the file for special BuildLoggers (like XmlLogger).
-
-* <pathconvert> won't set the property if the result is the empty string.
-
-Fixed bugs:
------------
-
-* <available> could fail to find files or directories that happen to
- start with the name of the project's basedir but are not children of
- the basedir.
-
-* Nested <property>'s inside <ant> can now be overriden by subsequent
- <ant> and <antcall> tasks.
-
-* <xslt>'s outputtype attribute wouldn't do anything.
-
-* <linecontains> filterreader could swallow lines.
-
-* <sequential> used to configure the tasks (set their attributes)
- before the first task has been executed. This means that properties
- that have been set by nested task seemed to be unset for the other
- tasks in the same <sequential> element.
-
-* <javac>'s sourcepath setting has been ignored by some compiler
- implementations.
-
-* <javadoc>'s packagelist attribute didn't work.
-
-* the plain mailer would always use port 25 in <mail>.
-
-* Ant's default logger could swallow empty lines.
-
-* ejbjar's iPlanet nested element now can process multiple descriptors.
-
-* IPlanetEjbc was looking in the wrong place for four iiop files.
-
-* <javac> would pass the -source switch to JDK 1.3's javac, even
- though it doesn't support it.
-
-Other changes:
---------------
-
-* <checksum> now uses a buffer (of configurable size).
-
-* The "Trying to override task definition" warning has been degraded
- to verbose level if the two task definitions only differ in the class
- loader instance that has loaded the definition.
-
-* Add a jvmargs to the ejbjar's weblogic element to allow additional
- arguments to be provided to the VM runnign ejbc. Document the
- jvmdebuglevel attribute which can be used to avoid warnings about
- interface classess being found on the classpath. Document the new
- <sysproperty> element which allows JVM properties to be defined.
- Added an outputdir attribute to allow the destination to be a
- directory into which the exploded jar is written.
-
-* ejbjar now supports Borland Enterprise Server 5 and Jonas 2.5
-
-Changes from Ant 1.5beta1 to Ant 1.5beta2
-=========================================
-
-Changes that could break older environments:
---------------------------------------------
-
-* Properties will now be expanded in mail message bodies. This means
-that one $ sign will be stripped if your mail message contains the text
-$$.
-
-* org.apache.tools.ant.taskdefs.Expand no longer extends MatchingTask.
-
-* Available#setFile now again uses a File argument as it did in 1.4,
-this may break environments that have been adapted to the String
-argument version present in 1.5beta1.
-
-Fixed bugs:
------------
-* When <move> attempts a rename, it deletes the destination file, if it
- exists, before renaming the source file. However, <move> was not
- checking if the destination file was actually a directory before
- trying to delete it.
-
-* Make CVS Tasks to work under Cygwin.
-
-* Fix LineContains to handle huge files elegantly without causing
-Stack Overflows.
-
-* if you ask for the "classic" compiler on Java1.4, you get upgraded to
-"modern" because there is no classic compiler any more.
-
-* the <http> condition was viewing 404 'not found' exceptions as success. Now
-it defaults to viewing any response >=400 as an error, and has an errorsBeginAt
-attribute you can use if you want a higher or lower value.
-
-* <get> throws a build exception on an http authorization error, unless you
-have set ignoreerrors to true.
-
-* <wsdltodotnet> was spelt in Wintel case: <WsdlToDotnet>. It is now lower
-case, though the old spelling is retained for anyone who used it.
-
-* Merging of Manifests in jar now works as documented.
-
-* paths that have been separated by colons would be incorrectly parsed
-on NetWare.
-
-* runant.pl now supports NetWare.
-
-* <tempfile> and <setproxy> tasks were in beta1, but not defined by
-default; They now are. <tempfile> fills a property with the name of a
-temporary file; <setproxy> lets you set the JVM's http, ftp and socks proxy
-settings.
-
-* <available classname="foo" ignoresystemclasses="true"> failed for
-JDK 1.1 and 1.2, even if the class could be found on the
-user-specified classpath.
-
-* <property environment=... /> now works on z/OS.
-
-* forked <javac> failed for the wrong reason on JDK 1.1 - Ant would
-use a temporary file to hold the names of the files to compile under
-some conditons, but 1.1 doesn't support this feature. Ant will no
-longer try this, but you may run into problems with the length of the
-command line now.
-
-* the refid attribute for <property>s nested into <ant> or <param>s
-nested into <antcall> didn't work.
-
-* <replaceregexp> didn't work for nested <fileset>s.
-
-* <javadoc> dropped sourcepath entries if no "interesting" .java
-source files could be found below them. This has been backwards
-incompatible and caused problems with custom doclets like xdoclet.
-
-* Using the doclet, docletpath or docletpathref attributes of
-<javadoc> may have caused NullPointerExceptions.
-
-* nested <filesets> of <javadoc> would include too much.
-
-* <dependset> will no longer choke on <targetfileset>s that point to
-non-existing directories.
-
-* <patch> didn't work at all.
-
-* <replace> and <replaceregexp> now fail if the file they are working
-on is locked.
-
-* <javadoc> would pick up the wrong executable in the combination JDK
-1.2 and AIX.
-
-Other changes:
---------------
-
-* z/OS now gets detected by the os condition.
-
-* <fileset> and <dirset> now have an optional followsymlink attribute
-that can prevent Ant from following symbolic links on some platforms.
-
-* BeanShell is now supported in the <script> task.
-
-* <ejbjar> under Weblogic attempts to use the ejbc20 compiler for 2.0 beans
- based on the deployment descriptor's DTD reference. Under weblogic 7.00 Beta
- this ejbc class has been deprecated. To avoid the deprecation warning use
- ejbcclass="weblogic.ejbc".
-
-* <ejbjar> will add a manifest to the generated jar based on the naming
- convention in use. This overrides the manifest specified in the
- <ejbjar> attribute
-
-
-Changes from Ant 1.4.1 to 1.5beta1
-==================================
-
-Changes that could break older environments:
---------------------------------------------
-
-* Important: Single $ signs are no longer silently stripped!
- Before you panic that we have broken all your build files, we have kept
- the old "$$" -> "$" behaviour. So only build files which accidentally had
- a $ sign in a string that was being silently stripped may break.
- We added this fix to stop newbie confusion; if you want to write a
- build file which works on ant versions 1.4.1 or earlier, stay with
- the double $$ sign rule.
-
-* Shipped XML parser is now Xerces 2.0.1 along with the XML Parser APIs.
- XML Parser APIs is a separate jar that contains the necessary
- JAXP/DOM/SAX classes.
-
-* <telnet> was fixed to expand properties inside nested <read> and
- <write> elements; before this only happened when you assigned the text
- to the string attribute. If you had $ signs in the string, they may
- need escaping.
-
-* the RegexpMatcher interface has been extended to support case
- insensitive matches and other options - custom implementations of
- this interface won't work any longer. We recommend to use the new
- Regexp interface that also supports substitution instead of the
- RegexpMatcher interface in the future.
-
-* <gzip> will throw an exception if your src attribute points to a directory.
-
-* Unjar, Unzip and Unwar will throw an exception if the Src attribute
- represents a directory. Support for nested filesets is provided
- instead.
-
-* It is no longer possible to overwrite a property using tasks like
- <condition>, <exec>, <pathconvert>, or <tstamp>. In some exceptional
- cases it will generate a warning if you attempt to overwrite an
- existing property.
-
-* Taskwriters please note: Whenever tasks had any overloaded set* methods,
- Ant's introspection mechanism would select the last overloaded method
- provided to it by the Java Runtime. A modification has now been made such
- that when the Java Runtime provides a method with a String as its argument,
- a check is made to see if there is another overloaded method that takes in
- some other type of argument. If there is one such method, then the method
- that takes in String as an argument is not selected by the Introspector.
-
-* The pattern definition **/._* has been included into the Default
- Excludes list.
-
-* <propertyfile>'s <entry> element was modified to remove "never" as a value
- as its behavior was undocumented and flakey.
-
-* The -projecthelp flag now only prints out targets that include the
- 'description' attribute, unless the -verbose or -debug flag is included
- on the Ant command line.
-
-* Ant's testcases now require JUnit 3.7 or above, as they now use the new
- assertTrue method instead of assert.
-
-* If the 'output' attribute of <ant> is set to a simple filename or a
- relative path, the file is created relative to ${basedir}, not ${user.dir}.
-
-* The default value for build.compiler is now javac1.x with x
- depending on the JDK that is running Ant instead of classic/modern.
-
-Fixed bugs:
------------
-* A bug existed that prevented generated log files from being deleted as
- part of the build process itself. This has now been fixed.
-
-* Fixed bug where <move> ignored <filterset>s.
-
-* Ant works properly with the combination of Java1.4/WindowsXP.
-
-* Fixed bug where <java> used to sometimes invoke class constructors twice.
-
-* Fixed bug with 4NT shell support.
-
-* Fixed bug where ant would not perform ftp without remotedir being
- specified even though this was not mandatory.
-
-* Fixed bug where ant would not copy system properties into new Project
- in ant/antcall tasks when inheritall="false" is set.
-
-* <propertyfile> would not close the original property file.
-
-* <ant> will no longer override a subbuild's basedir with inheritall="true".
-
-* Fixed problem with the built-in <junit> formatters which assumed
- that only one test could be running at the same time - this is not
- necessarily true, see junit.extensions.ActiveTestSuite.
-
-* <jar>'s whenEmpty attribute is useless as JARs are never empty, they
- contain at least a manifest file, therefore it will now print a
- warning and do nothing.
-
-* <typedef> hasn't been all that useful as it couldn't be used outside
- of targets (it can now) and nested "unknown" elements have always
- been considered to be tasks (changed as well).
-
-* <fixcrlf> would fail for files that contained lines longer than 8kB.
-
-* Some junit formatters incorrectly assumed that all testcases would
- inherit from junit.framework.TestCase.
-
-* <fixcrlf> dropped the first characters from Mac files.
-
-Other changes:
---------------
-* Selector Elements now provide a way to create filesets based on
- sophisticated selection criteria.
-
-* Gzip and Bzip2 files can now be constructed in the fly when using
- the tar task without having to create the intermediate tar file on
- disk. The Untar task can also untar GZip and BZip2 files on the fly
- without creating the intermediate tar file.
-
-* New optional type, <classfileset> added.
-
-* <ejbjar> now allows control over which additional classes and interfaces
- are added to the generated EJB jars. A new attribute "dependency" can be
- defined which controls what classes are added. The addition of classes now uses
- the Jakarta-BCEL library rather than reflection, meaning bean classes are
- no longer loaded into Ant's JVM. The default dependency analyzer is known as
- the ancestor analyzer. It provides the same behaviour as the 1.4.1 version of
- <ejbjar>. If the BCEL library is not present, a warning will be issued stating
- the ancestor analyzer is not available. In this case <ejbjar> will continue
- to function but will not add super classes to the jar.
-
-* <available> has a new attribute named ignoreSystemClasses.
-
-* New task <cvschangelog/> generates an XML report of changes that occur
- on CVS repository.
-
-* New filter readers: ClassConstants, ExpandProperties, HeadFilter,
- LineContains, LineContainsRegExp, PrefixLines, ReplaceTokens,
- StripJavaComments, StripLineBreaks, StripLineComments, TabsToSpaces,
- TailFilter.
-
-* <copy>, <loadfile>, <loadproperties>, <move> support FilterChains
- of FilterReaders.
-
-* New task <loadproperties> to load contents of file as Ant properties,
- with nested <filterchain> elements.
-
-* New task <loadfile> to load a whole file into a property.
-
-* New task <echoproperties> to list your current properties to the screen
- or a file.
-
-* New tasks <bzip2> and <bunzip2> to pack and unpack files using the
- BZip2 alogrithm.
-
-* New tasks <replaceregexp>, <checksum>, <translate>, <waitfor>,
- <manifest>, <vsscp>, <vssadd>, <vsscreate>, <splash>, <basename>, <dirname>,
- <concat>, <sourceoffsite>, <jarlib-available>, <jarlib-display>,
- <jarlib-manifest>, <jarlib-resolve>.
-
-* A new combined <mail> task, which replaces the old <mail> and
- <mimemail> tasks, has been added. The <mimemail> task, and
- old SendEmail and MimeMail classes have been deprecated.
-
-* Mail task allows specification of port number.
-
-* Users can control what <zip> and <jar> must do when duplicate files
- are found. A new element <zipgroupfileset> allows for multiple zip
- files to be merged into the archive. In addition, <jar> also has
- another new attribute: filesetmanifest. The existing manifest
- attribute of <jar> now also accepts the name of a jar added through
- a fileset.
-
-* gzip now checks that the zipfile is older than the source file
- before rebuilding the zipfile.
-
-* TarFileset takes in three new attributes - fullpath, prefix
- and preserveLeadingSlashes.
-
-* <move> attempts to rename the directory, if everything inside it is
- included, before performing file-by-file moves. This attempt will
- be done only if filtering is off and if mappers are not used. This
- is a performance improvement and there is no change otherwise in
- the funtionality of this task.
-
-* Exec task has extra attribute "resultproperty" to get the return code
- into a property.
-
-* Exec task prints a message when a timed-out process is killed.
-
-* Added optional attributes - name, arch and version to the <os> task.
-
-* Unjar, Untar, Unwar and Unzip now support patternsets to
- select files from an archive for extraction. Filesets may be
- used to select archived files for unarchival.
-
-* Javac task allows debug levels to be specified. Debug levels
- will have an effect only when the modern compiler or the
- classic compiler (version 1.2 and higher) is used and debugging
- is enabled.
-
-* Added support for specifying CVS_RSH in the <cvs/> task
-
-* The attributes zipfile, jarfile, warfile and earfile (from the Zip,
- Jar, War and Ear tasks) have been deprecated and superseded by a
- new attribute "destfile".
-
-* Added new conditions <isset>, <checksum>, <http>, <socket>, <contains>,
- <filesmatch>.
-
-* <taskdef> and <typedef> will now emit a warning if a task/type of
- the given name already exists.
-
-* A new revision of VAJ tasks: The most important new feature
- is the ability to execute VAJ tasks from the command line by
- exploiting the Remote Tool Access feature of VAJ.
-
-* Improved support for Novell NetWare.
-
-* Added an optional encoding attribute to <fixcrlf>.
-
-* <apply> has a new attribute relative that allows users to pass the
- filenames as relative instead of absolute paths on the command line.
-
-* References can now be copied into the child build by <ant> and
- <antcall> using nested <reference> elements or the new inheritRefs
- attribute.
-
-* <fail> now supports builds to fail based on conditions via if and
- unless attributes.
-
-* Ant now comes with two new BuildLogger implementations - one that
- can send emails containing a log of the build process (MailLogger),
- and one that colorizes the output based on message levels, using
- ANSI color code escape sequences (AnsiColorLogger).
-
-* A "package" mapper type has been added to allow package directory
- names replaced with the dotted form.
-
-* You can now specify environment variables in the <java> and <junit> tasks
- if the fork attribute has been set to true.
-
-* -propertyfile command-line option has been added to load an entire
- property file just as -D properties are declared (as user properties).
- -D properties take precedence over -propertyfile specified ones.
-
-* You can now set an ANT_ARGS environment variable to hold arguments you
- always want passed to the 'ant' command -- for example, if you always
- want to use a different logger or the -find flag.
-
-* <tstamp> now supports a new "prefix" attribute to prefix properties set.
-
-* You can now specify the -sourcepath for <javac> explicitly.
-
-* <javac> now supports a new "listfiles" attribute to list the source
- files it's handing off to the compiler.
-
-* The compiler implementation for <javac> can now be chosen on a task by
- task basis. The new "compiler" attribute of <javac> can be used to override
- the value of the build.compiler property, if set.
-
-* <javac> has a new nested element, <compilerarg>, which allows you
- to specify additional args for the specific compiler you're using.
-
-* <javac>'s "source" attribute is now enabled for jikes as well.
-
-* <propertyfile>'s <entry> now has a 'unit' attribute to specify the
- increment/decrement unit on date operations.
-
-* <property> now supports a 'prefix' attribute when loading from a file
- or resource.
-
-* In Ant 1.4, a feature has been added to the <junit> task that would
- add ant.jar, optional.jar and junit.jar implicitly to the classpath -
- this feature can now be disabled by setting the new includeantruntime
- attribute to false.
-
-* <style> behaves differently from any other directory-based task, as it
- processes all files that it finds in included directories in
- addition to the files matched by your patterns. There is now a new
- attribute, 'scanincludeddirectories', to suppress this behavior.
-
-* <javadoc> now supports a <tag> nested element to provide the -tag option
- to the standard Java 1.4 doclet. The element is ignored when not running
- on Java 1.4.
-
-* <ftp> can now chmod files on a remote server that supports
- "site chmod", as well as set the umask before transferring files, if
- the server supports "site umask".
-
-* New <serverdeploy> "optional" task.
-
-* <patternset> now supports nested patternsets.
-
-* Perforce tasks now support a "failonerror" attribute (defaults to "true").
-
-* Open Source application server JOnAS support:
- EJB hot deploy and deploy with <serverdeploy> and <ejbjar>
-
-* Added new DirSet (<dirset>) datatype.
-
-* <path> now supports nested <dirset> and <filelist> elements.
-
-* <pathconvert> now supports nested <dirset> and <filelist> elements.
-
-* <pathconvert>'s "dirsep" and "pathsep" attributes now accept
- multi-character values.
-
-* <copy> task now has a 'failonerror' attribute to allow keep-going
- behaviour when the file to be copied is not found (defaults to "true").
-
-* <uptodate> now has a 'srcfile' attribute to allow specifying a
- full-path filename.
-
-* <exec>, <sql> and <java> now support append attributes to allow
- appending the output to an existing file.
-
-* <java> now supports a timeout attribute analog to <exec> - it is
- highly recommended to only use it together with fork="true".
-
-* <javadoc> now supports a source attribute to enable javadoc to
- handle assertions present in JDK 1.4 source code.
-
-* <replace> supports a new replacefilterfile attribute that
- automatically turns all properties of a given file into
- replacefilters.
-
-* An alias of <xslt> has been added to refer to the <style> task.
-
-* The compiler implementation for <rmic> can now be chosen on a task by
- task basis. The new "compiler" attribute of <rmic> can be used to override
- the value of the build.rmic property, if set.
-
-* <rmic> has a new nested element, <compilerarg>, which allows you
- to specify additional args for the specific compiler you're using.
-
-* org.apache.tools.ant.XmlLogger now is a BuildLogger, rather than just
- a BuildListener. It can operate in either mode successfully.
-
-* <junit> has a new attribute "showoutput". If set to true, output
- generated by tests will be sent to Ant's logging system as well as
- to the formatters (instead of sending it to the formatters
- exclusively).
-
-* Ant has now a pluggable way to prompt users for input, which is used
- by the new <input> task. IDE integrators can provide an
- implementation of the InputHandler interface to decouple Ant's input
- from the console. An implementation that gets its input from a file
- for unattended builds is part of Ant's distribution.
-
- For more details see docs/manual/inputhandler.html.
-
-* <patch> has a new attribute that selects the directory in which to
- run the command.
-
-* <javadoc> now supports two new nested elements, <fileset> and <packageset>.
-
-Changes from Ant 1.4 to Ant 1.4.1
-===========================================
-
-Fixed bugs:
------------
-
-* <ant>'s antfile attribute will now also be considered an absolute path on
- Windows systems, if it starts with a \ and no drive specifier.
-
-* The fullpath attribute of <zipfileset> has been ignored if you used
- the src attribute at the same time.
-
-* The manifest file is now always placed as the second entry (after /META-INF)
- in generated jars. This allows the manifest to be read by JarInputStreams
-
-* Fixed bug in depend task which would fail with a NullPointerException if no
- dependency cache was specified.
-
-* sql task now handles REM statements correctly so that lines starying with rem
- but which are not comments are actually processed.
-
-* XMLLogger now uses the task's name rather than the classname
-
-* <mapper>s will now work as expected if the to pattern expands to an
- absolute pathname.
-
-* <javac> didn't ignore memory settings in non-fork mode
-
-* <cab> didn't split the options attribute into several command line
- arguments correctly.
-
-Other changes:
---------------
-
-* New source attribute for <javac> to enable assertion in JDK 1.4
-
-* XmlLogger and <antstructure> now add an encoding declaration to the
- XML files they generate.
-
-* <fileset> has a new attribute "casesensitive" to make it match
- filenames in a case insensitive way (if you set it to false) - by
- default filesets remain case sensitive.
-
-Changes from Ant 1.3 to Ant 1.4
-===========================================
-
-Changes that could break older environments:
---------------------------------------------
-* JUnitReport now uses the xalan redirect extension for multi-output.
- With Xalan 1.2.2 it forces the use of bsf.jar in the classpath.
- (Available in the xalan distribution). It is recommended to switch
- to Xalan 2.x that do not need it.
-
-* Zip.setWhenempty() has changed its signature.
-
-* <rmic> is now implemented using a factory. This makes extending
- rmic to use a new compiler a lot easier but may break custom
- versions of this task that rely on the old implementation.
-
-* several Zip methods have changed their signature as we now use a Zip
- package of our own that handles Unix permissions for directories.
- Furthermore <zip> will now use the platform's default character
- encoding for filenames - this is consistent with the command line
- ZIP tools, but causes problems if you try to open them from within
- Java and your filenames contain non US-ASCII characters. Use the new
- encoding attribute of the task and set it to UTF8 to get the old
- behavior.
-
-* The <pvcs> task has been moved to a package of its own.
-
-* JUnitResultFormater has two additional methods that must be
- implemented by custom formatters.
-
-* Ant will no longer use the canonical version of a path internally -
- this may yield different results on filesystems that support
- symbolic links.
-
-* The output generated by the xml formatter for <junit> has changed
- again, it doesn't format the numeric value in the time attribute anymore.
-
-* Pattern matching rules have changes slightly, the pattern foo*
- doesn't match files contained in a directory named foo - use foo/*
- instead.
-
-* <fixcrlf> will not remove trailing whitespace at the end of lines anymore.
-
-* The Classloader usage has been changed for the taskdef, property, available
- and sql tasks so that it delegates to the parent classloader. This may cause
- ClassNotFoundExceptions to be thrown if a system class attempts to load a
- class in the taskdef's classpath (typically factory objects).
-
-* Ant now allows multithreading of tasks and the containment of tasks within
- other tasks. This can break customer listeners which do not expect messages
- from a task before the previous task has finished.
-
-* Ant now installs its own ouput stream into System.out to route output to the
- task currently executing on the current thread. This also means that all
- output is now routed as Ant message events. Customer listeners and loggers
- should not call System.out at any time. This has always been true but such
- usage now will cause problems due to possible recursion.
-
-* Invalid manifest files will now cause build failures in the <jar> task.
-
-* Ant Introspection now looks for methods with method names starting with
- addConfigured. When called these methods are passed an argument after it has
- been configured from the build file. Custom tasks supporting nested elements
- starting with the name configured will no longer function.
-
-* The environment variable JAVACMD that can be used to specify the
- java executable to Ant's wrapper scripts must not contain additional
- command line parameters any longer - please use the environment
- variable ANT_OPTS for such parameters now.
-
-* Ant's wrapper scripts now quote the CLASSPATH environment variable, thus
- supporting classpaths which refer to directories containing spaces. This means
- that the CLASSPATH environment variable cannot have quotes. Any quotes should
- be removed. This will not affect the operation of the CLASSPATH environment
- variable in other contexts.
-
-* A delete task like
- <delete includeEmptyFilesets="true">
- <fileset dir="somedir" />
- </delete>
- will now remove "somedir" as well, unless there are still files left
- in it (matched by the default excludes).
-
-* The copy task will now fail if the file to be copied is not found.
-
-* Ant properties defined in properties files now behave the same way as
- properties defined in the build file. In particular the $ character needs
- to be escaped in property values by doubling it to $$. So, to define a
- property with the value $hello, you need to define it in a properties file
- as
- test.prop=$$hello
- This was not the case in Ant 1.3
-
-Other changes:
---------------
-
-* New tasks: ear, p4counter, record, cvspass, vsscheckin, vsscheckout,
- typedef, sleep, mimemail, set of tasks for Continuus/Synergy, dependset,
- condition, maudit, mmetrics, jpcoverage, jpcovreport, jpcovmerge
-
-* Ant now uses JAXP 1.1
-
-* rmic now supports Kaffe's and Weblogic's version of rmic.
-
-* new magic property build.rmic to chose the rmic implementation
-
-* <tar> will now add empty directories as well
-
-* you can now specify a description for <p4change>
-
-* <touch> can now work on <fileset>s
-
-* <uptodate> now supports a value attribute
-
-* <fail> supports nested text
-
-* <fixcrlf> won't override files that are already in the correct
- format.
-
-* <sql> now supports REM comments as well as // and --
-
-* <jar> now has a nested <metainf> element following the same idea as
- <war>'s <webinf>.
-
-* <pvcs> can now handle multiple projects.
-
-* <available> now has a "type" attribute you can use in conjunction
- with the "file" attribute to specify whether the "file" you're
- looking for is a file or a directory.
-
-* New <junit> formatter named "brief"
-
-* <ejbjar> changes
- * Add support for Borland Application Server to the <ejbjar> task using
- a <borland> nested element.
- * Add support for iPlanet Application Server to the <ejbjar> task. Also
- includes some iPlanet utility tasks
- * Add support for JBoss Application Server to the <ejbjar> task.
- * Add a naming attribute to control the naming scheme that
- ejbjar uses to name the generated EJB jars.
- * Weblogic element now sets the compiler class for EJB 2.0 beans
- * <dtd> elements can be specified at the <ejbjar> level for building generic
- beans
- * <dtd> elements can now be URLs
- * Allow the manifest to be specified for the generated jars
- * The weblogic element now supprts an attribte noEJBC to skip the processing
- of the jar by ejbc. The ejbc step will then occur at deployment
- * weblogic will tell ejbc to use Jikes compiler if build.compiler is set to
- jikes. It can be restored to the default, javac, operation if desired.
-
-* Allow the <sql> Delimiter to be set in the so that Oracle stored procs may be
- entered
-
-* <execon> and <apply> can now optionally skip empty filesets.
-
-* <javadoc> has a new useexternalfile attribute that makes it use a
- temporary file for sourcefile and package names - helps to defeat
- command line length limitations.
-
-* Data types like <path> can now be defined inside of <target>s
-
-* you can now specify a classpath for <style> - the XSLZ processor
- will be loaded from this path
-
-* added a force attribute to <style> to support dependencies that the
- task cannot determine itself (dependency on parameters, not file
- modification times for example)
-
-* added vmlauncher attribute to exec tasks. This defaults to true. If
- it is set to false, the VM's ability to launch commands in bypassed
- and the OS shell, either directly or through the auxillary antRun
- scripts is used.
-
-* regexp mapper now supports the java.util.regex package of JDK 1.4.
-
-* New filesonly attribute for <zip> and friends to suppress directory
- entries.
-
-* New update attribute for <zip> and friends - update an existing
- archive instead of creating a new one.
-
-* <apply> and <execon> have been merged into a single task.
-
-* added vssver.scc to the default excludes
-
-* <available> has a new filepath attribute/nested element that allows
- you top search for a file in a given path.
-
-* <junit> can now optionally set a property on test failure.
-
-* <taskdef> can now define several tasks at once, reading the
- name/classname pairs from a property file or resource.
-
-* <unzip/unjar/unwar> and <untar> now have an overwrite attribute that
- defaults to true. If set to false, files that are newer than the
- files in the archive will not be replaced.
-
-* <patternset> and <fileset> now support nested <in/excludesfile>
- elements - using these you can have more than one in/excludes file
- per <patternset>.
-
-* Three new supported compilers for javac: kjc for kopi, gcj for the
- gcc frontend and sj for Symantec's compiler.
- In addition extJavac or the new fork attribute can be
- used to run the JDK's javac in a JVM separate from Ant.
-
-* <fixrlf> can now with CR only line-ends and can use an arbitraty
- between 2 and 80.
-
-* The .NET tasks have been adapted to the beta2 release of the framework.
-
-* <move> will now try to rename() files before copying them byte by
- byte - only if filtering is of, of course.
-
-* <ant> and <antcall> tasks now support a new attribute inheritAll. When set to
- false, only user properties are passed through to the target Ant instance.
- This includes properties set on the command line and properties explicitly
- passed
-
-* <javadoc> now skips off line links if the package list cannot be found.
-
-* <wlrun> now allows the security policy file to exist outside the weblogic
- directory.
-
-* <java> task will set the Thread contextClassLoader under JDKs 1.2+ to the
- classloader for the class being executed.
-
-* Introduce the concept of a TaskContainer - a task or element which can contain
- Ant Tasks.
-
-* Add new tasks implementing the TaskContainer interface <parallel> and
- <sequential> which allow parallel execution of tasks to be specified.
-
-* <depend> task will now take into account dependencies on jar files and class
- files from a given classpath.
-
-* <jar> manifest entries may now be specified in the build file either
- completely or to be merged with a manifest file.
-
-* <tstamp> task custom formats now support locales.
-
-* Added a listner which will forward events to Log4J. The log4j configuration
- file should be in the directory from which Ant is run or passed as a system
- property using a JVM argument.
-
-* Introduced the concept of <filtersets> to allow for more control in which
- filters get applied in a <copy> or <move> operation.
-
-* Added nowarn attribute to javac and deprecated the Jikes-magic property
- build.compiler.warnings.
-
-* The <depend> task cache format has changed and all dependency information is
- now stored in a single file.
-
-Fixed bugs:
------------
-
-* Testcases have been made independent of current working directory.
-
-* Input ZIP-Files will be closed when using a <zipfileset>.
-
-* p4 tasks now don't fail if user, port or client have been omitted
- (and this is acceptable for the context of the command).
-
-* <javah>'s outputfile attribute will be resolved as relative to the
- projects basedir.
-
-* <antstructure> should create a valid DTD for propertyfile.operation.entry
- and omit tasks it fails to load.
-
-* won't try to pass a -bootclasspath flag to javac 1.1 anymore
-
-* <style>'s style attribute no handles absolute paths correctly.
-
-* <delete includeemptydirs="true"> now deletes more than just the leaf
- directories.
-
-* You can now specify a <fileset> for a directory that doesn't exist at
- declaration time but will created before the fileset gets used for the
- first time.
-
-* If the quiet attribute has been set, <delete> will handle <fileset>s
- with non-existing directories gracefully.
-
-* Output written by testcases will now be captured by the <junit> task
- and passed to the formatters.
-
-* Quote the -group parameter to Javadoc as per the specification
-
-* Initialise classes when loaded through the AntClassLoader - that is, run
- static initializers
-
-* Implement getResource() and getResources() in AntClassLoader
-
-* Create the <ejbjar> weblogic command line as a set of arguments rather than
- as a single line. Avoids problems with paths which contain spaces.
-
-* <ejbjar> now fails when the weblogic ejbc compiler reports an error.
-
-* Make the AntClassLoader load resources in the same order as it currently
- loads classes.
-
-* Handle classpaths with spaces
-
-* Make sure XSLT processors close their output files in <style>.
-
-* perform proper uptodate check in <rmic> when compiling for IIOP.
-
-* <jjtree>'s uptodate test works even if outputdirectory is not the
- parent dir of target
-
-* <copy> will remove target file (if it exists) before writing to it -
- this avoids problems with links on filesystems that support them.
-
-* <ftp> now properly recurses remote directories.
-
-* <ftp> closes remote connection when it's done.
-
-* <junit> tries to include all necessary classes for the task itself
- to the classpath when running in fork mode - doesn't work for JDK 1.1
-
-* <apply> and <execon> do now execute the command only once, if you
- specify the parallel attribute - instead of once per fileset.
-
-* directory based tasks and fileset could miss some included files in
- directories that have been excluded
-
-* <fixcrlf> failed for large files.
-
-* <move> removed files you tried to move to themselves.
-
-* <sql> task will not trty to print the result set unless the query succeeded.
-
-* Ant classloader will now ignore paths which are invalid relative to the
- project base
-
-* <ejbjar> weblogic elements check for jar file changes has been fixed.
- Previously some changes would not be included.
-
-* properties loaded from properties files are now resolved internally. This
- removes the spurious warnings about usage of properties which have not been
- set.
-
-* <jar> task and friends now process the JAR manifest to ensure it is valid.
-
-* The task finished event now includes any exception thrown by the task.
-
-* <java> task now supports a jvmVersion attribute so that if another JVM is
- being used, Ant can determine which options to use for features such as the
- VM memory limits
-
-
-Changes from Ant 1.2 to Ant 1.3
-===========================================
-
-Changes that could break older environments:
---------------------------------------------
-
-* Ant doesn't search for the buildfile anymore, unless you use the new
- -find argument.
-
-* <perforce> has been replaced by a number of new tasks.
-
-* <javac> is now implemented using a factory. This makes extending
- javac to use a new compiler a lot easier but may break custom
- versions of this task that rely on the old implementation.
-
-* The output generated by the xml formatter for <junit> has changed a
- little, it doesn't append " sec" in the time attribute anymore.
-
-Other changes:
---------------
-
-* A GUI Frontend: Antidote. This is currently in development. At this
- time, this is not part of the Ant release, although the source is
- included if you are interested.
-
-* New tasks: stylebook, propertyfile, depend, antlr, telnet, csc,
- ilasm, apply, javah, several clearcase tasks, junitreport, sound
-
-* Added output attribute to <java>.
-
-* Added nested zipfileset element to <zip>
-
-* Changed <sql> so that printing is at the task level rather than
- the statement level.
-
-* javadoc task will pass -d flag to any doclet if the destDir attribute is
- given. If the doclet does not accept the -d flag then omit the destdir
- attribute.
-
-* <cab> can work on non-Windows platforms with the help of libcabinet.
- See http://trill.cis.fordham.edu/~barbacha/cabinet_library/.
-
-* <ftp> now supports passive mode.
-
-* New <mapper> data type that can be used to get influence on the
- target files for some tasks like <copy> or enable new types of tasks
- like <apply>.
-
-* <execon> provides more control over the command line now, the names
- of the source files are no longer required to be at the end of the
- command.
-
-* Style tasks will now support TraX compliant XSL processors if one is present
- in your classpath.
-
-* Added a failonerror to the javac task. If set to false, the build will
- continue even if there are compilation errors.
-
-* Added nested format elements to the tstamp task allowing additional time
- formats to be defined for arbitrary properties.
-
-* Added classpath attribute and nested classpath element to <property>
- to make the resource attribute more powerful.
-
-* ${} property expansion will now be performed on the patterns read
- from files specified as includesfile or excludesfile attributes.
-
-* The <tar> and <untar> tasks now support GNU format for handling paths
- which are greater than 100 characters in length. In addition the <tar>
- task now supports nested filesets through which the file permissions
- may be controlled.
-
-* wlrun, wlstop and ejbjar now support Weblogic 6.0
-
-* The MPasre task has been updated to work with MParse 2.0
-
-* The documentation has been significantly updated.
-
-
-Fixed bugs:
------------
-
-* <signjar> doesn't use deprectated methods anymore.
-
-* javadoc's failonerror attribute works again
-
-* javadoc's additionalparam attribute will now be split into separate
- parameters (on spaces) to allow for more than one parameter.
-
-* Changed <sql> task so that printing result sets works on Oracle
-
-* Changes to ddcreator and ejbc helper to respect the descriptor hierarchy
- keppgenerated in ejbc can now be turned off
-
-* ejbjar now correctly ignores <ejb-ref> elements in the deployment descriptor.
- CMP files are included by parsing the weblogic deployment descriptor rather
- than relying on the naming convention used in ant 1.2
-
-* ejbjar includes super classes and super interfaces into the generated ejb
- jar files. The <support> nested element allows support classes to be
- included in the EJB jar. The toplink element should now correctly locate
- the toplink descriptor.
-
-* <vssget> now correctly deals with spaces in arguments
-
-* <jar> fails early if a given manifest file doesn't exist
-
-* <rmic> doesn't search for the _Skel file anymore when stubversion is
- set to 1.2.
-
-* <rmic> uses the the same classpath to verify a class can be rmic'd
- as it passes to the compiler.
-
-* org.apache.tools.mail.MailMessage (and therefore <mail>) can now
- handle SMTP servers sending multi line responses.
-
-* nested <classpath> elements of <taskdef> now work for <taskdef>s not
- nested into <target> as well.
-
-* <property> and <available> will search for the resource "foo" instead
- of "/org/apache/tools/ant/taskdefs/foo" when given a relative resource
- name foo.
-
-* Handle build files in directories whose name contained a "#" character
-
-* <junit> can now log to files whose name contains a comma as well.
-
-* The AntClassLoader now refers to the loader which loaded it, any
- requests it does not handle itself. Previously these went to the
- primordial loader.
-
-Changes from Ant 1.1 to Ant 1.2
-===============================
-
-Changes that could break older environments:
---------------------------------------------
-
-* Semantics of <property> has changed again in the hope to be more
-intuitive. ${} expansion now happens at runtime and <property> tags
-living inside of targets only take effect if they are visited at
-runtime.
-
-As a side effect of this change, task's attributes get set at runtime
-not at parser time as well, which might change the results of
-<script>s or other custom tasks that reference other tasks by their id
-attribute.
-
-* copying of support files in <javac> has been removed - as well as
-the filtering attribute.
-
-* the <expand> and <keysubst> tasks have been removed.
-
-* the ignore and items attributes of directory based tasks have been removed.
-
-* the command line switches _not_ starting with - have been removed.
-
-* Path and EnumeratedAttribute have been moved from
-org.apache.tools.ant to org.apache.tools.ant.types.
-
-* the class attributes of <available>, <java>, <rmic> and <taskdef>
-have been removed.
-
-* the src attribute of <chmod> has been removed.
-
-* <patch> and <javadoc> have lost some of their attributes.
-
-* <java> and <cvs> have lost some undocumented attributes.
-
-* the Unix antRun script would search for command.sh in the directory
-it changed to and invoke this instead of command if present. This
-behavior has been dropped.
-
-* <ejbjar> task syntax has been changed significantly
-
-* <exec> is no longer implemented by org.apache.tool.ant.taskdefs.Exec.
-Custom tasks that rely on Project.createTask("exec") to return an
-instance of this class are going to fail.
-
-* nested <include> and <exclude> elements expect the value of their
-name attribute to be a single pattern, they don't accept multiple
-patterns anymore. Split them into multiple elements of the same type.
-
-* <delete dir="somedir" /> will now delete the directory itself as
-well as all included files. If you just want to clean out the
-directory and keep the empty one, use a nested fileset.
-
-Other changes:
---------------
-
-* New tasks: antstructure, cab, execon, fail, ftp, genkey, jlink,
-junit, sql, javacc, jjtree, starteam, war, unwar, uptodate,
-native2ascii, copy, move, mparse.
-
-* copydir, copyfile, deltree and rename are now deprecated. They
-should be replaced with the new copy, delete and move tasks.
-
-* <java> uses a ClassLoader of its own in no-fork mode if a classpath is
-specified.
-
-* <style> will create the necessary target directories and reprocess
-all files if the stylesheet changes.
-
-* New data types fileset and patternset - expected to get a broader use.
-They, as well as PATH like structures, can now be defined on a global
-level and later be referenced by their id attribute.
-
-* You can specify environment variables to <exec>.
-
-* <get> can check whether a remote file is actually newer than a local
-copy before it starts a download (HTTP only).
-
-* Added a -logger option to allow the class which performs logging to be
-specified on the command line.
-
-* Added a -emacs option to tell the logger to leave out taskname adornments
-on log output.
-
-* <chmod> works on all files in parallel and supports multiple filesets.
-
-* <replace> can now use tokens and/or values that cross line boundaries.
-
-* build.compiler supports now jvc as well.
-
-* project specific help can now be obtained with the -projecthelp option.
-
-* Added a -debug option to make -verbose less verbose (and more useful)
-
-* Ant will now search for a file named build.xml in the parent directory
-and above (towards the root of the filesystem) if you didn't specify
--buildfile and there is no build.xml in the current directory.
-
-* <echo> can now write to a file and accepts nested text.
-
-Fixed bugs:
------------
-
-* <chmod> didn't work when used as a directory based task.
-
-* Path, Available, Property didn't resolve relative filenames with
-respect to the Project's basedir.
-
-* Project didn't interpret the basedir attribute correctly in all
-cases.
-
-* Nested <src> in <javac> caused NullPointerException.
-
-* Corrupt Zip- and Jar-files ar now deleted if the task fails.
-
-* many more fixes we've forgotten to document here ...
-
-* The packagelistloc attribute of <javadoc>'s <link> child will be
- resolved as a file (i.e. it is either absolute or relative to
- basedir).
diff --git a/build/tools/jakarta-ant-1.5.1/bin/ant b/build/tools/jakarta-ant-1.5.1/bin/ant
deleted file mode 100644
index ee0ae5603..000000000
--- a/build/tools/jakarta-ant-1.5.1/bin/ant
+++ /dev/null
@@ -1,192 +0,0 @@
-#! /bin/sh
-
-# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-# reserved.
-
-# load system-wide ant configuration
-if [ -f "/etc/ant.conf" ] ; then
- . /etc/ant.conf
-fi
-
-# provide default values for people who don't use RPMs
-if [ -z "$rpm_mode" ] ; then
- rpm_mode=false;
-fi
-if [ -z "$usejikes" ] ; then
- usejikes=false;
-fi
-
-# load user ant configuration
-if [ -f "$HOME/.antrc" ] ; then
- . "$HOME/.antrc"
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
- Darwin*) darwin=true
- if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
- fi
- ;;
-esac
-
-if [ -z "$ANT_HOME" ] ; then
- # try to find ANT
- if [ -d /opt/ant ] ; then
- ANT_HOME=/opt/ant
- fi
-
- if [ -d "${HOME}/opt/ant" ] ; then
- ANT_HOME="${HOME}/opt/ant"
- fi
-
- ## resolve links - $0 may be a link to ant's home
- PRG="$0"
- progname=`basename "$0"`
- saveddir=`pwd`
-
- # need this for relative symlinks
- cd `dirname "$PRG"`
-
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
- done
-
- ANT_HOME=`dirname "$PRG"`/..
-
- cd "$saveddir"
-
- # make it fully qualified
- ANT_HOME=`cd "$ANT_HOME" && pwd`
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$ANT_HOME" ] &&
- ANT_HOME=`cygpath --unix "$ANT_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# set ANT_LIB location
-ANT_LIB="${ANT_HOME}/lib"
-
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD=java
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly."
- echo " We cannot execute $JAVACMD"
- exit 1
-fi
-
-if [ -n "$CLASSPATH" ] ; then
- LOCALCLASSPATH="$CLASSPATH"
-fi
-
-# in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR
-if $rpm_mode; then
- JAVALIBDIR=/usr/share/java
- for i in ant ant-optional jaxp_parser xml_apis
- do
- if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH="$JAVALIBDIR/$i.jar"
- else
- LOCALCLASSPATH="$JAVALIBDIR/$i.jar":"$LOCALCLASSPATH"
- fi
- done
-
- # in rpm mode ant/lib is in /usr/share/java/ant
- ANT_LIB="${JAVALIBDIR}/ant"
-fi
-
-# add in the dependency .jar files in non-RPM mode (the default)
-for i in "${ANT_LIB}"/*.jar
-do
- # if the directory is empty, then it will return the input string
- # this is stupid, so case for it
- if [ -f "$i" ] ; then
- if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH="$i"
- else
- LOCALCLASSPATH="$i":"$LOCALCLASSPATH"
- fi
- fi
-done
-
-if [ -n "$JAVA_HOME" ] ; then
- if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar"
- fi
-
- if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
- LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip"
- fi
-
- # OSX hack to make Ant work with jikes
- if $darwin ; then
- OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
- if [ -d ${OSXHACK} ] ; then
- for i in ${OSXHACK}/*.jar
- do
- JIKESPATH="$JIKESPATH:$i"
- done
- fi
- fi
-else
- echo "Warning: JAVA_HOME environment variable is not set."
- echo " If build fails because sun.* classes could not be found"
- echo " you will need to set the JAVA_HOME environment variable"
- echo " to the installation directory of java."
-fi
-
-# Allow Jikes support (off by default)
-if $usejikes; then
- ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- ANT_HOME=`cygpath --path --windows "$ANT_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
- LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
- CYGHOME=`cygpath --path --windows "$HOME"`
-fi
-
-if [ -n "$CYGHOME" ]; then
- if [ -n "$JIKESPATH" ]; then
- JIKESPATH=`cygpath --path --windows "$JIKESPATH"`
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" -Dcygwin.user.home="$CYGHOME" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
- else
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Dcygwin.user.home="$CYGHOME" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
- fi
-else
- if [ -n "$JIKESPATH" ]; then
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" -Djikes.class.path="$JIKESPATH" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
- else
- "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
- fi
-fi
-
diff --git a/build/tools/jakarta-ant-1.5.1/bin/ant.bat b/build/tools/jakarta-ant-1.5.1/bin/ant.bat
deleted file mode 100644
index c3c371698..000000000
--- a/build/tools/jakarta-ant-1.5.1/bin/ant.bat
+++ /dev/null
@@ -1,95 +0,0 @@
-@echo off
-
-REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-REM reserved.
-
-if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
-
-if "%OS%"=="Windows_NT" @setlocal
-
-rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_ANT_HOME=%~dp0..
-
-if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
-set DEFAULT_ANT_HOME=
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-set ANT_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-rem This label provides a place for the argument list loop to break out
-rem and for NT handling to skip to.
-:doneStart
-
-rem find ANT_HOME if it does not exist due to either an invalid value passed
-rem by the user or the %0 problem on Windows 9x
-if exist "%ANT_HOME%" goto checkJava
-
-rem check for ant in Program Files on system drive
-if not exist "%SystemDrive%\Program Files\ant" goto checkSystemDrive
-set ANT_HOME=%SystemDrive%\Program Files\ant
-goto checkJava
-
-:checkSystemDrive
-rem check for ant in root directory of system drive
-if not exist %SystemDrive%\ant\nul goto checkCDrive
-set ANT_HOME=%SystemDrive%\ant
-goto checkJava
-
-:checkCDrive
-rem check for ant in C:\ant for Win9X users
-if not exist C:\ant\nul goto noAntHome
-set ANT_HOME=C:\ant
-goto checkJava
-
-:noAntHome
-echo ANT_HOME is set incorrectly or ant could not be located. Please set ANT_HOME.
-goto end
-
-:checkJava
-set LOCALCLASSPATH=%CLASSPATH%
-for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" %%i
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-set _JAVACMD=%JAVA_HOME%\bin\java.exe
-if exist "%JAVA_HOME%\lib\tools.jar" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\tools.jar"
-if exist "%JAVA_HOME%\lib\classes.zip" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\classes.zip"
-goto checkJikes
-
-:noJavaHome
-set _JAVACMD=java.exe
-echo.
-echo Warning: JAVA_HOME environment variable is not set.
-echo If build fails because sun.* classes could not be found
-echo you will need to set the JAVA_HOME environment variable
-echo to the installation directory of java.
-echo.
-
-:checkJikes
-if not "%JIKESPATH%"=="" goto runAntWithJikes
-
-:runAnt
-"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
-goto end
-
-:runAntWithJikes
-"%_JAVACMD%" -classpath "%LOCALCLASSPATH%" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
-goto end
-
-:end
-set LOCALCLASSPATH=
-set _JAVACMD=
-set ANT_CMD_LINE_ARGS=
-
-if "%OS%"=="Windows_NT" @endlocal
-
-:mainEnd
-if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
-
diff --git a/build/tools/jakarta-ant-1.5.1/bin/antRun b/build/tools/jakarta-ant-1.5.1/bin/antRun
deleted file mode 100644
index cba56f16d..000000000
--- a/build/tools/jakarta-ant-1.5.1/bin/antRun
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-# reserved.
-
-# Args: DIR command
-cd "$1"
-CMD="$2"
-shift
-shift
-
-exec "$CMD" "$@"
diff --git a/build/tools/jakarta-ant-1.5.1/bin/antRun.bat b/build/tools/jakarta-ant-1.5.1/bin/antRun.bat
deleted file mode 100644
index e8125f660..000000000
--- a/build/tools/jakarta-ant-1.5.1/bin/antRun.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-
-REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-REM reserved.
-
-if "%OS%"=="Windows_NT" @setlocal
-
-if ""%1""=="""" goto runCommand
-
-rem Change drive and directory to %1
-if "%OS%"=="Windows_NT" cd /d ""%1""
-if not "%OS%"=="Windows_NT" cd ""%1""
-shift
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of agruments (up to the command line limit, anyway).
-set ANT_RUN_CMD=%1
-if ""%1""=="""" goto runCommand
-shift
-:loop
-if ""%1""=="""" goto runCommand
-set ANT_RUN_CMD=%ANT_RUN_CMD% %1
-shift
-goto loop
-
-:runCommand
-rem echo %ANT_RUN_CMD%
-%ANT_RUN_CMD%
-
-if "%OS%"=="Windows_NT" @endlocal
-
diff --git a/build/tools/jakarta-ant-1.5.1/bin/antRun.pl b/build/tools/jakarta-ant-1.5.1/bin/antRun.pl
deleted file mode 100644
index 1851b50ce..000000000
--- a/build/tools/jakarta-ant-1.5.1/bin/antRun.pl
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/perl
-#######################################################################
-#
-# antRun.pl
-#
-# wrapper script for invoking commands on a platform with Perl installed
-# this is akin to antRun.bat, and antRun the SH script
-#
-# created: 2001-10-18
-# last modified: 2001-11-13
-# author: Jeff Tulley jtulley@novell.com
-#######################################################################
-#be fussy about variables
-use strict;
-
-#turn warnings on during dev; generates a few spurious uninitialised var access warnings
-#use warnings;
-
-#and set $debug to 1 to turn on trace info (currently unused)
-my $debug=1;
-
-#######################################################################
-# change drive and directory to "%1"
-my $ANT_RUN_CMD = @ARGV[0];
-
-# assign current run command to "%2"
-chdir (@ARGV[0]) || die "Can't cd to $ARGV[0]: $!\n";
-if ($^O eq "NetWare") {
- # There is a bug in Perl 5 on NetWare, where chdir does not
- # do anything. On NetWare, the following path-prefixed form should
- # always work. (afaict)
- $ANT_RUN_CMD .= "/".@ARGV[1];
-}
-else {
- $ANT_RUN_CMD = @ARGV[1];
-}
-
-# dispose of the first two arguments, leaving only the command's args.
-shift;
-shift;
-
-# run the command
-my $returnValue = system $ANT_RUN_CMD, @ARGV;
-if ($returnValue eq 0) {
- exit 0;
-}
-else {
- # only 0 and 1 are widely recognized as exit values
- # so change the exit value to 1
- exit 1;
-}
diff --git a/build/tools/jakarta-ant-1.5.1/bin/complete-ant-cmd.pl b/build/tools/jakarta-ant-1.5.1/bin/complete-ant-cmd.pl
deleted file mode 100644
index 58d7b2367..000000000
--- a/build/tools/jakarta-ant-1.5.1/bin/complete-ant-cmd.pl
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (c) 2001 The Apache Software Foundation. All rights
-# reserved.
-#
-# A script to allow Bash or Z-Shell to complete an Ant command-line.
-#
-# To install for Bash 2.0 or better, add the following to ~/.bashrc:
-#
-# $ complete -C complete-ant-cmd ant build.sh
-#
-# To install for Z-Shell 2.5 or better, add the following to ~/.zshrc:
-#
-# function ant_complete () {
-# local args_line args
-# read -l args_line
-# set -A args $args_line
-# set -A reply $(COMP_LINE=$args_line complete-ant-cmd ${args[1]} $1)
-# }
-# compctl -K ant_complete ant build.sh
-#
-# @author Mike Williams <mikew@cortexebusiness.com.au>
-
-my $cmdLine = $ENV{'COMP_LINE'};
-my $antCmd = $ARGV[0];
-my $word = $ARGV[1];
-
-my @completions;
-if ($word =~ /^-/) {
- list( restrict( $word, getArguments() ));
-} elsif ($cmdLine =~ /-(f|buildfile)\s+\S*$/) {
- list( getBuildFiles($word) );
-} else {
- list( restrict( $word, getTargets() ));
-}
-
-exit(0);
-
-sub list {
- for (@_) {
- print "$_\n";
- }
-}
-
-sub restrict {
- my ($word, @completions) = @_;
- grep( /^\Q$word\E/, @completions );
-}
-
-sub getArguments {
- qw(-buildfile -debug -emacs -f -find -help -listener -logfile
- -logger -projecthelp -quiet -verbose -version);
-}
-
-
-sub getBuildFiles {
- my ($word) = @_;
- grep( /\.xml$/, glob( "$word*" ));
-}
-
-sub getTargets {
-
- # Look for build-file
- my $buildFile = 'build.xml';
- if ($cmdLine =~ /-(f|buildfile)\s+(\S+)/) {
- $buildFile = $2;
- }
- return () unless (-f $buildFile);
-
- # Run "ant -projecthelp" to list targets. Keep a cache of results in a
- # cache-file.
- my $cacheFile = $buildFile;
- $cacheFile =~ s|(.*/)?(.*)|${1}.ant-targets-${2}|;
- if ((!-e $cacheFile) || (-M $buildFile) < (-M $cacheFile)) {
- open( CACHE, '>'.$cacheFile ) || die "can\'t write $cacheFile: $!\n";
- open( HELP, "$antCmd -projecthelp -f '$buildFile'|" ) || return();
- my %targets;
- while( <HELP> ) {
- if (/^\s+(\S+)/) {
- $targets{$1}++;
- }
- }
- my @targets = sort keys %targets;
- for (@targets) { print CACHE "$_\n"; }
- return @targets;
- }
-
- # Read the target-cache
- open( CACHE, $cacheFile ) || die "can\'t read $cacheFile: $!\n";
- my @targets;
- while (<CACHE>) {
- chop;
- s/\r$//; # for Cygwin
- push( @targets, $_ );
- }
- close( CACHE );
- @targets;
-
-}
-
-
-
diff --git a/build/tools/jakarta-ant-1.5.1/bin/lcp.bat b/build/tools/jakarta-ant-1.5.1/bin/lcp.bat
deleted file mode 100644
index 9b1a9b5a0..000000000
--- a/build/tools/jakarta-ant-1.5.1/bin/lcp.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-REM reserved.
-
-set _CLASSPATHCOMPONENT=%1
-if ""%1""=="""" goto gotAllArgs
-shift
-
-:argCheck
-if ""%1""=="""" goto gotAllArgs
-set _CLASSPATHCOMPONENT=%_CLASSPATHCOMPONENT% %1
-shift
-goto argCheck
-
-:gotAllArgs
-set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
-
diff --git a/build/tools/jakarta-ant-1.5.1/bin/runant.pl b/build/tools/jakarta-ant-1.5.1/bin/runant.pl
deleted file mode 100644
index a8c0c08cf..000000000
--- a/build/tools/jakarta-ant-1.5.1/bin/runant.pl
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
-# reserved.
-#
-#######################################################################
-#
-# runant.pl
-#
-# wrapper script for invoking ant in a platform with Perl installed
-# this may include cgi-bin invocation, which is considered somewhat daft.
-# (slo: that should be a separate file which can be derived from this
-# and returns the XML formatted output)
-#
-# the code is not totally portable due to classpath and directory splitting
-# issues. oops. (NB, use File::Spec::Functions will help and the code is
-# structured for the catfile() call, but because of perl version funnies
-# the code is not included.
-#
-# created: 2000-8-24
-# last modified: 2000-8-24
-# author: Steve Loughran steve_l@sourceforge.net
-#######################################################################
-#
-# Assumptions:
-#
-# - the "java" executable/script is on the command path
-# - ANT_HOME has been set
-# - target platform uses ":" as classpath separator or perl indicates it is dos/win32
-# - target platform uses "/" as directory separator.
-
-#be fussy about variables
-use strict;
-
-#platform specifics (disabled)
-#use File::Spec::Functions;
-
-#turn warnings on during dev; generates a few spurious uninitialised var access warnings
-#use warnings;
-
-#and set $debug to 1 to turn on trace info
-my $debug=0;
-
-#######################################################################
-#
-# check to make sure environment is setup
-#
-
-my $HOME = $ENV{ANT_HOME};
-if ($HOME eq "")
- {
- die "\n\nANT_HOME *MUST* be set!\n\n";
- }
-
-my $JAVACMD = $ENV{JAVACMD};
-$JAVACMD = "java" if $JAVACMD eq "";
-
-my $onnetware = 0;
-if ($^O eq "NetWare")
-{
- $onnetware = 1;
-}
-
-#ISSUE: what java wants to split up classpath varies from platform to platform
-#and perl is not too hot at hinting which box it is on.
-#here I assume ":" 'cept on win32, dos, and netware. Add extra tests here as needed.
-my $s=":";
-if(($^O eq "MSWin32") || ($^O eq "dos") || ($^O eq "cygwin") ||
- ($onnetware == 1))
- {
- $s=";";
- }
-
-#build up standard classpath
-my $localpath=$ENV{CLASSPATH};
-if ($localpath eq "")
- {
- print "warning: no initial classpath\n" if ($debug);
- $localpath="";
- }
-if ($onnetware == 1)
-{
-# avoid building a command line bigger than 512 characters - make localpath
-# only include the "extra" stuff, and add in the system classpath as an expanded
-# variable.
- $localpath="";
-}
-
-#add jar files. I am sure there is a perl one liner to do this.
-my $jarpattern="$HOME/lib/*.jar";
-my @jarfiles =glob($jarpattern);
-print "jarfiles=@jarfiles\n" if ($debug);
-my $jar;
-foreach $jar (@jarfiles )
- {
- $localpath.="$s$jar";
- }
-
-#if Java home is defined, look for tools.jar & classes.zip and add to classpath
-my $JAVA_HOME = $ENV{JAVA_HOME};
-if ($JAVA_HOME ne "")
- {
- my $tools="$JAVA_HOME/lib/tools.jar";
- if (-e "$tools")
- {
- $localpath .= "$s$tools";
- }
- my $classes="$JAVA_HOME/lib/classes.zip";
- if (-e $classes)
- {
- $localpath .= "$s$classes";
- }
- }
-else
- {
- print "\n\nWarning: JAVA_HOME environment variable is not set.\n".
- "If the build fails because sun.* classes could not be found\n".
- "you will need to set the JAVA_HOME environment variable\n".
- "to the installation directory of java\n";
- }
-
-#set JVM options and Ant arguments, if any
-my @ANT_OPTS=split(" ", $ENV{ANT_OPTS});
-my @ANT_ARGS=split(" ", $ENV{ANT_ARGS});
-
-#jikes
-if($ENV{JIKESPATH} ne "")
- {
- push @ANT_OPTS, "-Djikes.class.path=$ENV{JIKESPATH}";
- }
-
-#construct arguments to java
-my @ARGS;
-if ($onnetware == 1)
-{
-# make classpath literally $CLASSPATH; and then the contents of $localpath
-# this is to avoid pushing us over the 512 character limit
-# even skip the ; - that is already in $localpath
- push @ARGS, "-classpath", "\$CLASSPATH$localpath";
-}
-else
-{
- push @ARGS, "-classpath", "$localpath";
-}
-push @ARGS, "-Dant.home=$HOME";
-push @ARGS, @ANT_OPTS;
-push @ARGS, "org.apache.tools.ant.Main", @ANT_ARGS;
-push @ARGS, @ARGV;
-
-print "\n $JAVACMD @ARGS\n\n" if ($debug);
-
-my $returnValue = system $JAVACMD, @ARGS;
-if ($returnValue eq 0)
- {
- exit 0;
- }
-else
- {
- # only 0 and 1 are widely recognized as exit values
- # so change the exit value to 1
- exit 1;
- }
diff --git a/build/tools/jakarta-ant-1.5.1/bin/runant.py b/build/tools/jakarta-ant-1.5.1/bin/runant.py
deleted file mode 100644
index f014fa6d9..000000000
--- a/build/tools/jakarta-ant-1.5.1/bin/runant.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/python
-"""
-
- runant.py
-
- This script is a translation of the runant.pl written by Steve Loughran.
- It runs ant with/out arguments, it should be quite portable (thanks to
- the python os library)
- This script has been tested with Python2.0/Win2K
-
- Copyright (c) 2001 The Apache Software Foundation. All rights
- reserved.
-
- created: 2001-04-11
- author: Pierre Dittgen pierre.dittgen@criltelecom.com
-
- Assumptions:
-
- - the "java" executable/script is on the command path
- - ANT_HOME has been set
-"""
-import os, os.path, string, sys
-
-# Change it to 1 to get extra debug information
-debug = 0
-
-#######################################################################
-#
-# check to make sure environment is setup
-#
-if not os.environ.has_key('ANT_HOME'):
- print '\n\nANT_HOME *MUST* be set!\n\n'
- sys.exit(1)
-else:
- ANT_HOME = os.environ['ANT_HOME']
-
-if not os.environ.has_key('JAVACMD'):
- JAVACMD = 'java'
-else:
- JAVACMD = os.environ['JAVACMD']
-
-# Sets the separator char for CLASSPATH
-SEPARATOR = ':'
-if os.name == 'dos' or os.name == 'nt':
- SEPARATOR = ';'
-
-# Build up standard classpath
-localpath = ''
-if os.environ.has_key('CLASSPATH'):
- localpath = os.environ['CLASSPATH']
-else:
- if debug:
- print 'Warning: no initial classpath\n'
-
-# Add jar files
-LIBDIR = os.path.join(ANT_HOME, 'lib')
-jarfiles = []
-for file in os.listdir(LIBDIR):
- if file[-4:] == '.jar':
- jarfiles.append(os.path.join(LIBDIR,file))
-if debug:
- print 'Jar files:'
- for jar in jarfiles:
- print jar
-localpath = localpath + SEPARATOR + string.join(jarfiles, SEPARATOR)
-
-# If JAVA_HOME is defined, look for tools.jar & classes.zip
-# and add to classpath
-if os.environ.has_key('JAVA_HOME') and os.environ['JAVA_HOME'] != '':
- JAVA_HOME = os.environ['JAVA_HOME']
- TOOLS = os.path.join(JAVA_HOME, os.path.join('lib', 'tools.jar'))
- if os.path.exists(TOOLS):
- localpath = localpath + SEPARATOR + TOOLS
- CLASSES = os.path.join(JAVA_HOME, os.path.join('lib', 'classes.zip'))
- if os.path.exists(CLASSES):
- localpath = localpath + SEPARATOR + CLASSES
-else:
- print '\n\nWarning: JAVA_HOME environment variable is not set.\n', \
- 'If the build fails because sun.* classes could not be found\n', \
- 'you will need to set the JAVA_HOME environment variable\n', \
- 'to the installation directory of java\n'
-
-# Jikes
-ANT_OPTS = []
-if os.environ.has_key('ANT_OPTS'):
- ANT_OPTS = string.split(os.environ['ANT_OPTS'])
-if os.environ.has_key('JIKESPATH'):
- ANT_OPTS.append('-Djikes.class.path=' + os.environ['JIKESPATH'])
-
-# Builds the commandline
-cmdline = '%s -classpath %s -Dant.home=%s %s org.apache.tools.ant.Main %s' \
- % (JAVACMD, localpath, ANT_HOME, string.join(ANT_OPTS,' '), \
- string.join(sys.argv[1:], ' '))
-
-if debug:
- print '\n%s\n\n' % (cmdline)
-
-# Run the biniou!
-os.system(cmdline)
diff --git a/build/tools/jakarta-ant-1.5.1/etc/changelog.xsl b/build/tools/jakarta-ant-1.5.1/etc/changelog.xsl
deleted file mode 100644
index 46828ccbd..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/changelog.xsl
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsl:stylesheet
- xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
- version='1.0'>
-
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
- <xsl:param name="title"/>
- <xsl:param name="module"/>
- <xsl:param name="cvsweb"/>
-
- <xsl:output method="html" indent="yes" encoding="US-ASCII"
- doctype-public="-//W3C//DTD HTML 4.01//EN"
- doctype-system="http://www.w3.org/TR/html401/strict.dtd"/>
-
- <!-- Copy standard document elements. Elements that
- should be ignored must be filtered by apply-templates
- tags. -->
- <xsl:template match="*">
- <xsl:copy>
- <xsl:copy-of select="attribute::*[. != '']"/>
- <xsl:apply-templates/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="changelog">
- <html>
- <head>
- <title><xsl:value-of select="$title"/></title>
- <style type="text/css">
- body, p {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 80%;
- color: #000000;
- background-color: #ffffff;
- }
- tr, td {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- background: #eeeee0;
- }
- td {
- padding-left: 20px;
- }
- .dateAndAuthor {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-weight: bold;
- text-align: left;
- background: #a6caf0;
- padding-left: 3px;
- }
- a {
- color: #000000;
- }
- pre {
- font-weight: bold;
- }
- </style>
- </head>
- <body>
- <h1>
- <a name="top"><xsl:value-of select="$title"/></a>
- </h1>
- <p style="text-align: right">Designed for use with <a href="http://jakarta.apache.org/ant/">Ant</a>.</p>
- <hr/>
- <table border="0" width="100%" cellspacing="1">
-
- <xsl:apply-templates select=".//entry">
- <xsl:sort select="date" data-type="text" order="descending"/>
- <xsl:sort select="time" data-type="text" order="descending"/>
- </xsl:apply-templates>
-
- </table>
-
- </body>
- </html>
- </xsl:template>
-
- <xsl:template match="entry">
- <tr>
- <td class="dateAndAuthor">
- <xsl:value-of select="date"/><xsl:text> </xsl:text><xsl:value-of select="time"/><xsl:text> </xsl:text><xsl:value-of select="author"/>
- </td>
- </tr>
- <tr>
- <td>
- <pre>
-<xsl:apply-templates select="msg"/></pre>
- <ul>
- <xsl:apply-templates select="file"/>
- </ul>
- </td>
- </tr>
- </xsl:template>
-
- <xsl:template match="date">
- <i><xsl:value-of select="."/></i>
- </xsl:template>
-
- <xsl:template match="time">
- <i><xsl:value-of select="."/></i>
- </xsl:template>
-
- <xsl:template match="author">
- <i>
- <a>
- <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute>
- <xsl:value-of select="."/></a>
- </i>
- </xsl:template>
-
- <xsl:template match="file">
- <li>
- <a>
- <xsl:choose>
- <xsl:when test="string-length(prevrevision) = 0 ">
- <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&amp;content-type=text/x-cvsweb-markup</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&amp;r2=<xsl:value-of select="prevrevision"/></xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="name" /> (<xsl:value-of select="revision"/>)</a>
- </li>
- </xsl:template>
-
- <!-- Any elements within a msg are processed,
- so that we can preserve HTML tags. -->
- <xsl:template match="msg">
- <xsl:apply-templates/>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/build/tools/jakarta-ant-1.5.1/etc/checkstyle-frames.xsl b/build/tools/jakarta-ant-1.5.1/etc/checkstyle-frames.xsl
deleted file mode 100644
index 104af5c7e..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/checkstyle-frames.xsl
+++ /dev/null
@@ -1,324 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:lxslt="http://xml.apache.org/xslt"
- xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
- extension-element-prefixes="redirect">
-
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-
- <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
- <xsl:decimal-format decimal-separator="." grouping-separator="," />
-
- <xsl:param name="output.dir" select="'.'"/>
-
- <xsl:template match="checkstyle">
- <!-- create the index.html -->
- <redirect:write file="{$output.dir}/index.html">
- <xsl:call-template name="index.html"/>
- </redirect:write>
-
- <!-- create the stylesheet.css -->
- <redirect:write file="{$output.dir}/stylesheet.css">
- <xsl:call-template name="stylesheet.css"/>
- </redirect:write>
-
- <!-- create the overview-summary.html at the root -->
- <redirect:write file="{$output.dir}/overview-frame.html">
- <xsl:apply-templates select="." mode="overview"/>
- </redirect:write>
-
- <!-- create the all-classes.html at the root -->
- <redirect:write file="{$output.dir}/allclasses-frame.html">
- <xsl:apply-templates select="." mode="all.classes"/>
- </redirect:write>
-
- <!-- process all files -->
- <xsl:apply-templates select="file"/>
- </xsl:template>
-
- <xsl:template name="index.html">
- <html>
- <head>
- <title>CheckStyle Audit</title>
- </head>
- <frameset cols="20%,80%">
- <frame src="allclasses-frame.html" name="fileListFrame"/>
- <frame src="overview-frame.html" name="fileFrame"/>
- </frameset>
- <noframes>
- <h2>Frame Alert</h2>
- <p>
- This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
- </p>
- </noframes>
- </html>
- </xsl:template>
-
- <xsl:template name="pageHeader">
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td class="text-align:right"><h2>CheckStyle Audit</h2></td>
- </tr>
- <tr>
- <td class="text-align:right">Designed for use with <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
- </tr>
- </table>
- <hr size="1"/>
- </xsl:template>
-
- <xsl:template match="checkstyle" mode="overview">
- <html>
- <head>
- <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
- </head>
- <body>
- <!-- page header -->
- <xsl:call-template name="pageHeader"/>
-
- <!-- Summary part -->
- <xsl:apply-templates select="." mode="summary"/>
- <hr size="1" width="100%" align="left"/>
-
- <!-- File list part -->
- <xsl:apply-templates select="." mode="filelist"/>
- </body>
- </html>
- </xsl:template>
-
- <xsl:template name="stylesheet.css">
- .bannercell {
- border: 0px;
- padding: 0px;
- }
- body {
- margin-left: 10;
- margin-right: 10;
- font:normal 80% arial,helvetica,sanserif;
- background-color:#FFFFFF;
- color:#000000;
- }
- .a td {
- background: #efefef;
- }
- .b td {
- background: #fff;
- }
- th, td {
- text-align: left;
- vertical-align: top;
- }
- th {
- font-weight:bold;
- background: #ccc;
- color: black;
- }
- table, th, td {
- font-size:100%;
- border: none
- }
- table.log tr td, tr th {
-
- }
- h2 {
- font-weight:bold;
- font-size:140%;
- margin-bottom: 5;
- }
- h3 {
- font-size:100%;
- font-weight:bold;
- background: #525D76;
- color: white;
- text-decoration: none;
- padding: 5px;
- margin-right: 2px;
- margin-left: 2px;
- margin-bottom: 0;
- }
- </xsl:template>
-
- <!--
- Creates an all-classes.html file that contains a link to all files.
- -->
- <xsl:template match="checkstyle" mode="all.classes">
- <html>
- <head>
- <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
- </head>
- <body>
- <h2>Files</h2>
- <p>
- <table width="100%">
- <!-- For each file create its part -->
- <xsl:apply-templates select="file" mode="all.classes">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </p>
- </body>
- </html>
- </xsl:template>
-
- <xsl:template match="checkstyle" mode="filelist">
- <h3>Files</h3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Name</th>
- <th>Errors</th>
- </tr>
- <xsl:apply-templates select="file" mode="filelist">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </xsl:template>
-
- <xsl:template match="file" mode="filelist">
- <tr>
- <xsl:call-template name="alternated-row"/>
- <td nowrap="nowrap">
- <a>
- <xsl:attribute name="href">
- <xsl:text>files/</xsl:text><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="@name"/>
- </a>
- </td>
- <td><xsl:value-of select="count(error)"/></td>
- </tr>
- </xsl:template>
-
- <xsl:template match="file" mode="all.classes">
- <tr>
- <td nowrap="nowrap">
- <a target="fileFrame">
- <xsl:attribute name="href">
- <xsl:text>files/</xsl:text><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="@name"/>
- </a>
- </td>
- </tr>
- </xsl:template>
-
- <!--
- transform string like a/b/c to ../../../
- @param path the path to transform into a descending directory path
- -->
- <xsl:template name="path">
- <xsl:param name="path"/>
- <xsl:if test="contains($path,'/')">
- <xsl:text>../</xsl:text>
- <xsl:call-template name="path">
- <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'/')"/></xsl:with-param>
- </xsl:call-template>
- </xsl:if>
- <xsl:if test="not(contains($path,'/')) and not($path = '')">
- <xsl:text>../</xsl:text>
- </xsl:if>
- </xsl:template>
-
- <xsl:template match="file">
- <redirect:write file="{$output.dir}/files/{@name}.html">
- <html>
- <head>
- <link rel="stylesheet" type="text/css">
- <xsl:attribute name="href"><xsl:call-template name="path"><xsl:with-param name="path" select="@name"/></xsl:call-template><xsl:text>stylesheet.css</xsl:text></xsl:attribute>
- </link>
- </head>
- <body>
- <xsl:call-template name="pageHeader"/>
- <h3>File <xsl:value-of select="@name"/></h3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Error Description</th>
- <th>Line</th>
- </tr>
- <xsl:for-each select="error">
- <tr>
- <xsl:call-template name="alternated-row"/>
- <td><xsl:value-of select="@message"/></td>
- <td><xsl:value-of select="@line"/></td>
- </tr>
- </xsl:for-each>
- </table>
- </body>
- </html>
- </redirect:write>
- </xsl:template>
-
- <xsl:template match="checkstyle" mode="summary">
- <h3>Summary</h3>
- <xsl:variable name="fileCount" select="count(file)"/>
- <xsl:variable name="errorCount" select="count(file/error)"/>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Files</th>
- <th>Errors</th>
- </tr>
- <tr>
- <xsl:call-template name="alternated-row"/>
- <td><xsl:value-of select="$fileCount"/></td>
- <td><xsl:value-of select="$errorCount"/></td>
- </tr>
- </table>
- </xsl:template>
-
- <xsl:template name="alternated-row">
- <xsl:attribute name="class">
- <xsl:if test="position() mod 2 = 1">a</xsl:if>
- <xsl:if test="position() mod 2 = 0">b</xsl:if>
- </xsl:attribute>
- </xsl:template>
-</xsl:stylesheet>
-
diff --git a/build/tools/jakarta-ant-1.5.1/etc/coverage-frames.xsl b/build/tools/jakarta-ant-1.5.1/etc/coverage-frames.xsl
deleted file mode 100644
index 3881f1aaf..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/coverage-frames.xsl
+++ /dev/null
@@ -1,533 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:lxslt="http://xml.apache.org/xslt"
- xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
- extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2001-2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-
-<!--
-
- Sample stylesheet to be used with JProbe 3.0 XML output.
-
- It creates a set of HTML files a la javadoc where you can browse easily
- through all packages and classes.
-
- It is best used with JProbe Coverage Ant task that gives you the benefit
- of a reference classpath so that you have the list of classes/methods
- that are not used at all in a given classpath.
-
- @author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
-
--->
-
-<!-- default output directory is current directory -->
-<xsl:param name="output.dir" select="'.'"/>
-
-<!-- ======================================================================
- Root element
- ======================================================================= -->
-<xsl:template match="/snapshot">
- <!-- create the index.html -->
- <redirect:write file="{$output.dir}/index.html">
- <xsl:call-template name="index.html"/>
- </redirect:write>
-
- <!-- create the stylesheet.css -->
- <redirect:write file="{$output.dir}/stylesheet.css">
- <xsl:call-template name="stylesheet.css"/>
- </redirect:write>
-
- <!-- create the overview-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-summary.html">
- <xsl:apply-templates select="." mode="overview.packages"/>
- </redirect:write>
-
- <!-- create the all-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-frame.html">
- <xsl:apply-templates select="." mode="all.packages"/>
- </redirect:write>
-
- <!-- create the all-classes.html at the root -->
- <redirect:write file="{$output.dir}/allclasses-frame.html">
- <xsl:apply-templates select="." mode="all.classes"/>
- </redirect:write>
-
- <!-- process all packages -->
- <xsl:apply-templates select="./package" mode="write"/>
-</xsl:template>
-
-<!-- =======================================================================
- Frameset definition. Entry point for the report.
- 3 frames: packageListFrame, classListFrame, classFrame
- ======================================================================= -->
-<xsl:template name="index.html">
-<html>
- <head><title>Coverage Results.</title></head>
- <frameset cols="20%,80%">
- <frameset rows="30%,70%">
- <frame src="overview-frame.html" name="packageListFrame"/>
- <frame src="allclasses-frame.html" name="classListFrame"/>
- </frameset>
- <frame src="overview-summary.html" name="classFrame"/>
- </frameset>
- <noframes>
- <h2>Frame Alert</h2>
- <p>
- This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
- </p>
- </noframes>
-</html>
-</xsl:template>
-
-<!-- =======================================================================
- Stylesheet CSS used
- ======================================================================= -->
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
- .bannercell {
- border: 0px;
- padding: 0px;
- }
- body {
- margin-left: 10;
- margin-right: 10;
- font:normal 80% arial,helvetica,sanserif;
- background-color:#FFFFFF;
- color:#000000;
- }
- .a td {
- background: #efefef;
- }
- .b td {
- background: #fff;
- }
- th, td {
- text-align: left;
- vertical-align: top;
- }
- th {
- font-weight:bold;
- background: #ccc;
- color: black;
- }
- table, th, td {
- font-size:100%;
- border: none
- }
- table.log tr td, tr th {
-
- }
- h2 {
- font-weight:bold;
- font-size:140%;
- margin-bottom: 5;
- }
- h3 {
- font-size:100%;
- font-weight:bold;
- background: #525D76;
- color: white;
- text-decoration: none;
- padding: 5px;
- margin-right: 2px;
- margin-left: 2px;
- margin-bottom: 0;
- }
-</xsl:template>
-
-<!-- =======================================================================
- List of all classes in all packages
- This will be the first page in the classListFrame
- ======================================================================= -->
-<xsl:template match="snapshot" mode="all.classes">
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link"/>
- </head>
- <body>
- <h2>Classes</h2>
- <table width="100%">
- <xsl:for-each select="package/class">
- <xsl:sort select="@name"/>
- <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/>
- <xsl:variable name="link">
- <xsl:if test="not($package.name='')">
- <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
- </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
- </xsl:variable>
- <tr>
- <td nowrap="nowrap">
- <a target="classFrame" href="{$link}"><xsl:value-of select="@name"/></a>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<!-- list of all packages -->
-<xsl:template match="snapshot" mode="all.packages">
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link"/>
- </head>
- <body>
- <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
- <h2>Packages</h2>
- <table width="100%">
- <xsl:for-each select="package">
- <xsl:sort select="@name" order="ascending"/>
- <tr>
- <td nowrap="nowrap">
- <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame">
- <xsl:value-of select="@name"/>
- </a>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<!-- overview of statistics in packages -->
-<xsl:template match="snapshot" mode="overview.packages">
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link"/>
- </head>
- <body onload="open('allclasses-frame.html','classListFrame')">
- <xsl:call-template name="pageHeader"/>
- <h3>Summary</h3>
- <table class="log" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <!--th width="10%" nowrap="nowrap">Date</th>
- <th width="10%" nowrap="nowrap">Elapsed time</th-->
- <th width="10%" nowrap="nowrap">Reported Classes</th>
- <th width="10%" nowrap="nowrap">Methods Hit</th>
- <th width="10%" nowrap="nowrap">Lines Hit</th>
- </tr>
- <tr class="a">
- <!--td nowrap="nowrap"><xsl:value-of select="execution_log/@program_start"/></td>
- <td><xsl:value-of select="format-number(execution_log/@elapsed_time div 1000,'0.0')"/>secs</td-->
- <td><xsl:value-of select="count(package/class)"/></td>
- <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td>
- <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td>
- </tr>
- </table>
- <table border="0" width="100%">
- <tr>
- <td style="text-align: justify;">
- To ensure accurate test runs on Java applications, developers need to know how much of
- the code has been tested, and where to find any untested code. Coverage helps you
- locate untested code, and measure precisely how much code has been exercised.
- The result is a higher quality application in a shorter period of time.
- <p/>
- </td>
- </tr>
- </table>
-
- <h3>Packages</h3>
- <table class="log" cellpadding="5" cellspacing="2" width="100%">
- <xsl:apply-templates select="package[1]" mode="stats.header"/>
- <!-- display packages and sort them via their coverage rate -->
- <xsl:for-each select="package">
- <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/>
- <tr>
- <xsl:call-template name="alternate-row"/>
- <td><a href="{translate(@name,'.','/')}/package-summary.html"><xsl:value-of select="@name"/></a></td>
- <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td>
- <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td>
- </tr>
- </xsl:for-each>
- </table>
- <xsl:call-template name="pageFooter"/>
- </body>
- </html>
-</xsl:template>
-
-<!--
- detailed info for a package. It will output the list of classes
-, the summary page, and the info for each class
--->
-<xsl:template match="package" mode="write">
- <xsl:variable name="package.dir">
- <xsl:if test="not(@name = '')"><xsl:value-of select="translate(@name,'.','/')"/></xsl:if>
- <xsl:if test="@name = ''">.</xsl:if>
- </xsl:variable>
-
- <!-- create a classes-list.html in the package directory -->
- <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
- <xsl:apply-templates select="." mode="classes.list"/>
- </redirect:write>
-
- <!-- create a package-summary.html in the package directory -->
- <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
- <xsl:apply-templates select="." mode="package.summary"/>
- </redirect:write>
-
- <!-- for each class, creates a @name.html -->
- <xsl:for-each select="class">
- <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
- <xsl:apply-templates select="." mode="class.details"/>
- </redirect:write>
- </xsl:for-each>
-</xsl:template>
-
-<!-- list of classes in a package -->
-<xsl:template match="package" mode="classes.list">
- <html>
- <HEAD>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="@name"/>
- </xsl:call-template>
- </HEAD>
- <BODY>
- <table width="100%">
- <tr>
- <td nowrap="nowrap">
- <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2>
- </td>
- </tr>
- </table>
-
- <H2>Classes</H2>
- <TABLE WIDTH="100%">
- <xsl:for-each select="class">
- <xsl:sort select="@name"/>
- <tr>
- <td nowrap="nowrap">
- <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
- </td>
- </tr>
- </xsl:for-each>
- </TABLE>
- </BODY>
- </html>
-</xsl:template>
-
-<!-- summary of a package -->
-<xsl:template match="package" mode="package.summary">
- <HTML>
- <HEAD>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="@name"/>
- </xsl:call-template>
- </HEAD>
- <!-- when loading this package, it will open the classes into the frame -->
- <BODY onload="open('package-frame.html','classListFrame')">
- <xsl:call-template name="pageHeader"/>
- <h3>Package <xsl:value-of select="@name"/></h3>
- <table class="log" cellpadding="5" cellspacing="2" width="100%">
- <xsl:apply-templates select="." mode="stats.header"/>
- <xsl:apply-templates select="." mode="stats"/>
- </table>
-
- <xsl:if test="count(class) &gt; 0">
- <H3>Classes</H3>
- <table class="log" cellpadding="5" cellspacing="2" width="100%">
- <xsl:apply-templates select="." mode="stats.header"/>
- <xsl:apply-templates select="class" mode="stats">
- <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/>
- </xsl:apply-templates>
- </table>
- </xsl:if>
- <xsl:call-template name="pageFooter"/>
- </BODY>
- </HTML>
-</xsl:template>
-
-<!-- details of a class -->
-<xsl:template match="class" mode="class.details">
- <xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/>
- <HTML>
- <HEAD>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="$package.name"/>
- </xsl:call-template>
- </HEAD>
- <BODY>
- <xsl:call-template name="pageHeader"/>
- <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3>
-
- <!-- class summary -->
- <table class="log" cellpadding="5" cellspacing="2" width="100%">
- <xsl:apply-templates select="." mode="stats.header"/>
- <xsl:apply-templates select="." mode="stats"/>
- </table>
-
- <!-- details of methods -->
- <H3>Methods</H3>
- <table class="log" cellpadding="5" cellspacing="2" width="100%">
- <xsl:apply-templates select="method[1]" mode="stats.header"/>
- <xsl:apply-templates select="method" mode="stats">
- <xsl:sort data-type="number" select="cov.data/@hit_lines div cov.data/@total_lines"/>
- </xsl:apply-templates>
- </table>
- <xsl:call-template name="pageFooter"/>
- </BODY>
- </HTML>
-
-</xsl:template>
-
-<!-- Page Header -->
-<xsl:template name="pageHeader">
- <!-- jakarta logo -->
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td class="bannercell" rowspan="2">
- <a href="http://jakarta.apache.org/">
- <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
- </a>
- </td>
- <td style="text-align:right"><h2>Source Code Coverage</h2></td>
- </tr>
- <tr>
- <td style="text-align:right">Designed for use with <a href='http://www.sitraka.com/jprobe'>Sitraka JProbe</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
- </tr>
- </table>
- <hr size="1"/>
-</xsl:template>
-
-<!-- Page Footer -->
-<xsl:template name="pageFooter">
- <table width="100%">
- <tr><td><hr noshade="yes" size="1"/></td></tr>
- <tr><td>
- <div align="center"><font color="#525D76" size="-1"><em>
- Copyright &#169; 1999-2001, Apache Software Foundation
- </em></font></div>
- </td></tr>
- </table>
-</xsl:template>
-
-
-<xsl:template name="table.header">
- <tr>
- <th width="80%">Name</th>
- <th width="10%" nowrap="nowrap">Methods Hit</th>
- <th width="10%" nowrap="nowrap">Lines Hit</th>
- </tr>
-</xsl:template>
-
-<xsl:template match="method" mode="stats.header">
- <tr>
- <th width="90%">Name</th>
- <th width="10%" nowrap="nowrap">Lines Hit</th>
- </tr>
-</xsl:template>
-<xsl:template match="method" mode="stats">
- <tr>
- <xsl:call-template name="alternate-row"/>
- <td><xsl:value-of select="@name"/></td>
- <td>
- <xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/>
- </td>
- </tr>
-</xsl:template>
-
-<xsl:template match="package|class" mode="stats.header">
- <tr>
- <th width="80%">Name</th>
- <th width="10%" nowrap="nowrap">Methods Hit</th>
- <th width="10%" nowrap="nowrap">Lines Hit</th>
- </tr>
-</xsl:template>
-<xsl:template match="package|class" mode="stats">
- <tr>
- <xsl:call-template name="alternate-row"/>
- <td><xsl:value-of select="@name"/></td>
- <td><xsl:value-of select="format-number(cov.data/@hit_methods div cov.data/@total_methods,'0.0%')"/></td>
- <td><xsl:value-of select="format-number(cov.data/@hit_lines div cov.data/@total_lines,'0.0%')"/></td>
- </tr>
-</xsl:template>
-
-<!--
- transform string like a.b.c to ../../../
- @param path the path to transform into a descending directory path
--->
-<xsl:template name="path">
- <xsl:param name="path"/>
- <xsl:if test="contains($path,'.')">
- <xsl:text>../</xsl:text>
- <xsl:call-template name="path">
- <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
- </xsl:call-template>
- </xsl:if>
- <xsl:if test="not(contains($path,'.')) and not($path = '')">
- <xsl:text>../</xsl:text>
- </xsl:if>
-</xsl:template>
-
-
-<!-- create the link to the stylesheet based on the package name -->
-<xsl:template name="create.stylesheet.link">
- <xsl:param name="package.name"/>
- <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK>
-</xsl:template>
-
-<!-- alternated row style -->
-<xsl:template name="alternate-row">
-<xsl:attribute name="class">
- <xsl:if test="position() mod 2 = 1">a</xsl:if>
- <xsl:if test="position() mod 2 = 0">b</xsl:if>
-</xsl:attribute>
-</xsl:template>
-
-</xsl:stylesheet>
-
-
diff --git a/build/tools/jakarta-ant-1.5.1/etc/jdepend-frames.xsl b/build/tools/jakarta-ant-1.5.1/etc/jdepend-frames.xsl
deleted file mode 100644
index 5c73a11d4..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/jdepend-frames.xsl
+++ /dev/null
@@ -1,522 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:lxslt="http://xml.apache.org/xslt"
- xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
- extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-<!--
-
- Sample stylesheet to be used with JDepend XML output.
-
- It creates a set of HTML files a la javadoc where you can browse easily
- through all packages and classes.
-
- @author <a href="mailto:jtulley@novell.com">Jeff Tulley</a>
-
- -->
-<xsl:param name="output.dir" select="'.'"/>
-
-<xsl:template match="JDepend">
- <!-- create the index.html -->
- <redirect:write file="{$output.dir}/index.html">
- <xsl:call-template name="index.html"/>
- </redirect:write>
-
- <!-- create the stylesheet.css -->
- <redirect:write file="{$output.dir}/stylesheet.css">
- <xsl:call-template name="stylesheet.css"/>
- </redirect:write>
-
- <!-- create the overview-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-summary.html">
- <xsl:apply-templates select="." mode="overview.packages"/>
- </redirect:write>
-
- <!-- create the overview-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-packages.html">
- <xsl:apply-templates select="." mode="packages.details"/>
- </redirect:write>
-
- <!-- create the overview-cycles.html at the root -->
- <redirect:write file="{$output.dir}/overview-cycles.html">
- <xsl:apply-templates select="." mode="cycles.details"/>
- </redirect:write>
-
- <!-- create the overview-cycles.html at the root -->
- <redirect:write file="{$output.dir}/overview-explanations.html">
- <xsl:apply-templates select="." mode="explanations"/>
- </redirect:write>
-
- <!-- create the all-packages.html at the root -->
- <redirect:write file="{$output.dir}/all-packages.html">
- <xsl:apply-templates select="Packages" mode="all.packages"/>
- </redirect:write>
-
- <!-- create the all-cycles.html at the root -->
- <redirect:write file="{$output.dir}/all-cycles.html">
- <xsl:apply-templates select="Cycles" mode="all.cycles"/>
- </redirect:write>
-</xsl:template>
-
-
-<xsl:template name="index.html">
-<html>
- <head>
- <title>JDepend Analysis</title>
- </head>
- <frameset cols="20%,80%">
- <frameset rows="30%,70%">
- <frame src="all-packages.html" name="packageListFrame"/>
- <frame src="all-cycles.html" name="classListFrame"/>
- </frameset>
- <frame src="overview-summary.html" name="classFrame"/>
- </frameset>
- <noframes>
- <h2>Frame Alert</h2>
- <p>
- This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
- </p>
- </noframes>
-</html>
-</xsl:template>
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
- <style type="text/css">
- body {
- font:normal 68% verdana,arial,helvetica;
- color:#000000;
- }
- table tr td, tr th {
- font-size: 68%;
- }
- table.details tr th{
- font-weight: bold;
- text-align:left;
- background:#a6caf0;
- }
- table.details tr td{
- background:#eeeee0;
- }
-
- p {
- line-height:1.5em;
- margin-top:0.5em; margin-bottom:1.0em;
- margin-left:2em;
- margin-right:2em;
- }
- h1 {
- margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
- }
- h2 {
- margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
- }
- h3 {
- margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
- }
- h4 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
- }
- h5 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
- }
- h6 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
- }
- .Error {
- font-weight:bold; color:red;
- }
- .Failure {
- font-weight:bold; color:purple;
- }
- .Properties {
- text-align:right;
- }
- </style>
-</xsl:template>
-
-<xsl:template match="JDepend" mode="overview.packages">
- <html>
- <head>
- <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
- </head>
- <body>
- <xsl:call-template name="pageHeader"/>
- <table width="100%"><tr align="left"><h2>Summary</h2><td>
- </td><td align="right">
- [summary]
- [<a href="overview-packages.html">packages</a>]
- [<a href="overview-cycles.html">cycles</a>]
- [<a href="overview-explanations.html">explanations</a>]
- </td></tr></table>
- <table width="100%" class="details">
- <tr>
- <th>Package</th>
- <th>Total Classes</th>
- <th><a href="overview-explanations.html#EXnumber">Abstract Classes</a></th>
- <th><a href="overview-explanations.html#EXnumber">Concrete Classes</a></th>
- <th><a href="overview-explanations.html#EXafferent">Afferent Couplings</a></th>
- <th><a href="overview-explanations.html#EXefferent">Efferent Couplings</a></th>
- <th><a href="overview-explanations.html#EXabstractness">Abstractness</a></th>
- <th><a href="overview-explanations.html#EXinstability">Instability</a></th>
- <th><a href="overview-explanations.html#EXdistance">Distance</a></th>
-
- </tr>
- <xsl:for-each select="./Packages/Package">
- <xsl:if test="count(error) = 0">
- <tr>
- <td align="left">
- <a>
- <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="@name"/>
- </xsl:attribute>
- <xsl:value-of select="@name"/>
- </a>
- </td>
- <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td>
- <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td>
- <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td>
- <td align="right"><xsl:value-of select="Stats/Ca"/></td>
- <td align="right"><xsl:value-of select="Stats/Ce"/></td>
- <td align="right"><xsl:value-of select="Stats/A"/></td>
- <td align="right"><xsl:value-of select="Stats/I"/></td>
- <td align="right"><xsl:value-of select="Stats/D"/></td>
- </tr>
- </xsl:if>
- </xsl:for-each>
- <xsl:for-each select="./Packages/Package">
- <xsl:if test="count(error) &gt; 0">
- <tr>
- <td align="left">
- <xsl:value-of select="@name"/>
- </td>
- <td align="left" colspan="8"><xsl:value-of select="error"/></td>
- </tr>
- </xsl:if>
- </xsl:for-each>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="JDepend" mode="packages.details">
- <html>
- <head>
- <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
- </head>
- <body>
- <xsl:call-template name="pageHeader"/>
- <table width="100%"><tr align="left"><h2>Packages</h2><td>
- </td><td align="right">
- [<a href="overview-summary.html">summary</a>]
- [packages]
- [<a href="overview-cycles.html">cycles</a>]
- [<a href="overview-explanations.html">explanations</a>]
- </td></tr></table>
-
- <xsl:for-each select="./Packages/Package">
- <xsl:if test="count(error) = 0">
- <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute>
- <xsl:value-of select="@name"/></a></h3>
-
- <table width="100%"><tr>
- <td><a href="overview-explanations.html#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td>
- <td><a href="overview-explanations.html#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td>
- <td><a href="overview-explanations.html#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td>
- <td><a href="overview-explanations.html#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td>
- <td><a href="overview-explanations.html#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td>
- </tr></table>
-
- <table width="100%" class="details">
- <tr>
- <th>Abstract Classes</th>
- <th>Concrete Classes</th>
- <th>Used by Packages</th>
- <th>Uses Packages</th>
- </tr>
- <tr>
- <td valign="top" width="25%">
- <xsl:if test="count(AbstractClasses/Class)=0">
- <i>None</i>
- </xsl:if>
- <xsl:for-each select="AbstractClasses/Class">
- <xsl:value-of select="node()"/><br/>
- </xsl:for-each>
- </td>
- <td valign="top" width="25%">
- <xsl:if test="count(ConcreteClasses/Class)=0">
- <i>None</i>
- </xsl:if>
- <xsl:for-each select="ConcreteClasses/Class">
- <xsl:value-of select="node()"/><br/>
- </xsl:for-each>
- </td>
- <td valign="top" width="25%">
- <xsl:if test="count(UsedBy/Package)=0">
- <i>None</i>
- </xsl:if>
- <xsl:for-each select="UsedBy/Package">
- <a>
- <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute>
- <xsl:value-of select="node()"/>
- </a><br/>
- </xsl:for-each>
- </td>
- <td valign="top" width="25%">
- <xsl:if test="count(DependsUpon/Package)=0">
- <i>None</i>
- </xsl:if>
- <xsl:for-each select="DependsUpon/Package">
- <a>
- <xsl:attribute name="href">overview-packages.html#PK<xsl:value-of select="node()"/></xsl:attribute>
- <xsl:value-of select="node()"/>
- </a><br/>
- </xsl:for-each>
- </td>
- </tr>
- </table>
- </xsl:if>
- </xsl:for-each>
- <!-- this is often a long listing; provide a lower navigation table also -->
- <table width="100%"><tr align="left"><td></td><td align="right">
- [<a href="overview-summary.html">summary</a>]
- [packages]
- [<a href="overview-cycles.html">cycles</a>]
- [<a href="overview-explanations.html">explanations</a>]
- </td></tr></table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="JDepend" mode="cycles.details">
- <html>
- <head>
- <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
- </head>
- <body>
- <xsl:call-template name="pageHeader"/>
- <table width="100%"><tr align="left"><h2>Cycles</h2><td>
- </td><td align="right">
- [<a href="overview-summary.html">summary</a>]
- [<a href="overview-packages.html">packages</a>]
- [cycles]
- [<a href="overview-explanations.html">explanations</a>]
- </td></tr></table>
- <!--<table width="100%"><tr><td>
- </td><td align="right">
- [<a href="#NVsummary">summary</a>]
- [<a href="#NVpackages">packages</a>]
- [<a href="#NVcycles">cycles</a>]
- [<a href="#NVexplanations">explanations</a>]
- </td></tr></table> -->
-
- <xsl:if test="count(Cycles/Package) = 0">
- <p>There are no cyclic dependancies.</p>
- </xsl:if>
- <xsl:for-each select="Cycles/Package">
- <h3><a><xsl:attribute name="name">#CY<xsl:value-of select="@Name"/></xsl:attribute><xsl:value-of select="@Name"/></a></h3><p>
- <xsl:for-each select="Package">
- <xsl:value-of select="."/><br/>
- </xsl:for-each></p>
- </xsl:for-each>
- <!-- this is often a long listing; provide a lower navigation table also -->
- <table width="100%"><tr align="left"><td></td><td align="right">
- [<a href="overview-summary.html">summary</a>]
- [<a href="overview-packages.html">packages</a>]
- [cycles]
- [<a href="overview-explanations.html">explanations</a>]
- </td></tr></table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="JDepend" mode="explanations">
- <html>
- <head>
- <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
- </head>
- <body>
- <xsl:call-template name="pageHeader"/>
-
- <table width="100%"><tr align="left"><h2>Explanations</h2><td>
- </td><td align="right">
- [<a href="overview-summary.html">summary</a>]
- [<a href="overview-packages.html">packages</a>]
- [<a href="overview-cycles.html">cycles</a>]
- [explanations]
- </td></tr></table>
-
- <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p>
-
- <h3><a name="EXnumber">Number of Classes</a></h3>
- <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p>
- <h3><a name="EXafferent">Afferent Couplings</a></h3>
- <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p>
- <h3><a name="EXefferent">Efferent Couplings</a></h3>
- <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p>
- <h3><a name="EXabstractness">Abstractness</a></h3>
- <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p>
- <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p>
- <h3><a name="EXinstability">Instability</a></h3>
- <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p>
- <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p>
- <h3><a name="EXdistance">Distance</a></h3>
- <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p>
- <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p>
- <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p>
-
- </body>
- </html>
-</xsl:template>
-
-
-<!--
-Creates an html file that contains a link to all package links in overview-packages.html.
- @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="JDepend/Packages" mode="all.packages">
- <html>
- <head>
- <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
- </head>
- <body>
- <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right">
- [<a href="overview-summary.html" target="classFrame">summary</a>]
- [<a href="overview-packages.html" target="classFrame">packages</a>]
- [<a href="overview-cycles.html" target="classFrame">cycles</a>]
- [<a href="overview-explanations.html" target="classFrame">explanations</a>]
- </td></tr></table>
- <h2>Packages</h2>
- <table width="100%">
- <xsl:apply-templates select="Package[count(error)=0]" mode="all.packages.link">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="Package[count(error) &gt; 0]" mode="all.packages.nolink">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="JDepend/Packages/Package" mode="all.packages.link">
- <tr>
- <td nowrap="nowrap">
- <a href="overview-packages.html#PK{@name}" target="classFrame">
- <xsl:value-of select="@name"/>
- </a>
- </td>
- </tr>
-</xsl:template>
-
-<!--
-I do not know JDepend enough to know if every error results in a non-analyzed package,
-but that is how I am presenting it to the viewer. This may need to change.
- @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="JDepend/Packages/Package" mode="all.packages.nolink">
- <tr>
- <td nowrap="nowrap">
- Not Analyzed: <xsl:value-of select="@name"/>
- </td>
- </tr>
-</xsl:template>
-
-<!--
-Creates an html file that contains a link to all package links in overview-cycles.html.
- @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="JDepend/Cycles" mode="all.cycles">
- <html>
- <head>
- <link rel="stylesheet" type="text/css" href="stylesheet.css"/>
- </head>
- <body>
- <table width="100%"><tr align="left"><td></td><td nowrap="nowrap" align="right">
- [<a href="overview-summary.html" target="classFrame">summary</a>]
- [<a href="overview-packages.html" target="classFrame">packages</a>]
- [<a href="overview-cycles.html" target="classFrame">cycles</a>]
- [<a href="overview-explanations.html" target="classFrame">explanations</a>]
- </td></tr></table>
- <h2>Cycles</h2>
- <table width="100%">
- <xsl:apply-templates select="Package" mode="all.cycles">
- <xsl:sort select="@Name"/>
- </xsl:apply-templates>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="JDepend/Cycles/Package" mode="all.cycles">
- <tr>
- <td nowrap="nowrap">
- <a href="overview-cycles.html#CY{@Name}" target="classFrame"><xsl:value-of select="@Name"/></a>
- </td>
- </tr>
-</xsl:template>
-
-<!-- Page HEADER -->
-<xsl:template name="pageHeader">
- <h1>JDepend Analysis</h1>
- <table width="100%">
- <tr>
- <td align="left"></td>
- <td align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</td>
- </tr>
- </table>
- <hr size="1"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/build/tools/jakarta-ant-1.5.1/etc/jdepend.xsl b/build/tools/jakarta-ant-1.5.1/etc/jdepend.xsl
deleted file mode 100644
index 64d981f52..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/jdepend.xsl
+++ /dev/null
@@ -1,312 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-
-<xsl:template match="JDepend">
- <html>
- <head>
- <title>JDepend Analysis</title>
-
- <style type="text/css">
- body {
- font:normal 68% verdana,arial,helvetica;
- color:#000000;
- }
- table tr td, tr th {
- font-size: 68%;
- }
- table.details tr th{
- font-weight: bold;
- text-align:left;
- background:#a6caf0;
- }
- table.details tr td{
- background:#eeeee0;
- }
-
- p {
- line-height:1.5em;
- margin-top:0.5em; margin-bottom:1.0em;
- margin-left:2em;
- margin-right:2em;
- }
- h1 {
- margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
- }
- h2 {
- margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
- }
- h3 {
- margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
- }
- h4 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
- }
- h5 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
- }
- h6 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
- }
- .Error {
- font-weight:bold; color:red;
- }
- .Failure {
- font-weight:bold; color:purple;
- }
- .Properties {
- text-align:right;
- }
- </style>
-
-
- </head>
- <body>
- <!--h1>JDepend Report</h1>
- <ul>
- <xsl:for-each select="./Packages/Package">
- <xsl:sort select="@name"/>
- <li><xsl:value-of select="@name"/></li>
- </xsl:for-each>
- </ul-->
-
- <h1><a name="top">JDepend Analysis</a></h1>
- <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</p>
- <hr size="2" />
-
- <table width="100%"><tr><td>
- <a name="NVsummary"><h2>Summary</h2></a>
- </td><td align="right">
- [<a href="#NVsummary">summary</a>]
- [<a href="#NVpackages">packages</a>]
- [<a href="#NVcycles">cycles</a>]
- [<a href="#NVexplanations">explanations</a>]
- </td></tr></table>
-
- <table width="100%" class="details">
- <tr>
- <th>Package</th>
- <th>Total Classes</th>
- <th><a href="#EXnumber">Abstract Classes</a></th>
- <th><a href="#EXnumber">Concrete Classes</a></th>
- <th><a href="#EXafferent">Afferent Couplings</a></th>
- <th><a href="#EXefferent">Efferent Couplings</a></th>
- <th><a href="#EXabstractness">Abstractness</a></th>
- <th><a href="#EXinstability">Instability</a></th>
- <th><a href="#EXdistance">Distance</a></th>
-
- </tr>
- <xsl:for-each select="./Packages/Package">
- <xsl:if test="count(error) = 0">
- <tr>
- <td align="left">
- <a>
- <xsl:attribute name="href">#PK<xsl:value-of select="@name"/>
- </xsl:attribute>
- <xsl:value-of select="@name"/>
- </a>
- </td>
- <td align="right"><xsl:value-of select="Stats/TotalClasses"/></td>
- <td align="right"><xsl:value-of select="Stats/AbstractClasses"/></td>
- <td align="right"><xsl:value-of select="Stats/ConcreteClasses"/></td>
- <td align="right"><xsl:value-of select="Stats/Ca"/></td>
- <td align="right"><xsl:value-of select="Stats/Ce"/></td>
- <td align="right"><xsl:value-of select="Stats/A"/></td>
- <td align="right"><xsl:value-of select="Stats/I"/></td>
- <td align="right"><xsl:value-of select="Stats/D"/></td>
-
-
- </tr>
- </xsl:if>
- </xsl:for-each>
- <xsl:for-each select="./Packages/Package">
- <xsl:if test="count(error) &gt; 0">
- <tr>
- <td align="left">
- <xsl:value-of select="@name"/>
- </td>
- <td align="left" colspan="8"><xsl:value-of select="error"/></td>
- </tr>
- </xsl:if>
- </xsl:for-each>
- </table>
-
- <table width="100%"><tr><td>
- <a name="NVpackages"><h2>Packages</h2></a>
- </td><td align="right">
- [<a href="#NVsummary">summary</a>]
- [<a href="#NVpackages">packages</a>]
- [<a href="#NVcycles">cycles</a>]
- [<a href="#NVexplanations">explanations</a>]
- </td></tr></table>
-
- <xsl:for-each select="./Packages/Package">
- <xsl:if test="count(error) = 0">
- <h3><a><xsl:attribute name="name">PK<xsl:value-of select="@name"/></xsl:attribute>
- <xsl:value-of select="@name"/></a></h3>
-
- <table width="100%"><tr>
- <td><a href="#EXafferent">Afferent Couplings</a>: <xsl:value-of select="Stats/Ca"/></td>
- <td><a href="#EXefferent">Efferent Couplings</a>: <xsl:value-of select="Stats/Ce"/></td>
- <td><a href="#EXabstractness">Abstractness</a>: <xsl:value-of select="Stats/A"/></td>
- <td><a href="#EXinstability">Instability</a>: <xsl:value-of select="Stats/I"/></td>
- <td><a href="#EXdistance">Distance</a>: <xsl:value-of select="Stats/D"/></td>
- </tr></table>
-
- <table width="100%" class="details">
- <tr>
- <th>Abstract Classes</th>
- <th>Concrete Classes</th>
- <th>Used by Packages</th>
- <th>Uses Packages</th>
- </tr>
- <tr>
- <td valign="top" width="25%">
- <xsl:if test="count(AbstractClasses/Class)=0">
- <i>None</i>
- </xsl:if>
- <xsl:for-each select="AbstractClasses/Class">
- <xsl:value-of select="node()"/><br/>
- </xsl:for-each>
- </td>
- <td valign="top" width="25%">
- <xsl:if test="count(ConcreteClasses/Class)=0">
- <i>None</i>
- </xsl:if>
- <xsl:for-each select="ConcreteClasses/Class">
- <xsl:value-of select="node()"/><br/>
- </xsl:for-each>
- </td>
- <td valign="top" width="25%">
- <xsl:if test="count(UsedBy/Package)=0">
- <i>None</i>
- </xsl:if>
- <xsl:for-each select="UsedBy/Package">
- <a>
- <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute>
- <xsl:value-of select="node()"/>
- </a><br/>
- </xsl:for-each>
- </td>
- <td valign="top" width="25%">
- <xsl:if test="count(DependsUpon/Package)=0">
- <i>None</i>
- </xsl:if>
- <xsl:for-each select="DependsUpon/Package">
- <a>
- <xsl:attribute name="href">#PK<xsl:value-of select="node()"/></xsl:attribute>
- <xsl:value-of select="node()"/>
- </a><br/>
- </xsl:for-each>
- </td>
- </tr>
- </table>
- </xsl:if>
- </xsl:for-each>
-
- <table width="100%"><tr><td>
- <a name="NVcycles"><h2>Cycles</h2></a>
- </td><td align="right">
- [<a href="#NVsummary">summary</a>]
- [<a href="#NVpackages">packages</a>]
- [<a href="#NVcycles">cycles</a>]
- [<a href="#NVexplanations">explanations</a>]
- </td></tr></table>
-
- <xsl:if test="count(Cycles/Package) = 0">
- <p>There are no cyclic dependancies.</p>
- </xsl:if>
- <xsl:for-each select="Cycles/Package">
- <h3><xsl:value-of select="@Name"/></h3><p>
- <xsl:for-each select="Package">
- <xsl:value-of select="."/><br/>
- </xsl:for-each></p>
- </xsl:for-each>
-
- <table width="100%"><tr><td>
- <a name="NVexplanations"><h2>Explanations</h2></a>
- </td><td align="right">
- [<a href="#NVsummary">summary</a>]
- [<a href="#NVpackages">packages</a>]
- [<a href="#NVcycles">cycles</a>]
- [<a href="#NVexplanations">explanations</a>]
- </td></tr></table>
-
- <p>The following explanations are for quick reference and are lifted directly from the original <a href="http://www.clarkware.com/software/JDepend.html">JDepend documentation</a>.</p>
-
- <h3><a name="EXnumber">Number of Classes</a></h3>
- <p>The number of concrete and abstract classes (and interfaces) in the package is an indicator of the extensibility of the package.</p>
- <h3><a name="EXafferent">Afferent Couplings</a></h3>
- <p>The number of other packages that depend upon classes within the package is an indicator of the package's responsibility. </p>
- <h3><a name="EXefferent">Efferent Couplings</a></h3>
- <p>The number of other packages that the classes in the package depend upon is an indicator of the package's independence. </p>
- <h3><a name="EXabstractness">Abstractness</a></h3>
- <p>The ratio of the number of abstract classes (and interfaces) in the analyzed package to the total number of classes in the analyzed package. </p>
- <p>The range for this metric is 0 to 1, with A=0 indicating a completely concrete package and A=1 indicating a completely abstract package. </p>
- <h3><a name="EXinstability">Instability</a></h3>
- <p>The ratio of efferent coupling (Ce) to total coupling (Ce / (Ce + Ca)). This metric is an indicator of the package's resilience to change. </p>
- <p>The range for this metric is 0 to 1, with I=0 indicating a completely stable package and I=1 indicating a completely instable package. </p>
- <h3><a name="EXdistance">Distance</a></h3>
- <p>The perpendicular distance of a package from the idealized line A + I = 1. This metric is an indicator of the package's balance between abstractness and stability. </p>
- <p>A package squarely on the main sequence is optimally balanced with respect to its abstractness and stability. Ideal packages are either completely abstract and stable (x=0, y=1) or completely concrete and instable (x=1, y=0). </p>
- <p>The range for this metric is 0 to 1, with D=0 indicating a package that is coincident with the main sequence and D=1 indicating a package that is as far from the main sequence as possible. </p>
-
- </body>
- </html>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/build/tools/jakarta-ant-1.5.1/etc/junit-frames.xsl b/build/tools/jakarta-ant-1.5.1/etc/junit-frames.xsl
deleted file mode 100644
index 18ac51ef2..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/junit-frames.xsl
+++ /dev/null
@@ -1,741 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:lxslt="http://xml.apache.org/xslt"
- xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
- extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<xsl:decimal-format decimal-separator="." grouping-separator=","/>
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2001-2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-
-<!--
-
- Sample stylesheet to be used with An JUnitReport output.
-
- It creates a set of HTML files a la javadoc where you can browse easily
- through all packages and classes.
-
- @author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
- @author Erik Hatcher <a href="mailto:ehatcher@apache.org"/>
-
--->
-<xsl:param name="output.dir" select="'.'"/>
-
-
-<xsl:template match="testsuites">
- <!-- create the index.html -->
- <redirect:write file="{$output.dir}/index.html">
- <xsl:call-template name="index.html"/>
- </redirect:write>
-
- <!-- create the stylesheet.css -->
- <redirect:write file="{$output.dir}/stylesheet.css">
- <xsl:call-template name="stylesheet.css"/>
- </redirect:write>
-
- <!-- create the overview-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-summary.html">
- <xsl:apply-templates select="." mode="overview.packages"/>
- </redirect:write>
-
- <!-- create the all-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-frame.html">
- <xsl:apply-templates select="." mode="all.packages"/>
- </redirect:write>
-
- <!-- create the all-classes.html at the root -->
- <redirect:write file="{$output.dir}/allclasses-frame.html">
- <xsl:apply-templates select="." mode="all.classes"/>
- </redirect:write>
-
- <!-- process all packages -->
- <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
- <xsl:call-template name="package">
- <xsl:with-param name="name" select="@package"/>
- </xsl:call-template>
- </xsl:for-each>
-</xsl:template>
-
-
-<xsl:template name="package">
- <xsl:param name="name"/>
- <xsl:variable name="package.dir">
- <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if>
- <xsl:if test="$name = ''">.</xsl:if>
- </xsl:variable>
- <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> -->
- <!-- create a classes-list.html in the package directory -->
- <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
- <xsl:call-template name="classes.list">
- <xsl:with-param name="name" select="$name"/>
- </xsl:call-template>
- </redirect:write>
-
- <!-- create a package-summary.html in the package directory -->
- <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
- <xsl:call-template name="package.summary">
- <xsl:with-param name="name" select="$name"/>
- </xsl:call-template>
- </redirect:write>
-
- <!-- for each class, creates a @name.html -->
- <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
- <xsl:for-each select="/testsuites/testsuite[@package = $name]">
- <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
- <xsl:apply-templates select="." mode="class.details"/>
- </redirect:write>
- </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="index.html">
-<html>
- <head>
- <title>Unit Test Results.</title>
- </head>
- <frameset cols="20%,80%">
- <frameset rows="30%,70%">
- <frame src="overview-frame.html" name="packageListFrame"/>
- <frame src="allclasses-frame.html" name="classListFrame"/>
- </frameset>
- <frame src="overview-summary.html" name="classFrame"/>
- <noframes>
- <h2>Frame Alert</h2>
- <p>
- This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
- </p>
- </noframes>
- </frameset>
-</html>
-</xsl:template>
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
-body {
- font:normal 68% verdana,arial,helvetica;
- color:#000000;
-}
-table tr td, table tr th {
- font-size: 68%;
-}
-table.details tr th{
- font-weight: bold;
- text-align:left;
- background:#a6caf0;
-}
-table.details tr td{
- background:#eeeee0;
-}
-
-p {
- line-height:1.5em;
- margin-top:0.5em; margin-bottom:1.0em;
-}
-h1 {
- margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
-}
-h2 {
- margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
-}
-h3 {
- margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
-}
-h4 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-}
-h5 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-}
-h6 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
-}
-.Error {
- font-weight:bold; color:red;
-}
-.Failure {
- font-weight:bold; color:purple;
-}
-.Properties {
- text-align:right;
-}
-</xsl:template>
-
-
-<!-- ======================================================================
- This page is created for every testsuite class.
- It prints a summary of the testsuite and detailed information about
- testcase methods.
- ====================================================================== -->
-<xsl:template match="testsuite" mode="class.details">
- <xsl:variable name="package.name" select="@package"/>
- <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
- <html>
- <head>
- <title>Unit Test Results: <xsl:value-of select="$class.name"/></title>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="$package.name"/>
- </xsl:call-template>
- <script type="text/javascript" language="JavaScript">
- var TestCases = new Array();
- var cur;
- <xsl:apply-templates select="properties"/>
- </script>
- <script type="text/javascript" language="JavaScript"><![CDATA[
- function displayProperties (name) {
- var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
- var doc = win.document.open();
- doc.write("<html><head><title>Properties of " + name + "</title>");
- doc.write("<style type=\"text/css\">");
- doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
- doc.write("table tr td, table tr th { font-size: 68%; }");
- doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
- doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
- doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
- doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
- doc.write("</style>");
- doc.write("</head><body>");
- doc.write("<h3>Properties of " + name + "</h3>");
- doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
- doc.write("<table class='properties'>");
- doc.write("<tr><th>Name</th><th>Value</th></tr>");
- for (prop in TestCases[name]) {
- doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
- }
- doc.write("</table>");
- doc.write("</body></html>");
- doc.close();
- win.focus();
- }
- ]]>
- </script>
- </head>
- <body>
- <xsl:call-template name="pageHeader"/>
- <h3>Class <xsl:value-of select="$class.name"/></h3>
-
-
- <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testsuite.test.header"/>
- <xsl:apply-templates select="." mode="print.test"/>
- </table>
-
- <h2>Tests</h2>
- <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testcase.test.header"/>
- <!--
- test can even not be started at all (failure to load the class)
- so report the error directly
- -->
- <xsl:if test="./error">
- <tr class="Error">
- <td colspan="4"><xsl:apply-templates select="./error"/></td>
- </tr>
- </xsl:if>
- <xsl:apply-templates select="./testcase" mode="print.test"/>
- </table>
- <div class="Properties">
- <a>
- <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
- Properties &#187;
- </a>
- </div>
- </body>
- </html>
-</xsl:template>
-
- <!--
- Write properties into a JavaScript data structure.
- This is based on the original idea by Erik Hatcher (ehatcher@apache.org)
- -->
- <xsl:template match="properties">
- cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
- <xsl:for-each select="property">
- <xsl:sort select="@name"/>
- cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
- </xsl:for-each>
- </xsl:template>
-
-
-<!-- ======================================================================
- This page is created for every package.
- It prints the name of all classes that belongs to this package.
- @param name the package name to print classes.
- ====================================================================== -->
-<!-- list of classes in a package -->
-<xsl:template name="classes.list">
- <xsl:param name="name"/>
- <html>
- <head>
- <title>Unit Test Classes: <xsl:value-of select="$name"/></title>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="$name"/>
- </xsl:call-template>
- </head>
- <body>
- <table width="100%">
- <tr>
- <td nowrap="nowrap">
- <h2><a href="package-summary.html" target="classFrame"><xsl:value-of select="$name"/></a></h2>
- </td>
- </tr>
- </table>
-
- <h2>Classes</h2>
- <table width="100%">
- <xsl:for-each select="/testsuites/testsuite[./@package = $name]">
- <xsl:sort select="@name"/>
- <tr>
- <td nowrap="nowrap">
- <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </body>
- </html>
-</xsl:template>
-
-
-<!--
- Creates an all-classes.html file that contains a link to all package-summary.html
- on each class.
--->
-<xsl:template match="testsuites" mode="all.classes">
- <html>
- <head>
- <title>All Unit Test Classes</title>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name"/>
- </xsl:call-template>
- </head>
- <body>
- <h2>Classes</h2>
- <table width="100%">
- <xsl:apply-templates select="testsuite" mode="all.classes">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="testsuite" mode="all.classes">
- <xsl:variable name="package.name" select="@package"/>
- <tr>
- <td nowrap="nowrap">
- <a target="classFrame">
- <xsl:attribute name="href">
- <xsl:if test="not($package.name='')">
- <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
- </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="@name"/>
- </a>
- </td>
- </tr>
-</xsl:template>
-
-
-<!--
- Creates an html file that contains a link to all package-summary.html files on
- each package existing on testsuites.
- @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="testsuites" mode="all.packages">
- <html>
- <head>
- <title>All Unit Test Packages</title>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name"/>
- </xsl:call-template>
- </head>
- <body>
- <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
- <h2>Packages</h2>
- <table width="100%">
- <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages">
- <xsl:sort select="@package"/>
- </xsl:apply-templates>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="testsuite" mode="all.packages">
- <tr>
- <td nowrap="nowrap">
- <a href="{translate(@package,'.','/')}/package-summary.html" target="classFrame">
- <xsl:value-of select="@package"/>
- </a>
- </td>
- </tr>
-</xsl:template>
-
-
-<xsl:template match="testsuites" mode="overview.packages">
- <html>
- <head>
- <title>Unit Test Results: Summary</title>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name"/>
- </xsl:call-template>
- </head>
- <body>
- <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
- <xsl:call-template name="pageHeader"/>
- <h2>Summary</h2>
- <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
- <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
- <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
- <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
- <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
- <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <tr valign="top">
- <th>Tests</th>
- <th>Failures</th>
- <th>Errors</th>
- <th>Success rate</th>
- <th>Time</th>
- </tr>
- <tr valign="top">
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
- <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
- <xsl:otherwise>Pass</xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td><xsl:value-of select="$testCount"/></td>
- <td><xsl:value-of select="$failureCount"/></td>
- <td><xsl:value-of select="$errorCount"/></td>
- <td>
- <xsl:call-template name="display-percent">
- <xsl:with-param name="value" select="$successRate"/>
- </xsl:call-template>
- </td>
- <td>
- <xsl:call-template name="display-time">
- <xsl:with-param name="value" select="$timeCount"/>
- </xsl:call-template>
- </td>
-
- </tr>
- </table>
- <table border="0" width="95%">
- <tr>
- <td style="text-align: justify;">
- Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated.
- </td>
- </tr>
- </table>
-
- <h2>Packages</h2>
- <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testsuite.test.header"/>
- <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
- <xsl:sort select="@package" order="ascending"/>
- <!-- get the node set containing all testsuites that have the same package -->
- <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/>
- <tr valign="top">
- <!-- display a failure if there is any failure/error in the package -->
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="sum($insamepackage/@errors) &gt; 0">Error</xsl:when>
- <xsl:when test="sum($insamepackage/@failures) &gt; 0">Failure</xsl:when>
- <xsl:otherwise>Pass</xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td><a href="{translate(@package,'.','/')}/package-summary.html"><xsl:value-of select="@package"/></a></td>
- <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
- <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
- <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
- <td>
- <xsl:call-template name="display-time">
- <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
- </xsl:call-template>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </body>
- </html>
-</xsl:template>
-
-
-<xsl:template name="package.summary">
- <xsl:param name="name"/>
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="$name"/>
- </xsl:call-template>
- </head>
- <body>
- <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
- <xsl:call-template name="pageHeader"/>
- <h3>Package <xsl:value-of select="$name"/></h3>
-
- <!--table border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="class.metrics.header"/>
- <xsl:apply-templates select="." mode="print.metrics"/>
- </table-->
-
- <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/>
- <xsl:if test="count($insamepackage) &gt; 0">
- <h2>Classes</h2>
- <p>
- <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testsuite.test.header"/>
- <xsl:apply-templates select="$insamepackage" mode="print.test">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </p>
- </xsl:if>
- </body>
- </html>
-</xsl:template>
-
-
-<!--
- transform string like a.b.c to ../../../
- @param path the path to transform into a descending directory path
--->
-<xsl:template name="path">
- <xsl:param name="path"/>
- <xsl:if test="contains($path,'.')">
- <xsl:text>../</xsl:text>
- <xsl:call-template name="path">
- <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
- </xsl:call-template>
- </xsl:if>
- <xsl:if test="not(contains($path,'.')) and not($path = '')">
- <xsl:text>../</xsl:text>
- </xsl:if>
-</xsl:template>
-
-
-<!-- create the link to the stylesheet based on the package name -->
-<xsl:template name="create.stylesheet.link">
- <xsl:param name="package.name"/>
- <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link>
-</xsl:template>
-
-
-<!-- Page HEADER -->
-<xsl:template name="pageHeader">
- <h1>Unit Test Results</h1>
- <table width="100%">
- <tr>
- <td align="left"></td>
- <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://jakarta.apache.org/">Ant</a>.</td>
- </tr>
- </table>
- <hr size="1"/>
-</xsl:template>
-
-<!-- class header -->
-<xsl:template name="testsuite.test.header">
- <tr valign="top">
- <th width="80%">Name</th>
- <th>Tests</th>
- <th>Errors</th>
- <th>Failures</th>
- <th nowrap="nowrap">Time(s)</th>
- </tr>
-</xsl:template>
-
-<!-- method header -->
-<xsl:template name="testcase.test.header">
- <tr valign="top">
- <th>Name</th>
- <th>Status</th>
- <th width="80%">Type</th>
- <th nowrap="nowrap">Time(s)</th>
- </tr>
-</xsl:template>
-
-
-<!-- class information -->
-<xsl:template match="testsuite" mode="print.test">
- <tr valign="top">
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
- <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
- <xsl:otherwise>Pass</xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
- <td><xsl:apply-templates select="@tests"/></td>
- <td><xsl:apply-templates select="@errors"/></td>
- <td><xsl:apply-templates select="@failures"/></td>
- <td><xsl:call-template name="display-time">
- <xsl:with-param name="value" select="@time"/>
- </xsl:call-template>
- </td>
- </tr>
-</xsl:template>
-
-<xsl:template match="testcase" mode="print.test">
- <tr valign="top">
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="error">Error</xsl:when>
- <xsl:when test="failure">Failure</xsl:when>
- <xsl:otherwise>TableRowColor</xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <td><xsl:value-of select="@name"/></td>
- <xsl:choose>
- <xsl:when test="failure">
- <td>Failure</td>
- <td><xsl:apply-templates select="failure"/></td>
- </xsl:when>
- <xsl:when test="error">
- <td>Error</td>
- <td><xsl:apply-templates select="error"/></td>
- </xsl:when>
- <xsl:otherwise>
- <td>Success</td>
- <td></td>
- </xsl:otherwise>
- </xsl:choose>
- <td>
- <xsl:call-template name="display-time">
- <xsl:with-param name="value" select="@time"/>
- </xsl:call-template>
- </td>
- </tr>
-</xsl:template>
-
-
-<!-- Note : the below template error and failure are the same style
- so just call the same style store in the toolkit template -->
-<xsl:template match="failure">
- <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<xsl:template match="error">
- <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<!-- Style for the error and failure in the testcase template -->
-<xsl:template name="display-failures">
- <xsl:choose>
- <xsl:when test="not(@message)">N/A</xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@message"/>
- </xsl:otherwise>
- </xsl:choose>
- <!-- display the stacktrace -->
- <br/><br/>
- <code>
- <xsl:call-template name="br-replace">
- <xsl:with-param name="word" select="."/>
- </xsl:call-template>
- </code>
- <!-- the latter is better but might be problematic for non-21" monitors... -->
- <!--pre><xsl:value-of select="."/></pre-->
-</xsl:template>
-
-<xsl:template name="JS-escape">
- <xsl:param name="string"/>
- <xsl:choose>
- <xsl:when test="contains($string,&quot;'&quot;)">
- <xsl:value-of select="substring-before($string,&quot;'&quot;)"/>\&apos;<xsl:call-template name="JS-escape">
- <xsl:with-param name="string" select="substring-after($string,&quot;'&quot;)"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:when test="contains($string,'\')">
- <xsl:value-of select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">
- <xsl:with-param name="string" select="substring-after($string,'\')"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$string"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-
-<!--
- template that will convert a carriage return into a br tag
- @param word the text from which to convert CR to BR tag
--->
-<xsl:template name="br-replace">
- <xsl:param name="word"/>
- <xsl:choose>
- <xsl:when test="contains($word,'&#xA;')">
- <xsl:value-of select="substring-before($word,'&#xA;')"/>
- <br/>
- <xsl:call-template name="br-replace">
- <xsl:with-param name="word" select="substring-after($word,'&#xA;')"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$word"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template name="display-time">
- <xsl:param name="value"/>
- <xsl:value-of select="format-number($value,'0.000')"/>
-</xsl:template>
-
-<xsl:template name="display-percent">
- <xsl:param name="value"/>
- <xsl:value-of select="format-number($value,'0.00%')"/>
-</xsl:template>
-</xsl:stylesheet>
-
diff --git a/build/tools/jakarta-ant-1.5.1/etc/junit-noframes.xsl b/build/tools/jakarta-ant-1.5.1/etc/junit-noframes.xsl
deleted file mode 100644
index 7364e493c..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/junit-noframes.xsl
+++ /dev/null
@@ -1,519 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"
- doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2001-2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-
-<!--
-
- Sample stylesheet to be used with An JUnitReport output.
-
- It creates a non-framed report that can be useful to send via
- e-mail or such.
-
- @author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
- @author Erik Hatcher <a href="mailto:ehatcher@apache.org"/>
-
--->
-<xsl:template match="testsuites">
- <html>
- <head>
- <title>Unit Test Results</title>
- <style type="text/css">
- body {
- font:normal 68% verdana,arial,helvetica;
- color:#000000;
- }
- table tr td, table tr th {
- font-size: 68%;
- }
- table.details tr th{
- font-weight: bold;
- text-align:left;
- background:#a6caf0;
- }
- table.details tr td{
- background:#eeeee0;
- }
-
- p {
- line-height:1.5em;
- margin-top:0.5em; margin-bottom:1.0em;
- }
- h1 {
- margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
- }
- h2 {
- margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
- }
- h3 {
- margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
- }
- h4 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
- }
- h5 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
- }
- h6 {
- margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
- }
- .Error {
- font-weight:bold; color:red;
- }
- .Failure {
- font-weight:bold; color:purple;
- }
- .Properties {
- text-align:right;
- }
- </style>
- <script type="text/javascript" language="JavaScript">
- var TestCases = new Array();
- var cur;
- <xsl:for-each select="./testsuite">
- <xsl:apply-templates select="properties"/>
- </xsl:for-each>
-
- </script>
- <script type="text/javascript" language="JavaScript"><![CDATA[
- function displayProperties (name) {
- var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
- var doc = win.document.open();
- doc.write("<html><head><title>Properties of " + name + "</title>");
- doc.write("<style>")
- doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
- doc.write("table tr td, table tr th { font-size: 68%; }");
- doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
- doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
- doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
- doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
- doc.write("</style>");
- doc.write("</head><body>");
- doc.write("<h3>Properties of " + name + "</h3>");
- doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
- doc.write("<table class='properties'>");
- doc.write("<tr><th>Name</th><th>Value</th></tr>");
- for (prop in TestCases[name]) {
- doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
- }
- doc.write("</table>");
- doc.write("</body></html>");
- doc.close();
- win.focus();
- }
- ]]>
- </script>
- </head>
- <body>
- <a name="top"></a>
- <xsl:call-template name="pageHeader"/>
-
- <!-- Summary part -->
- <xsl:call-template name="summary"/>
- <hr size="1" width="95%" align="left"/>
-
- <!-- Package List part -->
- <xsl:call-template name="packagelist"/>
- <hr size="1" width="95%" align="left"/>
-
- <!-- For each package create its part -->
- <xsl:call-template name="packages"/>
- <hr size="1" width="95%" align="left"/>
-
- <!-- For each class create the part -->
- <xsl:call-template name="classes"/>
-
- </body>
- </html>
-</xsl:template>
-
-
-
- <!-- ================================================================== -->
- <!-- Write a list of all packages with an hyperlink to the anchor of -->
- <!-- of the package name. -->
- <!-- ================================================================== -->
- <xsl:template name="packagelist">
- <h2>Packages</h2>
- Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
- <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testsuite.test.header"/>
- <!-- list all packages recursively -->
- <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
- <xsl:sort select="@package"/>
- <xsl:variable name="testsuites-in-package" select="/testsuites/testsuite[./@package = current()/@package]"/>
- <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/>
- <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>
- <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>
- <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>
-
- <!-- write a summary for the package -->
- <tr valign="top">
- <!-- set a nice color depending if there is an error/failure -->
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
- <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
- </xsl:choose>
- </xsl:attribute>
- <td><a href="#{@package}"><xsl:value-of select="@package"/></a></td>
- <td><xsl:value-of select="$testCount"/></td>
- <td><xsl:value-of select="$errorCount"/></td>
- <td><xsl:value-of select="$failureCount"/></td>
- <td>
- <xsl:call-template name="display-time">
- <xsl:with-param name="value" select="$timeCount"/>
- </xsl:call-template>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </xsl:template>
-
-
- <!-- ================================================================== -->
- <!-- Write a package level report -->
- <!-- It creates a table with values from the document: -->
- <!-- Name | Tests | Errors | Failures | Time -->
- <!-- ================================================================== -->
- <xsl:template name="packages">
- <!-- create an anchor to this package name -->
- <xsl:for-each select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
- <xsl:sort select="@package"/>
- <a name="{@package}"></a>
- <h3>Package <xsl:value-of select="@package"/></h3>
-
- <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testsuite.test.header"/>
-
- <!-- match the testsuites of this package -->
- <xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/>
- </table>
- <a href="#top">Back to top</a>
- <p/>
- <p/>
- </xsl:for-each>
- </xsl:template>
-
- <xsl:template name="classes">
- <xsl:for-each select="testsuite">
- <xsl:sort select="@name"/>
- <!-- create an anchor to this class name -->
- <a name="{@name}"></a>
- <h3>TestCase <xsl:value-of select="@name"/></h3>
-
- <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testcase.test.header"/>
- <!--
- test can even not be started at all (failure to load the class)
- so report the error directly
- -->
- <xsl:if test="./error">
- <tr class="Error">
- <td colspan="4"><xsl:apply-templates select="./error"/></td>
- </tr>
- </xsl:if>
- <xsl:apply-templates select="./testcase" mode="print.test"/>
- </table>
- <div class="Properties">
- <a>
- <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
- Properties &#187;
- </a>
- </div>
- <p/>
-
- <a href="#top">Back to top</a>
- </xsl:for-each>
- </xsl:template>
-
- <xsl:template name="summary">
- <h2>Summary</h2>
- <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
- <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
- <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
- <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
- <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
- <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <tr valign="top">
- <th>Tests</th>
- <th>Failures</th>
- <th>Errors</th>
- <th>Success rate</th>
- <th>Time</th>
- </tr>
- <tr valign="top">
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
- <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
- </xsl:choose>
- </xsl:attribute>
- <td><xsl:value-of select="$testCount"/></td>
- <td><xsl:value-of select="$failureCount"/></td>
- <td><xsl:value-of select="$errorCount"/></td>
- <td>
- <xsl:call-template name="display-percent">
- <xsl:with-param name="value" select="$successRate"/>
- </xsl:call-template>
- </td>
- <td>
- <xsl:call-template name="display-time">
- <xsl:with-param name="value" select="$timeCount"/>
- </xsl:call-template>
- </td>
-
- </tr>
- </table>
- <table border="0" width="95%">
- <tr>
- <td style="text-align: justify;">
- Note: <i>failures</i> are anticipated and checked for with assertions while <i>errors</i> are unanticipated.
- </td>
- </tr>
- </table>
- </xsl:template>
-
- <!--
- Write properties into a JavaScript data structure.
- This is based on the original idea by Erik Hatcher (ehatcher@apache.org)
- -->
- <xsl:template match="properties">
- cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
- <xsl:for-each select="property">
- <xsl:sort select="@name"/>
- cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
- </xsl:for-each>
- </xsl:template>
-
-<!-- Page HEADER -->
-<xsl:template name="pageHeader">
- <h1>Unit Test Results</h1>
- <table width="100%">
- <tr>
- <td align="left"></td>
- <td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://jakarta.apache.org/ant'>Ant</a>.</td>
- </tr>
- </table>
- <hr size="1"/>
-</xsl:template>
-
-<xsl:template match="testsuite" mode="header">
- <tr valign="top">
- <th width="80%">Name</th>
- <th>Tests</th>
- <th>Errors</th>
- <th>Failures</th>
- <th nowrap="nowrap">Time(s)</th>
- </tr>
-</xsl:template>
-
-<!-- class header -->
-<xsl:template name="testsuite.test.header">
- <tr valign="top">
- <th width="80%">Name</th>
- <th>Tests</th>
- <th>Errors</th>
- <th>Failures</th>
- <th nowrap="nowrap">Time(s)</th>
- </tr>
-</xsl:template>
-
-<!-- method header -->
-<xsl:template name="testcase.test.header">
- <tr valign="top">
- <th>Name</th>
- <th>Status</th>
- <th width="80%">Type</th>
- <th nowrap="nowrap">Time(s)</th>
- </tr>
-</xsl:template>
-
-
-<!-- class information -->
-<xsl:template match="testsuite" mode="print.test">
- <tr valign="top">
- <!-- set a nice color depending if there is an error/failure -->
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
- <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
- </xsl:choose>
- </xsl:attribute>
-
- <!-- print testsuite information -->
- <td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>
- <td><xsl:value-of select="@tests"/></td>
- <td><xsl:value-of select="@errors"/></td>
- <td><xsl:value-of select="@failures"/></td>
- <td>
- <xsl:call-template name="display-time">
- <xsl:with-param name="value" select="@time"/>
- </xsl:call-template>
- </td>
- </tr>
-</xsl:template>
-
-<xsl:template match="testcase" mode="print.test">
- <tr valign="top">
- <xsl:attribute name="class">
- <xsl:choose>
- <xsl:when test="failure | error">Error</xsl:when>
- </xsl:choose>
- </xsl:attribute>
- <td><xsl:value-of select="@name"/></td>
- <xsl:choose>
- <xsl:when test="failure">
- <td>Failure</td>
- <td><xsl:apply-templates select="failure"/></td>
- </xsl:when>
- <xsl:when test="error">
- <td>Error</td>
- <td><xsl:apply-templates select="error"/></td>
- </xsl:when>
- <xsl:otherwise>
- <td>Success</td>
- <td></td>
- </xsl:otherwise>
- </xsl:choose>
- <td>
- <xsl:call-template name="display-time">
- <xsl:with-param name="value" select="@time"/>
- </xsl:call-template>
- </td>
- </tr>
-</xsl:template>
-
-
-<xsl:template match="failure">
- <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<xsl:template match="error">
- <xsl:call-template name="display-failures"/>
-</xsl:template>
-
-<!-- Style for the error and failure in the tescase template -->
-<xsl:template name="display-failures">
- <xsl:choose>
- <xsl:when test="not(@message)">N/A</xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@message"/>
- </xsl:otherwise>
- </xsl:choose>
- <!-- display the stacktrace -->
- <code>
- <br/><br/>
- <xsl:call-template name="br-replace">
- <xsl:with-param name="word" select="."/>
- </xsl:call-template>
- </code>
- <!-- the later is better but might be problematic for non-21" monitors... -->
- <!--pre><xsl:value-of select="."/></pre-->
-</xsl:template>
-
-<xsl:template name="JS-escape">
- <xsl:param name="string"/>
- <xsl:choose>
- <xsl:when test="contains($string,&quot;'&quot;)">
- <xsl:value-of select="substring-before($string,&quot;'&quot;)"/>\&apos;<xsl:call-template name="JS-escape">
- <xsl:with-param name="string" select="substring-after($string,&quot;'&quot;)"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:when test="contains($string,'\')">
- <xsl:value-of select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">
- <xsl:with-param name="string" select="substring-after($string,'\')"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$string"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-
-<!--
- template that will convert a carriage return into a br tag
- @param word the text from which to convert CR to BR tag
--->
-<xsl:template name="br-replace">
- <xsl:param name="word"/>
- <xsl:choose>
- <xsl:when test="contains($word,'&#xA;')">
- <xsl:value-of select="substring-before($word,'&#xA;')"/>
- <br/>
- <xsl:call-template name="br-replace">
- <xsl:with-param name="word" select="substring-after($word,'&#xA;')"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$word"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template name="display-time">
- <xsl:param name="value"/>
- <xsl:value-of select="format-number($value,'0.000')"/>
-</xsl:template>
-
-<xsl:template name="display-percent">
- <xsl:param name="value"/>
- <xsl:value-of select="format-number($value,'0.00%')"/>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/build/tools/jakarta-ant-1.5.1/etc/log.xsl b/build/tools/jakarta-ant-1.5.1/etc/log.xsl
deleted file mode 100644
index 744736c06..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/log.xsl
+++ /dev/null
@@ -1,247 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-
-<!--
-
- The purpose have this XSL is to provide a nice way to look at the output
- from the Ant XmlLogger (ie: ant -listener org.apache.tools.ant.XmlLogger )
-
- @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
-
--->
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-
-<xsl:template match="/">
-<html>
- <head>
- <style type="text/css">
- .bannercell {
- border: 0px;
- padding: 0px;
- }
- body {
- margin: 0;
- font:normal 100% arial,helvetica,sanserif;
- background-color:#FFFFFF;
- color:#000000;
- }
- table.status {
- font:bold 80% arial,helvetica,sanserif;
- background-color:#525D76;
- color:#ffffff;
- }
- table.log tr td, tr th {
- font-size: 80%;
- }
- .error {
- color:red;
- }
- .warn {
- color:brown;
- }
- .info {
- color:gray;
- }
- .debug{
- color:gray;
- }
- .failed {
- font-size:80%;
- background-color: red;
- color:#FFFFFF;
- font-weight: bold
- }
- .complete {
- font-size:80%;
- background-color: #525D76;
- color:#FFFFFF;
- font-weight: bold
- }
- .a td {
- background: #efefef;
- }
- .b td {
- background: #fff;
- }
- th, td {
- text-align: left;
- vertical-align: top;
- }
- th {
- background: #ccc;
- color: black;
- }
- table, th, td {
- border: none
- }
- h3 {
- font:bold 80% arial,helvetica,sanserif;
- background: #525D76;
- color: white;
- text-decoration: none;
- padding: 5px;
- margin-right: 2px;
- margin-left: 2px;
- margin-bottom: 0;
- }
- </style>
- </head>
- <body>
- <!-- jakarta logo -->
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td valign="top" class="bannercell">
- <a href="http://jakarta.apache.org/">
- <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
- </a>
- </td>
- <td style="text-align:right;vertical-align:bottom">
- <a href="htp://jakarta.apache.org/ant">Jakarta Ant</a>
- </td>
- </tr>
- </table>
-
- <table border="0" width="100%">
- <tr><td><hr noshade="yes" size="1"/></td></tr>
- </table>
-
- <xsl:apply-templates select="build"/>
-
- <!-- FOOTER -->
- <table width="100%">
- <tr><td><hr noshade="yes" size="1"/></td></tr>
- <tr><td>
- <div align="center"><font color="#525D76" size="-1"><em>
- Copyright &#169; 2000-2002, Apache Software Foundation
- </em></font></div>
- </td></tr>
- </table>
- </body>
-</html>
-</xsl:template>
-
-<xsl:template match="build">
- <!-- build status -->
- <table width="100%">
- <xsl:attribute name="class">
- <xsl:if test="@error">failed</xsl:if>
- <xsl:if test="not(@error)">complete</xsl:if>
- </xsl:attribute>
- <tr>
- <xsl:if test="@error">
- <td nowrap="yes">Build Failed</td>
- </xsl:if>
- <xsl:if test="not(@error)">
- <td nowrap="yes">Build Complete</td>
- </xsl:if>
- <td style="text-align:right" nowrap="yes">Total Time: <xsl:value-of select="@time"/></td>
- </tr>
- <tr>
- <td colspan="2">
- <xsl:if test="@error">
- <tt><xsl:value-of select="@error"/></tt><br/>
- <i style="font-size:80%">See the <a href="#stacktrace" alt="Click for details">stacktrace</a>.</i>
- </xsl:if>
- </td>
- </tr>
- </table>
- <table border="1" cellspacing="2" cellpadding="3" width="100%" style="font-size:80%">
- <tr class="a"><td width="1">ant.file</td><td><xsl:value-of select="substring-after(message[contains(text(),'ant.file')], '->')"/></td></tr>
- <tr class="b"><td width="1">ant.version</td><td><xsl:value-of select="substring-after(message[contains(text(),'ant.version')], '->')"/></td></tr>
- <tr class="a"><td width="1">java.version</td><td><xsl:value-of select="substring-after(message[contains(text(),'java.vm.version')], '->')"/></td></tr>
- <tr class="b"><td width="1">os.name</td><td><xsl:value-of select="substring-after(message[contains(text(),'os.name')], '->')"/></td></tr>
- </table>
- <!-- build information -->
- <h3>Build events</h3>
- <table class="log" border="1" cellspacing="2" cellpadding="3" width="100%">
- <tr>
- <th nowrap="yes" align="left" width="1%">target</th>
- <th nowrap="yes" align="left" width="1%">task</th>
- <th nowrap="yes" align="left">message</th>
- </tr>
- <xsl:apply-templates select=".//message[@priority != 'debug']"/>
- </table>
- <p>
- <!-- stacktrace -->
- <xsl:if test="stacktrace">
- <a name="stacktrace"/>
- <h3>Error details</h3>
- <table width="100%">
- <tr><td>
- <pre><xsl:value-of select="stacktrace"/></pre>
- </td></tr>
- </table>
- </xsl:if>
- </p>
-</xsl:template>
-
-<!-- report every message but those with debug priority -->
-<xsl:template match="message[@priority!='debug']">
- <tr valign="top">
- <!-- alternated row style -->
- <xsl:attribute name="class">
- <xsl:if test="position() mod 2 = 1">a</xsl:if>
- <xsl:if test="position() mod 2 = 0">b</xsl:if>
- </xsl:attribute>
- <td nowrap="yes" width="1%"><xsl:value-of select="../../@name"/></td>
- <td nowrap="yes" style="text-align:right" width="1%">[ <xsl:value-of select="../@name"/> ]</td>
- <td class="{@priority}" nowrap="yes">
- <xsl:value-of select="text()"/>
- </td>
- </tr>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/build/tools/jakarta-ant-1.5.1/etc/maudit-frames.xsl b/build/tools/jakarta-ant-1.5.1/etc/maudit-frames.xsl
deleted file mode 100644
index 476f65e7a..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/maudit-frames.xsl
+++ /dev/null
@@ -1,547 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:lxslt="http://xml.apache.org/xslt"
- xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
- extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2001-2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-<!--
-
- Stylesheet to transform an XML file generated by the Ant MAudit task into
- a set of JavaDoc-like HTML page to make pages more convenient to be browsed.
-
- It use the Xalan redirect extension to write to multiple output files.
-
- @author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
--->
-
-<xsl:param name="output.dir" select="'.'"/>
-
-
-<xsl:template match="classes">
- <!-- create the index.html -->
- <redirect:write file="{$output.dir}/index.html">
- <xsl:call-template name="index.html"/>
- </redirect:write>
-
- <!-- create the stylesheet.css -->
- <redirect:write file="{$output.dir}/stylesheet.css">
- <xsl:call-template name="stylesheet.css"/>
- </redirect:write>
-
- <!-- create the overview-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-summary.html">
- <xsl:apply-templates select="." mode="overview.packages"/>
- </redirect:write>
-
- <!-- create the all-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-frame.html">
- <xsl:apply-templates select="." mode="all.packages"/>
- </redirect:write>
-
- <!-- create the all-classes.html at the root -->
- <redirect:write file="{$output.dir}/allclasses-frame.html">
- <xsl:apply-templates select="." mode="all.classes"/>
- </redirect:write>
-
- <!-- process all packages -->
- <xsl:for-each select="./class[not(./@package = preceding-sibling::class/@package)]">
- <xsl:call-template name="package">
- <xsl:with-param name="name" select="@package"/>
- </xsl:call-template>
- </xsl:for-each>
-</xsl:template>
-
-
-<xsl:template name="package">
- <xsl:param name="name"/>
- <xsl:variable name="package.dir">
- <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if>
- <xsl:if test="$name = ''">.</xsl:if>
- </xsl:variable>
- <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> -->
- <!-- create a classes-list.html in the package directory -->
- <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
- <xsl:call-template name="classes.list">
- <xsl:with-param name="name" select="$name"/>
- </xsl:call-template>
- </redirect:write>
-
- <!-- create a package-summary.html in the package directory -->
- <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
- <xsl:call-template name="package.summary">
- <xsl:with-param name="name" select="$name"/>
- </xsl:call-template>
- </redirect:write>
-
- <!-- for each class, creates a @name.html -->
- <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
- <xsl:for-each select="/classes/class[@package = $name]">
- <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
- <xsl:apply-templates select="." mode="class.details"/>
- </redirect:write>
- </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="index.html">
-<HTML>
- <HEAD><TITLE>Audit Results.</TITLE></HEAD>
- <FRAMESET cols="20%,80%">
- <FRAMESET rows="30%,70%">
- <FRAME src="overview-frame.html" name="packageListFrame"/>
- <FRAME src="allclasses-frame.html" name="classListFrame"/>
- </FRAMESET>
- <FRAME src="overview-summary.html" name="classFrame"/>
- </FRAMESET>
- <noframes>
- <H2>Frame Alert</H2>
- <P>
- This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
- </P>
- </noframes>
-</HTML>
-</xsl:template>
-
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
- .bannercell {
- border: 0px;
- padding: 0px;
- }
- body {
- margin-left: 10;
- margin-right: 10;
- font:normal 80% arial,helvetica,sanserif;
- background-color:#FFFFFF;
- color:#000000;
- }
- .a td {
- background: #efefef;
- }
- .b td {
- background: #fff;
- }
- th, td {
- text-align: left;
- vertical-align: top;
- }
- th {
- font-weight:bold;
- background: #ccc;
- color: black;
- }
- table, th, td {
- font-size:100%;
- border: none
- }
- table.log tr td, tr th {
-
- }
- h2 {
- font-weight:bold;
- font-size:140%;
- margin-bottom: 5;
- }
- h3 {
- font-size:100%;
- font-weight:bold;
- background: #525D76;
- color: white;
- text-decoration: none;
- padding: 5px;
- margin-right: 2px;
- margin-left: 2px;
- margin-bottom: 0;
- }
-</xsl:template>
-
-
-<!-- print the violations of the class -->
-<xsl:template match="class" mode="class.details">
- <xsl:variable name="package.name" select="@package"/>
- <HTML>
- <HEAD>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="$package.name"/>
- </xsl:call-template>
- </HEAD>
- <BODY>
- <xsl:call-template name="pageHeader"/>
- <H3>Class <xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3>
-
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="class.audit.header"/>
- <xsl:apply-templates select="." mode="print.audit"/>
- </table>
-
- <H3>Violations</H3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="violation.audit.header"/>
- <xsl:apply-templates select="./violation" mode="print.audit">
- <xsl:sort data-type="number" select="@line"/>
- </xsl:apply-templates>
- </table>
- <xsl:call-template name="pageFooter"/>
- </BODY>
- </HTML>
-</xsl:template>
-
-
-<!-- list of classes in a package -->
-<xsl:template name="classes.list">
- <xsl:param name="name"/>
- <HTML>
- <HEAD>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="$name"/>
- </xsl:call-template>
- </HEAD>
- <BODY>
- <table width="100%">
- <tr>
- <td nowrap="nowrap">
- <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="$name"/></a></H2>
- </td>
- </tr>
- </table>
-
- <h2>Classes</h2>
- <TABLE WIDTH="100%">
- <xsl:apply-templates select="/classes/class[./@package = $name]" mode="classes.list">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </TABLE>
- </BODY>
- </HTML>
-</xsl:template>
-<!-- the class to list -->
-<xsl:template match="class" mode="classes.list">
- <tr>
- <td nowrap="nowrap">
- <!-- @bug naming to fix for inner classes -->
- <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
- </td>
- </tr>
-</xsl:template>
-
-
-<!--
- Creates an all-classes.html file that contains a link to all package-summary.html
- on each class.
--->
-<xsl:template match="classes" mode="all.classes">
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name"/>
- </xsl:call-template>
- </head>
- <body>
- <h2>Classes</h2>
- <table width="100%">
- <xsl:apply-templates select=".//class" mode="all.classes">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="class" mode="all.classes">
- <!-- (ancestor::package)[last()] is buggy in MSXML3 ? -->
- <xsl:variable name="package.name" select="@package"/>
- <tr>
- <td nowrap="nowrap">
- <a target="classFrame">
- <xsl:attribute name="href">
- <xsl:if test="not($package.name='')">
- <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
- </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="@name"/>
- </a>
- </td>
- </tr>
-</xsl:template>
-
-
-<!--
- Creates an html file that contains a link to all package-summary.html files on
- each package existing on testsuites.
- @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="classes" mode="all.packages">
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name"/>
- </xsl:call-template>
- </head>
- <body>
- <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
- <h2>Packages</h2>
- <table width="100%">
- <xsl:apply-templates select="class[not(./@package = preceding-sibling::class/@package)]" mode="all.packages">
- <xsl:sort select="@package" order="ascending"/>
- </xsl:apply-templates>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="class" mode="all.packages">
- <tr>
- <td nowrap="nowrap">
- <a href="{translate(@package,'.','/')}/package-summary.html" target="classFrame">
- <xsl:value-of select="@package"/>
- </a>
- </td>
- </tr>
-</xsl:template>
-
-
-<xsl:template match="classes" mode="overview.packages">
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name"/>
- </xsl:call-template>
- </head>
- <body onload="open('allclasses-frame.html','classListFrame')">
- <xsl:call-template name="pageHeader"/>
- <h3>Summary</h3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Audited classes</th>
- <th>Reported classes</th>
- <th>Violations</th>
- </tr>
- <tr class="a">
- <td><xsl:value-of select="@audited"/></td>
- <td><xsl:value-of select="@reported"/></td>
- <td><xsl:value-of select="@violations"/></td>
- </tr>
- </table>
- <table border="0" width="100%">
- <tr>
- <td style="text-align: justify;">
- Note: Rules checked have originated from style guidelines suggested by the language designers,
- experience from the Java development community and insite experience. Violations are generally
- reported with a reference to the <a href="http://java.sun.com/docs/books/jls/second_edition/html/jTOC.doc.html">Java Language Specifications</a> (JLS x.x.x)
- and Metamata Audit rules (x.x).
- Please consult these documents for additional information about violations.
- <p/>
- Rules checked also enforce adherence to <a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Sun Java coding guidelines</a> in use at Jakarta.
- <p/>
- One should note that these violations do not necessary underline errors but should be used
- as an indication for <i>possible</i> errors. As always, use your best judgment and review
- them carefully, it might save you hours of debugging.
- </td>
- </tr>
- </table>
-
- <h3>Packages</h3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="class.audit.header"/>
- <xsl:for-each select="class[not(./@package = preceding-sibling::class/@package)]">
- <xsl:sort select="@package" order="ascending"/>
- <tr>
- <xsl:call-template name="alternate-row"/>
- <td><a href="{translate(@package,'.','/')}/package-summary.html"><xsl:value-of select="@package"/></a></td>
- <td><xsl:value-of select="sum(/classes/class[./@package = current()/@package]/@violations)"/></td>
- </tr>
- </xsl:for-each>
- </table>
- <xsl:call-template name="pageFooter"/>
- </body>
- </html>
-</xsl:template>
-
-
-<xsl:template name="package.summary">
- <xsl:param name="name"/>
- <HTML>
- <HEAD>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="$name"/>
- </xsl:call-template>
- </HEAD>
- <BODY>
- <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
- <xsl:call-template name="pageHeader"/>
- <h3>Package <xsl:value-of select="$name"/></h3>
-
- <!--table border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="class.metrics.header"/>
- <xsl:apply-templates select="." mode="print.metrics"/>
- </table-->
-
- <xsl:if test="count(/classes/class[./@package = $name]) &gt; 0">
- <H3>Classes</H3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="class.audit.header"/>
- <xsl:apply-templates select="/classes/class[./@package = $name]" mode="print.audit">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </xsl:if>
- <xsl:call-template name="pageFooter"/>
- </BODY>
- </HTML>
-</xsl:template>
-
-
-<!--
- transform string like a.b.c to ../../../
- @param path the path to transform into a descending directory path
--->
-<xsl:template name="path">
- <xsl:param name="path"/>
- <xsl:if test="contains($path,'.')">
- <xsl:text>../</xsl:text>
- <xsl:call-template name="path">
- <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
- </xsl:call-template>
- </xsl:if>
- <xsl:if test="not(contains($path,'.')) and not($path = '')">
- <xsl:text>../</xsl:text>
- </xsl:if>
-</xsl:template>
-
-
-<!-- create the link to the stylesheet based on the package name -->
-<xsl:template name="create.stylesheet.link">
- <xsl:param name="package.name"/>
- <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK>
-</xsl:template>
-
-<!-- Page HEADER -->
-<xsl:template name="pageHeader">
-
- <!-- jakarta logo -->
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td class="bannercell" rowspan="2">
- <a href="http://jakarta.apache.org/">
- <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
- </a>
- </td>
- <td style="text-align:right"><h2>Source Code Audit</h2></td>
- </tr>
- <tr>
- <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Audit</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
- </tr>
- </table>
- <hr size="1"/>
-</xsl:template>
-
-<!-- Page HEADER -->
-<xsl:template name="pageFooter">
- <table width="100%">
- <tr><td><hr noshade="yes" size="1"/></td></tr>
- <tr><td>
- <div align="center"><font color="#525D76" size="-1"><em>
- Copyright &#169; 1999-2001, Apache Software Foundation
- </em></font></div>
- </td></tr>
- </table>
-</xsl:template>
-
-
-<!-- class header -->
-<xsl:template name="class.audit.header">
- <tr>
- <th width="80%">Name</th>
- <th>Violations</th>
- </tr>
-</xsl:template>
-
-<!-- method header -->
-<xsl:template name="violation.audit.header">
- <tr>
- <th>Line</th>
- <th>Message</th>
- </tr>
-</xsl:template>
-
-
-<!-- class information -->
-<xsl:template match="class" mode="print.audit">
- <tr>
- <xsl:call-template name="alternate-row"/>
- <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
- <td><xsl:apply-templates select="@violations"/></td>
- </tr>
-</xsl:template>
-
-<xsl:template match="violation" mode="print.audit">
- <tr>
- <xsl:call-template name="alternate-row"/>
- <td><xsl:value-of select="@line"/></td>
- <td><xsl:apply-templates select="@message"/></td>
- </tr>
-</xsl:template>
-
-<!-- alternated row style -->
-<xsl:template name="alternate-row">
-<xsl:attribute name="class">
- <xsl:if test="position() mod 2 = 1">a</xsl:if>
- <xsl:if test="position() mod 2 = 0">b</xsl:if>
-</xsl:attribute>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/build/tools/jakarta-ant-1.5.1/etc/mmetrics-frames.xsl b/build/tools/jakarta-ant-1.5.1/etc/mmetrics-frames.xsl
deleted file mode 100644
index 001112926..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/mmetrics-frames.xsl
+++ /dev/null
@@ -1,1070 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:lxslt="http://xml.apache.org/xslt"
- xmlns:xalan="http://xml.apache.org/xalan"
- xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
- exclude-result-prefixes="xalan"
- extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-<!--
- The Apache Software License, Version 1.1
-
- Copyright (c) 2001-2002 The Apache Software Foundation. All rights
- reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution, if
- any, must include the following acknowlegement:
- "This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowlegement may appear in the software itself,
- if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
- Foundation" must not be used to endorse or promote products derived
- from this software without prior written permission. For written
- permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
- nor may "Apache" appear in their names without prior written
- permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
- -->
-<!--
- @author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
- -->
-<xsl:param name="output.dir" select="'.'"/>
-
-<!-- default max value for the metrics -->
-<xsl:param name="vg.max" select="10"/>
-<xsl:param name="loc.max" select="1000"/>
-<xsl:param name="dit.max" select="10"/>
-<xsl:param name="noa.max" select="250"/>
-<xsl:param name="nrm.max" select="50"/>
-<xsl:param name="nlm.max" select="250"/>
-<xsl:param name="wmc.max" select="250"/>
-<xsl:param name="rfc.max" select="50"/>
-<xsl:param name="dac.max" select="10"/>
-<xsl:param name="fanout.max" select="10"/>
-<xsl:param name="cbo.max" select="15"/>
-<xsl:param name="lcom.max" select="10"/>
-<xsl:param name="nocl.max" select="10"/>
-
-
-<!-- create a tree fragment to speed up processing -->
-<xsl:variable name="doctree.var">
- <xsl:element name="classes">
- <xsl:for-each select=".//class">
- <xsl:element name="class">
- <xsl:attribute name="package">
- <xsl:value-of select="(ancestor::package)[last()]/@name"/>
- </xsl:attribute>
- <xsl:copy-of select="@*"/>
- <xsl:attribute name="name">
- <xsl:apply-templates select="." mode="class.name"/>
- </xsl:attribute>
- <xsl:copy-of select="method"/>
- </xsl:element>
- </xsl:for-each>
- </xsl:element>
-</xsl:variable>
-
-<xsl:variable name="doctree" select="xalan:nodeset($doctree.var)"/>
-
-<xsl:template match="metrics">
-
- <!-- create the index.html -->
- <redirect:write file="{$output.dir}/index.html">
- <xsl:call-template name="index.html"/>
- </redirect:write>
-
- <!-- create the stylesheet.css -->
- <redirect:write file="{$output.dir}/stylesheet.css">
- <xsl:call-template name="stylesheet.css"/>
- </redirect:write>
-
- <redirect:write file="{$output.dir}/metrics-reference.html">
- <xsl:call-template name="metrics-reference.html"/>
- </redirect:write>
-
- <!-- create the overview-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-summary.html">
- <xsl:apply-templates select="." mode="overview.packages"/>
- </redirect:write>
-
- <!-- create the all-packages.html at the root -->
- <redirect:write file="{$output.dir}/overview-frame.html">
- <xsl:apply-templates select="." mode="all.packages"/>
- </redirect:write>
-
- <!-- create the all-classes.html at the root -->
- <redirect:write file="{$output.dir}/allclasses-frame.html">
- <xsl:apply-templates select="." mode="all.classes"/>
- </redirect:write>
-
- <!-- process all packages -->
- <xsl:apply-templates select=".//package"/>
-</xsl:template>
-
-
-<xsl:template match="package">
- <xsl:variable name="package.name" select="@name"/>
- <xsl:variable name="package.dir">
- <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="translate($package.name,'.','/')"/></xsl:if>
- <xsl:if test="$package.name = 'unnamed package'">.</xsl:if>
- </xsl:variable>
- <!-- create a classes-list.html in the package directory -->
- <redirect:write file="{$output.dir}/{$package.dir}/package-frame.html">
- <xsl:apply-templates select="." mode="classes.list"/>
- </redirect:write>
-
- <!-- create a package-summary.html in the package directory -->
- <redirect:write file="{$output.dir}/{$package.dir}/package-summary.html">
- <xsl:apply-templates select="." mode="package.summary"/>
- </redirect:write>
-
- <!-- for each class, creates a @name.html -->
- <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
- <xsl:for-each select="$doctree/classes/class[@package = current()/@name]">
- <!--Processing <xsl:value-of select="$class.name"/><xsl:text>&#10;</xsl:text> -->
- <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
- <xsl:apply-templates select="." mode="class.details"/>
- </redirect:write>
- </xsl:for-each>
-</xsl:template>
-
-<!-- little trick to compute the classname for inner and non inner classes -->
-<!-- this is all in one line to avoid CRLF in the name -->
-<xsl:template match="class" mode="class.name">
- <xsl:if test="parent::class"><xsl:apply-templates select="parent::class" mode="class.name"/>.<xsl:value-of select="@name"/></xsl:if><xsl:if test="not(parent::class)"><xsl:value-of select="@name"/></xsl:if>
-</xsl:template>
-
-
-<xsl:template name="index.html">
-<HTML>
- <HEAD><TITLE>Metrics Results.</TITLE></HEAD>
- <FRAMESET cols="20%,80%">
- <FRAMESET rows="30%,70%">
- <FRAME src="overview-frame.html" name="packageListFrame"/>
- <FRAME src="allclasses-frame.html" name="classListFrame"/>
- </FRAMESET>
- <FRAME src="overview-summary.html" name="classFrame"/>
- </FRAMESET>
- <noframes>
- <H2>Frame Alert</H2>
- <P>
- This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
- </P>
- </noframes>
-</HTML>
-</xsl:template>
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="metrics-reference.html">
-<html>
-<head>
-<link title="Style" type="text/css" rel="stylesheet" href="stylesheet.css"/>
-</head>
-<body style="text-align:justify;">
-<h2>Metrics Reference</h2>
-<a href="#V(G)">V(G)</a> |
-<a href="#LOC">LOC</a> |
-<a href="#DIT">DIT</a> |
-<a href="#NOA">NOA</a> |
-<a href="#NRM">NRM</a> |
-<a href="#NLM">NLM</a> |
-<a href="#WMC">WMC</a> |
-<a href="#RFC">RFC</a> |
-<a href="#DAC">DAC</a> |
-<a href="#FANOUT">FANOUT</a> |
-<a href="#CBO">CBO</a> |
-<a href="#LCOM">LCOM</a> |
-<a href="#NOC">NOC</a>
-
-<a name="V(G)"/>
-<h3>Cyclomatic Complexity - V(G)</h3>
-This metric was introduced in the 1970s to measure the amount of control
-flow complexity or branching complexity in a module such as a
-subroutine. It gives the number of paths that may be taken through the
-code, and was initially developed to give some measure of the cost of
-producing a test case for the module by executing each path.
-<p/>
-Methods with a high cyclomatic complexity tend to be more difficult to
-understand and maintain. In general the more complex the methods of an
-application, the more difficult it will be to test it, and this will adversely
-affect its reliability.
-<p/>
-V(G) is a measure of the control flow complexity of a method or
-constructor. It counts the number of branches in the body of the method,
-defined as:
-<ul>
-<li>while statements;</li>
-<li>if statements;</li>
-<li>for statements.</li>
-</ul>
-
-The metric can also be configured to count each case of a switch
-statement as well.
-
-<a name="LOC"/>
-<h3>Lines of Code - LOC</h3>
-
-This is perhaps the simplest of all the metrics to define and compute.
-Counting lines has a long history as a software metric dating from before
-the rise of structured programming, and it is still in widespread use today.
-The size of a method affects the ease with which it can be understood, its
-reusability and its maintainability. There are a variety of ways that the size
-can be calculated. These include counting all the lines of code, the number
-of statements, the blank lines of code, the lines of commentary, and the
-lines consisting only of syntax such as block delimiters.
-<p/>
-This metric can also be used for sizing other constructs as well, for
-example, the overall size of a Java class or package can be measured by
-counting the number of source lines it consists of.
-<p/>
-LOC can be used to determine the size of a compilation unit (source file),
-class or interface, method, constructor, or field. It can be configured to
-ignore:
-<ul>
-<li>blank lines;</li>
-<li>lines consisting only of comments;</li>
-<li>lines consisting only of opening and closing braces.</li>
-</ul>
-
-<a name="DIT"/>
-<h3>Depth of Inheritance Hierarchy - DIT</h3>
-
-This metric calculates how far down the inheritance hierarchy a class is
-declared. In Java all classes have java.lang.Object as their ultimate
-superclass, which is defined to have a depth of 1. So a class that
-immediately extends java.lang.Object has a metric value of 2; any of its
-subclasses will have a value of 3, and so on.
-<p/>
-A class that is deep within the tree inherits more methods and state
-variables, thereby increasing its complexity and making it difficult to
-predict its behavior. It can be harder to understand a system with many
-inheritance layers.
-<p/>
-DIT is defined for classes and interfaces:
-<ul>
-<li>all interface types have a depth of 1;</li>
-<li>the class java.lang.Object has a depth of 1;</li>
-<li>all other classes have a depth of 1 + the depth of their super class.</li>
-</ul>
-
-<a name="NOA"/>
-<h3>Number of Attributes - NOA</h3>
-
-The number of distinct state variables in a class serves as one measure of
-its complexity. The more state a class represents the more difficult it is to
-maintain invariants for it. It also hinders comprehensibility and reuse.
-<p/>
-In Java, state can be exposed to subclasses through protected fields, which
-entails that the subclass also be aware of and maintain any invariants. This
-interference with the class's data encapsulation can be a source of defects
-and hidden dependencies between the state variables.
-<p/>
-NOA is defined for classes and interfaces. It counts the number of fields
-declared in the class or interface.
-
-<a name="NRM"/>
-<h3>Number of Remote Methods - NRM</h3>
-
-NRM is defined for classes. A remote method call is defined as an
-invocation of a method that is not declared in any of:
-<ul>
-<li>the class itself;</li>
-<li>a class or interface that the class extends or implements;</li>
-<li>a class or method that extends the class.</li>
-</ul>
-
-The value is the count of all the remote method calls in all of the methods
-and constructors of the class.
-
-<a name="NLM"/>
-<h3>Number of Local Methods - NLM</h3>
-
-NLM is defined for classes and interfaces. A local method is defined as a
-method that is declared in the class or interface. NLM can be configured to
-include the local methods of all of the class's superclasses. Methods with
-public, protected, package and private visibility can be independently
-counted by setting configuration parameters.
-
-<a name="WMC"/>
-<h3>Weighted Methods per Class - WMC</h3>
-
-If the number of methods in a class can be determined during the design
-and modeling phase of a project, it can be used as a predictor of how
-much time and effort is needed to develop, debug and maintain it. This
-metric can be further refined by incorporating a weighting for the
-complexity of each method. The usual weighting is given by the cyclomatic
-complexity of the method.
-<p/>
-The subclasses of a class inherit all of its public and protected methods,
-and possibly its package methods as well, so the number of methods a
-class has directly impacts the complexity of its subclasses. Classes with
-large numbers of methods are often specific to a particular application,
-reducing the ability to reuse them.
-<p/>
-The definition of WMC is based upon NLM, and it provides the same
-configuration parameters for counting inherited methods and of varying
-visibility. The main difference is that NLM always counts each method as 1,
-whereas WMC will weight each method. There are two weighting schemes:
-<ul>
-<li>V(G) the cyclomatic complexity of the method is used as its weight.
- Methods from class files are given a V(G) of 1.</li>
-<li>the arity, or the number of parameters of the method are used to
- determine the weight.</li>
-</ul>
-
-<a name="RFC"/>
-<h3>Response For Class - RFC</h3>
-
-The response set of a class is the set of all methods that can be invoked as
-a result of a message sent to an object of the class. This includes methods
-in the class's inheritance hierarchy and methods that can be invoked on
-other objects. The Response For Class metric is defined to be size of the
-response set for the class. A class which provides a larger response set is
-considered to be more complex than one with a smaller response set.
-<p/>
-One reason for this is that if a method call on a class can result in a large
-number of different method calls on the target and other classes, then it
-can be harder to test the behavior of the class and debug problems. It will
-typically require a deeper understanding of the potential interactions that
-objects of the class can have with the rest of the system.
-<p/>
-RFC is defined as the sum of NLM and NRM for the class. The local methods
-include all of the public, protected, package and private methods, but not
-methods declared only in a superclass.
-
-<a name="DAC"/>
-<h3>Data Abstraction Coupling - DAC</h3>
-
-DAC is defined for classes and interfaces. It counts the number of reference
-types that are used in the field declarations of the class or interface. The
-component types of arrays are also counted. Any field with a type that is
-either a supertype or a subtype of the class is not counted.
-
-<a name="FANOUT"/>
-<h3>Fan Out - FANOUT</h3>
-
-FANOUT is defined for classes and interfaces, constructors and methods. It
-counts the number of reference types that are used in:
-<ul>
-<li>field declarations;</li>
-<li>formal parameters and return types;</li>
-<li>throws declarations;</li>
-<li>local variables.</li>
-</ul>
-
-The component types of arrays are also counted. Any type that is either a
-supertype or a subtype of the class is not counted.
-
-<a name="CBO"/>
-<h3>Coupling Between Objects - CBO</h3>
-
-When one object or class uses another object or class they are said to be
-coupled. One major source of coupling is that between a superclass and a
-subclass. A coupling is also introduced when a method or field in another
-class is accessed, or when an object of another class is passed into or out
-of a method invocation. Coupling Between Objects is a measure of the
-non-inheritance coupling between two objects.
-<p/>
-A high value of coupling reduces the modularity of the class and makes
-reuse more difficult. The more independent a class is the more likely it is
-that it will be possible to reuse it in another part of the system. When a
-class is coupled to another class it becomes sensitive to changes in that
-class, thereby making maintenance for difficult. In addition, a class that is
-overly dependent on other classes can be difficult to understand and test in
-isolation.
-<p/>
-CBO is defined for classes and interfaces, constructors and methods. It
-counts the number of reference types that are used in:
-<ul>
-<li>field declarations</li>
-<li>formal parameters and return types</li>
-<li>throws declarations</li>
-<li>local variables</li>
-</ul>
-
-It also counts:
-<ul>
-<li>types from which field and method selections are made</li>
-</ul>
-
-The component types of arrays are also counted. Any type that is either a
-supertype or a subtype of the class is not counted.
-
-<a name="LCOM"/>
-<h3>Lack of Cohesion Of Methods - LCOM</h3>
-
-The cohesion of a class is the degree to which its methods are related to
-each other. It is determined by examining the pattern of state variable
-accesses within the set of methods. If all the methods access the same state
-variables then they have high cohesion; if they access disjoint sets of
-variables then the cohesion is low. An extreme example of low cohesion
-would be if none of the methods accessed any of the state variables.
-
-If a class exhibits low method cohesion it indicates that the design of the
-class has probably been partitioned incorrectly, and could benefit by being
-split into more classes with individually higher cohesion. On the other
-hand, a high value of cohesion (a low lack of cohesion) implies that the
-class is well designed. A cohesive class will tend to provide a high degree
-of encapsulation, whereas a lack of cohesion decreases encapsulation and
-increases complexity.
-<p/>
-Another form of cohesion that is useful for Java programs is cohesion
-between nested and enclosing classes. A nested class that has very low
-cohesion with its enclosing class would probably better designed as a peer
-class rather than a nested class.
-<p/>
-LCOM is defined for classes. Operationally, LCOM takes each pair of
-methods in the class and determines the set of fields they each access. If
-they have disjoint sets of field accesses increase the count P by one. If they
-share at least one field access then increase Q by one. After considering
-each pair of methods,
-LCOM = (P > Q) ? (P - Q) : 0
-<p/>
-Indirect access to fields via local methods can be considered by setting a
-metric configuration parameter.
-
-<a name="NOC"/>
-<h3>Number Of Classes - NOC</h3>
-
-The overall size of the system can be estimated by calculating the number
-of classes it contains. A large system with more classes is more complex
-than a smaller one because the number of potential interactions between
-objects is higher. This reduces the comprehensibility of the system which
-in turn makes it harder to test, debug and maintain.
-<p/>
-If the number of classes in the system can be projected during the initial
-design phase of the project it can serve as a base for estimating the total
-effort and cost of developing, debugging and maintaining the system.
-<p/>
-The NOC metric can also usefully be applied at the package and class level
-as well as the total system.
-<p/>
-NOCL is defined for class and interfaces. It counts the number of classes or
-interfaces that are declared. This is usually 1, but nested class declarations
-will increase this number.
-</body>
-</html>
-</xsl:template>
-
-<!-- this is the stylesheet css to use for nearly everything -->
-<xsl:template name="stylesheet.css">
- .bannercell {
- border: 0px;
- padding: 0px;
- }
- body {
- margin-left: 10;
- margin-right: 10;
- font:normal 80% arial,helvetica,sanserif;
- background-color:#FFFFFF;
- color:#000000;
- }
- .a td {
- background: #efefef;
- }
- .b td {
- background: #fff;
- }
- th, td {
- text-align: left;
- vertical-align: top;
- }
- th {
- font-weight:bold;
- background: #ccc;
- color: black;
- }
- table, th, td {
- font-size:100%;
- border: none
- }
- table.log tr td, tr th {
-
- }
- h2 {
- font-weight:bold;
- font-size:140%;
- margin-bottom: 5;
- }
- h3 {
- font-size:100%;
- font-weight:bold;
- background: #525D76;
- color: white;
- text-decoration: none;
- padding: 5px;
- margin-right: 2px;
- margin-left: 2px;
- margin-bottom: 0;
- }
- .Error {
- font-weight:bold; color:red;
- }
-
-</xsl:template>
-
-<!-- print the metrics of the class -->
-<xsl:template match="class" mode="class.details">
- <!--xsl:variable name="package.name" select="(ancestor::package)[last()]/@name"/-->
- <xsl:variable name="package.name" select="@package"/>
- <HTML>
- <HEAD>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="$package.name"/>
- </xsl:call-template>
- </HEAD>
- <BODY>
- <xsl:call-template name="pageHeader"/>
-
- <H3>Class <xsl:if test="not($package.name = 'unnamed package')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></H3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="all.metrics.header"/>
- <xsl:apply-templates select="." mode="print.metrics"/>
- </table>
-
- <H3>Methods</H3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="method.metrics.header"/>
- <xsl:apply-templates select="method" mode="print.metrics"/>
- </table>
-
- <xsl:call-template name="pageFooter"/>
- </BODY>
- </HTML>
-</xsl:template>
-
-
-<!-- list of classes in a package -->
-<xsl:template match="package" mode="classes.list">
- <HTML>
- <HEAD>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="@name"/>
- </xsl:call-template>
- </HEAD>
- <BODY>
- <table width="100%">
- <tr>
- <td nowrap="nowrap">
- <H2><a href="package-summary.html" target="classFrame"><xsl:value-of select="@name"/></a></H2>
- </td>
- </tr>
- </table>
-
- <H2>Classes</H2>
- <TABLE WIDTH="100%">
- <!-- xalan-nodeset:nodeset for Xalan 1.2.2 -->
- <xsl:for-each select="$doctree/classes/class[@package = current()/@name]">
- <xsl:sort select="@name"/>
- <tr>
- <td nowrap="nowrap">
- <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
- </td>
- </tr>
- </xsl:for-each>
- </TABLE>
- </BODY>
- </HTML>
-</xsl:template>
-
-
-<!--
- Creates an all-classes.html file that contains a link to all package-summary.html
- on each class.
--->
-<xsl:template match="metrics" mode="all.classes">
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="''"/>
- </xsl:call-template>
- </head>
- <body>
- <h2>Classes</h2>
- <table width="100%">
- <xsl:for-each select="$doctree/classes/class">
- <xsl:sort select="@name"/>
- <xsl:apply-templates select="." mode="all.classes"/>
- </xsl:for-each>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="class" mode="all.classes">
- <xsl:variable name="package.name" select="@package"/>
- <xsl:variable name="class.name" select="@name"/>
- <tr>
- <td nowrap="nowrap">
- <a target="classFrame">
- <xsl:attribute name="href">
- <xsl:if test="not($package.name='unnamed package')">
- <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
- </xsl:if>
- <xsl:value-of select="$class.name"/><xsl:text>.html</xsl:text>
- </xsl:attribute>
- <xsl:value-of select="$class.name"/>
- </a>
- </td>
- </tr>
-</xsl:template>
-
-<!--
- Creates an html file that contains a link to all package-summary.html files on
- each package existing on testsuites.
- @bug there will be a problem here, I don't know yet how to handle unnamed package :(
--->
-<xsl:template match="metrics" mode="all.packages">
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="./package/@name"/>
- </xsl:call-template>
- </head>
- <body>
- <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
- <h2>Packages</h2>
- <table width="100%">
- <xsl:apply-templates select=".//package[not(./@name = 'unnamed package')]" mode="all.packages">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="package" mode="all.packages">
- <tr>
- <td nowrap="nowrap">
- <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame">
- <xsl:value-of select="@name"/>
- </a>
- </td>
- </tr>
-</xsl:template>
-
-
-<xsl:template match="metrics" mode="overview.packages">
- <html>
- <head>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="''"/>
- </xsl:call-template>
- </head>
- <body onload="open('allclasses-frame.html','classListFrame')">
- <xsl:call-template name="pageHeader"/>
- <h3>Summary</h3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th><a href="metrics-reference.html#V(G)">V(G)</a></th>
- <th><a href="metrics-reference.html#LOC">LOC</a></th>
- <th><a href="metrics-reference.html#DIT">DIT</a></th>
- <th><a href="metrics-reference.html#NOA">NOA</a></th>
- <th><a href="metrics-reference.html#NRM">NRM</a></th>
- <th><a href="metrics-reference.html#NLM">NLM</a></th>
- <th><a href="metrics-reference.html#WMC">WMC</a></th>
- <th><a href="metrics-reference.html#RFC">RFC</a></th>
- <th><a href="metrics-reference.html#DAC">DAC</a></th>
- <th><a href="metrics-reference.html#FANOUT">FANOUT</a></th>
- <th><a href="metrics-reference.html#CBO">CBO</a></th>
- <th><a href="metrics-reference.html#LCOM">LCOM</a></th>
- <th><a href="metrics-reference.html#NOCL">NOCL</a></th>
- </tr>
- <xsl:apply-templates select="." mode="print.metrics"/>
- </table>
- <table border="0" width="100%">
- <tr>
- <td style="text-align: justify;">
- Note: Metrics evaluate the quality of software by analyzing the program source and quantifying
- various kind of complexity. Complexity is a common source of problems and defects in software.
- High complexity makes it more difficult to develop, understand, maintain, extend, test and debug
- a program.
- <p/>
- The primary use of metrics is to focus your attention on those parts of code that potentially are
- complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial
- actions.
- For additional information about metrics and their meaning, please consult
- Metamata Metrics manual.
- </td>
- </tr>
- </table>
-
- <h3>Packages</h3>
- <table border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="all.metrics.header"/>
- <xsl:for-each select=".//package[not(@name = 'unnamed package')]">
- <xsl:sort select="@name" order="ascending"/>
- <xsl:apply-templates select="." mode="print.metrics"/>
- </xsl:for-each>
- </table>
- <!-- @bug there could some classes at this level (classes in unnamed package) -->
- <xsl:call-template name="pageFooter"/>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="package" mode="package.summary">
- <HTML>
- <HEAD>
- <xsl:call-template name="create.stylesheet.link">
- <xsl:with-param name="package.name" select="@name"/>
- </xsl:call-template>
- </HEAD>
- <body onload="open('package-frame.html','classListFrame')">
- <xsl:call-template name="pageHeader"/>
- <!-- create an anchor to this package name -->
- <h3>Package <xsl:value-of select="@name"/></h3>
-
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="all.metrics.header"/>
- <xsl:apply-templates select="." mode="print.metrics"/>
- </table>
-
- <table border="0" width="100%">
- <tr>
- <td style="text-align: justify;">
- Note: Metrics evaluate the quality of software by analyzing the program source and quantifying
- various kind of complexity. Complexity is a common source of problems and defects in software.
- High complexity makes it more difficult to develop, understand, maintain, extend, test and debug
- a program.
- <p/>
- The primary use of metrics is to focus your attention on those parts of code that potentially are
- complexity hot spots. Once the complex areas your program have been uncovered, you can take remedial
- actions.
- For additional information about metrics and their meaning, please consult
- Metamata Metrics manual.
- </td>
- </tr>
- </table>
-
- <xsl:variable name="classes-in-package" select="$doctree/classes/class[@package = current()/@name]"/>
- <xsl:if test="count($classes-in-package) &gt; 0">
- <H3>Classes</H3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <xsl:call-template name="all.metrics.header"/>
- <xsl:for-each select="$classes-in-package">
- <xsl:sort select="@name"/>
- <xsl:apply-templates select="." mode="print.metrics"/>
- </xsl:for-each>
- </table>
- </xsl:if>
-
- <xsl:call-template name="pageFooter"/>
- </body>
- </HTML>
-</xsl:template>
-
-
-<!--
- transform string like a.b.c to ../../../
- @param path the path to transform into a descending directory path
--->
-<xsl:template name="path">
- <xsl:param name="path"/>
- <xsl:if test="contains($path,'.')">
- <xsl:text>../</xsl:text>
- <xsl:call-template name="path">
- <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
- </xsl:call-template>
- </xsl:if>
- <xsl:if test="not(contains($path,'.')) and not($path = '')">
- <xsl:text>../</xsl:text>
- </xsl:if>
-</xsl:template>
-
-
-<!-- create the link to the stylesheet based on the package name -->
-<xsl:template name="create.stylesheet.link">
- <xsl:param name="package.name"/>
- <LINK REL ="stylesheet" TYPE="text/css" TITLE="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></LINK>
-</xsl:template>
-
-
-<!-- Page Header -->
-<xsl:template name="pageHeader">
-
- <!-- jakarta logo -->
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td class="bannercell" rowspan="2">
- <a href="http://jakarta.apache.org/">
- <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
- </a>
- </td>
- <td style="text-align:right"><h2>Source Code Metrics</h2></td>
- </tr>
- <tr>
- <td style="text-align:right">Designed for use with <a href='http://www.webgain.com/products/quality_analyzer/'>Webgain QA/Metamata Metrics</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
- </tr>
- </table>
- <hr size="1"/>
-</xsl:template>
-
-<!-- Page Footer -->
-<xsl:template name="pageFooter">
- <table width="100%">
- <tr><td><hr noshade="yes" size="1"/></td></tr>
- <tr><td>
- <div align="center"><font color="#525D76" size="-1"><em>
- Copyright &#169; 1999-2001, Apache Software Foundation
- </em></font></div>
- </td></tr>
- </table>
-</xsl:template>
-
-<!-- class header -->
-<xsl:template name="all.metrics.header">
- <tr>
- <th width="80%">Name</th>
- <th nowrap="nowrap">V(G)</th>
- <th>LOC</th>
- <th>DIT</th>
- <th>NOA</th>
- <th>NRM</th>
- <th>NLM</th>
- <th>WMC</th>
- <th>RFC</th>
- <th>DAC</th>
- <th>FANOUT</th>
- <th>CBO</th>
- <th>LCOM</th>
- <th>NOCL</th>
- </tr>
-</xsl:template>
-
-<!-- method header -->
-<xsl:template name="method.metrics.header">
- <tr>
- <th width="80%">Name</th>
- <th nowrap="nowrap">V(G)</th>
- <th>LOC</th>
- <th>FANOUT</th>
- <th>CBO</th>
- </tr>
-</xsl:template>
-
-<!-- method information -->
-<xsl:template match="method" mode="print.metrics">
- <tr>
- <xsl:call-template name="alternate-row"/>
- <td><xsl:apply-templates select="@name"/></td>
- <td><xsl:apply-templates select="@vg"/></td>
- <td><xsl:apply-templates select="@loc"/></td>
- <td><xsl:apply-templates select="@fanout"/></td>
- <td><xsl:apply-templates select="@cbo"/></td>
- </tr>
-</xsl:template>
-
-<!-- class information -->
-<xsl:template match="class" mode="print.metrics">
- <tr>
- <xsl:call-template name="alternate-row"/>
- <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
- <td><xsl:apply-templates select="@vg"/></td>
- <td><xsl:apply-templates select="@loc"/></td>
- <td><xsl:apply-templates select="@dit"/></td>
- <td><xsl:apply-templates select="@noa"/></td>
- <td><xsl:apply-templates select="@nrm"/></td>
- <td><xsl:apply-templates select="@nlm"/></td>
- <td><xsl:apply-templates select="@wmc"/></td>
- <td><xsl:apply-templates select="@rfc"/></td>
- <td><xsl:apply-templates select="@dac"/></td>
- <td><xsl:apply-templates select="@fanout"/></td>
- <td><xsl:apply-templates select="@cbo"/></td>
- <td><xsl:apply-templates select="@lcom"/></td>
- <td><xsl:apply-templates select="@nocl"/></td>
- </tr>
-</xsl:template>
-
-<xsl:template match="file|package" mode="print.metrics">
- <tr>
- <xsl:call-template name="alternate-row"/>
- <td>
- <a href="{translate(@name,'.','/')}/package-summary.html" target="classFrame">
- <xsl:value-of select="@name"/>
- </a>
- </td>
- <td><xsl:apply-templates select="@vg"/></td>
- <td><xsl:apply-templates select="@loc"/></td>
- <td><xsl:apply-templates select="@dit"/></td>
- <td><xsl:apply-templates select="@noa"/></td>
- <td><xsl:apply-templates select="@nrm"/></td>
- <td><xsl:apply-templates select="@nlm"/></td>
- <td><xsl:apply-templates select="@wmc"/></td>
- <td><xsl:apply-templates select="@rfc"/></td>
- <td><xsl:apply-templates select="@dac"/></td>
- <td><xsl:apply-templates select="@fanout"/></td>
- <td><xsl:apply-templates select="@cbo"/></td>
- <td><xsl:apply-templates select="@lcom"/></td>
- <td><xsl:apply-templates select="@nocl"/></td>
- </tr>
-</xsl:template>
-
-<xsl:template match="metrics" mode="print.metrics">
- <tr>
- <xsl:call-template name="alternate-row"/>
- <!-- the global metrics is the top package metrics -->
- <td><xsl:apply-templates select="./package/@vg"/></td>
- <td><xsl:apply-templates select="./package/@loc"/></td>
- <td><xsl:apply-templates select="./package/@dit"/></td>
- <td><xsl:apply-templates select="./package/@noa"/></td>
- <td><xsl:apply-templates select="./package/@nrm"/></td>
- <td><xsl:apply-templates select="./package/@nlm"/></td>
- <td><xsl:apply-templates select="./package/@wmc"/></td>
- <td><xsl:apply-templates select="./package/@rfc"/></td>
- <td><xsl:apply-templates select="./package/@dac"/></td>
- <td><xsl:apply-templates select="./package/@fanout"/></td>
- <td><xsl:apply-templates select="./package/@cbo"/></td>
- <td><xsl:apply-templates select="./package/@lcom"/></td>
- <td><xsl:apply-templates select="./package/@nocl"/></td>
- </tr>
-</xsl:template>
-
-<!-- alternated row style -->
-<xsl:template name="alternate-row">
-<xsl:attribute name="class">
- <xsl:if test="position() mod 2 = 1">a</xsl:if>
- <xsl:if test="position() mod 2 = 0">b</xsl:if>
-</xsl:attribute>
-</xsl:template>
-
-
-<!-- how to display the metrics with their max value -->
-<!-- @todo the max values must be external to the xsl -->
-
- <xsl:template match="@vg">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$vg.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@loc">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$loc.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@dit">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$dit.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@noa">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$noa.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@nrm">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$nrm.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@nlm">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$nlm.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@wmc">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$wmc.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@rfc">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$rfc.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@dac">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$dac.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@fanout">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$fanout.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@cbo">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$cbo.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@lcom">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$lcom.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="@nocl">
- <xsl:call-template name="display-value">
- <xsl:with-param name="value" select="current()"/>
- <xsl:with-param name="max" select="$nocl.max"/>
- </xsl:call-template>
- </xsl:template>
-
- <xsl:template name="display-value">
- <xsl:param name="value"/>
- <xsl:param name="max"/>
- <xsl:if test="$value > $max">
- <xsl:attribute name="class">Error</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="$value"/>
- </xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/build/tools/jakarta-ant-1.5.1/etc/tagdiff.xsl b/build/tools/jakarta-ant-1.5.1/etc/tagdiff.xsl
deleted file mode 100644
index 4dac8f4b7..000000000
--- a/build/tools/jakarta-ant-1.5.1/etc/tagdiff.xsl
+++ /dev/null
@@ -1,162 +0,0 @@
-<!-- a stylesheet to display changelogs ala netbeans -->
-<xsl:stylesheet
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
- <xsl:param name="title"/>
- <xsl:param name="module"/>
- <xsl:param name="cvsweb"/>
-
- <xsl:output method="html" indent="yes"/>
-
- <!-- Copy standard document elements. Elements that
- should be ignored must be filtered by apply-templates
- tags. -->
- <xsl:template match="*">
- <xsl:copy>
- <xsl:copy-of select="attribute::*[. != '']"/>
- <xsl:apply-templates/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="tagdiff">
- <HTML>
- <HEAD>
- <TITLE><xsl:value-of select="$title"/></TITLE>
- </HEAD>
- <BODY link="#000000" alink="#000000" vlink="#000000" text="#000000">
- <style type="text/css">
- body, p {
- font-family: verdana,arial,helvetica;
- font-size: 80%;
- color:#000000;
- }
- .dateAndAuthor {
- font-family: verdana,arial,helvetica;
- font-size: 80%;
- font-weight: bold;
- text-align:left;
- background:#a6caf0;
- }
- tr, td{
- font-family: verdana,arial,helvetica;
- font-size: 80%;
- background:#eeeee0;
- }
- </style>
- <h1>
- <a name="top"><xsl:value-of select="$title"/></a>
- </h1>
- Tagdiff between <xsl:value-of select="@startTag"/> <xsl:value-of select="@startDate"/> and
- <xsl:value-of select="@endTag"/> <xsl:value-of select="@endDate"/>
- <p align="right">Designed for use with <a href="http://jakarta.apache.org">Ant</a>.</p>
- <hr size="2"/>
- <a name="TOP"/>
- <table width="100%">
- <tr>
- <td align="right">
- <a href="#New">New Files</a> |
- <a href="#Modified">Modified Files</a> |
- <a href="#Removed">Removed Files</a>
- </td>
- </tr>
- </table>
- <TABLE BORDER="0" WIDTH="100%" CELLPADDING="3" CELLSPACING="1">
- <xsl:call-template name="show-entries">
- <xsl:with-param name="title">New Files</xsl:with-param>
- <xsl:with-param name="anchor">New</xsl:with-param>
- <xsl:with-param name="entries" select=".//entry[file/revision][not(file/prevrevision)]"/>
- </xsl:call-template>
-
- <xsl:call-template name="show-entries">
- <xsl:with-param name="title">Modified Files</xsl:with-param>
- <xsl:with-param name="anchor">Modified</xsl:with-param>
- <xsl:with-param name="entries" select=".//entry[file/revision][file/prevrevision]"/>
- </xsl:call-template>
-
- <xsl:call-template name="show-entries">
- <xsl:with-param name="title">Removed Files</xsl:with-param>
- <xsl:with-param name="anchor">Removed</xsl:with-param>
- <xsl:with-param name="entries" select=".//entry[not(file/revision)][not(file/prevrevision)]"/>
- </xsl:call-template>
- </TABLE>
-
- </BODY>
- </HTML>
- </xsl:template>
-
- <xsl:template name="show-entries">
- <xsl:param name="title"/>
- <xsl:param name="anchor"/>
- <xsl:param name="entries"/>
- <TR>
- <TD colspan="2" class="dateAndAuthor">
- <a>
- <xsl:attribute name="name"><xsl:value-of select="$anchor"/></xsl:attribute>
- <xsl:value-of select="$title"/> - <xsl:value-of select="count($entries)"/> entries
- </a>
- <a href="#TOP">(back to top)</a>
- </TD>
- </TR>
- <TR>
- <TD width="20">
- <xsl:text> </xsl:text>
- </TD>
- <TD>
- <ul>
- <xsl:apply-templates select="$entries"/>
- </ul>
- </TD>
- </TR>
- </xsl:template>
-
- <xsl:template match="entry">
- <xsl:apply-templates select="file"/>
- </xsl:template>
-
- <xsl:template match="date">
- <i><xsl:value-of select="."/></i>
- </xsl:template>
-
- <xsl:template match="time">
- <i><xsl:value-of select="."/></i>
- </xsl:template>
-
- <xsl:template match="author">
- <i>
- <a>
- <xsl:attribute name="href">mailto:<xsl:value-of select="."/></xsl:attribute>
- <xsl:value-of select="."/>
- </a>
- </i>
- </xsl:template>
-
- <xsl:template match="file">
- <li>
- <a target="_new">
- <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" /></xsl:attribute>
- <xsl:value-of select="name" />
- </a>
- <xsl:if test="string-length(prevrevision) > 0 or string-length(revision) > 0">
- <xsl:text> </xsl:text>
- <a target="_new">
- <xsl:choose>
- <xsl:when test="string-length(prevrevision) = 0 ">
- <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?rev=<xsl:value-of select="revision" />&amp;content-type=text/x-cvsweb-markup</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&amp;r2=<xsl:value-of select="prevrevision"/>&amp;diff_format=h</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose> (<xsl:value-of select="revision"/>)
- </a>
- </xsl:if>
- </li>
- </xsl:template>
-
- <!-- Any elements within a msg are processed,
- so that we can preserve HTML tags. -->
- <xsl:template match="msg">
- <b><xsl:apply-templates/></b>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/build/tools/jakarta-ant-1.5.1/lib/README b/build/tools/jakarta-ant-1.5.1/lib/README
deleted file mode 100644
index 250f071e9..000000000
--- a/build/tools/jakarta-ant-1.5.1/lib/README
+++ /dev/null
@@ -1,15 +0,0 @@
-Please refer to the Ant manual under Installing Ant / Library
-Dependencies for a list of the jar requirements for various optional
-tasks and features.
-
-This directory contains xercesImpl.jar from the 2.2.0 release of
-Apache Xerces. For more information or newer releases see
-<http://xml.apache.org/xerces2-j/>. See the file LICENSE.xerces for
-the terms of distribution.
-
-It also contains xml-apis.jar, an Apache-controlled collection of
-standard classes from the 1.0b2 release of the Apache XML-Commons
-release. For more information or newer releases see
-<http://xml.apache.org/commons/>. See the files LICENSE.dom and
-LICENSE.sax for the terms of distribution.
-
diff --git a/build/tools/jakarta-ant-1.5.1/lib/ant.jar b/build/tools/jakarta-ant-1.5.1/lib/ant.jar
deleted file mode 100644
index 7cf87e838..000000000
--- a/build/tools/jakarta-ant-1.5.1/lib/ant.jar
+++ /dev/null
Binary files differ
diff --git a/build/tools/jakarta-ant-1.5.1/lib/iContract-jdk1_2.jar b/build/tools/jakarta-ant-1.5.1/lib/iContract-jdk1_2.jar
deleted file mode 100644
index a05cd9276..000000000
--- a/build/tools/jakarta-ant-1.5.1/lib/iContract-jdk1_2.jar
+++ /dev/null
Binary files differ
diff --git a/build/tools/jakarta-ant-1.5.1/lib/optional.jar b/build/tools/jakarta-ant-1.5.1/lib/optional.jar
deleted file mode 100644
index 1128e1d97..000000000
--- a/build/tools/jakarta-ant-1.5.1/lib/optional.jar
+++ /dev/null
Binary files differ
diff --git a/build/tools/jakarta-ant-1.5.1/lib/xercesImpl.jar b/build/tools/jakarta-ant-1.5.1/lib/xercesImpl.jar
deleted file mode 100644
index d41cf97ed..000000000
--- a/build/tools/jakarta-ant-1.5.1/lib/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/build/tools/jakarta-ant-1.5.1/lib/xml-apis.jar b/build/tools/jakarta-ant-1.5.1/lib/xml-apis.jar
deleted file mode 100644
index 8331d27f1..000000000
--- a/build/tools/jakarta-ant-1.5.1/lib/xml-apis.jar
+++ /dev/null
Binary files differ
diff --git a/build/tools/jakarta-ant-1.5.1/welcome.html b/build/tools/jakarta-ant-1.5.1/welcome.html
deleted file mode 100644
index 33f6a2a05..000000000
--- a/build/tools/jakarta-ant-1.5.1/welcome.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html>
-<head>
-<title>Welcome to Ant1.5</title>
-</head>
-<body bgcolor="#ffffff">
-<h1>Welcome to Ant1.5</h1>
-Hello, and welcome to Ant1.5
-<p>
-For new users to Ant, welcome to a new way to build your software.
-<p>
-For veteran Ant users, its been, what nine months since Ant 1.4.1
-shipped, and we've been as busy enhancing it as you've been using it.
-<p>
-
-We know you've been using Ant, not just from the all the bug reports we
-see, but from the awards we've been getting from JavaWorld and SD Magazine
-and from the fact that it is now clearly a mainstream product. Every quality IDE,
-from the Open Source projects: Emacs, NetBeans, Eclipse, JEdit, to the
-commercial offerings such as IntelliJ IDEA and JBuilder now have high
-quality Ant integration either built in or available as a
-download. And they do that not just because it improves their products,
-giving users the best of both worlds -great editors and a great build
-process, but because Java developers are starting to expect Ant (and
-JUnit) everywhere.
-<p>
-Even in mid-2001, if you said you were using Ant in your project, people
-would stare at you. Now, as long as you are talking with Java developers
-and not management or your family and friends, people will nod, shrug
-and maybe ask you questions about build file and Ant configurations. The good
-news: Ant 1.5 includes more helpful error messages and a new
-<tt>-diagnostics</tt> command to look at your Ant installation and help work out why
-things arent working.
-<p>
-Now, when you tell people you work on Ant in your spare time,
-people used to give you very funny stares; now they ask you about how to
-set up automated build processes, or deploy to some random app server.
-The good news: Ant 1.5 makes it easier to answer those questions.
-
-The other sign of mainstream is that there are also books on the
-subject, first Java Tools for Extreme Programming, then Ant: The
-Definitive Guide, and the first Ant1.5 book, Java Development with Ant,
-due to ship at the end of the month. (Steve says: I prefer the one with
-my name on the cover as co-author, but I'm biased).
-As usual, the manual has improved too:
-regardless of whether you need a book to work with Ant or not, you need
-that on-line documentation. And as usual, any extra contributions to the
-docs are welcome indeed.
-<p>
-Ant has also influenced how projects are built. Now when you download
-any open source project, or work with a closed source team, you expect
-to see a file called build.xml there. Equally important, you expect that
-build file to compile and run a set of tests using JUnit or a derivative
-thereof; if they are missing, you worry.
-<p>
-Together, Ant and JUnit have transformed the mainstream process for
-building and deploying Java projects. And that's pretty profound, when
-you think about it. What is equally impressive is that this was all done
-as a co-operative effort. Nobody works on Ant full-time; everybody uses
-it to solve their problems, to address their build crises and generally
-get something done in a hurry. It just so happens that the architectural
-model of Java classes bound via introspection to the XML build file
-makes it easy for people to add new tasks, extend existing ones and
-generally ease their way into developing and extending Ant. It is the
-users that have helped Ant become the success it is today, and will keep
-it that way tomorrow.
-<p>
-<h2>What has changed</h2>
-<p>
-So, what is new in Ant1.5? Lots of stuff. You will have to look at the
-<a href="WHATSNEW">whatsnew</a> file to see, but basically the changes
-fall into a number of categories
-<ol>
-<li>Bug fixes. We know, some things were broken in 1.4. In ant1.5 we
-have moved the bugs, fixing the ones we could, and no doubt adding
-different ones. Hopefully the total bug count has decreased.
-<li>Scalability. Changes in &lt;ant&gt; and a few other tasks should
-make it easier to write large, scalable build files.
-<li>Deployment. Take a look at the new &lt;serverdeploy&gt; task, add support
-for your server if it isnt there. Tomcat 4.1 has its own deployment
-tasks incidentally -fetch them from the tomcat pages.
-<li>Ease of use. We have added new attributes to make the archive tasks
-consistent with each other, new error messages for common problems (you
-get a screenful of help when a task wont instantiate, for example), and
-generally try and be helpful. As usual, we will accept contributions to
-the documentation or the code for even more helpfulness. Hey, in ant1.5
-you dont need to double escape the $ sign to preserve it in a string!
-<li>Java 1.4 support. We build and test fine on Java 1.4, and have the
-extensions to javac needed to build code with assertions in. We should
-point out that we have more work to do in this area: if someone wants to
-write an &lt;assertionset&gt; datatype to give users control of which assertions
-to enable, and patch this in to things like the &lt;junit&gt; and
-&lt;java&gt; tasks, things would get very interesting.
-<li>Continuous builds. Automated build tools are becoming more widely
-used; fork options on &lt;javac&gt; and &lt;javadoc&gt; are there to
-stop memory use growth on a continuous process.
-<li>New platforms: MacOS X for owners of those cute little laptops,
-Novell Netware servers, and even z/OS and OS/390 for mainframe
-developers who write their build files on their virtual card punches.
-<li>Conditions. Take a look at the &lt;condition&gt; tag to see what you can
-look for, then at &lt;waitfor&gt; to use the same tests in deployment.
-Finally, notice the <tt>if</tt> and <tt>unless</tt> attributes on
-&lt;fail&gt; for easy halting of the build on a condition, without
-having to resort to conditional targets.
-</ol>
-
-There are many more enhancements, so we hope you will find your build
-projects easier. We have, as usual, jumped through hoops to keep
-existing builds working, even those build files that went out their way
-to not work on Java 1.4 (hint: dont ask for the classic compiler, it has
-gone away). If your build file stops working, and it isnt something listed
-on the 'changes that may break your build' part of the WHATSNEW file, or
-something we know about on bugzilla, please dont hesitate to file a new
-bug report, preferably one with a replicable test and a patch to fix the
-problem.
-<p>
-Thanks,
-<p>
-The Ant development team.
-<p>
-PS: many thanks for Magesh to being the build manager for this release!
-He has been busy since Feb/March organizing it. Magesh -you are so good
-at this you should do it next time too :)
-</body></html>
-
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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 50c77a401..000000000
--- a/common/res/resources/schemas/MOA-ID-Configuration-1.1.xsd
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stephan G (Comp) -->
-<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.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.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="connectionBuilderImpl" type="xsd:string" use="optional"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ConnectionParameterServerAuthType">
- <xsd:sequence>
- <xsd:element name="AcceptedServerCertificates" type="xsd:anyURI" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>URL zu einem Verzeichnis, das akzeptierte Server-Zertifikate der TLS-Verbindung enthält (keine CA-Zertifikate)</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
- </xsd:complexType>
- <xsd:complexType name="ConnectionParameterClientAuthType">
- <xsd:complexContent>
- <xsd:extension base="ConnectionParameterServerAuthType">
- <xsd:sequence>
- <xsd:element name="ClientKeyStore" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>URL zu einem KeyStore, der den privaten Schlüssel, der für die TLS-Client-Authentisierung verwendetwird, enthält</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:simpleContent>
- <xsd:extension base="xsd:anyURI">
- <xsd:attribute name="password" type="xsd:string" use="optional"/>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="TrustProfileID" type="xsd:string"/>
- <xsd:simpleType name="ChainingModeType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="chaining"/>
- <xsd:enumeration value="pkix"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:simpleType name="BKUSelectionType">
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="HTMLComplete"/>
- <xsd:enumeration value="HTMLSelect"/>
- </xsd:restriction>
- </xsd:simpleType>
-</xsd:schema>
diff --git a/common/res/resources/schemas/MOA-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/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 f8941568d..000000000
--- a/common/src/at/gv/egovernment/moa/util/FileUtils.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package at.gv.egovernment.moa.util;
-
-import java.io.BufferedInputStream;
-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);
- }
-}
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());
- }
-
-}
diff --git a/id.oa/.classpath b/id.oa/.classpath
deleted file mode 100644
index 5af765a17..000000000
--- a/id.oa/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path=""/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/id.oa/.project b/id.oa/.project
deleted file mode 100644
index e49130a5f..000000000
--- a/id.oa/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>id.oa</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.ibm.etools.ctc.serviceprojectbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/id.oa/build.xml b/id.oa/build.xml
deleted file mode 100644
index adb191e76..000000000
--- a/id.oa/build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Ant Buildfile for MOA ID Auth component
-
- $Id$
-
--->
-<project name="id.oa" default="package" basedir=".">
- <property name="tmp" value="tmp"/>
- <property name="dist" value="${tmp}/dist"/>
-
- <!-- set up directories etc. -->
- <target name="init">
- <tstamp/>
- <echo>Time (hhmm): ${TSTAMP}</echo>
- <mkdir dir="${tmp}"/>
- <mkdir dir="${dist}"/>
- </target>
-
- <!-- package oa.war -->
- <target name="package" depends="init">
- <war warfile="${dist}/oa.war" webxml="web.xml">
- <fileset dir="html"/>
- </war>
- </target>
-
- <!-- clean temporary files -->
- <target name="clean">
- <delete dir="${tmp}"/>
- </target>
-</project>
diff --git a/id.oa/html/AuthTemplate.jsp b/id.oa/html/AuthTemplate.jsp
deleted file mode 100644
index 1fa0d1ef8..000000000
--- a/id.oa/html/AuthTemplate.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-<title>MOA ID Auth Sample Login - customized</title>
-</head>
-<body>
-<h1>MOA ID Auth Sample Login - customized</h1>
-<form name="CustomizedForm"
- action="<BKU>"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<XMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<DataURL>"/>
- <input type="submit" value="B&uuml;rgerkarte lesen"/>
-</form>
-<form name="CustomizedInfoForm"
- action="<BKU>"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<CertInfoXMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<CertInfoDataURL>"/>
- Hier finden Sie weitere Informationen zur &Uuml;berpr&uuml;fung der Zertifikate.
- <input type="submit" value="Weitere Info"/>
-</form></body>
-</html> \ No newline at end of file
diff --git a/id.oa/html/BKUSelectionTemplate.jsp b/id.oa/html/BKUSelectionTemplate.jsp
deleted file mode 100644
index 82c8518e9..000000000
--- a/id.oa/html/BKUSelectionTemplate.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head>
-<title>BKU Auswahl - customized</title>
-</head>
-<body>
-<h1><font color="green">BKU Auswahl - customized</font></h1>
-<p>
-<form method="post" action="<StartAuth>">
-<BKUSelect>
-<input type="submit" value="Ausw&auml;hlen"/>
-</form>
-</p>
-</body>
-</html> \ No newline at end of file
diff --git a/id.oa/html/auth.jsp b/id.oa/html/auth.jsp
deleted file mode 100644
index 0b563a83e..000000000
--- a/id.oa/html/auth.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<head>
-<title>MOA ID Auth Sample Login</title>
-</head>
-<body>
-<% /** assumes moa-id-auth and oa in the same servlet container,
- and moa-id-proxy on a different fixed location */
- String authUrlPath =
- request.getScheme() + "://"
- + request.getServerName() + ":" + request.getServerPort()
- + "/moa-id-auth/";
- String proxyUrlPath = "http://10.16.126.28:9080/moa-id-proxy/";
- String oaUrlPath =
- request.getScheme() + "://"
- + request.getServerName() + ":" + request.getServerPort()
- + "/oa/";
- String params =
- "Target=gb&" +
- "OA=" + proxyUrlPath + "index.jsp";
- String urlStartAuth =
- authUrlPath +
- "StartAuthentication?" +
- params;
- String templateParam =
- "&Template=" + oaUrlPath + "AuthTemplate.jsp";
- String urlStartAuthCustom =
- urlStartAuth +
- templateParam;
- String urlSelectBKU =
- authUrlPath +
- "SelectBKU?" +
- params;
- String urlSelectBKUCustom =
- urlSelectBKU +
- templateParam +
- "&BKUSelectionTemplate=" + oaUrlPath + "BKUSelectionTemplate.jsp";
-%>
-<a href="<%=urlStartAuth%>">Log in to sample application</a>
-<br>
-<a href="<%=urlStartAuthCustom%>">Log in to sample application using custom form</a>
-<br>
-<a href="<%=urlSelectBKU%>">Choose BKU (HTMLComplete or HTMLSelect) and log in</a>
-<br>
-<a href="<%=urlSelectBKUCustom%>">Choose BKU (HTMLSelect) using custom form and log in</a>
-<br>
-<a href="<%=authUrlPath+"StartAuthentication"%>">Wrong parameters example</a>
-</body>
-</html> \ No newline at end of file
diff --git a/id.oa/html/chooseBKU.jsp b/id.oa/html/chooseBKU.jsp
deleted file mode 100644
index 0135b6fdf..000000000
--- a/id.oa/html/chooseBKU.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<title>BKU Auswahl</title>
-</head>
-<body>
-<h1>BKU Auswahl</h1>
-<p>
-<form method="post" action="<%=request.getParameter("returnURI")%>">
-<select name="bkuURI">
- <option value="http://localhost:3495/http-security-layer-request" selected>Lokale B&uuml;rgerkarte</option>
- <option value="https://provider1.at:3496/http-security-layer-request">Provider eins</option>
- <option value="https://provider2.at:3496/http-security-layer-request">Provider zwei</option>
- <option value="https://10.16.126.28:3496/http-security-layer-request">B&uuml;rgerkarte Arbeitsplatz Paul Ivancsics</option>
-</select>
-<input type="submit" value="Ausw&auml;hlen"/>
-</form>
-</p>
-</body>
-</html> \ No newline at end of file
diff --git a/id.oa/html/form.jsp b/id.oa/html/form.jsp
deleted file mode 100644
index d439fa84d..000000000
--- a/id.oa/html/form.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ page import="java.util.*" %>
-<html>
-<head>
-<title>Sample Online Application</title>
-</head>
-<body>
-<h1>Sample Form</h1>
-<p>
-<form action="form.jsp">
-<% String param1 = request.getParameter("param1");
- if (param1 == null) param1 = ""; %>
-Input some text:
-<input type="text" name="param1" size="10"/>
-<br>Previous text input: <%=param1%><br>
-<input type="submit" value="Send"/>
-</form>
-</p>
-<p><a href="index.jsp">Back</a></p>
-</body>
-</html> \ No newline at end of file
diff --git a/id.oa/html/getBKUSelectTag.jsp b/id.oa/html/getBKUSelectTag.jsp
deleted file mode 100644
index 028dbd348..000000000
--- a/id.oa/html/getBKUSelectTag.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<select name="bkuURI">
- <option value="http://localhost:3495/http-security-layer-request" selected>Lokale B&uuml;rgerkarte</option>
- <option value="https://provider1.at:3496/http-security-layer-request">Provider eins</option>
- <option value="https://provider2.at:3496/http-security-layer-request">Provider zwei</option>
- <option value="https://10.16.126.28:3496/http-security-layer-request">B&uuml;rgerkarte Arbeitsplatz Paul Ivancsics</option>
-</select>
diff --git a/id.oa/html/index.jsp b/id.oa/html/index.jsp
deleted file mode 100644
index 5111e5103..000000000
--- a/id.oa/html/index.jsp
+++ /dev/null
@@ -1,56 +0,0 @@
-<%@ page import="java.util.*,javax.servlet.http.*,sun.misc.BASE64Decoder" %>
-<html>
-<head>
-<title>Sample Online Application</title>
-</head>
-<body>
-<h1>Sample Online Application</h1>
-
-<p>Request headers:
-<table border="1">
- <%
- /* collect parameters from request */
- for (Enumeration enum = request.getHeaderNames(); enum.hasMoreElements(); ) {
- String key = (String) enum.nextElement();
- String value = request.getHeader(key); %>
- <tr><td><%=key%></td><td><%=value%></td></tr>
- <% } %>
-</table>
-</p>
-
-<p>Request parameters:
-<table border="1">
- <%
- /* collect parameters from request */
- for (Enumeration enum = request.getParameterNames(); enum.hasMoreElements(); ) {
- String name = (String) enum.nextElement();
- String value = request.getParameter(name); %>
- <tr><td><%=name%></td><td><%=value%></td></tr>
- <% } %>
-</table>
-</p>
-
-<p>Cookies:
-<table border="1">
- <%
- /* collect attributes from request */
- Cookie[] cookies = request.getCookies();
- if (cookies != null) {
- for (int i = 0; i < cookies.length; i++) {
- Cookie cookie = cookies[i]; %>
- <tr><td><%=cookie.getName()%></td><td><%=cookie.getValue()%></td></tr>
- <% }
- } %>
-</table>
-</p>
-
-<% String authHeader = request.getHeader("Authorization");
- if (authHeader != null) {
- authHeader = authHeader.substring(authHeader.indexOf(" ")+1);
- String decAuthHeader = new String(new BASE64Decoder().decodeBuffer(authHeader));
-%>
-<p>Basic authentication credentials: <%=decAuthHeader%></p>
-<% } %>
-<p><a href="form.jsp">Form sample</a></p>
-</body>
-</html> \ No newline at end of file
diff --git a/id.oa/html/stateful_login.jsp b/id.oa/html/stateful_login.jsp
deleted file mode 100644
index eaede507f..000000000
--- a/id.oa/html/stateful_login.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ page import="javax.servlet.http.*" %>
-<%
- /* check request's remote IP address - must be moa-id-proxy's address */
- String remoteIPAddress = request.getRemoteAddr();
- if (! "127.0.0.1".equals(remoteIPAddress)) { /* Substitute "127.0.0.1" for moa-id-proxy's IP address */
- response.setStatus(403);
- return;
- }
-
- /* store authentication data in cookies */
- String fn = request.getParameter("FamilyName");
- String gn = request.getParameter("GivenName");
- /* set cookie domain and cookie path ! */
- String cookieDomain = ".test.test"; /* Set this to the common domain of moa-id-proxy and of the online application */
- String cookiePath = request.getContextPath(); /* Set this to the context path of the online application */
-
- Cookie cfn = new Cookie("familyname", fn);
- cfn.setDomain(cookieDomain);
- cfn.setPath(cookiePath);
- response.addCookie(cfn);
-
- Cookie cgn = new Cookie("givenname", gn);
- cgn.setDomain(cookieDomain);
- cgn.setPath(cookiePath);
- response.addCookie(cgn);
-
- /* redirect to online application's start page */
- response.sendRedirect("http://oa.test.test:8080/oa/index.jsp"); /* Substitute for URL in online application */
-%>
diff --git a/id.oa/web.xml b/id.oa/web.xml
deleted file mode 100644
index 13158fdaa..000000000
--- a/id.oa/web.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-
-<web-app>
- <display-name>Sample OA</display-name>
- <description>MOA Sample OA</description>
-</web-app>
-
diff --git a/id.server/.classpath b/id.server/.classpath
deleted file mode 100644
index 296c5f2ea..000000000
--- a/id.server/.classpath
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="res"/>
- <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/jaxp-1.2_01/dom.jar"/>
- <classpathentry kind="lib" path="lib/jsse-1.0.3_01/jcert.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.7/log4j-1.2.7.jar"/>
- <classpathentry kind="lib" path="lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip"/>
- <classpathentry kind="lib" path="lib/xalan-j-2.2/xalan.jar"/>
- <classpathentry kind="lib" path="lib/xerces-j-2.0.2/xercesImpl.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging-1.0.2/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/jaxen-1.0/jaxen-dom.jar"/>
- <classpathentry kind="lib" path="lib/jaxen-1.0/saxpath.jar"/>
- <classpathentry kind="lib" path="lib/jaxp-1.2_01/jaxp-api.jar"/>
- <classpathentry kind="lib" path="lib/jaxp-1.2_01/sax.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="lib" path="lib/xerces-j-2.0.2/xmlParserAPIs.jar"/>
- <classpathentry kind="lib" path="/common/lib/junit-3.8.1/junit.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.1rc2/axis.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.1rc2/commons-discovery.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.1rc2/jaxrpc.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.1rc2/saaj.jar"/>
- <classpathentry kind="lib" path="lib/moa-spss-1.0.8a/moa-spss.jar"/>
- <classpathentry kind="src" path="/common"/>
- <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik_ecc.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik_jce_full.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik_ldap.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik_X509TrustManager.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik-moa-full.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-1.06/ixsil.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/id.server/.cvsignore b/id.server/.cvsignore
deleted file mode 100644
index 7c18d5ded..000000000
--- a/id.server/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-tmp
diff --git a/id.server/.project b/id.server/.project
deleted file mode 100644
index 4ad8f922f..000000000
--- a/id.server/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>id.server</name>
- <comment></comment>
- <projects>
- <project>common</project>
- </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/id.server/.tomcatplugin b/id.server/.tomcatplugin
deleted file mode 100644
index 1916163e0..000000000
--- a/id.server/.tomcatplugin
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tomcatProjectProperties>
- <rootDir>/</rootDir>
- <exportSource>false</exportSource>
- <updateXml>true</updateXml>
- <warLocation></warLocation>
- <webPath>/id.server</webPath>
-</tomcatProjectProperties>
diff --git a/id.server/MOA-ID_release_notes.txt b/id.server/MOA-ID_release_notes.txt
deleted file mode 100644
index 3ad23801f..000000000
--- a/id.server/MOA-ID_release_notes.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-moa-id release notes
-====================
-
-1.0.1 20030509
---------------
-doc ergänzt (administrationshandbuch)
-javadoc ergänzt
-abnahmetests 651, 652 ergänzt
-beispielkonfiguration erweitert, dateien tw. umbenannt
-neueste versionen von moa-spss(1.0.3) u. iaik-moa(1.04)
-
-1.0.2 20030516
---------------
-doc ergänzt (anwendungshandbuch, api-doc)
-manche libraries von endorsed ins moa-id-xxx.war verlagert (analog zu moa-spss)
-beispielkonfiguration berichtigt
-neueste versionen von moa-spss(1.0.4) u. iaik-moa(1.05)
-unterstützung für hotsign version 1.2SR3b
-
-1.0.3 20030606
---------------
-moa-spss-1.0.6 u. iaik-moa-1.06
-mängel behoben:
-5.3.1
-5.3.2
-5.3.3
-5.3.4
-5.3.5
-5.3.7 Beispiel für Stateful OA: id.oa/html/stateful_login.jsp
-5.3.8 Logging Hierarchien moa.id.auth,moa.id.proxy
-5.3.9
-5.3.13
-5.4.1
-5.5.3
-mängel in id-admin_1.htm und id-admin_2.htm behoben, mit ausnahme von "jdk1.4"
-
-1.0.4 20030612
---------------
-mängel behoben:
-5.3.6
-5.3.10
-5.3.11
-5.3.12
-5.3.14
-5.3.15
-5.5.1
-mängel in dokumentation behoben
-
-1.0.4a 20030618
----------------
-bugfix moa-id-proxy: persistente connections
-
-1.0.5 20030714
----------------
-moa-spss-1.0.8
-mängel behoben:
-5.5.2
-6.4.2
-6.4.3
-6.4.4
-6.4.5
-6.5.1
-6.5.2 (siehe Doku id-admin_1.htm, Deployment von MOA-ID-Proxy)
-6.5.3
-6.5.4
-6.5.7
-mängel in dokumentation behoben
-
-1.0.6 20030723
---------------
-mängel behoben:
-6.4.7
-6.4.8
-6.5.5
-6.7.1
-6.7.2
-6.7.3
-6.7.4
-6.7.5
-6.8.1
-6.8.2
-6.8.3
-
-1.1 20030811
---------------
-Cookie-Handling
-Server-Response-Code 401 (HTTP_UNAUTHORIZED) in Verbindung mit Basic Authentication
-Server-Response-Code 304 (HTTP_NOT_MODIFIED)
-Basic-Authentication-Bug fixed \ No newline at end of file
diff --git a/id.server/build.xml b/id.server/build.xml
deleted file mode 100644
index 708eab22f..000000000
--- a/id.server/build.xml
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Ant Buildfile for MOA ID Auth and Proxy components
-
- $Id$
-
--->
-<project name="moa.id.server" default="dist-all" basedir=".">
- <property environment="env"/>
- <property name="version" value="1.1"/>
- <property name="src" value="src"/>
- <property name="res" value="res"/>
- <property name="data" value="data"/>
- <property name="doc" value="doc"/>
- <property name="html" value="html"/>
- <property name="html.auth" value="${html}/auth"/>
- <property name="webinf.auth" value="${html.auth}/WEB-INF"/>
- <property name="html.proxy" value="${html}/proxy"/>
- <property name="webinf.proxy" value="${html.proxy}/WEB-INF"/>
- <property name="tmp" value="tmp"/>
- <property name="compile" value="${tmp}/compile"/>
- <property name="api-doc" value="${tmp}/api-doc"/>
- <property name="api-doc.internal" value="${tmp}/api-doc-internal"/>
- <property name="dist" value="${tmp}/dist"/>
- <property name="dist.auth" value="${dist}/auth"/>
- <property name="dist.auth-zip" value="${dist}/auth-zip"/>
- <property name="dist.proxy" value="${dist}/proxy"/>
- <property name="dist.proxy-zip" value="${dist}/proxy-zip"/>
- <property name="dist.src" value="${dist}/src"/>
- <property name="dist.src-zip" value="${dist}/src-zip"/>
- <property name="prj.build" value="../build"/>
- <property name="prj.common" value="../common"/>
- <property name="prj.oa" value="../id.oa"/>
- <property name="lib" value="lib"/>
- <property name="lib.axis" value="${lib}/axis-1.1rc2"/>
- <property name="lib.commons-logging" value="${lib}/commons-logging-1.0.2"/>
- <property name="lib.iaik-moa" value="${lib}/iaik-moa-1.06"/>
- <property name="lib.jaxen" value="${lib}/jaxen-1.0"/>
- <property name="lib.jaxp" value="${lib}/jaxp-1.2_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.log4j" value="${lib}/log4j-1.2.7"/>
- <property name="lib.moa-spss" value="${lib}/moa-spss-1.0.8a"/>
- <property name="lib.postgres-jdbc" value="${lib}/postgres-jdbc2-7.3"/>
- <property name="lib.servlet" value="${lib}/servlet-2.3"/>
- <property name="lib.xalan" value="${lib}/xalan-j-2.2"/>
- <property name="lib.xerces" value="${lib}/xerces-j-2.0.2"/>
-
- <path id="compile.classpath">
- <pathelement location="${lib.axis}/axis.jar"/>
- <pathelement location="${lib.axis}/jaxrpc.jar"/>
- <pathelement location="${lib.axis}/saaj.jar"/>
- <pathelement location="${lib.jaxp}/jaxp-api.jar"/>
- <pathelement location="${lib.jaxp}/dom.jar"/>
- <pathelement location="${lib.jaxp}/sax.jar"/>
- <pathelement location="${lib.xerces}/xerces.jar"/>
- <pathelement location="${lib.jaxen}/jaxen-core.jar"/>
- <pathelement location="${lib.jaxen}/jaxen-dom.jar"/>
- <pathelement location="${lib.jaxen}/saxpath.jar"/>
- <pathelement location="${lib.xalan}/xalan.jar"/>
- <pathelement location="${lib.junit}/junit.jar"/>
- <fileset dir="${lib.jsse}" />
- <pathelement location="${lib.commons-logging}/commons-logging-api.jar"/>
- <pathelement location="${lib.commons-discovery}/commons-discovery.jar"/>
- <pathelement location="${lib.servlet}/servlet-2_3-fcs-classfiles.zip"/>
- <pathelement location="${lib.iaik-moa}/iaik-moa-full.jar"/>
- <pathelement location="${lib.iaik-moa}/ixsil.jar"/>
- <pathelement location="${lib.iaik-moa}/iaik_ecc.jar"/>
- <pathelement location="${lib.iaik-moa}/iaik_ldap.jar"/>
- <pathelement location="${lib.iaik-moa}/iaik_X509TrustManager.jar"/>
- <pathelement location="${lib.iaik-moa}/iaik_jce_full.jar"/>
- <pathelement location="${lib.moa-spss}/moa-common.jar"/>
- <pathelement location="${lib.moa-spss}/moa-spss.jar"/>
- <pathelement location="${env.MOA_COMMON_TEST_JAR}"/>
- </path>
-
- <!-- set up directories etc. -->
- <target name="init">
- <tstamp/>
- <echo>Time (hhmm): ${TSTAMP}</echo>
- <mkdir dir="${tmp}"/>
- <mkdir dir="${compile}"/>
- <mkdir dir="${api-doc.internal}"/>
- <mkdir dir="${dist.auth}"/>
- <mkdir dir="${dist.auth-zip}"/>
- <mkdir dir="${dist.proxy}"/>
- <mkdir dir="${dist.proxy-zip}"/>
- <mkdir dir="${dist.src}"/>
- <mkdir dir="${dist.src-zip}"/>
- </target>
-
- <!-- compile everything -->
- <target name="compile" depends="init">
- <fail message="env.MOA_COMMON_TEST_JAR not set" unless="env.MOA_COMMON_TEST_JAR"/>
- <javac srcdir= "${src}" destdir="${compile}" classpathref="compile.classpath" debug="on"/>
- </target>
-
- <!-- package moa-id-auth.war -->
- <target name="package-auth" depends="compile">
- <war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml">
- <fileset dir="${html.auth}" includes="errorpage.jsp,WEB-INF/server-config.wsdd"/>
- <lib dir="${lib.axis}"/>
- <lib dir="${lib.jaxen}"/>
- <lib dir="${lib.iaik-moa}" excludes="iaik_jce_full.jar,iaik_ldap.jar"/>
- <lib dir="${lib.moa-spss}"/>
- <lib dir="${lib.postgres-jdbc}"/>
- <lib dir="${lib.commons-logging}" includes="commons-logging.jar"/>
- <lib dir="${lib.xalan}"/>
- <lib dir="${lib.jaxp}"/>
- <lib dir="${lib.log4j}"/>
- <classes dir="${compile}">
- <exclude name="**/proxy/**"/>
- <exclude name="test/**"/>
- </classes>
- <classes dir="${res}"/>
- </war>
- </target>
-
- <!-- package moa-id-proxy.war -->
- <target name="package-proxy" depends="compile">
- <war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml">
- <lib dir="${lib.axis}"/>
- <lib dir="${lib.jaxen}"/>
- <lib dir="${lib.iaik-moa}" excludes="iaik_jce_full.jar,iaik_ldap.jar"/>
- <lib dir="${lib.moa-spss}" includes="moa-common.jar"/>
- <lib dir="${lib.commons-logging}" includes="commons-logging.jar"/>
- <lib dir="${lib.xalan}"/>
- <lib dir="${lib.jaxp}"/>
- <lib dir="${lib.log4j}"/>
- <lib dir="${lib.postgres-jdbc}"/>
- <classes dir="${compile}">
- <exclude name="**/auth/**"/>
- <exclude name="test/**"/>
- </classes>
- <classes dir="${res}"/>
- </war>
- </target>
-
- <!-- create JavaDoc for the MOA-ID API -->
- <target name="api-doc" depends="init">
- <javadoc defaultexcludes="yes"
- destdir="${api-doc}"
- author="false"
- version="false"
- use="true"
- windowtitle="MOA ID API"
- sourcefiles=
- "src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java,src/at/gv/egovernment/moa/id/AuthenticationException.java,src/at/gv/egovernment/moa/id/data/AuthenticationData.java,src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java,src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java,src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java"
- >
- <link offline="false" href="http://java.sun.com/j2se/1.3/docs/api/"/>
- <doctitle><![CDATA[<h1>MOA ID API</h1>]]></doctitle>
- <classpath refid="compile.classpath"/>
- </javadoc>
- </target>
-
- <!-- create JavaDoc for the server internal classes -->
- <target name="api-doc-internal" depends="init">
- <javadoc defaultexcludes="yes"
- destdir="${api-doc.internal}"
- author="true"
- version="true"
- use="true"
- windowtitle="MOA ID Server Internal API">
- <packageset dir="${prj.common}/src">
- <exclude name="test/**"/>
- </packageset>
- <packageset dir="src">
- <exclude name="test/**"/>
- </packageset>
- <group title="MOA ID Exception Classes"
- packages="at.gv.egovernment.moa.id">
- </group>
- <group title="MOA ID Configuration">
- <package name="at.gv.egovernment.moa.id.config"/>
- <package name="at.gv.egovernment.moa.id.config.auth"/>
- <package name="at.gv.egovernment.moa.id.config.proxy"/>
- </group>
- <group title="MOA ID Authentication Server">
- <package name="at.gv.egovernment.moa.id.auth"/>
- <package name="at.gv.egovernment.moa.id.auth.builder"/>
- <package name="at.gv.egovernment.moa.id.auth.data"/>
- <package name="at.gv.egovernment.moa.id.auth.invoke"/>
- <package name="at.gv.egovernment.moa.id.auth.parser"/>
- <package name="at.gv.egovernment.moa.id.auth.validator"/>
- </group>
- <group title="MOA ID Authentication Servlets and Web Services">
- <package name="at.gv.egovernment.moa.id.auth.servlet"/>
- </group>
- <group title="MOA ID Data Classes">
- <package name="at.gv.egovernment.moa.id.data"/>
- </group>
- <group title="MOA ID TrustManager">
- <package name="at.gv.egovernment.moa.id.iaik.pki.jsse"/>
- <package name="at.gv.egovernment.moa.id.iaik.pki"/>
- <package name="at.gv.egovernment.moa.id.iaik.config"/>
- <package name="at.gv.egovernment.moa.id.iaik.servertools.observer"/>
- </group>
- <group title="MOA ID Proxy Server">
- <package name="at.gv.egovernment.moa.id.proxy"/>
- <package name="at.gv.egovernment.moa.id.proxy.builder"/>
- <package name="at.gv.egovernment.moa.id.proxy.invoke"/>
- <package name="at.gv.egovernment.moa.id.proxy.parser"/>
- </group>
- <group title="MOA ID Proxy Servlet">
- <package name="at.gv.egovernment.moa.id.proxy.servlet"/>
- </group>
- <group title="Utilities">
- <package name="at.gv.egovernment.moa.util"/>
- <package name="at.gv.egovernment.moa.id.util"/>
- </group>
- <group title="Logging">
- <package name="at.gv.egovernment.moa.logging"/>
- </group>
- <link offline="false" href="http://java.sun.com/j2se/1.3/docs/api/"/>
- <link offline="false" href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
- <doctitle><![CDATA[<h1>MOA ID Server Internal API</h1>]]></doctitle>
- <classpath refid="compile.classpath"/>
- </javadoc>
- </target>
-
- <!-- create the moa-id-auth distributable -->
- <target name="dist-auth" depends="package-auth">
- <copy toDir="${dist.auth}/conf">
- <fileset dir="${data}/deploy/conf" excludes="moa-id/oa/**"/>
- </copy>
- <mkdir dir="${dist.auth}/conf/moa-id/certs/certstore"/>
- <mkdir dir="${dist.auth}/conf/moa-id/certs/ca-certs"/>
- <mkdir dir="${dist.auth}/conf/moa-id/certs/server-certs"/>
- <copy todir="${dist.auth}/doc">
- <fileset dir="${doc}"/>
- </copy>
- <copy toDir="${dist.auth}/ext13">
- <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
- <fileset dir="${lib.jsse}"/>
- </copy>
- <copy toDir="${dist.auth}/ext14">
- <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
- </copy>
- <copy toDir="${dist.auth}/endorsed">
- <fileset dir="${lib.xerces}"/>
- </copy>
- <copy todir="${dist.auth}/tomcat">
- <fileset dir="${data}/deploy/tomcat"/>
- </copy>
- </target>
-
- <!-- create the zipped moa-id-auth distributable -->
- <target name="dist-auth-zip" depends="dist-auth">
- <zip zipfile="${dist.auth-zip}/moa-id-auth-${version}.zip">
- <zipfileset dir="${dist.auth}" prefix="moa-id-auth-${version}"/>
- </zip>
- </target>
-
- <!-- create the moa-id-proxy distributable -->
- <target name="dist-proxy" depends="package-proxy">
- <copy toDir="${dist.proxy}/conf">
- <fileset dir="${data}/deploy/conf" excludes="moa-spss/**,moa-id/transforms/**"/>
- </copy>
- <mkdir dir="${dist.proxy}/conf/moa-id/certs/certstore"/>
- <mkdir dir="${dist.proxy}/conf/moa-id/certs/ca-certs"/>
- <mkdir dir="${dist.proxy}/conf/moa-id/certs/server-certs"/>
- <copy todir="${dist.proxy}/doc">
- <fileset dir="${doc}"/>
- </copy>
- <copy toDir="${dist.proxy}/ext13">
- <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
- <fileset dir="${lib.jsse}"/>
- </copy>
- <copy toDir="${dist.proxy}/ext14">
- <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
- </copy>
- <copy toDir="${dist.proxy}/endorsed">
- <fileset dir="${lib.xerces}"/>
- </copy>
- <copy todir="${dist.proxy}/tomcat">
- <fileset dir="${data}/deploy/tomcat"/>
- </copy>
- </target>
-
- <!-- create the zipped moa-id-proxy distributable -->
- <target name="dist-proxy-zip" depends="dist-proxy">
- <zip zipfile="${dist.proxy-zip}/moa-id-proxy-${version}.zip">
- <zipfileset dir="${dist.proxy}" prefix="moa-id-proxy-${version}"/>
- </zip>
- </target>
-
- <!-- create the source distributable -->
- <target name="dist-src" depends="init">
- <copy toDir="${dist.src}/build">
- <fileset dir="${prj.build}"/>
- </copy>
- <copy toDir="${dist.src}/common">
- <fileset dir="${prj.common}" excludes="tmp/**, bin/**"/>
- </copy>
- <copy toDir="${dist.src}/id.server">
- <fileset dir="." excludes="tmp/**, bin/**"/>
- </copy>
- <copy toDir="${dist.src}/id.oa">
- <fileset dir="${prj.oa}" excludes="tmp/**"/>
- </copy>
- </target>
-
- <!-- create the source distributable, including javadoc -->
- <target name="dist-src-doc" depends="dist-src,api-doc-internal">
- <copy toDir="${dist.src}/doc/api-doc-internal">
- <fileset dir="${api-doc.internal}"/>
- </copy>
- </target>
-
- <!-- create the zipped source distributable -->
- <target name="dist-src-zip" depends="init,dist-src-doc">
- <zip zipfile="${dist.src-zip}/moa-id-${version}-src.zip">
- <zipfileset dir="${dist.src}" prefix="moa-id-${version}-src"/>
- </zip>
- </target>
-
- <!-- create all the distributables -->
- <target name="dist-all" depends="dist-auth-zip,dist-proxy-zip,dist-src-zip"/>
-
- <!-- deploy moa-id-auth to catalina (needs MOA_AUTH_DEPLOY defined) -->
- <target name="deploy-auth" depends="dist-auth">
- <fail message="env.MOA_AUTH_DEPLOY not set" unless="env.MOA_AUTH_DEPLOY"/>
- <property name="deploy" value="${env.MOA_AUTH_DEPLOY}"/>
- <property name="deploy.webapps" value="${deploy}/webapps"/>
- <delete dir="${deploy.webapps}/moa-id-auth"/>
- <copy file="${dist.auth}/moa-id-auth.war" todir="${deploy.webapps}"/>
- <!-- copy sample configuration -->
- <copy toDir="${deploy}/conf">
- <fileset dir="${dist.auth}/conf"/>
- </copy>
- <!-- copy libraries to MOA_AUTH_DEPLOY/common/endorsed -->
- <copy toDir="${deploy}/common/endorsed">
- <fileset dir="${dist.auth}/endorsed"/>
- </copy>
- </target>
-
- <!-- deploy moa-id-proxy to catalina (needs MOA_PROXY_DEPLOY defined) -->
- <target name="deploy-proxy" depends="dist-proxy">
- <fail message="env.MOA_PROXY_DEPLOY not set" unless="env.MOA_PROXY_DEPLOY"/>
- <property name="deploy.proxy" value="${env.MOA_PROXY_DEPLOY}"/>
- <property name="deploy.proxy.webapps" value="${deploy.proxy}/webapps"/>
- <delete dir="${deploy.proxy.webapps}/moa-id-proxy"/>
- <copy file="${dist.proxy}/moa-id-proxy.war" todir="${deploy.proxy.webapps}"/>
- <!-- copy sample configuration -->
- <copy toDir="${deploy.proxy}/conf">
- <fileset dir="${dist.proxy}/conf"/>
- </copy>
- <!-- copy libraries to MOA_PROXY_DEPLOY/common/endorsed -->
- <copy toDir="${deploy.proxy}/common/endorsed">
- <fileset dir="${dist.proxy}/endorsed"/>
- </copy>
- </target>
-
- <!-- clean temporary files -->
- <target name="clean">
- <delete dir="${tmp}"/>
- </target>
-</project>
diff --git a/id.server/data/abnahme-test/conf/CopyConfigAbnahme.bat b/id.server/data/abnahme-test/conf/CopyConfigAbnahme.bat
deleted file mode 100644
index 3e90dc52e..000000000
--- a/id.server/data/abnahme-test/conf/CopyConfigAbnahme.bat
+++ /dev/null
@@ -1,40 +0,0 @@
-
-echo --------------------
-Echo Richte moa-sp ein
-echo --------------------
-md C:\programme\apacheGroup\abnahme\conf\moa
-md C:\programme\apacheGroup\abnahme\conf\moa\keys
-md C:\programme\apacheGroup\abnahme\conf\moa\profiles
-md C:\programme\apacheGroup\abnahme\conf\moa\trustprofiles
-md C:\programme\apacheGroup\abnahme\conf\moa-id
-md C:\programme\apacheGroup\abnahme\conf\moa-id\Transforms
-
-
-copy moa\server.xml C:\programme\apacheGroup\abnahme\conf\server.xml
-copy server.keystore C:\programme\apacheGroup\abnahme\server.keystore
-
-copy log4j.properties C:\programme\apacheGroup\abnahme\conf\moa\log4j.properties
-copy moa\ConfigurationTest.xml C:\programme\apacheGroup\abnahme\conf\moa\ConfigurationTest.xml
-xcopy moa\common\*.* C:\programme\apacheGroup\abnahme\common\*.* /s/e
-del C:\programme\apacheGroup\abnahme\conf\moa\trustprofiles\TrustProfile1 /S/Q
-del C:\programme\apacheGroup\abnahme\conf\moa\trustprofiles\TrustProfile2 /S/Q
-del C:\programme\apacheGroup\abnahme\conf\moa\profiles\*.* /S/Q
-del C:\programme\apacheGroup\abnahme\conf\moa\keys\*.* /S/Q
-copy moa\keys\*.* C:\programme\apacheGroup\abnahme\conf\moa\keys\*.*
-copy moa\profiles\*.* C:\programme\apacheGroup\abnahme\conf\moa\profiles\*.*
-xcopy moa\TrustProfile1\*.* C:\programme\apacheGroup\abnahme\conf\moa\trustprofiles\TrustProfile1\*.* /s/e
-xcopy moa\TrustProfile2\*.* C:\programme\apacheGroup\abnahme\conf\moa\trustprofiles\TrustProfile2\*.* /s/e
-rd C:\programme\apacheGroup\abnahme\conf\moa\trustprofiles\TrustProfile1\Cvs /S/Q
-rd C:\programme\apacheGroup\abnahme\conf\moa\trustprofiles\TrustProfile2\Cvs /S/Q
-rd C:\programme\apacheGroup\abnahme\conf\moa\trustprofiles\Cvs /S/Q
-rd C:\programme\apacheGroup\abnahme\common\moa\endorsed\Cvs /S/Q
-echo --------------------
-Echo Rrichte moa-auth ein
-echo --------------------
-copy moa-id\ConfigurationTest.xml C:\programme\apacheGroup\abnahme\conf\moa-id\ConfigurationTest.xml
-
-copy transforms\TransformsInfosHTML.xml C:\programme\apacheGroup\abnahme\conf\moa-id\Transforms\TransformsInfosHTML.xml
-echo --------------------
-Echo Kopiere Start-Skript
-echo --------------------
-copy moa\runAbnahme.bat C:\programme\apacheGroup\abnahme\runAbnahme.bat
diff --git a/id.server/data/abnahme-test/conf/OAConfBasicAuth.xml b/id.server/data/abnahme-test/conf/OAConfBasicAuth.xml
deleted file mode 100644
index 61455f903..000000000
--- a/id.server/data/abnahme-test/conf/OAConfBasicAuth.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<!--Sample XML file generated by XMLSPY v5 U (http://www.xmlspy.com)-->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateful</LoginType>
- <BasicAuth>
- <UserID>MOAGivenName</UserID>
- <Password>MOAFamilyName</Password>
- </BasicAuth>
-</Configuration>
diff --git a/id.server/data/abnahme-test/conf/OAConfHeaderAuth.xml b/id.server/data/abnahme-test/conf/OAConfHeaderAuth.xml
deleted file mode 100644
index c92e055e9..000000000
--- a/id.server/data/abnahme-test/conf/OAConfHeaderAuth.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<!--Sample XML file generated by XMLSPY v5 U (http://www.xmlspy.com)-->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateful</LoginType>
- <HeaderAuth>
- <Header Name="Param1" Value="MOAPublicAuthority"/>
- <Header Name="Param2" Value="MOABKZ"/>
- <Header Name="Param3" Value="MOAQualifiedCertificate"/>
- <Header Name="Param4" Value="MOAZMRZahl"/>
- <Header Name="Param5" Value="MOAIPAddress"/>
- </HeaderAuth>
-</Configuration>
diff --git a/id.server/data/abnahme-test/conf/OAConfParamAuth.xml b/id.server/data/abnahme-test/conf/OAConfParamAuth.xml
deleted file mode 100644
index a70f6a6c0..000000000
--- a/id.server/data/abnahme-test/conf/OAConfParamAuth.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<!--Sample XML file generated by XMLSPY v5 U (http://www.xmlspy.com)-->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateful</LoginType>
- <ParamAuth>
- <Parameter Name="Param1" Value="MOADateOfBirth"/>
- <Parameter Name="Param2" Value="MOAVPK"/>
- </ParamAuth>
-</Configuration>
diff --git a/id.server/data/abnahme-test/conf/deploy_AUTH.bat b/id.server/data/abnahme-test/conf/deploy_AUTH.bat
deleted file mode 100644
index adb168f09..000000000
--- a/id.server/data/abnahme-test/conf/deploy_AUTH.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-
-cd ..\..\..\..\build\scripts\
-Echo Entferne temporäre Projekt-Dateien und erstelle moa-id-auth.war
-call build id.server clean >null
-call build id.server dist-auth >null
-Echo Lösche altes .war-File vom Server und kopiere neu erzeugte Web-App
-del C:\programme\ApacheGroup\abnahme\webapps\moa-id-auth.war /Q/F/S
-rd C:\programme\ApacheGroup\abnahme\webapps\moa-id-auth /S/Q
-copy ..\..\id.server\tmp\dist\auth\moa-id-auth.war C:\programme\ApacheGroup\abnahme\webapps\moa-id-auth.war
-cd ..\..\id.server\data\abnahme-test\conf
-C:
-cd C:\programme\ApacheGroup\abnahme
diff --git a/id.server/data/abnahme-test/conf/log4j.properties b/id.server/data/abnahme-test/conf/log4j.properties
deleted file mode 100644
index 86aa9c994..000000000
--- a/id.server/data/abnahme-test/conf/log4j.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Sample log4j configuration for the MOA-SPSS web service
-#
-
-# commons-logging setup
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-
-# Define log4j root loggers for the 'moa.spss.server' and 'iaik.server'
-# logging hierarchies.
-# All logging output is written to the 'stdout' and 'R' appenders.
-# Add JDBC if you also want to write it to the database
-log4j.rootLogger=info, stdout, R
-log4j.logger.moa.spss.server=info
-log4j.logger.iaik.server=info
-log4j.moa=debug
-
-# Configure the 'stdout appender' to write logging output to the console
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
-
-# Configure the rolling file appender 'R' to write logging output
-# to the file 'moa-spss.log'. The file is rolled over every 1000KB,
-# and a maximum history of 4 log files is being kept.
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=moa-spss.log
-log4j.appender.R.MaxFileSize=1000KB
-log4j.appender.R.MaxBackupIndex=4
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
-
-# Configure the jdbc appender 'JDBC' to write logging output
-# to the given PostgreSQL database
-# a suitable table called 'spss_log' must have been created in the
-# database using the command:
-# create table spss_log (log_time timestamp, log_level varchar(5), log_msg varchar(256))
-log4j.appender.JDBC=org.apache.log4j.jdbc.JDBCAppender
-log4j.appender.JDBC.driver=org.postgresql.Driver
-log4j.appender.JDBC.URL=jdbc:postgresql://10.16.46.108/moa?user=moa&password=moatest
-log4j.appender.JDBC.layout=org.apache.log4j.PatternLayout
-log4j.appender.JDBC.sql=INSERT INTO spss_log (log_time, log_level, log_msg) VALUES ('%d{ yyyy-MM-dd HH:mm:ss.SSS}', '%5p', '%m') \ No newline at end of file
diff --git a/id.server/data/abnahme-test/conf/moa-id/ConfigurationTest.xml b/id.server/data/abnahme-test/conf/moa-id/ConfigurationTest.xml
deleted file mode 100644
index f2e23f2e2..000000000
--- a/id.server/data/abnahme-test/conf/moa-id/ConfigurationTest.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <SecurityLayer>
- <TransformsInfo filename="file:/C:/Programme/ApacheGroup/abnahme/conf/moa-id/Transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>file:/C:/Programme/ApacheGroup/abnahme/conf/moa-id/certs/server-certs</AcceptedServerCertificates>
- <!--<ClientKeyStore password="Keystore Pass">file:/c:/</ClientKeyStore> -->
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="http://moatestlinux:18080/moa-id-auth/services/GetAuthenticationData">
- <!-- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore> -->
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:/c:/Programme/ApacheGroup/abnahme/conf/moa-id/oa/OAConf.xml" sessionTimeOut="600">
- <ConnectionParameter URL="https://moatestlinux:18443/oa/">
- <AcceptedServerCertificates>file:/C:/Programme/ApacheGroup/abnahme/conf/moa-id/oa/server-certs/tomcat</AcceptedServerCertificates>
-<!-- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore> -->
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://10.16.126.28:9443/moa-id-proxy/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:/c:/Programme/ApacheGroup/abnahme/conf/moa-id/oa/OAConf.xml" sessionTimeOut="20">
- <ConnectionParameter URL="https://moatestlinux:18443/oa/">
- <AcceptedServerCertificates>file:/home/moa/id/abnahme/conf/moa-id/oa/server-certs/tomcat</AcceptedServerCertificates>
- <!-- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore> -->
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="/home/moa/id/abnahme/conf/moa-id/certs/cert-store-root"/>
- <GenericConfiguration name="TLSTrustedCACertificates" value="file:/home/moa/id/abnahme/conf/moa-id/certs/ca-certs"/>
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/conf/moa/ConfigurationTest.xml b/id.server/data/abnahme-test/conf/moa/ConfigurationTest.xml
deleted file mode 100644
index 82c45565d..000000000
--- a/id.server/data/abnahme-test/conf/moa/ConfigurationTest.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:moa-spss="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
- <DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <GenericConfiguration name="IAIKIXSILinit.properties" value="aValidFileName"/>
- <GenericConfiguration name="autoAddCertificates" value="true"/>
- <GenericConfiguration name="useAuthorityInfoAccess" value="true"/>
- <GenericConfiguration name="maxRevocationAge" value="0"/>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="aValidPathName"/>
- <GenericConfiguration name="archiveRevocationInfo" value="false"/>
- <GenericConfiguration name="DataBaseArchiveParameter.JDBCUrl" value="jdbc:postgresql://10.16.46.108/moa?user=moa&amp;password=moatest"/>
- <GenericConfiguration name="test.ReferenceBase" value="test"/>
- <!--
- <HardwareCryptoModule name="validPathToPKCS11Lib" slotID="validSlotID" userPIN="validPIN"/>
- <HardwareKeyModule name="validPathToPKCS11Lib" slotID="validSlotID" userPIN="validPIN"/>
-
- <HardwareKeyModule id="HSM" name="cryptoki.dll" slotID="0" userPIN="0000"/>-->
- <SoftwareKeyModule id="SWKeyModule1" filename="keys/test-ee2003_normal(buergerkarte).p12" password="buergerkarte"/>
- <SoftwareKeyModule id="SWKeyModule2" filename="keys/normal-eeExpired.p12" password=""/>
- <SoftwareKeyModule id="SWKeyModule3" filename="keys/ecc(ego).p12" password="ego"/>
- <SoftwareKeyModule id="SWKeyModule4" filename="keys/DSA.512.p12" password="topSecret"/>
- <KeyGroup id="HSMRSAKEY">
- <Key>
- <KeyModuleID>HSM</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>C=AT,OU=MOA,O=BRZ,CN=HSMRSAKEY</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="PKCS12RSAKey1">
- <!--PKCS12RSAKey1 maps to test-ee2003_normal(buergerkarte).p12-->
- <Key>
- <KeyModuleID>SWKeyModule1</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="PKCS12RSAKeyExpired">
- <!--PKCS12RSAKey1 maps to sicher-demo(buergerkarte).p12-->
- <Key>
- <KeyModuleID>SWKeyModule2</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>10</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="PKCS12ECDSAKey1">
- <!--PKCS12ECDSAKey1 maps to ecc(ego).p12-->
- <Key>
- <KeyModuleID>SWKeyModule3</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>68172</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="DSAinPKCS12">
- <!--DSAinPKCS12 maps to DSA.512.p12-->
- <Key>
- <KeyModuleID>SWKeyModule4</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK DSA Test CA,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>761791</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="allKeys">
- <Key>
- <KeyModuleID>SWKeyModule1</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- <Key>
- <KeyModuleID>SWKeyModule2</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- <Key>
- <KeyModuleID>SWKeyModule3</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>68172</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- <Key>
- <KeyModuleID>SWKeyModule4</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK DSA Test CA,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>761791</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroupMapping>
- <KeyGroup id="PKCS12RSAKey1"/>
- <KeyGroup id="PKCS12RSAKeyExpired"/>
- <KeyGroup id="PKCS12ECDSAKey1"/>
- <KeyGroup id="DSAinPKCS12"/>
- <KeyGroup id="HSMRSAKEY"/>
- </KeyGroupMapping>
- <KeyGroupMapping>
- <X509IssuerSerial>
- <dsig:X509IssuerName>CN=TestUser,OU=MOA,O=BRZ,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>12345678</dsig:X509SerialNumber>
- </X509IssuerSerial>
- <KeyGroup id="allKeys"/>
- </KeyGroupMapping>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <CRLArchive duration="365"/>
- <CRLDistributionPoint>
- <CAIssuerDN>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</CAIssuerDN>
- <DistributionPoint uri="http://www.iaik.at/testCA/iaik_test_sig.crl"/>
- </CRLDistributionPoint>
- <CRLDistributionPoint>
- <CAIssuerDN>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</CAIssuerDN>
- <DistributionPoint reasonCodes="keyCompromise affiliationChanged" uri="http://www.iaik.at/testCA/iaik_test_sig.crl"/>
- <DistributionPoint reasonCodes="certificateHold" uri="http://www.iaik.at/testCA/iaik_test_sig.crl"/>
- </CRLDistributionPoint>
- <VerifyTransformsInfoProfile id="TransformsInfoProfile1MOAID" filename="profiles/TransformsInfoProfile1MOAID.xml"/>
- <VerifyTransformsInfoProfile id="TransformsInfoProfile2MOAID" filename="profiles/TransformsInfoProfile2MOAID.xml"/>
- <VerifyTransformsInfoProfile id="TransformsInfoProfile3MOAID" filename="profiles/TransformsInfoProfile3MOAID.xml"/>
- <TrustProfile id="TrustProfile1" uri="C:/Programme/ApacheGroup/abnahme/conf/moa/trustprofiles/TrustProfile1"/>
- <TrustProfile id="TrustProfile2" uri="C:/Programme/ApacheGroup/abnahme/conf/moa/trustprofiles/TrustProfile2"/>
-</MOAConfiguration>
diff --git a/id.server/data/abnahme-test/conf/moa/TrustProfile1/Buergerkarte01Root.cer b/id.server/data/abnahme-test/conf/moa/TrustProfile1/Buergerkarte01Root.cer
deleted file mode 100644
index 18e6bc109..000000000
--- a/id.server/data/abnahme-test/conf/moa/TrustProfile1/Buergerkarte01Root.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/TrustProfile1/IAIK_TestRoot.cer b/id.server/data/abnahme-test/conf/moa/TrustProfile1/IAIK_TestRoot.cer
deleted file mode 100644
index 1cdc15c6e..000000000
--- a/id.server/data/abnahme-test/conf/moa/TrustProfile1/IAIK_TestRoot.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/TrustProfile1/Max_Mustermann.cer b/id.server/data/abnahme-test/conf/moa/TrustProfile1/Max_Mustermann.cer
deleted file mode 100644
index b5b39633d..000000000
--- a/id.server/data/abnahme-test/conf/moa/TrustProfile1/Max_Mustermann.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/TrustProfile1/TestPersonMOA1.cer b/id.server/data/abnahme-test/conf/moa/TrustProfile1/TestPersonMOA1.cer
deleted file mode 100644
index 81f6fa658..000000000
--- a/id.server/data/abnahme-test/conf/moa/TrustProfile1/TestPersonMOA1.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/TrustProfile1/TestPersonMOA4.cer b/id.server/data/abnahme-test/conf/moa/TrustProfile1/TestPersonMOA4.cer
deleted file mode 100644
index 99936caa8..000000000
--- a/id.server/data/abnahme-test/conf/moa/TrustProfile1/TestPersonMOA4.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/TrustProfile1/test-ee2003_normal_inkl_verwaltungs_oid.der b/id.server/data/abnahme-test/conf/moa/TrustProfile1/test-ee2003_normal_inkl_verwaltungs_oid.der
deleted file mode 100644
index 3a3aa543d..000000000
--- a/id.server/data/abnahme-test/conf/moa/TrustProfile1/test-ee2003_normal_inkl_verwaltungs_oid.der
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/TrustProfile2/Max_Mustermann.cer b/id.server/data/abnahme-test/conf/moa/TrustProfile2/Max_Mustermann.cer
deleted file mode 100644
index b5b39633d..000000000
--- a/id.server/data/abnahme-test/conf/moa/TrustProfile2/Max_Mustermann.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/common/endorsed/xercesImpl.jar b/id.server/data/abnahme-test/conf/moa/common/endorsed/xercesImpl.jar
deleted file mode 100644
index f25d73cd7..000000000
--- a/id.server/data/abnahme-test/conf/moa/common/endorsed/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/common/endorsed/xmlParserAPIs.jar b/id.server/data/abnahme-test/conf/moa/common/endorsed/xmlParserAPIs.jar
deleted file mode 100644
index c1fa1d645..000000000
--- a/id.server/data/abnahme-test/conf/moa/common/endorsed/xmlParserAPIs.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/keys/DSA.512.p12 b/id.server/data/abnahme-test/conf/moa/keys/DSA.512.p12
deleted file mode 100644
index 8f7a201ac..000000000
--- a/id.server/data/abnahme-test/conf/moa/keys/DSA.512.p12
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/keys/ecc(ego).p12 b/id.server/data/abnahme-test/conf/moa/keys/ecc(ego).p12
deleted file mode 100644
index f84e793c5..000000000
--- a/id.server/data/abnahme-test/conf/moa/keys/ecc(ego).p12
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/keys/normal-eeExpired.p12 b/id.server/data/abnahme-test/conf/moa/keys/normal-eeExpired.p12
deleted file mode 100644
index ff65f9fde..000000000
--- a/id.server/data/abnahme-test/conf/moa/keys/normal-eeExpired.p12
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/keys/sicher-demo(buergerkarte).p12 b/id.server/data/abnahme-test/conf/moa/keys/sicher-demo(buergerkarte).p12
deleted file mode 100644
index efaeb9b98..000000000
--- a/id.server/data/abnahme-test/conf/moa/keys/sicher-demo(buergerkarte).p12
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/keys/test-ee2003_normal(buergerkarte).p12 b/id.server/data/abnahme-test/conf/moa/keys/test-ee2003_normal(buergerkarte).p12
deleted file mode 100644
index efaeb9b98..000000000
--- a/id.server/data/abnahme-test/conf/moa/keys/test-ee2003_normal(buergerkarte).p12
+++ /dev/null
Binary files differ
diff --git a/id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile1MOAID.xml b/id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile1MOAID.xml
deleted file mode 100644
index c4f5a52af..000000000
--- a/id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile1MOAID.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-<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='OA']/saml:AttributeValue"/></td></tr>
-<tr><td><b>Geschäftsbereich:</b></td><td><xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms></VerifyTransformsInfoProfile>
diff --git a/id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile2MOAID.xml b/id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile2MOAID.xml
deleted file mode 100644
index dc4a97716..000000000
--- a/id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile2MOAID.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><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></VerifyTransformsInfoProfile>
diff --git a/id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile3MOAID.xml b/id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile3MOAID.xml
deleted file mode 100644
index 17c4d8d54..000000000
--- a/id.server/data/abnahme-test/conf/moa/profiles/TransformsInfoProfile3MOAID.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-<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></VerifyTransformsInfoProfile>
diff --git a/id.server/data/abnahme-test/conf/moa/runAbnahme.bat b/id.server/data/abnahme-test/conf/moa/runAbnahme.bat
deleted file mode 100644
index 8f635081c..000000000
--- a/id.server/data/abnahme-test/conf/moa/runAbnahme.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-C:
-cd\programme
-cd apacheGroup
-cd abnahme
-rem set moa.id.configuration=C:\Programme\ApacheGroup\abnahme\conf\moa-id\ConfigurationTest.xml
-set moa.spss.server.configuration=C:\Programme\ApacheGroup\abnahme\conf\moa\ConfigurationTest.xml
-rem set CATALINA_OPTS=-Dmoa.id.configuration=C:\Programme\ApacheGroup\abnahme\conf\moa-id\ConfigurationTest.xml -Dlog4j.configuration=file:/C:\Programme\ApacheGroup\abnahme\conf\log4j.properties -Dmoa.spss.server.configuration=C:\Programme\ApacheGroup\abnahme\conf\moa\ConfigurationTest.xml
-set MOA_ROOT=C:\Programme\ApacheGroup\abnahme\
-set CATALINA_OPTS=-Dmoa.spss.server.configuration=%MOA_ROOT%conf\moa\ConfigurationTest.xml -Dlog4j.configuration=file:/%MOA_ROOT%conf\moa\log4j.properties -Dmoa.id.configuration=%MOA_ROOT%conf\moa-id\ConfigurationTest.xml
-set CATALINA_HOME=C:\Programme\ApacheGroup\abnahme
-
-call bin\catalina run \ No newline at end of file
diff --git a/id.server/data/abnahme-test/conf/moa/server.xml b/id.server/data/abnahme-test/conf/moa/server.xml
deleted file mode 100644
index 75afa9955..000000000
--- a/id.server/data/abnahme-test/conf/moa/server.xml
+++ /dev/null
@@ -1,423 +0,0 @@
-<!-- Example Server Configuration File -->
-<!-- Note that component elements are nested corresponding to their
- parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
- which may contain one or more "Service" instances. The Server
- listens for a shutdown command on the indicated port.
-
- Note: A "Server" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
-
-
- <!-- Comment these entries out to disable JMX MBeans support -->
- <!-- You may also configure custom components (e.g. Valves/Realms) by
- including your own mbean-descriptor file(s), and setting the
- "descriptors" attribute to point to a ';' seperated list of paths
- (in the ClassLoader sense) of files to add to the default list.
- e.g. descriptors="/com/myfirm/mypackage/mbean-descriptor.xml"
- -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
- debug="0"/>
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
- debug="0"/>
-
- <!-- Global JNDI resources -->
- <GlobalNamingResources>
-
- <!-- Test entry for demonstration purposes -->
- <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
- <!-- Editable user database that can also be used by
- UserDatabaseRealm to authenticate users -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved">
- </Resource>
- <ResourceParams name="UserDatabase">
- <parameter>
- <name>factory</name>
- <value>org.apache.catalina.users.MemoryUserDatabaseFactory</value>
- </parameter>
- <parameter>
- <name>pathname</name>
- <value>conf/tomcat-users.xml</value>
- </parameter>
- </ResourceParams>
-
- </GlobalNamingResources>
-
- <!-- A "Service" is a collection of one or more "Connectors" that share
- a single "Container" (and therefore the web applications visible
- within that Container). Normally, that Container is an "Engine",
- but this is not required.
-
- Note: A "Service" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
- <!-- Define the Tomcat Stand-Alone Service -->
- <Service name="Tomcat-Standalone">
-
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Each Connector passes requests on to the
- associated "Container" (normally an Engine) for processing.
-
- By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
- You can also enable an SSL HTTP/1.1 Connector on port 8443 by
- following the instructions below and uncommenting the second Connector
- entry. SSL support requires the following steps (see the SSL Config
- HOWTO in the Tomcat 4.0 documentation bundle for more detailed
- instructions):
- * Download and install JSSE 1.0.2 or later, and put the JAR files
- into "$JAVA_HOME/jre/lib/ext".
- * Execute:
- %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
- $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix)
- with a password value of "changeit" for both the certificate and
- the keystore itself.
-
- By default, DNS lookups are enabled when a web application calls
- request.getRemoteHost(). This can have an adverse impact on
- performance, so you can disable it by setting the
- "enableLookups" attribute to "false". When DNS lookups are disabled,
- request.getRemoteHost() will return the String version of the
- IP address of the remote client.
- -->
-
- <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
- <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
- port="8080" minProcessors="5" maxProcessors="75"
- enableLookups="true" redirectPort="8443"
- acceptCount="100" debug="0" connectionTimeout="20000"
- useURIValidationHack="false" disableUploadTimeout="true" />
- <!-- Note : To disable connection timeouts, set connectionTimeout value
- to -1 -->
-
- <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
-
- <Connector className="org.apache.coyote.tomcat4.CoyoteConnector" port="8443" minProcessors="5" maxProcessors="75" enableLookups="true" acceptCount="100" debug="0" scheme="https" secure="true" useURIValidationHack="false" disableUploadTimeout="false">
- <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory" clientAuth="false" protocol="TLS" keystoreFile="server.keystore" keystorePass="changeit"/>
- </Connector>
-
-
- <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
- <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
- port="8009" minProcessors="5" maxProcessors="75"
- enableLookups="true" redirectPort="8443"
- acceptCount="10" debug="0" connectionTimeout="0"
- useURIValidationHack="false"
- protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
-
- <!-- Define an AJP 1.3 Connector on port 8009 -->
- <!--
- <Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
- port="8009" minProcessors="5" maxProcessors="75"
- acceptCount="10" debug="0"/>
- -->
-
- <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
- <!-- See proxy documentation for more information about using this. -->
- <!--
- <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
- port="8082" minProcessors="5" maxProcessors="75"
- enableLookups="true"
- acceptCount="100" debug="0" connectionTimeout="20000"
- proxyPort="80" useURIValidationHack="false"
- disableUploadTimeout="true" />
- -->
-
- <!-- Define a non-SSL legacy HTTP/1.1 Test Connector on port 8083 -->
- <!--
- <Connector className="org.apache.catalina.connector.http.HttpConnector"
- port="8083" minProcessors="5" maxProcessors="75"
- enableLookups="true" redirectPort="8443"
- acceptCount="10" debug="0" />
- -->
-
- <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8084 -->
- <!--
- <Connector className="org.apache.catalina.connector.http10.HttpConnector"
- port="8084" minProcessors="5" maxProcessors="75"
- enableLookups="true" redirectPort="8443"
- acceptCount="10" debug="0" />
- -->
-
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host). -->
-
- <!-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
- <Engine name="Standalone" defaultHost="localhost" debug="0" jmvRoute="jvm1">
- -->
-
- <!-- Define the top level container in our container hierarchy -->
- <Engine name="Standalone" defaultHost="localhost" debug="0">
-
- <!-- The request dumper valve dumps useful debugging information about
- the request headers and cookies that were received, and the response
- headers and cookies that were sent, for all requests received by
- this instance of Tomcat. If you care only about requests to a
- particular virtual host, or a particular application, nest this
- element inside the corresponding <Host> or <Context> entry instead.
-
- For a similar mechanism that is portable to all Servlet 2.3
- containers, check out the "RequestDumperFilter" Filter in the
- example application (the source for this filter may be found in
- "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
- Request dumping is disabled by default. Uncomment the following
- element to enable it. -->
- <!--
- <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
- -->
-
- <!-- Global logger unless overridden at lower levels -->
- <Logger className="org.apache.catalina.logger.FileLogger"
- prefix="catalina_log." suffix=".txt"
- timestamp="true"/>
-
- <!-- Because this Realm is here, an instance will be shared globally -->
-
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- debug="0" resourceName="UserDatabase"/>
-
- <!-- Comment out the old realm but leave here for now in case we
- need to go back quickly -->
- <!--
- <Realm className="org.apache.catalina.realm.MemoryRealm" />
- -->
-
- <!-- Replace the above Realm with one of the following to get a Realm
- stored in a database and accessed via JDBC -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
- driverName="org.gjt.mm.mysql.Driver"
- connectionURL="jdbc:mysql://localhost/authority"
- connectionName="test" connectionPassword="test"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
- driverName="oracle.jdbc.driver.OracleDriver"
- connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
- connectionName="scott" connectionPassword="tiger"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
- driverName="sun.jdbc.odbc.JdbcOdbcDriver"
- connectionURL="jdbc:odbc:CATALINA"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!-- Define the default virtual host -->
- <Host name="localhost" debug="0" appBase="webapps"
- unpackWARs="true" autoDeploy="true">
-
- <!-- Normally, users must authenticate themselves to each web app
- individually. Uncomment the following entry if you would like
- a user to be authenticated the first time they encounter a
- resource protected by a security constraint, and then have that
- user identity maintained across *all* web applications contained
- in this virtual host. -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn"
- debug="0"/>
- -->
-
- <!-- Access log processes all requests for this virtual host. By
- default, log files are created in the "logs" directory relative to
- $CATALINA_HOME. If you wish, you can specify a different
- directory with the "directory" attribute. Specify either a relative
- (to $CATALINA_HOME) or absolute path to the desired directory.
- -->
- <!--
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common" resolveHosts="false"/>
- -->
-
- <!-- Logger shared by all Contexts related to this virtual host. By
- default (when using FileLogger), log files are created in the "logs"
- directory relative to $CATALINA_HOME. If you wish, you can specify
- a different directory with the "directory" attribute. Specify either a
- relative (to $CATALINA_HOME) or absolute path to the desired
- directory.-->
- <Logger className="org.apache.catalina.logger.FileLogger"
- directory="logs" prefix="localhost_log." suffix=".txt"
- timestamp="true"/>
-
- <!-- Define properties for each web application. This is only needed
- if you want to set non-default properties, or have web application
- document roots in places other than the virtual host's appBase
- directory. -->
-
- <!-- Tomcat Root Context -->
- <!--
- <Context path="" docBase="ROOT" debug="0"/>
- -->
-
- <!-- Tomcat Examples Context -->
- <Context path="/examples" docBase="examples" debug="0"
- reloadable="true" crossContext="true">
- <Logger className="org.apache.catalina.logger.FileLogger"
- prefix="localhost_examples_log." suffix=".txt"
- timestamp="true"/>
- <Ejb name="ejb/EmplRecord" type="Entity"
- home="com.wombat.empl.EmployeeRecordHome"
- remote="com.wombat.empl.EmployeeRecord"/>
-
- <!-- If you wanted the examples app to be able to edit the
- user database, you would uncomment the following entry.
- Of course, you would want to enable security on the
- application as well, so this is not done by default!
- The database object could be accessed like this:
-
- Context initCtx = new InitialContext();
- Context envCtx = (Context) initCtx.lookup("java:comp/env");
- UserDatabase database =
- (UserDatabase) envCtx.lookup("userDatabase");
- -->
-<!--
- <ResourceLink name="userDatabase" global="UserDatabase"
- type="org.apache.catalina.UserDatabase"/>
--->
-
-
- <!-- PersistentManager: Uncomment the section below to test Persistent
- Sessions.
-
- saveOnRestart: If true, all active sessions will be saved
- to the Store when Catalina is shutdown, regardless of
- other settings. All Sessions found in the Store will be
- loaded on startup. Sessions past their expiration are
- ignored in both cases.
- maxActiveSessions: If 0 or greater, having too many active
- sessions will result in some being swapped out. minIdleSwap
- limits this. -1 or 0 means unlimited sessions are allowed.
- If it is not possible to swap sessions new sessions will
- be rejected.
- This avoids thrashing when the site is highly active.
- minIdleSwap: Sessions must be idle for at least this long
- (in seconds) before they will be swapped out due to
- activity.
- 0 means sessions will almost always be swapped out after
- use - this will be noticeably slow for your users.
- maxIdleSwap: Sessions will be swapped out if idle for this
- long (in seconds). If minIdleSwap is higher, then it will
- override this. This isn't exact: it is checked periodically.
- -1 means sessions won't be swapped out for this reason,
- although they may be swapped out for maxActiveSessions.
- If set to >= 0, guarantees that all sessions found in the
- Store will be loaded on startup.
- maxIdleBackup: Sessions will be backed up (saved to the Store,
- but left in active memory) if idle for this long (in seconds),
- and all sessions found in the Store will be loaded on startup.
- If set to -1 sessions will not be backed up, 0 means they
- should be backed up shortly after being used.
-
- To clear sessions from the Store, set maxActiveSessions, maxIdleSwap,
- and minIdleBackup all to -1, saveOnRestart to false, then restart
- Catalina.
- -->
- <!--
- <Manager className="org.apache.catalina.session.PersistentManager"
- debug="0"
- saveOnRestart="true"
- maxActiveSessions="-1"
- minIdleSwap="-1"
- maxIdleSwap="-1"
- maxIdleBackup="-1">
- <Store className="org.apache.catalina.session.FileStore"/>
- </Manager>
- -->
- <Environment name="maxExemptions" type="java.lang.Integer"
- value="15"/>
- <Parameter name="context.param.name" value="context.param.value"
- override="false"/>
- <Resource name="jdbc/EmployeeAppDb" auth="SERVLET"
- type="javax.sql.DataSource"/>
- <ResourceParams name="jdbc/EmployeeAppDb">
- <parameter><name>username</name><value>sa</value></parameter>
- <parameter><name>password</name><value></value></parameter>
- <parameter><name>driverClassName</name>
- <value>org.hsql.jdbcDriver</value></parameter>
- <parameter><name>url</name>
- <value>jdbc:HypersonicSQL:database</value></parameter>
- </ResourceParams>
- <Resource name="mail/Session" auth="Container"
- type="javax.mail.Session"/>
- <ResourceParams name="mail/Session">
- <parameter>
- <name>mail.smtp.host</name>
- <value>localhost</value>
- </parameter>
- </ResourceParams>
- <ResourceLink name="linkToGlobalResource"
- global="simpleValue"
- type="java.lang.Integer"/>
- </Context>
-
- </Host>
-
- </Engine>
-
- </Service>
-
- <!-- The MOD_WEBAPP connector is used to connect Apache 1.3 with Tomcat 4.0
- as its servlet container. Please read the README.txt file coming with
- the WebApp Module distribution on how to build it.
- (Or check out the "jakarta-tomcat-connectors/webapp" CVS repository)
-
- To configure the Apache side, you must ensure that you have the
- "ServerName" and "Port" directives defined in "httpd.conf". Then,
- lines like these to the bottom of your "httpd.conf" file:
-
- LoadModule webapp_module libexec/mod_webapp.so
- WebAppConnection warpConnection warp localhost:8008
- WebAppDeploy examples warpConnection /examples/
-
- The next time you restart Apache (after restarting Tomcat, if needed)
- the connection will be established, and all applications you make
- visible via "WebAppDeploy" directives can be accessed through Apache.
- -->
-
- <!-- Define an Apache-Connector Service -->
-<!--
- <Service name="Tomcat-Apache">
-
- <Connector className="org.apache.catalina.connector.warp.WarpConnector"
- port="8008" minProcessors="5" maxProcessors="75"
- enableLookups="true" appBase="webapps"
- acceptCount="10" debug="0"/>
-
- <Engine className="org.apache.catalina.connector.warp.WarpEngine"
- name="Apache" debug="0">
-
- <Logger className="org.apache.catalina.logger.FileLogger"
- prefix="apache_log." suffix=".txt"
- timestamp="true"/>
-
- <Realm className="org.apache.catalina.realm.MemoryRealm" />
-
- </Engine>
-
- </Service>
--->
-
-</Server>
diff --git a/id.server/data/abnahme-test/conf/transforms/TransformsInfosHTML.xml b/id.server/data/abnahme-test/conf/transforms/TransformsInfosHTML.xml
deleted file mode 100644
index e003297f4..000000000
--- a/id.server/data/abnahme-test/conf/transforms/TransformsInfosHTML.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<sl10:TransformsInfo>
- <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:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
- <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='OA']/saml:AttributeValue"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Geschäftsbereich:</b>
- </td>
- <td>
- <xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
- </dsig:Transforms>
- <sl10:FinalDataMetaInfo>
- <sl10:MimeType>text/html</sl10:MimeType>
- </sl10:FinalDataMetaInfo>
-</sl10:TransformsInfo>
diff --git a/id.server/data/abnahme-test/ixsil/init/properties/algorithms.properties b/id.server/data/abnahme-test/ixsil/init/properties/algorithms.properties
deleted file mode 100644
index 35a41cfdd..000000000
--- a/id.server/data/abnahme-test/ixsil/init/properties/algorithms.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-# IXSIL algorithm properties
-#
-# This file contains the properties which IXSIL uses to maintain the available algorithms.
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# Canonicalization algorithms
-#
-# The following properties (starting with "Canonicalization.") are associations between canonicalization
-# algorithm URIs and their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the canonicalization algorithm
-# with the identifying URI "http://www.w3.org/TR/2001/REC-xml-c14n-20010315", the name of the algorithm
-# property is "Canonicalization.http://www.w3.org/TR/2001/REC-xml-c14n-20010315", i.e. the identifying URI,
-# prepended by the canonicalization algorithm property identifier ("Canonicalization."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard impl. shipped with IXSIL, "iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXML".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Canonicalization.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315 = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXML
-Canonicalization.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXMLWithComments
-Canonicalization.http\://www.w3.org/2001/10/xml-exc-c14n# = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXML
-Canonicalization.http\://www.w3.org/2001/10/xml-exc-c14n#WithComments = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXMLWithComments
-
-#----------------------------------------------------------------------------------------------------------
-# Signature algorithms
-#
-# The following properties (starting with "Signature.") are associations between signature algorithm URIs and
-# their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the signature algorithm
-# with the identifying URI "http://www.w3.org/2000/09/xmldsig#rsa-sha1", the name of the algorithm
-# property is "Signature.http://www.w3.org/2000/09/xmldsig#rsa-sha1", i.e. the identifying URI,
-# prepended by the signature algorithm property identifier ("Signature."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard implementation shipped with IXSIL, "iaik.ixsil.algorithms.SignatureAlgorithmImplRSA".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Signature.http\://www.w3.org/2000/09/xmldsig#rsa-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplRSA
-Signature.http\://www.w3.org/2000/09/xmldsig#dsa-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplDSA
-Signature.http\://www.w3.org/2000/09/xmldsig#hmac-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplHMAC
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# Digest algorithms
-#
-# The following properties (starting with "Digest.") are associations between digest algorithm URIs and
-# their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the digest algorithm
-# with the identifying URI "http://www.w3.org/2000/09/xmldsig#sha1", the name of the algorithm
-# property is "Digest.http://www.w3.org/2000/09/xmldsig#sha1", i.e. the identifying URI,
-# prepended by the digest algorithm property identifier ("Digest."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard implementation shipped with IXSIL, "iaik.ixsil.algorithms.DigestAlgorithmImplSHA1".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Digest.http\://www.w3.org/2000/09/xmldsig#sha1 = iaik.ixsil.algorithms.DigestAlgorithmImplSHA1
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# Transform algorithms
-#
-# The following properties (starting with "Transform.") are associations between digest algorithm URIs and
-# their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the transform algorithm
-# with the identifying URI "http://www.w3.org/2000/09/xmldsig#base64", the name of the algorithm
-# property is "Transform.http://www.w3.org/2000/09/xmldsig#base64", i.e. the identifying URI,
-# prepended by the transform algorithm property identifier ("Transform."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard implementation shipped with IXSIL, "iaik.ixsil.algorithms.TransformImplBase64Decode".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Transform.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315 = iaik.ixsil.algorithms.TransformImplCanonicalXML
-Transform.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments = iaik.ixsil.algorithms.TransformImplCanonicalXMLWithComments
-Transform.http\://www.w3.org/2001/10/xml-exc-c14n# = iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXML
-Transform.http\://www.w3.org/2001/10/xml-exc-c14n#WithComments = iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXMLWithComments
-Transform.http\://www.w3.org/2000/09/xmldsig#base64 = iaik.ixsil.algorithms.TransformImplBase64Decode
-Transform.http\://www.w3.org/TR/1999/REC-xpath-19991116 = iaik.ixsil.algorithms.TransformImplXPath
-Transform.http\://www.w3.org/2000/09/xmldsig#enveloped-signature = iaik.ixsil.algorithms.TransformImplEnvelopedSignature
-Transform.http\://www.w3.org/TR/1999/REC-xslt-19991116 = iaik.ixsil.algorithms.TransformImplXSLT
-Transform.http\://www.w3.org/2002/06/xmldsig-filter2 = iaik.ixsil.algorithms.TransformImplXPath2
diff --git a/id.server/data/abnahme-test/ixsil/init/properties/init.properties b/id.server/data/abnahme-test/ixsil/init/properties/init.properties
deleted file mode 100644
index a309959cc..000000000
--- a/id.server/data/abnahme-test/ixsil/init/properties/init.properties
+++ /dev/null
@@ -1,214 +0,0 @@
-# IXSIL init properties
-#
-# This file contains the basic initialization properties for IXSIL.
-
-#----------------------------------------------------------------------------------------------------------
-# Properties for localizing exeption messages
-
-# This property specifies the ISO language code, which is used to select the appropriate exception message
-# file. Please see the documentation for Java class "java.util.RessourceBundle" for further information.
-
-IXSILException.ISOLanguageCode = "en"
-
-
-
-# This property specifies the ISO country code, which is used to select the appropriate exception message
-# file. Please see the documentation for Java class "java.util.RessourceBundle" for further information.
-
-IXSILException.ISOCountryCode = "US"
-
-
-#----------------------------------------------------------------------------------------------------------
-# Other property files
-
-# This property contains a URI specifying the (virtual) location of the IXSIL init properties file (i. e.
-# this file). The URI MUST be absolute.
-#
-# The use of this property is optional. It is only needed by IXSIL, if the library will be initialized using
-# the method IXSILInit.init(Properties, Properties, Properties). In this case it is used by IXSIL as the
-# base URI for absolutizing other property URIs, such as "DOMUtils.SignatureSchema" (see below).
-#
-# PLEASE NOTE: Contrary to URIs under e.g. http or ftp scheme, URIs under file and jar scheme do not have an
-# authority component. This means that the part following the scheme identifier starts with "/"
-# (single slash character), and not with "//" (two slash characters).
-#
-# Example 1 (absolute URI under file scheme): "file:/c:/path1/path2/init.properties"
-# Example 2 (absolute URI under jar scheme): "jar:/file:/c:/path1/path2/archive.jar!/init.properties"
-# Example 3 (absolute URI under http scheme): "http://somewhere.org/path1/path2/init.properties"
-
-location.initProperties = file:data/abnahme/test/ixsil/init/properties/init.properties
-
-
-
-# This property contains a URI specifying the location of the IXSIL algorithm properties file. The URI can
-# be absolute or relative. If a relative URI is used, it will be absolutized using this init property file's
-# URI as the base.
-#
-# PLEASE NOTE: Contrary to URIs under e.g. http or ftp scheme, URIs under file and jar scheme do not have an
-# authority component. This means that the part following the scheme identifier starts with "/"
-# (single slash character), and not with "//" (two slash characters).
-#
-# Example 1 (absolute URI under file scheme): "file:/c:/path1/path2/algorithms.properties"
-# Example 2 (absolute URI under jar scheme): "jar:/file:/c:/path1/path2/archive.jar!/algorithms.properties"
-# Example 3 (absolute URI under http scheme): "http://somewhere.org/path1/path2/algorithms.properties"
-# Example 4 (relative URI): "../otherpath/algorithms.properties"
-# Example 5 (relative URI): "algorithms.properties"
-
-location.algorithmsProperties = file:data/abnahme/test/ixsil/init/properties/algorithms.properties
-
-
-
-# This property contains a URI specifying the location of the IXSIL keyManager properties file. The URI can
-# be absolute or relative. If a relative URI is used, it will be absolutized using this init property file's
-# URI as the base.
-#
-# PLEASE NOTE: Contrary to URIs under e.g. http or ftp scheme, URIs under file and jar scheme do not have an
-# authority component. This means that the part following the scheme identifier starts with "/"
-# (single slash character), and not with "//" (two slash characters).
-#
-# Example 1 (absolute URI under file scheme): "file:/c:/path1/path2/keyManager.properties"
-# Example 2 (absolute URI under jar scheme): "jar:/file:/c:/path1/path2/archive.jar!/keyManager.properties"
-# Example 3 (absolute URI under http scheme): "http://somewhere.org/path1/path2/keyManager.properties"
-# Example 4 (relative URI): "../otherpath/keyManager.properties"
-# Example 5 (relative URI): "keyManager.properties"
-
-location.keyManagerProperties = file:data/abnahme/test/ixsil/init/properties/keyManager.properties
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# AlgorithmFactory properties
-
-
-
-This property specifies the extension class for the abstract class
-iaik.ixsil.algorithms.AlgorithmFactory, which is instantiated at invokation of method
-iaik.ixsil.algorithms.AlgorithmFactory.createFactory().
-Please specifiy the fully qualified java class name for the class to be instantiated.
-
-AlgorithmFactory.ImplementingClass = iaik.ixsil.algorithms.AlgorithmFactoryDefaultImpl
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# VerifierKeyManager properties
-
-# This property specifies the implementation class for the interface
-# iaik.ixsil.keyinfo.VerifierKeyManager, which is instantiated by IXSIL in the verification use case, if the
-# signature algorithm does not know about the verification key, and if the XML signature bears a KeyInfo
-# element which contains hints that can be used to deduce the verification key.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-VerifierKeyManager.ImplementingClass = iaik.ixsil.keyinfo.KeyManagerImpl
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# XML namespace prefix properties
-
-# This property specifies the namespace prefix used for XML elements from the XML-Signature namespace.
-#
-# PLEASE NOTE: The prefix must not be empty.
-
-namespacePrefix.XMLSignature = dsig:
-
-
-
-# This property specifies the namespace prefix used for XML elements from the XML Schema instance namespace.
-#
-# PLEASE NOTE: The prefix must not be empty.
-
-namespacePrefix.XMLSchemaInstance = xsi:
-
-
-#----------------------------------------------------------------------------------------------------------
-# DOMUtils properties
-
-
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.DOMUtilsInterface, which contains a couple of DOM utility methods, which IXSIL relies
-# on. If you would like to employ a parser different from Apache Xerces, you must implement the
-# DOMUtilsInterface and specify your implementation class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-DOMUtils.ImplementingClass = iaik.ixsil.util.DOMUtilsImpl
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies, wheter WARNINGS generated by the Apache Xerces parser should lead to a parser exception
-# or not.
-
-DOMUtils.ErrorHandler.reportWarnings = true
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies, wheter ERRORS generated by the Apache Xerces parser should lead to a parser exception
-# or not.
-
-DOMUtils.ErrorHandler.reportErrors = true
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies, wheter FATAL ERRORS generated by the Apache Xerces parser should lead to a parser
-# exception or not.
-
-DOMUtils.ErrorHandler.reportFatalErrors = true
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies an URI for the location of the XML schema for an XML signature, which is used as the
-# reference grammar in method iaik.ixsil.util.DOMUtilsImpl.schemaValidateSignatureElement.
-# The URI can be absolute or relative. If the URI is relative, it will be absolutized using the URI for
-# this init property file as the base.
-
-DOMUtils.SignatureSchema = ../schemas/Signature.xsd
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# XPathUtils properties
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.XPathUtilsInterface, which contains a couple of XPath utility methods, which IXSIL relies
-# on. If you would like to employ a XPath engine different from Apache Xalan, you must implement the
-# XPathUtilsInterface and specify your implementation class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-XPathUtils.ImplementingClass = iaik.ixsil.util.XPathUtilsImpl
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# CanonicalXMLSerializer properties
-
-
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.CanonicalXMLSerialierInterface. IXSIL relies on this interface to serialize XML according
-# to "Canonical XML" (see http://www.w3.org/TR/2001/REC-xml-c14n-20010315). If you would like to employ an
-# implemenation different from the standard implementation shipped with IXSIL, you must implement the
-# CanonicalXMLSerialierInterface and specify your implementation class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-CanonicalXMLSerializer.CanonicalXMLImplementingClass = iaik.ixsil.util.CanonicalXMLSerializerImpl
-
-
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.ExclusiveCanonicalXMLSerialierInterface. IXSIL relies on this interface to serialize XML
-# according to "Exclusive XML Canonicalization" (see http://www.w3.org/TR/2001/WD-xml-exc-c14n-20011120).
-# If you would like to employ an implemenation different from the standard implementation shipped with
-# IXSIL, you must implement the ExclusiveCanonicalXMLSerialierInterface and specify your implementation
-# class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-CanonicalXMLSerializer.ExclusiveCanonicalXMLImplementingClass = iaik.ixsil.util.CanonicalXMLSerializerImpl
diff --git a/id.server/data/abnahme-test/ixsil/init/properties/keyManager.properties b/id.server/data/abnahme-test/ixsil/init/properties/keyManager.properties
deleted file mode 100644
index 24ece437a..000000000
--- a/id.server/data/abnahme-test/ixsil/init/properties/keyManager.properties
+++ /dev/null
@@ -1,74 +0,0 @@
-# IXSIL algorithm properties
-#
-# This file contains the properties which IXSIL uses in context of key management.
-
-
-
-#----------------------------------------------------------------------------------------------------------
-#
-# The following properties are associations between the fully qualified XMLname of a "KeyInfo" subelement,
-# as used in an XML signature to specify hints how the verifier can obtain the verification key, and that
-# implementation class of the interface iaik.ixsil.keyinfo.KeyProviderInterface, which will manage
-# subelements of that type.
-#
-# These properties are only of interest, if you are using the standard key manager shipped with IXISL
-# (which is class iaik.ixsil.keyInfo.KeyManagerImpl).
-#
-# For instance, if you would like to specify the key provider implementation for "KeyValue" subelements,
-# the property name is the fully qualified XML name for the "KeyValue" element, namely
-# "http://www.w3.org/2000/09/xmldsig#:KeyValue". The value of the property is the fully qualified class
-# name of the key provider implementation class, for instance the standard implementation which ships with
-# IXSIL: "iaik.ixsil.keyinfo.KeyProviderImplKeyValue".
-#
-# PLEASE NOTE (I): A fully qualified name for an XML element consists of an URI indicating the namespace the
-# element belongs to (e.g. "http://www.w3.org/2000/09/xmldsig#") and the local name of the
-# element (e.g. "KeyValue"). Both components are seperated by a colon.
-#
-# PLEASE NOTE (II): The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-http\://www.w3.org/2000/09/xmldsig#\:KeyValue = iaik.ixsil.keyinfo.KeyProviderImplKeyValue
-http\://www.w3.org/2000/09/xmldsig#\:X509Data = iaik.ixsil.keyinfo.x509.KeyProviderImplX509Data
-http\://www.w3.org/2000/09/xmldsig#\:RetrievalMethod = iaik.ixsil.keyinfo.retrieval.KeyProviderImplRetrievalMethod
-
-
-
-#----------------------------------------------------------------------------------------------------------
-#
-# The following properties specify the order in which the different types of "KeyInfo" subelements are used
-# by the key manager to deduce the verification key.
-#
-# These properties are only of interest, if you are using the standard key manager shipped with IXISL
-# (which is class iaik.ixsil.keyInfo.KeyManagerImpl).
-#
-# The properties are associations between a two digit number and the fully qualified XML name of a "KeyInfo"
-# subelement. The lower the number, the more important is the associated "KeyInfo" sublement. Consider an
-# example configuration:
-#
-# Subelement.01 = http://www.w3.org/2000/09/xmldsig#:KeyValue
-# Subelement.02 = http://www.w3.org/2000/09/xmldsig#:X509Data
-#
-# In this configuration, the key manager first tries to use "KeyValue" subelements to deduce the
-# verification key. Only if this does not succeed, the key manager uses "X509Data" subelements as a second
-# chance. Of course you can specify more than only two different subelement types.
-#
-# PLEASE NOTE: A fully qualified name for an XML element consists of an URI indicating the namespace the
-# element belongs to (e.g. "http://www.w3.org/2000/09/xmldsig#") and the local name of the
-# element (e.g. "KeyValue"). Both components are seperated by a colon.
-
-Subelement.01 = http://www.w3.org/2000/09/xmldsig#:KeyValue
-Subelement.02 = http://www.w3.org/2000/09/xmldsig#:X509Data
-Subelement.03 = http://www.w3.org/2000/09/xmldsig#:RetrievalMethod
-
-
-
-#----------------------------------------------------------------------------------------------------------
-#
-# The following property is used by standard implementation of the "X509Data" key provider, which ships
-# with IXSIL, namely "KeyProviderImplX509Data". It specifies the implementation class for the interface
-# iaik.ixsil.keyinfo.x509.X509TrustManagerInterface, which is to be instantiated as the backbone trust
-# manager for this key provider.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-KeyProviderImplX509Data.X509TrustManagerDefaultImplementingClass = iaik.ixsil.keyinfo.x509.X509TrustManagerDummyImpl
-
diff --git a/id.server/data/abnahme-test/ixsil/init/schemas/Signature.xsd b/id.server/data/abnahme-test/ixsil/init/schemas/Signature.xsd
deleted file mode 100644
index ed7719dfb..000000000
--- a/id.server/data/abnahme-test/ixsil/init/schemas/Signature.xsd
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
- SYSTEM "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/04/08 07:20:16 $ by $Author: knirsch $
-
- 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 xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- targetNamespace="http://www.w3.org/2000/09/xmldsig#"
- version="0.1" elementFormDefault="qualified">
-
-<!-- Basic Types Defined for Signatures -->
-
-<!-- modified to ensure that whiteSpace is preserved
-<simpleType name="CryptoBinary">
- <restriction base="base64Binary">
- </restriction>
-</simpleType>
- -->
-
-<simpleType name="CryptoBinary">
- <restriction base="string">
- <whiteSpace value="preserve"/>
- <pattern value="[A-Za-z0-9\+/=\n\r\t ]*"/>
- </restriction>
-</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="ds:CryptoBinary">
- <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" minOccurs="0" type="ds:HMACOutputLengthType"/>
- <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"/>
- <!-- (1,1) elements from (0,unbounded) namespaces -->
- <element name="XPath" type="string"/>
- </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="ds:CryptoBinary"/>
-</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 processContents="lax" namespace="##other"/>
- <!-- (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 name="Transforms" type="ds:TransformsType" 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="ds:CryptoBinary"/>
- <element name="X509SubjectName" type="string"/>
- <element name="X509Certificate" type="ds:CryptoBinary"/>
- <element name="X509CRL" type="ds:CryptoBinary"/>
- <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="ds:CryptoBinary"/>
- <element name="PGPKeyPacket" type="ds:CryptoBinary" minOccurs="0"/>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <sequence>
- <element name="PGPKeyPacket" type="ds:CryptoBinary"/>
- <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="ds:CryptoBinary"/>
- <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"/> <!-- add a grep facet -->
- <attribute name="Encoding" type="anyURI" use="optional"/>
-</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="##any" 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="J" type="ds:CryptoBinary" minOccurs="0"/>
- <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
- <element name="Y" type="ds:CryptoBinary"/>
- <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/id.server/data/abnahme-test/ixsil/init/schemas/XMLSchema.dtd b/id.server/data/abnahme-test/ixsil/init/schemas/XMLSchema.dtd
deleted file mode 100644
index c55a9a819..000000000
--- a/id.server/data/abnahme-test/ixsil/init/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.1 2003/04/08 07:20:16 knirsch 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/id.server/data/abnahme-test/ixsil/init/schemas/datatypes.dtd b/id.server/data/abnahme-test/ixsil/init/schemas/datatypes.dtd
deleted file mode 100644
index 59bf31d52..000000000
--- a/id.server/data/abnahme-test/ixsil/init/schemas/datatypes.dtd
+++ /dev/null
@@ -1,203 +0,0 @@
-<!--
- DTD for XML Schemas: Part 2: Datatypes
- $Id: datatypes.dtd,v 1.1 2003/04/08 07:20:16 knirsch 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/id.server/data/abnahme-test/xmldata/A100/A101/htmlForm.html b/id.server/data/abnahme-test/xmldata/A100/A101/htmlForm.html
deleted file mode 100644
index 5f3812dbe..000000000
--- a/id.server/data/abnahme-test/xmldata/A100/A101/htmlForm.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<html>
-<head>
-<title>MOA ID Auth Sample Login - customized</title>
-</head>
-<body>
-<h1>MOA ID Auth Sample Login - customized</h1>
-<form name="CustomizedForm"
- action="http://localhost:3495/http-security-layer-request"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;&lt;sl10:InfoboxReadRequest xmlns:sl10=&quot;http://www.buergerkarte.at/namespaces/securitylayer/20020225#&quot;&gt;&lt;sl10:InfoboxIdentifier&gt;IdentityLink&lt;/sl10:InfoboxIdentifier&gt;&lt;sl10:BinaryFileParameters ContentIsXMLEntity=&quot;true&quot;/&gt;&lt;/sl10:InfoboxReadRequest&gt;"/>
- <input type="hidden"
- name="DataURL"
- value="https://localhost:8443/authVerifyIdentityLink?MOASessionID=DELETED"/>
- <input type="submit" value="B&uuml;rgerkarte lesen"/>
-</form>
-<form name="CustomizedInfoForm"
- action="http://localhost:3495/http-security-layer-request"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;sl11:VerifyXMLSignatureRequest xmlns:sl11=&quot;http://www.buergerkarte.at/namespaces/securitylayer/20020831#&quot; xmlns:sl10=&quot;http://www.buergerkarte.at/namespaces/securitylayer/20020225#&quot; xmlns:xml=&quot;http://www.w3.org/XML/1998/namespace&quot; xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;sl11:SignatureInfo&gt;
- &lt;sl11:SignatureEnvironment&gt;
- &lt;sl10:XMLContent xml:space=&quot;preserve&quot;&gt;&lt;dsig:Signature Id=&quot;HS_signature&quot; xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;&lt;dsig:SignedInfo&gt;&lt;dsig:CanonicalizationMethod Algorithm=&quot;http://www.w3.org/TR/2001/REC-xml-c14n-20010315&quot;/&gt;&lt;dsig:SignatureMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#rsa-sha1&quot;/&gt;&lt;dsig:Reference Id=&quot;reference-data-1&quot; URI=&quot;#signed-data&quot;&gt;&lt;dsig:Transforms&gt;&lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;&lt;xf2:XPath Filter=&quot;intersect&quot; xmlns:xf2=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;id(&apos;signed-data&apos;)/node()&lt;/xf2:XPath&gt;&lt;/dsig:Transform&gt;&lt;/dsig:Transforms&gt;&lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;&lt;dsig:DigestValue&gt;C0hW5jQojphweuFzPb+CNkHwhe4=&lt;/dsig:DigestValue&gt;&lt;/dsig:Reference&gt;&lt;dsig:Reference Type=&quot;http://uri.etsi.org/01903/v1.1.1#SignedProperties&quot; URI=&quot;#refetsi&quot;&gt;&lt;dsig:Transforms&gt;&lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;&lt;xf2:XPath Filter=&quot;intersect&quot; xmlns:etsi=&quot;http://uri.etsi.org/01903/v1.1.1#&quot; xmlns:xf2=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;id(&apos;refetsi&apos;)/etsi:QualifyingProperties/etsi:SignedProperties&lt;/xf2:XPath&gt;&lt;/dsig:Transform&gt;&lt;/dsig:Transforms&gt;&lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;&lt;dsig:DigestValue&gt;Bdsc7wAfyMyZ21ChcF+tRh3D7sU=&lt;/dsig:DigestValue&gt;&lt;/dsig:Reference&gt;&lt;/dsig:SignedInfo&gt;&lt;dsig:SignatureValue&gt;lCz3hDQMbqRMmCieG3fQFax3f8JX86gDi7mf4h03J7vlJjSOJQ4Wh/3Kd81ntKuh
-qFphj2cEhQYX08e6SeaU+7H7qdRa+xFRDRGav8L5x5xCUQT2SV+2/hx0C7UuJt+p
-tewtbqVAcNxgKPlBuIzyXGOrBdiinp1KftEQoVCpPCI=&lt;/dsig:SignatureValue&gt;&lt;dsig:KeyInfo&gt;&lt;dsig:X509Data&gt;&lt;dsig:X509Certificate&gt;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==&lt;/dsig:X509Certificate&gt;&lt;/dsig:X509Data&gt;&lt;/dsig:KeyInfo&gt;&lt;dsig:Object Id=&quot;signed-data&quot;&gt;&lt;html&gt;
-&lt;head&gt;
-&lt;title&gt;&Uuml;berpr&uuml;fung des Namen des Anmelde-Servers&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;h2&gt;Pr&uuml;fung der Identit&auml;t des MOA-ID Servers&lt;/h2&gt;
-
-Bevor Sie sich in den folgenden Schritten an eine Online-Applikation anmelden,
-wird empfohlen den Namen des Anmelde-Servers zu &uuml;berpr&uuml;fen.
-Zu diesem Zweck identifiziert Ihr Webbrowser den Anmelde-Server mit Hilfe eines Zertifikates.
-Ihre Aufgabe ist es zu &uuml;berpr&uuml;fen, ob das Server-Zertifikat von einem Unternehmen ausgestellt
-wurde, dem Sie vertrauen.
-&lt;p&gt;
-Die folgenden Abs&auml;tze beschreiben, wie Sie diese &Uuml;berpr&uuml;fung durchf&uuml;hren k&ouml;nnen.
-F&uuml;hren Sie jene Arbeitsschritte durch, die f&uuml;r den von Ihnen verwendeten Webbrowser zutreffend sind.
-&lt;/p&gt;
-&lt;h3&gt;Microsoft Internet Explorer 6.0&lt;/h3&gt;
-
-&lt;ol&gt;
-&lt;li&gt;&Ouml;ffnen Sie (durch Doppel-Klicken) das Symbol mit dem gelben Vorhangschlo&szlig; am unteren Rand des Browsers.&lt;/li&gt;
-&lt;li&gt;Selektieren Sie im nun ge&ouml;ffnetem Fenster &quot;Zertifikat&quot; den Karteireiter &quot;Zertifizierungspfad&quot;.&lt;/li&gt;
-&lt;li&gt;&Ouml;ffnen Sie (durch Doppel-Klicken) das an oberster Stelle gereihte Zertifikat.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie ob als Aussteller dieses Zertifikat (Karteireiter &quot;Details&quot;, Eintrag &quot;Aussteller&quot;)
-ein Unternehmen aufscheint, dem Sie vertrauen den Namen des Anmelde-Servers zu &uuml;berpr&uuml;fen.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie, ob dieses Zertifikat authentisch vom angegebene Unternehmen stammt. Dazu k&ouml;nnen Sie den
-Fingerabdruck (Karteireiter &quot;Details&quot;, unterster Eintrag) des Zertifikats &uuml;berpr&uuml;fen. Am Ende dieses Dokuments ist
-eine von der IKT-Stabsstelle &uuml;berpr&uuml;fte Liste von Zertifikaten und deren Fingerabdruck aufgelistet.
-&Uuml;berpr&uuml;fen Sie ob das von Ihnen zu &uuml;berpr&uuml;fende Zertifikat
-in dieser Liste enthalten ist und der Fingerabruck mit dem Wert in der Liste &uuml;bereinstimmt.
-&lt;ul&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten und stimmt der Wert des Fingerabdrucks mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat authentisch und der Anmeldevorgang kann fortgesetzt werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten aber stimmt der Wert des Fingerabdrucks nicht mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat nicht authentisch und der Anmeldevorgang muss abgebrochen werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat nicht in der Liste enthalten m&uuml;ssen Sie eine andere verl&auml;ssliche Quelle f&uuml;r den
-Vergleich des Fingerabdrucks finden. Sofern das Zertifikat authentisch ist, kann der Anmeldevorgang fortgesetzt werden.&lt;/li&gt;
-&lt;/ul&gt;&lt;/li&gt;
-&lt;li&gt;Ist das in Schritt 3. ge&ouml;ffnete Zertifikat nicht im Internet Explorer installiert erscheint das Zertifikat mit
-einem roten Kreuz. Sie k&ouml;nnen das Zertifikat installieren, indem Sie die Schaltfl&auml;che &quot;Zertifikat installieren ...&quot;
-(Karteireiter &quot;Allgemein&quot;) aktivieren. In der Folge werden alle von dieser Zertifizierungsstelle ausgestellten Zertifikate
-vom Internet Explorer als vertrauensw&uuml;rdig erkannt.&lt;/li&gt;
-&lt;/ol&gt;
-&lt;h3&gt;Netscape Navigator 7.0&lt;/h3&gt;
-&lt;ol&gt;
-&lt;li&gt;&Ouml;ffnen Sie (durch Klicken) das Symbol mit dem Vorhangschloss am rechten, unteren Rand des Browsers&lt;/li&gt;
-&lt;li&gt;Aktivieren Sie die Schaltfl&auml;che &quot;Anzeigen&quot;&lt;/li&gt;
-&lt;li&gt;Selektieren Sie im nun ge&ouml;ffnetem Fenster &quot;Zertifikatsanzeige&quot; den Karteireiter &quot;Detail&quot;.&lt;/li&gt;
-&lt;li&gt;Aktivieren Sie (durch Klicken) das an oberster Stelle gereihte Zertifikat.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie ob als Aussteller dieses Zertifikat (Eintrag &quot;Aussteller&quot;)
-ein Unternehmen aufscheint, dem Sie vertrauen den Namen des Anmelde-Servers zu &uuml;berpr&uuml;fen.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie, ob dieses Zertifikat authentisch vom angegebene Unternehmen stammt. Dazu k&ouml;nnen Sie den
-Fingerabdruck des Zertifikats &uuml;berpr&uuml;fen. Am Ende dieses Dokuments ist
-eine von der IKT-Stabsstelle &uuml;berpr&uuml;fte Liste von Zertifikaten und deren Fingerabdruck aufgelistet.
-&Uuml;berpr&uuml;fen Sie ob das von Ihnen zu &uuml;berpr&uuml;fende Zertifikat
-in dieser Liste enthalten ist und der Fingerabruck mit dem Wert in der Liste &uuml;bereinstimmt.
-&lt;ul&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten und stimmt der Wert des Fingerabdrucks mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat authentisch und der Anmeldevorgang kann fortgesetzt werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten aber stimmt der Wert des Fingerabdrucks nicht mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat nicht authentisch und der Anmeldevorgang muss abgebrochen werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat nicht in der Liste enthalten m&uuml;ssen Sie eine andere verl&auml;ssliche Quelle f&uuml;r den
-Vergleich des Fingerabdrucks finden. Sofern das Zertifikat authentisch ist, kann der Anmeldevorgang fortgesetzt werden.&lt;/li&gt;
-&lt;/ul&gt;&lt;/li&gt;
-&lt;li&gt;Ist das Aussteller-Zertifikat nicht im Netscape Navigator installiert k&ouml;nnen Sie das Zertifikat installieren,
-indem Sie die &quot;*.cer&quot; Datei mit Netscape Navigator &ouml;ffnen. In der Folge werden alle von dieser Zertifizierungsstelle
-ausgestellten Zertifikate vom Internet Explorer als vertrauensw&uuml;rdig erkannt.&lt;/li&gt;
-&lt;/ol&gt;
-
-&lt;h2&gt;Zertifikate und ihr Fingerabdruck&lt;/h2&gt;
-
-&lt;table&gt;
-&lt;tr&gt;
-&lt;td&gt;Aussteller&lt;/td&gt;&lt;td&gt;CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Seriennummer&lt;/td&gt;&lt;td&gt;111 (0x6f)&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Fingerabdruck&lt;/td&gt;&lt;td&gt;SHA-1: e6 e6 fc 88 71 91 77 c9 b7 42 18 25 75 7c 5e 47 bc ac 85 f6&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;p/&gt;
-&lt;table&gt;
-&lt;tr&gt;
-&lt;td&gt;Aussteller&lt;/td&gt;&lt;td&gt;CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Seriennummer&lt;/td&gt;&lt;td&gt;531 (0x213)&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Fingerabdruck&lt;/td&gt;&lt;td&gt;SHA-1: 9e 05 12 dd 61 da 59 49 d1 d8 63 1c 3f 19 d7 5f 49 6c 37 33&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;p/&gt;
-&lt;table&gt;
-&lt;tr&gt;
-&lt;td&gt;Aussteller&lt;/td&gt;&lt;td&gt;CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Seriennummer&lt;/td&gt;&lt;td&gt;536 (0x0218)&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Fingerabdruck&lt;/td&gt;&lt;td&gt;SHA-1: 0f 5a 03 42 f5 cd 44 87 99 c3 c6 d1 78 60 7e 3f 2b 5b cb 8f&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;&lt;/dsig:Object&gt;&lt;dsig:Object Id=&quot;refetsi&quot;&gt;&lt;etsi:QualifyingProperties Target=&quot;#HS_signature&quot; xmlns:etsi=&quot;http://uri.etsi.org/01903/v1.1.1#&quot;&gt;&lt;etsi:SignedProperties&gt;&lt;etsi:SignedSignatureProperties&gt;&lt;etsi:SigningTime&gt;2003-05-06T07:09:50Z&lt;/etsi:SigningTime&gt;&lt;etsi:SigningCertificate&gt;&lt;etsi:Cert&gt;&lt;etsi:CertDigest&gt;&lt;etsi:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;&lt;etsi:DigestValue&gt;Frhu1o4mL4gQHdJcU0xSA/h4COE=&lt;/etsi:DigestValue&gt;&lt;/etsi:CertDigest&gt;&lt;etsi:IssuerSerial&gt;&lt;dsig:X509IssuerName&gt;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&lt;/dsig:X509IssuerName&gt;&lt;dsig:X509SerialNumber&gt;6455&lt;/dsig:X509SerialNumber&gt;&lt;/etsi:IssuerSerial&gt;&lt;/etsi:Cert&gt;&lt;/etsi:SigningCertificate&gt;&lt;etsi:SignaturePolicyIdentifier&gt;&lt;etsi:SignaturePolicyImplied/&gt;&lt;/etsi:SignaturePolicyIdentifier&gt;&lt;/etsi:SignedSignatureProperties&gt;&lt;etsi:SignedDataObjectProperties&gt;&lt;etsi:DataObjectFormat ObjectReference=&quot;#reference-data-1&quot;&gt;&lt;etsi:MimeType&gt;text/html&lt;/etsi:MimeType&gt;&lt;/etsi:DataObjectFormat&gt;&lt;/etsi:SignedDataObjectProperties&gt;&lt;/etsi:SignedProperties&gt;&lt;/etsi:QualifyingProperties&gt;&lt;/dsig:Object&gt;&lt;/dsig:Signature&gt;&lt;/sl10:XMLContent&gt;
- &lt;/sl11:SignatureEnvironment&gt;
- &lt;sl11:SignatureLocation&gt;//dsig:Signature&lt;/sl11:SignatureLocation&gt;
- &lt;/sl11:SignatureInfo&gt;
-&lt;/sl11:VerifyXMLSignatureRequest&gt;
-"/>
- <input type="hidden"
- name="DataURL"
- value="https://localhost:8443/authStartAuthentication?MOASessionID=DELETED"/>
- Hier finden Sie weitere Informationen zur &Uuml;berpr&uuml;fung der Zertifikate.
- <input type="submit" value="Weitere Info"/>
-</form></body>
-</html> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A100/A102/htmlForm.html b/id.server/data/abnahme-test/xmldata/A100/A102/htmlForm.html
deleted file mode 100644
index 7ba249f98..000000000
--- a/id.server/data/abnahme-test/xmldata/A100/A102/htmlForm.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<html>
-<head>
-<title>Auslesen der Personenbindung</title>
-</head>
-<body>
-<form name="GetIdentityLinkForm"
- action="http://localhost:3495/http-security-layer-request"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;&lt;sl10:InfoboxReadRequest xmlns:sl10=&quot;http://www.buergerkarte.at/namespaces/securitylayer/20020225#&quot;&gt;&lt;sl10:InfoboxIdentifier&gt;IdentityLink&lt;/sl10:InfoboxIdentifier&gt;&lt;sl10:BinaryFileParameters ContentIsXMLEntity=&quot;true&quot;/&gt;&lt;/sl10:InfoboxReadRequest&gt;"/>
- <input type="hidden"
- name="DataURL"
- value="https://localhost:8443/authVerifyIdentityLink?MOASessionID=DELETED"/>
- <input type="submit" value="Auslesen der Personenbindung"/>
-</form>
-<form name="CertificateInfoForm"
- action="http://localhost:3495/http-security-layer-request"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;sl11:VerifyXMLSignatureRequest xmlns:sl11=&quot;http://www.buergerkarte.at/namespaces/securitylayer/20020831#&quot; xmlns:sl10=&quot;http://www.buergerkarte.at/namespaces/securitylayer/20020225#&quot; xmlns:xml=&quot;http://www.w3.org/XML/1998/namespace&quot; xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;sl11:SignatureInfo&gt;
- &lt;sl11:SignatureEnvironment&gt;
- &lt;sl10:XMLContent xml:space=&quot;preserve&quot;&gt;&lt;dsig:Signature Id=&quot;HS_signature&quot; xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;&lt;dsig:SignedInfo&gt;&lt;dsig:CanonicalizationMethod Algorithm=&quot;http://www.w3.org/TR/2001/REC-xml-c14n-20010315&quot;/&gt;&lt;dsig:SignatureMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#rsa-sha1&quot;/&gt;&lt;dsig:Reference Id=&quot;reference-data-1&quot; URI=&quot;#signed-data&quot;&gt;&lt;dsig:Transforms&gt;&lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;&lt;xf2:XPath Filter=&quot;intersect&quot; xmlns:xf2=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;id(&apos;signed-data&apos;)/node()&lt;/xf2:XPath&gt;&lt;/dsig:Transform&gt;&lt;/dsig:Transforms&gt;&lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;&lt;dsig:DigestValue&gt;C0hW5jQojphweuFzPb+CNkHwhe4=&lt;/dsig:DigestValue&gt;&lt;/dsig:Reference&gt;&lt;dsig:Reference Type=&quot;http://uri.etsi.org/01903/v1.1.1#SignedProperties&quot; URI=&quot;#refetsi&quot;&gt;&lt;dsig:Transforms&gt;&lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;&lt;xf2:XPath Filter=&quot;intersect&quot; xmlns:etsi=&quot;http://uri.etsi.org/01903/v1.1.1#&quot; xmlns:xf2=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;id(&apos;refetsi&apos;)/etsi:QualifyingProperties/etsi:SignedProperties&lt;/xf2:XPath&gt;&lt;/dsig:Transform&gt;&lt;/dsig:Transforms&gt;&lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;&lt;dsig:DigestValue&gt;Bdsc7wAfyMyZ21ChcF+tRh3D7sU=&lt;/dsig:DigestValue&gt;&lt;/dsig:Reference&gt;&lt;/dsig:SignedInfo&gt;&lt;dsig:SignatureValue&gt;lCz3hDQMbqRMmCieG3fQFax3f8JX86gDi7mf4h03J7vlJjSOJQ4Wh/3Kd81ntKuh
-qFphj2cEhQYX08e6SeaU+7H7qdRa+xFRDRGav8L5x5xCUQT2SV+2/hx0C7UuJt+p
-tewtbqVAcNxgKPlBuIzyXGOrBdiinp1KftEQoVCpPCI=&lt;/dsig:SignatureValue&gt;&lt;dsig:KeyInfo&gt;&lt;dsig:X509Data&gt;&lt;dsig:X509Certificate&gt;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==&lt;/dsig:X509Certificate&gt;&lt;/dsig:X509Data&gt;&lt;/dsig:KeyInfo&gt;&lt;dsig:Object Id=&quot;signed-data&quot;&gt;&lt;html&gt;
-&lt;head&gt;
-&lt;title&gt;&Uuml;berpr&uuml;fung des Namen des Anmelde-Servers&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;h2&gt;Pr&uuml;fung der Identit&auml;t des MOA-ID Servers&lt;/h2&gt;
-
-Bevor Sie sich in den folgenden Schritten an eine Online-Applikation anmelden,
-wird empfohlen den Namen des Anmelde-Servers zu &uuml;berpr&uuml;fen.
-Zu diesem Zweck identifiziert Ihr Webbrowser den Anmelde-Server mit Hilfe eines Zertifikates.
-Ihre Aufgabe ist es zu &uuml;berpr&uuml;fen, ob das Server-Zertifikat von einem Unternehmen ausgestellt
-wurde, dem Sie vertrauen.
-&lt;p&gt;
-Die folgenden Abs&auml;tze beschreiben, wie Sie diese &Uuml;berpr&uuml;fung durchf&uuml;hren k&ouml;nnen.
-F&uuml;hren Sie jene Arbeitsschritte durch, die f&uuml;r den von Ihnen verwendeten Webbrowser zutreffend sind.
-&lt;/p&gt;
-&lt;h3&gt;Microsoft Internet Explorer 6.0&lt;/h3&gt;
-
-&lt;ol&gt;
-&lt;li&gt;&Ouml;ffnen Sie (durch Doppel-Klicken) das Symbol mit dem gelben Vorhangschlo&szlig; am unteren Rand des Browsers.&lt;/li&gt;
-&lt;li&gt;Selektieren Sie im nun ge&ouml;ffnetem Fenster &quot;Zertifikat&quot; den Karteireiter &quot;Zertifizierungspfad&quot;.&lt;/li&gt;
-&lt;li&gt;&Ouml;ffnen Sie (durch Doppel-Klicken) das an oberster Stelle gereihte Zertifikat.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie ob als Aussteller dieses Zertifikat (Karteireiter &quot;Details&quot;, Eintrag &quot;Aussteller&quot;)
-ein Unternehmen aufscheint, dem Sie vertrauen den Namen des Anmelde-Servers zu &uuml;berpr&uuml;fen.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie, ob dieses Zertifikat authentisch vom angegebene Unternehmen stammt. Dazu k&ouml;nnen Sie den
-Fingerabdruck (Karteireiter &quot;Details&quot;, unterster Eintrag) des Zertifikats &uuml;berpr&uuml;fen. Am Ende dieses Dokuments ist
-eine von der IKT-Stabsstelle &uuml;berpr&uuml;fte Liste von Zertifikaten und deren Fingerabdruck aufgelistet.
-&Uuml;berpr&uuml;fen Sie ob das von Ihnen zu &uuml;berpr&uuml;fende Zertifikat
-in dieser Liste enthalten ist und der Fingerabruck mit dem Wert in der Liste &uuml;bereinstimmt.
-&lt;ul&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten und stimmt der Wert des Fingerabdrucks mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat authentisch und der Anmeldevorgang kann fortgesetzt werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten aber stimmt der Wert des Fingerabdrucks nicht mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat nicht authentisch und der Anmeldevorgang muss abgebrochen werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat nicht in der Liste enthalten m&uuml;ssen Sie eine andere verl&auml;ssliche Quelle f&uuml;r den
-Vergleich des Fingerabdrucks finden. Sofern das Zertifikat authentisch ist, kann der Anmeldevorgang fortgesetzt werden.&lt;/li&gt;
-&lt;/ul&gt;&lt;/li&gt;
-&lt;li&gt;Ist das in Schritt 3. ge&ouml;ffnete Zertifikat nicht im Internet Explorer installiert erscheint das Zertifikat mit
-einem roten Kreuz. Sie k&ouml;nnen das Zertifikat installieren, indem Sie die Schaltfl&auml;che &quot;Zertifikat installieren ...&quot;
-(Karteireiter &quot;Allgemein&quot;) aktivieren. In der Folge werden alle von dieser Zertifizierungsstelle ausgestellten Zertifikate
-vom Internet Explorer als vertrauensw&uuml;rdig erkannt.&lt;/li&gt;
-&lt;/ol&gt;
-&lt;h3&gt;Netscape Navigator 7.0&lt;/h3&gt;
-&lt;ol&gt;
-&lt;li&gt;&Ouml;ffnen Sie (durch Klicken) das Symbol mit dem Vorhangschloss am rechten, unteren Rand des Browsers&lt;/li&gt;
-&lt;li&gt;Aktivieren Sie die Schaltfl&auml;che &quot;Anzeigen&quot;&lt;/li&gt;
-&lt;li&gt;Selektieren Sie im nun ge&ouml;ffnetem Fenster &quot;Zertifikatsanzeige&quot; den Karteireiter &quot;Detail&quot;.&lt;/li&gt;
-&lt;li&gt;Aktivieren Sie (durch Klicken) das an oberster Stelle gereihte Zertifikat.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie ob als Aussteller dieses Zertifikat (Eintrag &quot;Aussteller&quot;)
-ein Unternehmen aufscheint, dem Sie vertrauen den Namen des Anmelde-Servers zu &uuml;berpr&uuml;fen.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie, ob dieses Zertifikat authentisch vom angegebene Unternehmen stammt. Dazu k&ouml;nnen Sie den
-Fingerabdruck des Zertifikats &uuml;berpr&uuml;fen. Am Ende dieses Dokuments ist
-eine von der IKT-Stabsstelle &uuml;berpr&uuml;fte Liste von Zertifikaten und deren Fingerabdruck aufgelistet.
-&Uuml;berpr&uuml;fen Sie ob das von Ihnen zu &uuml;berpr&uuml;fende Zertifikat
-in dieser Liste enthalten ist und der Fingerabruck mit dem Wert in der Liste &uuml;bereinstimmt.
-&lt;ul&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten und stimmt der Wert des Fingerabdrucks mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat authentisch und der Anmeldevorgang kann fortgesetzt werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten aber stimmt der Wert des Fingerabdrucks nicht mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat nicht authentisch und der Anmeldevorgang muss abgebrochen werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat nicht in der Liste enthalten m&uuml;ssen Sie eine andere verl&auml;ssliche Quelle f&uuml;r den
-Vergleich des Fingerabdrucks finden. Sofern das Zertifikat authentisch ist, kann der Anmeldevorgang fortgesetzt werden.&lt;/li&gt;
-&lt;/ul&gt;&lt;/li&gt;
-&lt;li&gt;Ist das Aussteller-Zertifikat nicht im Netscape Navigator installiert k&ouml;nnen Sie das Zertifikat installieren,
-indem Sie die &quot;*.cer&quot; Datei mit Netscape Navigator &ouml;ffnen. In der Folge werden alle von dieser Zertifizierungsstelle
-ausgestellten Zertifikate vom Internet Explorer als vertrauensw&uuml;rdig erkannt.&lt;/li&gt;
-&lt;/ol&gt;
-
-&lt;h2&gt;Zertifikate und ihr Fingerabdruck&lt;/h2&gt;
-
-&lt;table&gt;
-&lt;tr&gt;
-&lt;td&gt;Aussteller&lt;/td&gt;&lt;td&gt;CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Seriennummer&lt;/td&gt;&lt;td&gt;111 (0x6f)&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Fingerabdruck&lt;/td&gt;&lt;td&gt;SHA-1: e6 e6 fc 88 71 91 77 c9 b7 42 18 25 75 7c 5e 47 bc ac 85 f6&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;p/&gt;
-&lt;table&gt;
-&lt;tr&gt;
-&lt;td&gt;Aussteller&lt;/td&gt;&lt;td&gt;CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Seriennummer&lt;/td&gt;&lt;td&gt;531 (0x213)&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Fingerabdruck&lt;/td&gt;&lt;td&gt;SHA-1: 9e 05 12 dd 61 da 59 49 d1 d8 63 1c 3f 19 d7 5f 49 6c 37 33&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;p/&gt;
-&lt;table&gt;
-&lt;tr&gt;
-&lt;td&gt;Aussteller&lt;/td&gt;&lt;td&gt;CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Seriennummer&lt;/td&gt;&lt;td&gt;536 (0x0218)&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Fingerabdruck&lt;/td&gt;&lt;td&gt;SHA-1: 0f 5a 03 42 f5 cd 44 87 99 c3 c6 d1 78 60 7e 3f 2b 5b cb 8f&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;&lt;/dsig:Object&gt;&lt;dsig:Object Id=&quot;refetsi&quot;&gt;&lt;etsi:QualifyingProperties Target=&quot;#HS_signature&quot; xmlns:etsi=&quot;http://uri.etsi.org/01903/v1.1.1#&quot;&gt;&lt;etsi:SignedProperties&gt;&lt;etsi:SignedSignatureProperties&gt;&lt;etsi:SigningTime&gt;2003-05-06T07:09:50Z&lt;/etsi:SigningTime&gt;&lt;etsi:SigningCertificate&gt;&lt;etsi:Cert&gt;&lt;etsi:CertDigest&gt;&lt;etsi:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;&lt;etsi:DigestValue&gt;Frhu1o4mL4gQHdJcU0xSA/h4COE=&lt;/etsi:DigestValue&gt;&lt;/etsi:CertDigest&gt;&lt;etsi:IssuerSerial&gt;&lt;dsig:X509IssuerName&gt;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&lt;/dsig:X509IssuerName&gt;&lt;dsig:X509SerialNumber&gt;6455&lt;/dsig:X509SerialNumber&gt;&lt;/etsi:IssuerSerial&gt;&lt;/etsi:Cert&gt;&lt;/etsi:SigningCertificate&gt;&lt;etsi:SignaturePolicyIdentifier&gt;&lt;etsi:SignaturePolicyImplied/&gt;&lt;/etsi:SignaturePolicyIdentifier&gt;&lt;/etsi:SignedSignatureProperties&gt;&lt;etsi:SignedDataObjectProperties&gt;&lt;etsi:DataObjectFormat ObjectReference=&quot;#reference-data-1&quot;&gt;&lt;etsi:MimeType&gt;text/html&lt;/etsi:MimeType&gt;&lt;/etsi:DataObjectFormat&gt;&lt;/etsi:SignedDataObjectProperties&gt;&lt;/etsi:SignedProperties&gt;&lt;/etsi:QualifyingProperties&gt;&lt;/dsig:Object&gt;&lt;/dsig:Signature&gt;&lt;/sl10:XMLContent&gt;
- &lt;/sl11:SignatureEnvironment&gt;
- &lt;sl11:SignatureLocation&gt;//dsig:Signature&lt;/sl11:SignatureLocation&gt;
- &lt;/sl11:SignatureInfo&gt;
-&lt;/sl11:VerifyXMLSignatureRequest&gt;
-"/>
- <input type="hidden"
- name="DataURL"
- value="https://localhost:8443/authStartAuthentication?MOASessionID=DELETED"/>
- <input type="submit" value="Information zu Wurzelzertifikaten"/>
-</form>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A100/A103/htmlForm.html b/id.server/data/abnahme-test/xmldata/A100/A103/htmlForm.html
deleted file mode 100644
index 5f3812dbe..000000000
--- a/id.server/data/abnahme-test/xmldata/A100/A103/htmlForm.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<html>
-<head>
-<title>MOA ID Auth Sample Login - customized</title>
-</head>
-<body>
-<h1>MOA ID Auth Sample Login - customized</h1>
-<form name="CustomizedForm"
- action="http://localhost:3495/http-security-layer-request"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;&lt;sl10:InfoboxReadRequest xmlns:sl10=&quot;http://www.buergerkarte.at/namespaces/securitylayer/20020225#&quot;&gt;&lt;sl10:InfoboxIdentifier&gt;IdentityLink&lt;/sl10:InfoboxIdentifier&gt;&lt;sl10:BinaryFileParameters ContentIsXMLEntity=&quot;true&quot;/&gt;&lt;/sl10:InfoboxReadRequest&gt;"/>
- <input type="hidden"
- name="DataURL"
- value="https://localhost:8443/authVerifyIdentityLink?MOASessionID=DELETED"/>
- <input type="submit" value="B&uuml;rgerkarte lesen"/>
-</form>
-<form name="CustomizedInfoForm"
- action="http://localhost:3495/http-security-layer-request"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;sl11:VerifyXMLSignatureRequest xmlns:sl11=&quot;http://www.buergerkarte.at/namespaces/securitylayer/20020831#&quot; xmlns:sl10=&quot;http://www.buergerkarte.at/namespaces/securitylayer/20020225#&quot; xmlns:xml=&quot;http://www.w3.org/XML/1998/namespace&quot; xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;sl11:SignatureInfo&gt;
- &lt;sl11:SignatureEnvironment&gt;
- &lt;sl10:XMLContent xml:space=&quot;preserve&quot;&gt;&lt;dsig:Signature Id=&quot;HS_signature&quot; xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;&lt;dsig:SignedInfo&gt;&lt;dsig:CanonicalizationMethod Algorithm=&quot;http://www.w3.org/TR/2001/REC-xml-c14n-20010315&quot;/&gt;&lt;dsig:SignatureMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#rsa-sha1&quot;/&gt;&lt;dsig:Reference Id=&quot;reference-data-1&quot; URI=&quot;#signed-data&quot;&gt;&lt;dsig:Transforms&gt;&lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;&lt;xf2:XPath Filter=&quot;intersect&quot; xmlns:xf2=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;id(&apos;signed-data&apos;)/node()&lt;/xf2:XPath&gt;&lt;/dsig:Transform&gt;&lt;/dsig:Transforms&gt;&lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;&lt;dsig:DigestValue&gt;C0hW5jQojphweuFzPb+CNkHwhe4=&lt;/dsig:DigestValue&gt;&lt;/dsig:Reference&gt;&lt;dsig:Reference Type=&quot;http://uri.etsi.org/01903/v1.1.1#SignedProperties&quot; URI=&quot;#refetsi&quot;&gt;&lt;dsig:Transforms&gt;&lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;&lt;xf2:XPath Filter=&quot;intersect&quot; xmlns:etsi=&quot;http://uri.etsi.org/01903/v1.1.1#&quot; xmlns:xf2=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;id(&apos;refetsi&apos;)/etsi:QualifyingProperties/etsi:SignedProperties&lt;/xf2:XPath&gt;&lt;/dsig:Transform&gt;&lt;/dsig:Transforms&gt;&lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;&lt;dsig:DigestValue&gt;Bdsc7wAfyMyZ21ChcF+tRh3D7sU=&lt;/dsig:DigestValue&gt;&lt;/dsig:Reference&gt;&lt;/dsig:SignedInfo&gt;&lt;dsig:SignatureValue&gt;lCz3hDQMbqRMmCieG3fQFax3f8JX86gDi7mf4h03J7vlJjSOJQ4Wh/3Kd81ntKuh
-qFphj2cEhQYX08e6SeaU+7H7qdRa+xFRDRGav8L5x5xCUQT2SV+2/hx0C7UuJt+p
-tewtbqVAcNxgKPlBuIzyXGOrBdiinp1KftEQoVCpPCI=&lt;/dsig:SignatureValue&gt;&lt;dsig:KeyInfo&gt;&lt;dsig:X509Data&gt;&lt;dsig:X509Certificate&gt;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==&lt;/dsig:X509Certificate&gt;&lt;/dsig:X509Data&gt;&lt;/dsig:KeyInfo&gt;&lt;dsig:Object Id=&quot;signed-data&quot;&gt;&lt;html&gt;
-&lt;head&gt;
-&lt;title&gt;&Uuml;berpr&uuml;fung des Namen des Anmelde-Servers&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;h2&gt;Pr&uuml;fung der Identit&auml;t des MOA-ID Servers&lt;/h2&gt;
-
-Bevor Sie sich in den folgenden Schritten an eine Online-Applikation anmelden,
-wird empfohlen den Namen des Anmelde-Servers zu &uuml;berpr&uuml;fen.
-Zu diesem Zweck identifiziert Ihr Webbrowser den Anmelde-Server mit Hilfe eines Zertifikates.
-Ihre Aufgabe ist es zu &uuml;berpr&uuml;fen, ob das Server-Zertifikat von einem Unternehmen ausgestellt
-wurde, dem Sie vertrauen.
-&lt;p&gt;
-Die folgenden Abs&auml;tze beschreiben, wie Sie diese &Uuml;berpr&uuml;fung durchf&uuml;hren k&ouml;nnen.
-F&uuml;hren Sie jene Arbeitsschritte durch, die f&uuml;r den von Ihnen verwendeten Webbrowser zutreffend sind.
-&lt;/p&gt;
-&lt;h3&gt;Microsoft Internet Explorer 6.0&lt;/h3&gt;
-
-&lt;ol&gt;
-&lt;li&gt;&Ouml;ffnen Sie (durch Doppel-Klicken) das Symbol mit dem gelben Vorhangschlo&szlig; am unteren Rand des Browsers.&lt;/li&gt;
-&lt;li&gt;Selektieren Sie im nun ge&ouml;ffnetem Fenster &quot;Zertifikat&quot; den Karteireiter &quot;Zertifizierungspfad&quot;.&lt;/li&gt;
-&lt;li&gt;&Ouml;ffnen Sie (durch Doppel-Klicken) das an oberster Stelle gereihte Zertifikat.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie ob als Aussteller dieses Zertifikat (Karteireiter &quot;Details&quot;, Eintrag &quot;Aussteller&quot;)
-ein Unternehmen aufscheint, dem Sie vertrauen den Namen des Anmelde-Servers zu &uuml;berpr&uuml;fen.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie, ob dieses Zertifikat authentisch vom angegebene Unternehmen stammt. Dazu k&ouml;nnen Sie den
-Fingerabdruck (Karteireiter &quot;Details&quot;, unterster Eintrag) des Zertifikats &uuml;berpr&uuml;fen. Am Ende dieses Dokuments ist
-eine von der IKT-Stabsstelle &uuml;berpr&uuml;fte Liste von Zertifikaten und deren Fingerabdruck aufgelistet.
-&Uuml;berpr&uuml;fen Sie ob das von Ihnen zu &uuml;berpr&uuml;fende Zertifikat
-in dieser Liste enthalten ist und der Fingerabruck mit dem Wert in der Liste &uuml;bereinstimmt.
-&lt;ul&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten und stimmt der Wert des Fingerabdrucks mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat authentisch und der Anmeldevorgang kann fortgesetzt werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten aber stimmt der Wert des Fingerabdrucks nicht mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat nicht authentisch und der Anmeldevorgang muss abgebrochen werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat nicht in der Liste enthalten m&uuml;ssen Sie eine andere verl&auml;ssliche Quelle f&uuml;r den
-Vergleich des Fingerabdrucks finden. Sofern das Zertifikat authentisch ist, kann der Anmeldevorgang fortgesetzt werden.&lt;/li&gt;
-&lt;/ul&gt;&lt;/li&gt;
-&lt;li&gt;Ist das in Schritt 3. ge&ouml;ffnete Zertifikat nicht im Internet Explorer installiert erscheint das Zertifikat mit
-einem roten Kreuz. Sie k&ouml;nnen das Zertifikat installieren, indem Sie die Schaltfl&auml;che &quot;Zertifikat installieren ...&quot;
-(Karteireiter &quot;Allgemein&quot;) aktivieren. In der Folge werden alle von dieser Zertifizierungsstelle ausgestellten Zertifikate
-vom Internet Explorer als vertrauensw&uuml;rdig erkannt.&lt;/li&gt;
-&lt;/ol&gt;
-&lt;h3&gt;Netscape Navigator 7.0&lt;/h3&gt;
-&lt;ol&gt;
-&lt;li&gt;&Ouml;ffnen Sie (durch Klicken) das Symbol mit dem Vorhangschloss am rechten, unteren Rand des Browsers&lt;/li&gt;
-&lt;li&gt;Aktivieren Sie die Schaltfl&auml;che &quot;Anzeigen&quot;&lt;/li&gt;
-&lt;li&gt;Selektieren Sie im nun ge&ouml;ffnetem Fenster &quot;Zertifikatsanzeige&quot; den Karteireiter &quot;Detail&quot;.&lt;/li&gt;
-&lt;li&gt;Aktivieren Sie (durch Klicken) das an oberster Stelle gereihte Zertifikat.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie ob als Aussteller dieses Zertifikat (Eintrag &quot;Aussteller&quot;)
-ein Unternehmen aufscheint, dem Sie vertrauen den Namen des Anmelde-Servers zu &uuml;berpr&uuml;fen.&lt;/li&gt;
-&lt;li&gt;&Uuml;berpr&uuml;fen Sie, ob dieses Zertifikat authentisch vom angegebene Unternehmen stammt. Dazu k&ouml;nnen Sie den
-Fingerabdruck des Zertifikats &uuml;berpr&uuml;fen. Am Ende dieses Dokuments ist
-eine von der IKT-Stabsstelle &uuml;berpr&uuml;fte Liste von Zertifikaten und deren Fingerabdruck aufgelistet.
-&Uuml;berpr&uuml;fen Sie ob das von Ihnen zu &uuml;berpr&uuml;fende Zertifikat
-in dieser Liste enthalten ist und der Fingerabruck mit dem Wert in der Liste &uuml;bereinstimmt.
-&lt;ul&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten und stimmt der Wert des Fingerabdrucks mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat authentisch und der Anmeldevorgang kann fortgesetzt werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat in der Liste enthalten aber stimmt der Wert des Fingerabdrucks nicht mit dem Wert
-in der Liste &uuml;berein, dann ist das Zertifikat nicht authentisch und der Anmeldevorgang muss abgebrochen werden.&lt;/li&gt;
-&lt;li&gt;Ist Ihr zu pr&uuml;fendes Zertifikat nicht in der Liste enthalten m&uuml;ssen Sie eine andere verl&auml;ssliche Quelle f&uuml;r den
-Vergleich des Fingerabdrucks finden. Sofern das Zertifikat authentisch ist, kann der Anmeldevorgang fortgesetzt werden.&lt;/li&gt;
-&lt;/ul&gt;&lt;/li&gt;
-&lt;li&gt;Ist das Aussteller-Zertifikat nicht im Netscape Navigator installiert k&ouml;nnen Sie das Zertifikat installieren,
-indem Sie die &quot;*.cer&quot; Datei mit Netscape Navigator &ouml;ffnen. In der Folge werden alle von dieser Zertifizierungsstelle
-ausgestellten Zertifikate vom Internet Explorer als vertrauensw&uuml;rdig erkannt.&lt;/li&gt;
-&lt;/ol&gt;
-
-&lt;h2&gt;Zertifikate und ihr Fingerabdruck&lt;/h2&gt;
-
-&lt;table&gt;
-&lt;tr&gt;
-&lt;td&gt;Aussteller&lt;/td&gt;&lt;td&gt;CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Seriennummer&lt;/td&gt;&lt;td&gt;111 (0x6f)&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Fingerabdruck&lt;/td&gt;&lt;td&gt;SHA-1: e6 e6 fc 88 71 91 77 c9 b7 42 18 25 75 7c 5e 47 bc ac 85 f6&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;p/&gt;
-&lt;table&gt;
-&lt;tr&gt;
-&lt;td&gt;Aussteller&lt;/td&gt;&lt;td&gt;CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Seriennummer&lt;/td&gt;&lt;td&gt;531 (0x213)&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Fingerabdruck&lt;/td&gt;&lt;td&gt;SHA-1: 9e 05 12 dd 61 da 59 49 d1 d8 63 1c 3f 19 d7 5f 49 6c 37 33&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;p/&gt;
-&lt;table&gt;
-&lt;tr&gt;
-&lt;td&gt;Aussteller&lt;/td&gt;&lt;td&gt;CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Seriennummer&lt;/td&gt;&lt;td&gt;536 (0x0218)&lt;/td&gt;
-&lt;/tr&gt;
-&lt;tr&gt;
-&lt;td&gt;Fingerabdruck&lt;/td&gt;&lt;td&gt;SHA-1: 0f 5a 03 42 f5 cd 44 87 99 c3 c6 d1 78 60 7e 3f 2b 5b cb 8f&lt;/td&gt;
-&lt;/tr&gt;
-&lt;/table&gt;
-
-&lt;/body&gt;
-&lt;/html&gt;&lt;/dsig:Object&gt;&lt;dsig:Object Id=&quot;refetsi&quot;&gt;&lt;etsi:QualifyingProperties Target=&quot;#HS_signature&quot; xmlns:etsi=&quot;http://uri.etsi.org/01903/v1.1.1#&quot;&gt;&lt;etsi:SignedProperties&gt;&lt;etsi:SignedSignatureProperties&gt;&lt;etsi:SigningTime&gt;2003-05-06T07:09:50Z&lt;/etsi:SigningTime&gt;&lt;etsi:SigningCertificate&gt;&lt;etsi:Cert&gt;&lt;etsi:CertDigest&gt;&lt;etsi:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;&lt;etsi:DigestValue&gt;Frhu1o4mL4gQHdJcU0xSA/h4COE=&lt;/etsi:DigestValue&gt;&lt;/etsi:CertDigest&gt;&lt;etsi:IssuerSerial&gt;&lt;dsig:X509IssuerName&gt;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&lt;/dsig:X509IssuerName&gt;&lt;dsig:X509SerialNumber&gt;6455&lt;/dsig:X509SerialNumber&gt;&lt;/etsi:IssuerSerial&gt;&lt;/etsi:Cert&gt;&lt;/etsi:SigningCertificate&gt;&lt;etsi:SignaturePolicyIdentifier&gt;&lt;etsi:SignaturePolicyImplied/&gt;&lt;/etsi:SignaturePolicyIdentifier&gt;&lt;/etsi:SignedSignatureProperties&gt;&lt;etsi:SignedDataObjectProperties&gt;&lt;etsi:DataObjectFormat ObjectReference=&quot;#reference-data-1&quot;&gt;&lt;etsi:MimeType&gt;text/html&lt;/etsi:MimeType&gt;&lt;/etsi:DataObjectFormat&gt;&lt;/etsi:SignedDataObjectProperties&gt;&lt;/etsi:SignedProperties&gt;&lt;/etsi:QualifyingProperties&gt;&lt;/dsig:Object&gt;&lt;/dsig:Signature&gt;&lt;/sl10:XMLContent&gt;
- &lt;/sl11:SignatureEnvironment&gt;
- &lt;sl11:SignatureLocation&gt;//dsig:Signature&lt;/sl11:SignatureLocation&gt;
- &lt;/sl11:SignatureInfo&gt;
-&lt;/sl11:VerifyXMLSignatureRequest&gt;
-"/>
- <input type="hidden"
- name="DataURL"
- value="https://localhost:8443/authStartAuthentication?MOASessionID=DELETED"/>
- Hier finden Sie weitere Informationen zur &Uuml;berpr&uuml;fung der Zertifikate.
- <input type="submit" value="Weitere Info"/>
-</form></body>
-</html> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A100/AuthTemplate.html b/id.server/data/abnahme-test/xmldata/A100/AuthTemplate.html
deleted file mode 100644
index 2ecfe9cfd..000000000
--- a/id.server/data/abnahme-test/xmldata/A100/AuthTemplate.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-<title>MOA ID Auth Sample Login - customized</title>
-</head>
-<body>
-<h1>MOA ID Auth Sample Login - customized</h1>
-<form name="CustomizedForm"
- action="<BKU>"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<XMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<DataURL>"/>
- <input type="submit" value="B&uuml;rgerkarte lesen"/>
-</form>
-<form name="CustomizedInfoForm"
- action="<BKU>"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<CertInfoXMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<CertInfoDataURL>"/>
- Hier finden Sie weitere Informationen zur &Uuml;berpr&uuml;fung der Zertifikate.
- <input type="submit" value="Weitere Info"/>
-</form></body>
-</html> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A200/A201/CreateXMLSignatureRequest.xml b/id.server/data/abnahme-test/xmldata/A200/A201/CreateXMLSignatureRequest.xml
deleted file mode 100644
index 3877f0950..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A201/CreateXMLSignatureRequest.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<sl11:CreateXMLSignatureRequest xmlns:dsig='http://www.w3.org/2000/09/xmldsig#' xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/20020225#' xmlns:sl11='http://www.buergerkarte.at/namespaces/securitylayer/20020831#'>
- <sl11:KeyboxIdentifier>SecureSignatureKeypair</sl11:KeyboxIdentifier>
- <sl11:DataObjectInfo Structure='detached'>
- <sl10:DataObject Reference=''/>
-<sl10:TransformsInfo>
- <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:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
- <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='OA']/saml:AttributeValue"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Geschäftsbereich:</b>
- </td>
- <td>
- <xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
- </dsig:Transforms>
- <sl10:FinalDataMetaInfo>
- <sl10:MimeType>text/html</sl10:MimeType>
- </sl10:FinalDataMetaInfo>
-</sl10:TransformsInfo>
- </sl11:DataObjectInfo>
- <sl11:SignatureInfo>
- <sl11:SignatureEnvironment>
- <sl10:XMLContent><saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' MajorVersion='1' MinorVersion='0' AssertionID='any' Issuer='Hermann Muster' IssueInstant='2003-04-29T09:40:46+02:00'>
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier>https://localhost:8443/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>
-</saml:Assertion></sl10:XMLContent>
- </sl11:SignatureEnvironment>
- <sl11:SignatureLocation Index='2'>/saml:Assertion</sl11:SignatureLocation>
- </sl11:SignatureInfo>
-</sl11:CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A200/A254/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A254/InfoboxReadResponse.xml
deleted file mode 100644
index f6b2aa57d..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A254/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>000000000000</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/id.server/data/abnahme-test/xmldata/A200/A255/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A255/InfoboxReadResponse.xml
deleted file mode 100644
index b38e902f2..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A255/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="A" 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>000000000000</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/id.server/data/abnahme-test/xmldata/A200/A256/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A256/InfoboxReadResponse.xml
deleted file mode 100644
index ab5315d20..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A256/InfoboxReadResponse.xml
+++ /dev/null
@@ -1,108 +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>000000000000</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>
- <pr:Person xsi:type="pr:PhysicalPersonType">
- <pr:Identification>
- <pr:Value>000000000000</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/id.server/data/abnahme-test/xmldata/A200/A257/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A257/InfoboxReadResponse.xml
deleted file mode 100644
index a980fabd3..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A257/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>000000000000</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="NOCitizenPublicKey" 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="NOCitizenPublicKey" 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/id.server/data/abnahme-test/xmldata/A200/A258/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A258/InfoboxReadResponse.xml
deleted file mode 100644
index 78f5ddd5c..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A258/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://WRONG.NAMESPACE">
- <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://WRONG.NAMESPACE">
- <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/id.server/data/abnahme-test/xmldata/A200/A259/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A259/InfoboxReadResponse.xml
deleted file mode 100644
index 764b08361..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A259/InfoboxReadResponse.xml
+++ /dev/null
@@ -1,87 +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>
-
- </saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName="CitizenPublicKey" AttributeNamespace="http://www.buergerkarte.at/namespaces/personenbindung/20020506#">
- <saml:AttributeValue>
-
- </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/id.server/data/abnahme-test/xmldata/A200/A260/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A260/InfoboxReadResponse.xml
deleted file mode 100644
index 22ea67174..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A260/InfoboxReadResponse.xml
+++ /dev/null
@@ -1,41 +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>
-</saml:Assertion></sl10:XMLContent></sl10:BinaryFileData></sl10:InfoboxReadResponse> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A200/A261/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A261/InfoboxReadResponse.xml
deleted file mode 100644
index e3ca1bf66..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A261/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>Hermann2</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/id.server/data/abnahme-test/xmldata/A200/A262/Configuration.xml b/id.server/data/abnahme-test/xmldata/A200/A262/Configuration.xml
deleted file mode 100644
index 44b4f519b..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A262/Configuration.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile2</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile2</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <!--<X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>-->
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="http://localhost:9080/moa-id-auth/services/GetAuthenticationData">
- <!-- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore> -->
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="http://localhost:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="10">
- <ConnectionParameter URL="ProxyComponentURL">
- <AcceptedServerCertificates>url:AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://testP101:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://testP102:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfParamAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA302:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="true"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA303:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="true" provideIdentityLink="false"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA304:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="true" provideIdentityLink="true"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA305:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="false" provideIdentityLink="false"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA306:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="false" provideIdentityLink="true"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA307:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="false"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA308:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="data/test/certs/cert-store-root"/>
- <GenericConfiguration name="TLSTrustedCACertificates" value="file:c:/java/id.server/data/test/certs/ca-certs"/>
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A200/A262/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A262/InfoboxReadResponse.xml
deleted file mode 100644
index e894f560e..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A262/InfoboxReadResponse.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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-13T08:18:09.803" IssueInstant="2003-02-13T08:18:09.803" Issuer="http://zmr.bmi.gv.at/zmra/names#Issuer" MajorVersion="1" MinorVersion="0" xmlns="" 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>987654321098</pr:Value>
- <pr:Type>http://reference.e-government.gv.at/names/persondata/20020228#zmr-zahl</pr:Type>
- </pr:Identification>
- <pr:Name>
- <pr:GivenName>Monika</pr:GivenName>
- <pr:FamilyName primary="undefined">Bürger</pr:FamilyName>
- </pr:Name>
- <pr:DateOfBirth>1945-08-02</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>5lEaWEjW+4/6Zcp4TCAx4KDwrhqNCnwSOlyWBgAvHZs57Sg2h3lATP2SJjujzMityxI/r5XFSjNl
-D7BDml4hqy7P2Ro0z/EDKWCo+VMjZS2DKMUWoB4u+QOgovHXMcB/ko6N0MSwQxDxus7LrJ2aYT2G
-naS1u6/zULjkn3rhOjM=</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>ZObnb8BKSWDhmGsQhNGWSAboNH+nJPM109g8QlTi3KrLmtbVuuQWByZmRbgT4HfRFsnD8RvG2Lw3
-cC0G8UH/BeSo5LeJSZc5TUTbWm62kjywzGp4TTX0/K1bHp2cZ/lOIpfAI1tsGerWIoX7FRd79lc+
-8Osp1AsguEm/qQH6FTs=</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>N37kVznK95fiKaf1sWVHeFkbzwY=</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>Rk9zppvNedEsGSx9CibYS4eu0jw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Hte006lAMycSR138EA/LGP/NBuaab4PzleCjl4ZvDTGKBPEzFKtVqrY+evG9aKWi
-B/yw1L5DnIn9UOKqLouwZGBzK33nyAZdr+GWYtWKogbgEeNTLxT2LNoQHthfsTLr
-g2Me//mQEqYdtMcTfmhls/qizjhgZXm16yaCWv2bIoc=</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>0DHkFVM0QWLSexFR2MX0VavHHK8=</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/id.server/data/abnahme-test/xmldata/A200/A263/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/A200/A263/InfoboxReadResponse.xml
deleted file mode 100644
index 9ad95af1f..000000000
--- a/id.server/data/abnahme-test/xmldata/A200/A263/InfoboxReadResponse.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><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="" 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/IEQmrTQThPRHN
-WW5RPGxVlPDz5BmjberdaWlgJlbyKf3b/WpNNJYptQ7ijrXlsQoCzjfiQy37NEfv
-HEcxHQOA6sa42C+dFKsKIvmP3mZkRYWJDxxsVzI7E+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/id.server/data/abnahme-test/xmldata/A300/A301/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A301/AuthenticationData.xml
deleted file mode 100644
index 03b1fbd3f..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A301/AuthenticationData.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><pr:Person xsi:type="pr:PhysicalPersonType">
-
- <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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A301/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A301/Configuration.xml
deleted file mode 100644
index 39d9a864b..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A301/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A302/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A302/AuthenticationData.xml
deleted file mode 100644
index db46fb127..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A302/AuthenticationData.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData><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></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><pr:Person xsi:type="pr:PhysicalPersonType">
-
- <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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A302/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A302/Configuration.xml
deleted file mode 100644
index 804a27e92..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A302/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A303/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A303/AuthenticationData.xml
deleted file mode 100644
index 12cfbb668..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A303/AuthenticationData.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData><saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' MajorVersion='1' MinorVersion='0' Issuer='Hermann Muster' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier>https://localhost:8443/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>
-</saml:Assertion></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><pr:Person xsi:type="pr:PhysicalPersonType">
-
- <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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A303/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A303/Configuration.xml
deleted file mode 100644
index 2067a40c7..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A303/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="true" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A304/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A304/AuthenticationData.xml
deleted file mode 100644
index 7e05dbfe1..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A304/AuthenticationData.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData><saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' MajorVersion='1' MinorVersion='0' Issuer='Hermann Muster' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier>https://localhost:8443/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>
-</saml:Assertion><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></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><pr:Person xsi:type="pr:PhysicalPersonType">
-
- <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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A304/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A304/Configuration.xml
deleted file mode 100644
index bc1bc17ce..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A304/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A305/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A305/AuthenticationData.xml
deleted file mode 100644
index 124f7e5d0..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A305/AuthenticationData.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A305/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A305/Configuration.xml
deleted file mode 100644
index 7a2ed2017..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A305/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A306/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A306/AuthenticationData.xml
deleted file mode 100644
index 9b39890d1..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A306/AuthenticationData.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData><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></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A306/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A306/Configuration.xml
deleted file mode 100644
index 3750de781..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A306/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="false" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A307/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A307/AuthenticationData.xml
deleted file mode 100644
index 499a3908e..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A307/AuthenticationData.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData><saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' MajorVersion='1' MinorVersion='0' Issuer='Hermann Muster' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier>https://localhost:8443/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>
-</saml:Assertion></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A307/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A307/Configuration.xml
deleted file mode 100644
index 7400f791a..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A307/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A308/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A308/AuthenticationData.xml
deleted file mode 100644
index 32b3d31f9..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A308/AuthenticationData.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData><saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' MajorVersion='1' MinorVersion='0' Issuer='Hermann Muster' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier>https://localhost:8443/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>
-</saml:Assertion><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></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A308/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A308/Configuration.xml
deleted file mode 100644
index b6b42f267..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A308/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A309/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A309/AuthenticationData.xml
deleted file mode 100644
index b3e27002e..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A309/AuthenticationData.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><pr:Person xsi:type="pr:PhysicalPersonType">
-
- <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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>false</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A309/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A309/Configuration.xml
deleted file mode 100644
index 9e523773a..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A309/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</X509SubjectName>
- <X509SubjectName>CN=Max Mustermann,O=Musterorganisation,STREET=Mustergasse 1,L=Wien,ST=Wien,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
-
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A309/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A309/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 184615e91..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A309/CreateXMLSignatureResponse.xml
+++ /dev/null
@@ -1,52 +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-23T09:52:28+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>https://moatestlinux:18443/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="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-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='OA']/saml:AttributeValue"/></td></tr>
-<tr><td><b>Geschäftsbereich:</b></td><td><xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>ue7o7gdb1tN1eNQ/PTK2zBa4tzc=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-signed-1-1')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>DlzOL10xqFzEPMGWmenuvyqB3+c=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Mx68y1JK5jtEyp10w/9p5FYq0Ro5JsjOHQREag5DAfMW5Mf+6qapTjvO+eDZXYub
-Vjzph+QgxIhwfFQtrrM9M9ftuHWtD+HeVaexWNkApOBzijdTjZAS4lph4WM5wJ3M
-/vUhCJzQzC1scg7xRdNGd+aszMtksWKJpPw4oI0PayE=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-04-25T10:36:37</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>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/id.server/data/abnahme-test/xmldata/A300/A310/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A310/AuthenticationData.xml
deleted file mode 100644
index b3e27002e..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A310/AuthenticationData.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><pr:Person xsi:type="pr:PhysicalPersonType">
-
- <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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>false</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A310/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A310/Configuration.xml
deleted file mode 100644
index 9e523773a..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A310/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</X509SubjectName>
- <X509SubjectName>CN=Max Mustermann,O=Musterorganisation,STREET=Mustergasse 1,L=Wien,ST=Wien,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
-
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A310/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A310/CreateXMLSignatureResponse.xml
deleted file mode 100644
index e004eb74c..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A310/CreateXMLSignatureResponse.xml
+++ /dev/null
@@ -1,52 +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-23T09:52:28+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>https://moatestlinux:18443/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="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-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='OA']/saml:AttributeValue"/></td></tr>
-<tr><td><b>Geschäftsbereich:</b></td><td><xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>ue7o7gdb1tN1eNQ/PTK2zBa4tzc=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-signed-1-1')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Q2VhPYhMbwz4beILYjMDmBsurLQ=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>lr5L9hxi1rvdm5vT9WpG8yYKv1TIjPrONJUv6O4lTUyC4E8L4nwx8mMFPd8Q7jNb
-WmMmaDCl0uZYOATdu/x2t5wYOYreBUpka3J3wPTIJhMJQwaMMu3rHM3Ewn+1Wlsw
-6VED3ZWKAmI+12Mto5RLbD5BU6757Tx42YuCkw9glZM=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID5zCCA1SgAwIBAgIGAPR8iAdPMAkGBSsOAwIdBQAwgawxCzAJBgNVBAYTAkFU
-MSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVDSE5PTE9HWTFHMEUGA1UE
-CxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRpb24gUHJvY2Vzc2luZyBh
-bmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAsTDElBSUsgVGVzdCBDQTEVMBMGA1UE
-AxMMSUFJSyBUZXN0IENBMB4XDTAzMDQxMTExNDIwNVoXDTAzMTIzMDIyNTkzMFow
-gZgxCzAJBgNVBAYTAkFUMSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVD
-SE5PTE9HWTFHMEUGA1UECxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRp
-b24gUHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxGDAWBgNVBAMUD0lzb2xk
-ZSBC/HJnZXJpbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0bdQqA5YFf32
-OjaZo01tpAsP/Kgor6sWGLQj2uBrQDOAOymVkIPtv4C9XQ1tH8EUexgbYI1QpE9V
-ODvoo49Bi6u9hYnlDFj+8EgQoDCmqFSy/jzwLVnRL7jwN96uAyU5WymEdPWgHRpT
-6oDxYs36MJ7+iWQISA6nl3/QTI4wnJcCAwEAAaOCASwwggEoMAwGA1UdEwEB/wQC
-MAAwDgYDVR0PAQH/BAQDAgbAMBEGCWCGSAGG+EIBAQQEAwIFIDBnBgNVHSAEYDBe
-MFwGDCsGAQQBlRIBAnsBATBMMEoGCCsGAQUFBwICMD4aPFRoaXMgY2VydGlmaWNh
-dGUgb25seSBtYXkgYmUgdXNlZCBmb3IgZGVtb25zdHJhdGlvbiBwdXJwb3NlczA8
-BgNVHR8ENTAzMDGgL6AthitodHRwOi8vd3d3LmlhaWsuYXQvdGVzdENBL2lhaWtf
-dGVzdF9zaWcuY3JsMB0GA1UdDgQWBBTehKfLADylQ4B6DyYKvUG1+pHZzzAOBgcq
-KAAKAQEBBAMBAf8wHwYDVR0jBBgwFoAUTCCwVgIM94gKloilFLRRzDq18r8wCQYF
-Kw4DAh0FAAOBgQBw2mE3PxdtcSDwCTglkNt7ww4IGmWnUCYUiV8x/lcwWdXhcnRM
-lsjmOYi0vFiV8ne6x8fI6WMQLmHQMTfra+tEBrsHOlhISz5F5VGVfj/w6DcTC2HH
-wGaIkTqAu6GZ+bu8OpXYSIZEy4ZSMTWWnomses0LyrXqmWNWh1InVjAPiw==</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-04-25T10:36:39</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>YrSnK0/o4nCtqxK1IpJF2Qy4ZQc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1050061309775</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>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/id.server/data/abnahme-test/xmldata/A300/A311/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A300/A311/AuthenticationData.xml
deleted file mode 100644
index 8a66f40cf..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A311/AuthenticationData.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><pr:Person xsi:type="pr:PhysicalPersonType">
-
- <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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>false</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isPublicAuthority' AttributeNamespace='urn:oid:1.2.40.0.10.1.1.1'>
- <saml:AttributeValue>Musterbehörde</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A311/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A311/Configuration.xml
deleted file mode 100644
index 9e523773a..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A311/Configuration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</X509SubjectName>
- <X509SubjectName>CN=Max Mustermann,O=Musterorganisation,STREET=Mustergasse 1,L=Wien,ST=Wien,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
-
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="authenticationSessionTimeOut" value="600"/>
- <GenericConfiguration name="authenticationDataTimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A311/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A311/CreateXMLSignatureResponse.xml
deleted file mode 100644
index f7346ad2b..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A311/CreateXMLSignatureResponse.xml
+++ /dev/null
@@ -1,52 +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-23T09:52:28+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>https://moatestlinux:18443/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="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-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='OA']/saml:AttributeValue"/></td></tr>
-<tr><td><b>Geschäftsbereich:</b></td><td><xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>ue7o7gdb1tN1eNQ/PTK2zBa4tzc=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-signed-1-1')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>nSqJkplafvE6SpfL0JP5Tbanh3Y=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>V5m5I1QA+NXzhU64G/I1vT8LAoWqaoHm2Ck807U8SVG668NmjH4wrfTln+Shx0HD
-+q4c2NAb6ZFzTUQ190RlRgvEM0cvtCSpn7/AcJaBd5WuUYPRLPEmP8ca4xhLGi1t
-XZQCTpTLLnRI+5Yf5HJqc1lfs5Pkv9hQZ9W55eJgmiA=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIDwTCCAy6gAwIBAgIVAOn21xTCfievvs3qbq8HRBHjXjNPMAkGBSsOAwIdBQAw
-gZUxCzAJBgNVBAYTAkFUMSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVD
-SE5PTE9HWTFHMEUGA1UECxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRp
-b24gUHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAMTDElBSUsg
-VGVzdCBDQTAeFw0wMjExMTUwOTQwNTBaFw0wMzEyMzEyMjU5MzBaMHkxCzAJBgNV
-BAYTAkFUMQ0wCwYDVQQIEwRXaWVuMQ0wCwYDVQQHEwRXaWVuMRYwFAYDVQQJEw1N
-dXN0ZXJnYXNzZSAxMRswGQYDVQQKExJNdXN0ZXJvcmdhbmlzYXRpb24xFzAVBgNV
-BAMTDk1heCBNdXN0ZXJtYW5uMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDw
-Dxgoc53OFRWuZcGRkuZYYHxTeM7tLoH+9eFpqtokWHruFNn49JNWNdU2PMPeXezO
-6eYwz/214/EB/SvCx5ZRlLC7GikqUX0UyK/r36zq9Q5nOMFfSoG48hEIjzAUWnc4
-FIePYW7hdb0/nW+1CKVdpmsGHChJoN7SCiVvY0eyAQIDAQABo4IBLjCCASowDAYD
-VR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwZwYDVR0gBGAwXjBcBgwrBgEEAZUS
-AQIDAQEwTDBKBggrBgEFBQcCAjA+GjxUaGlzIGNlcnRpZmljYXRlIG1heSBiZSB1
-c2VkIGZvciBkZW1vbnN0cmF0aW9uIHB1cnBvc2VzIG9ubHkwLwYDVR0RBCgwJoEk
-bWF4Lm11c3Rlcm1hbm5AbXVzdGVyb3JnYW5pc2F0aW9uLmF0MB0GA1UdDgQWBBTp
-9tcUwn4nr77N6m6vB0MgXEvH5TAbBgcqKAAKAQEBBBAMDk11c3RlcmJlaMO2cmRl
-MBMGA1UdJQQMMAoGCCsGAQUFBwMEMB8GA1UdIwQYMBaAFOtWHOnph3q+vzHzdX8q
-/qzlQNOOMAkGBSsOAwIdBQADgYEALbC1Ibymb3DWwB+pEezrt87+r3xi+JGFxkt0
-tw0tOoe+ejSY8AhSuY3LseLdPNDnTtlg/GlkzijCFxBHPgUKhGokA91qIoV++fZt
-3/pxjSVxl+elGDCx9WcrXB5L7m5mxSMgYGOZH2UUlFZQvtKXxU4KrXCXkQVTsg9g
-RWizwj4=</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-04-25T10:36:40</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>pMBCPXFi69dO65GgzApHN4TxtvM=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1335699569126441074835341742398412708010421793615</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>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/id.server/data/abnahme-test/xmldata/A300/A355/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A355/CreateXMLSignatureResponse.xml
deleted file mode 100644
index b9e0e0f9c..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A355/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="A" 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/id.server/data/abnahme-test/xmldata/A300/A356/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A356/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 4ef49034c..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A356/CreateXMLSignatureResponse.xml
+++ /dev/null
@@ -1,62 +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:Subject>
- <saml:NameIdentifier>http://localhost2: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/id.server/data/abnahme-test/xmldata/A300/A357/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A357/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 4fe3c4b2b..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A357/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="gb" 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/id.server/data/abnahme-test/xmldata/A300/A358/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A358/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 4736c5dc3..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A358/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://wrong.namespace.com">
- <saml:AttributeValue>gb</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName="OA" AttributeNamespace="http://wrong.namespace.com">
- <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/id.server/data/abnahme-test/xmldata/A300/A359/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A359/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 7664fbe33..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A359/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>noTarget</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/id.server/data/abnahme-test/xmldata/A300/A360/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A360/CreateXMLSignatureResponse.xml
deleted file mode 100644
index a7ef7a637..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A360/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="noOA" 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/id.server/data/abnahme-test/xmldata/A300/A361/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A361/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 4736c5dc3..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A361/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://wrong.namespace.com">
- <saml:AttributeValue>gb</saml:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName="OA" AttributeNamespace="http://wrong.namespace.com">
- <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/id.server/data/abnahme-test/xmldata/A300/A362/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A362/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 6e8393033..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A362/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>WRONG</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/id.server/data/abnahme-test/xmldata/A300/A363/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A363/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 96032998a..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A363/CreateXMLSignatureResponse.xml
+++ /dev/null
@@ -1,13 +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></saml:Assertion></sl11:CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A300/A364/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A364/CreateXMLSignatureResponse.xml
deleted file mode 100644
index ba2749cda..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A364/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:8081/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/id.server/data/abnahme-test/xmldata/A300/A366/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A366/Configuration.xml
deleted file mode 100644
index 9a358e434..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A366/Configuration.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile2</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <!--<X509SubjectName>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</X509SubjectName>-->
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="http://localhost:9080/moa-id-auth/services/GetAuthenticationData">
- <!-- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore> -->
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="http://localhost:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="10">
- <ConnectionParameter URL="ProxyComponentURL">
- <AcceptedServerCertificates>url:AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="data/test/certs/cert-store-root"/>
- <GenericConfiguration name="TLSTrustedCACertificates" value="file:c:/java/id.server/data/test/certs/ca-certs"/>
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A367/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A367/Configuration.xml
deleted file mode 100644
index 5aade8185..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A367/Configuration.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <!--<X509SubjectName>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</X509SubjectName>-->
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="http://localhost:9080/moa-id-auth/services/GetAuthenticationData">
- <!-- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore> -->
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="http://localhost:8080/moa-id-proxy/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="10">
- <ConnectionParameter URL="ProxyComponentURL">
- <AcceptedServerCertificates>url:AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="data/test/certs/cert-store-root"/>
- <GenericConfiguration name="TLSTrustedCACertificates" value="file:c:/java/id.server/data/test/certs/ca-certs"/>
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A300/A367/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/A300/A367/CreateXMLSignatureResponse.xml
deleted file mode 100644
index ec8cefe99..000000000
--- a/id.server/data/abnahme-test/xmldata/A300/A367/CreateXMLSignatureResponse.xml
+++ /dev/null
@@ -1,94 +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-05-20T10:30:56+02:00" Issuer="Monika Bürger" MajorVersion="1" MinorVersion="0" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier>https://localhost:8443/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>http://localhost:8080/moa-id-proxy/</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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Vmmkctd+R7lkSKftZO1UnenfWi0=</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>vfTksPSWSacTaSWnvybsm8iV80o=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>wIqspNC5KqReKNMNO7PIemxSKwGId1HIp5r6FFtuj099C304xR5fZoCoC2Zyk6di
-bnoh+rRk9oZFeGoWvhb/JADGgtia7VUO4qc3suCNVpikRgiG5K8LXMGS3w+1wUFb
-JIkDKLuDxmXApG+BEEQXmE07zfwAzRbVBmunpWnG/us=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIFJTCCBA2gAwIBAgICGTkwDQYJKoZIhvcNAQEFBQAwgaExCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIzAhBgNVBAsTGmEtc2lnbi1URVNU
-LVByZW1pdW0tRW5jLTAxMSMwIQYDVQQDExphLXNpZ24tVEVTVC1QcmVtaXVtLUVu
-Yy0wMTAeFw0wMzAyMTAxMzI0MTlaFw0wNjAyMTAxMzI0MjBaMGoxCzAJBgNVBAYT
-AkFUMRwwGgYDVQQDExNUZXN0cGVyc29uIE1PQTEgQlJaMQwwCgYDVQQEEwNCUlox
-GDAWBgNVBCoTD1Rlc3RwZXJzb24gTU9BMTEVMBMGA1UEBRMMMjI1NjUyMzkyMTA0
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmURpYSNb7j/plynhMIDHgoPCu
-Go0KfBI6XJYGAC8dmzntKDaHeUBM/ZImO6PMyK3LEj+vlcVKM2UPsEOaXiGrLs/Z
-GjTP8QMpYKj5UyNlLYMoxRagHi75A6Ci8dcxwH+Sjo3QxLBDEPG6zsusnZphPYad
-pLW7r/NQuOSfeuE6MwIDAQABo4ICHzCCAhswEwYDVR0jBAwwCoAIS7OAw3GTPNgw
-JwYIKwYBBQUHAQMBAf8EGDAWMAgGBgQAjkYBATAKBggrBgEFBQcLATCBggYIKwYB
-BQUHAQEEdjB0MCkGCCsGAQUFBzABhh1odHRwOi8vd3d3LmEtdHJ1c3QuYXQ6ODIv
-b2NzcDBHBggrBgEFBQcwAoY7aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Et
-c2lnbi1URVNULVByZW1pdW0tU2lnLTAxYS5jcnQwgZQGA1UdIASBjDCBiTB9BgYq
-KAARAQQwczA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3Mv
-Y3AvYS1zaWduLVRFU1QwOgYIKwYBBQUHAgIwLhosRGllc2VzIFplcnRpZmlrYXQg
-ZGllbnQgbnVyIHp1IFRlc3R6d2Vja2VuICEwCAYGBACLMAEBMG8GA1UdHwRoMGYw
-ZKBioGCGXmxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLVRFU1QtUHJl
-bWl1bS1FbmMtMDEsbz1BLVRydXN0LGM9QVQ/Y2VydGlmaWNhdGVyZXZvY2F0aW9u
-bGlzdD8wEQYDVR0OBAoECEp3ZWggbV5MMA4GA1UdDwEB/wQEAwIGwDAgBgNVHREE
-GTAXgRV0ZXN0cGVyc29uMkBicnouZ3YuYXQwCQYDVR0TBAIwADANBgkqhkiG9w0B
-AQUFAAOCAQEAIuyADBvzJmE7yCCAilQrFl4U+HjMNF5NwbbUqjtVxCj7JliOFJBd
-en46ekG8w57tLHOhg/5N9xdmObX2jgzGZy7uJC7eDnszWjvvfsFev87MwZFy3Pm/
-wdu1+7/+RLDcrOViDn1x2n/JDvkqZJ5WFor2R76wnBIESNeHOqDW9nXHP5F5ERLI
-Ug3tVhIHCkxkBvHJkQOwMD+BhKGh/1jSBRloyrVD/5QUcbQE5wmOjv1I6LLOZRbq
-eXk8cQhwGH+K6p0BdwQc6rg3CXFqTTzP4GuUhnxfJsYtKw7qAfVSf3VRqbeVHX4M
-xDtbjTi15+0lWfB15L4jukJl10D9cFMsWA==</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-05-20T08:31:06Z</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>A6PySg7S5iw8pJEX0i5lwp43lZY=</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>6457</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/id.server/data/abnahme-test/xmldata/A400/A401/AuthenticationData.xml b/id.server/data/abnahme-test/xmldata/A400/A401/AuthenticationData.xml
deleted file mode 100644
index 32b3d31f9..000000000
--- a/id.server/data/abnahme-test/xmldata/A400/A401/AuthenticationData.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' xmlns:pr='http://reference.e-government.gv.at/namespace/persondata/20020228#' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' MajorVersion='1' MinorVersion='0' Issuer='https://localhost:8443/auth' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier='http://reference.e-government.gv.at/names/vpk/20020221#'>kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData><saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' MajorVersion='1' MinorVersion='0' Issuer='Hermann Muster' >
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier>https://localhost:8443/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>
-</saml:Assertion><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></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName='PersonData' AttributeNamespace='http://reference.e-government.gv.at/namespace/persondata/20020228#'>
- <saml:AttributeValue><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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName='isQualifiedCertificate' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A600/A601/GetAuthenticationDataWebServiceResponse.xml b/id.server/data/abnahme-test/xmldata/A600/A601/GetAuthenticationDataWebServiceResponse.xml
deleted file mode 100644
index 8dd0f10d6..000000000
--- a/id.server/data/abnahme-test/xmldata/A600/A601/GetAuthenticationDataWebServiceResponse.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<samlp:Response InResponseTo="" MajorVersion="1" MinorVersion="0" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol"> <samlp:Status> <samlp:StatusCode Value="samlp:Success"> </samlp:StatusCode> <samlp:StatusMessage>Anfrage erfolgreich beantwortet</samlp:StatusMessage> </samlp:Status> <saml:Assertion Issuer="https://localhost:8443/moa-id-auth/" 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:NameIdentifier NameQualifier="http://reference.e-government.gv.at/names/vpk/20020221#">kp6hOq6LRAkLtrqm6EvDm6bMwJw=</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData><saml:Assertion Issuer="Hermann Muster" MajorVersion="1" MinorVersion="0" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier>https://localhost:8443/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>
-</saml:Assertion><saml:Assertion 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></saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName="PersonData" AttributeNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#">
- <saml:AttributeValue><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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName="isQualifiedCertificate" AttributeNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <saml:AttributeValue>true</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion></samlp:Response> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A700/A701/AuthTemplate.html b/id.server/data/abnahme-test/xmldata/A700/A701/AuthTemplate.html
deleted file mode 100644
index 2ecfe9cfd..000000000
--- a/id.server/data/abnahme-test/xmldata/A700/A701/AuthTemplate.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-<title>MOA ID Auth Sample Login - customized</title>
-</head>
-<body>
-<h1>MOA ID Auth Sample Login - customized</h1>
-<form name="CustomizedForm"
- action="<BKU>"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<XMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<DataURL>"/>
- <input type="submit" value="B&uuml;rgerkarte lesen"/>
-</form>
-<form name="CustomizedInfoForm"
- action="<BKU>"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<CertInfoXMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<CertInfoDataURL>"/>
- Hier finden Sie weitere Informationen zur &Uuml;berpr&uuml;fung der Zertifikate.
- <input type="submit" value="Weitere Info"/>
-</form></body>
-</html> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A700/A701/BKUSelectionTemplate.html b/id.server/data/abnahme-test/xmldata/A700/A701/BKUSelectionTemplate.html
deleted file mode 100644
index 92b3f04cd..000000000
--- a/id.server/data/abnahme-test/xmldata/A700/A701/BKUSelectionTemplate.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head>
-<title>BKU Auswahl - customized</title>
-</head>
-<body>
-<h1><font color="green">BKU Auswahl - customized</font></h1>
-<p>
-<form method="post" action="<StartAuth>">
-<BKUSelect>
-<input type="submit" value="Ausw&auml;hlen"/>
-</form>
-</p>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A700/A701/SelectBKUForm.html b/id.server/data/abnahme-test/xmldata/A700/A701/SelectBKUForm.html
deleted file mode 100644
index a473a689b..000000000
--- a/id.server/data/abnahme-test/xmldata/A700/A701/SelectBKUForm.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<title>BKU Auswahl - customized</title>
-</head>
-<body>
-<h1><font color="green">BKU Auswahl - customized</font></h1>
-<p>
-<form method="post" action="https://localhost:8443/authStartAuthentication?MOASessionID=6621777788841637660">
-<select name="bkuURI">
- <option value="http://localhost:3495/http-security-layer-request" selected>Lokale B&uuml;rgerkarte</option>
- <option value="https://provider1.at:3496/http-security-layer-request">Provider eins</option>
- <option value="https://provider2.at:3496/http-security-layer-request">Provider zwei</option>
- <option value="https://10.16.126.28:3496/http-security-layer-request">B&uuml;rgerkarte Arbeitsplatz Paul Ivancsics</option>
-</select>
-
-<input type="submit" value="Ausw&auml;hlen"/>
-</form>
-</p>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A700/A702/SelectBKUForm.html b/id.server/data/abnahme-test/xmldata/A700/A702/SelectBKUForm.html
deleted file mode 100644
index a213d9de0..000000000
--- a/id.server/data/abnahme-test/xmldata/A700/A702/SelectBKUForm.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<html>
-<head>
-<title>Auswahl der B&uuml;rgerkartenumgebung</title>
-</head>
-<body>
-<form name="BKUSelectionForm"
- action="https://localhost:8443/authStartAuthentication?MOASessionID=7936129366756090040"
- method="post">
-<select name="bkuURI">
- <option value="http://localhost:3495/http-security-layer-request" selected>Lokale B&uuml;rgerkarte</option>
- <option value="https://provider1.at:3496/http-security-layer-request">Provider eins</option>
- <option value="https://provider2.at:3496/http-security-layer-request">Provider zwei</option>
- <option value="https://10.16.126.28:3496/http-security-layer-request">B&uuml;rgerkarte Arbeitsplatz Paul Ivancsics</option>
-</select>
-
- <input type="submit" value="B&uuml;rgerkartenumgebung ausw&auml;hlen"/>
-</form>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A700/A703/Configuration.xml b/id.server/data/abnahme-test/xmldata/A700/A703/Configuration.xml
deleted file mode 100644
index f38dc9ee0..000000000
--- a/id.server/data/abnahme-test/xmldata/A700/A703/Configuration.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLComplete">
- <ConnectionParameter URL="https://auswahl.buergerkarte.at/auswahl"/>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <!--<X509SubjectName>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</X509SubjectName>-->
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- </ChainingModes>
- <TrustedCACertificates>file:data/abnahme-test/certs/ca-certs</TrustedCACertificates>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="C:/programme/apacheGroup/abnahme/aValidPathName"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A700/A703/SelectBKUForm.html b/id.server/data/abnahme-test/xmldata/A700/A703/SelectBKUForm.html
deleted file mode 100644
index 21e48a844..000000000
--- a/id.server/data/abnahme-test/xmldata/A700/A703/SelectBKUForm.html
+++ /dev/null
@@ -1 +0,0 @@
-https://auswahl.buergerkarte.at/auswahl?returnURI=https://localhost:8443/authStartAuthentication?MOASessionID=-1393563939984986204 \ No newline at end of file
diff --git a/id.server/data/abnahme-test/xmldata/A700/Configuration.xml b/id.server/data/abnahme-test/xmldata/A700/Configuration.xml
deleted file mode 100644
index 44cc09196..000000000
--- a/id.server/data/abnahme-test/xmldata/A700/Configuration.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection BKUSelectionAlternative="HTMLSelect">
- <ConnectionParameter URL="file:data/abnahme-test/xmldata/A700/getBKUSelectTag.jsp"/>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <!--<X509SubjectName>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</X509SubjectName>-->
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- </ChainingModes>
- <TrustedCACertificates>file:data/abnahme-test/certs/ca-certs</TrustedCACertificates>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="C:/programme/apacheGroup/abnahme/aValidPathName"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/A700/getBKUSelectTag.jsp b/id.server/data/abnahme-test/xmldata/A700/getBKUSelectTag.jsp
deleted file mode 100644
index 028dbd348..000000000
--- a/id.server/data/abnahme-test/xmldata/A700/getBKUSelectTag.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<select name="bkuURI">
- <option value="http://localhost:3495/http-security-layer-request" selected>Lokale B&uuml;rgerkarte</option>
- <option value="https://provider1.at:3496/http-security-layer-request">Provider eins</option>
- <option value="https://provider2.at:3496/http-security-layer-request">Provider zwei</option>
- <option value="https://10.16.126.28:3496/http-security-layer-request">B&uuml;rgerkarte Arbeitsplatz Paul Ivancsics</option>
-</select>
diff --git a/id.server/data/abnahme-test/xmldata/C000/C001/Configuration.xml b/id.server/data/abnahme-test/xmldata/C000/C001/Configuration.xml
deleted file mode 100644
index e125e2c38..000000000
--- a/id.server/data/abnahme-test/xmldata/C000/C001/Configuration.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- </ConnectionParameter>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <AcceptedServerCertificates>http://AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <X509SubjectName>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</X509SubjectName>
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="http://localhost:9080/moa-id-auth/services/GetAuthenticationData">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <TrustedCACertificates>http://localhost:8080/truestedCACerts</TrustedCACertificates>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="data/test/certs/cert-store-root"/>
- <GenericConfiguration name="TLSTrustedCACertificates" value="file:c:/java/id.server/data/test/certs/ca-certs"/>
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/C000/C002/Configuration.xml b/id.server/data/abnahme-test/xmldata/C000/C002/Configuration.xml
deleted file mode 100644
index 7a75d85f8..000000000
--- a/id.server/data/abnahme-test/xmldata/C000/C002/Configuration.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <OnlineApplication publicURLPrefix="http://localhost:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- </OnlineApplication>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/C000/C003/Configuration.xml b/id.server/data/abnahme-test/xmldata/C000/C003/Configuration.xml
deleted file mode 100644
index db84e7b12..000000000
--- a/id.server/data/abnahme-test/xmldata/C000/C003/Configuration.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="http://localhost:9080/moa-id-auth/services/GetAuthenticationData"/>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="http://localhost:9080/">
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="10">
- <ConnectionParameter URL="ProxyComponentURL">
- <AcceptedServerCertificates>url:AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/C000/C051/ConfigurationC051.xml b/id.server/data/abnahme-test/xmldata/C000/C051/ConfigurationC051.xml
deleted file mode 100644
index e3a364514..000000000
--- a/id.server/data/abnahme-test/xmldata/C000/C051/ConfigurationC051.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <OnlineApplication2 publicURLPrefix="http://localhost:9080/">
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="10">
- <ConnectionParameter URL="ProxyComponentURL">
- <AcceptedServerCertificates>url:AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication2>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/Configuration.xml b/id.server/data/abnahme-test/xmldata/Configuration.xml
deleted file mode 100644
index e3f1bd8b4..000000000
--- a/id.server/data/abnahme-test/xmldata/Configuration.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <!--<AcceptedServerCertificates>file:data/abnahme-test/certs/server-certs</AcceptedServerCertificates>-->
- <!--<ClientKeyStore password="Keystore Pass">file:data/abnahme-test/certs/server-certs/server.keystore</ClientKeyStore>-->
- </ConnectionParameter>
-
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <!--<X509SubjectName>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</X509SubjectName>-->
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="http://localhost:8080/moa-id-auth/services/GetAuthenticationData">
- <!-- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore> -->
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="http://localhost:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="10">
- <ConnectionParameter URL="ProxyComponentURL">
- <AcceptedServerCertificates>url:AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://testP101:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://testP102:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfParamAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA302:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="true"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA303:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="true" provideIdentityLink="false"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA304:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="true" provideIdentityLink="true"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA305:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="false" provideIdentityLink="false"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA306:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="false" provideIdentityLink="true"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA307:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="false"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA308:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <TrustedCACertificates>file:data/abnahme-test/certs/ca-certs</TrustedCACertificates>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="C:/programme/apacheGroup/abnahme/aValidPathName"/>
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 5a4759b7a..000000000
--- a/id.server/data/abnahme-test/xmldata/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/id.server/data/abnahme-test/xmldata/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/InfoboxReadResponse.xml
deleted file mode 100644
index a35b7f209..000000000
--- a/id.server/data/abnahme-test/xmldata/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/id.server/data/abnahme-test/xmldata/L000/Configuration.xml b/id.server/data/abnahme-test/xmldata/L000/Configuration.xml
deleted file mode 100644
index e3f1bd8b4..000000000
--- a/id.server/data/abnahme-test/xmldata/L000/Configuration.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <SecurityLayer>
- <TransformsInfo filename="file:data/abnahme-test/conf/transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/">
- <!--<AcceptedServerCertificates>file:data/abnahme-test/certs/server-certs</AcceptedServerCertificates>-->
- <!--<ClientKeyStore password="Keystore Pass">file:data/abnahme-test/certs/server-certs/server.keystore</ClientKeyStore>-->
- </ConnectionParameter>
-
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile3MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- <!--<X509SubjectName>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</X509SubjectName>-->
- <X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="http://localhost:8080/moa-id-auth/services/GetAuthenticationData">
- <!-- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore> -->
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="http://localhost:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="10">
- <ConnectionParameter URL="ProxyComponentURL">
- <AcceptedServerCertificates>url:AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://localhost:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://testP101:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfBasicAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="https://testP102:9443/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/abnahme-test/conf/OAConfParamAuth.xml" sessionTimeOut="20">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA302:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="true"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA303:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="true" provideIdentityLink="false"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA304:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="true" provideIdentityLink="true"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA305:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="false" provideIdentityLink="false"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA306:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="false" provideIdentityLink="true"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA307:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="false"/>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://localhostA308:9080/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <TrustedCACertificates>file:data/abnahme-test/certs/ca-certs</TrustedCACertificates>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="C:/programme/apacheGroup/abnahme/aValidPathName"/>
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/abnahme-test/xmldata/L000/CreateXMLSignatureResponse.xml b/id.server/data/abnahme-test/xmldata/L000/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 0ef26ce2f..000000000
--- a/id.server/data/abnahme-test/xmldata/L000/CreateXMLSignatureResponse.xml
+++ /dev/null
@@ -1,94 +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-05-07T17:25:10+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>https://localhost:8443/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>http://10.16.126.28:9080/moa-id-proxy/</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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bvM1wMyWDhJeTm6wYNIBeqEMGhc=</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>SODqS1d8cJD301+Eq0jrCkRjSkI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>GIWA7SDyFiDbbDxOxipEjm9lNJunrfHsLaSEaDUgzpghZ0ESdP8wkS9fBGXdErm8
-FiitoTNUquYLefUjl6i5lIpPp+FraX/6t2Oxda4N8KMamoBpffcxoiU069JOVAEL
-ohZawwD4ezgeBJSTgwX7dmPCXjpNa1M8l1wm8FhCgqo=</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-05-07T15:25:17Z</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/id.server/data/abnahme-test/xmldata/L000/InfoboxReadResponse.xml b/id.server/data/abnahme-test/xmldata/L000/InfoboxReadResponse.xml
deleted file mode 100644
index a35b7f209..000000000
--- a/id.server/data/abnahme-test/xmldata/L000/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/id.server/data/certs/TrustProfile1/A-Trust-Qual-01.cer b/id.server/data/certs/TrustProfile1/A-Trust-Qual-01.cer
deleted file mode 100644
index f9f27442b..000000000
--- a/id.server/data/certs/TrustProfile1/A-Trust-Qual-01.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/A-Trust-nQual-01.cer b/id.server/data/certs/TrustProfile1/A-Trust-nQual-01.cer
deleted file mode 100644
index 289fc2198..000000000
--- a/id.server/data/certs/TrustProfile1/A-Trust-nQual-01.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/Buergerkarte01Root.cer b/id.server/data/certs/TrustProfile1/Buergerkarte01Root.cer
deleted file mode 100644
index 18e6bc109..000000000
--- a/id.server/data/certs/TrustProfile1/Buergerkarte01Root.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/C.CA.DS.cer b/id.server/data/certs/TrustProfile1/C.CA.DS.cer
deleted file mode 100644
index fc5bd433b..000000000
--- a/id.server/data/certs/TrustProfile1/C.CA.DS.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/IAIKRoot.cer b/id.server/data/certs/TrustProfile1/IAIKRoot.cer
deleted file mode 100644
index c0c60558a..000000000
--- a/id.server/data/certs/TrustProfile1/IAIKRoot.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/IAIKRootMusterbehoerde.cer b/id.server/data/certs/TrustProfile1/IAIKRootMusterbehoerde.cer
deleted file mode 100644
index 21dc972b9..000000000
--- a/id.server/data/certs/TrustProfile1/IAIKRootMusterbehoerde.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/TestPersonMOA4.cer b/id.server/data/certs/TrustProfile1/TestPersonMOA4.cer
deleted file mode 100644
index 99936caa8..000000000
--- a/id.server/data/certs/TrustProfile1/TestPersonMOA4.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/a-sign-TEST-Premium-Enc-01.cer b/id.server/data/certs/TrustProfile1/a-sign-TEST-Premium-Enc-01.cer
deleted file mode 100644
index fc5bd433b..000000000
--- a/id.server/data/certs/TrustProfile1/a-sign-TEST-Premium-Enc-01.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/a-sign-TEST-nQual-01.cer b/id.server/data/certs/TrustProfile1/a-sign-TEST-nQual-01.cer
deleted file mode 100644
index 84518a6a8..000000000
--- a/id.server/data/certs/TrustProfile1/a-sign-TEST-nQual-01.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/ecdsaroot_der.cer b/id.server/data/certs/TrustProfile1/ecdsaroot_der.cer
deleted file mode 100644
index dac166e9a..000000000
--- a/id.server/data/certs/TrustProfile1/ecdsaroot_der.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/TrustProfile1/hsm.cer b/id.server/data/certs/TrustProfile1/hsm.cer
deleted file mode 100644
index 278cb8fab..000000000
--- a/id.server/data/certs/TrustProfile1/hsm.cer
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB6TCCAVICAQEwDQYJKoZIhvcNAQEFBQAwPTESMBAGA1UEAxMJSFNNUlNBS0VZ
-MQwwCgYDVQQKEwNCUloxDDAKBgNVBAsTA01PQTELMAkGA1UEBhMCQVQwHhcNMDMw
-NDAzMTEwNjQ5WhcNMDQwNDAzMTEwNjQ5WjA9MRIwEAYDVQQDEwlIU01SU0FLRVkx
-DDAKBgNVBAoTA0JSWjEMMAoGA1UECxMDTU9BMQswCQYDVQQGEwJBVDCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEA2nygG6QL8ksWZFNAUWcLcAkRR7WHck3PFu4z
-ce2D/jeWk2pf3dC+49ZRkmJbKYclySx90BZFG6iSUkhI41eXbrRzIScFz15P9K4F
-rSg8redcdysWY/WJ2ybW05PuK8jNooyc4yAGoSfiNv7GlDfAqsZpSXB2YFvd6erF
-In5e7WECAwDL2zANBgkqhkiG9w0BAQUFAAOBgQCUhQ1YQg14ZtUGj1Zn1J5O3XXu
-RZmckYjRbqMxpY3iim+yH9+eSrDcfESUeoYQHzOB+qfOx+kU33qkWBzvP1079EbC
-v5eVi4mhJ6F/8xItuvroUtuQokiiEY8g8CSM1C124MLcJr0y90Nmb2q2cHhlBkw8
-s5uQpf4EtuqJAwMrcQ==
------END CERTIFICATE-----
diff --git a/id.server/data/certs/TrustProfile1/moahsmcert.cer b/id.server/data/certs/TrustProfile1/moahsmcert.cer
deleted file mode 100644
index 160390f35..000000000
--- a/id.server/data/certs/TrustProfile1/moahsmcert.cer
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB7zCCAVgCAQEwDQYJKoZIhvcNAQEFBQAwQDEVMBMGA1UEAxMMTU9BSFNNUlNB
-S0VZMQwwCgYDVQQKEwNCUloxDDAKBgNVBAsTA01PQTELMAkGA1UEBhMCQVQwHhcN
-MDMwNDA3MTQwNzM3WhcNMDQwNDA3MTQwNzM3WjBAMRUwEwYDVQQDEwxNT0FIU01S
-U0FLRVkxDDAKBgNVBAoTA0JSWjEMMAoGA1UECxMDTU9BMQswCQYDVQQGEwJBVDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuQJeLj5quuES22ZlXY2W5C/JF/7a
-WZM/EBj2hZff3i66IQYe3272E9p1utzIGvY3AfAlW0sKiOhZUpOnvFlAn+Bl86J2
-kE/mQMgVHd4fxb3onCNA+x/x5BdYVdx35il6iQy9xE0kpc01CMrUMMy0+GMcz4OR
-ziJf0WHsi9JL1nECAwCYrzANBgkqhkiG9w0BAQUFAAOBgQCDpmYSMnkjfJ4JXwwc
-Y6eqqiDBexZeVwNLjjJxwf5md4ZRiewwfY3aydcA8ffjcUh4/5XXdn5y2S2n8JEg
-N2EuHHC+k/CE2JJJylkikltE+nawdfa6MukhQ0sPKjyJ+Nr2nXOwX6O2bveaTw9J
-E2+9uU+Tuf4VG9HEHEL+IaU2tA==
------END CERTIFICATE-----
diff --git a/id.server/data/certs/ca-certs/GTE CyberTrust Root.cer b/id.server/data/certs/ca-certs/GTE CyberTrust Root.cer
deleted file mode 100644
index bcbddd2f3..000000000
--- a/id.server/data/certs/ca-certs/GTE CyberTrust Root.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/ca-certs/TrustMark-WebServer-01.cer b/id.server/data/certs/ca-certs/TrustMark-WebServer-01.cer
deleted file mode 100644
index 781d1e4f2..000000000
--- a/id.server/data/certs/ca-certs/TrustMark-WebServer-01.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/ca-certs/VeriSignRSA Secure Server CA.cer b/id.server/data/certs/ca-certs/VeriSignRSA Secure Server CA.cer
deleted file mode 100644
index b76137b1c..000000000
--- a/id.server/data/certs/ca-certs/VeriSignRSA Secure Server CA.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/ca-certs/a-sign-corporate-light-01.cer b/id.server/data/certs/ca-certs/a-sign-corporate-light-01.cer
deleted file mode 100644
index 6f97837a2..000000000
--- a/id.server/data/certs/ca-certs/a-sign-corporate-light-01.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/ca-certs/intermediate.cer b/id.server/data/certs/ca-certs/intermediate.cer
deleted file mode 100644
index c945fa97d..000000000
--- a/id.server/data/certs/ca-certs/intermediate.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/ca-certs/root.cer b/id.server/data/certs/ca-certs/root.cer
deleted file mode 100644
index dd22e761e..000000000
--- a/id.server/data/certs/ca-certs/root.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/client-certs/key.pem b/id.server/data/certs/client-certs/key.pem
deleted file mode 100644
index a326186c7..000000000
--- a/id.server/data/certs/client-certs/key.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,FE45B3E14DF98B85
-
-e4AS6U/QUW4/ZDMFdlDAVAsd5lKT7e83SWZXZePOjFXZDO+vXmiHp15uw/xrUiqA
-R5jTMHOmxccdpnoSeEXFRApgpfMgixL8IUzec8xaScOOy1+pbSadWWq5bsnnF4fF
-bztJiF5+2RXbNYe5DO32EuGpTOPZVIdWZkvgn5krPDs0EOJrGHC9SIAn+RNS7WDr
-AgKytCjX/aRQ9lUuoT8eX4e2tzslQ/x8K+0zt0vQZWDSPLZTqJNioILWwUpVapqH
-aC/8foQeWqHc1Dj9CoMZrUsS1Jwi/Hkc70cb1+3uH/DAaDng2gN4Qa2tpbvZhWHV
-rIZYpxN0CBxe/pmSwUZeZQPVcgHniJYRondVIOCCGst2l9XunOTxGoNGE8B7A/im
-FB/kondCVL7X+5gEjuAqjFTUrdQHbjCdDSwXLMAKDJEeY3NZhxsJlbXy2pcviUWz
-k0CfGpT9yANDtNT37OfJM6OZSKjUmgeqNENyL2G3X5gjpLCRTUt4BUh5IpeW3uLu
-f/wDAETyfDvHfyf2PAPSVcecDW+py7mFP87FKDrTb8e9fNleL3mNpdLaHFm7mHMf
-imhEehxiGMRj7TVBvS+WuJp0bFYiyEh6f2cnhwP/iAFkJEx7VDslYhtt9LkDGm3t
-1utow3jc/4t6IDV/rmyfYCoy9wbUymw3trGijjMT9H3L9bBekWXfiNTwOjfBa0G5
-meUUJ+BPnm1b5Y6I0nI5T1a7uJ0WeRL08NbJ26TDALBcV6l1IovgTKCtOofOcMBo
-JexXOTvllSEsNQrEzFUkzobLg48FyV/mwrjuIXuxUFwvcqKaU6Pa4Q==
------END RSA PRIVATE KEY-----
diff --git a/id.server/data/certs/client-certs/key2.pem b/id.server/data/certs/client-certs/key2.pem
deleted file mode 100644
index 86c1d1d96..000000000
--- a/id.server/data/certs/client-certs/key2.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,BE4627B155C4DAA7
-
-Ja5FdI9jxs0+96ELq/INvD4LrSg4ELUr9Z12zBEc4mIGZRnmPgxpgKJUaWQy+atI
-X/o+KS0HYSOHfnWiWQD4GFcjGDhs8vxTsPa6I+vtrnEvFByfOq/R8h7wdHAid14J
-2E8MBVim/TxAi/2JG7yVguKkaUR/jP8uvoiTtMQvKe/NHzQywOmiACvpkX5a9G0t
-kMZKZ23q2FuEYuNn7/9E09CWc4YDc7AwhUcuUAwZXGQTmLPWriSTUKgR88G7u2LQ
-/dO0dqpJEtZIz0h7f+s46I6B7jyXNkShx8scS6YOOrdaq2xB6wC0cOAaNMc/kl7f
-9msanW4fJbE/B0rrL6ChI8Mqlr+TJ8oFrBHt1z5wexPa9OGqBOUJmoywXEhp8WUY
-oth8HZf/thJE3DppxgRHfDKgUiv8hCSRvaSFZ33Dx7qISPVBzbmk2CF69Ok05Sc3
-sHahRIA8X01mS8fFGL6fJPLT+xW4ARiP1NnVDMBUbFDg/g9GEMvAnxh9lWLysUv5
-6LMR01H6CVhOsbKfpUqIfqT6U9HmjF1vQGD1jp9KGi12Cu6Yf6Z6OcMBmR93rao3
-50GtG0HLbhuUPIrFMYe3Dl0TfPxLj/ieNvGFgueWE7Y92mw/XGn3wLoSVKAIRrYd
-ZXh09mA3yARqY15UJWmR77WOrh4j1KybADF6F445+H64UtD1QQBHH4/K+ZJ1CUiE
-V9d1F9DAnOeU3yYvRprZU/6nbqzR7dfivgln8PE8Ht2EZf9Rk/n2/ztgKBik37MF
-WPthd+8Y+XKcjg2tZOENAxw7ikzjPIdHxFzxAnr9y5d4F6P5CSIjxw==
------END RSA PRIVATE KEY-----
diff --git a/id.server/data/certs/client-certs/req.cer b/id.server/data/certs/client-certs/req.cer
deleted file mode 100644
index 9f3f8116f..000000000
--- a/id.server/data/certs/client-certs/req.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/client-certs/req.pem b/id.server/data/certs/client-certs/req.pem
deleted file mode 100644
index db4a69057..000000000
--- a/id.server/data/certs/client-certs/req.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC5jCCAk+gAwIBAgIBADANBgkqhkiG9w0BAQQFADBcMQswCQYDVQQGEwJBVDET
-MBEGA1UECBMKU29tZS1TdGF0ZTENMAsGA1UEChMEQlJaRzEMMAoGA1UECxMDTU9B
-MRswGQYDVQQDExJBYm5haG1ldGVzdCBNT0EtSUQwHhcNMDMwNTA2MTU1NjMxWhcN
-MDMwNjA1MTU1NjMxWjBcMQswCQYDVQQGEwJBVDETMBEGA1UECBMKU29tZS1TdGF0
-ZTENMAsGA1UEChMEQlJaRzEMMAoGA1UECxMDTU9BMRswGQYDVQQDExJBYm5haG1l
-dGVzdCBNT0EtSUQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOJqhoQjXmkj
-E7eX0mhX4p3vz/vlpSDcmFmOw7PJOKYF38eJpPR0IqZqrDeDUJyuPQzSluRy1A6d
-kQBt93FVIND9LBd9yr6nh1bGIMppoJ/qKPHNk3bzEaW1ITgRx8ITc1jVOO2BIvVd
-4KTnLcszRvgr/KpYqpjqHRn+Eh3JwVTBAgMBAAGjgbcwgbQwHQYDVR0OBBYEFI6P
-2FnJlpDgTb/HFhIV3yczz7Q+MIGEBgNVHSMEfTB7gBSOj9hZyZaQ4E2/xxYSFd8n
-M8+0PqFgpF4wXDELMAkGA1UEBhMCQVQxEzARBgNVBAgTClNvbWUtU3RhdGUxDTAL
-BgNVBAoTBEJSWkcxDDAKBgNVBAsTA01PQTEbMBkGA1UEAxMSQWJuYWhtZXRlc3Qg
-TU9BLUlEggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAECbLNoxp
-6B81lDvab7KVB2HcR+o7DFoejy5HjI+iQL/RoxA5L5t7giROCGXCzjb+0+pxt8fR
-4yR66YmoxUC9kjfCxr70Wob+DrBy73yCnwpw2yndcRoYe3HmyoX0HvYPjnUm0IWt
-BGAALnQn/En/ZDW0YEM5DtOsZPoZd8r49UE=
------END CERTIFICATE-----
diff --git a/id.server/data/certs/client-certs/req2.pem b/id.server/data/certs/client-certs/req2.pem
deleted file mode 100644
index 972c4a344..000000000
--- a/id.server/data/certs/client-certs/req2.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADBeMQswCQYDVQQGEwJBVDET
-MBEGA1UECBMKU29tZS1TdGF0ZTENMAsGA1UEChMEQlJaRzEMMAoGA1UECxMDTU9B
-MR0wGwYDVQQDExRBYm5haG1ldGVzdCBNT0EtSUQgMjAeFw0wMzA1MDYxNzU2MDRa
-Fw0wMzA2MDUxNzU2MDRaMF4xCzAJBgNVBAYTAkFUMRMwEQYDVQQIEwpTb21lLVN0
-YXRlMQ0wCwYDVQQKEwRCUlpHMQwwCgYDVQQLEwNNT0ExHTAbBgNVBAMTFEFibmFo
-bWV0ZXN0IE1PQS1JRCAyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+T1D5
-sxLxeVxkJ04nRj0iP7OnuAsQBvankGkPrWRo/Z8OusG2tKp0CEgIK+nqbRzElmnL
-20ij7QKHNgUYAb/2tkMP1K2m6dr/fjBnJGle9lUCbIuzXndBgYy5+nBXVXERPo7k
-rUcbnh3hXpa2dpySqV2qgIcNWQ1zsjsYTMKOKwIDAQABo4G5MIG2MB0GA1UdDgQW
-BBS2az6C8gFXa9JjsC+7YVOz+kbQHTCBhgYDVR0jBH8wfYAUtms+gvIBV2vSY7Av
-u2FTs/pG0B2hYqRgMF4xCzAJBgNVBAYTAkFUMRMwEQYDVQQIEwpTb21lLVN0YXRl
-MQ0wCwYDVQQKEwRCUlpHMQwwCgYDVQQLEwNNT0ExHTAbBgNVBAMTFEFibmFobWV0
-ZXN0IE1PQS1JRCAyggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEA
-EEeNYSW9gJrxX04z6G48A+DODPzEtZeyVUE/n/OOox9pHZ0ftOj7M4XdLj6QIrES
-+cSo9UWFOkPrYj3TVuJ58LLvB3VqevNu8dq1Q0u7umiCofpuqX9rQ/hcfkVWrg3/
-EZdkckT+PRAZR88omVi5q0uU/CkG8o9+KUeqezmWMg8=
------END CERTIFICATE-----
diff --git a/id.server/data/certs/keystores/client.keystore b/id.server/data/certs/keystores/client.keystore
deleted file mode 100644
index 2304628f4..000000000
--- a/id.server/data/certs/keystores/client.keystore
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/keystores/client.p12 b/id.server/data/certs/keystores/client.p12
deleted file mode 100644
index de82e3d5e..000000000
--- a/id.server/data/certs/keystores/client.p12
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/keystores/client2.p12 b/id.server/data/certs/keystores/client2.p12
deleted file mode 100644
index 5147f7f9c..000000000
--- a/id.server/data/certs/keystores/client2.p12
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/keystores/server.keystore b/id.server/data/certs/keystores/server.keystore
deleted file mode 100644
index 5ed848e3f..000000000
--- a/id.server/data/certs/keystores/server.keystore
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/keystores/testlinux.keystore b/id.server/data/certs/keystores/testlinux.keystore
deleted file mode 100644
index 99e78638f..000000000
--- a/id.server/data/certs/keystores/testlinux.keystore
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/keystores/testlinux_plus_client.keystore b/id.server/data/certs/keystores/testlinux_plus_client.keystore
deleted file mode 100644
index cc08a127b..000000000
--- a/id.server/data/certs/keystores/testlinux_plus_client.keystore
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/keystores/testlinux_rev.keystore b/id.server/data/certs/keystores/testlinux_rev.keystore
deleted file mode 100644
index d7964e93d..000000000
--- a/id.server/data/certs/keystores/testlinux_rev.keystore
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/server-certs/a-trust.cer b/id.server/data/certs/server-certs/a-trust.cer
deleted file mode 100644
index f87f82561..000000000
--- a/id.server/data/certs/server-certs/a-trust.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/server-certs/baltimore.cer b/id.server/data/certs/server-certs/baltimore.cer
deleted file mode 100644
index 514c65c51..000000000
--- a/id.server/data/certs/server-certs/baltimore.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/server-certs/cio.cer b/id.server/data/certs/server-certs/cio.cer
deleted file mode 100644
index 560425e95..000000000
--- a/id.server/data/certs/server-certs/cio.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/server-certs/testlinux.crt b/id.server/data/certs/server-certs/testlinux.crt
deleted file mode 100644
index db9201838..000000000
--- a/id.server/data/certs/server-certs/testlinux.crt
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/server-certs/testlinux_rev.crt b/id.server/data/certs/server-certs/testlinux_rev.crt
deleted file mode 100644
index ac735db10..000000000
--- a/id.server/data/certs/server-certs/testlinux_rev.crt
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/server-certs/testwin.cer b/id.server/data/certs/server-certs/testwin.cer
deleted file mode 100644
index ff2f369a8..000000000
--- a/id.server/data/certs/server-certs/testwin.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/server-certs/testwin_rev.cer b/id.server/data/certs/server-certs/testwin_rev.cer
deleted file mode 100644
index b899000f2..000000000
--- a/id.server/data/certs/server-certs/testwin_rev.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/server-certs/tomcat-server.crt b/id.server/data/certs/server-certs/tomcat-server.crt
deleted file mode 100644
index f7cca3e9e..000000000
--- a/id.server/data/certs/server-certs/tomcat-server.crt
+++ /dev/null
Binary files differ
diff --git a/id.server/data/certs/server-certs/verisign.cer b/id.server/data/certs/server-certs/verisign.cer
deleted file mode 100644
index 85f09ee4e..000000000
--- a/id.server/data/certs/server-certs/verisign.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
deleted file mode 100644
index ec6203326..000000000
--- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <!-- für MOA-ID-AUTH -->
- <AuthComponent>
- <!-- URL und akzeptierte TLS-Server-Zertifikate des verwendeten BKU-Auswahl Service -->
- <BKUSelection BKUSelectionAlternative="HTMLComplete">
- <ConnectionParameter URL="http://auswahl.buergerkarte.at/auswahl">
- <!-- <AcceptedServerCertificates>file:conf/moa-id/certs/server-certs</AcceptedServerCertificates> -->
- </ConnectionParameter>
- </BKUSelection>
- <!-- Transformationen für die Anzeige des AUTH-Block im Secure Viewer -->
- <SecurityLayer>
- <TransformsInfo filename="file:conf/moa-id/transforms/TransformsInfoAuthBlock.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP über Web Service angesprochen wird -->
- <ConnectionParameter URL="http://localhost:8080/moa-spss/services/SignatureVerification">
- <!-- <AcceptedServerCertificates>file:conf/moa-id/certs/server-certs</AcceptedServerCertificates> -->
- <!-- <ClientKeyStore password="Keystore Pass">file:/file_to_clientkeystore</ClientKeyStore> -->
- </ConnectionParameter>
- <!-- TrustProfile für den IdentityLink der Bürgerkarte;
- muss in MOA-SP konfiguriert sein -->
- <VerifyIdentityLink>
- <TrustProfileID>MOAIDBuergerkarteRoot</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <!-- TrustProfile für die Signatur des AUTH-Blocks der Bürgerkarte;
- muss in MOA-SP konfiguriert sein -->
- <TrustProfileID>MOAIDBuergerkarteRoot</TrustProfileID>
- <!-- VerifyTransformsInfoProfile mit den Transformationen für die Anzeige der Anmeldedaten im Secure Viewer;
- muss in MOA-SP konfiguriert sein -->
- <VerifyTransformsInfoProfileID>MOAIDTransformAuthBlock</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <!-- Gültige Signatoren des IdentityLink, der von der Bürgerkarte gelesen wird -->
- <IdentityLinkSigners>
- <X509SubjectName>CN=zmr,OU=BMI-IV-2,O=BMI,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <!-- für MOA-ID-PROXY -->
- <ProxyComponent>
- <!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-ID-AUTH Web Service -->
- <AuthComponent>
- <ConnectionParameter URL="https://localhost:8443/moa-id-auth/services/GetAuthenticationData">
- <!-- <AcceptedServerCertificates>file:conf/moa-id/certs/server-certs</AcceptedServerCertificates> -->
- <!-- <ClientKeyStore password="Keystore Pass">file:/file_to_clientkeystore</ClientKeyStore> -->
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <!-- Eintrag für jede Online-Applikation -->
- <OnlineApplication publicURLPrefix="http://localhost:8080/moa-id-proxy/">
- <!-- für MOA-ID-AUTH -->
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <!-- für MOA-ID-PROXY -->
- <ProxyComponent configFileURL="file:conf/moa-id/oa/SampleOAConfiguration.xml" sessionTimeOut="600">
- <!-- <ProxyComponent configFileURL="file:conf/moa-id/oa/SampleOAConfiguration.xml" sessionTimeOut="600" loginParameterResolverImpl="at.gv.egovernment.moa.id.proxy.DefaultLoginParameterResolver" connectionBuilderImpl="at.gv.egovernment.moa.id.proxy.DefaultConnectionBuilder"> -->
- <!-- URL und akzeptierte TLS-Server-Zertifikate der Online-Applikation -->
- <ConnectionParameter URL="http://localhost:8080/oa/">
- <!-- <AcceptedServerCertificates>file:conf/moa-id/certs/server-certs</AcceptedServerCertificates> -->
- <!-- <ClientKeyStore password="Keystore Pass">file:/file_to_clientkeystore</ClientKeyStore> -->
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <!-- ChainingModes für die Zertifikatspfadüberprüfung der TLS-Zertifikate -->
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <!-- für MOA-ID-AUTH: Rootzertifikate des Servers MOA-SP, falls über HTTPS angesprochen -->
- <!-- für MOA-ID-PROXY: Rootzertifikate des Servers MOA-ID-AUTH, falls über HTTPS angesprochen,
- und aller Online-Applikationen, die über HTTPS angesprochen werden -->
- <TrustedCACertificates>file:conf/moa-id/certs/ca-certs</TrustedCACertificates>
- <!-- Cache-Verzeichnis für-Zertifikate -->
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="conf/moa-id/certs/certstore"/>
- <!-- Time-Out für die Anmeldung von Beginn bis zum Anlegen der Anmeldedaten, in Sekunden -->
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
- <!-- Time-Out für die Anmeldung vom Anlegen bis zum Abholen der Anmeldedaten, in Sekunden -->
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/deploy/conf/moa-id/log4j.properties b/id.server/data/deploy/conf/moa-id/log4j.properties
deleted file mode 100644
index eada826da..000000000
--- a/id.server/data/deploy/conf/moa-id/log4j.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# commons-logging setup
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-
-# define log4j root loggers
-log4j.rootLogger=info, stdout, R
-log4j.logger.moa.spss.server=info
-log4j.logger.iaik.server=info
-log4j.logger.moa.id.auth=info
-log4j.logger.moa.id.proxy=info
-
-# configure the stdout appender
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
-
-# configure the rolling file appender (R)
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=logs/moa-id.log
-log4j.appender.R.MaxFileSize=10000KB
-log4j.appender.R.MaxBackupIndex=1
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
diff --git a/id.server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml b/id.server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml
deleted file mode 100644
index 13d99f1c1..000000000
--- a/id.server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<!--Sample XML file generated by XMLSPY v5 U (http://www.xmlspy.com)-->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateless</LoginType>
- <BasicAuth>
- <UserID>MOAFamilyName</UserID>
- <Password>MOAGivenName</Password>
- </BasicAuth>
-</Configuration>
diff --git a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml b/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml
deleted file mode 100644
index 541089ccb..000000000
--- a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<sl10:TransformsInfo>
- <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:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
- <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="substring(//@IssueInstant,9,2)"/>.<xsl:value-of select="substring(//@IssueInstant,6,2)"/>.<xsl:value-of select="substring(//@IssueInstant,1,4)"/>, <xsl:value-of select="substring(//@IssueInstant,12,2)"/>:<xsl:value-of select="substring(//@IssueInstant,15,2)"/>:<xsl:value-of select="substring(//@IssueInstant,18,2)"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Applikation:</b>
- </td>
- <td>
- <xsl:value-of select="//saml:Attribute[@AttributeName='OA']/saml:AttributeValue"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Geschäftsbereich:</b>
- </td>
- <td>
- <xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
- </dsig:Transforms>
- <sl10:FinalDataMetaInfo>
- <sl10:MimeType>text/html</sl10:MimeType>
- </sl10:FinalDataMetaInfo>
-</sl10:TransformsInfo>
diff --git a/id.server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml b/id.server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
deleted file mode 100644
index 900f41252..000000000
--- a/id.server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:moa-spss="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <!-- Standardnamen für Kanonisierungs- und Digest-Algorithmus -->
- <CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
- <DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <!-- Cache-Verzeichnis für Zertifikate;
- muss die Root- und Intermediate-CA-Zertifikate der Bürgerkarte beinhalten -->
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="certstore"/>
- <!-- VerifyTransformsInfoProfile mit den Transformationen für die Anzeige des AUTH-Block im Secure Viewer -->
- <VerifyTransformsInfoProfile id="MOAIDTransformAuthBlock" filename="profiles/MOAIDTransformAuthBlock.xml"/>
- <!-- TrustProfile für den IdentityLink der Bürgerkarte;
- muss die Root- und Intermediate-CA-Zertifikate der Bürgerkarte beinhalten -->
- <TrustProfile id="MOAIDBuergerkarteRoot" uri="trustprofiles/MOAIDBuergerkarteRoot"/>
-</MOAConfiguration>
diff --git a/id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F b/id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F
deleted file mode 100644
index 69de75609..000000000
--- a/id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F
+++ /dev/null
Binary files differ
diff --git a/id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733 b/id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733
deleted file mode 100644
index 289fc2198..000000000
--- a/id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733
+++ /dev/null
Binary files differ
diff --git a/id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6 b/id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6
deleted file mode 100644
index b7d4b08a6..000000000
--- a/id.server/data/deploy/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6
+++ /dev/null
Binary files differ
diff --git a/id.server/data/deploy/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92 b/id.server/data/deploy/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92
deleted file mode 100644
index f9f27442b..000000000
--- a/id.server/data/deploy/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92
+++ /dev/null
Binary files differ
diff --git a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml b/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml
deleted file mode 100644
index 1d1a610b7..000000000
--- a/id.server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-<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="substring(//@IssueInstant,9,2)"/>.<xsl:value-of select="substring(//@IssueInstant,6,2)"/>.<xsl:value-of select="substring(//@IssueInstant,1,4)"/>, <xsl:value-of select="substring(//@IssueInstant,12,2)"/>:<xsl:value-of select="substring(//@IssueInstant,15,2)"/>:<xsl:value-of select="substring(//@IssueInstant,18,2)"/></td></tr>
-<tr><td><b>Applikation:</b></td><td><xsl:value-of select="//saml:Attribute[@AttributeName='OA']/saml:AttributeValue"/></td></tr>
-<tr><td><b>Geschäftsbereich:</b></td><td><xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms></VerifyTransformsInfoProfile>
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-Qual-01-SN0291.cer b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-Qual-01-SN0291.cer
deleted file mode 100644
index f9f27442b..000000000
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-Qual-01-SN0291.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN0213.cer b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN0213.cer
deleted file mode 100644
index 289fc2198..000000000
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN0213.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN0218.cer b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN0218.cer
deleted file mode 100644
index 69de75609..000000000
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN0218.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN6f.cer b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN6f.cer
deleted file mode 100644
index b7d4b08a6..000000000
--- a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot/A-Trust-nQual-01-SN6f.cer
+++ /dev/null
Binary files differ
diff --git a/id.server/data/deploy/tomcat/moa-id-env.bat b/id.server/data/deploy/tomcat/moa-id-env.bat
deleted file mode 100644
index 319d18f88..000000000
--- a/id.server/data/deploy/tomcat/moa-id-env.bat
+++ /dev/null
@@ -1 +0,0 @@
-set CATALINA_OPTS=-Dmoa.id.configuration=%CATALINA_HOME%\conf\moa-id\SampleMOAIDConfiguration.xml -Dmoa.spss.server.configuration=%CATALINA_HOME%\conf\moa-spss\SampleMOASPSSConfiguration.xml -Dlog4j.configuration=file:%CATALINA_HOME%\conf\moa-id\log4j.properties
diff --git a/id.server/data/deploy/tomcat/moa-id-env.sh b/id.server/data/deploy/tomcat/moa-id-env.sh
deleted file mode 100644
index 9acfe56c0..000000000
--- a/id.server/data/deploy/tomcat/moa-id-env.sh
+++ /dev/null
@@ -1 +0,0 @@
-export CATALINA_OPTS="-Dmoa.id.configuration=$CATALINA_HOME/conf/moa-id/SampleMOAIDConfiguration.xml -Dmoa.spss.server.configuration=$CATALINA_HOME/conf/moa-spss/SampleMOASPSSConfiguration.xml -Dlog4j.configuration=file:$CATALINA_HOME/conf/moa-id/log4j.properties"
diff --git a/id.server/data/deploy/tomcat/server.mod_jk.xml b/id.server/data/deploy/tomcat/server.mod_jk.xml
deleted file mode 100644
index 61100b260..000000000
--- a/id.server/data/deploy/tomcat/server.mod_jk.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<!-- Alternate Example-less Configuration File -->
-<!-- Note that component elements are nested corresponding to their
- parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
- which may contain one or more "Service" instances. The Server
- listens for a shutdown command on the indicated port.
-
- Note: A "Server" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
-
-
- <!-- Uncomment this entry to enable JMX MBeans support -->
-<!--
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
- debug="0" port="-1" login="admin" password="admin"/>
--->
-
-
- <!-- A "Service" is a collection of one or more "Connectors" that share
- a single "Container" (and therefore the web applications visible
- within that Container). Normally, that Container is an "Engine",
- but this is not required.
-
- Note: A "Service" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
- <!-- Define the Tomcat Stand-Alone Service -->
- <Service name="Tomcat-Standalone">
-
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Each Connector passes requests on to the
- associated "Container" (normally an Engine) for processing.
-
- By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
- You can also enable an SSL HTTP/1.1 Connector on port 8443 by
- following the instructions below and uncommenting the second Connector
- entry. SSL support requires the following steps (see the SSL Config
- HOWTO in the Tomcat 4.0 documentation bundle for more detailed
- instructions):
- * Download and install JSSE 1.0.2 or later, and put the JAR files
- into "$JAVA_HOME/jre/lib/ext".
- * Execute:
- %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
- $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix)
- with a password value of "changeit" for both the certificate and
- the keystore itself.
-
- By default, DNS lookups are enabled when a web application calls
- request.getRemoteHost(). This can have an adverse impact on
- performance, so you can disable it by setting the
- "enableLookups" attribute to "false". When DNS lookups are disabled,
- request.getRemoteHost() will return the String version of the
- IP address of the remote client.
- -->
-
- <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
- <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
- port="8009" minProcessors="5" maxProcessors="75"
- enableLookups="true" redirectPort="8443"
- acceptCount="10" debug="0" connectionTimeout="0"
- useURIValidationHack="false"
- protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
-
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host). -->
-
- <!-- Define the top level container in our container hierarchy -->
- <Engine name="Standalone" defaultHost="localhost" debug="0">
-
- <!-- The request dumper valve dumps useful debugging information about
- the request headers and cookies that were received, and the response
- headers and cookies that were sent, for all requests received by
- this instance of Tomcat. If you care only about requests to a
- particular virtual host, or a particular application, nest this
- element inside the corresponding <Host> or <Context> entry instead.
-
- For a similar mechanism that is portable to all Servlet 2.3
- containers, check out the "RequestDumperFilter" Filter in the
- example application (the source for this filter may be found in
- "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
- Request dumping is disabled by default. Uncomment the following
- element to enable it. -->
- <!--
- <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
- -->
-
- <!-- Global logger unless overridden at lower levels -->
- <Logger className="org.apache.catalina.logger.FileLogger"
- prefix="catalina_log." suffix=".txt"
- timestamp="true"/>
-
- <!-- Because this Realm is here, an instance will be shared globally -->
-
- <Realm className="org.apache.catalina.realm.MemoryRealm" />
-
- <!-- Replace the above Realm with one of the following to get a Realm
- stored in a database and accessed via JDBC -->
-
- <!-- Define the default virtual host -->
- <Host name="localhost" debug="0" appBase="webapps"
- unpackWARs="true" autoDeploy="true">
-
- <!-- Normally, users must authenticate themselves to each web app
- individually. Uncomment the following entry if you would like
- a user to be authenticated the first time they encounter a
- resource protected by a security constraint, and then have that
- user identity maintained across *all* web applications contained
- in this virtual host. -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn"
- debug="0"/>
- -->
-
- <!-- Access log processes all requests for this virtual host. By
- default, log files are created in the "logs" directory relative to
- $CATALINA_HOME. If you wish, you can specify a different
- directory with the "directory" attribute. Specify either a relative
- (to $CATALINA_HOME) or absolute path to the desired directory.
- -->
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common"/>
-
- <!-- Logger shared by all Contexts related to this virtual host. By
- default (when using FileLogger), log files are created in the "logs"
- directory relative to $CATALINA_HOME. If you wish, you can specify
- a different directory with the "directory" attribute. Specify either a
- relative (to $CATALINA_HOME) or absolute path to the desired
- directory.-->
- <Logger className="org.apache.catalina.logger.FileLogger"
- directory="logs" prefix="localhost_log." suffix=".txt"
- timestamp="true"/>
-
- <!-- Define properties for each web application. This is only needed
- if you want to set non-default properties, or have web application
- document roots in places other than the virtual host's appBase
- directory. -->
-
- <!-- Tomcat Root Context -->
- <!--
- <Context path="" docBase="ROOT" debug="0"/>
- -->
-
- </Host>
-
- </Engine>
-
- </Service>
-
- <!-- The MOD_WEBAPP connector is used to connect Apache 1.3 with Tomcat 4.0
- as its servlet container. Please read the README.txt file coming with
- the WebApp Module distribution on how to build it.
- (Or check out the "jakarta-tomcat-connectors/webapp" CVS repository)
-
- To configure the Apache side, you must ensure that you have the
- "ServerName" and "Port" directives defined in "httpd.conf". Then,
- lines like these to the bottom of your "httpd.conf" file:
-
- LoadModule webapp_module libexec/mod_webapp.so
- WebAppConnection warpConnection warp localhost:8008
- WebAppDeploy examples warpConnection /examples/
-
- The next time you restart Apache (after restarting Tomcat, if needed)
- the connection will be established, and all applications you make
- visible via "WebAppDeploy" directives can be accessed through Apache.
- -->
-
- <!-- Define an Apache-Connector Service -->
- <Service name="Tomcat-Apache">
-
- <Connector className="org.apache.catalina.connector.warp.WarpConnector"
- port="8008" minProcessors="5" maxProcessors="75"
- enableLookups="true"
- acceptCount="10" debug="0"/>
-
- <!-- Replace "localhost" with what your Apache "ServerName" is set to -->
- <Engine className="org.apache.catalina.connector.warp.WarpEngine"
- name="Apache" debug="0" appBase="webapps">
-
- <!-- Global logger unless overridden at lower levels -->
- <Logger className="org.apache.catalina.logger.FileLogger"
- prefix="apache_log." suffix=".txt"
- timestamp="true"/>
-
- <!-- Because this Realm is here, an instance will be shared globally -->
- <Realm className="org.apache.catalina.realm.MemoryRealm" />
-
- </Engine>
-
- </Service>
-
-</Server>
-
diff --git a/id.server/data/deploy/tomcat/server.xml b/id.server/data/deploy/tomcat/server.xml
deleted file mode 100644
index c99136fa2..000000000
--- a/id.server/data/deploy/tomcat/server.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<!-- Alternate Example-less Configuration File -->
-<!-- Note that component elements are nested corresponding to their
- parent-child relationships with each other -->
-<!-- A "Server" is a singleton element that represents the entire JVM,
- which may contain one or more "Service" instances. The Server
- listens for a shutdown command on the indicated port.
-
- Note: A "Server" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
- <!-- Uncomment this entry to enable JMX MBeans support -->
- <!--
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
- debug="0" port="-1" login="admin" password="admin"/>
--->
- <!-- A "Service" is a collection of one or more "Connectors" that share
- a single "Container" (and therefore the web applications visible
- within that Container). Normally, that Container is an "Engine",
- but this is not required.
-
- Note: A "Service" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
- <!-- Define the Tomcat Stand-Alone Service -->
- <Service name="Tomcat-Standalone">
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Each Connector passes requests on to the
- associated "Container" (normally an Engine) for processing.
-
- By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
- You can also enable an SSL HTTP/1.1 Connector on port 8443 by
- following the instructions below and uncommenting the second Connector
- entry. SSL support requires the following steps (see the SSL Config
- HOWTO in the Tomcat 4.0 documentation bundle for more detailed
- instructions):
- * Download and install JSSE 1.0.2 or later, and put the JAR files
- into "$JAVA_HOME/jre/lib/ext".
- * Execute:
- %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
- $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix)
- with a password value of "changeit" for both the certificate and
- the keystore itself.
-
- By default, DNS lookups are enabled when a web application calls
- request.getRemoteHost(). This can have an adverse impact on
- performance, so you can disable it by setting the
- "enableLookups" attribute to "false". When DNS lookups are disabled,
- request.getRemoteHost() will return the String version of the
- IP address of the remote client.
- -->
- <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
- <Connector className="org.apache.coyote.tomcat4.CoyoteConnector" port="8080" minProcessors="5" maxProcessors="75" enableLookups="true" redirectPort="8443" acceptCount="100" debug="0" connectionTimeout="20000" useURIValidationHack="false" disableUploadTimeout="true"/>
- <!-- Note : To disable connection timeouts, set connectionTimeout value
- to -1 -->
- <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
- <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
- port="8443" minProcessors="5" maxProcessors="75"
- enableLookups="uri"
- acceptCount="100" debug="0" scheme="https" secure="true"
- useURIValidationHack="false" disableUploadTimeout="true">
- <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
- clientAuth="false" protocol="TLS"/>
- </Connector>
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host). -->
- <!-- Define the top level container in our container hierarchy -->
- <Engine name="Standalone" defaultHost="localhost" debug="0">
- <!-- The request dumper valve dumps useful debugging information about
- the request headers and cookies that were received, and the response
- headers and cookies that were sent, for all requests received by
- this instance of Tomcat. If you care only about requests to a
- particular virtual host, or a particular application, nest this
- element inside the corresponding <Host> or <Context> entry instead.
-
- For a similar mechanism that is portable to all Servlet 2.3
- containers, check out the "RequestDumperFilter" Filter in the
- example application (the source for this filter may be found in
- "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
- Request dumping is disabled by default. Uncomment the following
- element to enable it. -->
- <!--
- <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
- -->
- <!-- Global logger unless overridden at lower levels -->
- <Logger className="org.apache.catalina.logger.FileLogger" prefix="catalina_log." suffix=".txt" timestamp="true"/>
- <!-- Because this Realm is here, an instance will be shared globally -->
- <Realm className="org.apache.catalina.realm.MemoryRealm"/>
- <!-- Define the default virtual host -->
- <Host name="localhost" debug="0" appBase="webapps" unpackWARs="true" autoDeploy="true">
- <!-- Normally, users must authenticate themselves to each web app
- individually. Uncomment the following entry if you would like
- a user to be authenticated the first time they encounter a
- resource protected by a security constraint, and then have that
- user identity maintained across *all* web applications contained
- in this virtual host. -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn"
- debug="0"/>
- -->
- <!-- Access log processes all requests for this virtual host. By
- default, log files are created in the "logs" directory relative to
- $CATALINA_HOME. If you wish, you can specify a different
- directory with the "directory" attribute. Specify either a relative
- (to $CATALINA_HOME) or absolute path to the desired directory.
- -->
- <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" prefix="localhost_access_log." suffix=".txt" pattern="common"/>
- <!-- Logger shared by all Contexts related to this virtual host. By
- default (when using FileLogger), log files are created in the "logs"
- directory relative to $CATALINA_HOME. If you wish, you can specify
- a different directory with the "directory" attribute. Specify either a
- relative (to $CATALINA_HOME) or absolute path to the desired
- directory.-->
- <Logger className="org.apache.catalina.logger.FileLogger" directory="logs" prefix="localhost_log." suffix=".txt" timestamp="true"/>
- <!-- Define properties for each web application. This is only needed
- if you want to set non-default properties, or have web application
- document roots in places other than the virtual host's appBase
- directory. -->
- <!-- Tomcat Root Context -->
- <!--
- <Context path="" docBase="../moa-id-proxy.war" debug="0"/>
- -->
- </Host>
- </Engine>
- </Service>
- <!-- The MOD_WEBAPP connector is used to connect Apache 1.3 with Tomcat 4.0
- as its servlet container. Please read the README.txt file coming with
- the WebApp Module distribution on how to build it.
- (Or check out the "jakarta-tomcat-connectors/webapp" CVS repository)
-
- To configure the Apache side, you must ensure that you have the
- "ServerName" and "Port" directives defined in "httpd.conf". Then,
- lines like these to the bottom of your "httpd.conf" file:
-
- LoadModule webapp_module libexec/mod_webapp.so
- WebAppConnection warpConnection warp localhost:8008
- WebAppDeploy examples warpConnection /examples/
-
- The next time you restart Apache (after restarting Tomcat, if needed)
- the connection will be established, and all applications you make
- visible via "WebAppDeploy" directives can be accessed through Apache.
- -->
- <!-- Define an Apache-Connector Service -->
- <Service name="Tomcat-Apache">
- <Connector className="org.apache.catalina.connector.warp.WarpConnector" port="8008" minProcessors="5" maxProcessors="75" enableLookups="true" acceptCount="10" debug="0"/>
- <!-- Replace "localhost" with what your Apache "ServerName" is set to -->
- <Engine className="org.apache.catalina.connector.warp.WarpEngine" name="Apache" debug="0" appBase="webapps">
- <!-- Global logger unless overridden at lower levels -->
- <Logger className="org.apache.catalina.logger.FileLogger" prefix="apache_log." suffix=".txt" timestamp="true"/>
- <!-- Because this Realm is here, an instance will be shared globally -->
- <Realm className="org.apache.catalina.realm.MemoryRealm"/>
- </Engine>
- </Service>
-</Server>
diff --git a/id.server/data/deploy/tomcat/uriworkermap.properties b/id.server/data/deploy/tomcat/uriworkermap.properties
deleted file mode 100644
index daf0dca1a..000000000
--- a/id.server/data/deploy/tomcat/uriworkermap.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# a sample mod_jk uriworkermap.properties file for mapping
-# MOA-ID-AUTH and MOA-ID-PROXY web service requests to workers
-#
-# omit the mappings you don't need
-
-/moa-id-auth/*=moaworker
-/moa-id-proxy/*=moaworker \ No newline at end of file
diff --git a/id.server/data/deploy/tomcat/workers.properties b/id.server/data/deploy/tomcat/workers.properties
deleted file mode 100644
index 9350ddc77..000000000
--- a/id.server/data/deploy/tomcat/workers.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# a sample workers.properties file defining a single mod_jk worker
-
-worker.list=moaworker
-worker.moaworker.type=ajp13
-worker.moaworker.host=localhost
-worker.moaworker.port=8009
diff --git a/id.server/data/test/conf/ConfigurationTest.xml b/id.server/data/test/conf/ConfigurationTest.xml
deleted file mode 100644
index 5c18e35cc..000000000
--- a/id.server/data/test/conf/ConfigurationTest.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <SecurityLayer>
- <TransformsInfo filename="file:data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="https://10.16.46.108:8443/moa-spss/services">
- <AcceptedServerCertificates>file:data/test/certs/server-certs</AcceptedServerCertificates>
- <!-- <ClientKeyStore password="Keystore Pass">URLtoClientKeystoreAUTH</ClientKeyStore> -->
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="AuthComponentURL">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="http://localhost:9080/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfParamAuth.xml" sessionTimeOut="10" loginParameterResolverImpl="StringloginParameterResolverImpl1" connectionBuilderImpl="StringconnectionBuilderImpl1">
- <ConnectionParameter URL="ProxyComponentURL">
- <AcceptedServerCertificates>url:AcceptedServerCertificates</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://verisign.moa.gv.at/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfBasicAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl3" connectionBuilderImpl="StringconnectionBuilderImpl3">
- <ConnectionParameter URL="https://www.verisign.com/">
- <AcceptedServerCertificates>file:data/test/certs/server-certs</AcceptedServerCertificates>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://a-trust.moa.gv.at/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfBasicAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl3" connectionBuilderImpl="StringconnectionBuilderImpl3">
- <ConnectionParameter URL="https://www.a-trust.at/">
- <AcceptedServerCertificates>file:data/test/certs/server-certs</AcceptedServerCertificates>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://baltimore.moa.gv.at/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfBasicAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl3" connectionBuilderImpl="StringconnectionBuilderImpl3">
- <ConnectionParameter URL="https://www.baltimore.com/">
- <AcceptedServerCertificates>file:data/test/certs/server-certs</AcceptedServerCertificates>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="http://cio.moa.gv.at/">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfBasicAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl3" connectionBuilderImpl="StringconnectionBuilderImpl3">
- <ConnectionParameter URL="https://www.cio.gv.at/">
- <AcceptedServerCertificates>file:data/test/certs/server-certs</AcceptedServerCertificates>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="StringOALoginURL2">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfHeaderAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl2" connectionBuilderImpl="StringconnectionBuilderImpl2">
- <ConnectionParameter URL="ProxyComponentURL2">
- <AcceptedServerCertificates>url:AcceptedServerCertificates2</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss2">URL:toClientKeystoreOA2</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <OnlineApplication publicURLPrefix="StringOALoginURL3">
- <AuthComponent provideZMRZahl="true" provideAUTHBlock="true" provideIdentityLink="true"/>
- <ProxyComponent configFileURL="file:data/test/conf/OAConfBasicAuth.xml" sessionTimeOut="20" loginParameterResolverImpl="StringloginParameterResolverImpl3" connectionBuilderImpl="StringconnectionBuilderImpl3">
- <ConnectionParameter URL="ProxyComponentURL3">
- <AcceptedServerCertificates>url:AcceptedServerCertificates3</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss3">URL:toClientKeystoreOA3</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="chaining">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <TrustedCACertificates>file:c:/java/id.server/data/test/certs/ca-certs</TrustedCACertificates>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="c:/java/id.server/data/test/certs/cert-store-root"/>
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
- <GenericConfiguration name="ProxyComponent.DisableHostnameVerification" value="true"/>
-</MOA-IDConfiguration>
diff --git a/id.server/data/test/conf/OAConfBasicAuth.xml b/id.server/data/test/conf/OAConfBasicAuth.xml
deleted file mode 100644
index 61455f903..000000000
--- a/id.server/data/test/conf/OAConfBasicAuth.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<!--Sample XML file generated by XMLSPY v5 U (http://www.xmlspy.com)-->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateful</LoginType>
- <BasicAuth>
- <UserID>MOAGivenName</UserID>
- <Password>MOAFamilyName</Password>
- </BasicAuth>
-</Configuration>
diff --git a/id.server/data/test/conf/OAConfHeaderAuth.xml b/id.server/data/test/conf/OAConfHeaderAuth.xml
deleted file mode 100644
index c92e055e9..000000000
--- a/id.server/data/test/conf/OAConfHeaderAuth.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<!--Sample XML file generated by XMLSPY v5 U (http://www.xmlspy.com)-->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateful</LoginType>
- <HeaderAuth>
- <Header Name="Param1" Value="MOAPublicAuthority"/>
- <Header Name="Param2" Value="MOABKZ"/>
- <Header Name="Param3" Value="MOAQualifiedCertificate"/>
- <Header Name="Param4" Value="MOAZMRZahl"/>
- <Header Name="Param5" Value="MOAIPAddress"/>
- </HeaderAuth>
-</Configuration>
diff --git a/id.server/data/test/conf/OAConfParamAuth.xml b/id.server/data/test/conf/OAConfParamAuth.xml
deleted file mode 100644
index a70f6a6c0..000000000
--- a/id.server/data/test/conf/OAConfParamAuth.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<!--Sample XML file generated by XMLSPY v5 U (http://www.xmlspy.com)-->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateful</LoginType>
- <ParamAuth>
- <Parameter Name="Param1" Value="MOADateOfBirth"/>
- <Parameter Name="Param2" Value="MOAVPK"/>
- </ParamAuth>
-</Configuration>
diff --git a/id.server/data/test/conf/log4j.properties b/id.server/data/test/conf/log4j.properties
deleted file mode 100644
index 9a808f925..000000000
--- a/id.server/data/test/conf/log4j.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# commons-logging setup
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-
-# define log4j root loggers
-log4j.rootLogger=debug, stdout
-
-# configure the stdout appender
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
diff --git a/id.server/data/test/conf/transforms/TransformsInfosHTML.xml b/id.server/data/test/conf/transforms/TransformsInfosHTML.xml
deleted file mode 100644
index e003297f4..000000000
--- a/id.server/data/test/conf/transforms/TransformsInfosHTML.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<sl10:TransformsInfo>
- <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:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
- <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='OA']/saml:AttributeValue"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Geschäftsbereich:</b>
- </td>
- <td>
- <xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
- </dsig:Transforms>
- <sl10:FinalDataMetaInfo>
- <sl10:MimeType>text/html</sl10:MimeType>
- </sl10:FinalDataMetaInfo>
-</sl10:TransformsInfo>
diff --git a/id.server/data/test/ixsil/init/properties/algorithms.properties b/id.server/data/test/ixsil/init/properties/algorithms.properties
deleted file mode 100644
index 35a41cfdd..000000000
--- a/id.server/data/test/ixsil/init/properties/algorithms.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-# IXSIL algorithm properties
-#
-# This file contains the properties which IXSIL uses to maintain the available algorithms.
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# Canonicalization algorithms
-#
-# The following properties (starting with "Canonicalization.") are associations between canonicalization
-# algorithm URIs and their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the canonicalization algorithm
-# with the identifying URI "http://www.w3.org/TR/2001/REC-xml-c14n-20010315", the name of the algorithm
-# property is "Canonicalization.http://www.w3.org/TR/2001/REC-xml-c14n-20010315", i.e. the identifying URI,
-# prepended by the canonicalization algorithm property identifier ("Canonicalization."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard impl. shipped with IXSIL, "iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXML".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Canonicalization.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315 = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXML
-Canonicalization.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXMLWithComments
-Canonicalization.http\://www.w3.org/2001/10/xml-exc-c14n# = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXML
-Canonicalization.http\://www.w3.org/2001/10/xml-exc-c14n#WithComments = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXMLWithComments
-
-#----------------------------------------------------------------------------------------------------------
-# Signature algorithms
-#
-# The following properties (starting with "Signature.") are associations between signature algorithm URIs and
-# their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the signature algorithm
-# with the identifying URI "http://www.w3.org/2000/09/xmldsig#rsa-sha1", the name of the algorithm
-# property is "Signature.http://www.w3.org/2000/09/xmldsig#rsa-sha1", i.e. the identifying URI,
-# prepended by the signature algorithm property identifier ("Signature."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard implementation shipped with IXSIL, "iaik.ixsil.algorithms.SignatureAlgorithmImplRSA".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Signature.http\://www.w3.org/2000/09/xmldsig#rsa-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplRSA
-Signature.http\://www.w3.org/2000/09/xmldsig#dsa-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplDSA
-Signature.http\://www.w3.org/2000/09/xmldsig#hmac-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplHMAC
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# Digest algorithms
-#
-# The following properties (starting with "Digest.") are associations between digest algorithm URIs and
-# their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the digest algorithm
-# with the identifying URI "http://www.w3.org/2000/09/xmldsig#sha1", the name of the algorithm
-# property is "Digest.http://www.w3.org/2000/09/xmldsig#sha1", i.e. the identifying URI,
-# prepended by the digest algorithm property identifier ("Digest."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard implementation shipped with IXSIL, "iaik.ixsil.algorithms.DigestAlgorithmImplSHA1".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Digest.http\://www.w3.org/2000/09/xmldsig#sha1 = iaik.ixsil.algorithms.DigestAlgorithmImplSHA1
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# Transform algorithms
-#
-# The following properties (starting with "Transform.") are associations between digest algorithm URIs and
-# their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the transform algorithm
-# with the identifying URI "http://www.w3.org/2000/09/xmldsig#base64", the name of the algorithm
-# property is "Transform.http://www.w3.org/2000/09/xmldsig#base64", i.e. the identifying URI,
-# prepended by the transform algorithm property identifier ("Transform."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard implementation shipped with IXSIL, "iaik.ixsil.algorithms.TransformImplBase64Decode".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Transform.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315 = iaik.ixsil.algorithms.TransformImplCanonicalXML
-Transform.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments = iaik.ixsil.algorithms.TransformImplCanonicalXMLWithComments
-Transform.http\://www.w3.org/2001/10/xml-exc-c14n# = iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXML
-Transform.http\://www.w3.org/2001/10/xml-exc-c14n#WithComments = iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXMLWithComments
-Transform.http\://www.w3.org/2000/09/xmldsig#base64 = iaik.ixsil.algorithms.TransformImplBase64Decode
-Transform.http\://www.w3.org/TR/1999/REC-xpath-19991116 = iaik.ixsil.algorithms.TransformImplXPath
-Transform.http\://www.w3.org/2000/09/xmldsig#enveloped-signature = iaik.ixsil.algorithms.TransformImplEnvelopedSignature
-Transform.http\://www.w3.org/TR/1999/REC-xslt-19991116 = iaik.ixsil.algorithms.TransformImplXSLT
-Transform.http\://www.w3.org/2002/06/xmldsig-filter2 = iaik.ixsil.algorithms.TransformImplXPath2
diff --git a/id.server/data/test/ixsil/init/properties/init.properties b/id.server/data/test/ixsil/init/properties/init.properties
deleted file mode 100644
index a679a2635..000000000
--- a/id.server/data/test/ixsil/init/properties/init.properties
+++ /dev/null
@@ -1,214 +0,0 @@
-# IXSIL init properties
-#
-# This file contains the basic initialization properties for IXSIL.
-
-#----------------------------------------------------------------------------------------------------------
-# Properties for localizing exeption messages
-
-# This property specifies the ISO language code, which is used to select the appropriate exception message
-# file. Please see the documentation for Java class "java.util.RessourceBundle" for further information.
-
-IXSILException.ISOLanguageCode = "en"
-
-
-
-# This property specifies the ISO country code, which is used to select the appropriate exception message
-# file. Please see the documentation for Java class "java.util.RessourceBundle" for further information.
-
-IXSILException.ISOCountryCode = "US"
-
-
-#----------------------------------------------------------------------------------------------------------
-# Other property files
-
-# This property contains a URI specifying the (virtual) location of the IXSIL init properties file (i. e.
-# this file). The URI MUST be absolute.
-#
-# The use of this property is optional. It is only needed by IXSIL, if the library will be initialized using
-# the method IXSILInit.init(Properties, Properties, Properties). In this case it is used by IXSIL as the
-# base URI for absolutizing other property URIs, such as "DOMUtils.SignatureSchema" (see below).
-#
-# PLEASE NOTE: Contrary to URIs under e.g. http or ftp scheme, URIs under file and jar scheme do not have an
-# authority component. This means that the part following the scheme identifier starts with "/"
-# (single slash character), and not with "//" (two slash characters).
-#
-# Example 1 (absolute URI under file scheme): "file:/c:/path1/path2/init.properties"
-# Example 2 (absolute URI under jar scheme): "jar:/file:/c:/path1/path2/archive.jar!/init.properties"
-# Example 3 (absolute URI under http scheme): "http://somewhere.org/path1/path2/init.properties"
-
-location.initProperties = file:data/test/ixsil/init/properties/init.properties
-
-
-
-# This property contains a URI specifying the location of the IXSIL algorithm properties file. The URI can
-# be absolute or relative. If a relative URI is used, it will be absolutized using this init property file's
-# URI as the base.
-#
-# PLEASE NOTE: Contrary to URIs under e.g. http or ftp scheme, URIs under file and jar scheme do not have an
-# authority component. This means that the part following the scheme identifier starts with "/"
-# (single slash character), and not with "//" (two slash characters).
-#
-# Example 1 (absolute URI under file scheme): "file:/c:/path1/path2/algorithms.properties"
-# Example 2 (absolute URI under jar scheme): "jar:/file:/c:/path1/path2/archive.jar!/algorithms.properties"
-# Example 3 (absolute URI under http scheme): "http://somewhere.org/path1/path2/algorithms.properties"
-# Example 4 (relative URI): "../otherpath/algorithms.properties"
-# Example 5 (relative URI): "algorithms.properties"
-
-location.algorithmsProperties = file:data/test/ixsil/init/properties/algorithms.properties
-
-
-
-# This property contains a URI specifying the location of the IXSIL keyManager properties file. The URI can
-# be absolute or relative. If a relative URI is used, it will be absolutized using this init property file's
-# URI as the base.
-#
-# PLEASE NOTE: Contrary to URIs under e.g. http or ftp scheme, URIs under file and jar scheme do not have an
-# authority component. This means that the part following the scheme identifier starts with "/"
-# (single slash character), and not with "//" (two slash characters).
-#
-# Example 1 (absolute URI under file scheme): "file:/c:/path1/path2/keyManager.properties"
-# Example 2 (absolute URI under jar scheme): "jar:/file:/c:/path1/path2/archive.jar!/keyManager.properties"
-# Example 3 (absolute URI under http scheme): "http://somewhere.org/path1/path2/keyManager.properties"
-# Example 4 (relative URI): "../otherpath/keyManager.properties"
-# Example 5 (relative URI): "keyManager.properties"
-
-location.keyManagerProperties = file:data/test/ixsil/init/properties/keyManager.properties
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# AlgorithmFactory properties
-
-
-
-This property specifies the extension class for the abstract class
-iaik.ixsil.algorithms.AlgorithmFactory, which is instantiated at invokation of method
-iaik.ixsil.algorithms.AlgorithmFactory.createFactory().
-Please specifiy the fully qualified java class name for the class to be instantiated.
-
-AlgorithmFactory.ImplementingClass = iaik.ixsil.algorithms.AlgorithmFactoryDefaultImpl
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# VerifierKeyManager properties
-
-# This property specifies the implementation class for the interface
-# iaik.ixsil.keyinfo.VerifierKeyManager, which is instantiated by IXSIL in the verification use case, if the
-# signature algorithm does not know about the verification key, and if the XML signature bears a KeyInfo
-# element which contains hints that can be used to deduce the verification key.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-VerifierKeyManager.ImplementingClass = iaik.ixsil.keyinfo.KeyManagerImpl
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# XML namespace prefix properties
-
-# This property specifies the namespace prefix used for XML elements from the XML-Signature namespace.
-#
-# PLEASE NOTE: The prefix must not be empty.
-
-namespacePrefix.XMLSignature = dsig:
-
-
-
-# This property specifies the namespace prefix used for XML elements from the XML Schema instance namespace.
-#
-# PLEASE NOTE: The prefix must not be empty.
-
-namespacePrefix.XMLSchemaInstance = xsi:
-
-
-#----------------------------------------------------------------------------------------------------------
-# DOMUtils properties
-
-
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.DOMUtilsInterface, which contains a couple of DOM utility methods, which IXSIL relies
-# on. If you would like to employ a parser different from Apache Xerces, you must implement the
-# DOMUtilsInterface and specify your implementation class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-DOMUtils.ImplementingClass = iaik.ixsil.util.DOMUtilsImpl
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies, wheter WARNINGS generated by the Apache Xerces parser should lead to a parser exception
-# or not.
-
-DOMUtils.ErrorHandler.reportWarnings = true
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies, wheter ERRORS generated by the Apache Xerces parser should lead to a parser exception
-# or not.
-
-DOMUtils.ErrorHandler.reportErrors = true
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies, wheter FATAL ERRORS generated by the Apache Xerces parser should lead to a parser
-# exception or not.
-
-DOMUtils.ErrorHandler.reportFatalErrors = true
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies an URI for the location of the XML schema for an XML signature, which is used as the
-# reference grammar in method iaik.ixsil.util.DOMUtilsImpl.schemaValidateSignatureElement.
-# The URI can be absolute or relative. If the URI is relative, it will be absolutized using the URI for
-# this init property file as the base.
-
-DOMUtils.SignatureSchema = ../schemas/Signature.xsd
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# XPathUtils properties
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.XPathUtilsInterface, which contains a couple of XPath utility methods, which IXSIL relies
-# on. If you would like to employ a XPath engine different from Apache Xalan, you must implement the
-# XPathUtilsInterface and specify your implementation class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-XPathUtils.ImplementingClass = iaik.ixsil.util.XPathUtilsImpl
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# CanonicalXMLSerializer properties
-
-
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.CanonicalXMLSerialierInterface. IXSIL relies on this interface to serialize XML according
-# to "Canonical XML" (see http://www.w3.org/TR/2001/REC-xml-c14n-20010315). If you would like to employ an
-# implemenation different from the standard implementation shipped with IXSIL, you must implement the
-# CanonicalXMLSerialierInterface and specify your implementation class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-CanonicalXMLSerializer.CanonicalXMLImplementingClass = iaik.ixsil.util.CanonicalXMLSerializerImpl
-
-
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.ExclusiveCanonicalXMLSerialierInterface. IXSIL relies on this interface to serialize XML
-# according to "Exclusive XML Canonicalization" (see http://www.w3.org/TR/2001/WD-xml-exc-c14n-20011120).
-# If you would like to employ an implemenation different from the standard implementation shipped with
-# IXSIL, you must implement the ExclusiveCanonicalXMLSerialierInterface and specify your implementation
-# class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-CanonicalXMLSerializer.ExclusiveCanonicalXMLImplementingClass = iaik.ixsil.util.CanonicalXMLSerializerImpl
diff --git a/id.server/data/test/ixsil/init/properties/keyManager.properties b/id.server/data/test/ixsil/init/properties/keyManager.properties
deleted file mode 100644
index 24ece437a..000000000
--- a/id.server/data/test/ixsil/init/properties/keyManager.properties
+++ /dev/null
@@ -1,74 +0,0 @@
-# IXSIL algorithm properties
-#
-# This file contains the properties which IXSIL uses in context of key management.
-
-
-
-#----------------------------------------------------------------------------------------------------------
-#
-# The following properties are associations between the fully qualified XMLname of a "KeyInfo" subelement,
-# as used in an XML signature to specify hints how the verifier can obtain the verification key, and that
-# implementation class of the interface iaik.ixsil.keyinfo.KeyProviderInterface, which will manage
-# subelements of that type.
-#
-# These properties are only of interest, if you are using the standard key manager shipped with IXISL
-# (which is class iaik.ixsil.keyInfo.KeyManagerImpl).
-#
-# For instance, if you would like to specify the key provider implementation for "KeyValue" subelements,
-# the property name is the fully qualified XML name for the "KeyValue" element, namely
-# "http://www.w3.org/2000/09/xmldsig#:KeyValue". The value of the property is the fully qualified class
-# name of the key provider implementation class, for instance the standard implementation which ships with
-# IXSIL: "iaik.ixsil.keyinfo.KeyProviderImplKeyValue".
-#
-# PLEASE NOTE (I): A fully qualified name for an XML element consists of an URI indicating the namespace the
-# element belongs to (e.g. "http://www.w3.org/2000/09/xmldsig#") and the local name of the
-# element (e.g. "KeyValue"). Both components are seperated by a colon.
-#
-# PLEASE NOTE (II): The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-http\://www.w3.org/2000/09/xmldsig#\:KeyValue = iaik.ixsil.keyinfo.KeyProviderImplKeyValue
-http\://www.w3.org/2000/09/xmldsig#\:X509Data = iaik.ixsil.keyinfo.x509.KeyProviderImplX509Data
-http\://www.w3.org/2000/09/xmldsig#\:RetrievalMethod = iaik.ixsil.keyinfo.retrieval.KeyProviderImplRetrievalMethod
-
-
-
-#----------------------------------------------------------------------------------------------------------
-#
-# The following properties specify the order in which the different types of "KeyInfo" subelements are used
-# by the key manager to deduce the verification key.
-#
-# These properties are only of interest, if you are using the standard key manager shipped with IXISL
-# (which is class iaik.ixsil.keyInfo.KeyManagerImpl).
-#
-# The properties are associations between a two digit number and the fully qualified XML name of a "KeyInfo"
-# subelement. The lower the number, the more important is the associated "KeyInfo" sublement. Consider an
-# example configuration:
-#
-# Subelement.01 = http://www.w3.org/2000/09/xmldsig#:KeyValue
-# Subelement.02 = http://www.w3.org/2000/09/xmldsig#:X509Data
-#
-# In this configuration, the key manager first tries to use "KeyValue" subelements to deduce the
-# verification key. Only if this does not succeed, the key manager uses "X509Data" subelements as a second
-# chance. Of course you can specify more than only two different subelement types.
-#
-# PLEASE NOTE: A fully qualified name for an XML element consists of an URI indicating the namespace the
-# element belongs to (e.g. "http://www.w3.org/2000/09/xmldsig#") and the local name of the
-# element (e.g. "KeyValue"). Both components are seperated by a colon.
-
-Subelement.01 = http://www.w3.org/2000/09/xmldsig#:KeyValue
-Subelement.02 = http://www.w3.org/2000/09/xmldsig#:X509Data
-Subelement.03 = http://www.w3.org/2000/09/xmldsig#:RetrievalMethod
-
-
-
-#----------------------------------------------------------------------------------------------------------
-#
-# The following property is used by standard implementation of the "X509Data" key provider, which ships
-# with IXSIL, namely "KeyProviderImplX509Data". It specifies the implementation class for the interface
-# iaik.ixsil.keyinfo.x509.X509TrustManagerInterface, which is to be instantiated as the backbone trust
-# manager for this key provider.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-KeyProviderImplX509Data.X509TrustManagerDefaultImplementingClass = iaik.ixsil.keyinfo.x509.X509TrustManagerDummyImpl
-
diff --git a/id.server/data/test/ixsil/init/schemas/Signature.xsd b/id.server/data/test/ixsil/init/schemas/Signature.xsd
deleted file mode 100644
index 7867883f9..000000000
--- a/id.server/data/test/ixsil/init/schemas/Signature.xsd
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
- SYSTEM "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.3 $ on $Date: 2001/08/28 16:14:01 $ by $Author: reagle $
-
- 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 xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- targetNamespace="http://www.w3.org/2000/09/xmldsig#"
- version="0.1" elementFormDefault="qualified">
-
-<!-- Basic Types Defined for Signatures -->
-
-<!-- modified to ensure that whiteSpace is preserved
-<simpleType name="CryptoBinary">
- <restriction base="base64Binary">
- </restriction>
-</simpleType>
- -->
-
-<simpleType name="CryptoBinary">
- <restriction base="string">
- <whiteSpace value="preserve"/>
- <pattern value="[A-Za-z0-9\+/=\n\r\t ]*"/>
- </restriction>
-</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="ds:CryptoBinary">
- <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" minOccurs="0" type="ds:HMACOutputLengthType"/>
- <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"/>
- <!-- (1,1) elements from (0,unbounded) namespaces -->
- <element name="XPath" type="string"/>
- </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="ds:CryptoBinary"/>
-</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 processContents="lax" namespace="##other"/>
- <!-- (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 name="Transforms" type="ds:TransformsType" 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="ds:CryptoBinary"/>
- <element name="X509SubjectName" type="string"/>
- <element name="X509Certificate" type="ds:CryptoBinary"/>
- <element name="X509CRL" type="ds:CryptoBinary"/>
- <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="ds:CryptoBinary"/>
- <element name="PGPKeyPacket" type="ds:CryptoBinary" minOccurs="0"/>
- <any namespace="##other" processContents="lax" minOccurs="0"
- maxOccurs="unbounded"/>
- </sequence>
- <sequence>
- <element name="PGPKeyPacket" type="ds:CryptoBinary"/>
- <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="ds:CryptoBinary"/>
- <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"/> <!-- add a grep facet -->
- <attribute name="Encoding" type="anyURI" use="optional"/>
-</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="##any" 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="J" type="ds:CryptoBinary" minOccurs="0"/>
- <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
- <element name="Y" type="ds:CryptoBinary"/>
- <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/id.server/data/test/ixsil/init/schemas/XMLSchema.dtd b/id.server/data/test/ixsil/init/schemas/XMLSchema.dtd
deleted file mode 100644
index 678cfc8dd..000000000
--- a/id.server/data/test/ixsil/init/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/id.server/data/test/ixsil/init/schemas/datatypes.dtd b/id.server/data/test/ixsil/init/schemas/datatypes.dtd
deleted file mode 100644
index 8e48553be..000000000
--- a/id.server/data/test/ixsil/init/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/id.server/data/test/xmldata/ErrorResponse.xml b/id.server/data/test/xmldata/ErrorResponse.xml
deleted file mode 100644
index db70c2560..000000000
--- a/id.server/data/test/xmldata/ErrorResponse.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><sl10:ErrorResponse xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/20020225#'>
- <sl10:ErrorCode>29002</sl10:ErrorCode>
- <sl10:Info>Ein unerwarteter Fehler ist aufgetreten. Die Verarbeitung wurde abgebrochen. Fehler:null</sl10:Info>
-</sl10:ErrorResponse> \ No newline at end of file
diff --git a/id.server/data/test/xmldata/GetIdentityLinkForm.html b/id.server/data/test/xmldata/GetIdentityLinkForm.html
deleted file mode 100644
index b7828e598..000000000
--- a/id.server/data/test/xmldata/GetIdentityLinkForm.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-<head>
-<title>Auslesen der Personenbindung</title>
-
-</head>
-<body>
-<form name="GetIdentityLinkForm"
- action="http://localhost:3495/http-security-layer-request"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<?xml version='1.0' encoding='ISO-8859-1' ?><sl10:InfoboxReadRequest xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/20020225#'><sl10:InfoboxIdentifier>IdentityLink</sl10:InfoboxIdentifier><sl10:BinaryFileParameters ContentIsXMLEntity='true'/></sl10:InfoboxReadRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="https://localhost:8443/moa-id-auth/VerifyIdentityLink?MOASessionID=3579795857269397498"/>
- <input type="submit" value="Auslesen der Personenbindung"/>
-</form>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/data/test/xmldata/standard/AuthenticationDataAssertion.xml b/id.server/data/test/xmldata/standard/AuthenticationDataAssertion.xml
deleted file mode 100644
index 2cfa65c96..000000000
--- a/id.server/data/test/xmldata/standard/AuthenticationDataAssertion.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Paul Ivancsics (My Own) -->
-<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" MajorVersion="1" MinorVersion="0" AssertionID="-4633313027464114584" Issuer="http://localhost:8080/moa-id-auth/" IssueInstant="2003-04-02T14:55:42+02:00">
- <saml:AttributeStatement>
- <saml:Subject>
- <saml:NameIdentifier NameQualifier="http://reference.e-government.gv.at/names/vpk/20020221#">MTk2OC0xMC0yMmdi</saml:NameIdentifier>
- <saml:SubjectConfirmation>
- <saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>
- <saml:SubjectConfirmationData>
- <saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" MajorVersion="1" MinorVersion="0" AssertionID="any" Issuer="Hermann Muster" IssueInstant="2003-04-02T14:55:27+02:00">
- <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>
- </saml:Assertion>
- <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>
- </saml:SubjectConfirmationData>
- </saml:SubjectConfirmation>
- </saml:Subject>
- <saml:Attribute AttributeName="PersonData" AttributeNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#">
- <saml:AttributeValue>
- <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:AttributeValue>
- </saml:Attribute>
- <saml:Attribute AttributeName="isQualifiedCertificate" AttributeNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <saml:AttributeValue>false</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion>
diff --git a/id.server/data/test/xmldata/standard/CreateXMLSignatureRequest.xml b/id.server/data/test/xmldata/standard/CreateXMLSignatureRequest.xml
deleted file mode 100644
index 4a5f02dcd..000000000
--- a/id.server/data/test/xmldata/standard/CreateXMLSignatureRequest.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1' ?>
-<sl11:CreateXMLSignatureRequest xmlns:dsig='http://www.w3.org/2000/09/xmldsig#' xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/20020225#' xmlns:sl11='http://www.buergerkarte.at/namespaces/securitylayer/20020831#'>
- <sl11:KeyboxIdentifier>SecureSignatureKeypair</sl11:KeyboxIdentifier>
- <sl11:DataObjectInfo Structure='detached'>
- <sl10:DataObject Reference=''/>
-<sl10:TransformsInfo>
- <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:xsl="http://www.w3.org/1999/XSL/Transform"
-xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" >
-<xsl:template match="/" xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<body>
-Bitte bestätigen Sie mit Ihrer Unterschrift folgende Angaben:
-<br /><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='OA']/saml:AttributeValue" /></td></tr>
-<tr><td><b>Geschäftsbereich:</b></td><td><xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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>
- <sl10:FinalDataMetaInfo>
- <sl10:MimeType>text/html</sl10:MimeType>
- </sl10:FinalDataMetaInfo>
-</sl10:TransformsInfo> </sl11:DataObjectInfo>
- <sl11:SignatureInfo>
- <sl11:SignatureEnvironment>
- <sl10:XMLContent><saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' MajorVersion='1' MinorVersion='0' AssertionID='any' Issuer='Hermann Muster' IssueInstant='2003-02-26T09:25:50+01:00'>
- <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>http://localhost:9080/login.html</saml:AttributeValue>
- </saml:Attribute>
- </saml:AttributeStatement>
-</saml:Assertion></sl10:XMLContent>
- </sl11:SignatureEnvironment>
- <sl11:SignatureLocation Index='2'>/saml:Assertion</sl11:SignatureLocation>
- </sl11:SignatureInfo>
-</sl11:CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/id.server/data/test/xmldata/standard/CreateXMLSignatureResponse.xml b/id.server/data/test/xmldata/standard/CreateXMLSignatureResponse.xml
deleted file mode 100644
index 5a4759b7a..000000000
--- a/id.server/data/test/xmldata/standard/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/id.server/data/test/xmldata/standard/VerifyXMLSignaterResponse.xml b/id.server/data/test/xmldata/standard/VerifyXMLSignaterResponse.xml
deleted file mode 100644
index 9b8fa743f..000000000
--- a/id.server/data/test/xmldata/standard/VerifyXMLSignaterResponse.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xml="http://www.w3.org/XML/1998/namespace"><SignerInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>0</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</dsig:X509SubjectName><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><PublicAuthority><Code>BMOLS-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><HashInputData><Base64Content>PFZlcmlmeVhNTFNpZ25hdHVyZVJlcXVlc3QgeG1sbnM9Imh0dHA6Ly9yZWZlcmVu Y2UuZS1nb3Zlcm5tZW50Lmd2LmF0L25hbWVzcGFjZS9tb2EvMjAwMjA4MjIjIiB4 bWxuczpkc2lnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIj4g IDxWZXJpZnlTaWduYXR1cmVJbmZvPiAgICA8VmVyaWZ5U2lnbmF0dXJlRW52aXJv bm1lbnQ+ICAgICAgPFhNTENvbnRlbnQgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHNh bWw6QXNzZXJ0aW9uIHhtbG5zOnByPSJodHRwOi8vcmVmZXJlbmNlLmUtZ292ZXJu bWVudC5ndi5hdC9uYW1lc3BhY2UvcGVyc29uZGF0YS8yMDAyMDIyOCMiIHhtbG5z OnNhbWw9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjEuMDphc3NlcnRpb24iIHht bG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFu Y2UiIEFzc2VydGlvbklEPSJ6bXIuYm1pLmd2LmF0LUFzc2VydGlvbklELTIwMDMt MDItMTJUMjA6Mjg6MzQuNDc0IiBJc3N1ZUluc3RhbnQ9IjIwMDMtMDItMTJUMjA6 Mjg6MzQuNDc0IiBJc3N1ZXI9Imh0dHA6Ly96bXIuYm1pLmd2LmF0L3ptcmEvbmFt ZXMjSXNzdWVyIiBNYWpvclZlcnNpb249IjEiIE1pbm9yVmVyc2lvbj0iMCI+CiAg PHNhbWw6QXR0cmlidXRlU3RhdGVtZW50PgogICAgPHNhbWw6U3ViamVjdD4KICAg ICAgPHNhbWw6U3ViamVjdENvbmZpcm1hdGlvbj4KICAgICAgICA8c2FtbDpDb25m aXJtYXRpb25NZXRob2Q+dXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6MS4wOmNtOnNl bmRlci12b3VjaGVzPC9zYW1sOkNvbmZpcm1hdGlvbk1ldGhvZD4KICAgICAgICA8 c2FtbDpTdWJqZWN0Q29uZmlybWF0aW9uRGF0YT4KICAgICAgICAgIDxwcjpQZXJz b24geHNpOnR5cGU9InByOlBoeXNpY2FsUGVyc29uVHlwZSI+CiAgICAgICAgICAg IAogICAgICAgICAgICA8cHI6TmFtZT4KICAgICAgICAgICAgICA8cHI6R2l2ZW5O YW1lPkhlcm1hbm48L3ByOkdpdmVuTmFtZT4KICAgICAgICAgICAgICA8cHI6RmFt aWx5TmFtZSBwcmltYXJ5PSJ1bmRlZmluZWQiPk11c3RlcjwvcHI6RmFtaWx5TmFt ZT4KICAgICAgICAgICAgPC9wcjpOYW1lPgogICAgICAgICAgICA8cHI6RGF0ZU9m QmlydGg+MTk2OC0xMC0yMjwvcHI6RGF0ZU9mQmlydGg+CiAgICAgICAgICA8L3By OlBlcnNvbj4KICAgICAgICA8L3NhbWw6U3ViamVjdENvbmZpcm1hdGlvbkRhdGE+ CiAgICAgIDwvc2FtbDpTdWJqZWN0Q29uZmlybWF0aW9uPgogICAgPC9zYW1sOlN1 YmplY3Q+CiAgICA8c2FtbDpBdHRyaWJ1dGUgQXR0cmlidXRlTmFtZT0iQ2l0aXpl blB1YmxpY0tleSIgQXR0cmlidXRlTmFtZXNwYWNlPSJodHRwOi8vd3d3LmJ1ZXJn ZXJrYXJ0ZS5hdC9uYW1lc3BhY2VzL3BlcnNvbmVuYmluZHVuZy8yMDAyMDUwNiMi PgogICAgICA8c2FtbDpBdHRyaWJ1dGVWYWx1ZT4KICAgICAgICA8ZHNpZzpSU0FL ZXlWYWx1ZT4KICAgICAgICAgIDxkc2lnOk1vZHVsdXM+MHYxRnRmN1dYZ29leHgw Sm8vR3JsRXhIT0huUUlFUTVGRlNqcHRMUmQ1Qk4xbVpZUmcyUzlLZk9NYkhTQ3Np UG04QXdqQUV3RTVFTSBBNlAxOFovWXlUSXVQN2ZOR3pja2JCNVBZSWdOTUhMOC9U WUpoSEE4Q2phbXNCckVmWURYaXZFOGlBdkFMZzVJOVJNTFpBRG16TDdhIGYyZGFZ WXVPOGR5Y1F3M3hnNlU9PC9kc2lnOk1vZHVsdXM+CiAgICAgICAgICA8ZHNpZzpF eHBvbmVudD5BUUFCPC9kc2lnOkV4cG9uZW50PgogICAgICAgIDwvZHNpZzpSU0FL ZXlWYWx1ZT4KICAgICAgPC9zYW1sOkF0dHJpYnV0ZVZhbHVlPgogICAgPC9zYW1s OkF0dHJpYnV0ZT4KICAgIDxzYW1sOkF0dHJpYnV0ZSBBdHRyaWJ1dGVOYW1lPSJD aXRpemVuUHVibGljS2V5IiBBdHRyaWJ1dGVOYW1lc3BhY2U9Imh0dHA6Ly93d3cu YnVlcmdlcmthcnRlLmF0L25hbWVzcGFjZXMvcGVyc29uZW5iaW5kdW5nLzIwMDIw NTA2IyI+CiAgICAgIDxzYW1sOkF0dHJpYnV0ZVZhbHVlPgogICAgICAgIDxkc2ln OlJTQUtleVZhbHVlPgogICAgICAgICAgPGRzaWc6TW9kdWx1cz5pMnFhNTZYNGZw WWVYcUZMWEFjUWxqR1UzK0RXblZnTnJBeEk5Z24yYk1lRld0TFhFMlNGYTZxdmw5 RXltVWwwbm9CbEZuMHE5RFdwIEFzeWVMblJoekNBWEplU3hpd3NVRWxvT3ZjUUNW MERmVzJVVnEwWTliVmxKOEtpZkoyQVMrNUJ4WjIxbWtjL1ZZeDVRejZFWWpQcm4g cElwZEF3UjlzdzV4bkl2VHlTYz08L2RzaWc6TW9kdWx1cz4KICAgICAgICAgIDxk c2lnOkV4cG9uZW50PkFRQUI8L2RzaWc6RXhwb25lbnQ+CiAgICAgICAgPC9kc2ln OlJTQUtleVZhbHVlPgogICAgICA8L3NhbWw6QXR0cmlidXRlVmFsdWU+CiAgICA8 L3NhbWw6QXR0cmlidXRlPjwvc2FtbDpBdHRyaWJ1dGVTdGF0ZW1lbnQ+Cjwvc2Ft bDpBc3NlcnRpb24+PC9YTUxDb250ZW50PiAgICA8L1ZlcmlmeVNpZ25hdHVyZUVu dmlyb25tZW50PiAgICA8VmVyaWZ5U2lnbmF0dXJlTG9jYXRpb24+Ly9kc2lnOlNp Z25hdHVyZTwvVmVyaWZ5U2lnbmF0dXJlTG9jYXRpb24+ICA8L1ZlcmlmeVNpZ25h dHVyZUluZm8+ICA8UmV0dXJuSGFzaElucHV0RGF0YT48L1JldHVybkhhc2hJbnB1 dERhdGE+ICA8VHJ1c3RQcm9maWxlSUQ+VHJ1c3RQcm9maWxlMTwvVHJ1c3RQcm9m aWxlSUQ+PC9WZXJpZnlYTUxTaWduYXR1cmVSZXF1ZXN0Pg==</Base64Content></HashInputData><HashInputData><Base64Content>PGRzaWc6TWFuaWZlc3QgeG1sbnM9Imh0dHA6Ly9yZWZlcmVuY2UuZS1nb3Zlcm5t ZW50Lmd2LmF0L25hbWVzcGFjZS9tb2EvMjAwMjA4MjIjIiB4bWxuczpkc2lnPSJo dHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIiB4bWxuczpwcj0iaHR0 cDovL3JlZmVyZW5jZS5lLWdvdmVybm1lbnQuZ3YuYXQvbmFtZXNwYWNlL3BlcnNv bmRhdGEvMjAwMjAyMjgjIiB4bWxuczpzYW1sPSJ1cm46b2FzaXM6bmFtZXM6dGM6 U0FNTDoxLjA6YXNzZXJ0aW9uIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3Jn LzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiB4bWw6c3BhY2U9InByZXNlcnZlIj48 ZHNpZzpSZWZlcmVuY2UgVVJJPSIiPjxkc2lnOlRyYW5zZm9ybXM+PGRzaWc6VHJh bnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxk c2lnI2VudmVsb3BlZC1zaWduYXR1cmUiPjwvZHNpZzpUcmFuc2Zvcm0+PC9kc2ln OlRyYW5zZm9ybXM+PGRzaWc6RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDov L3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3NoYTEiPjwvZHNpZzpEaWdlc3RN ZXRob2Q+PGRzaWc6RGlnZXN0VmFsdWU+QnF6ZkNCN2ROZzRHM3U0WWF4cEQxdEFM ZEtJPTwvZHNpZzpEaWdlc3RWYWx1ZT48L2RzaWc6UmVmZXJlbmNlPjwvZHNpZzpN YW5pZmVzdD4=</Base64Content></HashInputData><SignatureCheck><Code>1</Code></SignatureCheck><XMLDSIGManifestCheck><Code>1</Code><Info><ReferringSigReference>1</ReferringSigReference></Info></XMLDSIGManifestCheck><CertificateCheck><Code>1</Code></CertificateCheck></VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/id.server/data/test/xmldata/testperson1/InfoboxReadResponse.xml b/id.server/data/test/xmldata/testperson1/InfoboxReadResponse.xml
deleted file mode 100644
index a35b7f209..000000000
--- a/id.server/data/test/xmldata/testperson1/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/id.server/doc/Architektur ID.vsd b/id.server/doc/Architektur ID.vsd
deleted file mode 100644
index d4678007a..000000000
--- a/id.server/doc/Architektur ID.vsd
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/CIO X509ext-20030218.pdf b/id.server/doc/CIO X509ext-20030218.pdf
deleted file mode 100644
index a0fd67e3b..000000000
--- a/id.server/doc/CIO X509ext-20030218.pdf
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/MOA ID 1.x.wsdl b/id.server/doc/MOA ID 1.x.wsdl
deleted file mode 100644
index 06daae8f1..000000000
--- a/id.server/doc/MOA ID 1.x.wsdl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by patrick peck (anecon) -->
-<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
- <import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-20020812.xsd"/>
- <message name="GetAuthenticationDataInput">
- <part name="body" element="samlp:Request"/>
- </message>
- <message name="GetAuthenticationDataOutput">
- <part name="body" element="samlp:Response"/>
- </message>
- <message name="MOAFault">
- <part name="body" element="moa:ErrorResponse"/>
- </message>
- <portType name="IdentificationPortType">
- <operation name="getAuthenticationData">
- <input message="tns:GetAuthenticationDataInput"/>
- <output message="tns:GetAuthenticationDataOutput"/>
- <fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
- </portType>
- <binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="getAuthenticationData">
- <soap:operation soapAction="urn:GetAuthenticationDataAction"/>
- <input>
- <soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </input>
- <output>
- <soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </output>
- <fault name="MOAFault">
- <soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </fault>
- </operation>
- </binding>
- <service name="GetAuthenticationDataService">
- <port name="IdentificationPort" binding="tns:IdentificationBinding">
- <soap:address location="http://localhost/Identification"/>
- </port>
- </service>
-</definitions>
diff --git a/id.server/doc/MOA-ID Feinspezifikation.doc b/id.server/doc/MOA-ID Feinspezifikation.doc
deleted file mode 100644
index fa0009aa6..000000000
--- a/id.server/doc/MOA-ID Feinspezifikation.doc
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/MOA-ID Testfalldokumentation.doc b/id.server/doc/MOA-ID Testfalldokumentation.doc
deleted file mode 100644
index 1b3241ca7..000000000
--- a/id.server/doc/MOA-ID Testfalldokumentation.doc
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/MOA-ID-1.1-20030630.pdf b/id.server/doc/MOA-ID-1.1-20030630.pdf
deleted file mode 100644
index 8e5afb53f..000000000
--- a/id.server/doc/MOA-ID-1.1-20030630.pdf
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/MOA-ID-Configuration-1.1.xsd b/id.server/doc/MOA-ID-Configuration-1.1.xsd
deleted file mode 100644
index 50c77a401..000000000
--- a/id.server/doc/MOA-ID-Configuration-1.1.xsd
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stephan G (Comp) -->
-<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.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.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="connectionBuilderImpl" type="xsd:string" use="optional"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ConnectionParameterServerAuthType">
- <xsd:sequence>
- <xsd:element name="AcceptedServerCertificates" type="xsd:anyURI" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>URL zu einem Verzeichnis, das akzeptierte Server-Zertifikate der TLS-Verbindung enthält (keine CA-Zertifikate)</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
- </xsd:complexType>
- <xsd:complexType name="ConnectionParameterClientAuthType">
- <xsd:complexContent>
- <xsd:extension base="ConnectionParameterServerAuthType">
- <xsd:sequence>
- <xsd:element name="ClientKeyStore" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>URL zu einem KeyStore, der den privaten Schlüssel, der für die TLS-Client-Authentisierung verwendetwird, enthält</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:simpleContent>
- <xsd:extension base="xsd:anyURI">
- <xsd:attribute name="password" type="xsd:string" use="optional"/>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:element name="TrustProfileID" type="xsd:string"/>
- <xsd:simpleType name="ChainingModeType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="chaining"/>
- <xsd:enumeration value="pkix"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:simpleType name="BKUSelectionType">
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="HTMLComplete"/>
- <xsd:enumeration value="HTMLSelect"/>
- </xsd:restriction>
- </xsd:simpleType>
-</xsd:schema>
diff --git a/id.server/doc/api-doc/allclasses-frame.html b/id.server/doc/api-doc/allclasses-frame.html
deleted file mode 100644
index 114c4b426..000000000
--- a/id.server/doc/api-doc/allclasses-frame.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-All Classes
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" TARGET="classFrame">AuthenticationData</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html" TARGET="classFrame">AuthenticationException</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" TARGET="classFrame">AuthenticationServer</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" TARGET="classFrame"><I>ConnectionBuilder</I></A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" TARGET="classFrame"><I>LoginParameterResolver</I></A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" TARGET="classFrame">OAConfiguration</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
deleted file mode 100644
index 313defcbc..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Class AuthenticationException
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/AuthenticationException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationException.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id</FONT>
-<BR>
-Class AuthenticationException</H2>
-<PRE>
-<B>at.gv.egovernment.moa.id.AuthenticationException</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>AuthenticationException</B></DL>
-
-<P>
-Exception thrown during handling of AuthenticationSession
-<P>
-<HR>
-
-<P>
-<!-- ======== INNER CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../at/gv/egovernment/moa/id/AuthenticationException.html#AuthenticationException(java.lang.String, java.lang.Object[])">AuthenticationException</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;messageId,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">Object</A>[]&nbsp;parameters)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for AuthenticationException.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="AuthenticationException(java.lang.String, java.lang.Object[])"><!-- --></A><H3>
-AuthenticationException</H3>
-<PRE>
-public <B>AuthenticationException</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;messageId,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">Object</A>[]&nbsp;parameters)</PRE>
-<DL>
-<DD>Constructor for AuthenticationException.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>messageId</CODE> - &nbsp;</DL>
-</DD>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/AuthenticationException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationException.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
deleted file mode 100644
index 7aaad7c68..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Class AuthenticationServer
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/AuthenticationServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationServer.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.auth</FONT>
-<BR>
-Class AuthenticationServer</H2>
-<PRE>
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">java.lang.Object</A>
- |
- +--<B>at.gv.egovernment.moa.id.auth.AuthenticationServer</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>AuthenticationServer</B><DT>extends <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">Object</A></DL>
-
-<P>
-API for MOA ID Authentication Service.<br>
- <CODE>AuthenticationSession</CODE> is stored in a session store and retrieved
- by giving the session ID.
-<P>
-<HR>
-
-<P>
-<!-- ======== INNER CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#AuthenticationServer()">AuthenticationServer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for AuthenticationServer.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getAuthenticationData(java.lang.String)">getAuthenticationData</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;samlArtifact)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getInstance()">getInstance</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the single instance of <code>AuthenticationServer</code>.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">Object</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#clone()">clone</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#equals(java.lang.Object)">equals</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#finalize()">finalize</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#getClass()">getClass</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#hashCode()">hashCode</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notify()">notify</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notifyAll()">notifyAll</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#toString()">toString</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait()">wait</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long)">wait</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long, int)">wait</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="AuthenticationServer()"><!-- --></A><H3>
-AuthenticationServer</H3>
-<PRE>
-public <B>AuthenticationServer</B>()</PRE>
-<DL>
-<DD>Constructor for AuthenticationServer.</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getInstance()"><!-- --></A><H3>
-getInstance</H3>
-<PRE>
-public static <A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A> <B>getInstance</B>()</PRE>
-<DL>
-<DD>Returns the single instance of <code>AuthenticationServer</code>.<DD><DL>
-<DT><B>Returns:</B><DD>the single instance of <code>AuthenticationServer</code></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAuthenticationData(java.lang.String)"><!-- --></A><H3>
-getAuthenticationData</H3>
-<PRE>
-public <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A> <B>getAuthenticationData</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;samlArtifact)
- throws <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html">AuthenticationException</A></PRE>
-<DL>
-<DD>Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- The <code>AuthenticationData</code> is deleted from the store upon end of this call.<DD><DL>
-<DT><B>Returns:</B><DD><code>AuthenticationData</code></DL>
-</DD>
-</DL>
-<HR>
-
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/AuthenticationServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationServer.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
deleted file mode 100644
index ece0242d9..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Uses of Class at.gv.egovernment.moa.id.auth.AuthenticationServer
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationServer.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.auth.AuthenticationServer</B></H2>
-</CENTER>
-<A NAME="at.gv.egovernment.moa.id.auth"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A> in at.gv.egovernment.moa.id.auth</FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in at.gv.egovernment.moa.id.auth that return <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.<A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getInstance()">getInstance</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the single instance of <code>AuthenticationServer</code>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationServer.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
deleted file mode 100644
index 96ff7f4af..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Uses of Class at.gv.egovernment.moa.id.AuthenticationException
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationException.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.AuthenticationException</B></H2>
-</CENTER>
-<A NAME="at.gv.egovernment.moa.id.auth"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html">AuthenticationException</A> in at.gv.egovernment.moa.id.auth</FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in at.gv.egovernment.moa.id.auth that throw <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html">AuthenticationException</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#selectBKU(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)">selectBKU</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;authURL,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;target,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;oaURL,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;bkuSelectionTemplateURL,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;templateURL)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes request to select a BKU.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#startAuthentication(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)">startAuthentication</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;authURL,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;target,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;oaURL,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;templateURL,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;bkuURL,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;sessionID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes the beginning of an authentication session.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyIdentityLink(java.lang.String, java.lang.String)">verifyIdentityLink</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;sessionID,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;xmlInfoboxReadResponse)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the
- security layer implementation.<br>
-
- Validates given <code>&lt;InfoboxReadResponse&gt;</code>
- Parses identity link enclosed in <code>&lt;InfoboxReadResponse&gt;</code>
- Verifies identity link by calling the MOA SP component
- Checks certificate authority of identity link
- Stores identity link in the session
- Creates an authentication block to be signed by the user
- Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code>
- containg the authentication block, meant to be returned to the
- security layer implementation
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyAuthenticationBlock(java.lang.String, java.lang.String)">verifyAuthenticationBlock</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;sessionID,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;xmlCreateXMLSignatureReadResponse)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
- security layer implementation.<br>
-
- Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code>
- Parses <code>&lt;CreateXMLSignatureResponse&gt;</code> for error codes
- Parses authentication block enclosed in
- <code>&lt;CreateXMLSignatureResponse&gt;</code>
- Verifies authentication block by calling the MOA SP component
- Creates authentication data
- Creates a corresponding SAML artifact
- Stores authentication data in the authentication data store
- indexed by the SAML artifact
- Deletes authentication session
- Returns the SAML artifact, encoded BASE64
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getAuthenticationData(java.lang.String)">getAuthenticationData</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;samlArtifact)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;at.gv.egovernment.moa.id.auth.data.AuthenticationSession</CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getSession(java.lang.String)">getSession</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;id)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retrieves a session from the session store.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationException.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
deleted file mode 100644
index ec020b79d..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
+++ /dev/null
@@ -1,526 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Class OAConfiguration
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/OAConfiguration.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="OAConfiguration.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.config.proxy</FONT>
-<BR>
-Class OAConfiguration</H2>
-<PRE>
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">java.lang.Object</A>
- |
- +--<B>at.gv.egovernment.moa.id.config.proxy.OAConfiguration</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>OAConfiguration</B><DT>extends <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">Object</A></DL>
-
-<P>
-Holds configuration data concerning an online application for use by the MOA-ID Proxy component.
- These include the login type (stateful or stateless), the HTTP authentication type,
- and information needed to add authentication parameters or headers for a URL connection
- to the remote online application.
-<P>
-<DL>
-<DT><B>See Also: </B><DD><code>MOAIDConfiguration-1.1.xsd</code>, element <code>Configuration</code></DL>
-<HR>
-
-<P>
-<!-- ======== INNER CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#BASIC_AUTH">BASIC_AUTH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#HEADER_AUTH">HEADER_AUTH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATEFUL">LOGINTYPE_STATEFUL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATELESS">LOGINTYPE_STATELESS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#PARAM_AUTH">PARAM_AUTH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#OAConfiguration()">OAConfiguration</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getAuthType()">getAuthType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the authType.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getBasicAuthPasswordMapping()">getBasicAuthPasswordMapping</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the basicAuthPasswordMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getBasicAuthUserIDMapping()">getBasicAuthUserIDMapping</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the basicAuthUserIDMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getHeaderAuthMapping()">getHeaderAuthMapping</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the headerAuthMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getLoginType()">getLoginType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the loginType.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getParamAuthMapping()">getParamAuthMapping</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the paramAuthMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setAuthType(java.lang.String)">setAuthType</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;authLoginType)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the authType.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setBasicAuthPasswordMapping(java.lang.String)">setBasicAuthPasswordMapping</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;basicAuthPassword)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the basicAuthPasswordMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setBasicAuthUserIDMapping(java.lang.String)">setBasicAuthUserIDMapping</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;basicAuthUserID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the basicAuthUserIDMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setHeaderAuthMapping(java.util.HashMap)">setHeaderAuthMapping</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/HashMap.html">HashMap</A>&nbsp;headerAuth)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the headerAuthMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setLoginType(java.lang.String)">setLoginType</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;loginType)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the loginType.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setParamAuthMapping(java.util.HashMap)">setParamAuthMapping</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/HashMap.html">HashMap</A>&nbsp;paramAuth)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the paramAuthMapping.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">Object</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#clone()">clone</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#equals(java.lang.Object)">equals</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#finalize()">finalize</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#getClass()">getClass</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#hashCode()">hashCode</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notify()">notify</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notifyAll()">notifyAll</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#toString()">toString</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait()">wait</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long)">wait</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long, int)">wait</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="LOGINTYPE_STATEFUL"><!-- --></A><H3>
-LOGINTYPE_STATEFUL</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>LOGINTYPE_STATEFUL</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="LOGINTYPE_STATELESS"><!-- --></A><H3>
-LOGINTYPE_STATELESS</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>LOGINTYPE_STATELESS</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="BASIC_AUTH"><!-- --></A><H3>
-BASIC_AUTH</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>BASIC_AUTH</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="HEADER_AUTH"><!-- --></A><H3>
-HEADER_AUTH</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>HEADER_AUTH</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="PARAM_AUTH"><!-- --></A><H3>
-PARAM_AUTH</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>PARAM_AUTH</B></PRE>
-<DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="OAConfiguration()"><!-- --></A><H3>
-OAConfiguration</H3>
-<PRE>
-public <B>OAConfiguration</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getBasicAuthPasswordMapping()"><!-- --></A><H3>
-getBasicAuthPasswordMapping</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getBasicAuthPasswordMapping</B>()</PRE>
-<DL>
-<DD>Returns the basicAuthPasswordMapping.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getBasicAuthUserIDMapping()"><!-- --></A><H3>
-getBasicAuthUserIDMapping</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getBasicAuthUserIDMapping</B>()</PRE>
-<DL>
-<DD>Returns the basicAuthUserIDMapping.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getHeaderAuthMapping()"><!-- --></A><H3>
-getHeaderAuthMapping</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A> <B>getHeaderAuthMapping</B>()</PRE>
-<DL>
-<DD>Returns the headerAuthMapping.<DD><DL>
-<DT><B>Returns:</B><DD>HashMap</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLoginType()"><!-- --></A><H3>
-getLoginType</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getLoginType</B>()</PRE>
-<DL>
-<DD>Returns the loginType.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getParamAuthMapping()"><!-- --></A><H3>
-getParamAuthMapping</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A> <B>getParamAuthMapping</B>()</PRE>
-<DL>
-<DD>Returns the paramAuthMapping.<DD><DL>
-<DT><B>Returns:</B><DD>HashMap</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBasicAuthPasswordMapping(java.lang.String)"><!-- --></A><H3>
-setBasicAuthPasswordMapping</H3>
-<PRE>
-public void <B>setBasicAuthPasswordMapping</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;basicAuthPassword)</PRE>
-<DL>
-<DD>Sets the basicAuthPasswordMapping.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>basicAuthPasswordMapping</CODE> - The basicAuthPasswordMapping to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBasicAuthUserIDMapping(java.lang.String)"><!-- --></A><H3>
-setBasicAuthUserIDMapping</H3>
-<PRE>
-public void <B>setBasicAuthUserIDMapping</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;basicAuthUserID)</PRE>
-<DL>
-<DD>Sets the basicAuthUserIDMapping.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>basicAuthUserIDMapping</CODE> - The basicAuthUserIDMapping to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setHeaderAuthMapping(java.util.HashMap)"><!-- --></A><H3>
-setHeaderAuthMapping</H3>
-<PRE>
-public void <B>setHeaderAuthMapping</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/HashMap.html">HashMap</A>&nbsp;headerAuth)</PRE>
-<DL>
-<DD>Sets the headerAuthMapping.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>headerAuthMapping</CODE> - The headerAuthMapping to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setLoginType(java.lang.String)"><!-- --></A><H3>
-setLoginType</H3>
-<PRE>
-public void <B>setLoginType</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;loginType)</PRE>
-<DL>
-<DD>Sets the loginType.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>loginType</CODE> - The loginType to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setParamAuthMapping(java.util.HashMap)"><!-- --></A><H3>
-setParamAuthMapping</H3>
-<PRE>
-public void <B>setParamAuthMapping</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/HashMap.html">HashMap</A>&nbsp;paramAuth)</PRE>
-<DL>
-<DD>Sets the paramAuthMapping.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>paramAuthMapping</CODE> - The paramAuthMapping to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAuthType()"><!-- --></A><H3>
-getAuthType</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getAuthType</B>()</PRE>
-<DL>
-<DD>Returns the authType.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAuthType(java.lang.String)"><!-- --></A><H3>
-setAuthType</H3>
-<PRE>
-public void <B>setAuthType</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;authLoginType)</PRE>
-<DL>
-<DD>Sets the authType.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>authType</CODE> - The authType to set</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/OAConfiguration.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="OAConfiguration.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
deleted file mode 100644
index c41742f7a..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Uses of Class at.gv.egovernment.moa.id.config.proxy.OAConfiguration
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="OAConfiguration.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.config.proxy.OAConfiguration</B></H2>
-</CENTER>
-<A NAME="at.gv.egovernment.moa.id.proxy"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A> in at.gv.egovernment.moa.id.proxy</FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in at.gv.egovernment.moa.id.proxy with parameters of type <A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.<A HREF="../../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationHeaders</A></B>(<A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>&nbsp;oaConf,
- <A HREF="../../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>&nbsp;authData,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns authentication headers to be added to a URLConnection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.<A HREF="../../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationParameters</A></B>(<A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>&nbsp;oaConf,
- <A HREF="../../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>&nbsp;authData,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns request parameters to be added to a URLConnection.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="OAConfiguration.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
deleted file mode 100644
index 0a0906e25..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
+++ /dev/null
@@ -1,751 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Class AuthenticationData
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/AuthenticationData.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationData.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.data</FONT>
-<BR>
-Class AuthenticationData</H2>
-<PRE>
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">java.lang.Object</A>
- |
- +--<B>at.gv.egovernment.moa.id.data.AuthenticationData</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>AuthenticationData</B><DT>extends <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">Object</A></DL>
-
-<P>
-Encapsulates authentication data contained in a <code>&lt;saml:Assertion&gt;</code>.
-<P>
-<HR>
-
-<P>
-<!-- ======== INNER CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#AuthenticationData()">AuthenticationData</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for AuthenticationData.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getAssertionID()">getAssertionID</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the assertionID.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getDateOfBirth()">getDateOfBirth</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the dateOfBirth.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getFamilyName()">getFamilyName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the familyName.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getGivenName()">getGivenName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the givenName.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getIdentificationValue()">getIdentificationValue</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the identificationValue.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getIssueInstant()">getIssueInstant</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the issueInstant.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getIssuer()">getIssuer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the issuer.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getMajorVersion()">getMajorVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the majorVersion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getMinorVersion()">getMinorVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the minorVersion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getPublicAuthorityCode()">getPublicAuthorityCode</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the publicAuthorityCode.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getSamlAssertion()">getSamlAssertion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the samlAssertion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Date.html">Date</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getTimestamp()">getTimestamp</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the timestamp.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getVPK()">getVPK</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the vpk.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#isPublicAuthority()">isPublicAuthority</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the publicAuthority.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#isQualifiedCertificate()">isQualifiedCertificate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the qualifiedCertificate.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setAssertionID(java.lang.String)">setAssertionID</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;assertionID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the assertionID.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setDateOfBirth(java.lang.String)">setDateOfBirth</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;dateOfBirth)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the dateOfBirth.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setFamilyName(java.lang.String)">setFamilyName</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;gamilyName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the familyName.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setGivenName(java.lang.String)">setGivenName</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;givenName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the givenName.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setIdentificationValue(java.lang.String)">setIdentificationValue</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;identificationValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the identificationValue.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setIssueInstant(java.lang.String)">setIssueInstant</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;issueInstant)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the issueInstant.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setIssuer(java.lang.String)">setIssuer</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;issuer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the issuer.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setMajorVersion(int)">setMajorVersion</A></B>(int&nbsp;majorVersion)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the majorVersion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setMinorVersion(int)">setMinorVersion</A></B>(int&nbsp;minorVersion)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the minorVersion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setPublicAuthority(boolean)">setPublicAuthority</A></B>(boolean&nbsp;publicAuthority)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the publicAuthority.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setPublicAuthorityCode(java.lang.String)">setPublicAuthorityCode</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;publicAuthorityIdentification)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the publicAuthorityCode.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setQualifiedCertificate(boolean)">setQualifiedCertificate</A></B>(boolean&nbsp;qualifiedCertificate)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the qualifiedCertificate.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setSamlAssertion(java.lang.String)">setSamlAssertion</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;samlAssertion)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the samlAssertion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setVPK(java.lang.String)">setVPK</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;vpk)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the vpk.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html">Object</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#clone()">clone</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#equals(java.lang.Object)">equals</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#finalize()">finalize</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#getClass()">getClass</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#hashCode()">hashCode</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notify()">notify</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notifyAll()">notifyAll</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#toString()">toString</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait()">wait</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long)">wait</A>,
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long, int)">wait</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="AuthenticationData()"><!-- --></A><H3>
-AuthenticationData</H3>
-<PRE>
-public <B>AuthenticationData</B>()</PRE>
-<DL>
-<DD>Constructor for AuthenticationData.</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getMinorVersion()"><!-- --></A><H3>
-getMinorVersion</H3>
-<PRE>
-public int <B>getMinorVersion</B>()</PRE>
-<DL>
-<DD>Returns the minorVersion.<DD><DL>
-<DT><B>Returns:</B><DD>int</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isPublicAuthority()"><!-- --></A><H3>
-isPublicAuthority</H3>
-<PRE>
-public boolean <B>isPublicAuthority</B>()</PRE>
-<DL>
-<DD>Returns the publicAuthority.<DD><DL>
-<DT><B>Returns:</B><DD>boolean</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPublicAuthorityCode()"><!-- --></A><H3>
-getPublicAuthorityCode</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getPublicAuthorityCode</B>()</PRE>
-<DL>
-<DD>Returns the publicAuthorityCode.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isQualifiedCertificate()"><!-- --></A><H3>
-isQualifiedCertificate</H3>
-<PRE>
-public boolean <B>isQualifiedCertificate</B>()</PRE>
-<DL>
-<DD>Returns the qualifiedCertificate.<DD><DL>
-<DT><B>Returns:</B><DD>boolean</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVPK()"><!-- --></A><H3>
-getVPK</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getVPK</B>()</PRE>
-<DL>
-<DD>Returns the vpk.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMinorVersion(int)"><!-- --></A><H3>
-setMinorVersion</H3>
-<PRE>
-public void <B>setMinorVersion</B>(int&nbsp;minorVersion)</PRE>
-<DL>
-<DD>Sets the minorVersion.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>minorVersion</CODE> - The minorVersion to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPublicAuthority(boolean)"><!-- --></A><H3>
-setPublicAuthority</H3>
-<PRE>
-public void <B>setPublicAuthority</B>(boolean&nbsp;publicAuthority)</PRE>
-<DL>
-<DD>Sets the publicAuthority.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>publicAuthority</CODE> - The publicAuthority to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPublicAuthorityCode(java.lang.String)"><!-- --></A><H3>
-setPublicAuthorityCode</H3>
-<PRE>
-public void <B>setPublicAuthorityCode</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;publicAuthorityIdentification)</PRE>
-<DL>
-<DD>Sets the publicAuthorityCode.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>publicAuthorityCode</CODE> - The publicAuthorityCode to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setQualifiedCertificate(boolean)"><!-- --></A><H3>
-setQualifiedCertificate</H3>
-<PRE>
-public void <B>setQualifiedCertificate</B>(boolean&nbsp;qualifiedCertificate)</PRE>
-<DL>
-<DD>Sets the qualifiedCertificate.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>qualifiedCertificate</CODE> - The qualifiedCertificate to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setVPK(java.lang.String)"><!-- --></A><H3>
-setVPK</H3>
-<PRE>
-public void <B>setVPK</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;vpk)</PRE>
-<DL>
-<DD>Sets the vpk.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>vpk</CODE> - The vpk to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAssertionID()"><!-- --></A><H3>
-getAssertionID</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getAssertionID</B>()</PRE>
-<DL>
-<DD>Returns the assertionID.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDateOfBirth()"><!-- --></A><H3>
-getDateOfBirth</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getDateOfBirth</B>()</PRE>
-<DL>
-<DD>Returns the dateOfBirth.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFamilyName()"><!-- --></A><H3>
-getFamilyName</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getFamilyName</B>()</PRE>
-<DL>
-<DD>Returns the familyName.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getGivenName()"><!-- --></A><H3>
-getGivenName</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getGivenName</B>()</PRE>
-<DL>
-<DD>Returns the givenName.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIdentificationValue()"><!-- --></A><H3>
-getIdentificationValue</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getIdentificationValue</B>()</PRE>
-<DL>
-<DD>Returns the identificationValue.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIssueInstant()"><!-- --></A><H3>
-getIssueInstant</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getIssueInstant</B>()</PRE>
-<DL>
-<DD>Returns the issueInstant.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIssuer()"><!-- --></A><H3>
-getIssuer</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getIssuer</B>()</PRE>
-<DL>
-<DD>Returns the issuer.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMajorVersion()"><!-- --></A><H3>
-getMajorVersion</H3>
-<PRE>
-public int <B>getMajorVersion</B>()</PRE>
-<DL>
-<DD>Returns the majorVersion.<DD><DL>
-<DT><B>Returns:</B><DD>int</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAssertionID(java.lang.String)"><!-- --></A><H3>
-setAssertionID</H3>
-<PRE>
-public void <B>setAssertionID</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;assertionID)</PRE>
-<DL>
-<DD>Sets the assertionID.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>assertionID</CODE> - The assertionID to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDateOfBirth(java.lang.String)"><!-- --></A><H3>
-setDateOfBirth</H3>
-<PRE>
-public void <B>setDateOfBirth</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;dateOfBirth)</PRE>
-<DL>
-<DD>Sets the dateOfBirth.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>dateOfBirth</CODE> - The dateOfBirth to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setFamilyName(java.lang.String)"><!-- --></A><H3>
-setFamilyName</H3>
-<PRE>
-public void <B>setFamilyName</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;gamilyName)</PRE>
-<DL>
-<DD>Sets the familyName.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>familyName</CODE> - The familyName to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setGivenName(java.lang.String)"><!-- --></A><H3>
-setGivenName</H3>
-<PRE>
-public void <B>setGivenName</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;givenName)</PRE>
-<DL>
-<DD>Sets the givenName.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>givenName</CODE> - The givenName to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setIdentificationValue(java.lang.String)"><!-- --></A><H3>
-setIdentificationValue</H3>
-<PRE>
-public void <B>setIdentificationValue</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;identificationValue)</PRE>
-<DL>
-<DD>Sets the identificationValue.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>identificationValue</CODE> - The identificationValue to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setIssueInstant(java.lang.String)"><!-- --></A><H3>
-setIssueInstant</H3>
-<PRE>
-public void <B>setIssueInstant</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;issueInstant)</PRE>
-<DL>
-<DD>Sets the issueInstant.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>issueInstant</CODE> - The issueInstant to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setIssuer(java.lang.String)"><!-- --></A><H3>
-setIssuer</H3>
-<PRE>
-public void <B>setIssuer</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;issuer)</PRE>
-<DL>
-<DD>Sets the issuer.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>issuer</CODE> - The issuer to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMajorVersion(int)"><!-- --></A><H3>
-setMajorVersion</H3>
-<PRE>
-public void <B>setMajorVersion</B>(int&nbsp;majorVersion)</PRE>
-<DL>
-<DD>Sets the majorVersion.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>majorVersion</CODE> - The majorVersion to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSamlAssertion()"><!-- --></A><H3>
-getSamlAssertion</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>getSamlAssertion</B>()</PRE>
-<DL>
-<DD>Returns the samlAssertion.<DD><DL>
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSamlAssertion(java.lang.String)"><!-- --></A><H3>
-setSamlAssertion</H3>
-<PRE>
-public void <B>setSamlAssertion</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;samlAssertion)</PRE>
-<DL>
-<DD>Sets the samlAssertion.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>samlAssertion</CODE> - The samlAssertion to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTimestamp()"><!-- --></A><H3>
-getTimestamp</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Date.html">Date</A> <B>getTimestamp</B>()</PRE>
-<DL>
-<DD>Returns the timestamp.<DD><DL>
-<DT><B>Returns:</B><DD>Date</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/AuthenticationData.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationData.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
deleted file mode 100644
index 1822504b5..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Uses of Class at.gv.egovernment.moa.id.data.AuthenticationData
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationData.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.data.AuthenticationData</B></H2>
-</CENTER>
-<A NAME="at.gv.egovernment.moa.id.auth"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A> in at.gv.egovernment.moa.id.auth</FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in at.gv.egovernment.moa.id.auth that return <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.<A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getAuthenticationData(java.lang.String)">getAuthenticationData</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;samlArtifact)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- </TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.proxy"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A> in at.gv.egovernment.moa.id.proxy</FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in at.gv.egovernment.moa.id.proxy with parameters of type <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.<A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationHeaders</A></B>(<A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>&nbsp;oaConf,
- <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>&nbsp;authData,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns authentication headers to be added to a URLConnection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.<A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationParameters</A></B>(<A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>&nbsp;oaConf,
- <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>&nbsp;authData,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns request parameters to be added to a URLConnection.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="AuthenticationData.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
deleted file mode 100644
index 7d9bcef1d..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Interface ConnectionBuilder
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ConnectionBuilder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="ConnectionBuilder.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.proxy</FONT>
-<BR>
-Interface ConnectionBuilder</H2>
-<HR>
-<DL>
-<DT>public interface <B>ConnectionBuilder</B></DL>
-
-<P>
-Builder for <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html"><CODE>URLConnection</CODE></A> objects used to forward requests
- to the remote online application.
-<P>
-<HR>
-
-<P>
-<!-- ======== INNER CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/HttpURLConnection.html">HttpURLConnection</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html#buildConnection(javax.servlet.http.HttpServletRequest, java.lang.String, java.lang.String, javax.net.ssl.SSLSocketFactory)">buildConnection</A></B>(javax.servlet.http.HttpServletRequest&nbsp;request,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;publicURLPrefix,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;realURLPrefix,
- javax.net.ssl.SSLSocketFactory&nbsp;sslSocketFactory)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds an HttpURLConnection to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html"><CODE>URL</CODE></A> which is derived
- from an <CODE>HttpServletRequest</CODE> URL, by substitution of a
- public URL prefix for the real URL prefix.<br>
- The HttpURLConnection has been created by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html#openConnection()"><CODE>URL.openConnection()</CODE></A>, but
- it has not yet been connected to by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html#connect()"><CODE>URLConnection.connect()</CODE></A>.<br>
- The field settings of the HttpURLConnection are:
-
- <code>allowUserInteraction = false</code>
- <code>doInput = true</code>
- <code>doOutput = true</code>
- <code>requestMethod = request.getMethod()</code>
- <code>useCaches = false</code>
- </TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="buildConnection(javax.servlet.http.HttpServletRequest, java.lang.String, java.lang.String, javax.net.ssl.SSLSocketFactory)"><!-- --></A><H3>
-buildConnection</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/HttpURLConnection.html">HttpURLConnection</A> <B>buildConnection</B>(javax.servlet.http.HttpServletRequest&nbsp;request,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;publicURLPrefix,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;realURLPrefix,
- javax.net.ssl.SSLSocketFactory&nbsp;sslSocketFactory)
- throws <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/io/IOException.html">IOException</A></PRE>
-<DL>
-<DD>Builds an HttpURLConnection to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html"><CODE>URL</CODE></A> which is derived
- from an <CODE>HttpServletRequest</CODE> URL, by substitution of a
- public URL prefix for the real URL prefix.<br>
- The HttpURLConnection has been created by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html#openConnection()"><CODE>URL.openConnection()</CODE></A>, but
- it has not yet been connected to by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html#connect()"><CODE>URLConnection.connect()</CODE></A>.<br>
- The field settings of the HttpURLConnection are:
- <ul>
- <li><code>allowUserInteraction = false</code></li>
- <li><code>doInput = true</code></li>
- <li><code>doOutput = true</code></li>
- <li><code>requestMethod = request.getMethod()</code></li>
- <li><code>useCaches = false</code></li>
- </ul><DD><DL>
-<DT><B>Parameters:</B><DD><CODE>request</CODE> - the incoming request which shall be forwarded<DD><CODE>publicURLPrefix</CODE> - the public URL prefix to be substituted by the real URL prefix<DD><CODE>realURLPrefix</CODE> - the URL prefix to substitute the public URL prefix<DD><CODE>sslSocketFactory</CODE> - factory to be used for creating an SSL socket in case
- of a URL for scheme <code>"https:"</code>;
- <br>if <code>null</code>, the default SSL socket factory would be used<DT><B>Returns:</B><DD>a URLConnection created by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html#openConnection()"><CODE>URL.openConnection()</CODE></A>, connecting to
- the requested URL with <code>publicURLPrefix</code> substituted by <code>realURLPrefix</code><DT><B>Throws:</B><DD><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/io/IOException.html">IOException</A> - if an I/O exception occurs during opening the connection<DT><B>See Also: </B><DD><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html#openConnection()"><CODE>URL.openConnection()</CODE></A>,
-<CODE>com.sun.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ConnectionBuilder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="ConnectionBuilder.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
deleted file mode 100644
index 717ab1ee6..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
+++ /dev/null
@@ -1,364 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Interface LoginParameterResolver
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/LoginParameterResolver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="LoginParameterResolver.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.proxy</FONT>
-<BR>
-Interface LoginParameterResolver</H2>
-<HR>
-<DL>
-<DT>public interface <B>LoginParameterResolver</B></DL>
-
-<P>
-Determines authentication parameters and headers to be added to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html"><CODE>URLConnection</CODE></A>
- to the remote online application.
- Utilizes <A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html"><CODE>OAConfiguration</CODE></A> and <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html"><CODE>AuthenticationData</CODE></A>.
-<P>
-<HR>
-
-<P>
-<!-- ======== INNER CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOABKZ">MOABKZ</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOADateOfBirth">MOADateOfBirth</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAFamilyName">MOAFamilyName</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAGivenName">MOAGivenName</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constants used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code>,
- naming predicates used by the <code>LoginParameterResolver</code>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAIPAddress">MOAIPAddress</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAPublicAuthority">MOAPublicAuthority</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAQualifiedCertificate">MOAQualifiedCertificate</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAVPK">MOAVPK</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAZMRZahl">MOAZMRZahl</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationHeaders</A></B>(<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>&nbsp;oaConf,
- <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>&nbsp;authData,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns authentication headers to be added to a URLConnection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationParameters</A></B>(<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>&nbsp;oaConf,
- <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>&nbsp;authData,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns request parameters to be added to a URLConnection.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="MOAGivenName"><!-- --></A><H3>
-MOAGivenName</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>MOAGivenName</B></PRE>
-<DL>
-<DD>Constants used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code>,
- naming predicates used by the <code>LoginParameterResolver</code>.</DL>
-<HR>
-
-<A NAME="MOAFamilyName"><!-- --></A><H3>
-MOAFamilyName</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>MOAFamilyName</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="MOADateOfBirth"><!-- --></A><H3>
-MOADateOfBirth</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>MOADateOfBirth</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="MOAVPK"><!-- --></A><H3>
-MOAVPK</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>MOAVPK</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="MOAPublicAuthority"><!-- --></A><H3>
-MOAPublicAuthority</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>MOAPublicAuthority</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="MOABKZ"><!-- --></A><H3>
-MOABKZ</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>MOABKZ</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="MOAQualifiedCertificate"><!-- --></A><H3>
-MOAQualifiedCertificate</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>MOAQualifiedCertificate</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="MOAZMRZahl"><!-- --></A><H3>
-MOAZMRZahl</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>MOAZMRZahl</B></PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="MOAIPAddress"><!-- --></A><H3>
-MOAIPAddress</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A> <B>MOAIPAddress</B></PRE>
-<DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)"><!-- --></A><H3>
-getAuthenticationHeaders</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A> <B>getAuthenticationHeaders</B>(<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>&nbsp;oaConf,
- <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>&nbsp;authData,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;clientIPAddress)</PRE>
-<DL>
-<DD>Returns authentication headers to be added to a URLConnection.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>authConf</CODE> - configuration data<DD><CODE>authData</CODE> - authentication data<DD><CODE>clientIPAddress</CODE> - client IP address<DT><B>Returns:</B><DD>A map, the keys being header names and values being corresponding header values.
- <br>In case of authentication type <code>"basic-auth"</code>, header fields
- <code>username</code> and <code>password</code>.
- <br>In case of authentication type <code>"header-auth"</code>, header fields
- derived from parameter mapping and authentication data provided.
- <br>Otherwise, an empty map.</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)"><!-- --></A><H3>
-getAuthenticationParameters</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html">Map</A> <B>getAuthenticationParameters</B>(<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>&nbsp;oaConf,
- <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>&nbsp;authData,
- <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html">String</A>&nbsp;clientIPAddress)</PRE>
-<DL>
-<DD>Returns request parameters to be added to a URLConnection.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>authConf</CODE> - configuration data<DD><CODE>authData</CODE> - authentication data<DD><CODE>clientIPAddress</CODE> - client IP address<DT><B>Returns:</B><DD>A map, the keys being parameter names and values being corresponding parameter values.
- <br>In case of authentication type <code>"param-auth"</code>, parameters
- derived from parameter mapping and authentication data provided.
- <br>Otherwise, an empty map.</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/LoginParameterResolver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="LoginParameterResolver.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY: &nbsp;INNER&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
deleted file mode 100644
index c40b34e9f..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Uses of Interface at.gv.egovernment.moa.id.proxy.ConnectionBuilder
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="ConnectionBuilder.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>at.gv.egovernment.moa.id.proxy.ConnectionBuilder</B></H2>
-</CENTER>
-No usage of at.gv.egovernment.moa.id.proxy.ConnectionBuilder
-<P>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="ConnectionBuilder.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html b/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
deleted file mode 100644
index 9bad43a2a..000000000
--- a/id.server/doc/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Uses of Interface at.gv.egovernment.moa.id.proxy.LoginParameterResolver
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="LoginParameterResolver.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>at.gv.egovernment.moa.id.proxy.LoginParameterResolver</B></H2>
-</CENTER>
-No usage of at.gv.egovernment.moa.id.proxy.LoginParameterResolver
-<P>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="../../../../../../../index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="LoginParameterResolver.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/deprecated-list.html b/id.server/doc/api-doc/deprecated-list.html
deleted file mode 100644
index 78f7d881f..000000000
--- a/id.server/doc/api-doc/deprecated-list.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Deprecated List
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="deprecated-list.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Deprecated API</B></H2>
-</CENTER>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="deprecated-list.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/help-doc.html b/id.server/doc/api-doc/help-doc.html
deleted file mode 100644
index 79438069d..000000000
--- a/id.server/doc/api-doc/help-doc.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: API Help
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="help-doc.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H1>
-How This API Document Is Organized</H1>
-</CENTER>
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
-Package</H3>
-<BLOCKQUOTE>
-
-<P>
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:<UL>
-<LI>Interfaces (italic)<LI>Classes<LI>Exceptions<LI>Errors</UL>
-</BLOCKQUOTE>
-<H3>
-Class/Interface</H3>
-<BLOCKQUOTE>
-
-<P>
-Each class, interface, inner class and inner interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:<UL>
-<LI>Class inheritance diagram<LI>Direct Subclasses<LI>All Known Subinterfaces<LI>All Known Implementing Classes<LI>Class/interface declaration<LI>Class/interface description
-<P>
-<LI>Inner Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
-<P>
-<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
-<H3>
-Use</H3>
-<BLOCKQUOTE>
-Each documented package, class and interface has its own Use page. This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.</BLOCKQUOTE>
-<H3>
-Tree (Class Hierarchy)</H3>
-<BLOCKQUOTE>
-There is a <A HREF="overview-tree.html">Class Hierarchy</A> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.<UL>
-<LI>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.<LI>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</UL>
-</BLOCKQUOTE>
-<H3>
-Deprecated API</H3>
-<BLOCKQUOTE>
-The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE>
-<H3>
-Index</H3>
-<BLOCKQUOTE>
-The <A HREF="index-all.html">Index</A> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</BLOCKQUOTE>
-<H3>
-Prev/Next</H3>
-These links take you to the next or previous class, interface, package, or related page.<H3>
-Frames/No Frames</H3>
-These links show and hide the HTML frames. All pages are available with or without frames.
-<P>
-<H3>
-Serialized Form</H3>
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-<P>
-<FONT SIZE="-1">
-<EM>
-This help file applies to API documentation generated using the standard doclet. </EM>
-</FONT>
-<BR>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="help-doc.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/index-all.html b/id.server/doc/api-doc/index-all.html
deleted file mode 100644
index a66b0252e..000000000
--- a/id.server/doc/api-doc/index-all.html
+++ /dev/null
@@ -1,422 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Index
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-all.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_G_">G</A> <A HREF="#_H_">H</A> <A HREF="#_I_">I</A> <A HREF="#_L_">L</A> <A HREF="#_M_">M</A> <A HREF="#_O_">O</A> <A HREF="#_P_">P</A> <A HREF="#_R_">R</A> <A HREF="#_S_">S</A> <A HREF="#_V_">V</A> <HR>
-<A NAME="_A_"><!-- --></A><H2>
-<B>A</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html"><B>AuthenticationData</B></A> - class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>.<DD>Encapsulates authentication data contained in a <code>&lt;saml:Assertion&gt;</code>.<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#AuthenticationData()"><B>AuthenticationData()</B></A> -
-Constructor for class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Constructor for AuthenticationData.
-<DT><A HREF="at/gv/egovernment/moa/id/AuthenticationException.html"><B>AuthenticationException</B></A> - class at.gv.egovernment.moa.id.<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html">AuthenticationException</A>.<DD>Exception thrown during handling of AuthenticationSession<DT><A HREF="at/gv/egovernment/moa/id/AuthenticationException.html#AuthenticationException(java.lang.String, java.lang.Object[])"><B>AuthenticationException(String, Object[])</B></A> -
-Constructor for class at.gv.egovernment.moa.id.<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html">AuthenticationException</A>
-<DD>Constructor for AuthenticationException.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html"><B>AuthenticationServer</B></A> - class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>.<DD>API for MOA ID Authentication Service.<br>
- <CODE>AuthenticationSession</CODE> is stored in a session store and retrieved
- by giving the session ID.<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#AuthenticationServer()"><B>AuthenticationServer()</B></A> -
-Constructor for class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Constructor for AuthenticationServer.
-</DL>
-<HR>
-<A NAME="_B_"><!-- --></A><H2>
-<B>B</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#BASIC_AUTH"><B>BASIC_AUTH</B></A> -
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>&nbsp;
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html#buildConnection(javax.servlet.http.HttpServletRequest, java.lang.String, java.lang.String, javax.net.ssl.SSLSocketFactory)"><B>buildConnection(HttpServletRequest, String, String, SSLSocketFactory)</B></A> -
-Method in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html">ConnectionBuilder</A>
-<DD>Builds an HttpURLConnection to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html"><CODE>URL</CODE></A> which is derived
- from an <CODE>HttpServletRequest</CODE> URL, by substitution of a
- public URL prefix for the real URL prefix.<br>
- The HttpURLConnection has been created by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html#openConnection()"><CODE>URL.openConnection()</CODE></A>, but
- it has not yet been connected to by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html#connect()"><CODE>URLConnection.connect()</CODE></A>.<br>
- The field settings of the HttpURLConnection are:
-
- <code>allowUserInteraction = false</code>
- <code>doInput = true</code>
- <code>doOutput = true</code>
- <code>requestMethod = request.getMethod()</code>
- <code>useCaches = false</code>
-
-</DL>
-<HR>
-<A NAME="_C_"><!-- --></A><H2>
-<B>C</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#cleanup()"><B>cleanup()</B></A> -
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Cleans up expired session and authentication data stores.
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html"><B>ConnectionBuilder</B></A> - interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html">ConnectionBuilder</A>.<DD>Builder for <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html"><CODE>URLConnection</CODE></A> objects used to forward requests
- to the remote online application.</DL>
-<HR>
-<A NAME="_G_"><!-- --></A><H2>
-<B>G</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getAssertionID()"><B>getAssertionID()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the assertionID.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getAuthenticationData(java.lang.String)"><B>getAuthenticationData(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
-
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)"><B>getAuthenticationHeaders(OAConfiguration, AuthenticationData, String)</B></A> -
-Method in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>Returns authentication headers to be added to a URLConnection.
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)"><B>getAuthenticationParameters(OAConfiguration, AuthenticationData, String)</B></A> -
-Method in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>Returns request parameters to be added to a URLConnection.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getAuthType()"><B>getAuthType()</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Returns the authType.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getBasicAuthPasswordMapping()"><B>getBasicAuthPasswordMapping()</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Returns the basicAuthPasswordMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getBasicAuthUserIDMapping()"><B>getBasicAuthUserIDMapping()</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Returns the basicAuthUserIDMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getDateOfBirth()"><B>getDateOfBirth()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the dateOfBirth.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getFamilyName()"><B>getFamilyName()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the familyName.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getGivenName()"><B>getGivenName()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the givenName.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getHeaderAuthMapping()"><B>getHeaderAuthMapping()</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Returns the headerAuthMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getIdentificationValue()"><B>getIdentificationValue()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the identificationValue.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getInstance()"><B>getInstance()</B></A> -
-Static method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Returns the single instance of <code>AuthenticationServer</code>.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getIssueInstant()"><B>getIssueInstant()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the issueInstant.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getIssuer()"><B>getIssuer()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the issuer.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getLoginType()"><B>getLoginType()</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Returns the loginType.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getMajorVersion()"><B>getMajorVersion()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the majorVersion.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getMinorVersion()"><B>getMinorVersion()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the minorVersion.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getParamAuthMapping()"><B>getParamAuthMapping()</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Returns the paramAuthMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getPublicAuthorityCode()"><B>getPublicAuthorityCode()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the publicAuthorityCode.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getSamlAssertion()"><B>getSamlAssertion()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the samlAssertion.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getSession(java.lang.String)"><B>getSession(String)</B></A> -
-Static method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Retrieves a session from the session store.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getTimestamp()"><B>getTimestamp()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the timestamp.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getVPK()"><B>getVPK()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the vpk.
-</DL>
-<HR>
-<A NAME="_H_"><!-- --></A><H2>
-<B>H</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#HEADER_AUTH"><B>HEADER_AUTH</B></A> -
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>&nbsp;
-</DL>
-<HR>
-<A NAME="_I_"><!-- --></A><H2>
-<B>I</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#isPublicAuthority()"><B>isPublicAuthority()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the publicAuthority.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#isQualifiedCertificate()"><B>isQualifiedCertificate()</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Returns the qualifiedCertificate.
-</DL>
-<HR>
-<A NAME="_L_"><!-- --></A><H2>
-<B>L</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html"><B>LoginParameterResolver</B></A> - interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>.<DD>Determines authentication parameters and headers to be added to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html"><CODE>URLConnection</CODE></A>
- to the remote online application.
- <DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATEFUL"><B>LOGINTYPE_STATEFUL</B></A> -
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>&nbsp;
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATELESS"><B>LOGINTYPE_STATELESS</B></A> -
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>&nbsp;
-</DL>
-<HR>
-<A NAME="_M_"><!-- --></A><H2>
-<B>M</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOABKZ"><B>MOABKZ</B></A> -
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>&nbsp;
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOADateOfBirth"><B>MOADateOfBirth</B></A> -
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>&nbsp;
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAFamilyName"><B>MOAFamilyName</B></A> -
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>&nbsp;
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAGivenName"><B>MOAGivenName</B></A> -
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>Constants used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code>,
- naming predicates used by the <code>LoginParameterResolver</code>.
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAIPAddress"><B>MOAIPAddress</B></A> -
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>&nbsp;
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAPublicAuthority"><B>MOAPublicAuthority</B></A> -
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>&nbsp;
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAQualifiedCertificate"><B>MOAQualifiedCertificate</B></A> -
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>&nbsp;
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAVPK"><B>MOAVPK</B></A> -
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>&nbsp;
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAZMRZahl"><B>MOAZMRZahl</B></A> -
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">LoginParameterResolver</A>
-<DD>&nbsp;
-</DL>
-<HR>
-<A NAME="_O_"><!-- --></A><H2>
-<B>O</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html"><B>OAConfiguration</B></A> - class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>.<DD>Holds configuration data concerning an online application for use by the MOA-ID Proxy component.
- <DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#OAConfiguration()"><B>OAConfiguration()</B></A> -
-Constructor for class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>&nbsp;
-</DL>
-<HR>
-<A NAME="_P_"><!-- --></A><H2>
-<B>P</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#PARAM_AUTH"><B>PARAM_AUTH</B></A> -
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>&nbsp;
-</DL>
-<HR>
-<A NAME="_R_"><!-- --></A><H2>
-<B>R</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#REQ_START_AUTHENTICATION"><B>REQ_START_AUTHENTICATION</B></A> -
-Static variable in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Request name <CODE>at.gv.egovernment.moa.id.auth.servlet.StartAuthenticationServlet</CODE> is mapped to
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#REQ_VERIFY_AUTH_BLOCK"><B>REQ_VERIFY_AUTH_BLOCK</B></A> -
-Static variable in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Request name <CODE>at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet</CODE> is mapped to
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#REQ_VERIFY_IDENTITY_LINK"><B>REQ_VERIFY_IDENTITY_LINK</B></A> -
-Static variable in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Request name <CODE>at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet</CODE> is mapped to
-</DL>
-<HR>
-<A NAME="_S_"><!-- --></A><H2>
-<B>S</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#selectBKU(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)"><B>selectBKU(String, String, String, String, String)</B></A> -
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Processes request to select a BKU.
-
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setAssertionID(java.lang.String)"><B>setAssertionID(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the assertionID.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setAuthType(java.lang.String)"><B>setAuthType(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Sets the authType.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setBasicAuthPasswordMapping(java.lang.String)"><B>setBasicAuthPasswordMapping(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Sets the basicAuthPasswordMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setBasicAuthUserIDMapping(java.lang.String)"><B>setBasicAuthUserIDMapping(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Sets the basicAuthUserIDMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setDateOfBirth(java.lang.String)"><B>setDateOfBirth(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the dateOfBirth.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setFamilyName(java.lang.String)"><B>setFamilyName(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the familyName.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setGivenName(java.lang.String)"><B>setGivenName(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the givenName.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setHeaderAuthMapping(java.util.HashMap)"><B>setHeaderAuthMapping(HashMap)</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Sets the headerAuthMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setIdentificationValue(java.lang.String)"><B>setIdentificationValue(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the identificationValue.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setIssueInstant(java.lang.String)"><B>setIssueInstant(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the issueInstant.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setIssuer(java.lang.String)"><B>setIssuer(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the issuer.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setLoginType(java.lang.String)"><B>setLoginType(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Sets the loginType.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setMajorVersion(int)"><B>setMajorVersion(int)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the majorVersion.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setMinorVersion(int)"><B>setMinorVersion(int)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the minorVersion.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setParamAuthMapping(java.util.HashMap)"><B>setParamAuthMapping(HashMap)</B></A> -
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html">OAConfiguration</A>
-<DD>Sets the paramAuthMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setPublicAuthority(boolean)"><B>setPublicAuthority(boolean)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the publicAuthority.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setPublicAuthorityCode(java.lang.String)"><B>setPublicAuthorityCode(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the publicAuthorityCode.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setQualifiedCertificate(boolean)"><B>setQualifiedCertificate(boolean)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the qualifiedCertificate.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setSamlAssertion(java.lang.String)"><B>setSamlAssertion(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the samlAssertion.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#setSecondsAuthDataTimeOut(long)"><B>setSecondsAuthDataTimeOut(long)</B></A> -
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Sets the authDataTimeOut.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#setSecondsSessionTimeOut(long)"><B>setSecondsSessionTimeOut(long)</B></A> -
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Sets the sessionTimeOut.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setVPK(java.lang.String)"><B>setVPK(String)</B></A> -
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">AuthenticationData</A>
-<DD>Sets the vpk.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#startAuthentication(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)"><B>startAuthentication(String, String, String, String, String, String)</B></A> -
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Processes the beginning of an authentication session.
-
-</DL>
-<HR>
-<A NAME="_V_"><!-- --></A><H2>
-<B>V</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyAuthenticationBlock(java.lang.String, java.lang.String)"><B>verifyAuthenticationBlock(String, String)</B></A> -
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
- security layer implementation.<br>
-
- Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code>
- Parses <code>&lt;CreateXMLSignatureResponse&gt;</code> for error codes
- Parses authentication block enclosed in
- <code>&lt;CreateXMLSignatureResponse&gt;</code>
- Verifies authentication block by calling the MOA SP component
- Creates authentication data
- Creates a corresponding SAML artifact
- Stores authentication data in the authentication data store
- indexed by the SAML artifact
- Deletes authentication session
- Returns the SAML artifact, encoded BASE64
-
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyIdentityLink(java.lang.String, java.lang.String)"><B>verifyIdentityLink(String, String)</B></A> -
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html">AuthenticationServer</A>
-<DD>Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the
- security layer implementation.<br>
-
- Validates given <code>&lt;InfoboxReadResponse&gt;</code>
- Parses identity link enclosed in <code>&lt;InfoboxReadResponse&gt;</code>
- Verifies identity link by calling the MOA SP component
- Checks certificate authority of identity link
- Stores identity link in the session
- Creates an authentication block to be signed by the user
- Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code>
- containg the authentication block, meant to be returned to the
- security layer implementation
-
-</DL>
-<HR>
-<A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_G_">G</A> <A HREF="#_H_">H</A> <A HREF="#_I_">I</A> <A HREF="#_L_">L</A> <A HREF="#_M_">M</A> <A HREF="#_O_">O</A> <A HREF="#_P_">P</A> <A HREF="#_R_">R</A> <A HREF="#_S_">S</A> <A HREF="#_V_">V</A>
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="index-all.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/index.html b/id.server/doc/api-doc/index.html
deleted file mode 100644
index 7eb5deff7..000000000
--- a/id.server/doc/api-doc/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd>
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003-->
-<TITLE>
-MOA ID API
-</TITLE>
-</HEAD>
-<FRAMESET cols="20%,80%">
-<FRAME src="allclasses-frame.html" name="packageFrame">
-<FRAME src="at/gv/egovernment/moa/id/data/AuthenticationData.html" name="classFrame">
-</FRAMESET>
-<NOFRAMES>
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-<BR>
-Link to <A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">Non-frame version.</A></NOFRAMES>
-</HTML>
diff --git a/id.server/doc/api-doc/overview-tree.html b/id.server/doc/api-doc/overview-tree.html
deleted file mode 100644
index bcd54df75..000000000
--- a/id.server/doc/api-doc/overview-tree.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API: Class Hierarchy
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="overview-tree.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For All Packages</H2>
-</CENTER>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html"><B>Object</B></A><UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html"><B>AuthenticationData</B></A><LI TYPE="circle">class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html"><B>AuthenticationServer</B></A><LI TYPE="circle">class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html"><B>OAConfiguration</B></A></UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html"><B>AuthenticationException</B></A></UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html"><B>ConnectionBuilder</B></A><LI TYPE="circle">interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html"><B>LoginParameterResolver</B></A></UL>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="overview-tree.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/package-list b/id.server/doc/api-doc/package-list
deleted file mode 100644
index e69de29bb..000000000
--- a/id.server/doc/api-doc/package-list
+++ /dev/null
diff --git a/id.server/doc/api-doc/packages.html b/id.server/doc/api-doc/packages.html
deleted file mode 100644
index f5dd01736..000000000
--- a/id.server/doc/api-doc/packages.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-MOA ID API
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<BR>
-
-<BR>
-
-<BR>
-<CENTER>
-The front page has been renamed.Please see:
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="index.html">Frame version</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html">Non-frame version.</A></CENTER>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/serialized-form.html b/id.server/doc/api-doc/serialized-form.html
deleted file mode 100644
index 09311e7c2..000000000
--- a/id.server/doc/api-doc/serialized-form.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri May 16 09:59:18 CEST 2003 -->
-<TITLE>
-Serialized Form
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="serialized-form.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H1>
-Serialized Form</H1>
-</CENTER>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
- <TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
- </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
- <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A> &nbsp;
-&nbsp;<A HREF="serialized-form.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id.server/doc/api-doc/stylesheet.css b/id.server/doc/api-doc/stylesheet.css
deleted file mode 100644
index 74a3534ae..000000000
--- a/id.server/doc/api-doc/stylesheet.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Table colors */
-#TableHeadingColor { background: #CCCCFF } /* Dark mauve */
-#TableSubHeadingColor { background: #EEEEFF } /* Light mauve */
-#TableRowColor { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-#FrameTitleFont { font-size: normal; font-family: normal }
-#FrameHeadingFont { font-size: normal; font-family: normal }
-#FrameItemFont { font-size: normal; font-family: normal }
-
-/* Example of smaller, sans-serif font in frames */
-/* #FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */
-
-/* Navigation bar fonts and colors */
-#NavBarCell1 { background-color:#EEEEFF;}/* Light mauve */
-#NavBarCell1Rev { background-color:#00008B;}/* Dark Blue */
-#NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-#NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-#NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-#NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-
diff --git a/id.server/doc/bku-auswahl.20030408.pdf b/id.server/doc/bku-auswahl.20030408.pdf
deleted file mode 100644
index 39efe315f..000000000
--- a/id.server/doc/bku-auswahl.20030408.pdf
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/cs-sstc-schema-assertion-01.xsd b/id.server/doc/cs-sstc-schema-assertion-01.xsd
deleted file mode 100644
index 8bc5af147..000000000
--- a/id.server/doc/cs-sstc-schema-assertion-01.xsd
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Phill Hallam-Baker (VeriSign Inc.) -->
-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
- <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
- <annotation>
- <documentation>
- Document identifier: cs-sstc-schema-assertion-01
- Location: http://www.oasis-open.org/committees/security/docs/
- </documentation>
- </annotation>
- <simpleType name="IDType">
- <restriction base="string"/>
- </simpleType>
- <simpleType name="IDReferenceType">
- <restriction base="string"/>
- </simpleType>
- <simpleType name="DecisionType">
- <restriction base="string">
- <enumeration value="Permit"/>
- <enumeration value="Deny"/>
- <enumeration value="Indeterminate"/>
- </restriction>
- </simpleType>
- <element name="AssertionIDReference" type="saml:IDReferenceType"/>
- <element name="Assertion" type="saml:AssertionType"/>
- <complexType name="AssertionType">
- <sequence>
- <element ref="saml:Conditions" minOccurs="0"/>
- <element ref="saml:Advice" minOccurs="0"/>
- <choice maxOccurs="unbounded">
- <element ref="saml:Statement"/>
- <element ref="saml:SubjectStatement"/>
- <element ref="saml:AuthenticationStatement"/>
- <element ref="saml:AuthorizationDecisionStatement"/>
- <element ref="saml:AttributeStatement"/>
- </choice>
- <element ref="ds:Signature" minOccurs="0"/>
- </sequence>
- <attribute name="MajorVersion" type="integer" use="required"/>
- <attribute name="MinorVersion" type="integer" use="required"/>
- <attribute name="AssertionID" type="saml:IDType" use="required"/>
- <attribute name="Issuer" type="string" use="required"/>
- <attribute name="IssueInstant" type="dateTime" use="required"/>
- </complexType>
- <element name="Conditions" type="saml:ConditionsType"/>
- <complexType name="ConditionsType">
- <choice minOccurs="0" maxOccurs="unbounded">
- <element ref="saml:AudienceRestrictionCondition"/>
- <element ref="saml:Condition"/>
- </choice>
- <attribute name="NotBefore" type="dateTime" use="optional"/>
- <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
- </complexType>
- <element name="Condition" type="saml:ConditionAbstractType"/>
- <complexType name="ConditionAbstractType" abstract="true"/>
- <element name="AudienceRestrictionCondition" type="saml:AudienceRestrictionConditionType"/>
- <complexType name="AudienceRestrictionConditionType">
- <complexContent>
- <extension base="saml:ConditionAbstractType">
- <sequence>
- <element ref="saml:Audience" maxOccurs="unbounded"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name="Audience" type="anyURI"/>
- <element name="Advice" type="saml:AdviceType"/>
- <complexType name="AdviceType">
- <choice minOccurs="0" maxOccurs="unbounded">
- <element ref="saml:AssertionIDReference"/>
- <element ref="saml:Assertion"/>
- <any namespace="##other" processContents="lax"/>
- </choice>
- </complexType>
- <element name="Statement" type="saml:StatementAbstractType"/>
- <complexType name="StatementAbstractType" abstract="true"/>
- <element name="SubjectStatement" type="saml:SubjectStatementAbstractType"/>
- <complexType name="SubjectStatementAbstractType" abstract="true">
- <complexContent>
- <extension base="saml:StatementAbstractType">
- <sequence>
- <element ref="saml:Subject"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name="Subject" type="saml:SubjectType"/>
- <complexType name="SubjectType">
- <choice>
- <sequence>
- <element ref="saml:NameIdentifier"/>
- <element ref="saml:SubjectConfirmation" minOccurs="0"/>
- </sequence>
- <element ref="saml:SubjectConfirmation"/>
- </choice>
- </complexType>
- <element name="NameIdentifier" type="saml:NameIdentifierType"/>
- <complexType name="NameIdentifierType">
- <simpleContent>
- <extension base="string">
- <attribute name="NameQualifier" type="string" use="optional"/>
- <attribute name="Format" type="anyURI" use="optional"/>
- </extension>
- </simpleContent>
- </complexType>
- <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
- <complexType name="SubjectConfirmationType">
- <sequence>
- <element ref="saml:ConfirmationMethod" maxOccurs="unbounded"/>
- <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
- <element ref="ds:KeyInfo" minOccurs="0"/>
- </sequence>
- </complexType>
- <element name="SubjectConfirmationData" type="anyType"/>
- <element name="ConfirmationMethod" type="anyURI"/>
- <element name="AuthenticationStatement" type="saml:AuthenticationStatementType"/>
- <complexType name="AuthenticationStatementType">
- <complexContent>
- <extension base="saml:SubjectStatementAbstractType">
- <sequence>
- <element ref="saml:SubjectLocality" minOccurs="0"/>
- <element ref="saml:AuthorityBinding" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="AuthenticationMethod" type="anyURI" use="required"/>
- <attribute name="AuthenticationInstant" type="dateTime" use="required"/>
- </extension>
- </complexContent>
- </complexType>
- <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
- <complexType name="SubjectLocalityType">
- <attribute name="IPAddress" type="string" use="optional"/>
- <attribute name="DNSAddress" type="string" use="optional"/>
- </complexType>
- <element name="AuthorityBinding" type="saml:AuthorityBindingType"/>
- <complexType name="AuthorityBindingType">
- <attribute name="AuthorityKind" type="QName" use="required"/>
- <attribute name="Location" type="anyURI" use="required"/>
- <attribute name="Binding" type="anyURI" use="required"/>
- </complexType>
- <element name="AuthorizationDecisionStatement" type="saml:AuthorizationDecisionStatementType"/>
- <complexType name="AuthorizationDecisionStatementType">
- <complexContent>
- <extension base="saml:SubjectStatementAbstractType">
- <sequence>
- <element ref="saml:Action" maxOccurs="unbounded"/>
- <element ref="saml:Evidence" minOccurs="0"/>
- </sequence>
- <attribute name="Resource" type="anyURI" use="required"/>
- <attribute name="Decision" type="saml:DecisionType" use="required"/>
- </extension>
- </complexContent>
- </complexType>
- <element name="Action" type="saml:ActionType"/>
- <complexType name="ActionType">
- <simpleContent>
- <extension base="string">
- <attribute name="Namespace" type="anyURI"/>
- </extension>
- </simpleContent>
- </complexType>
- <element name="Evidence" type="saml:EvidenceType"/>
- <complexType name="EvidenceType">
- <choice maxOccurs="unbounded">
- <element ref="saml:AssertionIDReference"/>
- <element ref="saml:Assertion"/>
- </choice>
- </complexType>
- <element name="AttributeStatement" type="saml:AttributeStatementType"/>
- <complexType name="AttributeStatementType">
- <complexContent>
- <extension base="saml:SubjectStatementAbstractType">
- <sequence>
- <element ref="saml:Attribute" maxOccurs="unbounded"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name="AttributeDesignator" type="saml:AttributeDesignatorType"/>
- <complexType name="AttributeDesignatorType">
- <attribute name="AttributeName" type="string" use="required"/>
- <attribute name="AttributeNamespace" type="anyURI" use="required"/>
- </complexType>
- <element name="Attribute" type="saml:AttributeType"/>
- <complexType name="AttributeType">
- <complexContent>
- <extension base="saml:AttributeDesignatorType">
- <sequence>
- <element ref="saml:AttributeValue" maxOccurs="unbounded"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name="AttributeValue" type="anyType"/>
-</schema>
diff --git a/id.server/doc/cs-sstc-schema-protocol-01.xsd b/id.server/doc/cs-sstc-schema-protocol-01.xsd
deleted file mode 100644
index ecad05b0f..000000000
--- a/id.server/doc/cs-sstc-schema-protocol-01.xsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.2 U (http://www.xmlspy.com) by Phillip Hallam-Baker (Phillip Hallam-Baker) -->
-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
- <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-01.xsd"/>
- <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
- <annotation>
- <documentation>
- Document identifier: cs-sstc-schema-protocol-01
- Location: http://www.oasis-open.org/committees/security/docs/
- </documentation>
- </annotation>
- <complexType name="RequestAbstractType" abstract="true">
- <sequence>
- <element ref="samlp:RespondWith" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="ds:Signature" minOccurs="0"/>
- </sequence>
- <attribute name="RequestID" type="saml:IDType" use="required"/>
- <attribute name="MajorVersion" type="integer" use="required"/>
- <attribute name="MinorVersion" type="integer" use="required"/>
- <attribute name="IssueInstant" type="dateTime" use="required"/>
- </complexType>
- <element name="RespondWith" type="QName"/>
- <element name="Request" type="samlp:RequestType"/>
- <complexType name="RequestType">
- <complexContent>
- <extension base="samlp:RequestAbstractType">
- <choice>
- <element ref="samlp:Query"/>
- <element ref="samlp:SubjectQuery"/>
- <element ref="samlp:AuthenticationQuery"/>
- <element ref="samlp:AttributeQuery"/>
- <element ref="samlp:AuthorizationDecisionQuery"/>
- <element ref="saml:AssertionIDReference" maxOccurs="unbounded"/>
- <element ref="samlp:AssertionArtifact" maxOccurs="unbounded"/>
- </choice>
- </extension>
- </complexContent>
- </complexType>
- <element name="AssertionArtifact" type="string"/>
- <element name="Query" type="samlp:QueryAbstractType"/>
- <complexType name="QueryAbstractType" abstract="true"/>
- <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
- <complexType name="SubjectQueryAbstractType" abstract="true">
- <complexContent>
- <extension base="samlp:QueryAbstractType">
- <sequence>
- <element ref="saml:Subject"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name="AuthenticationQuery" type="samlp:AuthenticationQueryType"/>
- <complexType name="AuthenticationQueryType">
- <complexContent>
- <extension base="samlp:SubjectQueryAbstractType">
- <attribute name="AuthenticationMethod" type="anyURI"/>
- </extension>
- </complexContent>
- </complexType>
- <element name="AttributeQuery" type="samlp:AttributeQueryType"/>
- <complexType name="AttributeQueryType">
- <complexContent>
- <extension base="samlp:SubjectQueryAbstractType">
- <sequence>
- <element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="Resource" type="anyURI" use="optional"/>
- </extension>
- </complexContent>
- </complexType>
- <element name="AuthorizationDecisionQuery" type="samlp:AuthorizationDecisionQueryType"/>
- <complexType name="AuthorizationDecisionQueryType">
- <complexContent>
- <extension base="samlp:SubjectQueryAbstractType">
- <sequence>
- <element ref="saml:Action" maxOccurs="unbounded"/>
- <element ref="saml:Evidence" minOccurs="0" maxOccurs="1"/>
- </sequence>
- <attribute name="Resource" type="anyURI" use="required"/>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="ResponseAbstractType" abstract="true">
- <sequence>
- <element ref="ds:Signature" minOccurs="0"/>
- </sequence>
- <attribute name="ResponseID" type="saml:IDType" use="required"/>
- <attribute name="InResponseTo" type="saml:IDReferenceType" use="optional"/>
- <attribute name="MajorVersion" type="integer" use="required"/>
- <attribute name="MinorVersion" type="integer" use="required"/>
- <attribute name="IssueInstant" type="dateTime" use="required"/>
- <attribute name="Recipient" type="anyURI" use="optional"/>
- </complexType>
- <element name="Response" type="samlp:ResponseType"/>
- <complexType name="ResponseType">
- <complexContent>
- <extension base="samlp:ResponseAbstractType">
- <sequence>
- <element ref="samlp:Status"/>
- <element ref="saml:Assertion" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name="Status" type="samlp:StatusType"/>
- <complexType name="StatusType">
- <sequence>
- <element ref="samlp:StatusCode"/>
- <element ref="samlp:StatusMessage" minOccurs="0" maxOccurs="1"/>
- <element ref="samlp:StatusDetail" minOccurs="0"/>
- </sequence>
- </complexType>
- <element name="StatusCode" type="samlp:StatusCodeType"/>
- <complexType name="StatusCodeType">
- <sequence>
- <element ref="samlp:StatusCode" minOccurs="0"/>
- </sequence>
- <attribute name="Value" type="QName" use="required"/>
- </complexType>
- <element name="StatusMessage" type="string"/>
- <element name="StatusDetail" type="samlp:StatusDetailType"/>
- <complexType name="StatusDetailType">
- <sequence>
- <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-</schema>
diff --git a/id.server/doc/moa-id.htm b/id.server/doc/moa-id.htm
deleted file mode 100644
index 74018a5ab..000000000
--- a/id.server/doc/moa-id.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head>
-<meta http-equiv="refresh" content="0; URL=moa_id/moa.htm">
-
-</head>
-<body></body>
-</html> \ No newline at end of file
diff --git a/id.server/doc/moa_id/examples/BKUSelectionTemplate.html b/id.server/doc/moa_id/examples/BKUSelectionTemplate.html
deleted file mode 100644
index 11c9352d2..000000000
--- a/id.server/doc/moa_id/examples/BKUSelectionTemplate.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<form name="CustomizedForm" method="post" action="<StartAuth>">
-<BKUSelect>
-<input type="submit" value="Ausw&auml;hlen"/>
-</form>
diff --git a/id.server/doc/moa_id/examples/ChainingModes.txt b/id.server/doc/moa_id/examples/ChainingModes.txt
deleted file mode 100644
index 820b60d06..000000000
--- a/id.server/doc/moa_id/examples/ChainingModes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
diff --git a/id.server/doc/moa_id/examples/IdentityLinkSigners.txt b/id.server/doc/moa_id/examples/IdentityLinkSigners.txt
deleted file mode 100644
index faed15030..000000000
--- a/id.server/doc/moa_id/examples/IdentityLinkSigners.txt
+++ /dev/null
@@ -1,3 +0,0 @@
- <IdentityLinkSigners>
- <X509SubjectName>CN=zmr,OU=BMI-IV-2,O=BMI,C=AT</X509SubjectName>
- </IdentityLinkSigners>
diff --git a/id.server/doc/moa_id/examples/LoginServletExample.txt b/id.server/doc/moa_id/examples/LoginServletExample.txt
deleted file mode 100644
index e085e4126..000000000
--- a/id.server/doc/moa_id/examples/LoginServletExample.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-import java.io.IOException;
-import java.util.Vector;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-
-import org.apache.axis.message.SOAPBodyElement;
-import org.apache.xml.serialize.LineSeparator;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.jaxen.JaxenException;
-import org.jaxen.SimpleNamespaceContext;
-import org.jaxen.dom.DOMXPath;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Beispiel für ein Login-Servlet, das von MOA-ID-AUTH über einen Redirect aufgerufen wird.
- * Es werden demonstriert:
- * - Parameterübergabe von MOA-ID-AUTH
- * - Aufruf des MOA-ID-AUTH Web Service zum Abholen der Anmeldedaten über das Apache Axis Framework
- * - Parsen der Anmeldedaten mittels der XPath Engine "Jaxen"
- * - Speichern der Anmeldedaten in der HTTPSession
- * - Redirect auf die eigentliche Startseite der OA
- *
- * @author Paul Ivancsics
- */
-public class LoginServletExample extends HttpServlet {
-
- // Web Service QName und Endpoint
- private static final QName SERVICE_QNAME = new QName("GetAuthenticationData");
- private static final String ENDPOINT =
- "http://localhost:8080/moa-id-auth/services/GetAuthenticationData";
- // NamespaceContext für Jaxen
- private static SimpleNamespaceContext NS_CONTEXT;
- static {
- NS_CONTEXT = new SimpleNamespaceContext();
- NS_CONTEXT.addNamespace("saml", "urn:oasis:names:tc:SAML:1.0:assertion");
- NS_CONTEXT.addNamespace("samlp", "urn:oasis:names:tc:SAML:1.0:protocol");
- NS_CONTEXT.addNamespace("pr", "http://reference.e-government.gv.at/namespace/persondata/20020228#");
- }
-
- /**
- * Servlet wird von MOA-ID-AUTH nach erfolgter Authentisierung über ein Redirect aufgerufen.
- */
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
-
- // Parameter "Target" und "SAMLArtifact" aus dem Redirect von MOA-ID-AUTH lesen
- String target = req.getParameter("Target");
- String samlArtifact = req.getParameter("SAMLArtifact");
-
- try {
- // DOMBuilder instanzieren
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- // <samlp:Request> zusammenstellen und in einen DOM-Baum umwandeln
- String samlRequest =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?><samlp:Request IssueInstant=\"2003-01-01T00:00:00+02:00\" MajorVersion=\"1\" MinorVersion=\"0\" RequestID=\"12345678901234567890\" xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\"><samlp:AssertionArtifact>"
- + samlArtifact
- + "</samlp:AssertionArtifact></samlp:Request>";
- Document root_request = builder.parse(samlRequest);
-
- // Neues SOAPBodyElement anlegen und mit dem DOM-Baum füllen
- SOAPBodyElement body = new SOAPBodyElement(root_request.getDocumentElement());
- SOAPBodyElement[] params = new SOAPBodyElement[] { body };
-
- // AXIS-Service für Aufruf von MOA-ID-AUTH instanzieren
- Service service = ServiceFactory.newInstance().createService(SERVICE_QNAME);
-
- // Axis-Call erzeugen und mit Endpoint verknüpfen
- Call call = service.createCall();
- call.setTargetEndpointAddress(ENDPOINT);
-
- // Call aufrufen und die Antwort speichern
- System.out.println("Calling MOA-ID-AUTH ...");
- Vector responses = (Vector) call.invoke(params);
-
- // erstes BodyElement auslesen
- SOAPBodyElement response = (SOAPBodyElement) responses.get(0);
-
- // <samlp:Response> als DOM-Baum holen
- Document responseDocument = response.getAsDocument();
- Element samlResponse = responseDocument.getDocumentElement();
-
- // <samlp:Response> auf System.out ausgeben
- System.out.println("Response received:");
- OutputFormat format = new OutputFormat((Document) responseDocument);
- format.setLineSeparator(LineSeparator.Windows);
- format.setIndenting(true);
- format.setLineWidth(0);
- XMLSerializer serializer = new XMLSerializer(System.out, format);
- serializer.asDOMSerializer();
- serializer.serialize(responseDocument);
-
- // <samlp:StatusCode> auslesen
- Attr statusCodeAttr = (Attr)getNode(samlResponse, "/samlp:Response/samlp:Status/samlp:StatusCode/@Value");
- String samlStatusCode = statusCodeAttr.getValue();
- System.out.println("StatusCode: " + samlStatusCode);
-
- // <saml:Assertion> auslesen
- if ("samlp:Success".equals(samlStatusCode)) {
- Element samlAssertion = (Element)getNode(samlResponse, "/samlp:Response/saml:Assertion");
-
- // FamilyName aus der <saml:Assertion> parsen
- Node familyNameNode = getNode(samlAssertion, "//saml:AttributeStatement/saml:Attribute[@AttributeName=\"PersonData\"]/saml:AttributeValue/pr:Person/pr:Name/pr:FamilyName");
- String familyName = getText(familyNameNode);
- System.out.println("Family name: " + familyName);
-
- // weitere Anmeldedaten aus der <saml:Assertion> parsen
- // ...
-
- // Anmeldedaten und Target in der HTTPSession speichern
- HttpSession session = req.getSession();
- session.setAttribute("UserFamilyName", familyName);
- session.setAttribute("Geschaeftsbereich", target);
-
- // weitere Anmeldedaten in der HTTPSession speichern
- // ...
-
- // Redirect auf die eigentliche Startseite
- resp.sendRedirect("/index.jsp");
- }
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
- }
- /** Returns the first node matching an XPath expression. */
- private static Node getNode(Node contextNode, String xpathExpression) throws JaxenException {
- DOMXPath xpath = new DOMXPath(xpathExpression);
- xpath.setNamespaceContext(NS_CONTEXT);
- return (Node) xpath.selectSingleNode(contextNode);
- }
- /** Returns the text that a node contains. */
- 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();
- }
-}
diff --git a/id.server/doc/moa_id/examples/Template.html b/id.server/doc/moa_id/examples/Template.html
deleted file mode 100644
index 97e54c6af..000000000
--- a/id.server/doc/moa_id/examples/Template.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<form name="CustomizedForm"
- action="<BKU>"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<XMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<DataURL>"/>
- <input type="submit" value="B&uuml;rgerkarte lesen"/>
-</form>
-<form name="CustomizedInfoForm"
- action="<BKU>"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<CertInfoXMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<CertInfoDataURL>"/>
- Hier finden Sie weitere Informationen zur &Uuml;berpr&uuml;fung der Zertifikate.<br/>
- <input type="submit" value="Weitere Info"/>
-</form> \ No newline at end of file
diff --git a/id.server/doc/moa_id/examples/TransformsInfoAuthBlock.txt b/id.server/doc/moa_id/examples/TransformsInfoAuthBlock.txt
deleted file mode 100644
index 396d0faea..000000000
--- a/id.server/doc/moa_id/examples/TransformsInfoAuthBlock.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-<sl10:TransformsInfo>
- <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:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
- <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="substring(//@IssueInstant,9,2)"/>.<xsl:value-of select="substring(//@IssueInstant,6,2)"/>.<xsl:value-of select="substring(//@IssueInstant,1,4)"/>, <xsl:value-of select="substring(//@IssueInstant,12,2)"/>:<xsl:value-of select="substring(//@IssueInstant,15,2)"/>:<xsl:value-of select="substring(//@IssueInstant,18,2)"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Applikation:</b>
- </td>
- <td>
- <xsl:value-of select="//saml:Attribute[@AttributeName='OA']/saml:AttributeValue"/>
- </td>
- </tr>
- <tr>
- <td>
- <b>Geschäftsbereich:</b>
- </td>
- <td>
- <xsl:value-of select="//saml:Attribute[@AttributeName='Geschäftsbereich']/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:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
- </dsig:Transforms>
- <sl10:FinalDataMetaInfo>
- <sl10:MimeType>text/html</sl10:MimeType>
- </sl10:FinalDataMetaInfo>
-</sl10:TransformsInfo>
diff --git a/id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml b/id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml
deleted file mode 100644
index 6ce00228c..000000000
--- a/id.server/doc/moa_id/examples/conf/MOA-ID-Configuration.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stephan G (Comp) -->
-<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <AuthComponent>
- <BKUSelection>
- <ConnectionParameter URL="http://10.16.46.108:18080/oa/getBKUSelectTag.jsp"/>
- </BKUSelection>
- <SecurityLayer>
- <TransformsInfo filename="file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/Transforms/TransformsInfosHTML.xml"/>
- </SecurityLayer>
- <MOA-SP>
- <ConnectionParameter URL="https://10.16.46.108:8443/moa-spss/services/SignatureVerification">
- <AcceptedServerCertificates>file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/certs/server-certs</AcceptedServerCertificates>
- <ClientKeyStore password="Keystore Pass">file:/c:/</ClientKeyStore>
- </ConnectionParameter>
- <VerifyIdentityLink>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- </VerifyIdentityLink>
- <VerifyAuthBlock>
- <TrustProfileID>TrustProfile1</TrustProfileID>
- <VerifyTransformsInfoProfileID>TransformsInfoProfile1MOAID</VerifyTransformsInfoProfileID>
- </VerifyAuthBlock>
- </MOA-SP>
- <IdentityLinkSigners>
- <X509SubjectName>CN=Test Signaturdienst Personenbindung,OU=Zentrales Melderegister,O=Bundesministerium f\C3\BCr Inneres,C=AT</X509SubjectName>
- </IdentityLinkSigners>
- </AuthComponent>
- <ProxyComponent>
- <AuthComponent>
- <ConnectionParameter URL="http://moatestlinux:18080/moa-id-auth/services/GetAuthenticationData">
- <AcceptedServerCertificates>http://www.altova.com</AcceptedServerCertificates>
- <ClientKeyStore password="String">http://www.altova.com</ClientKeyStore>
- </ConnectionParameter>
- </AuthComponent>
- </ProxyComponent>
- <OnlineApplication publicURLPrefix="https://10.16.126.28:9443/moa-id-proxy/">
- <AuthComponent provideZMRZahl="false" provideAUTHBlock="false" provideIdentityLink="false"/>
- <ProxyComponent configFileURL="file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/oa/OAConf.xml" sessionTimeOut="600">
- <ConnectionParameter URL="https://moatestlinux:18443/oa/">
- <AcceptedServerCertificates>file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/oa/server-certs/tomcat</AcceptedServerCertificates>
- <ClientKeyStore password="ClientKeystoreOAPAss">URL:toClientKeystoreOA</ClientKeyStore>
- </ConnectionParameter>
- </ProxyComponent>
- </OnlineApplication>
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="file:/home/moa/id/jakarta-tomcat-4.1.18/conf/moa-id/certs/cert-store-root"/>
- <GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
- <GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
-</MOA-IDConfiguration>
diff --git a/id.server/doc/moa_id/examples/conf/OAConfBasicAuth.xml b/id.server/doc/moa_id/examples/conf/OAConfBasicAuth.xml
deleted file mode 100644
index 0e4508036..000000000
--- a/id.server/doc/moa_id/examples/conf/OAConfBasicAuth.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateful</LoginType>
- <BasicAuth>
- <UserID>MOAFamilyName</UserID>
- <Password>MOADateOfBirth</Password>
- </BasicAuth>
-</Configuration>
-
-<!-- Example for resulting "UserID:Password" used for basic authentication:
-Mustermann:1985-12-01
---> \ No newline at end of file
diff --git a/id.server/doc/moa_id/examples/conf/OAConfHeaderAuth.xml b/id.server/doc/moa_id/examples/conf/OAConfHeaderAuth.xml
deleted file mode 100644
index c1a1964bf..000000000
--- a/id.server/doc/moa_id/examples/conf/OAConfHeaderAuth.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateful</LoginType>
- <HeaderAuth>
- <Parameter Name="Name" Value="MOAFamilyName"/>
- <Parameter Name="Vorname" Value="MOAGivenName"/>
- <Parameter Name="Geburtsdatum" Value="MOADateOfBirth"/>
- <Parameter Name="VPK" Value="MOAVPK"/>
- </HeaderAuth>
-</Configuration>
-
-<!-- Example for resulting request headers:
-Name:Mustermann
-Vorname:Hermann
-Geburtsdatum:1985-12-01
-VPK:kp6hOq6LRAkLtrqm6EvDm6bMwJw=
---> \ No newline at end of file
diff --git a/id.server/doc/moa_id/examples/conf/OAConfParamAuth.xml b/id.server/doc/moa_id/examples/conf/OAConfParamAuth.xml
deleted file mode 100644
index 18e0a109c..000000000
--- a/id.server/doc/moa_id/examples/conf/OAConfParamAuth.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <LoginType>stateful</LoginType>
- <ParamAuth>
- <Parameter Name="Name" Value="MOAFamilyName"/>
- <Parameter Name="Vorname" Value="MOAGivenName"/>
- <Parameter Name="Geburtsdatum" Value="MOADateOfBirth"/>
- <Parameter Name="VPK" Value="MOAVPK"/>
- </ParamAuth>
-</Configuration>
-
-<!-- Example for resulting request parameters:
-Name=Mustermann&Vorname=Hermann&Geburtsdatum=1985-12-01&VPK=kp6hOq6LRAkLtrqm6EvDm6bMwJw=
---> \ No newline at end of file
diff --git a/id.server/doc/moa_id/examples/moa-id-env-linux.txt b/id.server/doc/moa_id/examples/moa-id-env-linux.txt
deleted file mode 100644
index 995d0b4d4..000000000
--- a/id.server/doc/moa_id/examples/moa-id-env-linux.txt
+++ /dev/null
@@ -1 +0,0 @@
-export CATALINA_OPTS="-Dmoa.id.configuration=/home/moa/jakarta-tomcat-4.1.18/conf/moa-id/MOAIDConfiguration.xml -Dlog4j.configuration=file:/home/moa/jakarta-tomcat-4.1.18/conf/moa-id/log4j.properties"
diff --git a/id.server/doc/moa_id/examples/moa-id-env-windows.txt b/id.server/doc/moa_id/examples/moa-id-env-windows.txt
deleted file mode 100644
index 109c196cf..000000000
--- a/id.server/doc/moa_id/examples/moa-id-env-windows.txt
+++ /dev/null
@@ -1 +0,0 @@
-set CATALINA_OPTS=-Dmoa.id.configuration=c:\jakarta-tomcat-4.1.18\conf\moa-id\MOAIDConfiguration.xml -Dlog4j.configuration=file:c:\jakarta-tomcat-4.1.18\conf\moa-id\log4j.properties
diff --git a/id.server/doc/moa_id/faqs.htm b/id.server/doc/moa_id/faqs.htm
deleted file mode 100644
index ed386e11e..000000000
--- a/id.server/doc/moa_id/faqs.htm
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-<head>
- <title>FAQs - Häufig gestellte Fragen </title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- th { font-family:"Verdana", "Arial"; font-size:10pt; font-weight:bold; color:#c0c0c0; background:#505050}
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; font-weight:bold; color:#505060; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:6px }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module für Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">FAQs</div><br />
-<div id="klein"><a href="moa.htm"><img src="../moa_images/west.gif" border="0" width="13" height="14" />
- <b> Zurück</b></a></div>
-<br />
-<!-- div id="slogan">
-MOA ist eine Entwicklung des Bundesrechenzentrums BRZ in Zusammenarbeit mit A-Trust und dem Institut für angewandte Informations- und Kom-munikationstechnik (IAIK) der Universität Graz
-</div -->
-</td>
-
-<td valign="top">
-<div id="titel">FAQs - Häufig gestellte Fragen </div>
-
-<p id="subtitel">Lokal installiertes MOA-ID und Microsoft Internet Explorer</p>
-<p id="block">
-Aufgrund eines Fehlers in Microsofts Internet Explorer kann es beim Testen eines lokal installierten Tomcat mit den MOA-ID-Modulen zu Fehlern kommen, da ein Redirect von der Auth-Komponente zur Proxy-Komponente nicht ausgeführt wird.
-</p>
-<p id="block">
-Als Workaround empfiehlt es sich, zum lokalen Testen einen alternativen Browser wie <a href="http://www.opera.com/">Opera</a>, <a href="http://www.mozilla.org/">Mozilla</a> oder <a href="http://www.netscape.org/">Netscape</a> zu verwenden, da diese Probleme dort nicht auftreten.
-</p>
-<br />
-<p id="subtitel">Lokale Proxy-Komponente und HTTPS</p>
-<p id="block">
-Wenn die Proxy-Komponente lokal l&auml;uft und per TLS/SSL aufgerufen wird, kommt es zu einer Fehlermeldung.
-</p>
-<p id="block">
-Workaround: Wenn in der Konfiguration statt 'localhost' der eigene Rechnername verwendet wird, funktioniert die Proxy-Komponente wie gewohnt. <br />
-Zum Herausfinden des Rechnernamens wechselt man unter Windows auf die Kommandozeile und kann mittels 'ipconfig /all' den Rechnernamen herausfinden.
-Unix/Linux-Anwender sehen bspw. mittels 'cat' in der Datei /etc/hosts nach, der Texteintrag hinter der eigenen IP-Adresse spezifiziert den Rechnernamen.
-</p>
-<br />
-<p id="subtitel">Tomcat und starke Verschl&uuml;sselung (&gt;100 Bit)</p>
-<p id="block">
-Serverseitig kann keine starke Verschl&uuml;sselung (seitens Tomcat) erzwungen werden.
-</p>
-<p id="block">
-Als Workaround empfiehlt es sich, einen Web-Server wie Apache oder den Microsoft Internet-Information-Server f&uuml;r das SSL-Handling vorzuschalten und dort in der jeweiligen Konfiguration starke Verschl&uuml;sselung zu erzwingen.
-</p>
-<br />
-</td></tr></table>
-
-
-
-
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/doc/moa_id/id-admin.htm b/id.server/doc/moa_id/id-admin.htm
deleted file mode 100644
index 718f0cd03..000000000
--- a/id.server/doc/moa_id/id-admin.htm
+++ /dev/null
@@ -1,283 +0,0 @@
-<html>
-<head>
- <title>MOA ID-Administration</title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- th { font-family:"Verdana", "Arial"; font-size:10pt; font-weight:bold; color:#d8d8d8; background:#505050}
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- tt { font-size:9pt; color:#505060; }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; font-weight:bold; color:#505060; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:3px }
- #info { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; padding:3px; border:solid 1px #c0c0c0 }
- #infolist { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module f&uuml;r Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">MOA-ID</div><br />
-<div id="klein"><img src="../moa_images/select.gif" border="0" width="13" height="14" />
- <b> Übersicht</b></div>
-<div id="klein"><a href="id-admin_1.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Basis-Installation</b></a></div>
-<div id="klein"><a href="id-admin_2.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Konfiguration </b></a></div>
-<div id="klein"><a href="id-admin_3.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Optionale<br />&#160; &#160;&#160;Komponenten</b></a></div>
-<br />
-<div id="klein"><a href="moa.htm"><img src="../moa_images/west.gif" border="0" width="13" height="14" />
- <b> Zur&uuml;ck</b></a></div>
-<br />
-</td>
-
-<td valign="top">
-<div id="titel">MOA ID-Administration v.1.1</div>
-<p id="block">
-Die Komponenten des Moduls Identifikation (MOA-ID), MOA-ID-AUTH und MOA-ID-PROXY, sind als plattformunabh&auml;ngige Webapplikationen ausgelegt.
-MOA-ID-AUTH ist die Basiskomponente des Moduls, und MOA-ID-PROXY ist eine optionale Zusatzkomponente.
-F&uuml;r den Betrieb dieser Webapplikationen wird eine Java Virtual Machine und ein Java Servlet Container vorausgesetzt.
-<br /><br />
-Dieses Handbuch beschreibt die Installation und Konfiguration von MOA-ID-AUTH und von MOA-ID-PROXY, und die Einrichtung der Systemumgebungen.
-</p>
-</td></tr></table>
-<br />
-
-
-
-<div id="szenarien" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="titel">&#160;</p>
-</td>
-<td valign="top">
-<p id="titel">Übersicht </p>
-<div id="block">
-F&uuml;r den Betrieb von MOA-ID-AUTH sind unterschiedliche Szenarien m&ouml;glich, die unterschiedliche M&ouml;glichkeiten bieten und die Installation unterschiedlicher Software- und Hardware-Komponenten erfordern. Dieser Abschnitt gibt einen kurzen Überblick &uuml;ber die notwendige Basis-Installation und optionale weitere Konfigurationsm&ouml;glichkeiten.
-</div>
-</td></tr></table>
-<br />
-
-<div id="szenarien1" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-</td>
-<td valign="top">
-<div id="subtitel">Basis-Installation von MOA-ID-AUTH</div>
-<p id="block">
-Die Basis-Installation stellt einerseits die minimalen Anforderungen f&uuml;r den Betrieb von MOA-ID-AUTH dar, andererseits dient sie als Ausgangspunkt f&uuml;r weitere (optionale) Konfigurations-M&ouml;glichkeiten.
-<br /><br />
-Folgende Software ist Voraussetzung f&uuml;r die Basis-Installation:
-</div>
-<ul>
-<li>JDK 1.3.1 oder JDK 1.4.1</li>
-<li>Tomcat 4.1.18 </li>
-<li>MOA-ID-AUTH 1.0 </li>
-<li>MOA SP/SS 1.0 (entweder als WebService oder direkt als interne Bibliothek)</li>
-</ul>
-<div id="block">
-Um m&ouml;glichen Versionskonflikten aus dem Weg zu gehen sollten stets die neuesten Versionen von MOA-ID als auch von MOA-SP/SS verwendet werden. <br/>
-In diesem Betriebs-Szenario wird MOA-ID-AUTH in Tomcat deployt. Tomcat fungiert gleichzeitig als HTTP- und HTTPS-Endpunkt f&uuml;r MOA-ID-AUTH. Beide Protokolle werden direkt in Tomcat konfiguriert.
-<br/><br/>
-Die Webapplikation verwendet Log4j als Logging Toolkit.
-</div>
-</td></tr></table>
-<br />
-
-<div id="szenarien2" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-</td>
-<td valign="top">
-<p id="subtitel">Basis-Installation von MOA-ID-PROXY (optional)</p>
-<div id="block">
-Einer Online-Applikation, f&uuml;r die MOA-ID-AUTH die Authentisierung &uuml;bernimmt, kann die Komponente MOA-ID-PROXY vorgeschaltet werden. Diese Komponente &uuml;bernimmt die Anmeldedaten von MOA-ID-AUTH, f&uuml;hrt die Anmeldung an der Online Applikation durch und schleust in der Folge Daten an die Online-Applikation und Daten an den Benutzer durch.
-
-Die Basis-Installation von MOA-ID-PROXY geschieht im Wesentlichen analog zur Basis-Installation von MOA-ID-AUTH.
-<br/><br/>
-MOA-ID-AUTH und MOA-ID-PROXY k&ouml;nnen in verschiedenen Konstellationen zum Einsatz gebracht werden:
-<ul>
-<li>auf verschiedenen Rechnern</li>
-<li>auf ein und demselben Rechner in verschiedenen Java Servlet Containern</li>
-<li>auf ein und demselben Rechner in ein und demselben Java Servlet Container</li>
-</ul>
-<br/><br /><br />
-Ausgehend von der Basis-Installation k&ouml;nnen die optionalen Konfigurationen, die in den nachfolgenden Abschnitten beschrieben werden, unabh&auml;ngig und in beliebiger Kombination aufgesetzt werden.
-</div>
-</td></tr></table>
-<br />
-
-<div id="szenarien3" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-</td>
-<td valign="top">
-<p id="subtitel">Konfiguration mit vorgeschaltetem Webserver (optional)</p>
-<div id="block">
-Den MOA ID Webapplikationen kann jeweils optional ein Webserver vorgeschaltet sein. Unter Microsoft Windows ist das im Regelfall der Microsoft Internet Information Server (MS IIS), auf Unix-Systemen kommt &uuml;blicherweise der Apache Webserver zum Einsatz.
-<br /><br />
- Folgende Software ist unter Windows Voraussetzung:
-</div>
-<ul>
-<li>MS IIS 5.0 </li>
-<li>Jakarta mod_jk 1.2.2 </li>
-</ul>
-<div id="block">Folgende Software ist unter Unix/Linux Voraussetzung: <div id="block">
-<ul>
-<li>Apache Webserver 2.0.x mit mod_SSL </li>
-<li>Jakarta mod_jk 1.2.2 </li>
-</ul>
-<div id="block">In diesem Fall &uuml;bernimmt der vorgeschaltete Webserver die Funktion des HTTP- und HTTPS-Endpunktes. Beide Protokolle werden im Webserver konfiguriert.
-<br /><br />
-Mittels mod_jk werden die Webservice-Aufrufe, die im vorgeschalteten Webserver eintreffen, an Tomcat weiter geleitet, bzw. die Antwort von Tomcat wieder an den Webserver zur&uuml;ck &uuml;bermittelt.
-</div>
-</td></tr></table>
-<br />
-
-<div id="szenarien4" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-</td>
-<td valign="top">
-<p id="subtitel">Konfiguration mit PostgreSQL (optional)</p>
-<div id="block">
-Das MOA ID Webservice kann eine PostgreSQL Datenbank nutzen, um:
-</div>
-<ul>
-<li>Log-Meldungen zu speichern </li>
-</ul>
-<div id="block">F&uuml;r den Zugriff auf PostgreSQL ist die Installation folgender Software Voraussetzung: </div>
-<ul>
-<li>PostgreSQL 7.3</li>
-</ul>
-</td></tr></table>
-<br />
-
-<div id="szenarien5" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-</td>
-<td valign="top">
-<p id="subtitel">Zusammenfassung</p>
-<div id="block">
-Notwendig f&uuml;r den Betrieb von MOA ID ist eine Basis-Installation. Weitere optionale Konfigurationen k&ouml;nnen unabh&auml;ngig und in beliebiger Kombination miteinander durchgef&uuml;hrt werden, um eine bessere Integration der MOA ID Webapplikationen in die vorhandene Betriebs-Infrastruktur zu erreichen.
-</div>
-</td></tr></table>
-<br /><br />
-
-
-
-<div id="referenzen" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-</td>
-<td valign="top">
-<p id="titel">Referenzierte Software</p>
-<div id="block">
-Die Versionsangaben beziehen sich auf die Versionen, mit denen die MOA ID Webapplikationen entwickelt und getestet wurde. Geringf&uuml;gig andere Software-Versionen stellen &uuml;blicherweise kein Problem dar.
-</div>
-<br /><br />
-<div id="block">
-<table border="1" width="100%" cellpadding="2" cellspacing="0">
-<tr>
-<th>Komponente</th><th>Version</th>
-</tr><tr>
-<td><a href="http://java.sun.com/j2se/1.3/download.html">JDK</a> </td><td>1.3.1_07 &#160; </td>
-</tr><tr>
-<td><a href="http://java.sun.com/j2se/1.4.1/download.html">JDK</a> </td><td>1.4.1&#160; </td>
-</tr><tr>
-<td><a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/">Tomcat </a> </td><td>4.1.18&#160; </td>
-</tr><tr>
-<td><a href="http://cio.gv.at/">MOA-ID-AUTH </a> </td><td>1.0&#160; </td>
-</tr><tr>
-<td><a href="http://cio.gv.at/">MOA-ID-PROXY </a> </td><td>1.0&#160; </td>
-</tr><tr>
-<td><a href="http://cio.gv.at/">MOA-SPSS </a> </td><td>1.0&#160; </td>
-</tr><tr>
-<td><a href="http://httpd.apache.org/docs-2.0/">Apache Webserver</a> </td><td>1.3.23 &#160; </td>
-</tr><tr>
-<td><a href="http://www.microsoft.com/windows2000/en/server/iis/default.asp">Microsoft Internet Information Server </a> </td><td>5.0 &#160; </td>
-</tr><tr>
-<td><a href="http://httpd.apache.org/docs-2.0/ssl/">mod_SSL </a> </td><td>(*)&#160; </td>
-</tr><tr>
-<td><a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/">Jakarta mod_jk </a> </td><td>1.2.2&#160; </td>
-</tr><tr>
-<td><a href="http://jakarta.apache.org/log4j/docs/index.html">Jakarta Log4j </a> </td><td>1.2.7&#160; </td>
-</tr><tr>
-<td><a href="http://techdocs.postgresql.org/installguides.php">PostgreSQL </a> </td><td>7.3&#160; </td>
-</tr>
-</table>
-</div>
-<br /><br />
-
-<div id="block">
-(*) passend zur Version des Apache Webservers
-</div>
-</td></tr></table>
-<br /><br />
-
-
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/doc/moa_id/id-admin_1.htm b/id.server/doc/moa_id/id-admin_1.htm
deleted file mode 100644
index f56338747..000000000
--- a/id.server/doc/moa_id/id-admin_1.htm
+++ /dev/null
@@ -1,400 +0,0 @@
-<html>
-<head>
- <title>MOA ID-Administration</title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- th { font-family:"Verdana", "Arial"; font-size:10pt; font-weight:bold; color:#d8d8d8; background:#505050}
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- tt { font-size:9pt; color:#505060; }
- pre { font-size:9pt; color:#505060; }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; font-weight:bold; color:#505060; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:3px }
- #info { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; padding:3px; border:solid 1px #c0c0c0 }
- #infolist { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module f&uuml;r Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">MOA-ID</div><br />
-<div id="klein"><a href="id-admin.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Übersicht</b></a></div>
-<div id="klein"><img src="../moa_images/select.gif" border="0" width="13" height="14" />
- <b> Basis-Installation</b></div>
-<div id="klein"><a href="id-admin_2.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Konfiguration </b></a></div>
-<div id="klein"><a href="id-admin_3.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Optionale<br />&#160; &#160;&#160;Komponenten</b></a></div>
-<br />
-<div id="klein"><a href="moa.htm"><img src="../moa_images/west.gif" border="0" width="13" height="14" />
- <b> Zur&uuml;ck</b></a></div>
-</br /><br />
-<div id="slogan">
-<b>Installationsschritte: </b>
-<br />
-<a href="#vorbereitung"><b>Vorbereitung</b></a><br />
-<a href="#Tomcat"><b>Tomcat Konfiguration</b></a><br />
-<a href="#deployment_ak"><b>Deployment<br/>MOA-ID-AUTH</b></a><br />
-<a href="#deployment_pk"><b>Deployment<br/>MOA-ID-PROXY</b></a><br />
-<a href="#Tomcat_Start"><b>Tomcat Start/Stop</b></a><br />
-<a href="#Logging"><b>Logging</b></a><br />
-</div>
-</td>
-
-<td valign="top">
-<p id="titel">Basis-Installation v.1.1</p>
-Bei der Basis-Installation von MOA-ID-AUTH und von MOA-ID-PROXY ist grunds&auml;tzlich gleichartig vorzugehen.
-Unterschiede sind in der Installationsanweisung angef&uuml;hrt.
-<div id="vorbereitung" />
-<p id="subtitel">Vorbereitung</p>
-<div id="block">
-<b>Installation des JDK</b><br />
-Installieren Sie das JDK 1.3.1 oder JDK 1.4.1 in ein beliebiges Verzeichnis. Das Wurzelverzeichnis der JDK-Installation wird im weiteren Verlauf als $JAVA_HOME bezeichnet.
-<br /><br />
-<b>Installation von Tomcat</b><br />
-Installieren Sie Tomcat in ein Verzeichnis, das keine Leerzeichen im Pfadnamen enth&auml;lt. Das Wurzelverzeichnis der Tomcat-Installation wird im weiteren Verlauf als $CATALINA_HOME bezeichnet. <b>Hinweis:</b> Tomcat wird in einer Distribution f&uuml;r JDKs ab Version 1.2 und in einer Distribution speziell f&uuml;r JDK 1.4 ausgeliefert. Installieren Sie die zur Version Ihres JDK passende Tomcat-Version.
-<br /><br />
-<b>Entpacken der MOA ID Webapplikation</b><br />
-Entpacken Sie die ausgelieferten Dateien der Webapplikation (moa-id-auth-x.y.zip oder moa-id-proxy-x.y.zip; ersetzen Sie x.y durch die Releasenummer von MOA-ID-AUTH bzw. MOA-ID-PROXY) in ein beliebiges Verzeichnis. Diese Verzeichnisse werden im weiteren Verlauf als $MOA_ID_INST_AUTH bzw. $MOA_ID_INST_PROXY bezeichnet.
-<br /><br />
-<b>Installation der IAIK JCE, des IAIK LDAP Protocol Handlers und von JSSE (JDK 1.3.1)</b><br />
-Da Java in der Version 1.3.1 ohne Unterst&uuml;tzung f&uuml;r Kryptographie, LDAP und SSL ausgeliefert wird, m&uuml;ssen diese Funktionalit&auml;ten nachtr&auml;glich installiert werden. Es stehen hierf&uuml;r zwei M&ouml;glichkeiten zur Verf&uuml;gung: <br />
-1. Installation innerhalb des JDK 1.3.1:<br />
-Die Dateien aus dem Verzeichnis $MOA_ID_INST_AUTH/ext13 (oder $MOA_ID_INST_PROXY/ext13) m&uuml;ssen in das Verzeichnis $JAVA_HOME/jre/lib/ext kopiert werden. Anschlie&szlig;end steht eine Unterst&uuml;tzung f&uuml;r Kryptographie und SSL jeder Java-Anwendung die dieses JDK verwendet zur Verf&uuml;gung.<br />
-2. Installation ausschlie&szlig;lich f&uuml;r Applikationen innerhalb von Tomcat:<br />
-Um die o.g. Unterst&uuml;tzung nur Tomcat-Anwendungen zu erm&ouml;glichen, k&ouml;nnen die Dateien aus dem Verzeichnis $MOA_ID_INST_AUTH/ext13 (oder $MOA_ID_INST_PROXY/ext13) in ein beliebiges Verzeichnis kopiert werden. Im Folgenden wird dieses Verzeichnis $MOA_ID_EXT genannt. Anschlie&szlig;end muss der Tomcat-Klassenpfad angepasst werden:<br/>
-F&uuml;r Windows-Betriebssysteme ist daf&uuml;r die Datei $CATALINA_HOME\bin\setclasspath.bat anzupassen:<br/>
-Hinter <i>'set CLASSPATH=%JAVA_HOME%\lib\tools.jar'</i> m&uuml;ssen nun jeweils mit Semikolon getrennt, die Dateien aus $MOA_ID_EXT inklusive der vollst&auml;ndigen Pfadangaben angef&uuml;gt werden.<br/>
-Anschlie&szlig;end sieht diese Zeile beispielsweise folgenderma&szlig;en aus:
-<pre>
- set CLASSPATH=%JAVA_HOME%\lib\tools.jar;
- $MOA_ID_EXT\iaik_jce_full.jar;
- $MOA_ID_EXT\iaik_ldap.jar;
- $MOA_ID_EXT\jcert.jar;
- $MOA_ID_EXT\jnet.jar;
- $MOA_ID_EXT\jsse.jar
-</pre>
-($MOA_ID_EXT ist durch den tats&auml;chlichen Pfad zu ersetzen)<br />
-Unix/Linux-Anwender verfahren analog mit der Datei $CATALINA_HOME/bin/setclasspath.sh wobei ';' durch ':' zu ersetzen ist.<br /><br />
-<b>Installation der IAIK JCE und des IAIK LDAP Protocol Handlers (JDK 1.4.1)</b><br />
-Die Dateien aus dem Verzeichnis $MOA_ID_INST_AUTH/ext14 (oder $MOA_ID_INST_PROXY/ext14) m&uuml;ssen in das Verzeichnis $JAVA_HOME/jre/lib/ext kopiert werden. Anschlie&szlig;end steht eine Unterst&uuml;tzung f&uuml;r Kryptographie und SSL jeder Java-Anwendung die dieses JDK verwendet zur Verf&uuml;gung.<br />
-Zus&auml;tzlich m&uuml;ssen die so genannten "Unlimited Strength Jurisdiction Policy Files 1.4.1" heruntergeladen, entpackt und ins Verzeichnis $JAVA_HOME/jre/lib/security kopiert werden. Der Download f&uuml;r diese Dateien findet sich am unteren Ende der <a href="http://java.sun.com/j2se/1.4.1/download.html">Download-Seite f&uuml;r das JDK 1.4.1</a> in der Sektion "Other Downloads".
-</div>
-
-</td></tr></table>
-
-<div id="Tomcat" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<p id="subtitel">Konfiguration von Tomcat</p>
-<div id="block">
-<b>Minimale Konfiguration</b> <br />
-Die zentrale Konfigurations-Datei von Tomcat ist $CATALINA_HOME/conf/server.xml. Tomcat wird grunds&auml;tzlich mit
-einer funktionierenden Default-Konfiguration ausgeliefert, die jedoch einiges an Ballast enth&auml;lt und viele Ports
-offen l&auml;sst. Die Datei $MOA_ID_INST_AUTH/tomcat/server.xml (bzw. $MOA_ID_INST_PROXY/tomcat/server.xml) enth&auml;lt eine minimale
-Tomcat-Konfiguration, die je einen Connector f&uuml;r HTTP und f&uuml;r HTTPS freischaltet.<br /><br />
-<b>SSL</b><br />
-F&uuml;r den sicheren Betrieb von MOA-ID-AUTH ist die Verwendung von SSL Voraussetzung, sofern nicht ein vorgelagerter WebServer (Apache oder IIS) das SSL-Handling &uuml;bernimmt.
-Ebenso kann SSL auch f&uuml;r MOA-ID-PROXY verwendet werden.
-Das Dokument <a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/ssl-howto.html" target="_new">Tomcat SSL Configuration HOW-TO</a> gibt einen guten Überblick &uuml;ber die Konfiguration von SSL in Tomcat. Da die f&uuml;r SSL notwendigen Bibliotheken bereits im Abschnitt "Vorbereitung" eingebunden wurden, sind nur noch folgende Schritte notwendig:
-</div>
-<ul>
-<li>Erstellung eines Server-Keystores, welches den privaten Schl&uuml;ssel des Servers sowie das Server-Zertifikat enth&auml;lt,
-z.B. mit dem <a href="http://java.sun.com/j2se/1.3/docs/tooldocs/win32/keytool.html" target="_new"> Java Keytool</a>. <br />
-<b>Hinweis:</b> Standardm&auml;&szlig;ig wird beim Erzeugen eines neuen Keystores im Home-Verzeichnis des Benutzers die Datei ".keystore" angelegt. M&ouml;chte man den Dateinamen und Pfad &auml;ndern, kann man das dem SSL-Connector in $CATALINA_HOME/conf/server.xml durch hinzuf&uuml;gen des Attributes <i>keystoreFile="NAME DES KEYSTORES"</i> im Element &lt;Factory&gt; bekannt machen. Das zum Keystore geh&ouml;rende Passwort &uuml;bergibt man Tomcat mittels des Attributes <i>keystorePass= "PASSWORT DES KEYSTORES"</i> im Element &lt;Factory&gt;. </li>
-<li>Erstellung eines Keystores mit vertrauensw&uuml;rdigen Client-Zertifikaten, z.B. mit dem <a href="http://java.sun.com/j2se/1.3/docs/tooldocs/win32/keytool.html" target="_new"> Java Keytool</a> (nur, wenn SSL Client-Authentisierung verwendet werden soll) </li>
-<li>Falls eine Client-Authentisierung gew&uuml;nscht ist, muss die Konfiguration des SSL-Connectors in $CATALINA_HOME/conf/server.xml angepasst werden.</li>
-</ul>
-
-<div id="block">
-<b>MOA Administrator</b><br />
-Der Aufruf der URL f&uuml;r die dynamische Konfiguration von MOA-ID-AUTH ist durch eine Passwort-Abfrage gesch&uuml;tzt, und kann nur von Benutzern aufgerufen werden, die der Benutzer-Rolle <tt>moa-admin</tt> zugeordnet werden k&ouml;nnen.<br />
-Um diese Benutzer-Rolle und einen oder mehrere Benutzer einzurichten, m&uuml;ssen in der Datei $CATALINA_HOME/conf/tomcat-users.xml unter dem Element <tt>&lt;tomcat-users&gt;</tt> sinngem&auml;&szlig; folgende Eintr&auml;ge hinzugef&uuml;gt werden:
-<pre>
-&lt;role rolename="moa-admin"/&gt;
-&lt;user username="moa" password="moa" roles="moa-admin"/&gt;
-</pre>
-</div>
-</td></tr></table>
-
-<div id="deployment_ak" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<p id="subtitel">Deployment von MOA-ID-AUTH in Tomcat</p>
-<div id="block">
-Um MOA-ID-AUTH in Tomcat f&uuml;r den Ablauf vorzubereiten, sind folgende Schritte notwendig: <br />
-<ul>
-<li>Die Datei $MOA_ID_INST_AUTH/moa-id-auth.war wird ins Verzeichnis $CATALINA_HOME/webapps kopiert. Dort wird sie beim ersten Start von Tomcat automatisch ins Verzeichnis $CATALINA_HOME/webapps/moa-id-auth entpackt. </li>
-<li>Die MOA-ID Konfigurationsdatei und die zugeh&ouml;rigen Verzeichnisse "certs" und "transforms" werden in ein beliebiges Verzeichnis im Filesystem kopiert (z.B. $CATALINA_HOME/conf/moa-id). <br />In $MOA_ID_INST_AUTH/conf/moa-id befindet sich eine funktionsf&auml;hige Konfiguration, die als Ausgangspunkt f&uuml;r die Konfiguration von MOA-ID-AUTH dienen kann. </li>
-<li>Die endorsed Libraries f&uuml;r Tomcat m&uuml;ssen aus dem Verzeichnis $MOA_ID_INST_AUTH/endorsed in das Tomcat-Verzeichnis $CATALINA_HOME/common/endorsed kopieren werden. Folgende Libraries sind f&uuml;r das Deployment im endorsed Verzeichnis vorgesehen:
-<ul>
-<li id="klein">Xerces-J-2.0.2 (bestehend aus xercesImpl.jar und xmlParserAPIs.jar)</li>
-</ul>
-Eventuell vorhandene Dateien mit dem gleichen Namen m&uuml;ssen ersetzt werden.
-</li>
-<li>Folgende Java System Properties sind zu setzen: <br />
-<ul id="klein">
-<li id="klein">moa.id.configuration=Name der MOA ID Konfigurationsdatei. Eine beispielhafte MOA ID Konfiguration ist in $MOA_ID_INST_AUTH/conf/moa-id/ SampleMOAIDConfiguration.xml enthalten.</li>
-<li id="klein">log4j.configuration=URL der Log4j Konfigurationsdatei. Eine beispielhafte Log4j-Konfiguration ist in $MOA_ID_INST_AUTH/conf/moa-id/log4j.properties enthalten. </li>
-<li id="klein">javax.net.ssl.trustStore=Name des Truststores f&uuml;r vertrauensw&uuml;rdige SSL Client-Zertifikate (optional; nur, wenn SSL Client-Authentisierung durchgef&uuml;hrt werden soll). </li>
-</ul>
-Diese Java System-Properties werden Tomcat &uuml;ber die Umgebungsvariable CATALINA_OPTS mitgeteilt
-(siehe Beispiele f&uuml;r <a href="examples/moa-id-env-windows.txt">Windows</a> und f&uuml;r <a href="examples/moa-id-env-linux.txt">Linux</a>).
-</ul>
-</div>
-</td></tr></table>
-
-
-<div id="deployment_pk" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<p id="subtitel">Deployment von MOA-ID-PROXY in Tomcat</p>
-<div id="block">
-Um MOA-ID-PROXY in Tomcat f&uuml;r den Ablauf vorzubereiten, sind folgende Schritte notwendig: <br />
-<ul>
-<li>Die Datei $MOA_ID_INST_PROXY/moa-id-proxy.war wird in ein beliebiges Verzeichnis (bspw. $CATALINA_HOME) kopiert. <b>HINWEIS: Das Verzeichnis darf NICHT $CATALINA_HOME/webapps sein!</b><br />
- Anschliessend muss in der Datei <tt>$CATALINA_HOME/conf/server.xml</tt> der Tomcat-Root-Context auf diese Datei gesetzt werden: wenn das war-file sich in $CATALINA_HOME befindet, geschieht dies mit dem Einf&uuml;gen von folgendem Element innerhalb von <tt>&lt;Server&gt;...&lt;Service&gt;...&lt;Engine&gt;...&lt;Host&gt;</tt>: </li>
-<pre>&lt;Context path="" docBase="../moa-id-proxy.war" debug="0"/&gt;</pre>
-Anmerkung: Der Root-Context von Tomcat ist normalerweise auskommentiert. <br /><br />
-<li>Die MOA-ID Konfigurationsdatei und die zugeh&ouml;rigen Verzeichnisse "certs" und "oa" werden in ein beliebiges Verzeichnis im Filesystem kopiert (z.B. $CATALINA_HOME/ conf/moa-id). <br />
-In $MOA_ID_INST_PROXY/conf/moa-id befindet sich eine funktionsf&auml;hige Konfiguration, die als Ausgangspunkt f&uuml;r die Konfiguration von MOA-ID-PROXY dienen kann. </li>
-<li>Die endorsed Libraries f&uuml;r Tomcat m&uuml;ssen aus dem Verzeichnis $MOA_ID_INST_PROXY/endorsed in das Tomcat-Verzeichnis $CATALINA_HOME/common/endorsed kopiert werden. Folgende Libraries sind f&uuml;r das Deployment im endorsed Verzeichnis vorgesehen:
-<ul>
-<li id="klein">Xerces-J-2.0.2 (bestehend aus xercesImpl.jar und xmlParserAPIs.jar)</li>
-</ul>
-Eventuell vorhandene Dateien mit dem gleichen Namen m&uuml;ssen ersetzt werden.
-</li>
-<li>Folgende Java System Properties sind zu setzen: <br />
-<ul id="klein">
-<li id="klein">moa.id.configuration=Name der MOA ID Konfigurationsdatei. Eine beispielhafte MOA ID Konfiguration ist in $MOA_ID_INST_AUTH/conf/moa-id/ SampleMOAIDConfiguration.xml enthalten.</li>
-<li id="klein">log4j.configuration=URL der Log4j Konfigurationsdatei. Eine beispielhafte Log4j-Konfiguration ist in $MOA_ID_INST_AUTH/conf/moa-id/log4j.properties enthalten. </li>
-<li id="klein">javax.net.ssl.trustStore=Name des Truststores f&uuml;r vertrauensw&uuml;rdige SSL Client-Zertifikate (optional; nur, wenn SSL Client-Authentisierung durchgef&uuml;hrt werden soll). </li>
-</ul>
-Diese Java System-Properties werden Tomcat &uuml;ber die Umgebungsvariable CATALINA_OPTS mitgeteilt
-(siehe Beispiele f&uuml;r <a href="examples/moa-id-env-windows.txt">Windows</a> und f&uuml;r <a href="examples/moa-id-env-linux.txt">Linux</a>).
-</ul>
-</div>
-</td></tr></table>
-
-<div id="Tomcat_Start" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<p id="subtitel">Starten und Stoppen von Tomcat </p>
-<div id="block">
-Nach dem Deployment und der Konfiguration kann Tomcat aus seinem Wurzelverzeichnis mit <br />
-<pre>
- bin\catalina start (unter Windows) oder
- bin/catalina.sh start (unter Unix/Linux)
-</pre>
-gestartet werden. Das Stoppen von Tomcat erfolgt analog mit <br />
-<pre>
- bin\catalina stop (unter Windows) oder
- bin/catalina.sh stop (unter Unix/Linux)
-</pre>
-Ein erfolgreicher Startvorgang von MOA-ID-AUTH ist an folgender Log-Meldung ersichtlich: <br />
-<pre>
- INFO | 08 13:33:38,497 | main |
- MOA ID Authentisierung wurde
- erfolgreich gestartet
-</pre>
-Analog bei MOA-ID-PROXY: <br/>
-<pre>
- INFO | 08 13:35:49,876 | main |
- MOA ID Proxy wurde erfolgreich gestartet
-</pre>
-
-Nach dem erfolgreichen Starten von Tomcat steht MOA-ID-AUTH unter der URL
-<pre>
-http(s)://host:port/moa-id-auth/StartAuthentication
-</pre>
-zur Verf&uuml;gung. Der WebService ist unter
-<pre>
-http(s)://host:port/moa-id-auth/services/GetAuthenticationData
-</pre>
-erreichbar. Die Verf&uuml;gbarkeit der Anwendung kann &uuml;berpr&uuml;ft werden, indem die URLs mit einem Web-Browser aufgerufen werden.<br />
-<br />
-<div id="ConfigUpdate" />
-<b>Dynamische Konfigurations-Updates</b><br />
-Dynamische Konfigurations-Updates k&ouml;nnen f&uuml;r MOA-ID-AUTH durch den Aufruf der URL http://hostname:port/moa-id-auth/ConfigurationUpdate (z.B. durch Eingabe in einem Browser) durchgef&uuml;hrt werden. Analog wird die Konfiguration von MOA-ID-PROXY mittels http://hostname:port/ConfigurationUpdate aktualisiert.<br /><br />
-<b>Hinweis: </b>Konfigurations&auml;nderungen für die Online-Applikationen betreffen grunds&auml;tzlich sowohl die Auth- als auch die Proxy-Komponente.
-Wenn bspw. das <tt>publicURLPrefix</tt> der OA ge&auml;ndert wird, muss sowohl f&uuml;r die Auth- als auch für die Proxy-Komponente ein ConfigurationUpdate durchgef&uuml;hrt werden. <br /> <br />
-Konnte MOA-ID-AUTH bzw. MOA-ID-PROXY nicht ordnungsgem&auml;&szlig; konfiguriert und gestartet werden, geht das aus der Log-Meldung hervor: <br />
-<pre>
-FATAL | 03 13:19:06,924 | main | Fehler
- beim Starten des Service MOA ID Authentisierung
-</pre>
-bzw.
-<pre>
-FATAL | 03 13:19:06,924 | main | Fehler
- beim Starten des Service MOA ID Proxy
-</pre>
-In diesem Fall geben die WARN bzw. ERROR Log-Meldungen unmittelbar davor Aufschluss &uuml;ber den genaueren Grund. <br />
-</div>
-</td></tr></table>
-
-
-<div id="Logging" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<div id="Logging" />
-<p id="subtitel">Logging</p>
-<div id="block">
-Die MOA ID Webapplikation verwendet Jakarta Log4j f&uuml;r die Ausgabe von Log-Meldungen am Bildschirm bzw. in Log-Dateien. Log4j bietet zahlreiche Konfigurationsm&ouml;glichkeiten, die ausf&uuml;hrlich im <a href="http://jakarta.apache.org/log4j/docs/manual.html" target="_new">Log4j Handbuch</a> beschrieben sind. Unter anderem gibt es die M&ouml;glichkeit, folgende Einstellungen vorzunehmen: <br />
-<ul>
-<li id="klein">Das verwendete Log-Level (DEBUG, INFO, WARN, ERROR, FATAL).</li>
-<li id="klein">Name und maximale Gr&ouml;&szlig;e der Log-Datei(en).</li>
-<li id="klein">Das Aussehen der Log-Eintr&auml;ge.</li>
-</ul>
-Es werden folgende Log-Hierarchien verwendet:
-</div>
-<ul>
-<li>moa.id.auth f&uuml;r alle Log-Meldungen aus dem MOA-ID-AUTH Modul </li>
-<li>moa.id.proxy f&uuml;r alle Log-Meldungen aus dem MOA-ID-PROXY Modul </li>
-<li>moa.spss.server f&uuml;r alle Log-Meldungen aus dem MOA-SPSS Modul </li>
-<li>iaik.server f&uuml;r alle Log-Meldungen aus den IAIK Kryptographie-Modulen </li>
-</ul>
-<div id="block">
-Als Ausgangspunkt f&uuml;r die Logging-Konfiguration liegt die Datei $MOA_ID_INST_AUTH/conf/moa-id/log4j.properties (bzw. $MOA_ID_INST_PROXY/conf/moa-id/log4j.properties) bei.
-Wird diese Datei als Logging-Konfiguration verwendet, so werden alle Log-Meldungen sowohl in die Konsole, als auch in die Datei <tt>$CATALINA_HOME/logs/moa-id.log</tt> geschrieben.
-<br /><br />
-<b>Format der Log-Meldungen</b><br />
-Anhand einer konkreten Log-Meldung wird das Format der MOA ID Log-Meldungen erl&auml;utert:
-<pre>
- INFO | 09 08:23:59,385 | Thread-8 |
- Anmeldedaten zu MOASession -5468974113772848113
- angelegt, SAML Artifakt
- AAF/BrdRfnMaQVGIbP/Gf9OwDUwwsXChb7nuT+VXQzOoHbV
-</pre>
-
-Der Wert <tt>INFO</tt> besagt, dass die Log-Meldung im Log-Level <tt>INFO</tt> entstanden ist. Folgende Log-Levels existieren:<br />
-<ul>
-<li id="klein"><tt>DEBUG:</tt> Log-Meldungen im Log-Level <tt>DEBUG</tt> geben Auskunft &uuml;ber die innere Arbeitsweise des Systems. Sie sind haupts&auml;chlich f&uuml;r Entwickler interessant.</li>
-<li id="klein"><tt>INFO:</tt> Diese Log-Meldungen geben informative Status-Informationen &uuml;ber den Ablauf der Webapplikation, wie z.B., dass eine neue Anfrage eingelangt ist.</li>
-<li id="klein"><tt>WARN:</tt> Bei der Ausf&uuml;hrung einer Operation sind leichte Fehler aufgetreten. Der Ablauf der Webapplikation ist nicht weiter beeintr&auml;chtigt.</li>
-<li id="klein"><tt>ERROR:</tt> Die Ausf&uuml;hrung einer Operation musste abgebrochen werden. Die Webapplikation ist davon nicht beeintr&auml;chtigt. </li>
-<li id="klein"><tt>FATAL:</tt> Es ist ein Fehler aufgetreten, der den weiteren Betrieb der Webapplikation nicht mehr sinnvoll macht.</li>
-</ul>
-Der n&auml;chste Wert <tt>09 08:23:59,385</tt>, gibt den Zeitpunkt an, an dem die Log-Meldung generiert wurde (in diesem Fall den 9. Tag im aktuellen Monat, sowie die genaue Uhrzeit). <br />
-Der Rest der Zeile einer Log-Meldung ist der eigentliche Text, mit dem das System bestimmte Informationen anzeigt. Im Fehlerfall ist h&auml;ufig ein Java Stack-Trace angef&uuml;gt, der eine genauere Ursachen-Forschung erm&ouml;glicht.
-<br /><br />
-
-
-<b>Wichtige Log-Meldungen</b><br />
-Neben den im Abschnitt "Starten und Stoppen von Tomcat" beschriebenen Log-Meldungen, die anzeigen, ob die Webapplikation
-ordnungsgem&auml;&szlig; gestartet wurde, geben nachfolgenden Log-Meldungen Aufschluss &uuml;ber die Abarbeitung von Anfragen.
-Die Annahme einer Anfrage wird beispielsweise angezeigt durch:
-</div>
-<pre>
- INFO | 09 08:37:17,663 | Thread-9 |
- MOASession 6576509775379152205 angelegt
-
- INFO | 09 08:37:20,828 | Thread-9 |
- Anmeldedaten zu MOASession 6576509775379152205
- angelegt, SAML Artifakt
- AAF/BrdRfnMaQVGIbP/Gf9OwDUwwsXChb7nuT+VXQzOoHbV
-
-</pre>
-
-<div id="block">
-Die 1. Log-Meldung besagt, dass sich ein Benutzer an MOA-ID-AUTH angemeldet und eine eindeutige SessionID zugewiesen bekommen hat. <br />
-Die 2. Log-Meldung informiert dar&uuml;ber, dass die Anmeldedaten des Benutzers unter dem angezeigten SAML Artifakt abgeholt werden k&ouml;nnen.<br />
-</div>
-Wenn nun versucht wird, eine Transaktion mit einer ung&uumlltigen SessionID fortzusetzen erh&auml;lt man folgende Log-Meldung:<br />
-<pre>
- ERROR | 09 09:34:27,105 | Thread-8 |
- at.gv.egovernment.moa.id.AuthenticationException:
- MOASessionID ist unbekannt
- (MOASessionID=-8650403497547200032)
-</pre>
-<div id="block">
-In diesem Fall gibt der mitgeloggte Stacktrace Auskunft &uuml;ber die Art des Fehlers. Der Aufrufer der MOA ID Webapplikation bekommt einen Fehlercode sowie eine kurze Beschreibung des Fehlers als Antwort zur&uuml;ck.
-<br /><br />
-Die Tats&auml;chlich &uuml;bertragenen Anfragen bzw. Antworten werden aus Effizienzgr&uuml;nden nur im Log-Level DEBUG angezeigt.
-</div>
-</td></tr></table>
-<br /><br />
-
-
-
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/doc/moa_id/id-admin_2.htm b/id.server/doc/moa_id/id-admin_2.htm
deleted file mode 100644
index b4e22a36b..000000000
--- a/id.server/doc/moa_id/id-admin_2.htm
+++ /dev/null
@@ -1,623 +0,0 @@
-<html>
-<head>
- <title>MOA ID-Administration</title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- th { font-family:"Verdana", "Arial"; font-size:10pt; font-weight:bold; color:#d8d8d8; background:#505050}
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- tt { font-size:9pt; color:#505060; }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; color:#505060; font-weight:bold; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:3px }
- #info { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; padding:3px; border:solid 1px #c0c0c0 }
- #infolist { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module f&uuml;r Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">MOA-ID</div><br />
-<div id="klein"><a href="id-admin.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> &uuml;bersicht</b></a></div>
-<div id="klein"><a href="id-admin_1.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Basis-Installation</b></a></div>
-<div id="klein"><img src="../moa_images/select.gif" border="0" width="13" height="14" />
- <b> Konfiguration </b></div>
-<div id="klein"><a href="id-admin_3.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Optionale<br />&#160; &#160;&#160;Komponenten</b></a></div>
-<br />
-<div id="klein"><a href="moa.htm"><img src="../moa_images/west.gif" border="0" width="13" height="14" />
- <b> Zur&uuml;ck</b></a></div>
-<br /><br />
-<div id="slogan">
-<a href="#moaid-konfiguration"><b>Konfiguration<br />von MOA-ID</b></a>
-<br /><br />
-<a href="examples/conf/MOA-ID-Configuration.xml" target="_new">Konfigurationsdatei</a>
-<br /><br />
-<b>Parameter-&uuml;bersicht</b><br />
-<a href="#ConnectionParameter">ConnectionParameter</a><br />
-<a href="#AuthComponent">AuthComponent</a><br />
-<a href="#BKUSelection" >&nbsp;&nbsp;BKUSelection</a><br />
-<a href="#SecurityLayer">&nbsp;&nbsp;SecurityLayer</a><br />
-<a href="#MOA-SP">&nbsp;&nbsp;MOA-SP</a><br />
-<a href="#IdentityLinkSigners">&nbsp;&nbsp;IdentityLinkSigners</a><br />
-<a href="#ProxyComponent">ProxyComponent</a><br />
-<a href="#OnlineApplication">OnlineApplication</a><br />
-<a href="#OnlineApplication/AuthComponent">&nbsp;&nbsp;AuthComponent</a><br />
-<a href="#OnlineApplication/ProxyComponent">&nbsp;&nbsp;ProxyComponent</a><br />
-<a href="#ChainingModes">ChainingModes</a><br />
-<a href="#TrustedCACertificates">TrustedCACertificates</a><br />
-<a href="#GenericConfiguration">GenericConfiguration</a><br />
-<br />
-<a href="#oa-config"><b>Konfiguration<br />der Online-Applikation</b></a><br />
-<br />
-<b>Parameter-&uuml;bersicht</b><br />
-<a href="#LoginType">LoginType</a><br />
-<a href="#ParamAuth">ParamAuth</a><br />
-<a href="#Parameter">&nbsp;&nbsp;ParamAuth/Parameter</a><br />
-<a href="#BasicAuth">BasicAuth</a><br />
-<a href="#HeaderAuth">HeaderAuth</a><br />
-<a href="#Header">&nbsp;&nbsp;HeaderAuth/Header</a><br />
-<br />
-<a href="#sp-config"><b>Konfiguration<br />von MOA-SP</b></a><br />
-<br />
-<a href="#verifytransformsInfoProfile">VerifyTransformsInfoProfile</a><br />
-<a href="#trustProfile">TrustProfile</a><br />
-<a href="#certstore">Certstore</a><br />
-<br />
-<a href="#online-config"><b>&auml;nderung der Konfig. <br />w&auml;hrend des Betriebs</b></a><br />
-
-<br />
-</div>
-
-</td>
-
-<td valign="top">
-<div id="titel">Konfiguration von MOA ID v.1.1</div>
-
-<div id="moaid-konfiguration" />
-<p id="subtitel">Konfiguration von MOA ID v.1.1</p>
-<p id="block">
-Die Konfiguration von MOA ID wird mittels einer XML-basierten Konfigurationsdatei, die dem Schema
-<a href="../MOA-ID-Configuration-1.1.xsd" target="_new">MOA-ID-Configuration-1.1.xsd</a> entspricht, durchgef&uuml;hrt.
-<p />
-Der Ort der Konfigurationsdatei wird im Abschnitt <a href="id-admin_1.htm#deployment">Deployment der Web-Applikation
-in Tomcat</a> beschrieben.
-<p />
-Die folgenden Abschnitte erl&auml;utern das Format der Konfigurationsdatei.
-<a href="examples/conf/MOA-ID-Configuration.xml" target="_new">MOA-ID-Configuration.xml</a> zeigt ein Beispiel
-f&uuml;r eine umfassende Konfigurationsdatei.
-</p>
-Enth&auml;lt die Konfigurationsdatei relative Pfadangaben, werden diese relativ zum Verzeichnis, in dem Tomcat gestartet wurde, interpretiert.
-
-<div id="ConnectionParameter" />
-<p id="block">
-<b>ConnectionParameter</b> <br />
-Das Element <tt>ConnectionParameter</tt> enth&auml;lt Parameter, die MOA-ID f&uuml;r den Aufbau von Verbindungen zu anderen Komponenten
-ben&ouml;tigt. Dieses Element tritt mehrfach in der Konfigurationsdatei auf und wird daher vorab detailliert beschrieben.
-<br /><br />
-Das Attribut <tt>URL</tt> enth&auml;lt die URL der Komponente zu der die Verbindung aufgebaut werden soll.
-Wird das Schema <tt>https</tt> verwendet, k&ouml;nnen die Kind-Elemente <tt>AcceptedServerCertificates</tt>
-und <tt>ClientKeyStore</tt> angegeben werden. Wird das Schema <tt>http</tt> verwendet m&uuml;ssen keine Kind-Elemente
-angegeben werden bzw. werden diese nicht ausgewertet. Andere Schemas werden nicht unterst&uuml;tzt.
-<br /><br />
-Wird die Verbindung &uuml;ber TLS aufgebaut und erfordert der TLS-Server eine Client-Authentisierung
-mittels Zertifikate, dann muss das Kind-Element <tt>ClientKeyStore</tt> spezifiziert werden, und es muss
-eine URL enthalten, die einen PKCS#12-Keystore mittels URL-Schema 'file:' referenziert.
-Diesem Keystore wird der private Schl&uuml;ssel f&uuml;r die TLS-Client-Authentisierung entnommen.
-Das Passwort zum Lesen des privaten Schl&uuml;ssels wird im Attribut <tt>ClientKeyStore/@password</tt> konfiguriert.<br />
-Aufgrund der Tatsache, dass starke Verschl&uuml;sselung eine Voraussetzung f&uuml;r MOA-ID darstellt, werden clientseitig nur die folgenden Cipher Suites unterst&uuml;tzt:<br/>
-<ul>
-<li><tt>SSL_RSA_WITH_RC4_128_SHA</tt></li>
-<li><tt>SSL_RSA_WITH_RC4_128_MD5</tt></li>
-<li><tt>SSL_RSA_WITH_3DES_EDE_CBC_SHA</tt></li>
-</ul>
-Im Kind-Element <tt>AcceptedServerCertificates</tt> kann ein Verzeichnisname angegeben werden, in dem die
-akzeptierten Zertifikate der TLS-Verbindung hinterlegt sind. Dieses Verzeichnis wird mittels URL-Schema 'file:' referenziert. In diesem Verzeichnis werden nur Serverzertifikate
-abgelegt. Fehlt dieser Parameter wird lediglich &uuml;berpr&uuml;ft ob ein Zertifikatspfad zu den im Element <tt>&lt;TrustedCACertificates&gt;</tt> angegebenen Zertifikaten erstellt werden kann. Falls dies nicht m&ouml;glich ist, kommt es zu einem Fehlerfall.
-</p>
-
-
-<div id="AuthComponent" />
-<p id="block">
-<b>AuthComponent</b> <br />
-<tt>AuthComponent</tt> enth&auml;lt Parameter, die nur die MOA-ID Authentisierungskomponente betreffen.
-Das Element ist optional und muss nicht verwendet werden, wenn auf dem Server keine MOA-ID Authentisierungskomponente
-installiert wird.
-<br /><br />
-Das Element <tt>AuthComponent</tt> hat vier Kind-Element:
-<ul>
-<li><tt>BKUSelection</tt> (optional)</li>
-<li><tt>SecurityLayer</tt></li>
-<li><tt>MOA-SP</tt></li>
-<li><tt>IdentityLinkSigners</tt></li>
-</ul>
-</p>
-
-<div id="BKUSelection" />
-<p id="block">
-<b>AuthComponent/BKUSelection</b> <br />
-Das optionale Element <tt>BKUSelection</tt> enth&auml;lt Parameter zur Nutzung eines Auswahldienstes f&uuml;r eine
-B&uuml;rgerkartenumgebung (BKU). Wird das Element nicht angegeben, dann wird die lokale B&uuml;rgerkartenumgebung
-auf <tt>http://localhost:3495/http-security-layer-request</tt> verwendet.
-<br /><br />
-Das Attribut <tt>BKUSelectionAlternative</tt> gibt an welche Alternative zur BKU-Auswahl verwendet werden soll. MOA-ID
-unterst&uuml;tzt die Werte <tt>HTMLComplete</tt> (vollst&auml;ndige HTML-Auswahl) und <tt>HTMLSelect</tt> (HTML-Code f&uuml;r Auswahl)
-[<a href="../bku-auswahl.20030408.pdf">"Auswahl von B&uuml;rgerkartenumge-bungen"</a>, Arno Hollosi].
-<br /><br />
-Das Kind-Element <tt>ConnectionParameter</tt> spezifiziert die Verbindung zum Auswahldienst (siehe
-<a href="#ConnectionParameter"><tt>ConnectionParameter</tt></a>), jedoch kann das Kind-Element <tt>ClientKeyStore</tt>
-nicht angegeben werden.
-</p>
-
-<div id="SecurityLayer" />
-<p id="block">
-<b>AuthComponent/SecurityLayer</b> <br />
-Das Element <tt>SecurityLayer</tt> enth&auml;lt Parameter zur Nutzung des Security-Layers.
-<br /><br />
-Das Kind-Element <tt>TransformsInfo</tt> spezifiziert eine Transformation, die f&uuml;r die Erstellung der Signatur
-des AUTH-Blocks als Parameter in den <tt>CreateXMLSignatureRequest</tt> des Security-Layers integriert werden muss.
-Mehrere unterschiedliche Implementierungen des Security-Layer k&ouml;nnen durch die Angabe mehrerer <tt>TransformsInfo</tt>-Elemente unterst&uuml;tzt werden.
-<br /><br />
-Das Attribut <tt>TransformsInfo/@filename</tt> verweist auf eine Datei, die das globale Element <tt>TransformsInfo</tt> vom Typ
-<tt>TransformsInfo</tt> enth&auml;lt. Das Encoding dieser Datei muss (anders als im Beispiel) UTF-8 sein.
-<br /><br />
-<a href="examples/TransformsInfoAuthBlock.txt">Beispiel f&uuml;r eine TransformsInfo-Datei</a>
-</p>
-
-<div id="MOA-SP" />
-<p id="block">
-<b>AuthComponent/MOA-SP</b> <br />
-Das Element <tt>MOA-SP</tt> enth&auml;lt Parameter zur Nutzung von MOA-SP. MOA-SP wird f&uuml;r die &uuml;berpr&uuml;fung der Signatur
-der Personenbindung und des AUTH-Blocks verwendet.
-<br /><br />
-Wird das Kind-Element <tt>ConnectionParameter</tt> angegeben, dann wird MOA-SP &uuml;ber das Webservice angesprochen, andernfalls
-wird MOA-SP &uuml;ber das API angesprochen.
-<br /><br />
-Das Kind-Element <tt>VerifyIdentityLink/TrustProfileID</tt> spezifiziert eine TrustProfileID, die f&uuml;r den
-<tt>VerifyXMLSignatureRequest</tt> zur &uuml;berpr&uuml;fung der Signatur der Personenbindung verwendet werden muss.
-<br /><br />
-Die Kind-Elemente <tt>VerifyAuthBlock/TrustProfileID</tt> und <tt>VerifyAuthBlock/VerifyTransformsInfoProfileID</tt>
-spezifizieren eine TrustProfileID und eine ID f&uuml;r ein Transformationsprofil, die f&uuml;r den
-<tt>VerifyXMLSignatureRequest</tt> zur &uuml;berpr&uuml;fung der Signatur des Auth-Blocks verwendet werden m&uuml;ssen.
-</p>
-
-<div id="IdentityLinkSigners" />
-<p id="block">
-<b>AuthComponent/IdentityLinkSigners</b> <br />
-Dieses Element gibt an von welchen Signatoren die Signatur des IdentityLink erstellt werden musste
-damit der IdentityLink akzeptiert wird. F&uuml;r jeden Signator muss der <tt>X509SubjectName</tt> nach RFC 2253
-spezifiziert werden.
-<br /><br />
-<a href="examples/IdentityLinkSigners.txt">Beispiel</a>
-<br /><br />
-</p>
-
-<div id="ProxyComponent" />
-<p id="block">
-<b>ProxyComponent</b> <br />
-<tt>ProxyComponent</tt> enth&auml;lt Parameter, die nur die MOA-ID Proxykomponente betreffen.
-Das Element ist optional und muss nicht verwendet werden, wenn auf dem Server keine MOA-ID Proxykomponente
-installiert wird.
-<br /><br />
-Das Element <tt>ProxyComponent</tt> hat nur das Kind-Element <tt>AuthComponent</tt>, das die Verbindung zur
-Authentisierungs-komponente beschreibt.
-<br /><br />
-Baut die Proxykomponente die Verbindung zur Authentisierungs-komponente
-&uuml;ber ein Webservice auf, dann muss das Element <tt>ConnectionParameter</tt> spezifiziert werden.
-<br /><br />
-Baut die Proxykomponente die Verbindung zur Authentisierungs-komponente
-&uuml;ber das API auf, dann wird das Element <tt>ConnectionParameter</tt> nicht spezifiziert.
-</p>
-
-<div id="OnlineApplication" />
-<p id="block">
-<b>OnlineApplication</b> <br />
-F&uuml;r jede Online-Applikation, die &uuml;ber MOA-ID authentisiert wird, gibt es ein Element <tt>OnlineApplication</tt>.
-Die Parameter betreffen teils die MOA-ID Authentisierungskomponente, teils die MOA-ID Proxykomponente, teils beide.
-<br /><br />
-Das Attribut <tt>OnlineApplication/@publicURLPrefix</tt> entspricht dem URL-Pr&auml;fix der nach au&szlig;en sichtbaren
-Dom&auml;ne der Online-Applikation, welcher von der MOA-ID Proxykomponente durch den URL-Pr&auml;fix der wirklichen
-Dom&auml;ne (Attribut <tt>OnlineApplication/ProxyComponent/ConnectionParameter/@URL</tt>) ersetzt wird.
-Es dient als Schl&uuml;ssel zum Auffinden der Konfigurationsparameter zur Online-Applikation.
-<br /><br />
-Das Element <tt>OnlineApplication</tt> hat optional zwei Kind-Elemente: <tt>AuthComponent</tt> und <tt>ProxyComponent</tt>.
-</p>
-
-<div id="OnlineApplication/AuthComponent" />
-<p id="block">
-<b>OnlineApplication/AuthComponent</b> <br />
-Das Element <tt>OnlineApplication/AuthComponent</tt> muss verwendet werden wenn auf dem Server die Authentisierungskomponente
-installiert wird. Es enth&auml;lt Parameter, die das Verhalten der Authentisierungskomponente bez&uuml;glich der Online-Applikation
-konfiguriert.
-<br /><br />
-Das Attribut <tt>provideZMRZahl</tt> bestimmt, ob die ZMR-Zahl in den Anmeldedaten aufscheint.
-Analog steuern die Attribute <tt>provideAUTHBlock</tt> und <tt>provideIdentityLink</tt>, ob die Anmeldedaten
-den Auth-Block bzw. die Personenbindung enthalten. Alle Attribute sind optional und haben den Default-Wert <tt>false</tt>.
-<br /><br />
-</p>
-
-<div id="OnlineApplication/ProxyComponent" />
-<p id="block">
-<b>OnlineApplication/ProxyComponent</b> <br />
-Das Element <tt>OnlineApplication/ProxyComponent</tt> muss verwendet werden wenn auf dem Server die Proxykomponente
-installiert wird.
-<br /><br />
-Das optionale Attribut <tt>configFileURL</tt> verweist auf eine Konfigurationsdatei die dem Schema
-<a href="../MOA-ID-Configuration-1.1.xsd" target="_new">MOA-ID-Configuration-1.1.xsd</a> entspricht mit Dokument-Element
-<tt>Configuration</tt>.<br />
-Default-Wert: <tt>http://&lt;realURLPrefix&gt;/MOAConfig.xml</tt>
-<br/>(<tt>&lt;realURLPrefix&gt;</tt> entspricht dem Wert von <tt>OnlineApplication/ProxyComponent/ConnectionParameter/@URL</tt>)
-<br /><br />
-Das optionale Attribut <tt>sessionTimeOut</tt> legt das Timeout einer Benutzersession in der
-Proxykomponente in Sekunden fest.<br />
-Default-Wert: 3600
-<br /><br />
-Im optionalen Attribut <tt>loginParameterResolverImpl</tt> kann der Klassenname eines
-zu verwendenden <tt>LoginParameterResolver</tt> angegeben werden, welcher die Defaultimplementierung ersetzt.
-<br /><br />
-Im optionalen Attribut <tt>connectionBuilderImpl</tt> kann der Klassenname eines zu verwendenden
-ConnectionBuilder angegeben werden, welcher die Defaultimplementierung ersetzt.
-<br /><br />
-Im Kind-Element <tt>ConnectionParameter</tt> ist konfiguriert, wie MOA-ID-PROXY zur Online-Applikation verbindet.
-</p>
-
-<div id="ChainingModes" />
-<p id="block">
-<b>ChainingModes</b><br />
-Das Element <tt>ChainingModes</tt> definiert, ob bei der Zertifikatspfad-&uuml;berpr&uuml;fung das Kettenmodell
-(<tt>"chaining"</tt>) oder das Modell nach PKIX RFC 3280 (<tt>"pkix"</tt>) verwendet werden soll.
-<br /><br />
-Das Attribut <tt>systemDefaultMode</tt> spezifiziert das Modell, das im Standardfall verwendet werden soll.
-<br/><br/>
-Mit dem Kind-Element <tt>TrustAnchor</tt> kann f&uuml;r jeden Trust Anchor ein abweichendes Modell spezifiziert werden.
-Ein Trust Anchor ist ein Zertifikat, das in <tt>TrustedCACertificates</tt> spezifiziert ist.
-Ein Trust Anchor wird durch den Typ <tt>&lt;dsig:X509IssuerSerialType&gt;</tt> spezifiziert.
-Das f&uuml;r diesen Trust Anchor g&uuml;ltige Modell wird durch das Attribut <tt>mode</tt> spezifiziert.
-<br/><br/>
-G&uuml;ltige Werte f&uuml;r die Attribute <tt>systemDefaultMode</tt> und <tt>mode</tt> sind <tt>"chaining"</tt> und <tt>"pkix"</tt>.
-<br/><br/>
-<a href="examples/ChainingModes.txt">Beispiel</a>
-</p>
-
-<div id="TrustedCACertificates" />
-<p id="block">
-<b>TrustedCACertificates</b><br />
-Das Element <tt>TrustedCACertificates</tt> enth&auml;lt eine URL, die auf ein Verzeichnis verweist, das jene Zertifikate
-enth&auml;lt, die als vertrauensw&uuml;rdig betrachtet werden. Diese URL muss mittels URL-Schema 'file:' referenziert werden. Im Zuge der &Uuml;berpr&uuml;fung der TLS-Serverzertifikate wird die
-Zertifikatspfaderstellung an einem dieser Zertifikate beendet.
-</p>
-
-<div id="GenericConfiguration" />
-<p id="block">
-<b>GenericConfiguration</b><br />
-Das Element <tt>GenericConfiguration</tt> erm&ouml;glicht das Setzen von Namen-Werte Paaren mittels der Attribute
-<tt>name</tt> und <tt>value</tt>. Die folgende Liste spezifiziert
-<ul>
-<li>g&uuml;ltige Werte f&uuml;r das name-Attribut, </li>
-<li>eine Beschreibung </li>
-<li>g&uuml;ltige Werte f&uuml;r das value-Attribut und (falls vorhanden)</li>
-<li>den Default-Wert f&uuml;r das value-Attribut. </li>
-</ul>
-
-<table border="0" cellspacing="3" cellpadding="2">
-<tr id="DirectoryCertStoreParameters.RootDir"><th align="left">name: DirectoryCertStoreParameters.RootDir</th></tr>
-<tr><td id="info">
-Gibt den Pfadnamen zu einem Verzeichnis an, das als Zertifikatsspeicher im Zuge der TLS-Server-Zertifikats&uuml;berpr&uuml;fung
-verwendet wird.<br />
-<hr />
-<b>value: </b><br />
-G&uuml;ltige Werte: Name eines g&uuml;ltigen Verzeichnisses<br />
-<b>Dieser Parameter muss angegeben werden.</b>
-</td></tr>
-</table>
-
-<table border="0" cellspacing="3" cellpadding="2">
-<tr id="AuthenticationSession.TimeOut"><th align="left">name: AuthenticationSession.TimeOut</th></tr>
-<tr><td id="info">
-Gibt die Zeitspanne in Sekunden vom Beginn der Authentisierung bis zum Anlegen der Anmeldedaten an.
-Wird die Angegebene Zeitspanne &uuml;berschritten wird der Anmeldevorgang abgebrochen.
-<br />
-<hr />
-<b>value: </b><br />
-G&uuml;ltige Werte: positive Ganzzahlen <br />
-Default-Wert: 120
-</td></tr>
-</table>
-
-<table border="0" cellspacing="3" cellpadding="2">
-<tr id="AuthenticationData.TimeOut"><th align="left">name: AuthenticationData.TimeOut</th></tr>
-<tr><td id="info">
-Gibt die Zeitspanne in Sekunden an, f&uuml;r die die Anmeldedaten in der Authentisierungskomponente zum Abholen
-durch die Proxykomponente oder eine nachfolgende Applikation bereitstehen. Nach Ablauf dieser Zeitspanne werden die Anmeldedaten gel&ouml;scht.<br />
-<hr />
-<b>value: </b><br />
-G&uuml;ltige Werte: positive Ganzzahlen<br />
-Default-Wert: 600
-</td></tr>
-</table>
-
-<table border="0" cellspacing="3" cellpadding="2">
-<tr id="TrustManager.RevocationChecking"><th align="left">name: TrustManager.RevocationChecking</th></tr>
-<tr><td id="info">
-F&uuml;r die TLS-Server-Authentisierung d&uuml;rfen nur Server-Zertifikate verwendet werden, die eine CRLDP-Extension enthalten (andernfalls kann von MOA-ID keine CRL-&uuml;berpr&uuml;fung durchgef&uuml;hrt werden).
-<br />Soll das RevocationChecking generell ausgeschaltet werden, ist dieses Attribut anzugeben und auf "false" zu setzen.
-<br />
-<hr />
-<b>value: </b><br />
-G&uuml;ltige Werte: true, false<br />
-Default-Wert: true
-</td></tr>
-</table>
-
-
-</td></tr></table>
-
-
-<br /><br />
-<div id="oa-config" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<p id="subtitel">Konfiguration der Online-Applikation</p>
-<div id="block">
-Die Konfiguration der OA beschreibt die Art und Weise, wie die Proxykomponente die Anmeldung an der Online-Applikation
-durchf&uuml;hrt.
-<br /><br />
-Der Name der Konfigurationsdatei wird in der Konfiguration von MOA-ID als Wert des Attributs
-<tt>configFileURL</tt> des Elements <tt>MOA-IDConfiguration/OnlineApplication/ProxyComponent</tt> hinterlegt.
-<br/>Ist dieses Attribut nicht gesetzt, dann wird die Datei von <tt>http://&lt;realURLPrefix&gt;/MOAConfig.xml</tt> geladen,
-wobei <tt>&lt;realURLPrefix&gt;</tt> dem Konfigurationswert <tt>OnlineApplication/ProxyComponent/ConnectionParameter/@URL</tt> entspricht.
-<br /><br />
-Die Konfigurationsdatei ist eine XML-Datei, die dem Schema
-<a href="../MOA-ID-Configuration-1.1.xsd" target="_new">MOA-ID-Configuration-1.1.xsd</a> mit dem Wurzelelement
-<tt>Configuration</tt> entspricht.
-</div>
-
-<div id="LoginType" />
-<p id="block">
-<b>LoginType</b><br />
-Das Element <tt>LoginType</tt> gibt an, ob die Online-Applikation ein einmaliges Login erwartet (<tt>stateful</tt>),
-oder ob die Login-Parameter bei jedem Request mitgegeben werden m&uuml;ssen (<tt>stateless</tt>). Im Fall einer stateful
-Online-Applikation werden die in der HTTP-Session der Proxykomponente gespeicherten Anmeldedaten nur f&uuml;r den Aufruf
-des Login-Scripts verwendet. Unmittelbar nach dem Aufruf werden sie gel&ouml;scht.
-<br />
-Default-Wert: <tt>stateful</tt>
-</p>
-</div>
-
-<div id="ParamAuth" />
-<p id="block">
-<b>ParamAuth</b><br />
-Konfiguriert die &uuml;bergabe der Authentisierungs-Parameter an die Online-Applikation mittels URL-Parametern. Das Element
-kann ein oder mehrere Kind-Elemente <tt>&lt;Parameter&gt;</tt> beinhalten.
-</p>
-</div>
-
-<div id="Parameter" />
-<p id="block">
-<b>ParamAuth/Parameter</b><br />
-Das Element <tt>&lt;Paramter&gt;</tt> enth&auml;lt die Attribute <tt>Name</tt> und <tt>Value</tt>.
-<br /><br />
-Das Attribut <tt>Name</tt> beschreibt den Namen des Parameters und ist ein frei zu w&auml;hlender String.
-<br /><br />
-Das Attribut <tt>Value</tt> beschreibt den Inhalt des Parameters und kann einen der durch <tt>MOAAuthDataType</tt> beschriebenen
-Werte annehmen. G&uuml;ltige Werte von <tt>MOAAuthDataType</tt> sind:
-<ul>
-<li><tt>MOAGivenName</tt> - der Vorname des Benutzers, wie in der Personenbindung enthalten
-<li><tt>MOAFamilyName</tt> - der Nachname des Benutzers, wie in der Personenbindung enthalten
-<li><tt>MOADateOfBirth</tt> - das Geburtsdatum des Benutzers, wie in der Personenbindung enthalten
-<li><tt>MOAVPK</tt> - die verfahrensspezifische Personenkennzeichnung des Benutzers, wie von der
-Authentisierungskomponente berechnet
-<li><tt>MOAPublicAuthority</tt> - wird durch <tt>true</tt> ersetzt, falls der Benutzer mit einem Zertifikat signierte,
-welches eine <a href="../CIO X509ext-20030218.pdf">Beh&ouml;rdenerweiterung</a> beinhaltet. Andernfalls wird <tt>false</tt> gesetzt
-<li><tt>MOABKZ</tt> - das Beh&ouml;rdenkennzeichen (nur sinnvoll, wenn <tt>MOAPublicAuthority</tt> den Wert <tt>true</tt>
-ergibt)
-<li><tt>MOAQualifiedCertificate</tt> - wird durch <tt>true</tt> ersetzt, falls das Zertifikat des Benutzers
-qualifiziert ist, andernfalls wird <tt>false</tt> gesetzt
-<li><tt>MOAZMRZahl</tt> - die ZMR-Zahl des Benutzers; diese ist nur dann verf&uuml;gbar, wenn die Online-Applikation
-die ZMR-Zahl bekommen darf (und daher in der Personenbindung enthalten ist)
-<li><tt>MOAIPAddress</tt> - IP-Adresse des Client des Benutzers.
-</ul>
-
-Anhand der <tt>&lt;Parameter&gt;<tt>-Elemente wird der Request f&uuml;r den Login-Vorgang (f&uuml;r stateful Online-Applikationen)
-folgenderma&szlig;en zusammenge-stellt:<br />
-<blockquote>
-<code>GET https://&lt;login-url&gt;?<br />
-&nbsp;&nbsp;&lt;p1.name=p1.resolvedValue&gt;&<br />
-&nbsp;&nbsp;&lt;p2.name=p2.resolvedValue&gt;...</code>
-</blockquote>
-<p id="block">
-Die <tt>&lt;login-url&gt;</tt> ergibt sich aus dem Parameter OA des <a href="id-anwendung_1.htm">Aufrufs von MOA-ID-AUTH</a>,
-zusammen mit der Konfiguration von <tt>OnlineApplication/@publicURLPrefix</tt> und von <tt>OnlineApplication/ProxyComponent/ConnectionParameter/@URL</tt>.
-<br/>Der Wert <tt>resolvedValue</tt> wird in MOA-ID-PROXY je nach Wert des Platzhalters eingesetzt.
-</p>
-</div>
-<div id="BasicAuth" />
-<p id="block">
-<b>BasicAuth</b><br />
-Das Element <tt>BasicAuth</tt> konfiguriert die &uuml;bergabe der Authentisierungs-Parameter an die Online-Appliktion
-mittels HTTP Basic Authentication. Es enth&auml;lt zwei Kind-Elemente.
-<br /><br />
-Das Element <tt>UserID</tt> gibt die UserId des zu authentisierenden Benutzers an und kann einen der durch
-<tt>MOAAuthDataType</tt> beschriebenen Werte annehmen.
-<br /><br />
-Das Element <tt>Password</tt> gibt das Passwort des zu authentisierenden Benutzers an und kann einen der durch
-<tt>MOAAuthDataType</tt> beschriebenen Werte annehmen.
-</p>
-</div>
-
-<div id="HeaderAuth" />
-<p id="block">
-<b>HeaderAuth</b><br />
-Das Element <tt>HeaderAuth</tt> konfiguriert die &uuml;bergabe der Authentisierungs-Parameter an die Online-Applikation
-in HTTP Request Headern. Das Element kann ein oder mehrere Kind-Elemente <tt>&lt;Header&gt;</tt> beinhalten.
-</p>
-</div>
-
-<div id="Header" />
-<p id="block">
-<b>HeaderAuth/Header</b><br />
-Das Element <tt>&lt;Header&gt;</tt> enth&auml;lt die Attribute Name und Value.
-<br /><br />
-Das Attribut <tt>Name</tt> beschreibt den Namen des Header und ist ein frei zu w&auml;hlender String.
-<br /><br />
-Das Attribut <tt>Value</tt> beschreibt den Inhalt des Header und kann einen der durch <tt>MOAAuthDataType</tt>
-beschriebenen Werte annehmen.
-<br /><br />
-Die Header werden folgenderma&szlig;en in den Request an die Online-Applikation eingef&uuml;gt:
-<blockquote><pre>
-&lt;h1.name&gt;:&lt;h1.resolvedValue&gt;
-&lt;h2.name&gt;:&lt;h2.resolvedValue&gt;
-...
-</pre></blockquote>
-Der Wert <tt>resolvedValue</tt> wird in der Proxykomponente je nach Wert des Platzhalters eingesetzt.
-Etwaige Header aus dem urspr&uuml;nglichen Request an die Proxykomponente, die denselben Namen haben, m&uuml;ssen
-&uuml;berschrieben werden.
-</p>
-</div>
-</td></tr></table>
-
-
-<div id="sp-config" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<p id="subtitel">Konfiguration von MOA-SP</p>
-<div id="block">
-
-<p id="block">
-MOA-ID &uuml;berpr&uuml;ft die Signaturen der Personenbindung und des AUTH-Blocks mit dem <tt>VerifyXMLSignatureRequest</tt>
-von MOA-SP. Dazu muss MOA-SP wie unten beschreiben konfiguriert werden.
-<br /><br />
-Ein Auszug einer beispielhaften MOA-SP Konfigurationsdatei, die diese Konfigurationsparameter enth&auml;lt ist in
-<tt>$MOA_ID_INST_AUTH/conf/moa-spss/ SampleMOASPSSConfiguration.xml</tt> enthalten.
-
-</p>
-
-<div id="verifytransformsInfoProfile" />
-<p id="block">
-<b>VerifyTransformsInfoProfile</b><br />
-Der Request zum &uuml;berpr&uuml;fen der Signatur des AUTH-Blocks verwendet ein vordefiniertes VerifyTransformsInfoProfile.
-Die im Request verwendete Profil-ID wird in der MOA-ID Konfigurationsdatei
-im Element <tt>/MOA-IDConfiguration/ AuthComponent/MOA-SP/VerifyAuthBlock/ VerifyTransformsInfoProfileID</tt> definiert.
-Entsprechend muss am MOA-SP Server ein VerifyTransformsInfoProfile mit gleichlautender ID definiert werden. Die
-Profiledefinition selbst ist in der Auslieferung von MOA-ID in <tt>$MOA_ID_INST_AUTH/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml</tt>
-enthalten. Diese Profildefinition muss unver&auml;ndert &uuml;bernommen werden.
-</p>
-</div>
-
-<div id="trustProfile" />
-<p id="block">
-<b>TrustProfile</b><br />
-Die Requests zur &uuml;berpr&uuml;fung der Signatur verwenden vordefinierte TrustProfile.
-Die im Request verwendete Profil-IDs werden in der MOA-ID Konfigurationsdatei
-in den Elementen <tt>/MOA-IDConfiguration/AuthComponent/MOA-SP/VerifyIdentityLink/ TrustProfileID</tt> und
-<tt>/MOA-IDConfiguration/AuthComponent/MOA-SP/VerifyAuthBlock/TrustProfileID</tt> definiert. Diese beiden Elemente
-k&ouml;nnen unterschiedliche oder identische TrustProfileIDs enthalten.
-Am MOA-SP Server m&uuml;ssen TrustProfile mit gleichlautender ID definiert werden.
-Die Auslieferung von MOA-ID enth&auml;lt das Verzeichnis <tt>$MOA_ID_INST_AUTH/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot</tt>,
-das als TrustProfile verwendet werden kann. Weitere Zertifikate k&ouml;nnen als vertrauensw&uuml;rdig hinzugef&uuml;gt werden.
-</p>
-</div>
-
-<div id="certstore" />
-<p id="block">
-<b>Certstore</b><br />
-Zum Aufbau eines Zertifikatspfades k&ouml;nnen ben&ouml;tigte Zertifikate aus einem Zertifikatsspeicher verwendet werden.
-Die Auslieferung von MOA-ID enth&auml;lt das Verzeichnis <tt>$MOA_ID_INST_AUTH/conf/moa-spss/certstore</tt>, das als initialer
-Zertifikatsspeicher verwendet werden kann.
-</p>
-</div>
-
-</div>
-</td></tr></table>
-
-
-<div id="online-config" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<p id="subtitel">&Auml;nderung der Konfiguration w&auml;hrend des Betriebs</p>
-<div id="block">
-Der Inhalt dieser Konfiguration, bzw. jene Teile, auf die indirekt verwiesen wird, k&ouml;nnen w&auml;hrend des laufenden
-Betriebes des MOA-Servers ge&auml;ndert werden. Der Server selbst wird durch den Aufruf einer <a href="id-admin_1.htm#ConfigUpdate">URL</a>
-(im Applikationskontext von MOA ID) dazu veranlasst, die ge&auml;nderte Konfiguration neu einzulesen.
-Im Falle einer fehlerhaften neuen Konfiguration wird die urspr&uuml;ngliche Konfiguration beibehalten.
-</div>
-
-
-</td></tr></table>
-<br /><br />
-
-
-
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/doc/moa_id/id-admin_3.htm b/id.server/doc/moa_id/id-admin_3.htm
deleted file mode 100644
index 92d13aa6a..000000000
--- a/id.server/doc/moa_id/id-admin_3.htm
+++ /dev/null
@@ -1,187 +0,0 @@
-<html>
-<head>
- <title>MOA ID-Administration</title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- th { font-family:"Verdana", "Arial"; font-size:10pt; font-weight:bold; color:#d8d8d8; background:#505050}
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- tt { font-size:9pt; color:#505060; }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; font-weight:bold; color:#505060; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:3px }
- #info { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; padding:3px; border:solid 1px #c0c0c0 }
- #infolist { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module f&uuml;r Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">MOA-ID</div><br />
-<div id="klein"><a href="id-admin.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Übersicht</b></a></div>
-<div id="klein"><a href="id-admin_1.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Basis-Installation</b></a></div>
-<div id="klein"><a href="id-admin_2.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Konfiguration </b></a></div>
-<div id="klein"><img src="../moa_images/select.gif" border="0" width="13" height="14" />
- <b> Optionale<br />&#160; &#160;&#160;Komponenten</b></div>
-<br />
-<div id="klein"><a href="moa.htm"><img src="../moa_images/west.gif" border="0" width="13" height="14" />
- <b> Zur&uuml;ck</b></a></div>
-<br />
-<div id="slogan">
-<b>Optionale <br />Komponenten</b><br />
-<a href="#IIS"><b>IIS </b></a><br />
-<a href="#Apache"><b>Apache </b></a><br />
-<a href="#SQL"><b>PostgreSQL </b></a><br />
-</div>
-</td>
-
-<div id="IIS" />
-<td valign="top">
-<p id="titel">Konfiguration der optionalen Komponenten</p>
-<p id="subtitel">Konfiguration des Microsoft Internet Information Server (optional)</p>
-<div id="block">
-Vor MOA-ID-AUTH oder MOA-ID-PROXY kann optional ein MS IIS vorgeschaltet sein. In diesem Fall &uuml;bernimmt der MS IIS die HTTP bzw. HTTPS-Kommunikation mit dem Aufrufer des Webservices. Die Kommunikation zwischen MS IIS und dem in Tomcat deployten Webservice wird durch Jakarta mod_jk durchgef&uuml;hrt.<br /><br />
-<b>Konfiguration von Jakarta mod_jk im MS IIS</b><br />
-F&uuml;r die Kommunikation des MS IIS mit dem im Tomcat deployten Webservice wird das ISAPI-Modul von Jakarta mod_jk im MS IIS installiert und konfiguriert. Eine detaillierte Installations- und Konfigurationsanleitung gibt das <a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/jk/iishowto.html" target="_new">mod_jk IIS HowTo</a>. Beispiele f&uuml;r <tt>workers.properties</tt> und <tt>uriworkermap.properties</tt> Dateien liegen im ausgelieferten moa-id-auth-x.y.zip bzw. moa-id-proxy-x.y.zip, Verzeichnis tomcat bei.
-<br /><br />
-<b>Konfiguration von Tomcat</b><br />
-Damit Tomcat die Aufrufe, die von MS IIS mittels Jakarta mod_jk weiterleitet, entgegennehmen kann, muss in $CATALINA_HOME/conf/server.xml der AJP 1.3 Connector aktiviert werden. Im Gegenzug k&ouml;nnen die Connectoren f&uuml;r HTTP und HTTPS deaktiviert werden. Das geschieht am einfachsten durch ein- bzw. auskommentieren der entsprechenden <tt>Connector</tt> Konfigurations-Elemente in dieser Datei.
-<br /><br />
-</div>
-<div id="block">
-<b>Konfiguration von SSL</b><br />
-Die Dokumentation zum Einrichten von SSL auf dem MS IIS steht nach Installation des IIS unter http://localhost/iisHelp/ bzw. <a href="http://www.microsoft.com/windows2000/en/server/iis/default.asp" target="_new">online</a> zur Verf&uuml;gung.
-</div>
-</td></tr></table>
-<br /><br />
-
-
-<div id="Apache" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<p id="subtitel">Konfiguration des Apache Webservers (optional)</p>
-<div id="block">
-Vor MOA-ID-AUTH oder MOA-ID-PROXY kann ein Apache Webserver vorgeschaltet sein. Das Prinzip funktioniert wie bei MS IIS, auch hier wird Jakarta mod_jk f&uuml;r die Kommunikation zwischen Webserver und Tomcat eingesetzt.
-<br /><br />
-<b>Konfiguration von Jakarta mod_jk im Apache Webserver</b><br />
- Um MOA-ID-AUTH oder MOA-ID-PROXY hinter einem Apache Webserver zu betreiben, ist die Konfiguration des Apache-Moduls mod_jk erforderlich. Eine detaillierte Installations- und Konfigurationsanleitung gibt das <a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/jk/aphowto.html" target="_new">mod_jk Apache HowTo</a>. Ein Beispiel f&uuml;r eine <tt>workers.properties</tt> Datei liegt im Verzeichnis $MOA_SPSS_INST/conf/moa bei.<br />
-Um MOA-ID-AUTH oder MOA-ID-PROXY dem Apache Webserver bekannt zu machen, muss folgender Eintrag in die Apache Konfigurationsdatei gemacht werden:
-<pre>
- JkMount /moa-id-auth/* moaworker
-</pre>
-oder f&uuml;r die Proxy-Komponente
-<pre>
- JkMount /* moaworker
-</pre>
-
-<br /><br />
-<b>Konfiguration von Tomcat</b><br />
-Die Konfiguration von Tomcat ist analog wie im Abschnitt &uuml;ber den MS IIS durchzuf&uuml;hren.
-<br /><br />
-
-<b>Konfiguration von SSL mit mod_SSL </b><br />
-Apache kann in Verbindung mit mod_SSL als SSL-Endpunkt f&uuml;r das MOA-ID-AUTH Webservice fungieren. In diesem Fall entf&auml;llt die SSL-Konfiguration in Tomcat, da Apache und Tomcat auch im Fall von SSL Daten via mod_jk austauschen. Eine detaillierte Installations- und Konfigurationsanleitung von mod_SSL gibt die <a href="http://www.modssl.org/docs/" target="_new">Online-Dokumentation</a>.
-<br /><br />
-Bei der Verwendung von Client-Authentisierung muss darauf geachtet werden, dass mod_ssl die HTTP-Header mit den Informationen &uuml;ber das Client-Zertifikat exportiert. Dies wird durch Angabe der Option<br />
-<pre>
- SSLOptions +ExportCertData +StdEnvVars
-</pre>
-in der Apache-Konfiguration erreicht.<br />
-Weiters muss Jakarta mod_jk angewiesen werden, die SSL Schl&uuml;ssell&auml;nge zu exportieren. Dies geschieht mit der Direktive:
-<pre>
- JkOptions +ForwardKeySize
- +ForwardURICompat
- -ForwardDirectories
-</pre>
-</div>
-</td></tr></table>
-<br /><br />
-
-
-<div id="SQL" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-</td>
-<td valign="top">
-<p id="subtitel">Konfiguration von PostgreSQL</p>
-<div id="block">
-MOA-ID-AUTH bzw. MOA-ID-PROXY kann PostgreSQL zum Abspeichern von Log-Meldungen verwenden. Hierf&uuml;r wird eine installierte und konfigurierte Datenbank vorausgesetzt. Eine detaillierte Übersicht &uuml;ber die Installation und Konfiguration von PostgreSQL gibt die <a href="http://techdocs.postgresql.org/">Online-Dokumentation</a>.<br /><br />
-<b>Logging</b><br />
-F&uuml;r das Logging in eine PostgreSQL Datenbank mittels Jakarta Log4j muss zun&auml;chst eine Tabelle f&uuml;r die Log-Meldungen angelegt werden. Dies kann mit folgendem SQL-Statement erreicht werden:
-<pre>
- create table spss_log
- (log_time timestamp,
- log_level varchar(5),
- log_msg varchar(256));
-</pre>
-Um das Logging in die Datenbank Log4j bekannt zu machen, muss die Log4j-Konfiguration adaptiert werden. Die Datei $MOA_SPSS_INST/conf/moa/log4.properties enth&auml;lt bereits eine beispielhafte Jakarta Log4j-Konfiguration f&uuml;r das Logging in eine PostgreSQL Datenbank, die standardm&auml;&szlig;ig ausgeschaltet ist. Hinweis: Bei Tests hat sich das Logging in eine Datenbank mit Jakarta Log4j als Performance-Engpa&szlig; herausgestellt. Es wird deshalb empfohlen, auf dieses Feature zu verzichten.
-<br /><br />
-</div>
-
-</td></tr></table>
-<br /><br />
-
-
-
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/doc/moa_id/id-anwendung.htm b/id.server/doc/moa_id/id-anwendung.htm
deleted file mode 100644
index 6e33f40e8..000000000
--- a/id.server/doc/moa_id/id-anwendung.htm
+++ /dev/null
@@ -1,104 +0,0 @@
-<html>
-<head>
- <title>MOA ID-Anwendung</title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- th { font-family:"Verdana", "Arial"; font-size:10pt; font-weight:bold; color:#d8d8d8; background:#505050}
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- tt { font-size:9pt; color:#505060; }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; font-weight:bold; color:#505060; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:3px }
- #info { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; padding:3px; border:solid 1px #c0c0c0 }
- #infolist { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module für Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">MOA-ID</div><br />
-<div id="klein"><img src="../moa_images/select.gif" border="0" width="13" height="14" />
- <b> Übersicht</b></div>
-<div id="klein"><a href="id-anwendung_1.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Aufruf MOA-ID-AUTH</b></a></div>
-<div id="klein"><a href="id-anwendung_2.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Abfrage MOA-ID-AUTH </b></a></div>
-<br />
-<div id="klein"><a href="moa.htm"><img src="../moa_images/west.gif" border="0" width="13" height="14" />
- <b> Zurück</b></a></div>
-<br />
-</td>
-
-<td valign="top">
-<div id="titel">MOA ID-Anwendung</div>
-<p id="block">
-MOA-ID führt für eine Online-Applikation (OA) die Benutzeridentifizierung und -authentisierung mit Hilfe der Bürgerkarte durch.
-</p>
-<p id="titel">Übersicht </p>
-Um diese Funktionalität verfügbar zu machen, ist folgendermaßen vorzugehen:<br />
-</p>
-<ul>
-<li>Die OA muss als Webapplikation installiert werden.</li>
-<li>MOA-ID-AUTH muss als Webapplikation <a href="id-admin_1.htm">installiert</a> und für die OA <a href="id-admin_2.htm">konfiguriert</a> werden.</li>
-<li>MOA-ID-AUTH wird durch einen Verweis von einer Webseite aufgerufen.
-Diese Webseite kann z.B. Teil eines Portals sein.</li>
-<li>Nach erfolgter Authentisierung holt die OA die bereitgestellten Anmeldedaten zum Bürger von MOA-ID-AUTH ab.
-Dies kann unter Mithilfe der Webapplikation MOA-ID-PROXY geschehen, die für diesen Zweck <a href="id-admin_1.htm">installiert</a> und für die OA <a href="id-admin_2.htm">konfiguriert</a> werden muss.</li>
-</ul>
-</td></tr></table>
-<br />
-
-
-
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html>
diff --git a/id.server/doc/moa_id/id-anwendung_1.htm b/id.server/doc/moa_id/id-anwendung_1.htm
deleted file mode 100644
index 81c4ecc9e..000000000
--- a/id.server/doc/moa_id/id-anwendung_1.htm
+++ /dev/null
@@ -1,182 +0,0 @@
-<html>
-<head>
- <title>MOA ID-Anwendung</title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- th { font-family:"Verdana", "Arial"; font-size:10pt; font-weight:bold; color:#d8d8d8; background:#505050}
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- tt { font-size:9pt; color:#505060; }
- pre { font-size:9pt; color:#505060; }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; font-weight:bold; color:#505060; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:3px }
- #info { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; padding:3px; border:solid 1px #c0c0c0 }
- #infolist { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module für Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">MOA-ID</div><br />
-<div id="klein"><a href="id-anwendung.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Übersicht</b></a></div>
-<div id="klein"><a href="id-anwendung_1.htm"><img src="../moa_images/select.gif" border="0" width="13" height="14" />
- <b> Aufruf MOA-ID-AUTH</b></a></div>
-<div id="klein"><a href="id-anwendung_2.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Abfrage MOA-ID-AUTH </b></a></div>
-<br />
-<div id="klein"><a href="moa.htm"><img src="../moa_images/west.gif" border="0" width="13" height="14" />
- <b> Zurück</b></a></div>
-</br /><br />
-</td>
-
-
-<td valign="top">
-<p id="titel">Aufruf von MOA-ID-AUTH </p>
-<div id="block">MOA-ID-AUTH wird immer durch eine andere (verweisende) Webseite aufgerufen. Diese Webseite kann z.B. Teil eines Portals sein.
-Der Aufruf erfolgt durch einen Verweis der Form: </div>
-<pre>&lt;a href=&quot;https://&lt;moa-id-server-und-pfad&gt;/
-StartAuthentication?Target=&lt;geschäftsbereich&gt;
-&OA=&lt;oa-url&gt;&Template=&lt;template-url&gt;&quot;&gt;</pre>
-
-<table border="1"><tbody valign="baseline">
-<tr>
-<td id="klein">&lt;moa-id-server-und-pfad&gt;</td><td id="klein">Server und Pfad, wo MOA-ID-AUTH installiert ist</td>
-</tr>
-<tr>
-<td id="klein">Target=&lt;geschäftsbereich&gt;</td><td id="klein">Angabe, f&uuml;r welches Verfahren der Benutzer authentisiert werden soll (siehe TODO: Link auf Verzeichnis der Geschäftsbereich)</td>
-</tr>
-<tr>
-<td id="klein">OA=&lt;oa-url&gt;</td><td id="klein">Webseite, auf die der Browser nach erfolgter Authentisierung weitergeleitet werden soll</td>
-</tr>
-<tr>
-<td id="klein">Template=&lt;template-url&gt;</td><td id="klein">optional; HTML-Vorlage f&uuml;r der Anmeldeseite von MOA-ID-AUTH, &uuml;ber die der B&uuml;rger den Authentisierungsvorgang startet. &Uuml;ber diesen Parameter kann das Aussehen der Anmeldeseite an das Aussehen der Online-Applikation angepasst werden.</td>
-</tr>
-</tbody></table>
-<br/><br/>
-
-<div id="block">
-<b>Template</b><br /><br />
-Ein <a href="examples/Template.html">Template</a> f&uuml;r die Anmeldeseite von MOA-ID-AUTH kann aus folgender Grundstruktur aufgebaut werden: </div>
-<pre>
-&lt;form name="CustomizedForm" action="&lt;BKU&gt;" method="post"&gt;
- &lt;input type="hidden"
- name="XMLRequest"
- value="&lt;XMLRequest&gt;"/&gt;
- &lt;input type="hidden"
- name="DataURL"
- value="&lt;DataURL&gt;"/&gt;
- &lt;input type="submit" value="B&uuml;rgerkarte lesen"/&gt;
-&lt;/form&gt;
-&lt;form name="CustomizedInfoForm"
- action="&lt;BKU&gt;"
- method="post"&gt;
- &lt;input type="hidden"
- name="XMLRequest"
- value="&lt;CertInfoXMLRequest&gt;"/&gt;
- &lt;input type="hidden"
- name="DataURL"
- value="&lt;CertInfoDataURL&gt;"/&gt;
-Hier finden Sie weitere Informationen
-zur &Uuml;berpr&uuml;fung der Zertifikate.&lt;br/&gt;
- &lt;input type="submit" value="Weitere Info"/&gt;
-&lt;/form&gt;
-</pre>
-
-<div id="block">Innerhalb dieser <tt>&lt;form&gt;</tt>-Elemente k&ouml;nnen Texte, Beschriftungen und Styles modifiziert werden,
-und es k&ouml;nnen zus&auml;tzliche Elemente darin aufgenommen werden.
-<br /><br />
-Die vorgegebene Grundstruktur ist aber in jedem Fall einzuhalten, und es m&uuml;ssen die speziellen
-Tags <tt>&lt;BKU&gt;</tt> (kommt 2x vor), <tt>&lt;XMLRequest&gt;</tt>, <tt>&lt;DataURL&gt;</tt>, <tt>&lt;CertInfoXMLRequest&gt;</tt> und <tt>&lt;CertInfoDataURL&gt;</tt>
-darin enthalten sein.
-</div>
-<br /><br />
-
-<div id="block">
-<b>BKU-Auswahl</b><br /><br />
-MOA-ID-AUTH bietet die M&ouml;glichkeit, die B&uuml;rgerkartenumgebung (BKU) auszuw&auml;hlen, &uuml;ber die in weiterer Folge die B&uuml;rgerkarte ausgelesen wird. Der Aufruf erfolgt dann durch einen Verweis der Form: </div>
-<pre>&lt;a href=&quot;https://&lt;moa-id-server-und-pfad&gt;/
-SelectBKU?Target=&lt;geschäftsbereich&gt;
-&OA=&lt;oa-url&gt;&Template=&lt;template-url&gt;
-&BKUSelectionTemplate=&lt;bku-template-url&gt;&quot;&gt;</pre>
-
-<table border="1"><tbody valign="baseline">
-<tr><td id="klein">BKUSelectionTemplate= &lt;bku-template-url&gt;</td>
-<td id="klein">optional; HTML-Vorlage f&uuml;r der BKU-Auswahlseite von MOA-ID-AUTH.
-&Uuml;ber diesen Parameter kann das Aussehen der BKU-Auswahlseite an das Aussehen der Online-Applikation angepasst werden.</td>
-</tr>
-</tbody></table>
-<br/><br/>
-
-<div id="block">
-<b>BKUSelectionTemplate</b><br /><br />
-Ein <a href="examples/BKUSelectionTemplate.html">Template f&uuml;r die BKU-Auswahl</a> von MOA-ID-AUTH kann aus folgender Grundstruktur aufgebaut werden: </div>
-<pre>
-&lt;form name="CustomizedForm" method="post" action="&lt;StartAuth&gt;"&gt;
- &lt;BKUSelect&gt;
- &lt;input type="submit" value="Ausw&auml;hlen"/&gt;
-&lt;/form&gt;
-</pre>
-<div id="block">Innerhalb dieser <tt>&lt;form&gt;</tt>-Elemente k&ouml;nnen Texte, Beschriftungen und Styles modifiziert werden,
-und es k&ouml;nnen zus&auml;tzliche Elemente darin aufgenommen werden.
-<br /><br />
-Auch dabei ist die vorgegebene Grundstruktur einzuhalten, die speziellen Tags <tt>&lt;StartAuth&gt;</tt> und <tt>&lt;BKUSelect&gt;</tt> sind verpflichtend.
-</div>
-<br /><br />
-
-
-</td></tr></table>
-
-
-
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html>
diff --git a/id.server/doc/moa_id/id-anwendung_2.htm b/id.server/doc/moa_id/id-anwendung_2.htm
deleted file mode 100644
index 1ffeb4c08..000000000
--- a/id.server/doc/moa_id/id-anwendung_2.htm
+++ /dev/null
@@ -1,249 +0,0 @@
-<html>
-<head>
- <title>MOA ID-Anwendung</title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- th { font-family:"Verdana", "Arial"; font-size:10pt; font-weight:bold; color:#d8d8d8; background:#505050}
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- tt { font-size:9pt; color:#505060; }
- pre { font-size:9pt; color:#505060; }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; font-weight:bold; color:#505060; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:3px }
- #info { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; padding:3px; border:solid 1px #c0c0c0 }
- #infolist { font-family:"Verdana", "Arial"; font-size:8pt; color:#505060; }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module für Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">MOA-ID</div><br />
-<div id="klein"><a href="id-anwendung.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Übersicht</b></a></div>
-<div id="klein"><a href="id-anwendung_1.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Aufruf MOA-ID-AUTH</b></a></div>
-<div id="klein"><a href="id-anwendung_2.htm"><img src="../moa_images/select.gif" border="0" width="13" height="14" />
- <b> Abfrage MOA-ID-AUTH </b></a></div>
-<br />
-<div id="klein"><a href="moa.htm"><img src="../moa_images/west.gif" border="0" width="13" height="14" />
- <b> Zurück</b></a></div>
-</br /><br />
-<div id="slogan">
-<b>Abfragearten: </b>
-</br />
-<a href="#webservice"><b>Web Service</b></a><br />
-<a href="#proxy"><b>MOA-ID-PROXY</b></a><br />
-</div>
-</td>
-
-
-<td valign="top">
-<p id="titel">Abfrage der Anmeldedaten von MOA-ID-AUTH</p>
-<div id="block">Nach erfolgter Authentisierung stehen in MOA-ID-AUTH Anmeldedaten zum Abholen bereit,
-und MOA-ID-AUTH veranlasst einen Redirect zur Online-Applikation (OA).
-<br /><br />
-In diesem Redirect werden der Geschäftsbereich und ein SAML-Artifact als Parameter übergeben.
-</div>
-<pre>&lt;a href=&quot;https://&lt;oa-url&gt;
-?Target=&lt;geschäftsbereich&gt;
-&SAMLArtifact=&lt;saml-artifact&gt;&quot;&gt;</pre>
-
-<table border="1"><tbody valign="baseline">
-<tr><td>&lt;oa-url&gt;</td><td>URL, der beim Aufruf von MOA-ID-AUTH als Parameter &quot;OA&quot; übergeben wurde</td></tr>
-<tr><td>Target=&lt;geschäftsbereich&gt;</td><td>Parameter, der beim Aufruf von MOA-ID-AUTH übergeben wurde</td></tr>
-<tr><td>SAMLArtifact=&lt;saml-artifact&gt;</td><td>SAML-Artifact, das von MOA-ID-AUTH zu den Anmeldedaten erstellt wurde.
-Mithilfe dieses SAML-Artifacts kann die OA die Anmeldedaten von MOA-ID-AUTH abholen.</td></tr>
-</tbody></table>
-<br/><br/>
-<div id="block">Grundsätzlich stehen einer OA mehrere Arten zum Abholen der Anmeldedaten von MOA-ID-AUTH zur Verfügung: </div>
-<ol>
-<li>Die Applikation ruft selbst das MOA-ID-AUTH Web Service auf.
-<br/>Die Implementierung dieser Variante wird empfohlen, insbesondere für Online-Applikationen, die neu erstellt werden.
-</li>
-<li>Es wird die MOA-ID-PROXY Webapplikation eingesetzt, um die Anmeldedaten abzuholen und an die OA zu übergeben.
-<br/>Aus Sicht von MOA-ID-PROXY ist bedeutsam, ob die OA die Anmeldedaten nach Abarbeitung des HTTP-Requests behält.
-<ul>
-<li>Stateful OA: MOA-ID-PROXY übergibt einmalig die Anmeldedaten an die OA, und die OA speichert die Anmeldedaten, typischerweise unter Einsatz von Cookies.</li>
-<li>Stateless OA: MOA-ID-PROXY übergibt die Anmeldedaten bei jedem HTTP-Request vom Browser des Bürgers an die OA.</li>
-</ul>
-Diese Variante ist vorzuziehen, wenn
-<ul>
-<li>für die Plattform, auf der die OA aufbaut, Web Service-Schnittstellen nicht verfügbar sind</li>
-<li>das nötige Web Service-Know How nicht zur Verfügung steht</li>
-<li>die Implementierung von Variante 1 zu aufwändig wäre</li>
-<li>eine Anpassung der OA aus bestimmten Gründen nicht möglich ist</li>
-</ul>
-</li>
-</ol>
-</td></tr></table>
-
-
-
-<div id="webservice" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-
-<td valign="top">
-<p id="subtitel">Aufruf des MOA-ID-AUTH Web Service</p>
-<div id="block">Das MOA-ID-AUTH Web Service wird über einen &lt;samlp:Request&gt; aufgerufen.
-Der &lt;samlp:Request&gt; enthält in einem &lt;samlp:AssertionArtifact&gt; das von MOA-ID-AUTH übergebene SAML-Artifact.
-<br/><br/>
-MOA-ID-AUTH liefert als Antwort einen &lt;samlp:Response&gt;. Die Anmeldedaten sind im &lt;samlp:Response&gt; in Form einer &lt;saml:Assertion&gt; enthalten.
-<br/><br/>
-<a href="../cs-sstc-schema-protocol-01.xsd">SAML 1.0 Protocol Schema</a>
-<br/>
-<a href="../cs-sstc-schema-assertion-01.xsd">SAML 1.0 Assertion Schema</a>
-<br/>
-Der detaillierte Aufbau der &lt;saml:Assertion&gt; zu den Anmeldedaten ist in der <a href="../MOA-ID-1.1-20030630.pdf">Spezifikation MOA-ID 1.1</a> beschrieben.
-<br/><br/>
-<h4>Beispiel LoginServletExample</h4>
-Das Abholen der Anmeldedaten durch Aufruf des Web Service von MOA-ID-AUTH wird anhand eines beispielhaften Java Servlet gezeigt.
-Das LoginServletExample wird in einer Stateful OA von MOA-ID-AUTH nach erfolgter Authentisierung über Redirect aufgerufen.
-<br/><br/>
-Das Beispiel demonstriert insgesamt die Integration von MOA-ID-AUTH in die OA:
-</div>
-<ul>
-<li>Parameterübergabe von MOA-ID-AUTH an die OA</li>
-<li>Aufruf des MOA-ID-AUTH Web Service mittels des SOAP Frameworks "Apache AXIS"</li>
-<li>Parsen der Anmeldedaten mittels der XPath Engine "Jaxen"</li>
-<li>Speichern der Anmeldedaten in der HTTPSession</li>
-<li>Redirect auf die eigentliche Startseite der OA</li>
-</ul>
-
-
-<b>Voraussetzungen</b><br >
-<div id="block">Die folgende Liste enthält die für das Beispiel erforderlichen Java-Bibliotheken. Die angeführten Versionsnummern bezeichnen jene Versionen dieser Java-Bibliotheken, mit denen das Beispiel getestet wurde. </div>
-<br />
-<table border="1" width="100%" cellpadding="2" cellspacing="0">
-<tr>
-<th>Java-Bibliothek</th><th>Version</th><th>Bemerkung</th>
-</tr><tr>
-<tr valign="top">
-<td>JDK</td><td>1.3 bzw. 1.4.1</td><td>Java Development Kit</td>
-</tr><tr valign="top">
-<td>Xerces <br />XML Parser</td><td>2.0.2+</td>
-<td id="klein">nicht nötig wenn JDK 1.4 oder höher verwendet wird <br />
- Download: <a href="http://xml.apache.org/xerces2-j/">xml.apache.org/xerces2-j</a> </td>
-</tr><tr valign="top">
-<td>AXIS <br />SOAP Framework</td><td>1.0+</td>
-<td id="klein">Download: <a href="http://xml.apache.org/axis/">xml.apache.org/axis</a> </td>
-</tr><tr valign="top">
-<td>Jaxen XPath Engine</td><td>1.0+</td>
-<td id="klein">Download: <a href="http://jaxen.sourceforge.net/">http://jaxen.sourceforge.net</a> </td>
-</tr><tr valign="top">
-<td>JSSE</td><td>1.0.3+</td>
-<td id="klein">wenn eine SSL Verbindung verwendet wird, nicht nötig ab JDK 1.4 <br />Download: <a href="http://java.sun.com/products/jsse/">java.sun.com/products/jsse</a> </td>
-</tr><tr valign="top">
-<td>Servlet API</td><td>2.3+</td>
-<td id="klein">Download: <a href="http://java.sun.com/products/servlet/">java.sun.com/products/servlet</a> </td>
-</tr>
-</table>
-<br/>
-<b>Code</b><br />
-<a href="examples/LoginServletExample.txt">LoginServletExample</a>
-
-</td></tr></table>
-
-<DIV bla="hhalloo">
-
-
-
-<div id="proxy" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-<br /><br />
-</div>
-</td>
-<td valign="top">
-<p id="subtitel">Einsatz von MOA-ID-PROXY zum Abfragen der Anmeldedaten von MOA-ID-AUTH</p>
-<div id="block">
-Anstatt den Aufruf des MOA-ID-AUTH Web Service in der OA zu implementieren, kann die MOA-ID-PROXY Webapplikation eingesetzt werden, um dies für die OA zu erledigen. MOA-ID-PROXY muss für die OA konfiguriert werden, so wie in <a href="id-admin_2.htm#OnlineApplication/ProxyComponent">MOA-ID-Administration</a> beschrieben.
-<br/><br/>
-Bei der Konfiguration ist speziell zu beachten:
-<br/><br/>
-<b>Konfigurationsdatei zur OA</b><br />
-Der <a href="id-admin_2.htm#oa-config">LoginType</a> (stateful oder stateless) ist gemäß dem Applikationstyp zu setzen.
-<br/><br/>
-Die <a href="id-admin_2.htm#oa-config">Übergabe der Anmeldedaten</a> ist in Form und Inhalt zu konfigurieren.
-</div>
-<ul>
-<li>BasicAuth: HTTP Basic Authentication (<a href="examples/conf/OAConfBasicAuth.xml">Beispiel</a>)</li>
-<li>ParamAuth: Übergabe über Requestparameter (<a href="examples/conf/OAConfParamAuth.xml">Beispiel</a>)</li>
-<li>HeaderAuth: Übergabe über Requestheader (<a href="examples/conf/OAConfHeaderAuth.xml">Beispiel</a>)</li>
-</ul>
-
-<div id="block">
-<b>LoginParameterResolver</b><br />
-Das Übergabe der Anmeldedaten an die OA über Request Parameter oder Header geschieht in einer Standardimplementierung des Interface
-<pre>at.gv.egovernment.moa.proxy.LoginParameterResolver</pre>
-Falls die Erfordernisse der OA mittels <a href="id-admin_2.htm#oa-config">Konfiguration</a> nicht abgedeckt werden können,
-so kann eine maßgeschneiderte Implementierung von <tt>LoginParameterResolver</tt> erstellt und zusammen mit MOA-ID-PROXY zum Einsatz gebracht werden
-(siehe <a href="../api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html">API</a>).
-<br/><br/>
-<b>ConnectionBuilder</b>
-Das Herstellen einer URL-Verbindung von MOA-ID-PROXY zur OA geschieht einer Standardimplementierung des Interface
-<pre>at.gv.egovernment.moa.proxy.ConnectionBuilder </pre>
-Falls nötig, kann eine maßgeschneiderte Implementierung von <tt>ConnectionBuilder</tt> erstellt und zusammen mit MOA-ID-PROXY zum Einsatz gebracht werden
-(siehe <a href="../api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html">API</a>).
-</div>
-</td></tr></table>
-
-
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html>
diff --git a/id.server/doc/moa_id/links.htm b/id.server/doc/moa_id/links.htm
deleted file mode 100644
index c5a9b7113..000000000
--- a/id.server/doc/moa_id/links.htm
+++ /dev/null
@@ -1,141 +0,0 @@
-<html>
-<head>
- <title>MOA Grundlagen</title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- th { font-family:"Verdana", "Arial"; font-size:10pt; font-weight:bold; color:#c0c0c0; background:#505050}
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; font-weight:bold; color:#505060; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:6px }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module für Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">MOA Links</div><br />
-<div id="klein"><a href="#Extern"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Ext. Komponenten</b></a></div>
-<div id="klein"><a href="#Administration"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Administration</b></a></div>
-<div id="klein"><a href="#Anwendung"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Anwendung</b></a></div>
-<div id="klein"><a href="#Spezifikationen"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Spezifikationen</b></a></div>
-<br />
-<div id="klein"><a href="moa.htm"><img src="../moa_images/west.gif" border="0" width="13" height="14" />
- <b> Zurück</b></a></div>
-<br />
-<!-- div id="slogan">
-MOA ist eine Entwicklung des Bundesrechenzentrums BRZ in Zusammenarbeit mit A-Trust und dem Institut für angewandte Informations- und Kom-munikationstechnik (IAIK) der Universität Graz
-</div -->
-</td>
-
-<td valign="top">
-<div id="titel">MOA Links </div>
-
-<div id="Administration" />
-<p id="subtitel">Externe Komponenten</p>
-
-<div id="klein">Apache <br />
-<a href="http://httpd.apache.org/docs-2.0/">http://httpd.apache.org/docs-2.0</a></div>
-
-<div id="klein">Internet Information Server <br />
-<a href="http://www.microsoft.com/windows2000/en/server/iis/default.asp">http://www.microsoft.com/windows2000/en/server/iis/default.asp</a></div>
-
-<div id="klein">Tomcat <br />
-<a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/">http://jakarta.apache.org/tomcat/tomcat-4.1-doc</a> </div>
-
-<div id="klein">Tomcat mod_SSL <br />
-<a href="http://httpd.apache.org/docs-2.0/ssl/">http://httpd.apache.org/docs-2.0/ssl</a></div>
-
-<div id="klein">Tomcat mod_jk <br />
-<a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/">http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2</a></div>
-
-<div id="klein">Logging Toolkit <br />
-<a href="http://jakarta.apache.org/log4j/docs/index.html">http://jakarta.apache.org/log4j/docs/ </a></div>
-
-<div id="klein">IAIK JCE <br />
-<a href="http://jce.iaik.tugraz.at/products/index.php">http://jce.iaik.tugraz.at/products/index.php </a></div>
-
-<div id="klein">PostgreSQL <br />
-<a href="http://techdocs.postgresql.org/installguides.php">http://techdocs.postgresql.org </a></div>
-
-<div id="Spezifikationen" />
-<p id="subtitel">Spezifikationen</p>
-<p id="klein">
-<div id="klein">DOM <br />
-<a href="http://www.w3c.org/DOM/">http://www.w3c.org/DOM</a></div>
-
-<div id="klein">E-Government <br />
-<a href="http://reference.e-government.gv.at/">http://reference.e-government.gv.at</a></div>
-
-<div id="klein">Security Layer Version 1.1<br />
-<a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831">http://www.buergerkarte.at/konzept/securitylayer/spezifikation/2002083</a></div>
-
-<div id="klein">Personenbindung Version 1.1<br />
-<a href="http://www.buergerkarte.at/konzept/personenbindung/spezifikation/20020506">http://www.buergerkarte.at/konzept/personenbindung/spezifikation/20020506</a></div>
-
-<div id="klein">Security Assertion Markup Language <br />
-<a href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=security">http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=security</a></div>
-
-<div id="klein">Auswahl von Bürgerkartenumgebungen Version 1.0.0<br />
-<a href="../bku-auswahl.20030408.pdf">bku-auswahl.20030408.pdf</a></div>
-</p>
-
-</td></tr></table>
-
-
-
-
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/doc/moa_id/moa-id-ablauf.jpg b/id.server/doc/moa_id/moa-id-ablauf.jpg
deleted file mode 100644
index 0585664f4..000000000
--- a/id.server/doc/moa_id/moa-id-ablauf.jpg
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_id/moa.htm b/id.server/doc/moa_id/moa.htm
deleted file mode 100644
index 4ffab01d5..000000000
--- a/id.server/doc/moa_id/moa.htm
+++ /dev/null
@@ -1,247 +0,0 @@
-<html>
-<head>
- <title>MOA Module fuer Online Applikationen</title>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
- <meta content="heinz.rosenkranz@brz.gv.at" name="author"/>
-
-<style type="text/css">
- body { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- td { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; }
- li { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- ul { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; margin-top:3px }
- tt { font-size:9pt; color:#505060; }
- #titel { font-family:"Verdana", "Arial"; font-size:18pt; color:#505060; }
- #subtitel { font-family:"Verdana", "Arial"; font-size:12pt; font-weight:bold; color:#505060; }
- #slogan { font-family:"Verdana", "Arial"; font-size:8pt; color:#808090; text-align:justify; width:160px }
- #block { font-family:"Verdana", "Arial"; font-size:10pt; color:#505060; text-align:justify }
- #klein { font-family:"Verdana", "Arial"; font-size:9pt; color:#505060; margin-top:3px }
- a:link {color:#000090}
- a:visited {color:#000090}
- a:hover {color:#c03030}
- a {text-decoration: none}
-</style>
-
-<script language="JavaScript">
-<!--
-function goWin(url) {
- Fenster=window.open(url,"smallWin","toolbar=0,location=0,directories=0,status=0,menubar=0,resizable=yes,scrollbars=yes,width=500,height=480,top=20,screenY=0,left=20,screenX=0");
- window.setTimeout("showWin()",300);
-}
-function showWin() { Fenster.focus(); }
-// -->
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" >
-<div style="width:650px">
-
-
-
-<!-- Projekt-Logo -->
-<div style="height:42px; font-size:16pt; color:#b0b8c0; background:#003050">
-&#160;Module f&uuml;r Online-Applikationen
-</div>
-<div style="margin-left:8px; margin-top:3px; font-size:8pt; color:#707070; ">
-<!-- Development Center der BRZ GmbH, A-Trust und IAIK Graz -->&#160;
-</div>
-<div style="margin-top:-65px; text-align:right; font-size:8pt; font-weight:bold; color:#d04040;" >
-Projekt <span style="font-size:48pt; ">moa</span>&#160;
-</div>
-<br />
-
-
-
-<!-- First Section with Navigation -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top">
-<div style="font-weight:bold; margin-top:12px">MOA-ID</div><br />
-<div id="klein"><img src="../moa_images/select.gif" border="0" width="13" height="14" />
- <b> Allgemein</b></div>
-<div id="klein"><a href="id-admin.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> ID Administration</b></a></div>
-<div id="klein"><a href="id-anwendung.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> ID Anwendung</b></a></div>
-<div id="klein"><a href="../api-doc/index.html" target="_javadoc">
- <img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> API-Dokumentation</b></a></div>
-<div id="klein"><a href="faqs.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> FAQs</b></a></div>
-<div id="klein"><a href="links.htm"><img src="../moa_images/idle.gif" border="0" width="13" height="14" />
- <b> Links</b></a></div>
-<br />
-<div> <a href="javascript:history.back()">
- <img src="../moa_images/west.gif" border="0" width="13" height="14" /> &#160;
- <b>Zur&uuml;ck </b></a></div>
-<br />
-<div id="slogan">
-</div>
-</td>
-
-<td valign="top">
-<img src="../moa_images/moa_thema.gif" align="right" />
-<div id="titel">Allgemein v.1.1</div>
-<p id="block">
-Dieses Dokument enth&auml;lt die Dokumentation f&uuml;r das Modul <br />
-<ul>
-<li>MOA-ID (Identifikation)</li>
-</ul></p>
-</td></tr></table>
-
-<div id="id" />
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top" id="klein">
-<p id="subtitel">&#160;</p>
-<div id="slogan">
-</div>
-</td>
-<td valign="top">
-<div id="block">
-Das Modul Identifikation stellt Online-Applikationen Funktionalit&auml;t zur Verf&uuml;gung zu stellen, damit diese
-eine Benutzer-Identifikation und -Authentisierung mit Hilfe der B&uuml;rgerkarte und deren Signaturfunktion
-realisieren k&ouml;nnen.
-<br /><br />
-Das Modul besteht aus zwei Komponenten:
-<ul>
-<li>Die Authentisierungskomponente (MOA-ID-AUTH) f&uuml;hrt die eigentliche Authentisierung des Benutzers durch und &uuml;bergibt der
-Proxykomponente die Anmeldedaten.</li>
-<li>Die Proxykomponente (MOA-ID-PROXY) &uuml;bernimmt die Anmeldedaten von der Authentisierungskomponente,
-f&uuml;hrt die Anmeldung an der Online Applikation durch und schleust in der Folge Daten an die Online-Applikation
-und Daten an den Benutzer durch.</li>
-</ul>
-Diese beiden Komponenten k&ouml;nnen auf unterschiedlichen Rechnern
-oder auf dem gleichen Rechner eingesetzt werden.
-<br /><br />
-Die Funktionalit&auml;t und der Aufbau der Schnittstelle zu MOA-ID ist in der
-<a href="../MOA-ID-1.1-20030630.pdf" target="_new">Spezifikation Version 1.1</a> detailliert beschrieben.
-<br /><br />
-F&uuml;r den Betrieb von MOA-ID ist der Einsatz von MOA-Signaturpr&uuml;fung (MOA-SP) erforderlich.
-</div>
-
-<br /><br />
-<div id="titel">Ablauf einer Anmeldung</div>
-<br />
-
-<img src="moa-id-ablauf.jpg" border="0" hspace="-200" width="500" />
-
-<table border="0" cellspacing="3" cellpadding="2">
-
-<tr>
-<td valign="top" width="30">1</td>
-<td id="block">Der Benutzer verbindet sich zu einem Web-Portal, &uuml;ber das die verf&uuml;gbaren Online-Applikationen (OA) erreichbar
-sind. Jeder Link zu einer OA verweist auf die Authentisierungs-komponente.
-</td>
-</tr>
-
-<tr>
-<td valign="top">2</td>
-<td id="block">Der Benutzer verbindet sich mit MOA-ID-AUTH, die die Authentisierung des
-Benutzers durchf&uuml;hrt:</td>
-</tr>
-
-<tr>
-<td valign="top">2.1</td>
-<td id="block">MOA-ID-AUTH bietet dem Benutzer optional eine Auswahl von verf&uuml;gbaren B&uuml;rgerkartenumgebungen (engl. Bezeichnung: Security-Layer) an.</td>
-</tr>
-
-<tr>
-<td valign="top">2.2</td>
-<td id="block">MOA-ID-AUTH erzeugt eine HTML-Seite mit einem <tt>&lt;InfoboxReadRequest&gt;</tt>
- zum Auslesen der Personenbindung. Diese HTML-Seite wird an den Browser geschickt.</td>
-</tr>
-
-<tr>
-<td valign="top">2.3</td>
-<td id="block">Der Browser schickt den <tt>&lt;InfoboxReadRequest&gt;</tt> an den ausgew&auml;hlten Security-Layer. Der Security-Layer liest die
-Personenbindung von der B&uuml;rgerkarte und sendet diese an MOA-ID-AUTH, die die Signatur der Personenbindung durch
-einen Aufruf von MOA-SP &uuml;berpr&uuml;ft.
-</td>
-</tr>
-
-<tr>
-<td valign="top">2.4</td>
-<td id="block">MOA-ID-AUTH erstellt den AUTH-Block. Der AUTH-Block enth&auml;lt
-<ul>
-<li>Vor- und Nachname aus der Personenbindung,</li>
-<li>URL von MOA-ID-AUTH,</li>
-<li>URL und Gesch&auml;ftsbereich der Online-Applikation,</li>
-<li>die aktuelle Zeit.</li>
-</ul>
-Anschließend wird
-eine XML Antwortseite, die das Kommando zum Signieren (<tt>&lt;CreateXMLSignatureRequest&gt;</tt>) des generierten
-AUTH-Blocks enth&auml;lt, an den ausgew&auml;hlten Security-Layer gesendet.</td>
-</tr>
-
-<tr>
-<td valign="top">2.5</td>
-<td id="block">Der Request wird vom Security-Layer verarbeitet. Die signierten Daten werden an
-MOA-ID-AUTH zur&uuml;ckgesendet.</td>
-</tr>
-
-<tr>
-<td valign="top">2.6</td>
-<td id="block">MOA-ID-AUTH &uuml;berpr&uuml;ft den signierten AUTH-Block und legt f&uuml;r den Benutzer die Anmeldedaten
-an. Die Anmeldedaten enthalten
-<ul>
-<li>die verfahrensspezifische Personenkennzeichnung (VPK),</li>
-<li>den signierten AUTH-Block (optional),</li>
-<li>die Personenbindung (optional),</li>
-<li>die <tt>PersonData</tt>-Struktur aus der Personenbindung (optional),</li>
-<li>die Information, ob die Signatur des AUTH-Blocks mit einem qualifiziertem Zertifikat erfolgte,</li>
-<li>Informationen zur Beh&ouml;rde, falls die Signatur mit einem Beh&ouml;rdenzertifikat erzeugt wurde.</li>
-</ul>
-</td>
-</tr>
-
-<tr>
-<td valign="top">2.7</td>
-<td id="block">Ist der obige Authentisierungsvorgang erfolgreich, dann wird eine Redirect-Seite
-zum Browser gesendet.</td>
-</tr>
-
-<tr>
-<td valign="top">3</td>
-<td id="block">Der Browser f&uuml;hrt das Redirect zur Proxykomponente durch. Als Parameter wird das von MOA-ID-AUTH
-erzeugte SAML-Artifact &uuml;bergeben.</td>
-</tr>
-
-<tr>
-<td valign="top">4</td>
-<td id="block">Die Proxykomponente verwendet dieses eindeutige SAML-Artifact, um die Anmeldedaten
-von MOA-ID-AUTH zu erhal-ten. Danach werden die Anmeldedaten in MOA-ID-AUTH gel&ouml;scht.</td>
-</tr>
-
-<tr>
-<td valign="top">5</td>
-<td id="block">MOA-ID-PROXY liest die Konfigurationsdatei der zugeh&ouml;rigen Online-Applikation, die beschreibt, wie die Anmeldedaten
-an die nachfolgende Applikation &uuml;bergeben werden m&uuml;ssen, und meldet den Benutzer bei der Applikation an.</td>
-</tr>
-
-<tr>
-<td valign="top">6</td>
-<td id="block">Ist die betreffende OA als stateless konfiguriert, so werden in weiterer Folge die Antworten der OA
-an den Benutzer weitergeleitet und die Anfragen des Benutzers an die OA weitergeleitet.</td>
-</tr>
-
-
-</table>
-
-
-</td></tr></table>
-<br /><br />
-
-<!-- Trailer -->
-<table width="650" border="0" cellpadding="10" cellspacing="0">
-<tr>
-<td width="170" valign="top"><br /></td>
-<td valign="top">
-<hr />
-<div style="font-size:8pt; color:#909090">&copy; 2003 <!-- Development Center, BRZ GmbH --></div>
-</td></tr></table>
-<br />
-
-
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/doc/moa_images/east.gif b/id.server/doc/moa_images/east.gif
deleted file mode 100644
index e76117cb0..000000000
--- a/id.server/doc/moa_images/east.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/idle.gif b/id.server/doc/moa_images/idle.gif
deleted file mode 100644
index 28b8148e5..000000000
--- a/id.server/doc/moa_images/idle.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/moa_diagramm1.jpg b/id.server/doc/moa_images/moa_diagramm1.jpg
deleted file mode 100644
index 776331fb8..000000000
--- a/id.server/doc/moa_images/moa_diagramm1.jpg
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/moa_thema.gif b/id.server/doc/moa_images/moa_thema.gif
deleted file mode 100644
index f59075528..000000000
--- a/id.server/doc/moa_images/moa_thema.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/north.gif b/id.server/doc/moa_images/north.gif
deleted file mode 100644
index b4316b5d7..000000000
--- a/id.server/doc/moa_images/north.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/pfeil.gif b/id.server/doc/moa_images/pfeil.gif
deleted file mode 100644
index e4eeb1740..000000000
--- a/id.server/doc/moa_images/pfeil.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/print.gif b/id.server/doc/moa_images/print.gif
deleted file mode 100644
index b8e59144e..000000000
--- a/id.server/doc/moa_images/print.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/select.gif b/id.server/doc/moa_images/select.gif
deleted file mode 100644
index 59a1694c5..000000000
--- a/id.server/doc/moa_images/select.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/south.gif b/id.server/doc/moa_images/south.gif
deleted file mode 100644
index c70ab3e97..000000000
--- a/id.server/doc/moa_images/south.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/transdot.gif b/id.server/doc/moa_images/transdot.gif
deleted file mode 100644
index e31aba280..000000000
--- a/id.server/doc/moa_images/transdot.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/doc/moa_images/west.gif b/id.server/doc/moa_images/west.gif
deleted file mode 100644
index 135698ee7..000000000
--- a/id.server/doc/moa_images/west.gif
+++ /dev/null
Binary files differ
diff --git a/id.server/html/auth/WEB-INF/server-config.wsdd b/id.server/html/auth/WEB-INF/server-config.wsdd
deleted file mode 100644
index 0344f24f9..000000000
--- a/id.server/html/auth/WEB-INF/server-config.wsdd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment name="defaultClientConfig"
- xmlns="http://xml.apache.org/axis/wsdd/"
- xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"
- xmlns:handler="http://xml.apache.org/axis/wsdd/providers/handler">
-
- <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
- <handler name="MsgDispatcher" type="java:org.apache.axis.providers.java.MsgProvider"/>
- <handler name="HTTPAuthHandler" type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
-
- <service name="GetAuthenticationData" provider="java:MSG">
- <namespace>urn:oasis:names:tc:SAML:1.0:protocol</namespace>
- <parameter name="allowedMethods" value="Request"/>
- <parameter name="className" value="at.gv.egovernment.moa.id.auth.servlet.GetAuthenticationDataService"/>
- <wsdlFile>/resources/wsdl/MOA-SP-SS-1.0-20020829.wsdl</wsdlFile>
- <requestFlow>
- </requestFlow>
- <responseFlow>
- </responseFlow>
- </service>
-
- <transport name="http">
- <requestFlow>
- <handler type="URLMapper"/>
- <handler type="HTTPAuthHandler"/>
- </requestFlow>
- </transport>
-
-</deployment>
diff --git a/id.server/html/auth/WEB-INF/web.xml b/id.server/html/auth/WEB-INF/web.xml
deleted file mode 100644
index 9f713408c..000000000
--- a/id.server/html/auth/WEB-INF/web.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-<web-app>
- <display-name>MOA ID Auth</display-name>
- <description>MOA ID Authentication Service</description>
- <servlet>
- <servlet-name>SelectBKU</servlet-name>
- <display-name>SelectBKU</display-name>
- <description>Select Bürgerkartenartenumgebung</description>
- <servlet-class>at.gv.egovernment.moa.id.auth.servlet.SelectBKUServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>StartAuthentication</servlet-name>
- <display-name>StartAuthentication</display-name>
- <description>Start authentication process</description>
- <servlet-class>at.gv.egovernment.moa.id.auth.servlet.StartAuthenticationServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>VerifyIdentityLink</servlet-name>
- <display-name>VerifyIdentityLink</display-name>
- <description>Verify identity link coming from security layer</description>
- <servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>VerifyAuthBlock</servlet-name>
- <display-name>VerifyAuthBlock</display-name>
- <description>Verify AUTH block coming from security layer</description>
- <servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>ConfigurationUpdate</servlet-name>
- <display-name>ConfigurationUpdate</display-name>
- <description>Update MOA-ID Auth configuration from the configuration file</description>
- <servlet-class>at.gv.egovernment.moa.id.auth.servlet.ConfigurationServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>AxisServlet</servlet-name>
- <display-name>Apache-Axis Servlet</display-name>
- <servlet-class>
- org.apache.axis.transport.http.AxisServlet
- </servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>SelectBKU</servlet-name>
- <url-pattern>/SelectBKU</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>StartAuthentication</servlet-name>
- <url-pattern>/StartAuthentication</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>VerifyIdentityLink</servlet-name>
- <url-pattern>/VerifyIdentityLink</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>VerifyAuthBlock</servlet-name>
- <url-pattern>/VerifyAuthBlock</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ConfigurationUpdate</servlet-name>
- <url-pattern>/ConfigurationUpdate</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
- <error-page>
- <error-code>500</error-code>
- <location>/errorpage.jsp</location>
- </error-page>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>ConfigurationUpdate</web-resource-name>
- <url-pattern>/ConfigurationUpdate</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>moa-admin</role-name>
- </auth-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>UserDatabase</realm-name>
- </login-config>
-</web-app>
diff --git a/id.server/html/auth/errorpage.jsp b/id.server/html/auth/errorpage.jsp
deleted file mode 100644
index a5b05d60e..000000000
--- a/id.server/html/auth/errorpage.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>Fehler</title>
-</head>
-<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
- String errorMessage = (String)request.getAttribute("ErrorMessage");
- String wrongParameters = (String)request.getAttribute("WrongParameters");
-%>
-
-<body>
-<h1>Fehler bei der Anmeldung</h1>
-<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
-<% if (errorMessage != null) { %>
-<p><%=errorMessage%></p>
-<% } %>
-<% if (exceptionThrown != null) { %>
-<p><%=exceptionThrown.getMessage()%></p>
-<% } %>
-<% if (wrongParameters != null) { %>
-<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br>
- Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
-<% } %>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/html/auth/index.jsp b/id.server/html/auth/index.jsp
deleted file mode 100644
index cb9dde3d9..000000000
--- a/id.server/html/auth/index.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-<head>
-<title>MOA ID Auth Sample Login</title>
-</head>
-<body>
-<%
- String urlPath =
- request.getScheme() + "://"
- + request.getServerName() + ":" + request.getServerPort()
- + request.getContextPath() + "/";
- String params =
- "Target=gb&" +
- "OA=https://10.16.126.28:9443/moa-id-proxy/index.jsp";
- String urlStartAuth =
- urlPath +
- "StartAuthentication?" +
- params;
- String templateParam =
- "&Template=http://10.16.46.108:18080/oa/AuthTemplate.jsp";
- String urlStartAuthCustom =
- urlStartAuth +
- templateParam;
- String urlSelectBKU =
- urlPath +
- "SelectBKU?" +
- params;
- String urlSelectBKUCustom =
- urlSelectBKU +
- templateParam +
- "&BKUSelectionTemplate=http://10.16.46.108:18080/oa/BKUSelectionTemplate.jsp";
-%>
-<a href="<%=urlStartAuth%>">Log in to sample application</a>
-<br>
-<a href="<%=urlStartAuthCustom%>">Log in to sample application using custom form</a>
-<br>
-<a href="<%=urlSelectBKU%>">Choose BKU (HTMLComplete or HTMLSelect) and log in</a>
-<br>
-<a href="<%=urlSelectBKUCustom%>">Choose BKU (HTMLSelect) using custom form and log in</a>
-</body>
-</html> \ No newline at end of file
diff --git a/id.server/html/proxy/WEB-INF/web.xml b/id.server/html/proxy/WEB-INF/web.xml
deleted file mode 100644
index 9145a48d6..000000000
--- a/id.server/html/proxy/WEB-INF/web.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-<web-app>
- <display-name>MOA ID Proxy</display-name>
- <description>MOA ID Proxy Service</description>
- <servlet>
- <servlet-name>Proxy</servlet-name>
- <display-name>Proxy</display-name>
- <description>Forwards requests to the online application</description>
- <servlet-class>at.gv.egovernment.moa.id.proxy.servlet.ProxyServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>ConfigurationUpdate</servlet-name>
- <display-name>ConfigurationUpdate</display-name>
- <description>Update MOA-ID Proxy configuration from the configuration file</description>
- <servlet-class>at.gv.egovernment.moa.id.proxy.servlet.ConfigurationServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ConfigurationUpdate</servlet-name>
- <url-pattern>/ConfigurationUpdate</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Proxy</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>ConfigurationUpdate</web-resource-name>
- <url-pattern>/ConfigurationUpdate</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>moa-admin</role-name>
- </auth-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>UserDatabase</realm-name>
- </login-config>
-</web-app>
diff --git a/id.server/javadoc.xml b/id.server/javadoc.xml
deleted file mode 100644
index c16b52819..000000000
--- a/id.server/javadoc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="id.server" default="javadoc">
- <target name="javadoc">
- <javadoc destdir="c:\java\id.server\doc\apidoc" access="private"
- use="true" notree="false" nonavbar="false" noindex="false"
- splitindex="true" author="true" version="true"
- nodeprecatedlist="false" nodeprecated="false"
- packagenames="at.gv.egovernment.moa.id.auth.builder,at.gv.egovernment.moa.id.auth,at.gv.egovernment.moa.id.auth.service,at.gv.egovernment.moa.id.config.auth,at.gv.egovernment.moa.id.auth.data,at.gv.egovernment.moa.id.config.proxy,at.gv.egovernment.moa.id.auth.parser,at.gv.egovernment.moa.id.auth.spss,at.gv.egovernment.moa.id.proxy,at.gv.egovernment.moa.id.config"
- sourcepath="c:\java\id.server\src;c:\java\id.server\res" classpath="c:\java\id.server\WEB-INF\classes;c:\java\id.server\lib\axis-1.0\axis.jar;c:\java\id.server\lib\commons-logging-1.0.2\commons-logging-api.jar;c:\java\id.server\lib\jaxen-1.0\jaxen-core.jar;c:\java\id.server\lib\jaxp-1.2_01\dom.jar;c:\java\id.server\lib\jsse-1.0.3_01\jcert.jar;c:\java\id.server\lib\log4j-1.2.7\log4j-1.2.7.jar;c:\java\id.server\lib\servlet-2.3\servlet-2_3-fcs-classfiles.zip;c:\java\id.server\lib\xalan-j-2.2\xalan.jar;c:\java\id.server\lib\xerces-j-2.0.2\xercesImpl.jar;c:\java\id.server\lib\axis-1.0\commons-discovery.jar;c:\java\id.server\lib\axis-1.0\jaxrpc.jar;c:\java\id.server\lib\axis-1.0\saaj.jar;c:\java\id.server\lib\commons-logging-1.0.2\commons-logging.jar;c:\java\id.server\lib\jaxen-1.0\jaxen-dom.jar;c:\java\id.server\lib\jaxen-1.0\saxpath.jar;c:\java\id.server\lib\jaxp-1.2_01\jaxp-api.jar;c:\java\id.server\lib\jaxp-1.2_01\sax.jar;c:\java\id.server\lib\jsse-1.0.3_01\jnet.jar;c:\java\id.server\lib\jsse-1.0.3_01\jsse.jar;c:\java\id.server\lib\xerces-j-2.0.2\xmlParserAPIs.jar;c:\java\common\bin;c:\java\common\lib\commons-logging-1.0.2\commons-logging-api.jar;c:\java\common\lib\jaxen-1.0\jaxen-core.jar;c:\java\common\lib\xerces-j-2.0.2\xmlParserAPIs.jar;c:\java\common\lib\jaxp-1.2_01\dom.jar;c:\java\common\lib\xalan-j-2.2\xalan.jar;c:\java\common\lib\jaxen-1.0\jaxen-dom.jar;c:\java\common\lib\jaxp-1.2_01\jaxp-api.jar;c:\java\common\lib\jaxen-1.0\saxpath.jar;c:\java\common\lib\xerces-j-2.0.2\xercesImpl.jar;c:\java\common\lib\junit-3.8.1\junit.jar;c:\java\common\lib\iaik-jce-3.01\iaik_jce_full.jar;c:\java\id.server\lib\iaik-jce-3.01\iaik_jce_full.jar">
- <link href="http://java.sun.com/j2se/1.3/docs/api"/>
- <link href="http://java.sun.com/products/jsse/doc/apidoc/index.html"/>
- <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
- <link href="http://java.sun.com/products/jsse/doc/apidoc/index.html"/>
- <link href="http://java.sun.com/products/jsse/doc/apidoc/index.html"/>
- </javadoc>
- </target>
-</project>
- \ No newline at end of file
diff --git a/id.server/lib/axis-1.1rc2/axis.jar b/id.server/lib/axis-1.1rc2/axis.jar
deleted file mode 100644
index 445ff8134..000000000
--- a/id.server/lib/axis-1.1rc2/axis.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/axis-1.1rc2/commons-discovery.jar b/id.server/lib/axis-1.1rc2/commons-discovery.jar
deleted file mode 100644
index 9dcd95038..000000000
--- a/id.server/lib/axis-1.1rc2/commons-discovery.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/axis-1.1rc2/jaxrpc.jar b/id.server/lib/axis-1.1rc2/jaxrpc.jar
deleted file mode 100644
index dcf9c3ac1..000000000
--- a/id.server/lib/axis-1.1rc2/jaxrpc.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/axis-1.1rc2/saaj.jar b/id.server/lib/axis-1.1rc2/saaj.jar
deleted file mode 100644
index 839f81879..000000000
--- a/id.server/lib/axis-1.1rc2/saaj.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/axis-1.1rc2/wsdl4j.jar b/id.server/lib/axis-1.1rc2/wsdl4j.jar
deleted file mode 100644
index de45fea68..000000000
--- a/id.server/lib/axis-1.1rc2/wsdl4j.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/commons-logging-1.0.2/commons-logging-api.jar b/id.server/lib/commons-logging-1.0.2/commons-logging-api.jar
deleted file mode 100644
index d6ad90330..000000000
--- a/id.server/lib/commons-logging-1.0.2/commons-logging-api.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/commons-logging-1.0.2/commons-logging.jar b/id.server/lib/commons-logging-1.0.2/commons-logging.jar
deleted file mode 100644
index aca1e4132..000000000
--- a/id.server/lib/commons-logging-1.0.2/commons-logging.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/iaik-moa-1.06/iaik-moa-full.jar b/id.server/lib/iaik-moa-1.06/iaik-moa-full.jar
deleted file mode 100644
index 343875e6d..000000000
--- a/id.server/lib/iaik-moa-1.06/iaik-moa-full.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/iaik-moa-1.06/iaik_X509TrustManager.jar b/id.server/lib/iaik-moa-1.06/iaik_X509TrustManager.jar
deleted file mode 100644
index 952d0a781..000000000
--- a/id.server/lib/iaik-moa-1.06/iaik_X509TrustManager.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/iaik-moa-1.06/iaik_ecc.jar b/id.server/lib/iaik-moa-1.06/iaik_ecc.jar
deleted file mode 100644
index 8c528a215..000000000
--- a/id.server/lib/iaik-moa-1.06/iaik_ecc.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/iaik-moa-1.06/iaik_jce_full.jar b/id.server/lib/iaik-moa-1.06/iaik_jce_full.jar
deleted file mode 100644
index 8d0f093e6..000000000
--- a/id.server/lib/iaik-moa-1.06/iaik_jce_full.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/iaik-moa-1.06/iaik_ldap.jar b/id.server/lib/iaik-moa-1.06/iaik_ldap.jar
deleted file mode 100644
index afe683ed0..000000000
--- a/id.server/lib/iaik-moa-1.06/iaik_ldap.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/iaik-moa-1.06/ixsil.jar b/id.server/lib/iaik-moa-1.06/ixsil.jar
deleted file mode 100644
index d60a0a39d..000000000
--- a/id.server/lib/iaik-moa-1.06/ixsil.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/jaxen-1.0/jaxen-core.jar b/id.server/lib/jaxen-1.0/jaxen-core.jar
deleted file mode 100644
index e52bf679c..000000000
--- a/id.server/lib/jaxen-1.0/jaxen-core.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/jaxen-1.0/jaxen-dom.jar b/id.server/lib/jaxen-1.0/jaxen-dom.jar
deleted file mode 100644
index 1a9926357..000000000
--- a/id.server/lib/jaxen-1.0/jaxen-dom.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/jaxen-1.0/saxpath.jar b/id.server/lib/jaxen-1.0/saxpath.jar
deleted file mode 100644
index 2b43955ba..000000000
--- a/id.server/lib/jaxen-1.0/saxpath.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/jaxp-1.2_01/dom.jar b/id.server/lib/jaxp-1.2_01/dom.jar
deleted file mode 100644
index f91f80a8b..000000000
--- a/id.server/lib/jaxp-1.2_01/dom.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/jaxp-1.2_01/jaxp-api.jar b/id.server/lib/jaxp-1.2_01/jaxp-api.jar
deleted file mode 100644
index 7a3295ee6..000000000
--- a/id.server/lib/jaxp-1.2_01/jaxp-api.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/jaxp-1.2_01/sax.jar b/id.server/lib/jaxp-1.2_01/sax.jar
deleted file mode 100644
index 9ffb844e5..000000000
--- a/id.server/lib/jaxp-1.2_01/sax.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/jsse-1.0.3_01/jcert.jar b/id.server/lib/jsse-1.0.3_01/jcert.jar
deleted file mode 100644
index d33134214..000000000
--- a/id.server/lib/jsse-1.0.3_01/jcert.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/jsse-1.0.3_01/jnet.jar b/id.server/lib/jsse-1.0.3_01/jnet.jar
deleted file mode 100644
index e1d340093..000000000
--- a/id.server/lib/jsse-1.0.3_01/jnet.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/jsse-1.0.3_01/jsse.jar b/id.server/lib/jsse-1.0.3_01/jsse.jar
deleted file mode 100644
index 123188c5e..000000000
--- a/id.server/lib/jsse-1.0.3_01/jsse.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/junit-3.8.1/junit.jar b/id.server/lib/junit-3.8.1/junit.jar
deleted file mode 100644
index 674d71e89..000000000
--- a/id.server/lib/junit-3.8.1/junit.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/log4j-1.2.7/log4j-1.2.7.jar b/id.server/lib/log4j-1.2.7/log4j-1.2.7.jar
deleted file mode 100644
index 1595a56ef..000000000
--- a/id.server/lib/log4j-1.2.7/log4j-1.2.7.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/moa-spss-1.0.8a/moa-common.jar b/id.server/lib/moa-spss-1.0.8a/moa-common.jar
deleted file mode 100644
index ce59f8c26..000000000
--- a/id.server/lib/moa-spss-1.0.8a/moa-common.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/moa-spss-1.0.8a/moa-spss.jar b/id.server/lib/moa-spss-1.0.8a/moa-spss.jar
deleted file mode 100644
index efd525f46..000000000
--- a/id.server/lib/moa-spss-1.0.8a/moa-spss.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/postgres-jdbc2-7.3/pg73jdbc2.jar b/id.server/lib/postgres-jdbc2-7.3/pg73jdbc2.jar
deleted file mode 100644
index 8bf46dd8e..000000000
--- a/id.server/lib/postgres-jdbc2-7.3/pg73jdbc2.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip b/id.server/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip
deleted file mode 100644
index c450772ea..000000000
--- a/id.server/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/xalan-j-2.2/bsf.jar b/id.server/lib/xalan-j-2.2/bsf.jar
deleted file mode 100644
index 19036c1bc..000000000
--- a/id.server/lib/xalan-j-2.2/bsf.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/xalan-j-2.2/xalan.jar b/id.server/lib/xalan-j-2.2/xalan.jar
deleted file mode 100644
index 8dd6dca25..000000000
--- a/id.server/lib/xalan-j-2.2/xalan.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/xerces-j-2.0.2/xercesImpl.jar b/id.server/lib/xerces-j-2.0.2/xercesImpl.jar
deleted file mode 100644
index f25d73cd7..000000000
--- a/id.server/lib/xerces-j-2.0.2/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/lib/xerces-j-2.0.2/xmlParserAPIs.jar b/id.server/lib/xerces-j-2.0.2/xmlParserAPIs.jar
deleted file mode 100644
index c1fa1d645..000000000
--- a/id.server/lib/xerces-j-2.0.2/xmlParserAPIs.jar
+++ /dev/null
Binary files differ
diff --git a/id.server/res/META-INF/services/org.apache.axis.components.net.SecureSocketFactory b/id.server/res/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
deleted file mode 100644
index c4547e804..000000000
--- a/id.server/res/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
+++ /dev/null
@@ -1 +0,0 @@
-at.gv.egovernment.moa.id.util.AxisSecureSocketFactory
diff --git a/id.server/res/resources/properties/id_messages_de.properties b/id.server/res/resources/properties/id_messages_de.properties
deleted file mode 100644
index 4c27031b5..000000000
--- a/id.server/res/resources/properties/id_messages_de.properties
+++ /dev/null
@@ -1,101 +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.
-
-#
-# Error messages: the key corresponds to the error code
-#
-
-# status messages included in <samlp:Response> of GetAuthenticationDataService
-1200=Anfrage erfolgreich beantwortet
-1201=Fehlerhaftes Requestformat: mehr als 1 Request übergeben
-1202=Fehlerhaftes Requestformat: kein SAML-Artifakt übergeben
-1203=Fehlerhaftes Requestformat: mehr als 1 SAML-Artifakt übergeben
-1204=Fehlerhaftes Requestformat
-1205=Fehler beim Abholen der Anmeldedaten, fehlerhaftes SAML-Artifakt Format (SAML-Artifakt={0}): {1}
-1206=Fehler beim Abholen der Anmeldedaten, unbekanntes SAML-Artifakt (SAML-Artifakt={0})
-1207=Zeitüberschreitung beim Abholen der Anmeldedaten (SAML-Artifakt={0})
-1299=Interner Server-Fehler
-
-auth.00=Anmeldung an dieser Applikation wird nicht unterstützt (URL={0})
-auth.01=Die Anmeldung ist bereits im Gange (MOASessionID={0})
-auth.02=MOASessionID ist unbekannt (MOASessionID={0})
-auth.03=Fehler beim Abholen des URL "{0}": {1}
-auth.04=Fehler beim Auslesen der Resource "{0}": {1}
-auth.05=Fehlender Parameter "{1}" beim Aufruf von "{0}"
-auth.06=Fehler beim Speichern der Anmeldedaten, fehlerhaftes SAML-Artifact Format (SAML-Artifact={0})
-auth.07=Aufruf muss über "https:" erfolgen
-auth.08=In der Bürgerkartenumgebung ist ein Fehler aufgetreten: <br>Fehlercode <i>{0}</i>: {1}
-
-init.00=MOA ID Authentisierung wurde erfolgreich gestartet
-init.01=Fehler beim Aktivieren des IAIK-JCE/JSSE/JDK1.3 Workaround: SSL ist möglicherweise nicht verfügbar
-init.02=Fehler beim Starten des Service MOA ID Authentisierung
-
-config.00=MOA ID Konfiguration erfolgreich geladen
-config.01=Umgebungsvariable "moa.id.configuration" nicht gesetzt
-config.02=Nicht klassifizierter Fehler in der Konfiguration (siehe Log-Datei für Details)
-config.03=Fehler beim Einlesen der Konfiguration
-config.04=Fehler beim Lesen der MOA ID Konfiguration; es wird weiterhin die ursprüngliche Konfiguration verwendet
-config.05=Fehlerhafter Wert für "{0}" in der MOA ID Konfiguration
-config.06=Doppelter Eintrag in der Konfiguration für die Online-Applikation gefunden: {0}
-config.07=Klasse {0} kann nicht instanziert werden
-config.08=Fehlender Wert für "{0}" in der MOA ID Konfiguration
-config.09=Fehler beim Erstellen von X509IssuerSerial (IssuerName={0}, SerialNumber={1})
-config.10=Fehler in der MOA SPSS Konfiguration: {0}
-
-parser.00=Leichter Fehler beim Parsen: {0}
-parser.01=Fehler beim Parsen: {0}
-parser.02=Schwerer Fehler beim Parsen: {0}
-
-builder.00=Fehler beim Aufbau der Struktur "{0}": {1}
-builder.01=Fehlerhaftes Template: Kennung "{0}" fehlt
-
-service.00=Fehler beim Aufruf des Web Service: {0}
-service.01=Fehler beim Aufruf des Web Service: kein Endpoint
-service.02=Fehler beim Aufruf des Web Service, Status {0}: {1}
-service.03=Fehler beim Aufruf des SPSS-API: {0}
-
-cleaner.00=AuthenticationSessionCleaner wurde gestartet
-cleaner.01=Fehler im AuthenticationSessionCleaner
-cleaner.02=MOASession {0} ist abgelaufen
-cleaner.03=Anmeldedaten zu SAML-Artifakt {0} sind abgelaufen
-
-proxy.00=MOA ID Proxy wurde erfolgreich gestartet
-proxy.01=Unbekannter URL {0}, erwarteter URL auf {1}
-proxy.02=Unbekannter URL {0}
-proxy.04=URL {0} : {1}
-proxy.05=Fehler beim Aufbauen der SSLSocketFactory für {0} : {1}
-proxy.06=Fehler beim Starten des Service MOA ID Proxy
-proxy.07=Sie sind nicht angemeldet. Melden Sie sich erneut an.
-proxy.08=Kein URL-Mapping in der HttpSession verfügbar (URL {0})
-proxy.09=Fehler beim Aufruf des MOA-ID Auth API: {0}
-proxy.10=Fehler beim Weiterleiten (MOA-ID Proxy)
-proxy.11=Beim Weiterleiten des Request ist ein Fehler aufgetreten.
-proxy.12=Fehler bei der Anmeldung. <br>Eine Anmeldung an der Anwendung <b>{0}</b> war nicht m&ouml;glich. <br>Pr&uuml;fen Sie bitte ihre Berechtigung.
-
-validator.00=Kein SAML:Assertion Objekt gefunden {0}
-validator.01=Im Subject kommt mehr als ein Element des Typs PhysicalPersonType vor {0}
-validator.02=Das verwendete Schlüsselformat eines öffentlichen Schlüssels ist unbekannt {0}
-validator.03=Der Namespace eines öffentlichen Schlüssels ist ungültig {0}
-validator.04=Es wurde ein SAML:Attribut ohne öffentlichen Schlüssel gefunden {0}
-validator.05=Es wurde keine DSIG:Signature gefunden {0}
-
-validator.06=Die Signatur ist ungültig
-validator.07=Das Zertifikat der Personenbindung ist ungültig
-validator.08=Das Manifest ist ungültig
-validator.09=Die öffentlichen Schlüssel des Identitiy Link stimmen nicht mit dem retournierten Zertifikat überein
-
-validator.10=Anzahl der URLs zur Authentisierungskomponente ungültig {0}
-validator.11="Geschäftsbereich" wurde nicht in den SAML-Attributen gefunden {0}
-validator.12=Der Namespace des SAML-Attributs "Geschäftsbereich" ist ungültig {0}
-validator.13=Das Target des 'Geschäftsbereichs' ist ungültig {0}
-validator.14="OA" wurde nicht in den SAML-Attributen gefunden {0}
-validator.15=Der Namespace des SAML-Attributs "OA" ist ungültig {0}
-validator.16=Die vorkonfigurierte URL der OnlineApplikation ist fehlerhaft {0}
-
-validator.17= Der SubjectDN-Name des von MOA-SP retournierten Zertifikats ist ungültig {0}
-validator.18= Der SubjectDN-Name des von MOA-SP retournierten Zertifikats ist nicht als gültiger SubjectDN-Name für eine Personenbindung konfiguriert. <b>{0}</b> wurde NICHT in der Konfiguration gefunden
-
-validator.19=Das verwendete Zertifikat zum Signieren ist ungültig
-
-ssl.01=Validierung des SSL-Server-Endzertifikates hat fehlgeschlagen \ No newline at end of file
diff --git a/id.server/res/resources/wsdl/MOA-ID-1.0.wsdl b/id.server/res/resources/wsdl/MOA-ID-1.0.wsdl
deleted file mode 100644
index 5751b3e58..000000000
--- a/id.server/res/resources/wsdl/MOA-ID-1.0.wsdl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
- <import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-20020812.xsd"/>
- <message name="GetAuthenticationDataInput">
- <part name="body" element="samlp:Request"/>
- </message>
- <message name="GetAuthenticationDataOutput">
- <part name="body" element="samlp:Response"/>
- </message>
- <message name="MOAFault">
- <part name="body" element="moa:ErrorResponse"/>
- </message>
- <portType name="IdentificationPortType">
- <operation name="getAuthenticationData">
- <input message="tns:GetAuthenticationDataInput"/>
- <output message="tns:GetAuthenticationDataOutput"/>
- <fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
- </portType>
- <binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="getAuthenticationData">
- <soap:operation soapAction="urn:GetAuthenticationDataAction"/>
- <input>
- <soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </input>
- <output>
- <soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </output>
- <fault name="MOAFault">
- <soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </fault>
- </operation>
- </binding>
- <service name="GetAuthenticationDataService">
- <port name="IdentificationPort" binding="tns:IdentificationBinding">
- <soap:address location="http://localhost/moa-id-auth/services/GetAuthenticationData"/>
- </port>
- </service>
-</definitions>
diff --git a/id.server/res/resources/xmldata/CertInfoDsigSignature.xml b/id.server/res/resources/xmldata/CertInfoDsigSignature.xml
deleted file mode 100644
index bf35dc73f..000000000
--- a/id.server/res/resources/xmldata/CertInfoDsigSignature.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<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>C0hW5jQojphweuFzPb+CNkHwhe4=</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>Bdsc7wAfyMyZ21ChcF+tRh3D7sU=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>lCz3hDQMbqRMmCieG3fQFax3f8JX86gDi7mf4h03J7vlJjSOJQ4Wh/3Kd81ntKuh
-qFphj2cEhQYX08e6SeaU+7H7qdRa+xFRDRGav8L5x5xCUQT2SV+2/hx0C7UuJt+p
-tewtbqVAcNxgKPlBuIzyXGOrBdiinp1KftEQoVCpPCI=</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>
-<head>
-<title>Überprüfung des Namen des Anmelde-Servers</title>
-</head>
-<body>
-<h2>Prüfung der Identität des MOA-ID Servers</h2>
-
-Bevor Sie sich in den folgenden Schritten an eine Online-Applikation anmelden,
-wird empfohlen den Namen des Anmelde-Servers zu überprüfen.
-Zu diesem Zweck identifiziert Ihr Webbrowser den Anmelde-Server mit Hilfe eines Zertifikates.
-Ihre Aufgabe ist es zu überprüfen, ob das Server-Zertifikat von einem Unternehmen ausgestellt
-wurde, dem Sie vertrauen.
-<p>
-Die folgenden Absätze beschreiben, wie Sie diese Überprüfung durchführen können.
-Führen Sie jene Arbeitsschritte durch, die für den von Ihnen verwendeten Webbrowser zutreffend sind.
-</p>
-<h3>Microsoft Internet Explorer 6.0</h3>
-
-<ol>
-<li>Öffnen Sie (durch Doppel-Klicken) das Symbol mit dem gelben Vorhangschloß am unteren Rand des Browsers.</li>
-<li>Selektieren Sie im nun geöffnetem Fenster &quot;Zertifikat&quot; den Karteireiter &quot;Zertifizierungspfad&quot;.</li>
-<li>Öffnen Sie (durch Doppel-Klicken) das an oberster Stelle gereihte Zertifikat.</li>
-<li>Überprüfen Sie ob als Aussteller dieses Zertifikat (Karteireiter &quot;Details&quot;, Eintrag &quot;Aussteller&quot;)
-ein Unternehmen aufscheint, dem Sie vertrauen den Namen des Anmelde-Servers zu überprüfen.</li>
-<li>Überprüfen Sie, ob dieses Zertifikat authentisch vom angegebene Unternehmen stammt. Dazu können Sie den
-Fingerabdruck (Karteireiter &quot;Details&quot;, unterster Eintrag) des Zertifikats überprüfen. Am Ende dieses Dokuments ist
-eine von der IKT-Stabsstelle überprüfte Liste von Zertifikaten und deren Fingerabdruck aufgelistet.
-Überprüfen Sie ob das von Ihnen zu überprüfende Zertifikat
-in dieser Liste enthalten ist und der Fingerabruck mit dem Wert in der Liste übereinstimmt.
-<ul>
-<li>Ist Ihr zu prüfendes Zertifikat in der Liste enthalten und stimmt der Wert des Fingerabdrucks mit dem Wert
-in der Liste überein, dann ist das Zertifikat authentisch und der Anmeldevorgang kann fortgesetzt werden.</li>
-<li>Ist Ihr zu prüfendes Zertifikat in der Liste enthalten aber stimmt der Wert des Fingerabdrucks nicht mit dem Wert
-in der Liste überein, dann ist das Zertifikat nicht authentisch und der Anmeldevorgang muss abgebrochen werden.</li>
-<li>Ist Ihr zu prüfendes Zertifikat nicht in der Liste enthalten müssen Sie eine andere verlässliche Quelle für den
-Vergleich des Fingerabdrucks finden. Sofern das Zertifikat authentisch ist, kann der Anmeldevorgang fortgesetzt werden.</li>
-</ul></li>
-<li>Ist das in Schritt 3. geöffnete Zertifikat nicht im Internet Explorer installiert erscheint das Zertifikat mit
-einem roten Kreuz. Sie können das Zertifikat installieren, indem Sie die Schaltfläche &quot;Zertifikat installieren ...&quot;
-(Karteireiter &quot;Allgemein&quot;) aktivieren. In der Folge werden alle von dieser Zertifizierungsstelle ausgestellten Zertifikate
-vom Internet Explorer als vertrauenswürdig erkannt.</li>
-</ol>
-<h3>Netscape Navigator 7.0</h3>
-<ol>
-<li>Öffnen Sie (durch Klicken) das Symbol mit dem Vorhangschloss am rechten, unteren Rand des Browsers</li>
-<li>Aktivieren Sie die Schaltfläche &quot;Anzeigen&quot;</li>
-<li>Selektieren Sie im nun geöffnetem Fenster &quot;Zertifikatsanzeige&quot; den Karteireiter &quot;Detail&quot;.</li>
-<li>Aktivieren Sie (durch Klicken) das an oberster Stelle gereihte Zertifikat.</li>
-<li>Überprüfen Sie ob als Aussteller dieses Zertifikat (Eintrag &quot;Aussteller&quot;)
-ein Unternehmen aufscheint, dem Sie vertrauen den Namen des Anmelde-Servers zu überprüfen.</li>
-<li>Überprüfen Sie, ob dieses Zertifikat authentisch vom angegebene Unternehmen stammt. Dazu können Sie den
-Fingerabdruck des Zertifikats überprüfen. Am Ende dieses Dokuments ist
-eine von der IKT-Stabsstelle überprüfte Liste von Zertifikaten und deren Fingerabdruck aufgelistet.
-Überprüfen Sie ob das von Ihnen zu überprüfende Zertifikat
-in dieser Liste enthalten ist und der Fingerabruck mit dem Wert in der Liste übereinstimmt.
-<ul>
-<li>Ist Ihr zu prüfendes Zertifikat in der Liste enthalten und stimmt der Wert des Fingerabdrucks mit dem Wert
-in der Liste überein, dann ist das Zertifikat authentisch und der Anmeldevorgang kann fortgesetzt werden.</li>
-<li>Ist Ihr zu prüfendes Zertifikat in der Liste enthalten aber stimmt der Wert des Fingerabdrucks nicht mit dem Wert
-in der Liste überein, dann ist das Zertifikat nicht authentisch und der Anmeldevorgang muss abgebrochen werden.</li>
-<li>Ist Ihr zu prüfendes Zertifikat nicht in der Liste enthalten müssen Sie eine andere verlässliche Quelle für den
-Vergleich des Fingerabdrucks finden. Sofern das Zertifikat authentisch ist, kann der Anmeldevorgang fortgesetzt werden.</li>
-</ul></li>
-<li>Ist das Aussteller-Zertifikat nicht im Netscape Navigator installiert können Sie das Zertifikat installieren,
-indem Sie die &quot;*.cer&quot; Datei mit Netscape Navigator öffnen. In der Folge werden alle von dieser Zertifizierungsstelle
-ausgestellten Zertifikate vom Internet Explorer als vertrauenswürdig erkannt.</li>
-</ol>
-
-<h2>Zertifikate und ihr Fingerabdruck</h2>
-
-<table>
-<tr>
-<td>Aussteller</td><td>CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT</td>
-</tr>
-<tr>
-<td>Seriennummer</td><td>111 (0x6f)</td>
-</tr>
-<tr>
-<td>Fingerabdruck</td><td>SHA-1: e6 e6 fc 88 71 91 77 c9 b7 42 18 25 75 7c 5e 47 bc ac 85 f6</td>
-</tr>
-</table>
-
-<p/>
-<table>
-<tr>
-<td>Aussteller</td><td>CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT</td>
-</tr>
-<tr>
-<td>Seriennummer</td><td>531 (0x213)</td>
-</tr>
-<tr>
-<td>Fingerabdruck</td><td>SHA-1: 9e 05 12 dd 61 da 59 49 d1 d8 63 1c 3f 19 d7 5f 49 6c 37 33</td>
-</tr>
-</table>
-
-<p/>
-<table>
-<tr>
-<td>Aussteller</td><td>CN=A-Trust-nQual-01,OU=A-Trust-nQual-01,O=A-Trust,C=AT</td>
-</tr>
-<tr>
-<td>Seriennummer</td><td>536 (0x0218)</td>
-</tr>
-<tr>
-<td>Fingerabdruck</td><td>SHA-1: 0f 5a 03 42 f5 cd 44 87 99 c3 c6 d1 78 60 7e 3f 2b 5b cb 8f</td>
-</tr>
-</table>
-
-</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-05-06T07:09:50Z</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> \ No newline at end of file
diff --git a/id.server/res/resources/xmldata/CertInfoVerifyXMLSignatureRequest.xml b/id.server/res/resources/xmldata/CertInfoVerifyXMLSignatureRequest.xml
deleted file mode 100644
index 1966d2ca2..000000000
--- a/id.server/res/resources/xmldata/CertInfoVerifyXMLSignatureRequest.xml
+++ /dev/null
@@ -1,9 +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/></sl10:XMLContent>
- </sl11:SignatureEnvironment>
- <sl11:SignatureLocation>//dsig:Signature</sl11:SignatureLocation>
- </sl11:SignatureInfo>
-</sl11:VerifyXMLSignatureRequest>
diff --git a/id.server/src/at/gv/egovernment/moa/id/AuthenticationException.java b/id.server/src/at/gv/egovernment/moa/id/AuthenticationException.java
deleted file mode 100644
index 96a5e0673..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/AuthenticationException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package at.gv.egovernment.moa.id;
-
-
-/**
- * Exception thrown during handling of AuthenticationSession
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationException extends MOAIDException {
-
- /**
- * Constructor for AuthenticationException.
- * @param messageId
- */
- public AuthenticationException(String messageId, Object[] parameters) {
- super(messageId, parameters, null);
- }
- /**
- * Constructor for AuthenticationException.
- * @param messageId
- * @param parameters
- * @param wrapped
- */
- public AuthenticationException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
- super(messageId, parameters, wrapped);
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/BuildException.java b/id.server/src/at/gv/egovernment/moa/id/BuildException.java
deleted file mode 100644
index 785dce7a3..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/BuildException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.gv.egovernment.moa.id;
-
-
-/**
- * Exception thrown while building an XML or HTML structure.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class BuildException extends MOAIDException {
-
- /**
- * Constructor for BuildException.
- * @param messageId
- * @param parameters
- */
- public BuildException(String messageId, Object[] parameters) {
- super(messageId, parameters);
- }
-
- /**
- * Constructor for BuildException.
- * @param messageId
- * @param parameters
- * @param wrapped
- */
- public BuildException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
- super(messageId, parameters, wrapped);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/MOAIDException.java b/id.server/src/at/gv/egovernment/moa/id/MOAIDException.java
deleted file mode 100644
index bce2c4778..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/MOAIDException.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package at.gv.egovernment.moa.id;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Base class of technical MOA exceptions.
- *
- * Technical exceptions are exceptions that originate from system failure (e.g.,
- * a database connection fails, a component is not available, etc.)
- *
- * @author Patrick Peck, Ivancsics Paul
- * @version $Id$
- */
-public class MOAIDException extends Exception {
- /** message ID */
- private String messageId;
- /** wrapped exception */
- private Throwable wrapped;
-
- /**
- * Create a new <code>MOAIDException</code>.
- *
- * @param messageId The identifier of the message associated with this
- * exception.
- * @param parameters Additional message parameters.
- */
- public MOAIDException(String messageId, Object[] parameters) {
- super(MOAIDMessageProvider.getInstance().getMessage(messageId, parameters));
- this.messageId = messageId;
- }
-
- /**
- * Create a new <code>MOAIDException</code>.
- *
- * @param messageId The identifier of the message associated with this
- * <code>MOAIDException</code>.
- * @param parameters Additional message parameters.
- * @param wrapped The exception wrapped by this
- * <code>MOAIDException</code>.
- */
- public MOAIDException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
-
- super(MOAIDMessageProvider.getInstance().getMessage(messageId, parameters));
- this.messageId = messageId;
- this.wrapped = wrapped;
- }
-
- /**
- * Print a stack trace of this exception to <code>System.err</code>.
- *
- * @see java.lang.Throwable#printStackTrace()
- */
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
- /**
- * Print a stack trace of this exception, including the wrapped exception.
- *
- * @param s The stream to write the stack trace to.
- * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
- */
- public void printStackTrace(PrintStream s) {
- if (getWrapped() == null)
- super.printStackTrace(s);
- else {
- s.print("Root exception: ");
- getWrapped().printStackTrace(s);
- }
- }
-
- /**
- * Print a stack trace of this exception, including the wrapped exception.
- *
- * @param s The stream to write the stacktrace to.
- * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
- */
- public void printStackTrace(PrintWriter s) {
- if (getWrapped() == null)
- super.printStackTrace(s);
- else {
- s.print("Root exception: ");
- getWrapped().printStackTrace(s);
- }
- }
-
- /**
- * @return message ID
- */
- public String getMessageId() {
- return messageId;
- }
-
- /**
- * @return wrapped exception
- */
- public Throwable getWrapped() {
- return wrapped;
- }
-
- /**
- * Convert this <code>MOAIDException</code> to an <code>ErrorResponse</code>
- * element from the MOA namespace.
- *
- * @return An <code>ErrorResponse</code> element, containing the subelements
- * <code>ErrorCode</code> and <code>Info</code> required by the MOA schema.
- */
- public Element toErrorResponse() {
- DocumentBuilder builder;
- DOMImplementation impl;
- Document doc;
- Element errorResponse;
- Element errorCode;
- Element info;
-
- // create a new document
- try {
- builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- impl = builder.getDOMImplementation();
- } catch (ParserConfigurationException e) {
- return null;
- }
-
- // build the ErrorResponse element
- doc = impl.createDocument(Constants.MOA_NS_URI, "ErrorResponse", null);
- errorResponse = doc.getDocumentElement();
-
- // add MOA namespace declaration
- errorResponse.setAttributeNS(
- Constants.XMLNS_NS_URI,
- "xmlns",
- Constants.MOA_NS_URI);
-
- // build the child elements
- errorCode = doc.createElementNS(Constants.MOA_NS_URI, "ErrorCode");
- errorCode.appendChild(doc.createTextNode(messageId));
- info = doc.createElementNS(Constants.MOA_NS_URI, "Info");
- info.appendChild(doc.createTextNode(toString()));
- errorResponse.appendChild(errorCode);
- errorResponse.appendChild(info);
- return errorResponse;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/ParseException.java b/id.server/src/at/gv/egovernment/moa/id/ParseException.java
deleted file mode 100644
index a5e0088d9..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/ParseException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.gv.egovernment.moa.id;
-
-
-/**
- * Exception thrown while parsing an XML structure.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ParseException extends MOAIDException {
-
- /**
- * Constructor for ParseException.
- * @param messageId
- * @param parameters
- */
- public ParseException(String messageId, Object[] parameters) {
- super(messageId, parameters);
- }
-
- /**
- * Constructor for ParseException.
- * @param messageId
- * @param parameters
- * @param wrapped
- */
- public ParseException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
- super(messageId, parameters, wrapped);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/ServiceException.java b/id.server/src/at/gv/egovernment/moa/id/ServiceException.java
deleted file mode 100644
index 9e6ab2361..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/ServiceException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.gv.egovernment.moa.id;
-
-
-/**
- * Exception thrown while calling the MOA-SPSS web service.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ServiceException extends MOAIDException {
-
- /**
- * Constructor for ServiceException.
- * @param messageId
- * @param parameters
- */
- public ServiceException(String messageId, Object[] parameters) {
- super(messageId, parameters);
- }
-
- /**
- * Constructor for ServiceException.
- * @param messageId
- * @param parameters
- * @param wrapped
- */
- public ServiceException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
- super(messageId, parameters, wrapped);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
deleted file mode 100644
index e9d9c7175..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ /dev/null
@@ -1,648 +0,0 @@
-package at.gv.egovernment.moa.id.auth;
-
-import iaik.pki.PKIException;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.AuthenticationException;
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.id.ServiceException;
-import at.gv.egovernment.moa.id.auth.builder.AuthenticationBlockAssertionBuilder;
-import at.gv.egovernment.moa.id.auth.builder.AuthenticationDataAssertionBuilder;
-import at.gv.egovernment.moa.id.auth.builder.CertInfoVerifyXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.builder.CreateXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;
-import at.gv.egovernment.moa.id.auth.builder.GetIdentityLinkFormBuilder;
-import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilder;
-import at.gv.egovernment.moa.id.auth.builder.PersonDataBuilder;
-import at.gv.egovernment.moa.id.auth.builder.SAMLArtifactBuilder;
-import at.gv.egovernment.moa.id.auth.builder.SelectBKUFormBuilder;
-import at.gv.egovernment.moa.id.auth.builder.VPKBuilder;
-import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
-import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker;
-import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.SAMLArtifactParser;
-import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.servlet.AuthServlet;
-import at.gv.egovernment.moa.id.auth.validator.CreateXMLSignatureResponseValidator;
-import at.gv.egovernment.moa.id.auth.validator.IdentityLinkValidator;
-import at.gv.egovernment.moa.id.auth.validator.ValidateException;
-import at.gv.egovernment.moa.id.auth.validator.VerifyXMLSignatureResponseValidator;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.id.util.Random;
-import at.gv.egovernment.moa.id.util.SSLUtils;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.DateTimeUtils;
-import at.gv.egovernment.moa.util.FileUtils;
-
-/**
- * API for MOA ID Authentication Service.<br>
- * {@link AuthenticationSession} is stored in a session store and retrieved
- * by giving the session ID.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationServer implements MOAIDAuthConstants {
-
- /** single instance */
- private static AuthenticationServer instance;
- /** session data store (session ID -> AuthenticationSession) */
- private static Map sessionStore = new HashMap();
- /** authentication data store (assertion handle -> AuthenticationData) */
- private static Map authenticationDataStore = new HashMap();
- /**
- * time out in milliseconds used by {@link cleanup} for session store
- */
- private long sessionTimeOut = 10*60*1000; // default 10 minutes
- /**
- * time out in milliseconds used by {@link cleanup} for authentication data store
- */
- private long authDataTimeOut = 2*60*1000; // default 2 minutes
-
- /**
- * Returns the single instance of <code>AuthenticationServer</code>.
- *
- * @return the single instance of <code>AuthenticationServer</code>
- */
- public static AuthenticationServer getInstance() {
- if (instance == null)
- instance = new AuthenticationServer();
- return instance;
- }
- /**
- * Constructor for AuthenticationServer.
- */
- public AuthenticationServer() {
- super();
- }
- /**
- * Processes request to select a BKU.
- * <br/>Processing depends on value of {@link AuthConfigurationProvider#getBKUSelectionType}.
- * <br/>For <code>bkuSelectionType==HTMLComplete</code>, a <code>returnURI</code> for the
- * "BKU Auswahl" service is returned.
- * <br/>For <code>bkuSelectionType==HTMLSelect</code>, an HTML form for BKU selection is returned.
- * @param authURL base URL of MOA-ID Auth component
- * @param target "Gesch&auml;ftsbereich"
- * @param oaURL online application URL requested
- * @param bkuSelectionTemplateURL template for BKU selection form to be used
- * in case of <code>HTMLSelect</code>; may be null
- * @param templateURL URL providing an HTML template for the HTML form to be used
- * for call <code>startAuthentication</code>
- * @return for <code>bkuSelectionType==HTMLComplete</code>, the <code>returnURI</code> for the
- * "BKU Auswahl" service;
- * for <code>bkuSelectionType==HTMLSelect</code>, an HTML form for BKU selection
- * @throws WrongParametersException upon missing parameters
- * @throws AuthenticationException when the configured BKU selection service cannot be reached,
- * and when the given bkuSelectionTemplateURL cannot be reached
- * @throws ConfigurationException on missing configuration data
- * @throws BuildException while building the HTML form
- */
- public String selectBKU(
- String authURL, String target, String oaURL, String bkuSelectionTemplateURL, String templateURL)
- throws WrongParametersException, AuthenticationException, ConfigurationException, BuildException {
-
- if (isEmpty(authURL))
- throw new WrongParametersException("StartAuthentication", "AuthURL");
- if (isEmpty(target))
- throw new WrongParametersException("StartAuthentication", PARAM_TARGET);
- if (isEmpty(oaURL))
- throw new WrongParametersException("StartAuthentication", PARAM_OA);
- if (! authURL.startsWith("https:"))
- throw new AuthenticationException("auth.07", null);
- ConnectionParameter bkuConnParam = AuthConfigurationProvider.getInstance().getBKUConnectionParameter();
- if (bkuConnParam == null)
- throw new ConfigurationException("config.08", new Object[] {"BKUSelection/ConnectionParameter"});
- OAAuthParameter oaParam =
- AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(oaURL);
- if (oaParam == null)
- throw new AuthenticationException("auth.00", new Object[] {oaURL});
- AuthenticationSession session = newSession();
- Logger.info("MOASession " + session.getSessionID() + " angelegt");
- session.setTarget(target);
- session.setOAURLRequested(oaURL);
- session.setPublicOAURLPrefix(oaParam.getPublicURLPrefix());
- session.setAuthURL(authURL);
- session.setTemplateURL(templateURL);
- String returnURL = new DataURLBuilder().buildDataURL(authURL, REQ_START_AUTHENTICATION, session.getSessionID());
- String bkuSelectionType = AuthConfigurationProvider.getInstance().getBKUSelectionType();
- if (bkuSelectionType.equals(AuthConfigurationProvider.BKU_SELECTION_TYPE_HTMLCOMPLETE)) {
- // bkuSelectionType==HTMLComplete
- String redirectURL = bkuConnParam.getUrl() + "?" + AuthServlet.PARAM_RETURN + "=" + returnURL;
- return redirectURL;
- }
- else {
- // bkuSelectionType==HTMLSelect
- String bkuSelectTag;
- try {
- bkuSelectTag = readBKUSelectTag(AuthConfigurationProvider.getInstance(), bkuConnParam);
- }
- catch (Throwable ex) {
- throw new AuthenticationException("auth.03", new Object[] {bkuConnParam.getUrl(), ex.toString()}, ex);
- }
- String bkuSelectionTemplate = null;
- if (bkuSelectionTemplateURL != null) {
- try {
- bkuSelectionTemplate = new String(FileUtils.readURL(bkuSelectionTemplateURL));
- }
- catch (IOException ex) {
- throw new AuthenticationException("auth.03", new Object[] {bkuSelectionTemplateURL, ex.toString()}, ex);
- }
- }
- String htmlForm = new SelectBKUFormBuilder().build(bkuSelectionTemplate, returnURL, bkuSelectTag);
- return htmlForm;
- }
- }
- /**
- * Method readBKUSelectTag.
- * @param conf the ConfigurationProvider
- * @param connParam the ConnectionParameter for that connection
- * @return String
- * @throws ConfigurationException on config-errors
- * @throws PKIException on PKI errors
- * @throws IOException on any data error
- * @throws GeneralSecurityException on security errors
- */
- private String readBKUSelectTag(ConfigurationProvider conf, ConnectionParameter connParam)
- throws ConfigurationException, PKIException, IOException, GeneralSecurityException {
-
- if (connParam.isHTTPSURL())
- return new String(SSLUtils.readHttpsURL(conf, connParam));
- else
- return new String(FileUtils.readURL(connParam.getUrl()));
- }
- /**
- * Processes the beginning of an authentication session.
- * <ul>
- * <li>Starts an authentication session</li>
- * <li>Creates an <code>&lt;InfoboxReadRequest&gt;</code></li>
- * <li>Creates an HTML form for querying the identity link from the
- * security layer implementation.
- * <br>Form parameters include
- * <ul>
- * <li>the <code>&lt;InfoboxReadRequest&gt;</code></li>
- * <li>the data URL where the security layer implementation sends it response to</li>
- * </ul>
- * </ul>
- * @param authURL URL of the servlet to be used as data URL
- * @param target "Gesch&auml;ftsbereich" of the online application requested
- * @param oaURL online application URL requested
- * @param bkuURL URL of the "B&uuml;rgerkartenumgebung" to be used;
- * may be <code>null</code>; in this case, the default location will be used
- * @param templateURL URL providing an HTML template for the HTML form generated
- * @return HTML form
- * @throws AuthenticationException
- * @see GetIdentityLinkFormBuilder
- * @see InfoboxReadRequestBuilder
- */
- public String startAuthentication(
- String authURL, String target, String oaURL, String templateURL, String bkuURL, String sessionID)
- throws WrongParametersException, AuthenticationException, ConfigurationException, BuildException {
-
- if (isEmpty(sessionID)) {
- if (isEmpty(authURL))
- throw new WrongParametersException("StartAuthentication", "AuthURL");
- if (! authURL.startsWith("https:"))
- throw new AuthenticationException("auth.07", null);
- if (isEmpty(target))
- throw new WrongParametersException("StartAuthentication", PARAM_TARGET);
- if (isEmpty(oaURL))
- throw new WrongParametersException("StartAuthentication", PARAM_OA);
- }
- AuthenticationSession session;
- if (sessionID != null)
- session = getSession(sessionID);
- else {
- OAAuthParameter oaParam =
- AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(oaURL);
- if (oaParam == null)
- throw new AuthenticationException("auth.00", new Object[] {oaURL});
- session = newSession();
- Logger.info("MOASession " + session.getSessionID() + " angelegt");
- session.setTarget(target);
- session.setOAURLRequested(oaURL);
- session.setPublicOAURLPrefix(oaParam.getPublicURLPrefix());
- session.setAuthURL(authURL);
- session.setTemplateURL(templateURL);
- }
- String infoboxReadRequest = new InfoboxReadRequestBuilder().build();
- String dataURL = new DataURLBuilder().buildDataURL(
- session.getAuthURL(), REQ_VERIFY_IDENTITY_LINK, session.getSessionID());
- String template = null;
- if (session.getTemplateURL() != null) {
- try {
- template = new String(FileUtils.readURL(session.getTemplateURL()));
- }
- catch (IOException ex) {
- throw new AuthenticationException("auth.03", new Object[] {session.getTemplateURL(), ex.toString()}, ex);
- }
- }
- String certInfoRequest = new CertInfoVerifyXMLSignatureRequestBuilder().build();
- String certInfoDataURL = new DataURLBuilder().buildDataURL(
- session.getAuthURL(), REQ_START_AUTHENTICATION, session.getSessionID());
- String htmlForm = new GetIdentityLinkFormBuilder().build(
- template, bkuURL, infoboxReadRequest, dataURL, certInfoRequest, certInfoDataURL);
- return htmlForm;
- }
- /**
- * Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the
- * security layer implementation.<br>
- * <ul>
- * <li>Validates given <code>&lt;InfoboxReadResponse&gt;</code></li>
- * <li>Parses identity link enclosed in <code>&lt;InfoboxReadResponse&gt;</code></li>
- * <li>Verifies identity link by calling the MOA SP component</li>
- * <li>Checks certificate authority of identity link</li>
- * <li>Stores identity link in the session</li>
- * <li>Creates an authentication block to be signed by the user</li>
- * <li>Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code>
- * containg the authentication block, meant to be returned to the
- * security layer implementation</li>
- * </ul>
- *
- * @param sessionID ID of associated authentication session data
- * @param xmlInfoboxReadResponse String representation of the
- * <code>&lt;InfoboxReadResponse&gt;</code>
- * @return String representation of the <code>&lt;CreateXMLSignatureRequest&gt;</code>
- */
- public String verifyIdentityLink (String sessionID, String xmlInfoboxReadResponse)
- throws AuthenticationException, ParseException, ConfigurationException, ValidateException, ServiceException, WrongParametersException {
-
- if (isEmpty(sessionID))
- throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID);
- if (isEmpty(xmlInfoboxReadResponse))
- throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_XMLRESPONSE);
- AuthenticationSession session = getSession(sessionID);
- if (session.getTimestampIdentityLink() != null)
- throw new AuthenticationException("auth.01", new Object[] {sessionID});
- session.setTimestampIdentityLink();
- AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
- // parses the <InfoboxReadResponse>
- IdentityLink identityLink = new InfoboxReadResponseParser(xmlInfoboxReadResponse).
- parseIdentityLink();
- // validates the identity link
- IdentityLinkValidator.getInstance().validate(identityLink);
- // builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
- Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(
- identityLink, authConf.getMoaSpIdentityLinkTrustProfileID());
- // debug output
- debugOutputXMLFile("VerifyIdentityLinkRequest.xml", domVerifyXMLSignatureRequest);
- // invokes the call
- Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().
- verifyXMLSignature(domVerifyXMLSignatureRequest);
- // parses the <VerifyXMLSignatureResponse>
- VerifyXMLSignatureResponse verifyXMLSignatureResponse =
- new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse).parseData();
- // debug output
- debugOutputXMLFile("VerifyIdentityLinkResponse.xml", domVerifyXMLSignatureResponse);
- // validates the <VerifyXMLSignatureResponse>
- VerifyXMLSignatureResponseValidator.getInstance().validate(
- verifyXMLSignatureResponse,
- authConf.getIdentityLinkX509SubjectNames(),
- VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK);
-
- session.setIdentityLink(identityLink);
- // builds the AUTH-block
- String authBlock = buildAuthenticationBlock(session);
- session.setAuthBlock(authBlock);
- // builds the <CreateXMLSignatureRequest>
- String[] transformInfos = authConf.getTransformsInfos();
- String createXMLSignatureRequest = new CreateXMLSignatureRequestBuilder().
- build(authBlock, transformInfos);
- return createXMLSignatureRequest;
- }
- /**
- * Builds an authentication block <code>&lt;saml:Assertion&gt;</code> from given session data.
- * @param session authentication session
- * @return <code>&lt;saml:Assertion&gt;</code> as a String
- */
- private String buildAuthenticationBlock(AuthenticationSession session) {
- IdentityLink identityLink = session.getIdentityLink();
- String issuer = identityLink.getGivenName() + " " + identityLink.getFamilyName();
- String issueInstant = DateTimeUtils.buildDateTime(Calendar.getInstance());
- String authURL = session.getAuthURL();
- String target = session.getTarget();
- String oaURL = session.getPublicOAURLPrefix();
- String authBlock = new AuthenticationBlockAssertionBuilder().
- build(issuer, issueInstant, authURL, target, oaURL);
- return authBlock;
- }
- /**
- * Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
- * security layer implementation.<br>
- * <ul>
- * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
- * <li>Parses <code>&lt;CreateXMLSignatureResponse&gt;</code> for error codes</li>
- * <li>Parses authentication block enclosed in
- * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
- * <li>Verifies authentication block by calling the MOA SP component</li>
- * <li>Creates authentication data</li>
- * <li>Creates a corresponding SAML artifact</li>
- * <li>Stores authentication data in the authentication data store
- * indexed by the SAML artifact</li>
- * <li>Deletes authentication session</li>
- * <li>Returns the SAML artifact, encoded BASE64</li>
- * </ul>
- *
- * @param sessionID session ID of the running authentication session
- * @param xmlCreateXMLSignatureReadResponse String representation of the
- * <code>&lt;CreateXMLSignatureResponse&gt;</code>
- * @return SAML artifact needed for retrieving authentication data, encoded BASE64
- */
- public String verifyAuthenticationBlock(
- String sessionID, String xmlCreateXMLSignatureReadResponse)
- throws AuthenticationException, BuildException, ParseException, ConfigurationException, ServiceException, ValidateException, WrongParametersException {
-
- if (isEmpty(sessionID))
- throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID);
- if (isEmpty(xmlCreateXMLSignatureReadResponse))
- throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_XMLRESPONSE);
- AuthenticationSession session = getSession(sessionID);
- AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
- // parses <CreateXMLSignatureResponse>
- CreateXMLSignatureResponse csresp =
- new CreateXMLSignatureResponseParser(xmlCreateXMLSignatureReadResponse).parseResponse();
- // validates <CreateXMLSignatureResponse>
- new CreateXMLSignatureResponseValidator().validate(csresp, session.getTarget(), session.getPublicOAURLPrefix());
- // builds a <VerifyXMLSignatureRequest> for a MOA-SPSS call
- String[] vtids = authConf.getMoaSpAuthBlockVerifyTransformsInfoIDs();
- String tpid = authConf.getMoaSpAuthBlockTrustProfileID();
- Element domVsreq = new VerifyXMLSignatureRequestBuilder().build(csresp, vtids, tpid);
- // debug output
- AuthenticationServer.debugOutputXMLFile("VerifyAuthenticationBlockRequest.xml", domVsreq);
- // invokes the call
- Element domVsresp = new SignatureVerificationInvoker().verifyXMLSignature(domVsreq);
- // parses the <VerifyXMLSignatureResponse>
- VerifyXMLSignatureResponse vsresp = new VerifyXMLSignatureResponseParser(domVsresp).parseData();
- // debug output
- AuthenticationServer.debugOutputXMLFile("VerifyAuthenticationBlockResponse.xml", domVsresp);
- // validates the <VerifyXMLSignatureResponse>
- VerifyXMLSignatureResponseValidator.getInstance().validate(
- vsresp, null,VerifyXMLSignatureResponseValidator.CHECK_AUTH_BLOCK);
- // compares the public keys from the identityLink with the AuthBlock
- VerifyXMLSignatureResponseValidator.getInstance().validateCertificate(vsresp, session.getIdentityLink());
-
- // builds authentication data and stores it together with a SAML artifact
- AuthenticationData authData = buildAuthenticationData(session, vsresp);
- String samlArtifact = new SAMLArtifactBuilder().build(session.getAuthURL(), session.getSessionID());
- storeAuthenticationData(samlArtifact, authData);
- // invalidates the authentication session
- sessionStore.remove(sessionID);
- Logger.info("Anmeldedaten zu MOASession " + sessionID + " angelegt, SAML Artifakt " + samlArtifact);
- return samlArtifact;
- }
- /**
- * Builds the AuthenticationData object together with the
- * corresponding <code>&lt;saml:Assertion&gt;</code>
- * @param session authentication session
- * @param verifyXMLSigResp VerifyXMLSignatureResponse from MOA-SP
- * @return AuthenticationData object
- * @throws ConfigurationException while accessing configuration data
- * @throws BuildException while building the <code>&lt;saml:Assertion&gt;</code>
- */
- private AuthenticationData buildAuthenticationData(
- AuthenticationSession session,
- VerifyXMLSignatureResponse verifyXMLSigResp)
- throws ConfigurationException, BuildException {
-
- IdentityLink identityLink = session.getIdentityLink();
- AuthenticationData authData = new AuthenticationData();
- authData.setMajorVersion(1);
- authData.setMinorVersion(0);
- authData.setAssertionID(Random.nextRandom());
- authData.setIssuer(session.getAuthURL());
- authData.setIssueInstant(DateTimeUtils.buildDateTime(Calendar.getInstance()));
- String vpkBase64 = new VPKBuilder().buildVPK(
- identityLink.getIdentificationValue(), identityLink.getDateOfBirth(), session.getTarget());
- authData.setVPK(vpkBase64);
- authData.setGivenName(identityLink.getGivenName());
- authData.setFamilyName(identityLink.getFamilyName());
- authData.setDateOfBirth(identityLink.getDateOfBirth());
- authData.setQualifiedCertificate(verifyXMLSigResp.isQualifiedCertificate());
- authData.setPublicAuthority(verifyXMLSigResp.isPublicAuthority());
- authData.setPublicAuthorityCode(verifyXMLSigResp.getPublicAuthorityCode());
- OAAuthParameter oaParam =
- AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(
- session.getPublicOAURLPrefix());
- String prPerson = new PersonDataBuilder().build(
- identityLink, oaParam.getProvideZMRZahl());
-
- try {
- String ilAssertion =
- oaParam.getProvideIdentityLink() ? DOMUtils.serializeNode(identityLink.getSamlAssertion()) : "";
- String authBlock = oaParam.getProvideAuthBlock() ? session.getAuthBlock() : "";
- String samlAssertion = new AuthenticationDataAssertionBuilder().build(
- authData, prPerson, authBlock, ilAssertion);
- authData.setSamlAssertion(samlAssertion);
- return authData;
- }
- catch (Throwable ex) {
- throw new BuildException(
- "builder.00",
- new Object[] { "AuthenticationData", ex.toString() },
- ex);
- }
- }
- /**
- * Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- * The <code>AuthenticationData</code> is deleted from the store upon end of this call.
- *
- * @return <code>AuthenticationData</code>
- */
- public AuthenticationData getAuthenticationData(String samlArtifact) throws AuthenticationException {
- String assertionHandle;
- try {
- assertionHandle = new SAMLArtifactParser(samlArtifact).parseAssertionHandle();
- }
- catch (ParseException ex) {
- throw new AuthenticationException("1205", new Object[] {samlArtifact, ex.toString()});
- }
- AuthenticationData authData = null;
- synchronized (authenticationDataStore) {
- authData = (AuthenticationData)authenticationDataStore.get(assertionHandle);
- if (authData == null) {
- Logger.error("Assertion not found for SAML Artifact: " + samlArtifact);
- throw new AuthenticationException("1206", new Object[] {samlArtifact});
- }
- authenticationDataStore.remove(assertionHandle);
- }
- long now = new Date().getTime();
- if (now - authData.getTimestamp().getTime() > authDataTimeOut)
- throw new AuthenticationException("1207", new Object[] {samlArtifact});
- Logger.debug("Assertion delivered for SAML Artifact: " + samlArtifact);
- return authData;
- }
- /**
- * Stores authentication data indexed by the assertion handle contained in the
- * given saml artifact.
- * @param samlArtifact SAML artifact
- * @param authData authentication data
- * @throws AuthenticationException when SAML artifact is invalid
- */
- private void storeAuthenticationData(String samlArtifact, AuthenticationData authData)
- throws AuthenticationException {
-
- try {
- SAMLArtifactParser parser = new SAMLArtifactParser(samlArtifact);
- // check type code 0x0001
- byte[] typeCode = parser.parseTypeCode();
- if (typeCode[0] != 0 || typeCode[1] != 1)
- throw new AuthenticationException("auth.06", new Object[] {samlArtifact});
- String assertionHandle = parser.parseAssertionHandle();
- synchronized(authenticationDataStore) {
- Logger.debug("Assertion stored for SAML Artifact: " + samlArtifact);
- authenticationDataStore.put(assertionHandle, authData);
- }
- }
- catch (AuthenticationException ex) {
- throw ex;
- }
- catch (Throwable ex) {
- throw new AuthenticationException("auth.06", new Object[] {samlArtifact});
- }
- }
- /**
- * Creates a new session and puts it into the session store.
- *
- * @param id Session ID
- * @return AuthenticationSession created
- * @exception AuthenticationException
- * thrown when an <code>AuthenticationSession</code> is running
- * already for the given session ID
- */
- private static AuthenticationSession newSession() throws AuthenticationException {
- String sessionID = Random.nextRandom();
- AuthenticationSession newSession = new AuthenticationSession(sessionID);
- synchronized (sessionStore) {
- AuthenticationSession session = (AuthenticationSession)sessionStore.get(sessionID);
- if (session != null)
- throw new AuthenticationException("auth.01", new Object[] { sessionID });
- sessionStore.put(sessionID, newSession);
- }
- return newSession;
- }
- /**
- * Retrieves a session from the session store.
- *
- * @param id session ID
- * @return <code>AuthenticationSession</code> stored with given session ID,
- * <code>null</code> if session ID unknown
- */
- public static AuthenticationSession getSession(String id) throws AuthenticationException {
- AuthenticationSession session = (AuthenticationSession)sessionStore.get(id);
- if (session == null)
- throw new AuthenticationException("auth.02", new Object[] { id });
- return session;
- }
- /**
- * Cleans up expired session and authentication data stores.
- */
- public void cleanup() {
- long now = new Date().getTime();
- synchronized(sessionStore) {
- Set keys = new HashSet(sessionStore.keySet());
- for (Iterator iter = keys.iterator(); iter.hasNext(); ) {
- String sessionID = (String) iter.next();
- AuthenticationSession session = (AuthenticationSession) sessionStore.get(sessionID);
- if (now - session.getTimestampStart().getTime() > sessionTimeOut) {
- Logger.info(MOAIDMessageProvider.getInstance().getMessage("cleaner.02", new Object[] {sessionID}));
- sessionStore.remove(sessionID);
- }
- }
- }
- synchronized(authenticationDataStore) {
- Set keys = new HashSet(authenticationDataStore.keySet());
- for (Iterator iter = keys.iterator(); iter.hasNext(); ) {
- String samlArtifact = (String) iter.next();
- AuthenticationData authData = (AuthenticationData) authenticationDataStore.get(samlArtifact);
- if (now - authData.getTimestamp().getTime() > authDataTimeOut) {
- Logger.info(MOAIDMessageProvider.getInstance().getMessage("cleaner.03", new Object[] {samlArtifact}));
- authenticationDataStore.remove(samlArtifact);
- }
- }
- }
- }
-
- /**
- * Sets the sessionTimeOut.
- * @param sessionTimeOut time out in seconds
- */
- public void setSecondsSessionTimeOut(long seconds) {
- sessionTimeOut = 1000 * seconds;
- }
- /**
- * Sets the authDataTimeOut.
- * @param authDataTimeOut time out in seconds
- */
- public void setSecondsAuthDataTimeOut(long seconds) {
- authDataTimeOut = 1000 * seconds;
- }
-
- /**
- * Checks a parameter.
- * @param param parameter
- * @return true if the parameter is null or empty
- */
- private boolean isEmpty(String param) {
- return param == null || param.length() == 0;
- }
-
- /**
- * Writes an XML structure to file for debugging purposes, encoding UTF-8.
- *
- * @param filename file name
- * @param rootElem root element in DOM tree
- */
- public static void debugOutputXMLFile(String filename, Element rootElem) {
- if (Logger.isDebugEnabled(DEBUG_OUTPUT_HIERARCHY)) {
- try {
- String xmlString = new String(DOMUtils.serializeNode(rootElem));
- debugOutputXMLFile(filename, xmlString);
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
- }
- }
- /**
- * Writes an XML structure to file for debugging purposes, encoding UTF-8.
- *
- * @param filename file name
- * @param xmlString XML string
- */
- public static void debugOutputXMLFile(String filename, String xmlString) {
- if (Logger.isDebugEnabled(DEBUG_OUTPUT_HIERARCHY)) {
- try {
- java.io.OutputStream fout = new java.io.FileOutputStream(filename);
- byte[] xmlData = xmlString.getBytes("UTF-8");
- fout.write(xmlData);
- fout.close();
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
- }
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationSessionCleaner.java b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationSessionCleaner.java
deleted file mode 100644
index 7e5ed6ec7..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationSessionCleaner.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package at.gv.egovernment.moa.id.auth;
-
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Thread cleaning the <code>AuthenticationServer</code> session store
- * and authentication data store from garbage.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationSessionCleaner implements Runnable {
-
- /** interval the <code>AuthenticationSessionCleaner</code> is run in */
- private static final long SESSION_CLEANUP_INTERVAL = 30 * 60; // 30 min
-
- /**
- * Runs the thread. Cleans the <code>AuthenticationServer</code> session store
- * and authentication data store from garbage, then sleeps for given interval, and restarts.
- */
- public void run() {
- while (true) {
- try {
- Logger.debug("AuthenticationSessionCleaner run");
- AuthenticationServer.getInstance().cleanup();
- }
- catch (Exception e) {
- Logger.error(MOAIDMessageProvider.getInstance().getMessage("cleaner.01", null), e);
- }
- try {
- Thread.sleep(SESSION_CLEANUP_INTERVAL * 1000);
- }
- catch (InterruptedException e) {
- }
- }
- }
-
- /**
- * start the sessionCleaner
- */
- public static void start() {
- // start the session cleanup thread
- Thread sessionCleaner =
- new Thread(new AuthenticationSessionCleaner());
- sessionCleaner.setName("SessionCleaner");
- sessionCleaner.setDaemon(true);
- sessionCleaner.setPriority(Thread.MIN_PRIORITY);
- sessionCleaner.start();
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java b/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java
deleted file mode 100644
index ddba20049..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package at.gv.egovernment.moa.id.auth;
-
-/**
- * Constants used throughout moa-id-auth component.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public interface MOAIDAuthConstants {
-
- /** servlet parameter &quot;Target&quot; */
- public static final String PARAM_TARGET = "Target";
- /** servlet parameter &quot;OA&quot; */
- public static final String PARAM_OA = "OA";
- /** servlet parameter &quot;bkuURI&quot; */
- public static final String PARAM_BKU = "bkuURI";
- /** servlet parameter &quot;BKUSelectionTemplate&quot; */
- public static final String PARAM_BKUTEMPLATE = "BKUSelectionTemplate";
- /** servlet parameter &quot;returnURI&quot; */
- public static final String PARAM_RETURN = "returnURI";
- /** servlet parameter &quot;Template&quot; */
- public static final String PARAM_TEMPLATE = "Template";
- /** servlet parameter &quot;MOASessionID&quot; */
- public static final String PARAM_SESSIONID = "MOASessionID";
- /** servlet parameter &quot;XMLResponse&quot; */
- public static final String PARAM_XMLRESPONSE = "XMLResponse";
- /** servlet parameter &quot;SAMLArtifact&quot; */
- public static final String PARAM_SAMLARTIFACT = "SAMLArtifact";
- /** Request name {@link at.gv.egovernment.moa.id.auth.servlet.StartAuthenticationServlet} is mapped to */
- public static final String REQ_START_AUTHENTICATION = "StartAuthentication";
- /** Request name {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet} is mapped to */
- public static final String REQ_VERIFY_IDENTITY_LINK = "VerifyIdentityLink";
- /** Request name {@link at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet} is mapped to */
- public static final String REQ_VERIFY_AUTH_BLOCK = "VerifyAuthBlock";
- /** Logging hierarchy used for controlling debug output of XML structures to files */
- public static final String DEBUG_OUTPUT_HIERARCHY = "moa.id.auth";
- /** Header Name for controlling the caching mechanism of the browser */
- public static final String HEADER_EXPIRES = "Expires";
- /** Header Value for controlling the caching mechanism of the browser */
- public static final String HEADER_VALUE_EXPIRES = "Sat, 6 May 1995 12:00:00 GMT";
- /** Header Name for controlling the caching mechanism of the browser */
- public static final String HEADER_PRAGMA = "Pragma";
- /** Header Value for controlling the caching mechanism of the browser */
- public static final String HEADER_VALUE_PRAGMA = "no-cache";
- /** Header Name for controlling the caching mechanism of the browser */
- public static final String HEADER_CACHE_CONTROL = "Cache-control";
- /** Header Value for controlling the caching mechanism of the browser */
- public static final String HEADER_VALUE_CACHE_CONTROL = "no-store, no-cache, must-revalidate";
- /** Header Value for controlling the caching mechanism of the browser */
- public static final String HEADER_VALUE_CACHE_CONTROL_IE = "post-check=0, pre-check=0";
-
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
deleted file mode 100644
index f9bec8b76..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package at.gv.egovernment.moa.id.auth;
-
-import iaik.pki.PKIException;
-import iaik.pki.jsse.IAIKX509TrustManager;
-
-import java.security.GeneralSecurityException;
-
-import java.io.IOException;
-
-import javax.net.ssl.SSLSocketFactory;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.iaik.config.LoggerConfigImpl;
-import at.gv.egovernment.moa.id.util.AxisSecureSocketFactory;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.id.util.SSLUtils;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
-
-/**
- * Web application initializer
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class MOAIDAuthInitializer {
-
- /** a boolean identifying if the MOAIDAuthInitializer has been startet */
- public static boolean initialized = false;
-
-
-
- /**
- * Initializes the web application components which need initialization:
- * logging, JSSE, MOA-ID Auth configuration, Axis, session cleaner.
- */
- public static void initialize()
- throws ConfigurationException, PKIException, IOException, GeneralSecurityException {
- if (initialized)
- return;
- initialized=true;
- Logger.setHierarchy("moa.id.auth");
- // Restricts TLS cipher suites
- System.setProperty("https.cipherSuites", "SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_3DES_EDE_CBC_SHA");
- // load some jsse classes so that the integrity of the jars can be verified
- // before the iaik jce is installed as the security provider
- // this workaround is only needed when sun jsse is used in conjunction with
- // iaik-jce (on jdk1.3)
- ClassLoader cl = MOAIDAuthInitializer.class.getClassLoader();
- try {
- cl.loadClass("javax.security.cert.Certificate"); // from jcert.jar
- }
- catch (ClassNotFoundException e) {
- Logger.warn(MOAIDMessageProvider.getInstance().getMessage("init.01", null), e);
- }
-
- // Initializes SSLSocketFactory store
- SSLUtils.initialize();
-
- // Loads the configuration
- AuthConfigurationProvider authConf = AuthConfigurationProvider.reload();
- ConnectionParameter moaSPConnParam = authConf.getMoaSpConnectionParameter();
-
- // If MOA-SP API calls: loads MOA-SP configuration and configures IAIK
- if (moaSPConnParam == null) {
- try {
- LoggingContextManager.getInstance().setLoggingContext(
- new LoggingContext("startup"));
- ConfigurationProvider config = ConfigurationProvider.getInstance();
- new IaikConfigurator().configure(config);
- }
- catch (at.gv.egovernment.moa.spss.server.config.ConfigurationException ex) {
- throw new ConfigurationException("config.10", new Object[] { ex.toString() }, ex);
- }
- }
-
- // Initializes IAIKX509TrustManager logging
- String log4jConfigURL = System.getProperty("log4j.configuration");
- if (log4jConfigURL != null) {
- IAIKX509TrustManager.initLog(new LoggerConfigImpl(log4jConfigURL));
- }
-
- // Initializes the Axis secure socket factory for use in calling the MOA-SP web service
- if (moaSPConnParam != null && moaSPConnParam.isHTTPSURL()) {
- SSLSocketFactory ssf = SSLUtils.getSSLSocketFactory(authConf, moaSPConnParam);
- AxisSecureSocketFactory.initialize(ssf);
- }
-
- // sets the authentication session and authentication data time outs
- String param = authConf.getGenericConfigurationParameter(AuthConfigurationProvider.AUTH_SESSION_TIMEOUT_PROPERTY);
- if (param != null) {
- long sessionTimeOut = 0;
- try { sessionTimeOut = new Long(param).longValue(); }
- catch (NumberFormatException ex) {
- Logger.error(MOAIDMessageProvider.getInstance().getMessage("config.05", new Object[] {AuthConfigurationProvider.AUTH_SESSION_TIMEOUT_PROPERTY}));
- }
- if (sessionTimeOut > 0)
- AuthenticationServer.getInstance().setSecondsSessionTimeOut(sessionTimeOut);
- }
- param = authConf.getGenericConfigurationParameter(AuthConfigurationProvider.AUTH_DATA_TIMEOUT_PROPERTY);
- if (param != null) {
- long authDataTimeOut = 0;
- try { authDataTimeOut = new Long(param).longValue(); }
- catch (NumberFormatException ex) {
- Logger.error(MOAIDMessageProvider.getInstance().getMessage("config.05", new Object[] {AuthConfigurationProvider.AUTH_DATA_TIMEOUT_PROPERTY}));
- }
- if (authDataTimeOut > 0)
- AuthenticationServer.getInstance().setSecondsAuthDataTimeOut(authDataTimeOut);
- }
-
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/WrongParametersException.java b/id.server/src/at/gv/egovernment/moa/id/auth/WrongParametersException.java
deleted file mode 100644
index 3ce2798ea..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/WrongParametersException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.gv.egovernment.moa.id.auth;
-
-import at.gv.egovernment.moa.id.MOAIDException;
-
-/**
- * Exception thrown when the <code>AuthenticationServer</code> API is
- * called with wrong parameters provided.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class WrongParametersException extends MOAIDException {
-
- /**
- * Constructor
- */
- public WrongParametersException(String call, String parameter) {
- super("auth.05", new Object[] {call, parameter});
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
deleted file mode 100644
index 4babf948c..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.text.MessageFormat;
-
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Builder for the authentication block <code>&lt;saml:Assertion&gt;</code>
- * to be included in a <code>&lt;CreateXMLSignatureResponse&gt;</code>.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationBlockAssertionBuilder implements Constants {
- /** private static String nl contains the NewLine representation in Java*/
- private static String nl = "\n";
- /** private static String AUTH_BLOCK contains an XML-Auth-Block-Template */
- private static String AUTH_BLOCK =
- "<saml:Assertion xmlns:saml=''" + SAML_NS_URI + "'' MajorVersion=''1'' MinorVersion=''0'' AssertionID=''any'' Issuer=''{0}'' IssueInstant=''{1}''>" + nl +
- " <saml:AttributeStatement>" + nl +
- " <saml:Subject>" + nl +
- " <saml:NameIdentifier>{2}</saml:NameIdentifier>" + nl +
- " </saml:Subject>" + nl +
- " <saml:Attribute AttributeName=''Geschäftsbereich'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
- " <saml:AttributeValue>{3}</saml:AttributeValue>" + nl +
- " </saml:Attribute>" + nl +
- " <saml:Attribute AttributeName=''OA'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
- " <saml:AttributeValue>{4}</saml:AttributeValue>" + nl +
- " </saml:Attribute>" + nl +
- " </saml:AttributeStatement>" + nl +
- "</saml:Assertion>";
-
- /**
- * Constructor for AuthenticationBlockAssertionBuilder.
- */
- public AuthenticationBlockAssertionBuilder() {
- super();
- }
- /**
- * Builds the authentication block <code>&lt;saml:Assertion&gt;</code>.
- *
- * @param issuer authentication block issuer; <code>"GivenName FamilyName"</code>
- * @param issueInstant current timestamp
- * @param authURL URL of MOA-ID authentication component
- * @param target "Gesch&auml;ftsbereich"
- * @param oaURL public URL of online application requested
- * @return String representation of authentication block
- * <code>&lt;saml:Assertion&gt;</code> built
- */
- public String build(String issuer, String issueInstant, String authURL, String target, String oaURL) {
- String assertion = MessageFormat.format(
- AUTH_BLOCK, new Object[] { issuer, issueInstant, authURL, target, oaURL });
- return assertion;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
deleted file mode 100644
index fd7cb1a9d..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.text.MessageFormat;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Builder for the authentication data <code>&lt;saml:Assertion&gt;</code>
- * to be provided by the MOA ID Auth component.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationDataAssertionBuilder implements Constants {
- /** private static String NL contains the NewLine representation in Java*/
- private static final String NL = "\n";
- /**
- * XML template for the <code>&lt;saml:Assertion&gt;</code> to be built
- */
- private static final String AUTH_DATA =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + NL +
- "<saml:Assertion xmlns:saml=''" + SAML_NS_URI + "'' xmlns:pr=''" + PD_NS_URI + "'' xmlns:xsi=''" + XSI_NS_URI + "''" +
- " MajorVersion=''1'' MinorVersion=''0'' AssertionID=''{0}'' Issuer=''{1}'' IssueInstant=''{2}''>" + NL +
- " <saml:AttributeStatement>" + NL +
- " <saml:Subject>" + NL +
- " <saml:NameIdentifier NameQualifier=''http://reference.e-government.gv.at/names/vpk/20020221#''>{3}</saml:NameIdentifier>" + NL +
- " <saml:SubjectConfirmation>" + NL +
- " <saml:ConfirmationMethod>" + MOA_NS_URI + "cm</saml:ConfirmationMethod>" + NL +
- " <saml:SubjectConfirmationData>{4}{5}</saml:SubjectConfirmationData>" + NL +
- " </saml:SubjectConfirmation>" + NL +
- " </saml:Subject>" + NL +
- " <saml:Attribute AttributeName=''PersonData'' AttributeNamespace=''" + PD_NS_URI + "''>" + NL +
- " <saml:AttributeValue>{6}</saml:AttributeValue>" + NL +
- " </saml:Attribute>" + NL +
- " <saml:Attribute AttributeName=''isQualifiedCertificate'' AttributeNamespace=''" + MOA_NS_URI + "''>" + NL +
- " <saml:AttributeValue>{7}</saml:AttributeValue>" + NL +
- " </saml:Attribute>" + NL +
- "{8}" +
- " </saml:AttributeStatement>" + NL +
- "</saml:Assertion>";
- /**
- * XML template for the <code>&lt;saml:Attribute&gt;</code> named <code>"isPublicAuthority"</code>,
- * to be inserted into the <code>&lt;saml:Assertion&gt;</code>
- */
- private static final String PUBLIC_AUTHORITY_ATT =
- " <saml:Attribute AttributeName=''isPublicAuthority'' AttributeNamespace=''urn:oid:1.2.40.0.10.1.1.1''>" + NL +
- " <saml:AttributeValue>{0}</saml:AttributeValue>" + NL +
- " </saml:Attribute>" + NL;
-
- /**
- * Constructor for AuthenticationDataAssertionBuilder.
- */
- public AuthenticationDataAssertionBuilder() {
- super();
- }
-
- /**
- * Builds the authentication data <code>&lt;saml:Assertion&gt;</code>.
- *
- * @param authData the <code>AuthenticationData</code> to build the
- * <code>&lt;saml:Assertion&gt;</code> from
- * @param xmlPersonData <code>lt;pr:Person&gt;</code> element as a String
- * @param xmlAuthBlock authentication block to be included in a
- * <code>lt;saml:SubjectConfirmationData&gt;</code> element; may include
- * the <code>"ZMR-Zahl"</code> or not; may be empty
- * @param xmlIdentityLink the IdentityLink
- * @return the <code>&lt;saml:Assertion&gt;</code>
- * @throws BuildException if an error occurs during the build process
- */
- public String build(
- AuthenticationData authData,
- String xmlPersonData,
- String xmlAuthBlock,
- String xmlIdentityLink) throws BuildException {
-
- String isQualifiedCertificate = authData.isQualifiedCertificate() ? "true" : "false";
- String publicAuthorityAttribute = "";
- if (authData.isPublicAuthority()) {
- String publicAuthorityIdentification = authData.getPublicAuthorityCode();
- if (publicAuthorityIdentification == null)
- publicAuthorityIdentification = "True";
- publicAuthorityAttribute = MessageFormat.format(
- PUBLIC_AUTHORITY_ATT, new Object[] { publicAuthorityIdentification });
- }
-
- String assertion = MessageFormat.format(AUTH_DATA, new Object[] {
- authData.getAssertionID(),
- authData.getIssuer(),
- authData.getIssueInstant(),
- authData.getVPK(),
- removeXMLDeclaration(xmlAuthBlock),
- removeXMLDeclaration(xmlIdentityLink),
- removeXMLDeclaration(xmlPersonData),
- isQualifiedCertificate,
- publicAuthorityAttribute});
- return assertion;
- }
-
- /**
- * Removes the XML declaration from an XML expression.
- * @param xmlString XML expression as String
- * @return XML expression, XML declaration removed
- */
- private String removeXMLDeclaration(String xmlString) {
- if (xmlString.startsWith("<?xml")) {
- int firstElement = xmlString.indexOf("<", 1);
- return xmlString.substring(firstElement);
- }
- else return xmlString;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
deleted file mode 100644
index e5bbaa585..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.id.BuildException;
-
-/**
- * Base class for HTML/XML builders providing commonly useful functions.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class Builder {
-
- /**
- * Replaces a special tag in an XML or HTML template by a value.
- * @param htmlTemplate template
- * @param tag special tag
- * @param value value replacing the tag
- * @return XML or HTML code, the tag replaced
- * @throws BuildException when template does not contain the tag
- */
- protected String replaceTag(String template, String tag, String value) throws BuildException {
- int index = template.indexOf(tag);
- if (index < 0)
- throw new BuildException(
- "builder.01",
- new Object[] {"&lt;" + tag.substring(1, tag.length() - 1) + "&gt;"});
- return template.substring(0, index) + value + template.substring(index + tag.length());
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
deleted file mode 100644
index 5ceb1d1c0..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.io.IOException;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.util.FileUtils;
-
-/**
- * Builder for the <code>&lt;VerifyXMLSignatureRequest&gt;</code> structure
- * used for presenting certificate information in the secure viewer of the security layer implementation.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class CertInfoVerifyXMLSignatureRequestBuilder extends Builder {
-
- /** special tag in the VerifyXMLRequest template to be substituted for a <code>&lt;dsig:Signature&gt;</code> */
- private static final String SIGNATURE_TAG = "<dsig:Signature/>";
-
- /**
- * Constructor
- */
- public CertInfoVerifyXMLSignatureRequestBuilder() {
- super();
- }
- /**
- * Builds the <code>&lt;VerifyXMLSignatureRequest&gt;</code> structure.
- * @return the XML structure
- * @throws BuildException
- */
- public String build() throws BuildException {
- String resCertInfoRequest = "resources/xmldata/CertInfoVerifyXMLSignatureRequest.xml";
- String resDsigSignature = "resources/xmldata/CertInfoDsigSignature.xml";
- String certInfoRequest;
- try {
- certInfoRequest = FileUtils.readResource(resCertInfoRequest, "UTF-8");
- }
- catch (IOException ex) {
- throw new BuildException("auth.04", new Object[] {resCertInfoRequest, ex.toString()});
- }
- try {
- String dsigSignature = FileUtils.readResource(resDsigSignature, "UTF-8");
- certInfoRequest = replaceTag(certInfoRequest, SIGNATURE_TAG, dsigSignature);
- return certInfoRequest;
- }
- catch (IOException ex) {
- throw new BuildException("auth.04", new Object[] {resDsigSignature, ex.toString()});
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
deleted file mode 100644
index 8693c71a9..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.text.MessageFormat;
-
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Builder for the <code>&lt;CreateXMLSignatureRequest&gt;</code> structure
- * used for requesting a signature under the authentication block from the
- * security layer implementation.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class CreateXMLSignatureRequestBuilder implements Constants {
- /** private static String nl contains the NewLine representation in Java*/
- private static final String nl = "\n";
- /**
- * XML template for the <code>&lt;moa:CreateXMLSignatureRequest&gt;</code> to be built
- */
- private static final String CREATE_XML_SIGNATURE_REQUEST =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + nl +
- "<sl11:CreateXMLSignatureRequest xmlns:dsig=''" + DSIG_NS_URI + "'' xmlns:sl10=''" + SL10_NS_URI + "'' xmlns:sl11=''" + SL11_NS_URI + "''>" + nl +
- " <sl11:KeyboxIdentifier>SecureSignatureKeypair</sl11:KeyboxIdentifier>" + nl +
- " <sl11:DataObjectInfo Structure=''detached''>" + nl +
- " <sl10:DataObject Reference=''''/>" + nl +
- "{1}" +
- " </sl11:DataObjectInfo>" + nl +
- " <sl11:SignatureInfo>" + nl +
- " <sl11:SignatureEnvironment>" + nl +
- " <sl10:XMLContent>{0}</sl10:XMLContent>" + nl +
- " </sl11:SignatureEnvironment>" + nl +
- " <sl11:SignatureLocation Index=''2''>/saml:Assertion</sl11:SignatureLocation>" + nl +
- " </sl11:SignatureInfo>" + nl +
- "</sl11:CreateXMLSignatureRequest>";
-
- /**
- * Constructor for CreateXMLSignatureRequestBuilder.
- */
- public CreateXMLSignatureRequestBuilder() {
- super();
- }
-
- /**
- * Builds the <code>&lt;CreateXMLSignatureRequest&gt;</code>.
- *
- * @param authBlock String representation of XML authentication block
- * @return String representation of <code>&lt;CreateXMLSignatureRequest&gt;</code>
- */
- public String build(String authBlock, String[] dsigTransformInfos) {
- String dsigTransformInfosString = "";
- for (int i = 0; i < dsigTransformInfos.length; i++)
- dsigTransformInfosString += dsigTransformInfos[i];
- String request = MessageFormat.format(
- CREATE_XML_SIGNATURE_REQUEST, new Object[] { authBlock, dsigTransformInfosString });
- return request;
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
deleted file mode 100644
index 575149d9e..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.id.auth.servlet.AuthServlet;
-
-/**
- * Builds a DataURL parameter meant for the security layer implementation
- * to respond to.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class DataURLBuilder {
-
- /**
- * Constructor for DataURLBuilder.
- */
- public DataURLBuilder() {
- super();
- }
-
- /**
- * Constructs a data URL for <code>VerifyIdentityLink</code> or <code>VerifyAuthenticationBlock</code>,
- * including the <code>MOASessionID</code> as a parameter.
- *
- * @param authBaseURL base URL (context path) of the MOA ID Authentication component,
- * including a trailing <code>'/'</code>
- * @param authServletName request part of the data URL
- * @param sessionID sessionID to be included in the dataURL
- * @return String
- */
- public String buildDataURL(String authBaseURL, String authServletName, String sessionID) {
- String dataURL = authBaseURL + authServletName;
- dataURL = addParameter(dataURL, AuthServlet.PARAM_SESSIONID, sessionID);
- return dataURL;
- }
-
- /**
- * Method addParameter.
- * @param urlString represents the url
- * @param paramname is the parameter to be added
- * @param value is the value of that parameter
- * @return String
- */
- private String addParameter(String urlString, String paramname, String value) {
- String url = urlString;
- if (paramname != null) {
- if (url.indexOf("?") < 0)
- url += "?";
- else
- url += "&";
- url += paramname + "=" + value;
- }
- return url;
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
deleted file mode 100644
index 8391fdd62..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import at.gv.egovernment.moa.id.BuildException;
-
-/**
- * Builder for HTML form requesting the security layer implementation
- * to get the identity link from smartcard by a <code>&lt;InfoboxReadRequest&gt;</code>.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class GetIdentityLinkFormBuilder extends Builder {
- /** private static String NL contains the NewLine representation in Java*/
- private static final String nl = "\n";
- /** special tag in the HTML template to be substituted for the BKU URL */
- private static final String BKU_TAG = "<BKU>";
- /** special tag in the HTML template to be substituted for the XML request */
- private static final String XMLREQUEST_TAG = "<XMLRequest>";
- /** special tag in the HTML template to be substituted for the data URL */
- private static final String DATAURL_TAG = "<DataURL>";
- /** special tag in the HTML template to be substituted for certificate info XML request */
- private static final String CERTINFO_XMLREQUEST_TAG = "<CertInfoXMLRequest>";
- /** special tag in the HTML template to be substituted for the certificate info data URL */
- private static final String CERTINFO_DATAURL_TAG = "<CertInfoDataURL>";
-
- /** default BKU URL */
- private static final String DEFAULT_BKU = "http://localhost:3495/http-security-layer-request";
- /** default HTML template */
- private static final String DEFAULT_HTML_TEMPLATE =
- "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
- "<html>" + nl +
- "<head>" + nl +
- "<title>Auslesen der Personenbindung</title>" + nl +
- "</head>" + nl +
- "<body>" + nl +
- "<form name=\"GetIdentityLinkForm\"" + nl +
- " action=\"" + BKU_TAG + "\"" + nl +
- " method=\"post\">" + nl +
- " <input type=\"hidden\" " + nl +
- " name=\"XMLRequest\"" + nl +
- " value=\"" + XMLREQUEST_TAG + "\"/>" + nl +
- " <input type=\"hidden\" " + nl +
- " name=\"DataURL\"" + nl +
- " value=\"" + DATAURL_TAG + "\"/>" + nl +
- " <input type=\"submit\" value=\"Auslesen der Personenbindung\"/>" + nl +
- "</form>" + nl +
- "<form name=\"CertificateInfoForm\"" + nl +
- " action=\"" + BKU_TAG + "\"" + nl +
- " method=\"post\">" + nl +
- " <input type=\"hidden\" " + nl +
- " name=\"XMLRequest\"" + nl +
- " value=\"" + CERTINFO_XMLREQUEST_TAG + "\"/>" + nl +
- " <input type=\"hidden\" " + nl +
- " name=\"DataURL\"" + nl +
- " value=\"" + CERTINFO_DATAURL_TAG + "\"/>" + nl +
- " <input type=\"submit\" value=\"Information zu Wurzelzertifikaten\"/>" + nl +
- "</form>" + nl +
- "</body>" + nl +
- "</html>";
-
- /**
- * Constructor for GetIdentityLinkFormBuilder.
- */
- public GetIdentityLinkFormBuilder() {
- super();
- }
- /**
- * Builds the HTML form, including XML Request and data URL as parameters.
- *
- * @param htmlTemplate template to be used for the HTML form;
- * may be <code>null</code>, in this case a default layout will be produced
- * @param xmlRequest XML Request to be sent as a parameter in the form
- * @param bkuURL URL of the "B&uuml;rgerkartenumgebung" the form will be submitted to;
- * may be <code>null</code>, in this case the default URL will be used
- * @param dataURL DataURL to be sent as a parameter in the form
- */
- public String build(
- String htmlTemplate, String bkuURL, String xmlRequest, String dataURL, String certInfoXMLRequest, String certInfoDataURL)
- throws BuildException {
-
- String htmlForm = htmlTemplate == null ? DEFAULT_HTML_TEMPLATE : htmlTemplate;
- String bku = bkuURL == null ? DEFAULT_BKU : bkuURL;
- htmlForm = replaceTag(htmlForm, BKU_TAG, bku);
- htmlForm = replaceTag(htmlForm, XMLREQUEST_TAG, encodeParameter(xmlRequest));
- htmlForm = replaceTag(htmlForm, DATAURL_TAG, dataURL);
- htmlForm = replaceTag(htmlForm, BKU_TAG, bku);
- htmlForm = replaceTag(htmlForm, CERTINFO_XMLREQUEST_TAG, encodeParameter(certInfoXMLRequest));
- htmlForm = replaceTag(htmlForm, CERTINFO_DATAURL_TAG, certInfoDataURL);
- return htmlForm;
- }
- /**
- * Encodes a string for inclusion as a parameter in the form.
- * Double quotes are substituted by <code>"&amp;quot;"</code>.
- * @param s the string to be encoded
- * @return the string encoded
- * @throws BuildException on any exception encountered
- */
- public static String encodeParameter(String s) throws BuildException {
- StringReader in = new StringReader(s);
- StringWriter out = new StringWriter();
- try {
- for (int ch = in.read(); ch >= 0; ch = in.read()) {
- if (ch == '"')
- out.write("&quot;");
- else if (ch == '<')
- out.write("&lt;");
- else if (ch == '>')
- out.write("&gt;");
- else if (ch == 'ä')
- out.write("&auml;");
- else if (ch == 'ö')
- out.write("&ouml;");
- else if (ch == 'ü')
- out.write("&uuml;");
- else if (ch == 'Ä')
- out.write("&Auml;");
- else if (ch == 'Ö')
- out.write("&Ouml;");
- else if (ch == 'Ü')
- out.write("&Uuml;");
- else if (ch == 'ß')
- out.write("&szlig;");
- else
- out.write(ch);
- }
- }
- catch (IOException ex) {
- throw new BuildException("builder.00", new Object[] {"GetIdentityLinkForm", ex.toString()});
- }
- return out.toString();
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
deleted file mode 100644
index d3e100671..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Builder for the <code>&lt;InfoboxReadRequest&gt;</code> structure
- * used for requesting the identity link from the security layer implementation.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class InfoboxReadRequestBuilder implements Constants {
-
- /**
- * XML template for the <code>&lt;sl10:InfoboxReadRequest&gt;</code> to be built
- */
- String INFOBOX_READ_REQUEST =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
- "<sl10:InfoboxReadRequest xmlns:sl10=\"" + SL10_NS_URI + "\">" +
- "<sl10:InfoboxIdentifier>IdentityLink</sl10:InfoboxIdentifier>" +
- "<sl10:BinaryFileParameters ContentIsXMLEntity=\"true\"/>" +
- "</sl10:InfoboxReadRequest>";
-
- /**
- * Constructor for InfoboxReadRequestBuilder.
- */
- public InfoboxReadRequestBuilder() {
- }
- /**
- * Builds an <code>&lt;InfoboxReadRequest&gt;</code>.
- *
- * @return <code>&lt;InfoboxReadRequest&gt;</code> as String
- */
- public String build() {
- String request = INFOBOX_READ_REQUEST;
- return request;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
deleted file mode 100644
index 85ec1cb7f..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Builder for the <code>lt;pr:Person&gt;</code> element to be inserted
- * in the authentication data <code>lt;saml:Assertion&gt;</code>.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class PersonDataBuilder {
-
- /**
- * Constructor for PersonDataBuilder.
- */
- public PersonDataBuilder() {
- super();
- }
- /**
- * Builds the <code>&lt;pr:Person&gt;</code> element.<br/>
- * Utilizes the parsed <code>&lt;prPerson&gt;</code> from the identity link
- * and the information regarding inclusion of <code>"ZMR-Zahl"</code> in the
- * <code>&lt;pr:Person&gt;</code> data.
- *
- * @param identityLink <code>IdentityLink</code> containing the
- * attribute <code>prPerson</code>
- * @param provideZMRZahl true if <code>"ZMR-Zahl"</code> is to be included;
- * false otherwise
- * @return the <code>&lt;pr:Person&gt;</code> element as a String
- * @throws BuildException on any error
- */
- public String build(IdentityLink identityLink, boolean provideZMRZahl)
- throws BuildException {
-
- try {
- Element prPerson = (Element)identityLink.getPrPerson().cloneNode(true);
- if (! provideZMRZahl) {
- Node prIdentification = XPathUtils.selectSingleNode(prPerson, "pr:Identification");
- prPerson.removeChild(prIdentification);
- }
- String xmlString = DOMUtils.serializeNode(prPerson);
- return xmlString;
- }
- catch (Exception ex) {
- throw new BuildException(
- "builder.00",
- new Object[] {"PersonData", ex.toString()},
- ex);
- }
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java
deleted file mode 100644
index 27e19e830..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.io.ByteArrayOutputStream;
-import java.security.MessageDigest;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * Builder for the SAML artifact, as defined in the
- * Browser/Artifact profile of SAML.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLArtifactBuilder {
-
- /**
- * Constructor for SAMLArtifactBuilder.
- */
- public SAMLArtifactBuilder() {
- super();
- }
-
- /**
- * Builds the SAML artifact, encoded BASE64.
- * <ul>
- * <li><code>TypeCode</code>: <code>0x0001</code>.</li>
- * <li><code>SourceID</code>: SHA-1 hash of the authURL</li>
- * <li><code>AssertionHandle</code>: SHA-1 hash of the <code>MOASessionID</code></li>
- * </ul>
- * @param authURL URL auf the MOA-ID Auth component to be used for construction
- * of <code>SourceID</code>
- * @param sessionID <code>MOASessionID</code> to be used for construction
- * of <code>AssertionHandle</code>
- * @return the 42-byte SAML artifact, encoded BASE64
- */
- public String build(String authURL, String sessionID) throws BuildException {
- try {
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] sourceID = md.digest(authURL.getBytes());
- byte[] assertionHandle = md.digest(sessionID.getBytes());
- ByteArrayOutputStream out = new ByteArrayOutputStream(42);
- out.write(0);
- out.write(1);
- out.write(sourceID, 0, 20);
- out.write(assertionHandle, 0, 20);
- byte[] samlArtifact = out.toByteArray();
- String samlArtifactBase64 = Base64Utils.encode(samlArtifact);
- return samlArtifactBase64;
- }
- catch (Throwable ex) {
- throw new BuildException(
- "builder.00",
- new Object[] {"SAML Artifact, MOASessionID=" + sessionID, ex.toString()},
- ex);
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java
deleted file mode 100644
index a4fb5579e..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.text.MessageFormat;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.*;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * Builder for the <code>lt;samlp:Response&gt;</code> used for passing
- * result and status information from the <code>GetAuthenticationData</code>
- * web service.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLResponseBuilder implements Constants {
- /** XML - Template for samlp:Response */
- private static final String RESPONSE =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
- "<samlp:Response xmlns:samlp=\"" + SAMLP_NS_URI + "\" xmlns:saml=\"" + SAML_NS_URI + "\"" +
- " ResponseID=\"{0}\" InResponseTo=\"{1}\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"{2}\">" +
- " <samlp:Status>" +
- " <samlp:StatusCode Value=\"{3}\">" +
- " {4}" +
- " </samlp:StatusCode>" +
- " <samlp:StatusMessage>{5}</samlp:StatusMessage>" +
- " </samlp:Status>" +
- " {6}" +
- "</samlp:Response>";
- /** XML - Template for samlp:StatusCode */
- private static final String SUB_STATUS_CODE =
- "<samlp:StatusCode Value=\"{0}\"></samlp:StatusCode>";
-
- /**
- * Constructor for SAMLResponseBuilder.
- */
- public SAMLResponseBuilder() {
- super();
- }
- /**
- * Builds the SAML response.
- * @param responseID response ID
- * @param inResponseTo request ID of <code>lt;samlp:Request&gt;</code> responded to
- * @param issueInstant current timestamp
- * @param statusCode status code
- * @param subStatusCode sub-status code refining the status code; may be <code>null</code>
- * @param statusMessage status message
- * @param samlAssertion SAML assertion representing authentication data
- * @return SAML response as a DOM element
- */
- public Element build(
- String responseID,
- String inResponseTo,
- String issueInstant,
- String statusCode,
- String subStatusCode,
- String statusMessage,
- String samlAssertion)
- throws BuildException {
-
- try {
- String xmlSubStatusCode =
- subStatusCode == null ?
- "" :
- MessageFormat.format(SUB_STATUS_CODE, new Object[] {subStatusCode});
- String xmlResponse = MessageFormat.format(RESPONSE, new Object[] {
- responseID,
- inResponseTo,
- issueInstant,
- statusCode,
- xmlSubStatusCode,
- statusMessage,
- removeXMLDeclaration(samlAssertion) });
- Element domResponse = DOMUtils.parseDocument(xmlResponse, true, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
- return domResponse;
- }
- catch (Throwable ex) {
- throw new BuildException(
- "builder.00",
- new Object[] { "samlp:Response", ex.toString() },
- ex);
- }
- }
- /**
- * Removes the XML declaration from an XML expression.
- * @param xmlString XML expression as String
- * @return XML expression, XML declaration removed
- */
- private String removeXMLDeclaration(String xmlString) {
- if (xmlString.startsWith("<?xml")) {
- int firstElement = xmlString.indexOf("<", 1);
- return xmlString.substring(firstElement);
- }
- else return xmlString;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
deleted file mode 100644
index 363cd65a3..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.id.BuildException;
-
-/**
- * Builder for the BKU selection form requesting the user to choose
- * a BKU from a list.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SelectBKUFormBuilder extends Builder {
- /** private static String NL contains the NewLine representation in Java*/
- private static final String nl = "\n";
- /** special tag in the HTML template to be substituted for the form action which is
- * a URL of MOA-ID Auth */
- private static final String ACTION_TAG = "<StartAuth>";
- /** special tag in the HTML template to be substituted for the <code>&lt;select;gt;</code> tag
- * containing the BKU selection options */
- private static final String SELECT_TAG = "<BKUSelect>";
- /**
- * Template for the default html-code to be returned as security-layer-selection to be built
- */
- private static final String DEFAULT_HTML_TEMPLATE =
- "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
- "<html>" + nl +
- "<head>" + nl +
- "<title>Auswahl der B&uuml;rgerkartenumgebung</title>" + nl +
- "</head>" + nl +
- "<body>" + nl +
- "<form name=\"BKUSelectionForm\"" + nl +
- " action=\"" + ACTION_TAG + "\"" + nl +
- " method=\"post\">" + nl +
- SELECT_TAG + nl +
- " <input type=\"submit\" value=\"B&uuml;rgerkartenumgebung ausw&auml;hlen\"/>" + nl +
- "</form>" + nl +
- "</body>" + nl +
- "</html>";
-
- /**
- * Constructor
- */
- public SelectBKUFormBuilder() {
- super();
- }
- /**
- * Method build. Builds the form
- * @param htmlTemplate to be used
- * @param startAuthenticationURL the url where the startAuthenticationServlet can be found
- * @param bkuSelectTag if a special bku should be used
- * @return String
- * @throws BuildException on any error
- */
- public String build(String htmlTemplate, String startAuthenticationURL, String bkuSelectTag)
- throws BuildException {
-
- String htmlForm = htmlTemplate == null ? DEFAULT_HTML_TEMPLATE : htmlTemplate;
- htmlForm = replaceTag(htmlForm, ACTION_TAG, startAuthenticationURL);
- htmlForm = replaceTag(htmlForm, SELECT_TAG, bkuSelectTag);
- return htmlForm;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VPKBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/VPKBuilder.java
deleted file mode 100644
index c18156a01..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VPKBuilder.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.security.MessageDigest;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * Builder for the VPK, as defined in
- * <code>&quot;Ableitung f&uml;r die verfahrensspezifische Personenkennzeichnung&quot;</code>
- * version <code>1.0.1</code> from <code>&quot;reference.e-government.gv.at&quot;</code>.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class VPKBuilder {
-
- /**
- * Builds the VPK from given parameters.
- * @param identificationValue "ZMR-Zahl"
- * @param dateOfBirth "Geburtsdatum"
- * @param target "Verfahrensname"; will be transformed to lower case
- * @return VPK in a BASE64 encoding
- * @throws BuildException while building the VPK
- */
- public String buildVPK(String identificationValue, String dateOfBirth, String target)
- throws BuildException {
-
- if (identificationValue == null || identificationValue.length() == 0
- || dateOfBirth == null || dateOfBirth.length() == 0
- || target == null || target.length() == 0)
- throw new BuildException(
- "builder.00",
- new Object[] {"VPK",
- "Unvollständige Parameterangaben: identificationValue=" + identificationValue +
- ",dateOfBirth=" + dateOfBirth + ",target=" + target});
- String basisbegriff = identificationValue + "+" + dateOfBirth + "+" + target.toLowerCase();
- try {
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] hash = md.digest(basisbegriff.getBytes());
- String hashBase64 = Base64Utils.encode(hash);
- return hashBase64;
- }
- catch (Exception ex) {
- throw new BuildException(
- "builder.00",
- new Object[] {"VPK", ex.toString()},
- ex);
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java
deleted file mode 100644
index 863162fd9..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.*;
-import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Builder for the <code>&lt;VerifyXMLSignatureRequestBuilder&gt;</code> structure
- * used for sending the DSIG-Signature of the Security Layer card for validating to MOA-SP.
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class VerifyXMLSignatureRequestBuilder {
- /** The MOA-Prefix */
- private static final String MOA = Constants.MOA_PREFIX + ":";
- /** the request as string */
- private String request;
- /** the request as DOM-Element */
- private Element reqElem;
-
- /**
- * Constructor for VerifyXMLSignatureRequestBuilder.
- */
- public VerifyXMLSignatureRequestBuilder() {}
- /**
- * Builds a <code>&lt;VerifyXMLSignatureRequest&gt;</code>
- * from an IdentityLink with a known trustProfileID which
- * has to exist in MOA-SP
- * @param idl - The IdentityLink
- * @param trustProfileID - a preconfigured TrustProfile at MOA-SP
- * @return Element - The complete request as Dom-Element
- * @throws ParseException
- */
- public Element build(IdentityLink idl, String trustProfileID) throws ParseException
- { //samlAssertionObject
- request =
- "<?xml version='1.0' encoding='UTF-8' ?>"
- + "<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\"/>"
- + " </VerifySignatureEnvironment>"
- + " <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>"
- + " </VerifySignatureInfo>"
- + " <SignatureManifestCheckParams ReturnReferenceInputData=\"false\">" // True bei CreateXMLSig Überprüfung
- +" <ReferenceInfo>" + " <VerifyTransformsInfoProfile/>"
- // Profile ID für create (alle auslesen aus IDCOnfig VerifyAuthBlock)
- +" </ReferenceInfo>" + " </SignatureManifestCheckParams>"
-
- // Testweise ReturnReferenceInputData = False
-
- +" <ReturnHashInputData/>"
- + " <TrustProfileID>"
- + trustProfileID
- + "</TrustProfileID>"
- + "</VerifyXMLSignatureRequest>";
-
- try {
- InputStream s = new ByteArrayInputStream(request.getBytes("UTF-8"));
- reqElem = DOMUtils.parseXmlValidating(s);
-
- String CONTENT_XPATH =
- "//"
- + MOA
- + "VerifyXMLSignatureRequest/"
- + MOA
- + "VerifySignatureInfo/"
- + MOA
- + "VerifySignatureEnvironment/"
- + MOA
- + "XMLContent";
-
- Element insertTo =
- (Element) XPathUtils.selectSingleNode(reqElem, CONTENT_XPATH);
- insertTo.appendChild(
- insertTo.getOwnerDocument().importNode(idl.getSamlAssertion(), true));
-
- String SIGN_MANI_CHECK_PARAMS_XPATH =
- "//"
- + MOA
- + "VerifyXMLSignatureRequest/"
- + MOA
- + "SignatureManifestCheckParams";
- insertTo =
- (Element) XPathUtils.selectSingleNode(
- reqElem,
- SIGN_MANI_CHECK_PARAMS_XPATH);
- insertTo.removeChild(
- (Element) XPathUtils.selectSingleNode(
- reqElem,
- SIGN_MANI_CHECK_PARAMS_XPATH + "/" + MOA + "ReferenceInfo"));
- Element[] dsigTransforms = idl.getDsigReferenceTransforms();
- for (int i = 0; i < 1; i++) //dsigTransforms.length; i++)
- {
- Element refInfo =
- insertTo.getOwnerDocument().createElementNS(
- Constants.MOA_NS_URI,
- "ReferenceInfo");
- insertTo.appendChild(refInfo);
- Element verifyTransformsInfoProfile =
- insertTo.getOwnerDocument().createElementNS(
- Constants.MOA_NS_URI,
- "VerifyTransformsInfoProfile");
- refInfo.appendChild(verifyTransformsInfoProfile);
- verifyTransformsInfoProfile.appendChild(
- insertTo.getOwnerDocument().importNode(dsigTransforms[i], true));
- }
- }
- catch (Throwable t) {
- throw new ParseException( //"VerifyXMLSignatureRequest (IdentityLink)");
- "builder.00",
- new Object[] { "VerifyXMLSignatureRequest (IdentityLink)" },
- t);
- }
-
- return reqElem;
- }
-
- /**
- * Builds a <code>&lt;VerifyXMLSignatureRequest&gt;</code>
- * from an IdentityLink with a known trustProfileID which
- * has to exist in MOA-SP
- * @param idl - The IdentityLink
- * @param trustProfileID - a preconfigured TrustProfile at MOA-SP
- * @return Element - The complete request as Dom-Element
- * @throws ParseException
- */
- public Element build(
- CreateXMLSignatureResponse csr,
- String[] verifyTransformsInfoProfileID,
- String trustProfileID)
- throws ParseException { //samlAssertionObject
- request =
- "<?xml version='1.0' encoding='UTF-8' ?>"
- + "<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\"/>"
- + " </VerifySignatureEnvironment>"
- + " <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>"
- + " </VerifySignatureInfo>"
- + " <SignatureManifestCheckParams ReturnReferenceInputData=\"true\">"
- + " <ReferenceInfo>";
-
- for (int i = 0; i < verifyTransformsInfoProfileID.length; i++) {
- request += " <VerifyTransformsInfoProfileID>" +
- verifyTransformsInfoProfileID[i] +
- "</VerifyTransformsInfoProfileID>";
- // Profile ID für create (auslesen aus IDCOnfig VerifyAuthBlock ODER per String übergeben....)
-
- }
-
- request += " </ReferenceInfo>"
- + " </SignatureManifestCheckParams>"
- // Testweise ReturnReferenceInputData = False
- +" <ReturnHashInputData/>"
- + " <TrustProfileID>"
- + trustProfileID
- + "</TrustProfileID>"
- + "</VerifyXMLSignatureRequest>";
-
- try {
- // Build a DOM-Tree of the obove String
- InputStream s = new ByteArrayInputStream(request.getBytes("UTF-8"));
- reqElem = DOMUtils.parseXmlValidating(s);
- //Insert the SAML-Assertion-Object
- String CONTENT_XPATH =
- "//"
- + MOA
- + "VerifyXMLSignatureRequest/"
- + MOA
- + "VerifySignatureInfo/"
- + MOA
- + "VerifySignatureEnvironment/"
- + MOA
- + "XMLContent";
-
- Element insertTo =
- (Element) XPathUtils.selectSingleNode(reqElem, CONTENT_XPATH);
- insertTo.appendChild(
- insertTo.getOwnerDocument().importNode(csr.getSamlAssertion(), true));
-
- }
- catch (Throwable t) {
- throw new ParseException(
- "builder.00",
- new Object[] { "VerifyXMLSignatureRequest" },
- t);
- }
-
- return reqElem;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
deleted file mode 100644
index ba4a9e367..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package at.gv.egovernment.moa.id.auth.data;
-
-import java.util.Date;
-
-
-/**
- * Session data to be stored between <code>AuthenticationServer</code> API calls.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationSession {
- /**
- * session ID
- */
- private String sessionID;
- /**
- * "Gesch&auml;ftsbereich" the online application belongs to
- */
- private String target;
- /**
- * public online application URL requested
- */
- private String oaURLRequested;
- /**
- * public online application URL prefix
- */
- private String oaPublicURLPrefix;
- /**
- * URL of MOA ID authentication component
- */
- private String authURL;
- /**
- * HTML template URL
- */
- private String templateURL;
- /**
- * identity link read from smartcard
- */
- private IdentityLink identityLink;
- /**
- * authentication block to be signed by the user
- */
- private String authBlock;
- /**
- * timestamp logging when authentication session has been created
- */
- private Date timestampStart;
- /**
- * timestamp logging when identity link has been received
- */
- private Date timestampIdentityLink;
-
- /**
- * Constructor for AuthenticationSession.
- *
- * @param id Session ID
- */
- public AuthenticationSession(String id) {
- sessionID = id;
- setTimestampStart();
- }
-
- /**
- * Returns the identityLink.
- * @return IdentityLink
- */
- public IdentityLink getIdentityLink() {
- return identityLink;
- }
-
- /**
- * Returns the sessionID.
- * @return String
- */
- public String getSessionID() {
- return sessionID;
- }
-
- /**
- * Sets the identityLink.
- * @param identityLink The identityLink to set
- */
- public void setIdentityLink(IdentityLink identityLink) {
- this.identityLink = identityLink;
- }
-
- /**
- * Sets the sessionID.
- * @param sessionID The sessionID to set
- */
- public void setSessionID(String sessionId) {
- this.sessionID = sessionId;
- }
-
- /**
- * Returns the oaURLRequested.
- * @return String
- */
- public String getOAURLRequested() {
- return oaURLRequested;
- }
-
- /**
- * Returns the oaURLRequested.
- * @return String
- */
- public String getPublicOAURLPrefix() {
- return oaPublicURLPrefix;
- }
-
- /**
- * Returns the target.
- * @return String
- */
- public String getTarget() {
- return target;
- }
-
- /**
- * Sets the oaURLRequested.
- * @param oaURLRequested The oaURLRequested to set
- */
- public void setOAURLRequested(String url) {
- this.oaURLRequested = url;
- }
-
- /**
- * Sets the oaPublicURLPrefix
- * @param url The oaPublicURLPrefix to set
- */
- public void setPublicOAURLPrefix(String url) {
- this.oaPublicURLPrefix = url;
- }
-
- /**
- * Sets the target.
- * @param target The target to set
- */
- public void setTarget(String target) {
- this.target = target;
- }
-
- /**
- * Returns the authURL.
- * @return String
- */
- public String getAuthURL() {
- return authURL;
- }
-
- /**
- * Sets the authURL.
- * @param authURL The authURL to set
- */
- public void setAuthURL(String authURL) {
- this.authURL = authURL;
- }
-
- /**
- * Returns the authBlock.
- * @return String
- */
- public String getAuthBlock() {
- return authBlock;
- }
-
- /**
- * Sets the authBlock.
- * @param authBlock The authBlock to set
- */
- public void setAuthBlock(String authBlock) {
- this.authBlock = authBlock;
- }
-
- /**
- * Returns the timestampIdentityLink.
- * @return Date
- */
- public Date getTimestampIdentityLink() {
- return timestampIdentityLink;
- }
-
- /**
- * Returns the timestampStart.
- * @return Date
- */
- public Date getTimestampStart() {
- return timestampStart;
- }
-
- /**
- * Sets the current date as timestampIdentityLink.
- */
- public void setTimestampIdentityLink() {
- timestampIdentityLink = new Date();
- }
-
- /**
- * Sets the current date as timestampStart.
- */
- public void setTimestampStart() {
- timestampStart = new Date();
- }
-
- /**
- * @return template URL
- */
- public String getTemplateURL() {
- return templateURL;
- }
-
- /**
- * @param string the template URL
- */
- public void setTemplateURL(String string) {
- templateURL = string;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/CreateXMLSignatureResponse.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/CreateXMLSignatureResponse.java
deleted file mode 100644
index 81945f644..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/CreateXMLSignatureResponse.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package at.gv.egovernment.moa.id.auth.data;
-
-import org.w3c.dom.Element;
-
-/**
- * This bean saves all information of the CreateXMLSignature-Response:
- * a {@link SAMLAttribute} array, the SamlAssertion-Element and the
- * saml NameIdentifier
- *
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class CreateXMLSignatureResponse {
- /** the samlNameIdentifier */
-private String samlNameIdentifier;
- /** an array of saml-attributes */
-private SAMLAttribute[] samlAttributes;
- /**
- * the original saml:Assertion-Element
- */
- private Element samlAssertion;
-/**
- * Returns the samlAssertion.
- * @return Element
- */
-public Element getSamlAssertion() {
- return samlAssertion;
-}
-
-/**
- * Returns the samlAttribute.
- * @return SAMLAttribute[]
- */
-public SAMLAttribute[] getSamlAttributes() {
- return samlAttributes;
-}
-
-/**
- * Returns the samlNameIdentifier.
- * @return String
- */
-public String getSamlNameIdentifier() {
- return samlNameIdentifier;
-}
-
-/**
- * Sets the samlAssertion.
- * @param samlAssertion The samlAssertion to set
- */
-public void setSamlAssertion(Element samlAssertion) {
- this.samlAssertion = samlAssertion;
-}
-
-/**
- * Sets the samlAttribute.
- * @param samlAttribute The samlAttribute to set
- */
-public void setSamlAttributes(SAMLAttribute[] samlAttributes) {
- this.samlAttributes = samlAttributes;
-}
-
-/**
- * Sets the samlNameIdentifier.
- * @param samlNameIdentifier The samlNameIdentifier to set
- */
-public void setSamlNameIdentifier(String samlNameIdentifier) {
- this.samlNameIdentifier = samlNameIdentifier;
-}
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java
deleted file mode 100644
index e2ad2625a..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/IdentityLink.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package at.gv.egovernment.moa.id.auth.data;
-
-import java.security.PublicKey;
-
-import org.w3c.dom.Element;
-
-
-/**
- * Data contained in an identity link issued by BMI, relevant to the MOA ID component.
- * <br><code>"IdentityLink"</code> is the translation of <code>"Personenbindung"</code>.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class IdentityLink {
- /**
- * <code>"identificationValue"</code> is the translation of <code>"ZMR-Zahl"</code>.
- */
- private String identificationValue;
- /**
- * first name
- */
- private String givenName;
- /**
- * family name
- */
- private String familyName;
- /**
- * date of birth
- */
- private String dateOfBirth;
- /**
- * the original saml:Assertion-Element
- */
- private Element samlAssertion;
- /**
- * Element /saml:Assertion/saml:AttributeStatement/saml:Subject/saml:SubjectConfirmation/saml:SubjectConfirmationData/pr:Person
- */
- private Element prPerson;
- /**
- * we need for each dsig:Reference Element all
- * transformation elements
- */
- private Element[] dsigReferenceTransforms;
-
-
- /**
- * we need all public keys stored in
- * the identity link
- */
- private PublicKey[] publicKey;
-
- /**
- * Constructor for IdentityLink
- */
- public IdentityLink() {
- }
-
- /**
- * Returns the dateOfBirth.
- * @return Calendar
- */
- public String getDateOfBirth() {
- return dateOfBirth;
- }
-
- /**
- * Returns the familyName.
- * @return String
- */
- public String getFamilyName() {
- return familyName;
- }
-
- /**
- * Returns the givenName.
- * @return String
- */
- public String getGivenName() {
- return givenName;
- }
-
- /**
- * Returns the identificationValue.
- * <code>"identificationValue"</code> is the translation of <code>"ZMR-Zahl"</code>.
- * @return String
- */
- public String getIdentificationValue() {
- return identificationValue;
- }
-
- /**
- * Sets the dateOfBirth.
- * @param dateOfBirth The dateOfBirth to set
- */
- public void setDateOfBirth(String dateOfBirth) {
- this.dateOfBirth = dateOfBirth;
- }
-
- /**
- * Sets the familyName.
- * @param familyName The familyName to set
- */
- public void setFamilyName(String familyName) {
- this.familyName = familyName;
- }
-
- /**
- * Sets the givenName.
- * @param givenName The givenName to set
- */
- public void setGivenName(String givenName) {
- this.givenName = givenName;
- }
-
- /**
- * Sets the identificationValue.
- * <code>"identificationValue"</code> is the translation of <code>"ZMR-Zahl"</code>.
- * @param identificationValue The identificationValue to set
- */
- public void setIdentificationValue(String identificationValue) {
- this.identificationValue = identificationValue;
- }
-
- /**
- * Returns the samlAssertion.
- * @return Element
- */
- public Element getSamlAssertion() {
- return samlAssertion;
- }
-
- /**
- * Sets the samlAssertion.
- * @param samlAssertion The samlAssertion to set
- */
- public void setSamlAssertion(Element samlAssertion) {
- this.samlAssertion = samlAssertion;
- }
-
- /**
- * Returns the dsigReferenceTransforms.
- * @return Element[]
- */
- public Element[] getDsigReferenceTransforms() {
- return dsigReferenceTransforms;
- }
-
- /**
- * Sets the dsigReferenceTransforms.
- * @param dsigReferenceTransforms The dsigReferenceTransforms to set
- */
- public void setDsigReferenceTransforms(Element[] dsigReferenceTransforms) {
- this.dsigReferenceTransforms = dsigReferenceTransforms;
- }
-
- /**
- * Returns the publicKey.
- * @return PublicKey[]
- */
- public PublicKey[] getPublicKey() {
- return publicKey;
- }
-
- /**
- * Sets the publicKey.
- * @param publicKey The publicKey to set
- */
- public void setPublicKey(PublicKey[] publicKey) {
- this.publicKey = publicKey;
- }
-
- /**
- * Returns the prPerson.
- * @return Element
- */
- public Element getPrPerson() {
- return prPerson;
- }
-
- /**
- * Sets the prPerson.
- * @param prPerson The prPerson to set
- */
- public void setPrPerson(Element prPerson) {
- this.prPerson = prPerson;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java
deleted file mode 100644
index c787b2a81..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/SAMLAttribute.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package at.gv.egovernment.moa.id.auth.data;
-
-/**
- * This bean saves all data of a single SAMLAttribute:
- * the name, value and namespace
- *
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class SAMLAttribute {
-/** the name to be stored */
-private String name;
-/** the namespace to be stored */
-private String namespace;
-/** the value to be stored */
-private String value;
-
- /**
- * Constructor for SAMLAttribute.
- */
- public SAMLAttribute(String name, String namespace, String value) {
-
- this.name = name;
- this.namespace = namespace;
- this.value = value;
-
- }
-
-/**
- * Returns the name.
- * @return String
- */
-public String getName() {
- return name;
-}
-
-/**
- * Returns the namespace.
- * @return String
- */
-public String getNamespace() {
- return namespace;
-}
-
-/**
- * Returns the value.
- * @return String
- */
-public String getValue() {
- return value;
-}
-
-/**
- * Sets the name.
- * @param name The name to set
- */
-public void setName(String name) {
- this.name = name;
-}
-
-/**
- * Sets the namespace.
- * @param namespace The namespace to set
- */
-public void setNamespace(String namespace) {
- this.namespace = namespace;
-}
-
-/**
- * Sets the value.
- * @param value The value to set
- */
-public void setValue(String value) {
- this.value = value;
-}
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/VerifyXMLSignatureResponse.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/VerifyXMLSignatureResponse.java
deleted file mode 100644
index 8233d1478..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/VerifyXMLSignatureResponse.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package at.gv.egovernment.moa.id.auth.data;
-
-import iaik.x509.X509Certificate;
-
-/**
- * This bean saves all information of the MOA-SP-Answer
- * after the verification of any signature
- *
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class VerifyXMLSignatureResponse {
- /** The xmlDsigSubjectName to be stored */
- private String xmlDsigSubjectName;
- /** The signatureCheckCode to be stored */
- private int signatureCheckCode;
- /** The xmlDSIGManifestCheckCode to be stored */
- private int xmlDSIGManifestCheckCode;
- /** The xmlDSIGManigest to be stored */
- private boolean xmlDSIGManigest;
- /** The certificateCheckCode to be stored */
- private int certificateCheckCode;
- /** The publicAuthority to be stored */
- private boolean publicAuthority;
- /** The publicAuthorityCode to be stored */
- private String publicAuthorityCode;
- /** The qualifiedCertificate to be stored */
- private boolean qualifiedCertificate;
- /** The x509certificate to be stored */
- private X509Certificate x509certificate;
-
- /**
- * Returns the certificateCheckCode.
- * @return int
- */
- public int getCertificateCheckCode() {
- return certificateCheckCode;
- }
-
- /**
- * Returns the signatureCheckCode.
- * @return int
- */
- public int getSignatureCheckCode() {
- return signatureCheckCode;
- }
-
- /**
- * Returns the xmlDSIGManifestCheckCode.
- * @return int
- */
- public int getXmlDSIGManifestCheckCode() {
- return xmlDSIGManifestCheckCode;
- }
-
- /**
- * Returns the xmlDsigSubjectName.
- * @return String
- */
- public String getXmlDsigSubjectName() {
- return xmlDsigSubjectName;
- }
-
- /**
- * Sets the certificateCheckCode.
- * @param certificateCheckCode The certificateCheckCode to set
- */
- public void setCertificateCheckCode(int certificateCheckCode) {
- this.certificateCheckCode = certificateCheckCode;
- }
-
- /**
- * Sets the signatureCheckCode.
- * @param signatureCheckCode The signatureCheckCode to set
- */
- public void setSignatureCheckCode(int signatureCheckCode) {
- this.signatureCheckCode = signatureCheckCode;
- }
-
- /**
- * Sets the xmlDSIGManifestCheckCode.
- * @param xmlDSIGManifestCheckCode The xmlDSIGManifestCheckCode to set
- */
- public void setXmlDSIGManifestCheckCode(int xmlDSIGManifestCheckCode) {
- this.xmlDSIGManifestCheckCode = xmlDSIGManifestCheckCode;
- }
-
- /**
- * Sets the xmlDsigSubjectName.
- * @param xmlDsigSubjectName The xmlDsigSubjectName to set
- */
- public void setXmlDsigSubjectName(String xmlDsigSubjectName) {
- this.xmlDsigSubjectName = xmlDsigSubjectName;
- }
-
- /**
- * Returns the publicAuthorityCode.
- * @return int
- */
- public String getPublicAuthorityCode() {
- return publicAuthorityCode;
- }
-
- /**
- * Sets the publicAuthorityCode.
- * @param publicAuthorityCode The publicAuthorityCode to set
- */
- public void setPublicAuthorityCode(String publicAuthorityCode) {
- this.publicAuthorityCode = publicAuthorityCode;
- }
-
- /**
- * Returns the qualifiedCertificate.
- * @return boolean
- */
- public boolean isQualifiedCertificate() {
- return qualifiedCertificate;
- }
-
- /**
- * Returns the x509certificate.
- * @return X509Certificate
- */
- public X509Certificate getX509certificate() {
- return x509certificate;
- }
-
- /**
- * Sets the qualifiedCertificate.
- * @param qualifiedCertificate The qualifiedCertificate to set
- */
- public void setQualifiedCertificate(boolean qualifiedCertificate) {
- this.qualifiedCertificate = qualifiedCertificate;
- }
-
- /**
- * Sets the x509certificate.
- * @param x509certificate The x509certificate to set
- */
- public void setX509certificate(X509Certificate x509certificate) {
- this.x509certificate = x509certificate;
- }
-
- /**
- * Returns the xmlDSIGManigest.
- * @return boolean
- */
- public boolean isXmlDSIGManigest() {
- return xmlDSIGManigest;
- }
-
- /**
- * Sets the xmlDSIGManigest.
- * @param xmlDSIGManigest The xmlDSIGManigest to set
- */
- public void setXmlDSIGManigest(boolean xmlDSIGManigest) {
- this.xmlDSIGManigest = xmlDSIGManigest;
- }
-
- /**
- * Returns the publicAuthority.
- * @return boolean
- */
- public boolean isPublicAuthority() {
- return publicAuthority;
- }
-
- /**
- * Sets the publicAuthority.
- * @param publicAuthority The publicAuthority to set
- */
- public void setPublicAuthority(boolean publicAuthority) {
- this.publicAuthority = publicAuthority;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java b/id.server/src/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java
deleted file mode 100644
index 8faa69260..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package at.gv.egovernment.moa.id.auth.invoke;
-
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-
-import org.apache.axis.message.SOAPBodyElement;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.ServiceException;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.spss.api.SignatureVerificationService;
-import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureRequestParser;
-import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureResponseBuilder;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
-/**
- * Invoker of the <code>SignatureVerification</code> web service of MOA-SPSS.<br>
- * Either invokes the web service, or calls the corresponding API, depending on configuration data.
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class SignatureVerificationInvoker {
- /** This QName Object identifies the SignatureVerification endpoint of the web service */
- private static final QName SERVICE_QNAME = new QName("SignatureVerification");
-
- /**
- * Method verifyXMLSignature.
- * @param request to be sent
- * @return Element with the answer
- * @throws ServiceException if an error occurs
- */
- public Element verifyXMLSignature(Element request) throws ServiceException {
- return doCall(SERVICE_QNAME, request);
- }
-
- /**
- * Method doCall.
- * @param serviceName the name of the service
- * @param request the request to be sent
- * @return Element the answer
- * @throws ServiceException if an error occurs
- */
- protected Element doCall(QName serviceName, Element request) throws ServiceException {
- ConnectionParameter authConnParam = null;
- try {
- Service service = ServiceFactory.newInstance().createService(serviceName);
- Call call = service.createCall();
- SOAPBodyElement body = new SOAPBodyElement(request);
- SOAPBodyElement[] params = new SOAPBodyElement[] { body };
- Vector responses;
- SOAPBodyElement response;
-
- String endPoint;
- AuthConfigurationProvider authConfigProvider = AuthConfigurationProvider.getInstance();
- authConnParam = authConfigProvider.getMoaSpConnectionParameter();
-
- //If the ConnectionParameter do NOT exist, we try to get the api to work....
- if (authConnParam != null) {
- endPoint = authConnParam.getUrl();
- call.setTargetEndpointAddress(endPoint);
- responses = (Vector) call.invoke(serviceName, params);
- response = (SOAPBodyElement) responses.get(0);
- return response.getAsDOM();
- }
- else {
- SignatureVerificationService svs = SignatureVerificationService.getInstance();
- VerifyXMLSignatureRequest vsrequest = new VerifyXMLSignatureRequestParser().parse(request);
- VerifyXMLSignatureResponse vsresponse = svs.verifyXMLSignature(vsrequest);
-
- Document result = new VerifyXMLSignatureResponseBuilder().build(vsresponse);
- Logger.setHierarchy("moa.id.auth");
- return result.getDocumentElement();
- }
- }
- catch (Exception ex) {
- if (authConnParam != null)
- throw new ServiceException("service.00", new Object[] { ex.toString()}, ex);
- else
- throw new ServiceException("service.03", new Object[] { ex.toString()}, ex);
- }
- }
-} \ No newline at end of file
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
deleted file mode 100644
index 1079a48de..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package at.gv.egovernment.moa.id.auth.parser;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.traversal.NodeIterator;
-
-import at.gv.egovernment.moa.id.*;
-import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.data.SAMLAttribute;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Parses an <code>&lt;InfoboxReadResponse&gt;</code> returned from
- * the security layer
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-
-public class CreateXMLSignatureResponseParser {
- //
- // XPath namespace prefix shortcuts
- //
- /** Xpath prefix for reaching SecurityLayer 1.0 Namespaces */
- private static final String SL10 = Constants.SL10_PREFIX + ":";
- /** Xpath prefix for reaching SecurityLayer 1.1 Namespaces */
- private static final String SL11 = Constants.SL11_PREFIX + ":";
- /** Xpath prefix for reaching SAML Namespaces */
- private static final String SAML = Constants.SAML_PREFIX + ":";
- /** Xpath prefix for reaching XML-DSIG Namespaces */
- private static final String DSIG = Constants.DSIG_PREFIX + ":";
- /** Xpath expression to the root element */
- private static final String ROOT = "/" + SL11 + "CreateXMLSignatureResponse/";
- /** Xpath expression to the SAML:Assertion element */
- private static final String SAML_ASSERTION_XPATH = ROOT + SAML + "Assertion";
- /** Xpath expression to the SAML:NameIdentifier element */
- private static final String SAML_SUBJECT_NAME_IDENTIFIER_XPATH = SAML_ASSERTION_XPATH + "/" + SAML + "AttributeStatement/" + SAML + "Subject/" + SAML + "NameIdentifier";
- /** Xpath expression to the AttributeStatement element */
- private static final String SAML_ATTRIBUTE_XPATH = SAML_ASSERTION_XPATH + "/" + SAML + "AttributeStatement/" + SAML + "Attribute";
- /** Xpath expression to the AttributeValue element */
- private static final String SAML_ATTRIBUTE_VALUE_XPATH = SAML + "AttributeValue";
-
- /** This is the root element of the XML-Document provided by the Security Layer Card */
- private Element sigResponse;
-
- /**
- * Constructor for CreateXMLSignatureResponseParser.
- * A DOM-representation of the incoming String will be created
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as String
- * @throws AuthenticationException if any authentication error occurs
- * @throws ParseException if an element cannot be parsed
- */
- public CreateXMLSignatureResponseParser(String xmlResponse) throws AuthenticationException, ParseException {
- ErrorResponseParser erp = new ErrorResponseParser(xmlResponse);
- if (erp.getErrorCode() != null) {
- throw new AuthenticationException("auth.08", new Object[] { erp.getErrorCode(), erp.getErrorInfo()});
- }
-
- try {
-
- InputStream s = new ByteArrayInputStream(xmlResponse.getBytes("UTF-8"));
- sigResponse = DOMUtils.parseXmlValidating(s);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString()}, t);
- }
- }
-
- /**
- * Constructor for CreateXMLSignatureResponseParser.
- * A DOM-representation of the incoming Inputstream will be created
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as InputStream
- * @throws AuthenticationException if any Authentication error occurs
- * @throws ParseException if an element cannot be parsed
- */
- public CreateXMLSignatureResponseParser(InputStream is) throws AuthenticationException, ParseException {
-
- ErrorResponseParser erp = new ErrorResponseParser(is);
- if (erp.getErrorCode() != null) {
- throw new AuthenticationException("auth.08", new Object[] { erp.getErrorCode(), erp.getErrorInfo()});
- }
-
- try {
-
- sigResponse = DOMUtils.parseXmlValidating(is);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString()}, t);
- }
- }
-
- /**
- * Constructor for CreateXMLSignatureResponseParser.
- * The incoming Element will be used for further operations
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as InputStream
- */
- public CreateXMLSignatureResponseParser(Element xmlResponse) {
- sigResponse = xmlResponse;
-
- }
-
- /**
- * Parses the identity link from <code>&lt;InfoboxReadResponse&gt;</code>
- * @return Identity link
- * @throws ParseException
- */
-
- public CreateXMLSignatureResponse parseResponse() throws ParseException {
- CreateXMLSignatureResponse cResp;
- try {
-
- cResp = new CreateXMLSignatureResponse();
- cResp.setSamlNameIdentifier(XPathUtils.getElementValue(sigResponse, SAML_SUBJECT_NAME_IDENTIFIER_XPATH, null));
- cResp.setSamlAssertion((Element) XPathUtils.selectSingleNode(sigResponse, SAML_ASSERTION_XPATH));
- NodeIterator attrIter = XPathUtils.selectNodeIterator(sigResponse, SAML_ATTRIBUTE_XPATH);
- Element samlAttr;
- List samlAttributes = new ArrayList();
- while ((samlAttr = (Element) attrIter.nextNode()) != null) {
- String attrName = XPathUtils.getAttributeValue(samlAttr, "@AttributeName", "");
- String attrNamespace = XPathUtils.getAttributeValue(samlAttr, "@AttributeNamespace", "");
- String attrValue = XPathUtils.getElementValue(samlAttr, SAML_ATTRIBUTE_VALUE_XPATH, "");
- samlAttributes.add(new SAMLAttribute(attrName, attrNamespace, attrValue));
- }
- SAMLAttribute[] result = new SAMLAttribute[samlAttributes.size()];
- samlAttributes.toArray(result);
- cResp.setSamlAttributes(result);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString()}, t);
- }
- return cResp;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ECDSAKeyValueConverter.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/ECDSAKeyValueConverter.java
deleted file mode 100644
index c28cfac76..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ECDSAKeyValueConverter.java
+++ /dev/null
@@ -1,350 +0,0 @@
-package at.gv.egovernment.moa.id.auth.parser;
-
-import iaik.security.ecc.ecdsa.ECDSAParameter;
-import iaik.security.ecc.ecdsa.ECPublicKey;
-import iaik.security.ecc.math.ecgroup.ECGroupFactory;
-import iaik.security.ecc.math.ecgroup.ECPoint;
-import iaik.security.ecc.math.ecgroup.EllipticCurve;
-import iaik.security.ecc.math.ecgroup.ProjectiveCoordinate;
-import iaik.security.ecc.math.field.Field;
-import iaik.security.ecc.math.field.FieldElement;
-import iaik.security.ecc.math.field.FieldFactory;
-import iaik.security.ecc.math.field.Value;
-import iaik.security.ecc.parameter.ECCParameterFactory;
-import iaik.security.ecc.spec.ECCParameterSpec;
-import java.math.BigInteger;
-import java.security.PublicKey;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Vector;
-import java.net.URL;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class ECDSAKeyValueConverter
-{
- /** Namespaces */
- public static final String NAMESPACE_XSI = "http://www.w3.org/2001/XMLSchema-instance";
-
- /**
- * Method element2ECDSAPublicKey.
- * @param keyValueElem a DomElement containing an ECDSA Public Key
- * @return PublicKey a java.security.publicKey - object
- * @throws Exception on any error
- */
-
- public static PublicKey element2ECDSAPublicKey(Element keyValueElem) throws Exception
- {
- String ecdsaNS = Constants.ECDSA_NS_URI;
- // Domain parameters
- Element domainParams = getChildElement(keyValueElem, ecdsaNS, "DomainParameters", 1);
- if (domainParams == null) throw new Exception("Domain parameters must not be implicit.");
- Element namedCurve = getChildElement(domainParams, ecdsaNS, "NamedCurve", 1);
- ECCParameterSpec eccParameterSpec;
- if (namedCurve != null)
- {
- URL curveNameURN = new URL(namedCurve.getAttributeNS(null, "URN"));
- ECCParameterFactory eccParamFactory = ECCParameterFactory.getInstance();
- eccParameterSpec = eccParamFactory.getParameterByOID(curveNameURN.getPath().substring(4));
- }
- else
- {
- Element excplicitParams = getChildElement(domainParams, ecdsaNS, "ExplicitParams", 1);
- Element fieldParams = getChildElement(excplicitParams, ecdsaNS, "FieldParams", 1);
- Element curveParams = getChildElement(excplicitParams, ecdsaNS, "CurveParams", 1);
- Element basePointParams = getChildElement(excplicitParams, ecdsaNS, "BasePointParams", 1);
-
- // Field parameters
- String fieldParamsTypeStr = fieldParams.getAttributeNS(NAMESPACE_XSI, "type");
- String ecdsaNSPrefix = getECDSANSPrefix(fieldParams);
- BigInteger p = null;
- int fieldParamsType = 0;
- final int FIELD_TYPE_PRIME = 1;
- final int FIELD_TYPE_TNB = 2;
- final int FIELD_TYPE_PNB = 3;
- int m = -1, k = -1, k1 = -1, k2 = -1, k3 = -1;
- if (fieldParamsTypeStr.equals(ecdsaNSPrefix + ":PrimeFieldParamsType"))
- {
- fieldParamsType = FIELD_TYPE_PRIME;
- String pStr = getChildElementText(fieldParams, ecdsaNS, "P", 1);
- p = new BigInteger(pStr, 10);
- }
- else if (fieldParamsTypeStr.equals(ecdsaNSPrefix + ":TnBFieldParamsType"))
- {
- fieldParamsType = FIELD_TYPE_TNB;
- String mStr = getChildElementText(fieldParams, ecdsaNS, "M", 1);
- m = Integer.parseInt(mStr);
- String kStr = getChildElementText(fieldParams, ecdsaNS, "K", 1);
- k = Integer.parseInt(kStr);
- }
- else if (fieldParamsTypeStr.equals(ecdsaNSPrefix + ":PnBFieldParamsType"))
- {
- fieldParamsType = FIELD_TYPE_PNB;
- String mStr = getChildElementText(fieldParams, ecdsaNS, "M", 1);
- m = Integer.parseInt(mStr);
- String k1Str = getChildElementText(fieldParams, ecdsaNS, "K1", 1);
- k1 = Integer.parseInt(k1Str);
- String k2Str = getChildElementText(fieldParams, ecdsaNS, "K2", 1);
- k2 = Integer.parseInt(k2Str);
- String k3Str = getChildElementText(fieldParams, ecdsaNS, "K3", 1);
- k3 = Integer.parseInt(k3Str);
- }
- else throw new Exception("Unknown field parameters.");
-
- // Curve parameters
- Element aElem = getChildElement(curveParams, ecdsaNS, "A", 1);
- String aStr = aElem.getAttributeNS(null, "Value");
- Element bElem = getChildElement(curveParams, ecdsaNS, "B", 1);
- String bStr = bElem.getAttributeNS(null, "Value");
- String seedStr = getChildElementText(curveParams, ecdsaNS, "Seed", 1);
- BigInteger seed = (seedStr != null) ? new BigInteger(seedStr, 10) : null;
-
- // Base point parameters
- Element basePoint = getChildElement(basePointParams, ecdsaNS, "BasePoint", 1);
- Element basePointXElem = getChildElement(basePoint, ecdsaNS, "X", 1);
- String basePointXStr = basePointXElem.getAttributeNS(null, "Value");
- Element basePointYElem = getChildElement(basePoint, ecdsaNS, "Y", 1);
- String basePointYStr = basePointYElem.getAttributeNS(null, "Value");
- String orderStr = getChildElementText(basePointParams, ecdsaNS, "Order", 1);
- BigInteger order = new BigInteger(orderStr, 10);
- String cofactorStr = getChildElementText(basePointParams, ecdsaNS, "Cofactor", 1);
- BigInteger cofactor = (cofactorStr != null) ? new BigInteger(cofactorStr, 10) : null;
-
- if (fieldParamsType == FIELD_TYPE_PRIME)
- {
- BigInteger a = new BigInteger(aStr, 10);
- BigInteger b = new BigInteger(bStr, 10);
- BigInteger basePointX = new BigInteger(basePointXStr, 10);
- BigInteger basePointY = new BigInteger(basePointYStr, 10);
- eccParameterSpec = new ECCParameterSpec(p, cofactor, order, seed, null, a, b, basePointX,
- basePointY, null);
- }
- else
- {
- int[] irreducible = new int[m/32 + ((m % 32 != 0) ? 1 : 0)];
- if (fieldParamsType == FIELD_TYPE_TNB)
- {
- irreducible[m/32] = 1 << m % 32;
- irreducible[k/32] += 1 << k % 32;
- irreducible[0] += 1;
- }
- else
- {
- irreducible[m/32] = 1 << m % 32;
- irreducible[k3/32] += 1 << k3 % 32;
- irreducible[k2/32] += 1 << k2 % 32;
- irreducible[k1/32] += 1 << k1 % 32;
- irreducible[0] += 1;
- }
- eccParameterSpec = new ECCParameterSpec(irreducible, cofactor, order, octetString2IntArray(aStr),
- octetString2IntArray(bStr), octetString2IntArray(basePointXStr),
- octetString2IntArray(basePointYStr), null);
- }
- }
-
- // Public key
- Element publicKeyElem = getChildElement(keyValueElem, ecdsaNS, "PublicKey", 1);
- Element publicKeyXElem = getChildElement(publicKeyElem, ecdsaNS, "X", 1);
- String publicKeyXStr = publicKeyXElem.getAttributeNS(null, "Value");
- Element publicKeyYElem = getChildElement(publicKeyElem, ecdsaNS, "Y", 1);
- String publicKeyYStr = publicKeyYElem.getAttributeNS(null, "Value");
-
- ECDSAParameter ecdsaParams = new ECDSAParameter(eccParameterSpec, false);
- ECGroupFactory ecGroupFactory = ECGroupFactory.getInstance();
- EllipticCurve eCurve = ecGroupFactory.getCurveWithProjective(eccParameterSpec.getA(),
- eccParameterSpec.getB(), eccParameterSpec.getR());
- Field field = eCurve.getField();
-
- // Detect type of public key field elements
- String elementType = publicKeyXElem.getAttributeNS(NAMESPACE_XSI, "type");
- String elementTypeLocalName = elementType.substring(elementType.indexOf(':') + 1);
- int FIELD_TYPE_PRIME = 1, FIELD_TYPE_CHAR_TWO = 2;
- int fieldElemType = ("PrimeFieldElemType".equals(elementTypeLocalName))
- ? FIELD_TYPE_PRIME
- : FIELD_TYPE_CHAR_TWO;
-
- FieldElement publicKeyPointX, publicKeyPointY;
- if (fieldElemType == FIELD_TYPE_PRIME)
- {
- Value xValue = FieldFactory.getInstance().getPrimeFieldValue(new BigInteger(publicKeyXStr, 10));
- publicKeyPointX = field.newElement(xValue);
- Value yValue = FieldFactory.getInstance().getPrimeFieldValue(new BigInteger(publicKeyYStr, 10));
- publicKeyPointY = field.newElement(yValue);
- }
- else
- {
- publicKeyPointX = field.newElement(octetString2ByteArray(publicKeyXStr));
- publicKeyPointY = field.newElement(octetString2ByteArray(publicKeyYStr));
- }
- ProjectiveCoordinate publicKeyPointCoordinate = new ProjectiveCoordinate(publicKeyPointX,
- publicKeyPointY, field.getONEelement());
- ECPoint publicKeyPoint = eCurve.newPoint(publicKeyPointCoordinate);
- ECPublicKey publicKey = new ECPublicKey(ecdsaParams, publicKeyPoint);
-
- return publicKey;
- }
-
- /**
- * Method getECDSANSPrefix.
- * @param element to get the prefix
- * @return String the prefix
- */
- private static String getECDSANSPrefix(Element element)
- {
- // FIXXME: Review this function (GK, 11.06.2002) - should return a list of strings, since more than
- // one NS prefix can be bound to the ECDSA namespace
-
- HashMap inScopeNSAttrs = getInScopeNSAttrs(element);
- Iterator inScopeNSAttrsIt = inScopeNSAttrs.keySet().iterator();
- while (inScopeNSAttrsIt.hasNext())
- {
- Attr currentAttr = (Attr)inScopeNSAttrs.get(inScopeNSAttrsIt.next());
- if (Constants.ECDSA_NS_URI.equals(currentAttr.getValue()))
- {
- return ("xmlns".equals(currentAttr.getNodeName())) ? "" : currentAttr.getNodeName().substring(6);
- }
- }
- return null;
- }
-
- /**
- * Method octetString2IntArray.
- * Converts an octet string representation into an int array as needed for the IAIK ECC library
- * @param octetString rightmost byte is least significant byte
- * @return int[] rightmost byte is LEAST significant byte
- */
- private static int[] octetString2IntArray(String octetString)
- {
- int byteCount = octetString.length()/2;
- int[] intArray = new int[byteCount/4 + ((byteCount % 4 != 0) ? 1 : 0)];
- for (int i = 0; i < byteCount; i++)
- {
- int oSStartPos = octetString.length() - (i + 1) * 2;
- int currentByte = Integer.parseInt(octetString.substring(oSStartPos, oSStartPos + 2), 16);
- intArray[i/4] += (currentByte & 0xFF) << ((i % 4) * 8);
- }
- return intArray;
- }
-
- /**
- * Converts an octet string representation into a byte array as needed for the IAIK ECC library
- * @param octetString rightmost byte is least significant byte
- * @return byte[] rightmost byte is MOST significant byte
- */
- private static byte[] octetString2ByteArray(String octetString)
- {
- int byteCount = octetString.length()/2;
- byte[] byteArray = new byte[byteCount];
- for (int i = 0; i < byteCount; i++)
- {
- int oSStartPos = octetString.length() - (i + 1) * 2;
- byteArray[byteCount - i - 1] = (byte) Integer.parseInt(octetString.substring(
- oSStartPos, oSStartPos + 2), 16);
- }
- return byteArray;
- }
-
- /**
- * Method evenStringLength.
- * @param hexString
- * @return String
- */
-
- private static String evenStringLength(String hexString)
- {
- return (hexString.length() % 2 != 0) ? "0" + hexString : hexString;
- }
-
- /**
- * Method getChildElement.
- * @param parent
- * @param namespace
- * @param localName
- * @param instance
- * @return Element
- */
-
- private static Element getChildElement(Element parent, String namespace, String localName,
- int instance)
- {
- NodeList namedElements = parent.getElementsByTagNameNS(namespace, localName);
- if (namedElements.getLength() < instance) return null;
- return (Element)namedElements.item(instance - 1);
- }
-
- /**
- * Method getChildElementText.
- * @param parent Element
- * @param namespace String
- * @param localName String
- * @param instance int
- * @return String
- */
-
- private static String getChildElementText(Element parent, String namespace, String localName,
- int instance)
- {
- Element child = getChildElement(parent, namespace, localName, instance);
- if (child == null) return null;
- NodeList childNodes = child.getChildNodes();
- int nodeCount = 0;
- while (nodeCount < childNodes.getLength())
- {
- Node currentNode = childNodes.item(nodeCount);
- if (currentNode.getNodeType() == Node.TEXT_NODE) return currentNode.getNodeValue();
- nodeCount++;
- }
- return null;
- }
-
- /**
- * Method getInScopeNSAttrs.
- * @param element element
- * @return HashMap
- */
- public static HashMap getInScopeNSAttrs(Element element)
- {
- // Get all ancestors of element
- Vector ancestors = new Vector();
- ancestors.add(element);
- Node currentAncestor = element;
- while ((currentAncestor = currentAncestor.getParentNode()) != null &&
- currentAncestor.getNodeType() == Node.ELEMENT_NODE)
- {
- ancestors.add(currentAncestor);
- }
-
- // Scan all ancestors for NS attributes
- HashMap inScopeNSAttrs = new HashMap();
- for (int i = ancestors.size() - 1; i >= 0; i--)
- {
- Element currentAncestorElem = (Element)ancestors.get(i);
- NamedNodeMap attrs = currentAncestorElem.getAttributes();
- for (int j = 0; j < attrs.getLength(); j++)
- {
- Attr currentAttr = (Attr)attrs.item(j);
- String currentAttrName = currentAttr.getNodeName();
- if ("xmlns".equals(currentAttrName) || currentAttrName.startsWith("xmlns:"))
- {
- inScopeNSAttrs.put(currentAttrName, currentAttr);
- }
- }
- }
-
- // Check if default NS attribute is in list; if value is empty remove it from list
- Attr defaultNSAttr = (Attr)inScopeNSAttrs.get("xmlns");
- if (defaultNSAttr != null && "".equals(defaultNSAttr.getValue())) inScopeNSAttrs.remove("xmlns");
-
- return inScopeNSAttrs;
- }
-} \ No newline at end of file
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java
deleted file mode 100644
index 4fbc58977..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package at.gv.egovernment.moa.id.auth.parser;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Parses an <code>&lt;InfoboxReadResponse&gt;</code>.
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-
-public class ErrorResponseParser {
- //
- // XPath namespace prefix shortcuts
- //
- /** Xpath prefix for reaching SecurityLayer 1.0 Namespaces */
- private static final String SL10 = Constants.SL10_PREFIX + ":";
- /** Xpath expression to the root element */
- private static final String ROOT = "/" + SL10 + "ErrorResponse/";
- /** Xpath expression to the ErrorCode element */
- private static final String ERROR_CODE_XPATH =
- ROOT + SL10 + "ErrorCode";
- /** Xpath expression to the Info element */
- private static final String ERROR_INFO_XPATH =
- ROOT + SL10 + "Info";
-
-
- /** This is the root element of the XML-Document provided by the Security Layer Card */
- private Element errorElement;
-
- /**
- * Constructor for InfoboxReadResponseParser.
- * A DOM-representation of the incoming String will be created
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as String
- * @throws ParseException on any error
- */
- public ErrorResponseParser(String xmlResponse) throws ParseException {
- try {
- InputStream s = new ByteArrayInputStream(xmlResponse.getBytes("UTF-8"));
- errorElement = DOMUtils.parseXmlValidating(s);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString()}, t);
- }
- }
-
- /**
- * Constructor for InfoboxReadResponseParser.
- * A DOM-representation of the incoming Inputstream will be created
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as InputStream
- * @throws ParseException on any error
- */
- public ErrorResponseParser(InputStream xmlResponse) throws ParseException {
- try {
- errorElement = DOMUtils.parseXmlValidating(xmlResponse);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString() }, t);
- }
- }
-
- /**
- * Method getErrorCode. returns the error code
- * @return String
- */
- public String getErrorCode() {
-
- return XPathUtils.getElementValue(errorElement,ERROR_CODE_XPATH,null);
- }
-
- /**
- * Method getErrorInfo: returns the information about the error
- * @return String
- */
- public String getErrorInfo() {
-
- return XPathUtils.getElementValue(errorElement,ERROR_INFO_XPATH,null);
- }
-
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
deleted file mode 100644
index f9ef54884..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package at.gv.egovernment.moa.id.auth.parser;
-
-import java.security.interfaces.RSAPublicKey;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.PublicKey;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.traversal.NodeIterator;
-
-import at.gv.egovernment.moa.id.*;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Parses an identity link <code>&lt;saml:Assertion&gt;</code>
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class IdentityLinkAssertionParser {
-
- //
- // XPath namespace prefix shortcuts
- //
-
- /** Xpath prefix for reaching PersonData Namespaces */
- private static final String PDATA = Constants.PD_PREFIX + ":";
- /** Xpath prefix for reaching SecurityLayer 1.0 Namespaces */
- private static final String SL10 = Constants.SL10_PREFIX + ":";
- /** Xpath prefix for reaching SAML Namespaces */
- private static final String SAML = Constants.SAML_PREFIX + ":";
- /** Xpath prefix for reaching XML-DSIG Namespaces */
- private static final String DSIG = Constants.DSIG_PREFIX + ":";
- /** Xpath prefix for reaching ECDS Namespaces */
- private static final String ECDSA = Constants.ECDSA_PREFIX + ":";
- /** Xpath expression to the root element */
- private static final String ROOT = "/" + SAML + "Assertion/";
- /** Xpath expression to the SAMLSubjectConfirmationData element */
- private static final String SAML_SUBJECT_CONFIRMATION_DATA_XPATH =
- ROOT
- + SAML
- + "AttributeStatement/"
- + SAML
- + "Subject/"
- + SAML
- + "SubjectConfirmation/"
- + SAML
- + "SubjectConfirmationData";
- /** Xpath expression to the PersonData element */
- private static final String PERSON_XPATH =
- SAML_SUBJECT_CONFIRMATION_DATA_XPATH
- + "/"
- + PDATA
- + "Person";
- /** Xpath expression to the PersonData GivenName element */
- private static final String PERSON_GIVEN_NAME_XPATH =
- PERSON_XPATH
- + "/"
- + PDATA
- + "Name/"
- + PDATA
- + "GivenName";
- /** Xpath expression to the PersonData FamilyName element */
- private static final String PERSON_FAMILY_NAME_XPATH =
- PERSON_XPATH
- + "/"
- + PDATA
- + "Name/"
- + PDATA
- + "FamilyName";
- /** Xpath expression to the PersonData DateOfBirth element */
- private static final String PERSON_DATE_OF_BIRTH_XPATH =
- PERSON_XPATH
- + "/"
- + PDATA
- + "DateOfBirth";
- /** Xpath expression to the Identification element */
- private static final String PERSON_IDENT_XPATH =
- PERSON_XPATH
- + "/"
- + PDATA
- + "Identification";
-
- /** Xpath expression to the Identification Value element */
- private static final String PERSON_IDENT_VALUE_XPATH =
- PERSON_XPATH
- + "/"
- + PDATA
- + "Identification/"
- + PDATA
- + "Value";
- /** Xpath expression to the RSAKeyValue element */
- private static final String RSA_KEY_VALUE_XPATH =
- ROOT
- + SAML
- + "AttributeStatement/"
- + SAML
- + "Attribute/"
- + SAML
- + "AttributeValue/"
- + DSIG
- + "RSAKeyValue";
- /** Xpath expression to the RSA Modulus element */
- private static final String RSA_KEY_MODULUS_XPATH = DSIG + "Modulus";
- /** Xpath expression to the RSA Exponent element */
- private static final String RSA_KEY_EXPONENT_XPATH = DSIG + "Exponent";
- /** Xpath expression to the DSIG X509Certificate element */
- private static final String DSIG_CERTIFICATES_XPATH =
- ROOT
- + DSIG
- + "Signature/"
- + DSIG
- + "KeyInfo/"
- + DSIG
- + "X509Data/"
- + DSIG
- + "X509Certificate";
- /** Xpath expression to the DSIG Transforms element */
- private static final String DSIG_REFERENCE_TRANSFORMATION_XPATH =
- ROOT
- + DSIG
- + "Signature/"
- + DSIG
- + "SignedInfo/"
- + DSIG
- + "Reference/"
- + DSIG
- + "Transforms";
-
- /**This is the root element of the XML-Document provided by the Security Layer Card*/
- private Element assertionElem;
-
- /**
- * Constructor for <code>IdentityLinkAssertionParser</code>.
- * A DOM-representation of the incoming String will be created
- * @param xmlAssertion <code>&lt;saml:Assertion&gt;</code> as String
- * @throws ParseException on any parsing error
- */
- public IdentityLinkAssertionParser(String xmlAssertion) throws ParseException {
- try {
- InputStream s = new ByteArrayInputStream(xmlAssertion.getBytes("UTF-8"));
- assertionElem = DOMUtils.parseXmlValidating(s);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString()}, t);
- }
- }
-
- /**
- * Constructor for <code>IdentityLinkAssertionParser</code>.
- * A DOM-representation of the incoming Inputstream will be created
- * @param xmlAssertion <code>&lt;saml:Assertion&gt;</code> as InputStream
- * @throws ParseException on any parsing error
- */
- public IdentityLinkAssertionParser(InputStream xmlAssertion) throws Exception {
- try {
- assertionElem = DOMUtils.parseXmlValidating(xmlAssertion);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString() }, t);
- }
- }
-
- /**
- * Parses the identity link from the <code>&lt;saml:Assertion&gt;</code>
- * @return Identity link
- * @throws ParseException on any parsing error
- */
-
- public IdentityLink parseIdentityLink() throws ParseException {
- IdentityLink identityLink;
- try {
- identityLink = new IdentityLink();
- //ÄNDERN: NUR der Identification-Teil
- identityLink.setSamlAssertion(assertionElem);
- identityLink.setPrPerson((Element)
- XPathUtils.selectSingleNode(assertionElem, PERSON_XPATH));
- identityLink.setIdentificationValue(
- XPathUtils.getElementValue(assertionElem, PERSON_IDENT_VALUE_XPATH, ""));
- identityLink.setGivenName(
- XPathUtils.getElementValue(assertionElem, PERSON_GIVEN_NAME_XPATH, ""));
- identityLink.setFamilyName(
- XPathUtils.getElementValue(assertionElem, PERSON_FAMILY_NAME_XPATH, ""));
- identityLink.setDateOfBirth(
- XPathUtils.getElementValue(assertionElem, PERSON_DATE_OF_BIRTH_XPATH, ""));
- NodeIterator dsigRefTransforms =
- XPathUtils.selectNodeIterator(assertionElem, DSIG_REFERENCE_TRANSFORMATION_XPATH);
- List transElems = new ArrayList();
- Element transformsElem;
- while ((transformsElem = (Element) dsigRefTransforms.nextNode()) != null) {
- transElems.add(transformsElem);
- }
- Element[] result = new Element[transElems.size()];
- transElems.toArray(result);
- identityLink.setDsigReferenceTransforms(result);
-
- identityLink.setPublicKey(getPublicKeys());
-
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString() }, t);
- }
-
- return identityLink;
- }
-
- /**
- * Parses an array of Public Keys from the <code>&lt;InfoboxReadResponse&gt;</code>
- * @return RSAPublicKey[]
- * @throws IOException can occur when decoding the base64 values of the modulus and exponent
- */
- public PublicKey[] getPublicKeys() throws IOException{
-
-
- List pubKeys = new ArrayList();
- //Try to get RSA-Keys
- NodeIterator rsaIter =
- XPathUtils.selectNodeIterator(assertionElem, RSA_KEY_VALUE_XPATH);
- Element rsaElem;
- while ((rsaElem = (Element) rsaIter.nextNode()) != null) {
- String modulus =
- XPathUtils.getElementValue(rsaElem, RSA_KEY_MODULUS_XPATH, "");
- String exponent =
- XPathUtils.getElementValue(rsaElem, RSA_KEY_EXPONENT_XPATH, "");
-
- RSAPublicKey resPub =
- new iaik.security.rsa.RSAPublicKey(
- new BigInteger(1, Base64Utils.decode(modulus, true)),
- new BigInteger(1, Base64Utils.decode(exponent, true)));
- pubKeys.add(resPub);}
-
- PublicKey[] result = new PublicKey[pubKeys.size()];
-
- pubKeys.toArray(result);
- return result;
-
- }
- /**
- * Parses a string array of decoded base64 certificates from
- * the <code>&lt;InfoboxReadResponse&gt;</code> found in the dsig-signature
- * @return String[] with raw-certificates from the dsig-signature keyinfo
- * @throws Exception
- */
- public String[] getCertificates() throws Exception {
- List certs = new ArrayList();
- NodeIterator rsaIter =
- XPathUtils.selectNodeIterator(assertionElem, DSIG_CERTIFICATES_XPATH);
- Element certElem;
- while ((certElem = (Element) rsaIter.nextNode()) != null) {
- String content = DOMUtils.getText(certElem);
- certs.add(new String(Base64Utils.decode(content, true)));
- }
- String[] result = new String[certs.size()];
- certs.toArray(result);
- return result;
-
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
deleted file mode 100644
index c1146218e..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package at.gv.egovernment.moa.id.auth.parser;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.AuthenticationException;
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Parses an <code>&lt;InfoboxReadResponse&gt;</code>.
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-
-public class InfoboxReadResponseParser {
- //
- // XPath namespace prefix shortcuts
- //
- /** Xpath prefix for reaching SecurityLayer 1.0 Namespaces */
- private static final String SL10 = Constants.SL10_PREFIX + ":";
- /** Xpath prefix for reaching SAML Namespaces */
- private static final String SAML = Constants.SAML_PREFIX + ":";
- /** Xpath expression to the root element */
- private static final String ROOT = "/" + SL10 + "InfoboxReadResponse/";
- /** Xpath expression to the SAML:Assertion element */
- private static final String SAML_ASSERTION_XPATH = ROOT + SL10 + "BinaryFileData/" + SL10 + "XMLContent/" + SAML + "Assertion";
-
- /** This is the root element of the XML-Document provided by the Security Layer Card*/
- private Element infoBoxElem;
-
- /**
- * Constructor for InfoboxReadResponseParser.
- * A DOM-representation of the incoming String will be created
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as String
- * @throws ParseException on any parsing error
- */
- public InfoboxReadResponseParser(String xmlResponse) throws ParseException, AuthenticationException {
-
- ErrorResponseParser erp = new ErrorResponseParser(xmlResponse);
- if (erp.getErrorCode() != null) {
- throw new AuthenticationException("auth.08", new Object[] { erp.getErrorCode(), erp.getErrorInfo()});
- }
-
- try {
-
- InputStream s = new ByteArrayInputStream(xmlResponse.getBytes("UTF-8"));
- infoBoxElem = DOMUtils.parseXmlValidating(s);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString()}, t);
- }
- }
-
- /**
- * Constructor for InfoboxReadResponseParser.
- * A DOM-representation of the incoming Inputstream will be created
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as InputStream
- * @throws ParseException on any parsing error
- */
- public InfoboxReadResponseParser(InputStream is) throws ParseException, AuthenticationException {
-
- ErrorResponseParser erp = new ErrorResponseParser(is);
- if (erp.getErrorCode() != null) {
- throw new AuthenticationException("auth.08", new Object[] { erp.getErrorCode(), erp.getErrorInfo()});
- }
-
- try {
-
- infoBoxElem = DOMUtils.parseXmlValidating(is);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString()}, t);
- }
- }
-
- /**
- * Parses the embedded <code>&lt;saml:Assertion&gt;</code> element from <code>&lt;InfoboxReadResponse&gt;</code>
- * @return <code>&lt;saml:Assertion&gt;</code> as String
- * @throws ParseException on any parsing error
- */
- public String parseSAMLAssertion() throws ParseException {
- try {
- Element samlAssertion = (Element) XPathUtils.selectSingleNode(infoBoxElem, SAML_ASSERTION_XPATH);
- return DOMUtils.serializeNode(samlAssertion);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString()}, t);
- }
- }
-
- /**
- * Parses the identity link from the <code>&lt;saml:Assertion&gt;</code>
- * @return Identity link
- * @throws ParseException on any parsing error
- */
-
- public IdentityLink parseIdentityLink() throws ParseException {
- String samlAssertionString = parseSAMLAssertion();
- IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(samlAssertionString);
- return ilParser.parseIdentityLink();
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParser.java
deleted file mode 100644
index 7c4c01abe..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParser.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package at.gv.egovernment.moa.id.auth.parser;
-
-import java.io.IOException;
-
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * Parser for a SAML artifact.
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLArtifactParser {
- /** byte array containing the SamlArtifact bytes */
- private byte[] samlArtifactBytes;
-
- /**
- * Constructor
- * @param samlArtifact as String
- * @throws ParseException on any parsing error
- */
- public SAMLArtifactParser(String samlArtifact) throws ParseException {
- try {
- samlArtifactBytes = Base64Utils.decode(samlArtifact, false);
- }
- catch (IOException ex) {
- throw new ParseException("parser.02", new Object[] {ex.toString()}, ex);
- }
- }
- /**
- * Parses the type code.
- * @return type code
- * @throws ParseException when SAML artifact is invalid
- */
- public byte[] parseTypeCode() throws ParseException {
- try {
- byte[] typeCode = new byte[] {samlArtifactBytes[0], samlArtifactBytes[1]};
- return typeCode;
- }
- catch (Throwable ex) {
- throw new ParseException("parser.02", new Object[] {ex.toString()}, ex);
- }
- }
- /**
- * Parses the assertion handle.
- * @return assertion handle
- * @throws ParseException when SAML artifact is invalid
- */
- public String parseAssertionHandle() throws ParseException {
- try {
- return new String(samlArtifactBytes, 22, 20);
- }
- catch (Throwable ex) {
- throw new ParseException("parser.02", new Object[] {ex.toString()}, ex);
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java
deleted file mode 100644
index c74dc64e8..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/VerifyXMLSignatureResponseParser.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package at.gv.egovernment.moa.id.auth.parser;
-
-import iaik.utils.Base64InputStream;
-import iaik.x509.X509Certificate;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.*;
-import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Parses a <code>&lt;VerifyXMLSignatureResponse&gt;</code> returned by
- * MOA-SPSS.
- * This class implements the Singleton pattern
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-
-
-public class VerifyXMLSignatureResponseParser {
- //
- // XPath namespace prefix shortcuts
- //
- /** Xpath prefix for reaching MOA Namespaces */
- private static final String MOA = Constants.MOA_PREFIX + ":";
- /** Xpath prefix for reaching DSIG Namespaces */
- private static final String DSIG = Constants.DSIG_PREFIX + ":";
- /** Xpath prefix for reaching SecurityLayer 1.1 Namespaces */
- private static final String SL11 = Constants.SL11_PREFIX + ":";
- /** Xpath expression to the root element */
- private static final String ROOT = "/" + MOA + "VerifyXMLSignatureResponse/";
-
- /** Xpath expression to the X509SubjectName element */
- private static final String DSIG_SUBJECT_NAME_XPATH =
- ROOT + MOA + "SignerInfo/" + DSIG + "X509Data/" +
- DSIG + "X509SubjectName";
- /** Xpath expression to the X509Certificate element */
- private static final String DSIG_X509_CERTIFICATE_XPATH =
- ROOT + MOA + "SignerInfo/" + DSIG + "X509Data/" +
- DSIG + "X509Certificate";
- /** Xpath expression to the PublicAuthority element */
- private static final String PUBLIC_AUTHORITY_XPATH =
- ROOT + MOA + "SignerInfo/" + DSIG + "X509Data/" +
- MOA + "PublicAuthority";
- /** Xpath expression to the PublicAuthorityCode element */
- private static final String PUBLIC_AUTHORITY_CODE_XPATH =
- PUBLIC_AUTHORITY_XPATH + "/" + MOA + "Code";
- /** Xpath expression to the QualifiedCertificate element */
- private static final String QUALIFIED_CERTIFICATE_XPATH =
- ROOT + MOA + "SignerInfo/" + DSIG + "X509Data/" +
- SL11 + "QualifiedCertificate";
-
- /** Xpath expression to the SignatureCheckCode element */
- private static final String SIGNATURE_CHECK_CODE_XPATH =
- ROOT + MOA + "SignatureCheck/" + MOA + "Code";
- /** Xpath expression to the XMLDSIGManifestCheckCode element */
- private static final String XMLDSIG_MANIFEST_CHECK_CODE_XPATH =
- ROOT + MOA + "XMLDSIGManifestCheck/" + MOA + "Code";
- /** Xpath expression to the CertificateCheckCode element */
- private static final String CERTIFICATE_CHECK_CODE_XPATH =
- ROOT + MOA + "CertificateCheck/" + MOA + "Code";
-
-
- /** This is the root element of the XML-Document provided by the Security Layer Card*/
- private Element verifyXMLSignatureResponse;
-
- /**
- * Constructor for VerifyXMLSignatureResponseParser.
- * A DOM-representation of the incoming String will be created
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as String
- * @throws ParseException on any parsing error
- */
- public VerifyXMLSignatureResponseParser(String xmlResponse) throws ParseException{
- try {
- InputStream s = new ByteArrayInputStream(xmlResponse.getBytes("UTF-8"));
-
- verifyXMLSignatureResponse = DOMUtils.parseXmlValidating(s);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", null, t);
- }
- }
-
- /**
- * Constructor for VerifyXMLSignatureResponseParser.
- * A DOM-representation of the incoming Inputstream will be created
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as InputStream
- * @throws Exception on any parsing error
- */
- public VerifyXMLSignatureResponseParser(InputStream xmlResponse) throws Exception
- {
- try {
- verifyXMLSignatureResponse = DOMUtils.parseXmlValidating(xmlResponse);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", null, t);
- }
- }
-
- /**
- * Constructor for VerifyXMLSignatureResponseParser.
- * The incoming Element will be used for further operations
- * @param xmlResponse <code>&lt;InfoboxReadResponse&gt;</code> as Element
- */
- public VerifyXMLSignatureResponseParser(Element xmlResponse)
- {
- verifyXMLSignatureResponse =xmlResponse;
-
- }
-
- /**
- * Parse identity link from <code>&lt;InfoboxReadResponse&gt;</code>
- * @return Identity link
- * @throws ParseException on any parsing error
- */
-
- public VerifyXMLSignatureResponse parseData() throws ParseException {
- VerifyXMLSignatureResponse respData=new VerifyXMLSignatureResponse();
-
- try {
-
- respData.setXmlDsigSubjectName(XPathUtils.getElementValue(verifyXMLSignatureResponse,DSIG_SUBJECT_NAME_XPATH,""));
- Element e = (Element)XPathUtils.selectSingleNode(verifyXMLSignatureResponse,QUALIFIED_CERTIFICATE_XPATH);
- respData.setQualifiedCertificate(e!=null);
-
- Base64InputStream in = new Base64InputStream(new ByteArrayInputStream(XPathUtils.getElementValue(
- verifyXMLSignatureResponse,DSIG_X509_CERTIFICATE_XPATH,"").getBytes("UTF-8")),true);
-
- respData.setX509certificate(new X509Certificate(in));
-
- Element publicAuthority = (Element)XPathUtils.selectSingleNode(verifyXMLSignatureResponse,PUBLIC_AUTHORITY_CODE_XPATH);
- respData.setPublicAuthority(publicAuthority != null);
- respData.setPublicAuthorityCode(XPathUtils.getElementValue(verifyXMLSignatureResponse,PUBLIC_AUTHORITY_CODE_XPATH,""));
- respData.setSignatureCheckCode(new Integer(XPathUtils.getElementValue(verifyXMLSignatureResponse,SIGNATURE_CHECK_CODE_XPATH,"")).intValue());
-
- String xmlDsigCheckCode = XPathUtils.getElementValue(verifyXMLSignatureResponse,XMLDSIG_MANIFEST_CHECK_CODE_XPATH,null);
- if (xmlDsigCheckCode!=null)
- {
- respData.setXmlDSIGManigest(true);
- respData.setXmlDSIGManifestCheckCode(new Integer(xmlDsigCheckCode).intValue());
- }
- else
- respData.setXmlDSIGManigest(false);
- respData.setCertificateCheckCode(new Integer(XPathUtils.getElementValue(verifyXMLSignatureResponse,CERTIFICATE_CHECK_CODE_XPATH,"")).intValue());
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", null, t);
- }
- return respData;
- }
-
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
deleted file mode 100644
index 3a1cab4be..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package at.gv.egovernment.moa.id.auth.servlet;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
-import at.gv.egovernment.moa.id.auth.WrongParametersException;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.URLDecoder;
-
-/**
- * Base class for MOA-ID Auth Servlets, providing standard error handling
- * and constant names.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthServlet extends HttpServlet implements MOAIDAuthConstants {
-
-
- /**
- * Handles an error. <br>
- * <ul>
- * <li>Logs the error</li>
- * <li>Places error message and exception thrown into the request
- * as request attributes (to be used by <code>"/errorpage.jsp"</code>)</li>
- * <li>Sets HTTP status 500 (internal server error)</li>
- * </ul>
- *
- * @param errorMessage error message
- * @param exceptionThrown exception thrown
- * @param req servlet request
- * @param resp servlet response
- */
- protected void handleError(
- String errorMessage, Throwable exceptionThrown, HttpServletRequest req, HttpServletResponse resp) {
-
- if (exceptionThrown != null)
- Logger.error(errorMessage, exceptionThrown);
- else
- Logger.error(errorMessage);
- req.setAttribute("ErrorMessage", errorMessage);
- req.setAttribute("ExceptionThrown", exceptionThrown);
- resp.setStatus(500);
- }
- /**
- * Handles a <code>WrongParametersException</code>.
- * @param req servlet request
- * @param resp servlet response
- */
- protected void handleWrongParameters(WrongParametersException ex, HttpServletRequest req, HttpServletResponse resp) {
- Logger.error(ex.toString());
- req.setAttribute("WrongParameters", "true");
- resp.setStatus(500);
- }
-
- /**
- * Logs all servlet parameters for debugging purposes.
- */
- protected void logParameters(HttpServletRequest req) {
- for (Enumeration enum = req.getParameterNames(); enum.hasMoreElements(); ) {
- String parname = (String)enum.nextElement();
- Logger.debug("Parameter " + parname + req.getParameter(parname));
- }
- }
- /**
- * Parses the request input stream for parameters,
- * assuming parameters are encoded UTF-8.
- * @param req servlet request
- * @return mapping parameter name -> value
- */
- protected Map getParameters(HttpServletRequest req) throws IOException {
- Map parameters = new HashMap();
- InputStream in = req.getInputStream();
- String paramName;
- String paramValueURLEncoded;
- do {
- paramName = new String(readBytesUpTo(in, '='));
- if (paramName.length() > 0) {
- paramValueURLEncoded = readBytesUpTo(in, '&');
- String paramValue = URLDecoder.decode(paramValueURLEncoded, "UTF-8");
- parameters.put(paramName, paramValue);
- }
- }
- while (paramName.length() > 0);
- in.close();
-
- return parameters;
- }
- /**
- * Reads bytes up to a delimiter, consuming the delimiter.
- * @param in input stream
- * @param delimiter delimiter character
- * @return String constructed from the read bytes
- * @throws IOException
- */
- protected String readBytesUpTo(InputStream in, char delimiter) throws IOException {
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- boolean done = false;
- int b;
- while (! done && (b = in.read()) >= 0) {
- if (b == delimiter)
- done = true;
- else
- bout.write(b);
- }
- return bout.toString();
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java
deleted file mode 100644
index 554819f73..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package at.gv.egovernment.moa.id.auth.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Servlet requested for updating the MOA-ID Auth configuration from configuration file
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ConfigurationServlet extends HttpServlet {
- /** Constant for the DTD-Doc type */
- private static final String DOC_TYPE =
- "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n";
-
- /**
- * Handle a HTTP GET request, used to indicated that the MOA
- * configuration needs to be updated (reloaded).
- *
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
- */
- public void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
-
- MOAIDMessageProvider msg = MOAIDMessageProvider.getInstance();
- PrintWriter out;
-
- response.setContentType("text/html");
- out = response.getWriter();
- out.println(DOC_TYPE);
- out.println("<head><title>MOA configuration update</title></head>");
- out.println("<body bgcolor=\"#FFFFFF\">");
- try {
- MOAIDAuthInitializer.initialized=false;
- MOAIDAuthInitializer.initialize();
- String message = msg.getMessage("config.00", null);
- Logger.info(message);
- out.println("<p><b>");
- out.println(message);
- out.println("</b></p>");
- } catch (Throwable t) {
- String errorMessage = msg.getMessage("config.04", null);
- Logger.error(errorMessage, t);
- out.println("<p><b>");
- out.println(errorMessage);
- out.println("</b></p>");
- }
- out.println("</body>");
-
- out.flush();
- out.close();
- }
-
- /**
- * Do the same as <code>doGet</code>.
- *
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest, HttpServletResponse)
- */
- public void doPost(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- doGet(request, response);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java
deleted file mode 100644
index c41b514c8..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataService.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package at.gv.egovernment.moa.id.auth.servlet;
-
-import java.util.Calendar;
-
-import org.apache.axis.AxisFault;
-import org.w3c.dom.Element;
-
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.id.AuthenticationException;
-import at.gv.egovernment.moa.id.MOAIDException;
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
-import at.gv.egovernment.moa.id.auth.builder.SAMLResponseBuilder;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.id.util.Random;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.DateTimeUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Web service for picking up authentication data created in the MOA-ID Auth component.
- *
- * @author Paul Ivancsics
- * @version $Id$
- * @see at.gv.egovernment.moa.id.auth.AuthenticationServer#getAuthenticationData
- */
-public class GetAuthenticationDataService implements Constants {
-
- /**
- * Constructor for GetAuthenticationDataService.
- */
- public GetAuthenticationDataService() {
- super();
- }
-
- /**
- * Takes a <code>lt;samlp:Request&gt;</code> containing a
- * <code>SAML artifact</code> and returns the corresponding
- * authentication data <code>lt;saml:Assertion&gt;</code>
- * (obtained from the <code>AuthenticationServer</code>),
- * enclosed in a <code>lt;samlp:Response&gt;</code>.
- * <br/>Bad requests are mapped into various <code>lt;samlp:StatusCode&gt;</code>s,
- * possibly containing enclosed sub-<code>lt;samlp:StatusCode&gt;</code>s.
- * The status codes are defined in the SAML specification.
- *
- * @param requests request elements of type <code>lt;samlp:Request&gt;</code>;
- * only 1 request element is allowed
- * @return response element of type <code>lt;samlp:Response&gt;</code>,
- * packed into an <code>Element[]</code>
- * @throws AxisFault thrown when an error occurs in assembling the
- * <code>lt;samlp:Response&gt;</code>
- */
- public Element[] Request(Element[] requests)
- throws AxisFault {
-
- Element request = requests[0];
- Element[] responses = new Element[1];
- String requestID = "";
- String statusCode = "";
- String subStatusCode = null;
- String statusMessageCode = null;
- String statusMessage = null;
- String samlAssertion = "";
- if (requests.length > 1) {
- // more than 1 request given as parameter
- statusCode = "samlp:Requester";
- subStatusCode = "samlp:TooManyResponses";
- statusMessageCode = "1201";
- }
- else {
- try {
- DOMUtils.validateElement(request, ALL_SCHEMA_LOCATIONS, null);
- NodeList samlArtifactList = XPathUtils.selectNodeList(request, "samlp:AssertionArtifact");
- if (samlArtifactList.getLength() == 0) {
- // no SAML artifact given in request
- statusCode = "samlp:Requester";
- statusMessageCode = "1202";
- }
- else if (samlArtifactList.getLength() > 1) {
- // too many SAML artifacts given in request
- statusCode = "samlp:Requester";
- subStatusCode = "samlp:TooManyResponses";
- statusMessageCode = "1203";
- }
- else {
- Element samlArtifactElem = (Element)samlArtifactList.item(0);
- requestID = samlArtifactElem.getAttribute("RequestID");
- String samlArtifact = DOMUtils.getText(samlArtifactElem);
- try {
- AuthenticationData authData = AuthenticationServer.getInstance().
- getAuthenticationData(samlArtifact);
- // success
- samlAssertion = authData.getSamlAssertion();
- statusCode = "samlp:Success";
- statusMessageCode = "1200";
- }
- catch (AuthenticationException ex) {
- // no authentication data for given SAML artifact
- statusCode = "samlp:Requester";
- subStatusCode = "samlp:ResourceNotRecognized";
- statusMessage = ex.toString();
- }
- }
- }
- catch (Throwable t) {
- // invalid request format
- statusCode = "samlp:Requester";
- statusMessageCode = "1204";
- }
- }
- try {
- String responseID = Random.nextRandom();
- String issueInstant = DateTimeUtils.buildDateTime(Calendar.getInstance());
- if (statusMessage == null)
- statusMessage = MOAIDMessageProvider.getInstance().getMessage(statusMessageCode, null);
- responses[0] = new SAMLResponseBuilder().build(
- responseID, requestID, issueInstant, statusCode, subStatusCode, statusMessage, samlAssertion);
- }
- catch (MOAIDException e) {
- AxisFault fault = AxisFault.makeFault(e);
- fault.setFaultDetail(new Element[] { e.toErrorResponse()});
- throw fault;
- }
- catch (Throwable t) {
- MOAIDException e = new MOAIDException("1299", null, t);
- AxisFault fault = AxisFault.makeFault(e);
- fault.setFaultDetail(new Element[] { e.toErrorResponse()});
- throw fault;
- }
- return responses;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java
deleted file mode 100644
index 50ca21c69..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package at.gv.egovernment.moa.id.auth.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
-import at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer;
-import at.gv.egovernment.moa.id.auth.WrongParametersException;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Servlet requested for selecting a BKU.
- * <br>In case of {@link AuthConfigurationProvider#getBKUSelectionType}==HTMLComplete,
- * the browser is redirected to the configured "BKU-Auswahl-URL".
- * <br>In case of {@link AuthConfigurationProvider#getBKUSelectionType}==HTMLSelect,
- * the list of available BKU's is fetched from a BKU-Auswahl server, and presented
- * to the user in an HTML form.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SelectBKUServlet extends AuthServlet {
-
- /**
- * Calls the web application initializer.
- *
- * @see javax.servlet.Servlet#init(ServletConfig)
- */
- public void init(ServletConfig servletConfig) throws ServletException {
- try {
- MOAIDAuthInitializer.initialize();
- Logger.info(MOAIDMessageProvider.getInstance().getMessage("init.00", null));
- }
- catch (Exception ex) {
- Logger.fatal(MOAIDMessageProvider.getInstance().getMessage("init.02", null), ex);
- throw new ServletException(ex);
- }
- }
-
- /**
- * Responds with an HTML form which requests the user to choose a BKU.
- */
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
-
- Logger.debug("GET SelectBKU");
- String authURL =
- req.getScheme() + "://" +
- req.getServerName() + ":" +
- req.getServerPort() +
- req.getContextPath() + "/";
- String target = req.getParameter(PARAM_TARGET);
- String oaURL = req.getParameter(PARAM_OA);
- String bkuSelectionTemplateURL = req.getParameter(PARAM_BKUTEMPLATE);
- String templateURL = req.getParameter(PARAM_TEMPLATE);
- resp.setHeader(HEADER_EXPIRES,HEADER_VALUE_EXPIRES);
- resp.setHeader(HEADER_PRAGMA,HEADER_VALUE_PRAGMA);
- resp.setHeader(HEADER_CACHE_CONTROL,HEADER_VALUE_CACHE_CONTROL);
- resp.addHeader(HEADER_CACHE_CONTROL,HEADER_VALUE_CACHE_CONTROL_IE);
-
- try {
- String returnValue = AuthenticationServer.getInstance().selectBKU(
- authURL, target, oaURL, bkuSelectionTemplateURL, templateURL);
- String bkuSelectionType = AuthConfigurationProvider.getInstance().getBKUSelectionType();
- if (bkuSelectionType.equals(AuthConfigurationProvider.BKU_SELECTION_TYPE_HTMLCOMPLETE)) {
- // bkuSelectionType==HTMLComplete
- String redirectURL = returnValue;
- resp.sendRedirect(redirectURL);
- Logger.debug("REDIRECT TO: " + redirectURL);
- }
- else {
- // bkuSelectionType==HTMLSelect
- String htmlForm = returnValue;
- resp.setContentType("text/html");
- PrintWriter out = new PrintWriter(resp.getOutputStream());
- out.print(htmlForm);
- out.flush();
- Logger.debug("Finished GET SelectBKU");
- }
- }
- catch (WrongParametersException ex) {
- handleWrongParameters(ex, req, resp);
- }
- catch (Throwable ex) {
- handleError(null, ex, req, resp);
- }
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
deleted file mode 100644
index 2ea43935b..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package at.gv.egovernment.moa.id.auth.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import at.gv.egovernment.moa.id.MOAIDException;
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
-import at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer;
-import at.gv.egovernment.moa.id.auth.WrongParametersException;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Servlet requested for starting a MOA ID authentication session.
- * Utilizes the {@link AuthenticationServer}.
- *
- * @author Paul Ivancsics
- * @version $Id$
- * @see AuthenticationServer#startAuthentication
- */
-public class StartAuthenticationServlet extends AuthServlet {
-
- /**
- * Responds with an HTML form which upon submit requests the identity link
- * from the security layer implementation.
- * <br>
- * Response:
- * <ul>
- * <li>Content type: <code>"text/html"</code></li>
- * <li>Content: see return value of {@link AuthenticationServer#startAuthentication}</li>
- * <li>Error status: <code>500</code>
- * </ul>
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
- */
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
-
- Logger.debug("GET StartAuthentication");
- String authURL =
- req.getScheme() + "://" +
- req.getServerName() + ":" +
- req.getServerPort() +
- req.getContextPath() + "/";
- String target = req.getParameter(PARAM_TARGET);
- String oaURL = req.getParameter(PARAM_OA);
- String bkuURL = req.getParameter(PARAM_BKU);
- String templateURL = req.getParameter(PARAM_TEMPLATE);
- String sessionID = req.getParameter(PARAM_SESSIONID);
- resp.setHeader(HEADER_EXPIRES,HEADER_VALUE_EXPIRES);
- resp.setHeader(HEADER_PRAGMA,HEADER_VALUE_PRAGMA);
- resp.setHeader(HEADER_CACHE_CONTROL,HEADER_VALUE_CACHE_CONTROL);
- resp.addHeader(HEADER_CACHE_CONTROL,HEADER_VALUE_CACHE_CONTROL_IE);
- try {
- String getIdentityLinkForm =
- AuthenticationServer.getInstance().startAuthentication(authURL, target, oaURL, templateURL, bkuURL, sessionID);
- resp.setContentType("text/html");
- PrintWriter out = new PrintWriter(resp.getOutputStream());
- out.print(getIdentityLinkForm);
- out.flush();
- Logger.debug("Finished GET StartAuthentication");
- }
- catch (WrongParametersException ex) {
- handleWrongParameters(ex, req, resp);
- }
- catch (MOAIDException ex) {
- handleError(null, ex, req, resp);
- }
- }
-
-
- /**
- * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
- */
- protected void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
-
- doGet(req, resp);
- }
-
-
- /**
- * Calls the web application initializer.
- *
- * @see javax.servlet.Servlet#init(ServletConfig)
- */
- public void init(ServletConfig servletConfig) throws ServletException {
- try {
- MOAIDAuthInitializer.initialize();
- Logger.info(MOAIDMessageProvider.getInstance().getMessage("init.00", null));
- }
- catch (Exception ex) {
- Logger.fatal(MOAIDMessageProvider.getInstance().getMessage("init.02", null), ex);
- throw new ServletException(ex);
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
deleted file mode 100644
index 8d16f73dd..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package at.gv.egovernment.moa.id.auth.servlet;
-
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import at.gv.egovernment.moa.id.MOAIDException;
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
-import at.gv.egovernment.moa.id.auth.WrongParametersException;
-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Servlet requested for verifying the signed authentication block
- * provided by the security layer implementation.
- * Utilizes the {@link AuthenticationServer}.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class VerifyAuthenticationBlockServlet extends AuthServlet {
-
-
- /**
- * Constructor for VerifyAuthenticationBlockServlet.
- */
- public VerifyAuthenticationBlockServlet() {
- super();
- }
-
- /**
- * GET requested by security layer implementation to verify
- * that data URL resource is available.
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
- */
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
-
- Logger.debug("GET VerifyAuthenticationBlock");
- }
-
- /**
- * Verifies the signed authentication block and redirects the browser
- * to the online application requested, adding a parameter needed for
- * retrieving the authentication data.
- * <br>
- * Request parameters:
- * <ul>
- * <li>MOASessionID: ID of associated authentication session</li>
- * <li>XMLResponse: <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
- * </ul>
- * Response:
- * <ul>
- * <li>Status: <code>302</code></li>
- * <li>Header <code>"Location"</code>: URL of the online application requested, with
- * parameters <code>"Target"</code> and <code>"SAMLArtifact"</code> added</li>
- * <li>Error status: <code>500</code>
- * </ul>
- * @see AuthenticationServer#verifyAuthenticationBlock
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest, HttpServletResponse)
- */
- protected void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
-
- Logger.debug("POST VerifyAuthenticationBlock");
- Map parameters = getParameters(req);
- String sessionID = req.getParameter(PARAM_SESSIONID);
- String createXMLSignatureResponse = (String)parameters.get(PARAM_XMLRESPONSE);
- // debug output
- AuthenticationServer.debugOutputXMLFile("CreateXMLSignatureResponse.xml", createXMLSignatureResponse);
- try {
- AuthenticationSession session = AuthenticationServer.getSession(sessionID);
- String samlArtifactBase64 =
- AuthenticationServer.getInstance().verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
- String redirectURL = session.getOAURLRequested();
- redirectURL = addURLParameter(redirectURL, PARAM_TARGET, session.getTarget());
- redirectURL = addURLParameter(redirectURL, PARAM_SAMLARTIFACT, URLEncoder.encode(samlArtifactBase64));
- redirectURL = resp.encodeRedirectURL(redirectURL);
- resp.setStatus(302);
- resp.addHeader("Location", redirectURL);
- Logger.debug("REDIRECT TO: " + redirectURL);
- }
- catch (WrongParametersException ex) {
- handleWrongParameters(ex, req, resp);
- }
- catch (MOAIDException ex) {
- handleError(null, ex, req, resp);
- }
-
- }
- /**
- * Adds a parameter to a URL.
- * @param url the URL
- * @param paramname parameter name
- * @param paramvalue parameter value
- * @return the URL with parameter added
- */
- private static String addURLParameter(String url, String paramname, String paramvalue) {
- String param = paramname + "=" + paramvalue;
- if (url.indexOf("?") < 0)
- return url + "?" + param;
- else
- return url + "&" + param;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
deleted file mode 100644
index d3a28c7d4..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package at.gv.egovernment.moa.id.auth.servlet;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import at.gv.egovernment.moa.id.MOAIDException;
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
-import at.gv.egovernment.moa.id.auth.WrongParametersException;
-import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;
-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Servlet requested for verifying the identity link
- * provided by the security layer implementation.
- * Utilizes the {@link AuthenticationServer}.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class VerifyIdentityLinkServlet extends AuthServlet {
-
- /**
- * Constructor for VerifyIdentityLinkServlet.
- */
- public VerifyIdentityLinkServlet() {
- super();
- }
-
- /**
- * GET requested by security layer implementation to verify
- * that data URL resource is available.
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
- */
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
-
- Logger.debug("GET VerifyIdentityLink");
- }
-
- /**
- * Verifies the identity link and responds with a new
- * <code>CreateXMLSignatureRequest</code>.
- * <br>
- * Request parameters:
- * <ul>
- * <li>MOASessionID: ID of associated authentication session</li>
- * <li>XMLResponse: <code>&lt;InfoboxReadResponse&gt;</code></li>
- * </ul>
- * Response:
- * <ul>
- * <li>Content type: <code>"text/xml"</code></li>
- * <li>Content: see return value of {@link AuthenticationServer#verifyIdentityLink}</li>
- * <li>Error status: <code>500</code>
- * </ul>
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest, HttpServletResponse)
- */
- protected void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
-
- Logger.debug("POST VerifyIdentityLink");
- Map parameters = getParameters(req);
- String sessionID = req.getParameter(PARAM_SESSIONID);
- String infoboxReadResponse = (String)parameters.get(PARAM_XMLRESPONSE);
- // debug output
- AuthenticationServer.debugOutputXMLFile("InfoboxReadResponse.xml", infoboxReadResponse);
- try {
- String createXMLSignatureRequest =
- AuthenticationServer.getInstance().verifyIdentityLink(sessionID, infoboxReadResponse);
- AuthenticationSession session = AuthenticationServer.getSession(sessionID);
- resp.setStatus(307);
- String dataURL = new DataURLBuilder().buildDataURL(
- session.getAuthURL(), AuthenticationServer.REQ_VERIFY_AUTH_BLOCK, sessionID);
- resp.addHeader("Location", dataURL);
- resp.setContentType("text/xml");
- // debug output
- AuthenticationServer.debugOutputXMLFile("CreateXMLSignatureRequest.xml", createXMLSignatureRequest);
- OutputStream out = resp.getOutputStream();
- out.write(createXMLSignatureRequest.getBytes("UTF-8"));
- out.flush();
- out.close();
- Logger.debug("Finished POST VerifyIdentityLink");
- }
- catch (WrongParametersException ex) {
- handleWrongParameters(ex, req, resp);
- }
- catch (MOAIDException ex) {
- handleError(null, ex, req, resp);
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java b/id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
deleted file mode 100644
index e596e79a4..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package at.gv.egovernment.moa.id.auth.validator;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.data.SAMLAttribute;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- *
- * This class is used to validate an {@link CreateXMLSignatureResponse}
- * returned by the security layer.
- * This class implements the Singleton pattern.
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class CreateXMLSignatureResponseValidator {
-
- /** Xpath prefix for reaching SecurityLayer 1.0 Namespaces */
- private static final String SAML = Constants.SAML_PREFIX + ":";
- /** Xpath prefix for reaching XML-DSIG Namespaces */
- private static final String DSIG = Constants.DSIG_PREFIX + ":";
- /** Xpath expression to the SAML:Assertion element */
- private static final String ROOT = SAML + "Assertion";
- /** Xpath expression to the SAML:NameIdentifier element */
- private static final String SAML_SUBJECT_NAME_IDENTIFIER_XPATH =
- SAML + "AttributeStatement/" + SAML + "Subject/" +
- SAML + "NameIdentifier";
- /** Xpath expression to the SAML:Attribute element */
- private static final String SAML_ATTRIBUTE_XPATH =
- ROOT + "/" + SAML + "AttributeStatement/" + SAML + "Attribute";
- /** Xpath expression to the SAML:AttributeValue element */
- private static final String SAML_ATTRIBUTE_VALUE_XPATH =
- SAML + "AttributeValue";
-
-
- /** Singleton instance. <code>null</code>, if none has been created. */
- private static CreateXMLSignatureResponseValidator instance;
-
- /**
- * Constructor for a singleton CreateXMLSignatureResponseValidator.
- * @return an instance of CreateXMLSignatureResponseValidator
- * @throws ValidateException if no instance can be created
- */
- public static synchronized CreateXMLSignatureResponseValidator getInstance()
- throws ValidateException {
- if (instance == null) {
- instance = new CreateXMLSignatureResponseValidator();
- }
- return instance;
- }
-
-
- /**
- * The Method validate is used for validating an explicit {@link CreateXMLSignatureResponse}
- * @param createXMLSignatureResponse
- * @param gbTarget
- * @param oaURL
- * @throws ValidateException
- */
- public void validate(CreateXMLSignatureResponse createXMLSignatureResponse, String gbTarget, String oaURL)
- throws ValidateException {
-
- // A3.056: more then one /saml:Assertion/saml:AttributeStatement/saml:Subject/saml:NameIdentifier
-
- XPathUtils.selectNodeList(createXMLSignatureResponse.getSamlAssertion(),SAML_SUBJECT_NAME_IDENTIFIER_XPATH);
-
- SAMLAttribute[] samlattributes = createXMLSignatureResponse.getSamlAttributes();
- boolean foundOA = false;
- boolean foundGB = false;
- for (int i = 0; i < samlattributes.length; i++)
- {
- if (samlattributes[i].getName().equals("Geschäftsbereich"))
- if (samlattributes[i].getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#"))
-
- {
- foundGB = true;
- if (!gbTarget.equals(samlattributes[i].getValue()))
- {
- throw new ValidateException("validator.13", null);
- }
- }
- else throw new ValidateException("validator.12", null);
- if (samlattributes[i].getName().equals("OA"))
- if (samlattributes[i].getNamespace().equals("http://reference.e-government.gv.at/namespace/moa/20020822#"))
- {
- foundOA = true;
- if (!oaURL.equals(samlattributes[i].getValue())) // CHECKS für die AttributeVALUES fehlen noch
- {
- throw new ValidateException("validator.16", new Object[] {":gefunden wurde '" + oaURL + "', erwartet wurde '" + samlattributes[i].getValue()});
- }
-
- }
- else throw new ValidateException("validator.15", null);
- }
- if (!foundOA) throw new ValidateException("validator.14", null);
- if (!foundGB) throw new ValidateException("validator.11", null);
-
- //Check if dsig:Signature exists
- Element dsigSignature = (Element) XPathUtils.selectSingleNode(createXMLSignatureResponse.getSamlAssertion(),DSIG + "Signature");
- if (dsigSignature==null) throw new ValidateException("validator.05", null);
-
-
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java b/id.server/src/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java
deleted file mode 100644
index 42e3e946f..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/IdentityLinkValidator.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package at.gv.egovernment.moa.id.auth.validator;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- *
- * This class is used to validate an {@link IdentityLink}
- * returned by the security layer
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class IdentityLinkValidator implements Constants {
-
- //
- // XPath namespace prefix shortcuts
- //
- /** Xpath prefix for reaching PersonData Namespaces */
- private static final String PDATA = PD_PREFIX + ":";
- /** Xpath prefix for reaching SAML Namespaces */
- private static final String SAML = SAML_PREFIX + ":";
- /** Xpath prefix for reaching XML-DSIG Namespaces */
- private static final String DSIG = DSIG_PREFIX + ":";
- /** Xpath prefix for reaching ECDSA Namespaces */
- private static final String ECDSA = ECDSA_PREFIX + ":";
- /** Xpath expression to the root element */
- private static final String ROOT = "/" + SAML + "Assertion/";
- /** Xpath expression to the SAML:SubjectConfirmationData element */
- private static final String SAML_SUBJECT_CONFIRMATION_DATA_XPATH =
- ROOT
- + SAML
- + "AttributeStatement/"
- + SAML
- + "Subject/"
- + SAML
- + "SubjectConfirmation/"
- + SAML
- + "SubjectConfirmationData";
-/** Xpath expression to the PersonData:Person element */
- private static final String PERSON_XPATH =
- SAML_SUBJECT_CONFIRMATION_DATA_XPATH + "/" + PDATA + "Person";
- /** Xpath expression to the SAML:Attribute element */
- private static final String ATTRIBUTE_XPATH =
- ROOT + SAML + "AttributeStatement/" + SAML + "Attribute";
- /** Xpath expression to the SAML:AttributeName attribute */
- private static final String ATTRIBUTE_NAME_XPATH =
- ROOT + SAML + "AttributeStatement/" + SAML + "Attribute/@AttributeName";
- /** Xpath expression to the SAML:AttributeNamespace attribute */
- private static final String ATTRIBUTE_NAMESPACE_XPATH =
- ROOT
- + SAML
- + "AttributeStatement/"
- + SAML
- + "Attribute/@AttributeNamespace";
- /** Xpath expression to the SAML:AttributeValue element */
- private static final String ATTRIBUTE_VALUE_XPATH =
- ROOT
- + SAML
- + "AttributeStatement/"
- + SAML
- + "Attribute/"
- + SAML
- + "AttributeValue";
-
- /** Singleton instance. <code>null</code>, if none has been created. */
- private static IdentityLinkValidator instance;
-
- /**
- * Constructor for a singleton IdentityLinkValidator.
- * @return a new IdentityLinkValidator instance
- * @throws ValidateException if no instance can be created
- */
- public static synchronized IdentityLinkValidator getInstance()
- throws ValidateException {
- if (instance == null) {
- instance = new IdentityLinkValidator();
- }
- return instance;
- }
-
- /**
- * Method validate. Validates the {@link IdentityLink}
- * @param identityLink The identityLink to validate
- * @throws ValidateException on any validation error
- */
- public void validate(IdentityLink identityLink) throws ValidateException {
-
- //Search the SAML:ASSERTION Object (A2.054)
- if (identityLink.getSamlAssertion() == null)
- throw new ValidateException("validator.00", null);
-
- // Check how many saml:Assertion/saml:AttributeStatement/
- // saml:Subject/ saml:SubjectConfirmation/
- // saml:SubjectConfirmationData/pr:Person of type
- // PhysicalPersonType exist (A2.056)
- NodeList nl =
- XPathUtils.selectNodeList(identityLink.getSamlAssertion(), PERSON_XPATH);
- // If we have just one Person-Element we don't need to check the attributes
- int counterPhysicalPersonType = 0;
- if (nl.getLength() > 1)
- for (int i = 0; i < nl.getLength(); i++) {
- String xsiType =
- ((Element) nl.item(i))
- .getAttributeNodeNS(
- "http://www.w3.org/2001/XMLSchema-instance",
- "type")
- .getNodeValue();
- // We have to check if xsiType contains "PhysicalPersonType"
- // An equal-check will fail because of the Namespace-prefix of the attribute value
- if (xsiType.indexOf("PhysicalPersonType") > -1)
- counterPhysicalPersonType++;
- }
- if (counterPhysicalPersonType > 1)
- throw new ValidateException("validator.01", null);
-
- //Check the SAML:ATTRIBUTES
- nl = XPathUtils.selectNodeList(identityLink.getSamlAssertion(), ATTRIBUTE_XPATH);
- for (int i = 0; i < nl.getLength(); i++) {
- String attributeName =
- XPathUtils.getAttributeValue(
- (Element) nl.item(i),
- "@AttributeName",
- null);
- String attributeNS =
- XPathUtils.getAttributeValue(
- (Element) nl.item(i),
- "@AttributeNamespace",
- null);
- if (attributeName.equals("CitizenPublicKey")) {
- if (attributeNS.equals("http://www.buergerkarte.at/namespaces/personenbindung/20020506#")) {
- Element attributeValue =
- (Element) XPathUtils.selectSingleNode((Element) nl.item(i),SAML + "AttributeValue/" + DSIG + "RSAKeyValue");
- if (attributeValue==null)
- attributeValue =
- (Element) XPathUtils.selectSingleNode((Element)nl.item(i), SAML + "AttributeValue/" + ECDSA + "ECDSAKeyValue");
- if (attributeValue == null)
- throw new ValidateException("validator.02", null);
- }
- else
- throw new ValidateException("validator.03", null);
- }
- else
- throw new ValidateException("validator.04", null);
- }
-
- //Check if dsig:Signature exists
- Element dsigSignature = (Element) XPathUtils.selectSingleNode(identityLink.getSamlAssertion(),ROOT + DSIG + "Signature");
- if (dsigSignature==null) throw new ValidateException("validator.05", null);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/ValidateException.java b/id.server/src/at/gv/egovernment/moa/id/auth/validator/ValidateException.java
deleted file mode 100644
index a6685fca8..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/ValidateException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package at.gv.egovernment.moa.id.auth.validator;
-
-import at.gv.egovernment.moa.id.MOAIDException;
-
-/**
- * Exception thrown while validating an incoming XML structure
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ValidateException extends MOAIDException {
-
- /**
- * Constructor for ValidateException.
- * @param messageId
- * @param parameters
- */
- public ValidateException(String messageId, Object[] parameters) {
- super(messageId, parameters);
- }
-
- /**
- * Constructor for ValidateException.
- * @param messageId
- * @param parameters
- * @param wrapped
- */
- public ValidateException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
- super(messageId, parameters, wrapped);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java b/id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
deleted file mode 100644
index a238d28cb..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package at.gv.egovernment.moa.id.auth.validator;
-
-import java.security.PublicKey;
-import java.security.interfaces.RSAPublicKey;
-
-import iaik.asn1.structures.Name;
-import iaik.utils.RFC2253NameParserException;
-import iaik.x509.X509Certificate;
-
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
-
-/**
- * This class is used to validate an {@link VerifyXMLSignatureResponse}
- * returned by MOA-SPSS
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class VerifyXMLSignatureResponseValidator {
-
- /** Identification string for checking identity link */
- public static final String CHECK_IDENTITY_LINK = "IdentityLink";
- /** Identification string for checking authentication block */
- public static final String CHECK_AUTH_BLOCK = "AuthBlock";
-
- /** Singleton instance. <code>null</code>, if none has been created. */
- private static VerifyXMLSignatureResponseValidator instance;
-
- /**
- * Constructor for a singleton VerifyXMLSignatureResponseValidator.
- */
- public static synchronized VerifyXMLSignatureResponseValidator getInstance()
- throws ValidateException {
- if (instance == null) {
- instance = new VerifyXMLSignatureResponseValidator();
- }
- return instance;
- }
-
- /**
- * Validates a {@link VerifyXMLSignatureResponse} returned by MOA-SPSS.
- *
- * @param verifyXMLSignatureResponse the <code>&lt;VerifyXMLSignatureResponse&gt;</code>
- * @param identityLinkSignersSubjectDNNames subject names configured
- * @param whatToCheck is used to identify whether the identityLink or the Auth-Block is validated
- * @throws ValidateException on any validation error
- */
- public void validate(
- VerifyXMLSignatureResponse verifyXMLSignatureResponse,
- String[] identityLinkSignersSubjectDNNames, String whatToCheck)
- throws ValidateException {
-
- if (verifyXMLSignatureResponse.getSignatureCheckCode() != 0)
- throw new ValidateException("validator.06", null);
- if (verifyXMLSignatureResponse.getCertificateCheckCode() != 0)
- if (whatToCheck.equals(CHECK_IDENTITY_LINK))
- throw new ValidateException("validator.07", null);
- else
- throw new ValidateException("validator.19", null);
- if (verifyXMLSignatureResponse.isXmlDSIGManigest())
- if (verifyXMLSignatureResponse.getXmlDSIGManifestCheckCode() != 0)
- throw new ValidateException("validator.08", null);
- //Check whether the returned X509 SubjectName is in the MOA-ID configuration or not
- if (identityLinkSignersSubjectDNNames != null) {
- String subjectDN = "";
- X509Certificate x509Cert = verifyXMLSignatureResponse.getX509certificate();
- try {
- subjectDN = ((Name) x509Cert.getSubjectDN()).getRFC2253String();
- }
- catch (RFC2253NameParserException e) {
- throw new ValidateException("validator.17", null);
- }
- boolean found = false;
- for (int i = 0; i < identityLinkSignersSubjectDNNames.length; i++) {
- if (identityLinkSignersSubjectDNNames[i].equals(subjectDN))
- found = true;
- }
- if (!found)
- throw new ValidateException(
- "validator.18",
- new Object[] { subjectDN });
- }
- }
-
- /**
- * Method validateCertificate.
- * @param vsr is the VerifyXMLSignatureResponse
- * @param idl
- * @throws ValidateException
- */
- public void validateCertificate(
- VerifyXMLSignatureResponse verifyXMLSignatureResponse,
- IdentityLink idl)
- throws ValidateException {
-
- X509Certificate x509Response = verifyXMLSignatureResponse.getX509certificate();
- PublicKey[] pubKeysIdentityLink = (PublicKey[]) idl.getPublicKey();
-
- RSAPublicKey pubKeyResponse = (RSAPublicKey) x509Response.getPublicKey();
-
- boolean found = false;
- for (int i = 0; i < pubKeysIdentityLink.length; i++) {
- if (idl.getPublicKey()[i]
- instanceof java.security.interfaces.RSAPublicKey) {
- /* for (int j = 0;
- j < idl.getPublicKey()[i].getClass().getInterfaces().length;
- j++) {
- if (idl.getPublicKey()[i].getClass().getInterfaces()[j].getName()
- .equals("java.security.interfaces.RSAPublicKey")) {*/
- RSAPublicKey rsakey = (RSAPublicKey) pubKeysIdentityLink[i];
- if (rsakey.getModulus().equals(pubKeyResponse.getModulus())
- && rsakey.getPublicExponent().equals(
- pubKeyResponse.getPublicExponent()))
- found = true;
- }
-
- }
-
- if (!found)
- throw new ValidateException("validator.09", null);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
deleted file mode 100644
index f91222ac3..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
+++ /dev/null
@@ -1,678 +0,0 @@
-package at.gv.egovernment.moa.id.config;
-
-import iaik.pki.pathvalidation.ChainingModes;
-import iaik.utils.RFC2253NameParser;
-import iaik.utils.RFC2253NameParserException;
-
-import java.io.ByteArrayInputStream;
-import java.math.BigInteger;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.traversal.NodeIterator;
-
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
-import at.gv.egovernment.moa.id.config.proxy.OAConfiguration;
-import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter;
-import at.gv.egovernment.moa.id.data.IssuerAndSerial;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.BoolUtils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * A class that builds configuration data from a DOM based representation.
- *
- * @author Patrick Peck
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class ConfigurationBuilder {
-
- //
- // XPath namespace prefix shortcuts
- //
- /** an XPATH-Expression */
- private static final String CONF = Constants.MOA_ID_CONFIG_PREFIX + ":";
- /** an XPATH-Expression */
- private static final String DSIG = Constants.DSIG_PREFIX + ":";
-
- //
- // chaining mode constants appearing in the configuration file
- //
- /** an XPATH-Expression */
- private static final String CM_CHAINING = "chaining";
- /** an XPATH-Expression */
- private static final String CM_PKIX = "pkix";
- /** an XPATH-Expression */
- private static final String DEFAULT_ENCODING = "UTF-8";
-
- /**
- * Default online application configuration file name
- * (used when <code>/OnlineApplication/ProxyComponent@configFileURL</code> is <code>null</code>).
- */
- public static final String DEFAULT_OA_CONFIG_FILENAME = "MOAConfig.xml";
-
- //
- // XPath expressions to select certain parts of the configuration
- //
- /** an XPATH-Expression */
- private static final String ROOT = "/" + CONF + "MOA-IDConfiguration/";
- /** an XPATH-Expression */
- private static final String ROOTOA = "/" + CONF + "Configuration/";
- /** an XPATH-Expression */
- private static final String AUTH_BKU_XPATH =
- ROOT + CONF + "AuthComponent/" + CONF + "BKUSelection";
- /** an XPATH-Expression */
- private static final String AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH =
- ROOT + CONF + "AuthComponent/" + CONF + "SecurityLayer/" + CONF + "TransformsInfo/@filename";
- /** an XPATH-Expression */
- private static final String AUTH_MOA_SP_XPATH =
- ROOT + CONF + "AuthComponent/" + CONF + "MOA-SP";
- /** an XPATH-Expression */
- private static final String AUTH_MOA_SP_VERIFY_IDENTITY_TRUST_ID_XPATH =
- ROOT + CONF + "AuthComponent/" + CONF + "MOA-SP/" + CONF + "VerifyIdentityLink/" + CONF + "TrustProfileID";
- /** an XPATH-Expression */
- private static final String AUTH_MOA_SP_VERIFY_AUTH_TRUST_ID_XPATH =
- ROOT + CONF + "AuthComponent/" + CONF + "MOA-SP/" + CONF + "VerifyAuthBlock/" + CONF + "TrustProfileID";
- /** an XPATH-Expression */
- private static final String AUTH_MOA_SP_VERIFY_AUTH_VERIFY_ID_XPATH =
- ROOT + CONF + "AuthComponent/" + CONF + "MOA-SP/" + CONF + "VerifyAuthBlock/" + CONF + "VerifyTransformsInfoProfileID";
-
- /** an XPATH-Expression */
- private static final String AUTH_IDENTITY_LINK_X509SUBJECTNAME_XPATH =
- ROOT + CONF + "AuthComponent/" + CONF + "IdentityLinkSigners/" + CONF + "X509SubjectName";
- /** an XPATH-Expression */
- private static final String PROXY_AUTH_XPATH =
- ROOT + CONF + "ProxyComponent/" + CONF + "AuthComponent";
-
- /** an XPATH-Expression */
- private static final String OA_XPATH = ROOT + CONF + "OnlineApplication";
- /** an XPATH-Expression */
- private static final String OA_LOGIN_XPATH = ROOT + CONF + "OnlineApplication/@loginURL";
- /** an XPATH-Expression */
- private static final String OA_AUTH_COMPONENT_XPATH = CONF + "AuthComponent";
- /** an XPATH-Expression */
- private static final String OA_PROXY_COMPONENT_XPATH = CONF + "ProxyComponent";
- /** an XPATH-Expression */
- private static final String OA_PROXY_COMPONENT_ABSOLUTE_XPATH = ROOT + CONF + "OnlineApplication/" + CONF + "ProxyComponent";
- /** an XPATH-Expression */
- private static final String OA_PROXY_URL_XPATH = CONF + "ProxyComponent/@configFileURL";
- /** an XPATH-Expression */
- private static final String OA_PROXY_SESSION_TIMEOUT_XPATH = CONF + "ProxyComponent/@sessionTimeOut";
- /** an XPATH-Expression */
- private static final String OA_PROXY_LOGIN_PARA_XPATH = CONF + "ProxyComponent/@loginParameterResolverImpl";
- /** an XPATH-Expression */
- private static final String OA_PROXY_CONNECTION_BUILDER_XPATH = CONF + "ProxyComponent/@connectionBuilderImpl";
- /** an XPATH-Expression */
- private static final String CONNECTION_PARAMETER_URL_XPATH =
- CONF + "ConnectionParameter/@URL";
- /** an XPATH-Expression */
- private static final String CONNECTION_PARAMETER_ACCEPTED_CERTS_XPATH =
- CONF + "ConnectionParameter/" + CONF + "AcceptedServerCertificates";
- /** an XPATH-Expression */
- private static final String CONNECTION_PARAMETERN_KEYSTORE_XPATH =
- CONF + "ConnectionParameter/" + CONF + "ClientKeyStore";
- /** an XPATH-Expression */
- private static final String CONNECTION_PARAMETER_KEYSTORE_PASS_XPATH =
- CONNECTION_PARAMETERN_KEYSTORE_XPATH + "/@password";
- /** an XPATH-Expression */
- private static final String GENERIC_CONFIGURATION_XPATH =
- ROOT + CONF + "GenericConfiguration";
- /** an XPATH-Expression */
- private static final String OACONF_LOGIN_TYPE_XPATH =
- ROOTOA + CONF + "LoginType";
- /** an XPATH-Expression */
- private static final String OACONF_PARAM_AUTH_PARAMETER_XPATH =
- ROOTOA + CONF + "ParamAuth/" + CONF + "Parameter";
- /** an XPATH-Expression */
- private static final String OACONF_USER_ID_XPATH =
- ROOTOA + CONF + "BasicAuth/" + CONF + "UserID";
- /** an XPATH-Expression */
- private static final String OACONF_PASSWORD_XPATH =
- ROOTOA + CONF + "BasicAuth/" + CONF + "Password";
- /** an XPATH-Expression */
- private static final String OACONF_HEADER_AUTH_HEADER_XPATH =
- ROOTOA + CONF + "HeaderAuth/" + CONF + "Header";
- /** an XPATH-Expression */
- private static final String CHAINING_MODES_XPATH =
- ROOT + CONF + "ChainingModes";
- /** an XPATH-Expression */
- private static final String CHAINING_MODES_DEFAULT_XPATH =
- CHAINING_MODES_XPATH + "/@systemDefaultMode";
- /** an XPATH-Expression */
- private static final String TRUST_ANCHOR_XPATH =
- ROOT + CONF + "ChainingModes/" + CONF + "TrustAnchor";
- /** an XPATH-Expression */
- private static final String ISSUER_XPATH = DSIG + "X509IssuerName";
- /** an XPATH-Expression */
- private static final String SERIAL_XPATH = DSIG + "X509SerialNumber";
- /** an XPATH-Expression */
- private static final String TRUSTED_CA_CERTIFICATES_XPATH =
- ROOT + CONF + "TrustedCACertificates";
-
- /** The root element of the MOA-ID configuration */
- private Element configElem;
-
- /**
- * Creates a new <code>MOAConfigurationProvider</code>.
- *
- * @param configElem The root element of the MOA-ID configuration.
- */
- public ConfigurationBuilder(Element configElem) {
- this.configElem = configElem;
- }
-
- /**
- * Returns the root element of the MOA-ID configuration.
- *
- * @return The root element of the MOA-ID configuration.
- */
- public Element getConfigElem() {
- return configElem;
- }
-
- /**
- * Build a ConnectionParameter object containing all information
- * of the moa-sp element in the authentication component
- * @return ConnectionParameter of the authentication component moa-sp element
- */
- public ConnectionParameter buildAuthBKUConnectionParameter() {
-
- Element authBKU = (Element) XPathUtils.selectSingleNode(getConfigElem(), AUTH_BKU_XPATH);
- if (authBKU==null) return null;
- return buildConnectionParameter(authBKU);
- }
-
- /**
- * Method buildAuthBKUSelectionType.
- *
- * Build a string with the configuration value of BKUSelectionAlternative
- *
- * @return String
- */
- public String buildAuthBKUSelectionType() {
-
- Element authBKU = (Element) XPathUtils.selectSingleNode(getConfigElem(), AUTH_BKU_XPATH);
- if (authBKU==null) return null;
- return (authBKU).getAttribute("BKUSelectionAlternative");
- }
-
- /**
- * Build a string array with all filenames leading
- * to the Transforms Information for the Security Layer
- * @return String[] of filenames to the Security Layer Transforms Information
- */
- public String[] buildTransformsInfoFileNames() {
-
- List transformsInfoFileNames = new ArrayList();
- NodeIterator tiIter =
- XPathUtils.selectNodeIterator(
- getConfigElem(),
- AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH);
- Attr tiElem;
-
- while ((tiElem = (Attr) tiIter.nextNode()) != null) {
-
- String tiFileName = tiElem.getNodeValue();
- transformsInfoFileNames.add(tiFileName);
- }
- String[] result = new String[transformsInfoFileNames.size()];
- transformsInfoFileNames.toArray(result);
-
- return result;
- }
-
- /**
- * Build a ConnectionParameter bean containing all information
- * of the authentication component moa-sp element
- * @return ConnectionParameter of the authentication component moa-sp element
- */
- public ConnectionParameter buildMoaSpConnectionParameter() {
-
- Element connectionParameter = (Element) XPathUtils.selectSingleNode(getConfigElem(), AUTH_MOA_SP_XPATH);
- if (connectionParameter==null) return null;
- return buildConnectionParameter(connectionParameter);
- }
-
- /**
- * Return a string with a url-reference to the VerifyIdentityLink trust
- * profile id within the moa-sp part of the authentication component
- * @return String with a url-reference to the VerifyIdentityLink trust profile ID
- */
- public String getMoaSpIdentityLinkTrustProfileID() {
- return XPathUtils.getElementValue(
- getConfigElem(),
- AUTH_MOA_SP_VERIFY_IDENTITY_TRUST_ID_XPATH,
- "");
- }
- /**
- * Return a string representation of an URL pointing to trusted CA Certificates
- * @return String representation of an URL pointing to trusted CA Certificates
- */
- public String getTrustedCACertificates() {
- return XPathUtils.getElementValue(
- getConfigElem(),
- TRUSTED_CA_CERTIFICATES_XPATH,null);
- }
-
- /**
- * Return a string with a url-reference to the VerifyAuthBlock trust
- * profile id within the moa-sp part of the authentication component
- * @return String with a url-reference to the VerifyAuthBlock trust profile ID
- */
- public String getMoaSpAuthBlockTrustProfileID() {
- return XPathUtils.getElementValue(
- getConfigElem(),
- AUTH_MOA_SP_VERIFY_AUTH_TRUST_ID_XPATH,
- "");
- }
- /**
- * Build a string array with references to all verify transform info
- * IDs within the moa-sp part of the authentication component
- * @return A string array containing all urls to the
- * verify transform info IDs
- */
- public String[] buildMoaSpAuthBlockVerifyTransformsInfoIDs() {
-
- List verifyTransformsInfoIDs = new ArrayList();
- NodeIterator vtIter =
- XPathUtils.selectNodeIterator(
- getConfigElem(),
- AUTH_MOA_SP_VERIFY_AUTH_VERIFY_ID_XPATH);
- Element vtElem;
-
- while ((vtElem = (Element) vtIter.nextNode()) != null) {
-
- String vtInfoIDs = DOMUtils.getText(vtElem);
- verifyTransformsInfoIDs.add(vtInfoIDs);
- }
- String[] result = new String[verifyTransformsInfoIDs.size()];
- verifyTransformsInfoIDs.toArray(result);
-
- return result;
- }
-
- /**
- * Return a string array containing all X509 Subject Names
- * of the Identity Link Signers
- * @return String with a url-reference to the VerifyAuthBlock trust profile ID
- */
- public String[] getIdentityLink_X509SubjectNames() {
-
- List x509SubjectNameList = new ArrayList();
- NodeIterator x509Iter =
- XPathUtils.selectNodeIterator(
- getConfigElem(),
- AUTH_IDENTITY_LINK_X509SUBJECTNAME_XPATH);
- Element x509Elem;
-
- while ((x509Elem = (Element) x509Iter.nextNode()) != null) {
-
- String vtInfoIDs = DOMUtils.getText(x509Elem);
- x509SubjectNameList.add(vtInfoIDs);
- }
- String[] result = new String[x509SubjectNameList.size()];
- x509SubjectNameList.toArray(result);
-
- return result;
- }
-
- /**
- * Build an array of the OnlineApplication Parameters containing information
- * about the authentication component
- * @return An OAProxyParameter array containing beans
- * with all relevant information for the authentication component of the online
- * application
- */
- public OAAuthParameter[] buildOnlineApplicationAuthParameters() {
-
- List OA_set = new ArrayList();
- NodeList OAIter = XPathUtils.selectNodeList(getConfigElem(), OA_XPATH);
-
- for (int i = 0; i < OAIter.getLength(); i++) {
- Element oAElem = (Element) OAIter.item(i);
- Element authComponent =
- (Element) XPathUtils.selectSingleNode(oAElem, OA_AUTH_COMPONENT_XPATH);
-
- OAAuthParameter oap = new OAAuthParameter();
- oap.setPublicURLPrefix(oAElem.getAttribute("publicURLPrefix"));
- //Check if there is an Auth-Block to read from configuration
- if (authComponent!=null)
- {
- oap.setProvideZMRZahl(BoolUtils.valueOf(authComponent.getAttribute("provideZMRZahl")));
- oap.setProvideAuthBlock(BoolUtils.valueOf(authComponent.getAttribute("provideAUTHBlock")));
- oap.setProvideIdentityLink(BoolUtils.valueOf(authComponent.getAttribute("provideIdentityLink")));
- }
- OA_set.add(oap);
- }
- OAAuthParameter[] result =
- new OAAuthParameter[OA_set.size()];
- OA_set.toArray(result);
-
- return result;
-
- }
-
- /**
- * Build a bean containing all information about the ProxyComponent
- * @return The ConnectionParameter for the Proxy Component
- */
- public ConnectionParameter buildAuthComponentConnectionParameter()
- {
-
- Element connectionParameter = (Element) XPathUtils.selectSingleNode(getConfigElem(), PROXY_AUTH_XPATH);
- if (connectionParameter==null) return null;
- return buildConnectionParameter(connectionParameter);
-
- }
- /**
- * Method buildConnectionParameter: internal Method for creating a
- * ConnectionParameter object with all data found in the incoming element
- * @param root: this Element contains the ConnectionParameter
- * @return ConnectionParameter
- */
- protected ConnectionParameter buildConnectionParameter(Element root)
- {
- ConnectionParameter result = new ConnectionParameter();
- result.setAcceptedServerCertificates(
- XPathUtils.getElementValue(root,CONNECTION_PARAMETER_ACCEPTED_CERTS_XPATH,null));
- result.setUrl(
- XPathUtils.getAttributeValue(root, CONNECTION_PARAMETER_URL_XPATH, ""));
- result.setClientKeyStore(
- XPathUtils.getElementValue(root,CONNECTION_PARAMETERN_KEYSTORE_XPATH,null));
- result.setClientKeyStorePassword(
- XPathUtils.getAttributeValue(root,CONNECTION_PARAMETER_KEYSTORE_PASS_XPATH,""));
-
- if ((result.getAcceptedServerCertificates()==null)
- && (result.getUrl()=="")
- && (result.getClientKeyStore()==null)
- && (result.getClientKeyStorePassword()==""))
- return null;
-
- return result;
- }
-
- /**
- * Build an array of OnlineApplication Parameter Beans containing information
- * about the proxy component
- * @return An OAProxyParameter array containing beans
- * with all relevant information for the proxy component of the online
- * application
- */
- public OAProxyParameter[] buildOnlineApplicationProxyParameters() throws ConfigurationException{
-
- List oA_list = new ArrayList();
- NodeList OAIter = XPathUtils.selectNodeList(getConfigElem(), OA_XPATH);
-
- for (int i = 0; i < OAIter.getLength(); i++) {
- Element oAElem = (Element) OAIter.item(i);
- OAProxyParameter oap = new OAProxyParameter();
-
- oap.setPublicURLPrefix(oAElem.getAttribute("publicURLPrefix"));
- Element proxyComponentElem = (Element) XPathUtils.selectSingleNode(oAElem,OA_PROXY_COMPONENT_XPATH);
- if (proxyComponentElem != null) {
- oap.setConfigFileURL(XPathUtils.getAttributeValue(oAElem, OA_PROXY_URL_XPATH, null));
- // default session time out: 3600 sec = 1 h
- oap.setSessionTimeOut(new Integer(XPathUtils.getAttributeValue(oAElem,OA_PROXY_SESSION_TIMEOUT_XPATH,"3600")).intValue());
- oap.setLoginParameterResolverImpl(XPathUtils.getAttributeValue(oAElem, OA_PROXY_LOGIN_PARA_XPATH, null));
- oap.setConnectionBuilderImpl(XPathUtils.getAttributeValue(oAElem,OA_PROXY_CONNECTION_BUILDER_XPATH, null));
-
- ConnectionParameter conPara = buildConnectionParameter(proxyComponentElem);
- oap.setConnectionParameter(conPara);
-
- OAConfiguration oaConf = buildOAConfiguration(getOAConfigElement(oap));
- oap.setOaConfiguration(oaConf);
-
- oA_list.add(oap);
- }
- }
- OAProxyParameter[] result =
- new OAProxyParameter[oA_list.size()];
- oA_list.toArray(result);
-
- return result;
-
- }
-
- /**
- * Build the mapping of generic configuration properties.
- *
- * @return a {@link Map} of generic configuration properties (a name to value
- * mapping) from the configuration.
- */
- public Map buildGenericConfiguration() {
-
- Map genericConfiguration = new HashMap();
- NodeIterator gcIter =
- XPathUtils.selectNodeIterator(
- getConfigElem(),
- GENERIC_CONFIGURATION_XPATH);
- Element gcElem;
-
- while ((gcElem = (Element) gcIter.nextNode()) != null) {
- String gcName = gcElem.getAttribute("name");
- String gcValue = gcElem.getAttribute("value");
-
- genericConfiguration.put(gcName, gcValue);
- }
-
- return genericConfiguration;
- }
- /**
- * Method buildOAConfiguration.
- *
- * Build an {@link OAConfiguration} Object from the given configuration DOM element
- *
- * @param root
- * @return OAConfiguration
- * @throws ConfigurationException
- */
- public OAConfiguration buildOAConfiguration(Element root) throws ConfigurationException{
-
- OAConfiguration oaConfiguration = new OAConfiguration();
-
- //The LoginType hast to be "stateless" or "stateful" to be valid
- oaConfiguration.setLoginType(
- XPathUtils.getElementValue(root, OACONF_LOGIN_TYPE_XPATH, null));
-
- //Try to build the Parameter Auth Parameters
- NodeIterator paramAuthIter =
- XPathUtils.selectNodeIterator(
- root,
- OACONF_PARAM_AUTH_PARAMETER_XPATH);
- Element paramAuthElem;
- HashMap paramAuthMap = new HashMap();
- while ((paramAuthElem = (Element) paramAuthIter.nextNode()) != null) {
- String name = XPathUtils.getAttributeValue(paramAuthElem, "@Name", null);
- String value = XPathUtils.getAttributeValue(paramAuthElem, "@Value", null);
- if (paramAuthMap.containsKey(name))
- throw new ConfigurationException("config.06", new Object[]{"Doppelter Wert für Parameter per HeaderAuthentication"});
- paramAuthMap.put(name, value);
- }
- oaConfiguration.setParamAuthMapping(paramAuthMap);
- // Try to build the BasicAuthParameters
- oaConfiguration.setBasicAuthUserIDMapping(
- XPathUtils.getElementValue(root, OACONF_USER_ID_XPATH, null));
- oaConfiguration.setBasicAuthPasswordMapping(
- XPathUtils.getElementValue(root, OACONF_PASSWORD_XPATH, null));
-
- //Try to build the Parameter Auth Parameters
- NodeIterator headerAuthIter = XPathUtils.selectNodeIterator(root,OACONF_HEADER_AUTH_HEADER_XPATH);
-
- Element headerAuthElem;
- HashMap headerAuthMap = new HashMap();
- while ((headerAuthElem = (Element) headerAuthIter.nextNode()) != null) {
- String name =
- XPathUtils.getAttributeValue(headerAuthElem, "@Name", null);
- String value =
- XPathUtils.getAttributeValue(headerAuthElem, "@Value", null);
- // Contains Key (Neue Config-Exception: doppelte werte)
- if (headerAuthMap.containsKey(name))
- throw new ConfigurationException("config.06", new Object[]{"Doppelter Wert für Parameter per HeaderAuthentication"});
- headerAuthMap.put(name, value);
- }
- oaConfiguration.setHeaderAuthMapping(headerAuthMap);
-
- if (paramAuthMap.size() == 0) {
- if (oaConfiguration.getBasicAuthUserIDMapping() == null) {
- oaConfiguration.setAuthType(OAConfiguration.HEADER_AUTH);
- }
- else
- oaConfiguration.setAuthType(OAConfiguration.BASIC_AUTH);
- }
- else
- oaConfiguration.setAuthType(OAConfiguration.PARAM_AUTH);
-
- return oaConfiguration;
- }
-
- /**
- * Reads the configuration file of the online application, and creates a DOM tree from it.
- * If <code>/OnlineApplication/ProxyComponent@configFileURL</code> is not given,
- * uses default configuration file location.
- *
- * @param oap configuration data of online application, meant for use by MOA-ID-PROXY
- * @return Element DOM tree root element
- * @throws ConfigurationException on any exception thrown
- */
- private Element getOAConfigElement(OAProxyParameter oap) throws ConfigurationException
- {
- try {
- String configFileURL = oap.getConfigFileURL();
- if (configFileURL == null) {
- // use default config file URL, when config file URL is not given
- configFileURL = oap.getConnectionParameter().getUrl();
- if (configFileURL.charAt(configFileURL.length() - 1) != '/')
- configFileURL += "/";
- configFileURL += DEFAULT_OA_CONFIG_FILENAME;
- }
- Logger.info("Loading MOA-OA configuration " + configFileURL);
- Element configElem = DOMUtils.parseXmlValidating(
- new ByteArrayInputStream(FileUtils.readURL(configFileURL)));
- return configElem;
- }
- catch (Throwable t) {
- throw new ConfigurationException("config.03", new Object[] {"OAConfiguration"} , t);
- }
- }
-
- /**
- * Returns the default chaining mode from the configuration.
- *
- * @return The default chaining mode.
- */
- public String getDefaultChainingMode() {
- String defaultChaining =
- XPathUtils.getAttributeValue(
- getConfigElem(),
- CHAINING_MODES_DEFAULT_XPATH,
- CM_CHAINING);
-
- return translateChainingMode(defaultChaining);
-
- }
- /**
- * Build the chaining modes for all configured trust anchors.
- *
- * @return The mapping from trust anchors to chaining modes.
- */
- public Map buildChainingModes() {
- Map chainingModes = new HashMap();
- NodeIterator trustIter =
- XPathUtils.selectNodeIterator(getConfigElem(), TRUST_ANCHOR_XPATH);
- Element trustAnchorElem;
-
- while ((trustAnchorElem = (Element) trustIter.nextNode()) != null) {
- IssuerAndSerial issuerAndSerial = buildIssuerAndSerial(trustAnchorElem);
- String mode = trustAnchorElem.getAttribute("mode");
-
- if (issuerAndSerial != null) {
- chainingModes.put(issuerAndSerial, translateChainingMode(mode));
- }
- }
-
- return chainingModes;
- }
-
- /**
- * Build an <code>IssuerAndSerial</code> from the DOM representation.
- *
- * @param root The root element (being of type <code>dsig:
- * X509IssuerSerialType</code>.
- * @return The issuer and serial number contained in the <code>root</code>
- * element or <code>null</code> if could not be built for any reason.
- */
- private IssuerAndSerial buildIssuerAndSerial(Element root) {
- String issuer = XPathUtils.getElementValue(root, ISSUER_XPATH, null);
- String serial = XPathUtils.getElementValue(root, SERIAL_XPATH, null);
-
- if (issuer != null && serial != null) {
- try {
- RFC2253NameParser nameParser = new RFC2253NameParser(issuer);
- Principal issuerDN = nameParser.parse();
-
- return new IssuerAndSerial(issuerDN, new BigInteger(serial));
- } catch (RFC2253NameParserException e) {
- warn("config.09", new Object[] { issuer, serial }, e);
- return null;
- } catch (NumberFormatException e) {
- warn("config.09", new Object[] { issuer, serial }, e);
- return null;
- }
- }
- return null;
- }
-
- /**
- * Translate the chaining mode from the configuration file to one used in the
- * IAIK MOA API.
- *
- * @param chainingMode The chaining mode from the configuration.
- * @return The chaining mode as provided by the <code>ChainingModes</code>
- * interface.
- * @see iaik.pki.pathvalidation.ChainingModes
- */
- private String translateChainingMode(String chainingMode) {
- if (chainingMode.equals(CM_CHAINING)) {
- return ChainingModes.CHAIN_MODE;
- } else if (chainingMode.equals(CM_PKIX)) {
- return ChainingModes.PKIX_MODE;
- } else {
- return ChainingModes.CHAIN_MODE;
- }
- }
-
- /**
- * Method warn.
- * @param messageId to identify a country-specific message
- * @param parameters for the logger
- */
- //
- // various utility methods
- //
-
- private static void warn(String messageId, Object[] parameters) {
- Logger.warn(MOAIDMessageProvider.getInstance().getMessage(messageId, parameters));
- }
-
- /**
- * Method warn.
- * @param messageId to identify a country-specific message
- * @param args for the logger
- * @param t as throwabl
- */
- private static void warn(String messageId, Object[] args, Throwable t) {
- Logger.warn(MOAIDMessageProvider.getInstance().getMessage(messageId, args), t);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationException.java b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationException.java
deleted file mode 100644
index 2ebec0398..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package at.gv.egovernment.moa.id.config;
-
-import at.gv.egovernment.moa.id.MOAIDException;
-
-/**
- * Exception signalling an error in the configuration.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ConfigurationException extends MOAIDException {
-
- /**
- * Create a <code>MOAConfigurationException</code>.
- */
- public ConfigurationException(String messageId, Object[] parameters) {
- super(messageId, parameters);
- }
-
- /**
- * Create a <code>MOAConfigurationException</code>.
- */
- public ConfigurationException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
-
- super(messageId, parameters, wrapped);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
deleted file mode 100644
index 5d523ba62..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package at.gv.egovernment.moa.id.config;
-
-import java.math.BigInteger;
-import java.security.Principal;
-import java.security.cert.X509Certificate;
-import java.util.Map;
-
-import at.gv.egovernment.moa.id.data.IssuerAndSerial;
-
-/**
- * Base class for <code>AuthConfigurationProvider</code> and <code>ProxyConfigurationProvider</code>,
- * providing functions common to both of them.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ConfigurationProvider {
-
- /**
- * Constructor
- */
- public ConfigurationProvider() {
- super();
- }
-
- /**
- * The name of the system property which contains the file name of the
- * configuration file.
- */
- public static final String CONFIG_PROPERTY_NAME =
- "moa.id.configuration";
-
- /**
- * The name of the generic configuration property giving the certstore directory path.
- */
- public static final String DIRECTORY_CERTSTORE_PARAMETER_PROPERTY =
- "DirectoryCertStoreParameters.RootDir";
-
- /**
- * A <code>Map</code> which contains generic configuration information. Maps a
- * configuration name (a <code>String</code>) to a configuration value (also a
- * <code>String</code>).
- */
- protected Map genericConfiguration;
-
- /** The default chaining mode. */
- protected String defaultChainingMode;
-
- /**
- * A <code>Map</code> which contains the <code>IssuerAndSerial</code> to
- * chaining mode (a <code>String</code>) mapping.
- */
- protected Map chainingModes;
-
- /**
- * the URL for the trusted CA Certificates
- */
- protected String trustedCACertificates;
-
- /**
- * Returns the mapping of generic configuration properties.
- *
- * @return The mapping of generic configuration properties (a name to value
- * mapping) from the configuration.
- */
- public Map getGenericConfiguration() {
- return genericConfiguration;
- }
-
- /**
- * Returns the value of a parameter from the generic configuration section.
- *
- * @return the parameter value; <code>null</code> if no such parameter
- */
- public String getGenericConfigurationParameter(String parameter) {
- if (! genericConfiguration.containsKey(parameter))
- return null;
- return (String)genericConfiguration.get(parameter);
- }
-
- /**
- * Return the chaining mode for a given trust anchor.
- *
- * @param trustAnchor The trust anchor for which the chaining mode should be
- * returned.
- * @return The chaining mode for the given trust anchor. If the trust anchor
- * has not been configured separately, the system default will be returned.
- */
- public String getChainingMode(X509Certificate trustAnchor) {
- Principal issuer = trustAnchor.getIssuerDN();
- BigInteger serial = trustAnchor.getSerialNumber();
- IssuerAndSerial issuerAndSerial = new IssuerAndSerial(issuer, serial);
-
- String mode = (String) chainingModes.get(issuerAndSerial);
- return mode != null ? mode : defaultChainingMode;
- }
-
- /**
- * Returns the trustedCACertificates.
- * @return String
- */
- public String getTrustedCACertificates() {
- return trustedCACertificates;
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/ConnectionParameter.java b/id.server/src/at/gv/egovernment/moa/id/config/ConnectionParameter.java
deleted file mode 100644
index 30b09cfe0..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/ConnectionParameter.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package at.gv.egovernment.moa.id.config;
-
-/**
- * This bean class is used to store data for various connectionParameter
- * within the MOA-ID configuration
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class ConnectionParameter {
-
- /**
- * Server URL
- */
- private String url;
- /**
- * File URL for a directory containing PKCS#12 server SSL certificates.
- * From these certificates, a X509 trust store will be assembled for use
- * by a JSSE <code>TrustManager</code>.
- * This field will only be used in case of an HTTPS URL.
- */
- private String acceptedServerCertificates;
- /**
- * File URL of a X509 key store containing the private key to be used
- * for an HTTPS connection when the server requires client authentication.
- * This field will only be used in case of an HTTPS URL.
- */
- private String clientKeyStore;
- /**
- * Password protecting the client key store.
- */
- private String clientKeyStorePassword;
-
- /**
- * Checks whether the URL scheme is <code>"https"</code>.
- * @return true in case of an URL starting with <code>"https"</code>
- */
- public boolean isHTTPSURL() {
- return getUrl().indexOf("https") == 0;
- }
-
- /**
- * Returns the url.
- * @return String
- */
- public String getUrl() {
- return url;
- }
-
- /**
- * Returns the acceptedServerCertificates.
- * @return String
- */
- public String getAcceptedServerCertificates() {
- return acceptedServerCertificates;
- }
-
- /**
- * Sets the acceptedServerCertificates.
- * @param acceptedServerCertificates The acceptedServerCertificates to set
- */
- public void setAcceptedServerCertificates(String acceptedServerCertificates) {
- this.acceptedServerCertificates = acceptedServerCertificates;
- }
-
- /**
- * Sets the url.
- * @param url The url to set
- */
- public void setUrl(String url) {
- this.url = url;
- }
-
- /**
- * Returns the clientKeyStore.
- * @return String
- */
- public String getClientKeyStore() {
- return clientKeyStore;
- }
-
- /**
- * Returns the clientKeyStorePassword.
- * @return String
- */
- public String getClientKeyStorePassword() {
- return clientKeyStorePassword;
- }
-
- /**
- * Sets the clientKeyStore.
- * @param clientKeyStore The clientKeyStore to set
- */
- public void setClientKeyStore(String clientKeyStore) {
- this.clientKeyStore = clientKeyStore;
- }
-
- /**
- * Sets the clientKeyStorePassword.
- * @param clientKeyStorePassword The clientKeyStorePassword to set
- */
- public void setClientKeyStorePassword(String clientKeyStorePassword) {
- this.clientKeyStorePassword = clientKeyStorePassword;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
deleted file mode 100644
index e3c869d53..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ /dev/null
@@ -1,341 +0,0 @@
-package at.gv.egovernment.moa.id.config.auth;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.config.ConfigurationBuilder;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.FileUtils;
-
-/**
- * A class providing access to the Auth Part of the MOA-ID configuration data.
- *
- * <p>Configuration data is read from an XML file, whose location is given by
- * the <code>moa.id.configuration</code> system property.</p>
- * <p>This class implements the Singleton pattern. The <code>reload()</code>
- * method can be used to update the configuration data. Therefore, it is not
- * guaranteed that consecutive calls to <code>getInstance()</code> will return
- * the same <code>AuthConfigurationProvider</code> all the time. During the
- * processing of a web service request, the current
- * <code>TransactionContext</code> should be used to obtain the
- * <code>AuthConfigurationProvider</code> local to that request.</p>
- *
- * @author Patrick Peck
- * @author Stefan Knirsch
- *
- * @version $Id$
- */
-public class AuthConfigurationProvider extends ConfigurationProvider {
-
- /** DEFAULT_ENCODING is "UTF-8" */
- private static final String DEFAULT_ENCODING="UTF-8";
- /**
- * The name of the generic configuration property giving the authentication session time out.
- */
- public static final String AUTH_SESSION_TIMEOUT_PROPERTY =
- "AuthenticationSession.TimeOut";
- /**
- * The name of the generic configuration property giving the authentication data time out.
- */
- public static final String AUTH_DATA_TIMEOUT_PROPERTY =
- "AuthenticationData.TimeOut";
-
- /**
- * BKUSelectionType HTMLComplete, according to schema type <code>BKUSelectionType</code>
- */
- public static final String BKU_SELECTION_TYPE_HTMLCOMPLETE =
- "HTMLComplete";
-
- /**
- * BKUSelectionType HTMLSelect, according to schema type <code>BKUSelectionType</code>
- */
- public static final String BKU_SELECTION_TYPE_HTMLSELECT =
- "HTMLSelect";
-
- /** Singleton instance. <code>null</code>, if none has been created. */
- private static AuthConfigurationProvider instance;
-
- //
- // configuration data
- //
-
- /**
- * configuration files containing transformations for rendering in the
- * secure viewer of the security layer implementation;
- * multiple files can be given for different mime types
- */
- private String[] transformsInfoFileNames;
- /**
- * transformations for rendering in the secure viewer of the security layer implementation,
- * read from {@link transformsInfoFileNames};
- * multiple transformation can be given for different mime types
- */
- private String[] transformsInfos;
- /**
- * parameters for connection to MOA SP component
- */
- private ConnectionParameter moaSpConnectionParameter;
- /**
- * trust profile ID to be used for verifying the identity link signature via MOA ID SP
- */
- private String moaSpIdentityLinkTrustProfileID;
- /**
- * trust profile ID to be used for verifying the AUTH block signature via MOA ID SP
- */
- private String moaSpAuthBlockTrustProfileID;
- /**
- * transformations to be used for verifying the AUTH block signature via MOA ID SP
- */
- private String[] moaSpAuthBlockVerifyTransformsInfoIDs;
- /**
- * X509 SubjectNames which will be trusted
- */
- private String[] identityLinkX509SubjectNames;
-
- /**
- * configuration parameters for online applications
- */
- private OAAuthParameter[] onlineApplicationAuthParameters;
- /**
- * the Selection Type of the bku Selection Element
- */
- private String bKUSelectionType;
- /**
- * is the bku Selection Element present?
- */
- private boolean bKUSelectable;
- /**
- * the bku Selection Connection Parameters
- */
- private ConnectionParameter bKUConnectionParameter;
- /**
- * Return the single instance of configuration data.
- *
- * @return AuthConfigurationProvider The current configuration data.
- * @throws ConfigurationException
- */
- public static synchronized AuthConfigurationProvider getInstance()
- throws ConfigurationException {
-
- if (instance == null) {
- reload();
- }
- return instance;
- }
-
- /**
- * Reload the configuration data and set it if successful.
- *
- * @return AuthConfigurationProvider The loaded configuration data.
- * @throws ConfigurationException Failure to load the configuration data.
- */
- public static synchronized AuthConfigurationProvider reload()
- throws ConfigurationException {
- String fileName = System.getProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME);
- if (fileName == null) {
- throw new ConfigurationException("config.01", null);
- }
- Logger.info("Loading MOA-ID-AUTH configuration " + fileName);
-
- instance = new AuthConfigurationProvider(fileName);
- return instance;
- }
-
- /**
- * Constructor for AuthConfigurationProvider.
- * @param fileName
- * @throws ConfigurationException
- */
- public AuthConfigurationProvider(String fileName)
- throws ConfigurationException {
-
- load(fileName);
- }
-
- /**
- * Load the configuration data from XML file with the given name and build
- * the internal data structures representing the MOA ID configuration.
- *
- * @param fileName The name of the XML file to load.
- * @throws ConfigurationException The MOA configuration could not be
- * read/built.
- */
- private void load(String fileName) throws ConfigurationException {
- InputStream stream = null;
- Element configElem;
- ConfigurationBuilder builder;
-
- try {
- // load the main config file
- stream = new BufferedInputStream(new FileInputStream(fileName));
- configElem = DOMUtils.parseXmlValidating(stream);
- } catch (Throwable t) {
- throw new ConfigurationException("config.03", null, t);
- }
- finally {
- try {
- if (stream != null) {
- stream.close();
- }
- } catch (IOException e) {
- }
- }
- try {
- // build the internal datastructures
- builder = new ConfigurationBuilder(configElem);
- bKUConnectionParameter = builder.buildAuthBKUConnectionParameter();
- bKUSelectable = (bKUConnectionParameter!=null);
- bKUSelectionType = builder.buildAuthBKUSelectionType();
- genericConfiguration = builder.buildGenericConfiguration();
- transformsInfoFileNames = builder.buildTransformsInfoFileNames();
- loadTransformsInfos();
- moaSpConnectionParameter = builder.buildMoaSpConnectionParameter();
- moaSpIdentityLinkTrustProfileID = builder.getMoaSpIdentityLinkTrustProfileID();
- moaSpAuthBlockTrustProfileID = builder.getMoaSpAuthBlockTrustProfileID();
- moaSpAuthBlockVerifyTransformsInfoIDs = builder.buildMoaSpAuthBlockVerifyTransformsInfoIDs();
- onlineApplicationAuthParameters = builder.buildOnlineApplicationAuthParameters();
- identityLinkX509SubjectNames = builder.getIdentityLink_X509SubjectNames();
- defaultChainingMode = builder.getDefaultChainingMode();
- chainingModes = builder.buildChainingModes();
- trustedCACertificates = builder.getTrustedCACertificates(); }
- catch (Throwable t) {
- throw new ConfigurationException("config.02", null, t);
- }
- }
-
- /**
- * Loads the <code>transformsInfos</code> from files.
- * @throws Exception on any exception thrown
- */
- private void loadTransformsInfos() throws Exception {
- transformsInfos = new String[transformsInfoFileNames.length];
- for (int i = 0; i < transformsInfoFileNames.length; i++) {
- String fileURL = transformsInfoFileNames[i];
- String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
- transformsInfos[i] = transformsInfo;
- }
- }
- /**
- * Return a string array with all filenames leading
- * to the Transforms Information for the Security Layer
- * @return String[] of filenames to the Security Layer Transforms Information
- */
- public String[] getTransformsInfoFileNames() {
- return transformsInfoFileNames;
- }
-
- /**
- * Build an array of the OnlineApplication Parameters containing information
- * about the authentication component
- * @return An OAProxyParameter array containing beans
- * with all relevant information for theauthentication component of the online
- * application
- */
- public OAAuthParameter[] getOnlineApplicationParameters() {
- return onlineApplicationAuthParameters;
- }
-
- /**
- * Provides configuration information regarding the online application behind
- * the given URL, relevant to the MOA-ID Auth component.
- *
- * @param oaURL URL requested for an online application
- * @return an <code>OAAuthParameter</code>, or <code>null</code>
- * if none is applicable
- */
- public OAAuthParameter getOnlineApplicationParameter(String oaURL) {
- OAAuthParameter[] oaParams = getOnlineApplicationParameters();
- for (int i = 0; i < oaParams.length; i++) {
- OAAuthParameter oaParam = oaParams[i];
- if (oaURL.indexOf(oaParam.getPublicURLPrefix()) == 0)
- return oaParam;
- }
- return null;
- }
-
- /**
- * Return a string with a url-reference to the VerifyAuthBlock trust
- * profile id within the moa-sp part of the authentication component
- *
- * @return String with a url-reference to the VerifyAuthBlock trust profile ID
- */
- public String getMoaSpAuthBlockTrustProfileID() {
- return moaSpAuthBlockTrustProfileID;
- }
-
- /**
- * Return a string array with references to all verify transform info
- * IDs within the moa-sp part of the authentication component
- * @return A string array containing all urls to the
- * verify transform info IDs
- */
- public String[] getMoaSpAuthBlockVerifyTransformsInfoIDs() {
- return moaSpAuthBlockVerifyTransformsInfoIDs;
- }
-
- /**
- * Return a ConnectionParameter bean containing all information
- * of the authentication component moa-sp element
- * @return ConnectionParameter of the authentication component moa-sp element
- */
- public ConnectionParameter getMoaSpConnectionParameter() {
- return moaSpConnectionParameter;
- }
-
- /**
- * Return a string with a url-reference to the VerifyIdentityLink trust
- * profile id within the moa-sp part of the authentication component
- * @return String with a url-reference to the VerifyIdentityLink trust profile ID
- */
- public String getMoaSpIdentityLinkTrustProfileID() {
- return moaSpIdentityLinkTrustProfileID;
- }
- /**
- * Returns the transformsInfos.
- * @return String[]
- */
- public String[] getTransformsInfos() {
- return transformsInfos;
- }
-
- /**
- * Returns the identityLinkX509SubjectNames.
- * @return String[]
- */
- public String[] getIdentityLinkX509SubjectNames() {
- return identityLinkX509SubjectNames;
- }
-
- /**
- * Returns the bKUConnectionParameter.
- * @return ConnectionParameter
- */
- public ConnectionParameter getBKUConnectionParameter() {
- return bKUConnectionParameter;
- }
-
- /**
- * Returns the bKUSelectable.
- * @return boolean
- */
- public boolean isBKUSelectable() {
- return bKUSelectable;
- }
-
- /**
- * Returns the bKUSelectionType.
- * @return String
- */
- public String getBKUSelectionType() {
- return bKUSelectionType;
- }
-
-} \ No newline at end of file
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
deleted file mode 100644
index 9ee1ec606..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package at.gv.egovernment.moa.id.config.auth;
-
-/**
- * Configuration parameters belonging to an online application,
- * to use with the MOA ID Auth component.
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class OAAuthParameter {
-
- /**
- * public URL prefix of the online application
- */
- private String publicURLPrefix;
- /**
- * determines whether "ZMR-Zahl" is to be included in the authentication data
- */
- private boolean provideZMRZahl;
- /**
- * determines whether AUTH block is to be included in the authentication data
- */
- private boolean provideAuthBlock;
- /**
- * determines whether identity link is to be included in the authentication data
- */
- private boolean provideIdentityLink;
-
- /**
- * Returns the provideAuthBlock.
- * @return String
- */
- public boolean getProvideAuthBlock() {
- return provideAuthBlock;
- }
-
- /**
- * Returns the provideIdentityLink.
- * @return String
- */
- public boolean getProvideIdentityLink() {
- return provideIdentityLink;
- }
-
- /**
- * Returns the provideZMRZahl.
- * @return String
- */
- public boolean getProvideZMRZahl() {
- return provideZMRZahl;
- }
-
- /**
- * Returns the publicURLPrefix.
- * @return String
- */
- public String getPublicURLPrefix() {
- return publicURLPrefix;
- }
-
- /**
- * Sets the provideAuthBlock.
- * @param provideAuthBlock The provideAuthBlock to set
- */
- public void setProvideAuthBlock(boolean provideAuthBlock) {
- this.provideAuthBlock = provideAuthBlock;
- }
-
- /**
- * Sets the provideIdentityLink.
- * @param provideIdentityLink The provideIdentityLink to set
- */
- public void setProvideIdentityLink(boolean provideIdentityLink) {
- this.provideIdentityLink = provideIdentityLink;
- }
-
- /**
- * Sets the provideZMRZahl.
- * @param provideZMRZahl The provideZMRZahl to set
- */
- public void setProvideZMRZahl(boolean provideZMRZahl) {
- this.provideZMRZahl = provideZMRZahl;
- }
-
- /**
- * Sets the publicURLPrefix.
- * @param publicURLPrefix The publicURLPrefix to set
- */
- public void setPublicURLPrefix(String publicURLPrefix) {
- this.publicURLPrefix = publicURLPrefix;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
deleted file mode 100644
index c9a13fee5..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package at.gv.egovernment.moa.id.config.proxy;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Holds configuration data concerning an online application for use by the MOA-ID Proxy component.
- * These include the login type (stateful or stateless), the HTTP authentication type,
- * and information needed to add authentication parameters or headers for a URL connection
- * to the remote online application.
- * @see <code>MOAIDConfiguration-1.1.xsd</code>, element <code>Configuration</code>
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class OAConfiguration {
-
- /** Constant for an login method */
- public static final String LOGINTYPE_STATEFUL = "stateful";
- /** Constant for an login method */
- public static final String LOGINTYPE_STATELESS = "stateless";
-
- /** Constant for an auth method */
- public static final String BASIC_AUTH = "basic";
- /** Constant for an auth method */
- public static final String HEADER_AUTH = "header";
- /** Constant for an auth method */
- public static final String PARAM_AUTH = "param";
-
- /** login type: stateful or stateless */
- String loginType;
- /** authentication type: basic, header, or param */
- String authType;
- /**
- * mapping of parameter names to AuthenticationData field names
- * in case of authentication type <code>"header-auth"</code>
- */
- Map paramAuthMapping;
- /**
- * mapping of parameter names to AuthenticationData field names
- * in case of authentication type <code>"param-auth"</code>
- */
- Map headerAuthMapping;
- /** mapping for user ID to be used in case of authentication type <code>"basic-auth"</code> */
- String basicAuthUserIDMapping;
- /** mapping for password to be used in case of authentication type <code>"basic-auth"</code> */
- String basicAuthPasswordMapping;
-
- /**
- * Returns the basicAuthPasswordMapping.
- * @return String
- */
- public String getBasicAuthPasswordMapping() {
- return basicAuthPasswordMapping;
- }
-
- /**
- * Returns the basicAuthUserIDMapping.
- * @return String
- */
- public String getBasicAuthUserIDMapping() {
- return basicAuthUserIDMapping;
- }
-
- /**
- * Returns the headerAuthMapping.
- * @return HashMap
- */
- public Map getHeaderAuthMapping() {
- return headerAuthMapping;
- }
-
- /**
- * Returns the loginType.
- * @return String
- */
- public String getLoginType() {
- return loginType;
- }
-
- /**
- * Returns the paramAuthMapping.
- * @return HashMap
- */
- public Map getParamAuthMapping() {
- return paramAuthMapping;
- }
-
- /**
- * Sets the basicAuthPasswordMapping.
- * @param basicAuthPasswordMapping The basicAuthPasswordMapping to set
- */
- public void setBasicAuthPasswordMapping(String basicAuthPassword) {
- this.basicAuthPasswordMapping = basicAuthPassword;
- }
-
- /**
- * Sets the basicAuthUserIDMapping.
- * @param basicAuthUserIDMapping The basicAuthUserIDMapping to set
- */
- public void setBasicAuthUserIDMapping(String basicAuthUserID) {
- this.basicAuthUserIDMapping = basicAuthUserID;
- }
-
- /**
- * Sets the headerAuthMapping.
- * @param headerAuthMapping The headerAuthMapping to set
- */
- public void setHeaderAuthMapping(HashMap headerAuth) {
- this.headerAuthMapping = headerAuth;
- }
-
- /**
- * Sets the loginType.
- * @param loginType The loginType to set
- */
- public void setLoginType(String loginType) {
- this.loginType = loginType;
- }
-
- /**
- * Sets the paramAuthMapping.
- * @param paramAuthMapping The paramAuthMapping to set
- */
- public void setParamAuthMapping(HashMap paramAuth) {
- this.paramAuthMapping = paramAuth;
- }
-
- /**
- * Returns the authType.
- * @return String
- */
- public String getAuthType() {
- return authType;
- }
-
- /**
- * Sets the authType.
- * @param authType The authType to set
- */
- public void setAuthType(String authLoginType) {
- this.authType = authLoginType;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java b/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
deleted file mode 100644
index f08c60736..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/OAProxyParameter.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package at.gv.egovernment.moa.id.config.proxy;
-
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-
-/**
- * Configuration parameters belonging to an online application,
- * to use with the MOA ID Proxy component.
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class OAProxyParameter {
-
- /**
- * public URL prefix of the online application
- */
- private String publicURLPrefix;
- /**
- * URL of online application configuration file;
- * defaults to relative URL <code>/moaconfig.xml</code>
- */
- private String configFileURL;
- /**
- * implementation of {@link at.gv.egovernment.moa.id.proxy.LoginParameterResolver} interface
- * to be used for authenticating the online application;
- * defaults to {@link at.gv.egovernment.moa.id.proxy.DefaultLoginParameterResolver}
- */
- private String loginParameterResolverImpl;
- /**
- * implementation of {@link at.gv.egovernment.moa.id.proxy.ConnectionBuilder} interface
- * to be used for connecting to the online application;
- * defaults to {@link at.gv.egovernment.moa.id.proxy.DefaultConnectionBuilder}
- */
- private String connectionBuilderImpl;
- /**
- * session time out to be used in case of a stateless online application
- */
- private int sessionTimeOut;
- /**
- * parameters regarding the connection from the proxy to the online application
- */
- private ConnectionParameter connectionParameter;
- /**
- * parameters for logging into the online application
- */
- private OAConfiguration oaConfiguration;
-
- /**
- * Returns the configFileURL.
- * @return String
- */
- public String getConfigFileURL() {
- return configFileURL;
- }
-
- /**
- * Returns the sessionTimeOut.
- * @return int
- */
- public int getSessionTimeOut() {
- return sessionTimeOut;
- }
-
- /**
- * Returns the connectionParameter.
- * @return ConnectionParameter
- */
- public ConnectionParameter getConnectionParameter() {
- return connectionParameter;
- }
-
- /**
- * Sets the configFileURL.
- * @param configFileURL The configFileURL to set
- */
- public void setConfigFileURL(String oaProxyConfigFileURL) {
- this.configFileURL = oaProxyConfigFileURL;
- }
-
- /**
- * Sets the sessionTimeOut.
- * @param sessionTimeOut The sessionTimeOut to set
- */
- public void setSessionTimeOut(int oaProxySessionTimeOut) {
- this.sessionTimeOut = oaProxySessionTimeOut;
- }
-
- /**
- * Sets the connectionParameter.
- * @param connectionParameter The connectionParameter to set
- */
- public void setConnectionParameter(ConnectionParameter proxyConnectionParameter) {
- this.connectionParameter = proxyConnectionParameter;
- }
-
- /**
- * Returns the publicURLPrefix.
- * @return String
- */
- public String getPublicURLPrefix() {
- return publicURLPrefix;
- }
-
- /**
- * Sets the publicURLPrefix.
- * @param publicURLPrefix The publicURLPrefix to set
- */
- public void setPublicURLPrefix(String url) {
- this.publicURLPrefix = url;
- }
-
- /**
- * Returns the connectionBuilderImpl.
- * @return String
- */
- public String getConnectionBuilderImpl() {
- return connectionBuilderImpl;
- }
-
- /**
- * Returns the loginParameterResolverImpl.
- * @return String
- */
- public String getLoginParameterResolverImpl() {
- return loginParameterResolverImpl;
- }
-
- /**
- * Sets the connectionBuilderImpl.
- * @param connectionBuilderImpl The connectionBuilderImpl to set
- */
- public void setConnectionBuilderImpl(String connectionBuilderImp) {
- this.connectionBuilderImpl = connectionBuilderImp;
- }
-
- /**
- * Sets the loginParameterResolverImpl.
- * @param loginParameterResolverImpl The loginParameterResolverImpl to set
- */
- public void setLoginParameterResolverImpl(String loginParameterResolverImpl) {
- this.loginParameterResolverImpl = loginParameterResolverImpl;
- }
-
- /**
- * Returns the oaConfiguration.
- * @return OAConfiguration
- */
- public OAConfiguration getOaConfiguration() {
- return oaConfiguration;
- }
-
- /**
- * Sets the oaConfiguration.
- * @param oaConfiguration The oaConfiguration to set
- */
- public void setOaConfiguration(OAConfiguration oaConfiguration) {
- this.oaConfiguration = oaConfiguration;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
deleted file mode 100644
index 897d14da9..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/proxy/ProxyConfigurationProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package at.gv.egovernment.moa.id.config.proxy;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.config.ConfigurationBuilder;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * A class providing access to the Proxy Part of the MOA-ID configuration data.
- *
- * <p>Configuration data is read from an XML file, whose location is given by
- * the <code>moa.id.configuration</code> system property.</p>
- * <p>This class implements the Singleton pattern. The <code>reload()</code>
- * method can be used to update the configuration data. Therefore, it is not
- * guaranteed that consecutive calls to <code>getInstance()</code> will return
- * the same <code>ProxyConfigurationProvider</code> all the time. During the
- * processing of a web service request, the current
- * <code>TransactionContext</code> should be used to obtain the
- * <code>ProxyConfigurationProvider</code> local to that request.</p>
- *
- * @author Stefan Knirsch
- */
-public class ProxyConfigurationProvider extends ConfigurationProvider {
-
- /** Singleton instance. <code>null</code>, if none has been created. */
- private static ProxyConfigurationProvider instance;
-
- //
- // configuration data
- //
- /**
- * connection parameters for connection to MOA ID Auth component
- */
- private ConnectionParameter authComponentConnectionParameter;
- /**
- * configuration parameters for online applications
- */
- private OAProxyParameter[] onlineApplicationProxyParameter;
-
- /**
- * Return the single instance of configuration data.
- *
- * @return ProxyConfigurationProvider The current configuration data.
- * @throws ConfigurationException
- */
- public static synchronized ProxyConfigurationProvider getInstance()
- throws ConfigurationException {
-
- if (instance == null) {
- reload();
- }
- return instance;
- }
-
- /**
- * Reload the configuration data and set it if successful.
- *
- * @return ProxyConfigurationProvider The loaded configuration data.
- * @throws ConfigurationException Failure to load the configuration data.
- */
- public static synchronized ProxyConfigurationProvider reload()
- throws ConfigurationException {
- String fileName = System.getProperty(CONFIG_PROPERTY_NAME);
- if (fileName == null) {
- throw new ConfigurationException("config.01", null);
- }
- Logger.info("Loading MOA-ID-PROXY configuration " + fileName);
-
- instance = new ProxyConfigurationProvider(fileName);
- return instance;
- }
-
- /**
- * Constructor for ProxyConfigurationProvider.
- */
- public ProxyConfigurationProvider(String fileName)
- throws ConfigurationException {
-
- load(fileName);
- }
-
- /**
- * Load the configuration data from XML file with the given name and build
- * the internal data structures representing the MOA configuration.
- *
- * @param fileName The name of the XML file to load.
- * @throws ConfigurationException The MOA configuration could not be
- * read/built.
- */
- private void load(String fileName) throws ConfigurationException {
- FileInputStream stream = null;
- Element configElem;
- ConfigurationBuilder builder;
-
- try {
- // load the main config file
- stream = new FileInputStream(fileName);
- configElem = DOMUtils.parseXmlValidating(stream);
- }
- catch (Throwable t) {
- throw new ConfigurationException("config.03", null, t);
- }
- finally {
- try {
- if (stream != null) {
- stream.close();
- }
- }
- catch (IOException e) {
- }
- }
- try {
- // build the internal datastructures
- builder = new ConfigurationBuilder(configElem);
- authComponentConnectionParameter = builder.buildAuthComponentConnectionParameter();
- onlineApplicationProxyParameter = builder.buildOnlineApplicationProxyParameters();
- genericConfiguration = builder.buildGenericConfiguration();
- defaultChainingMode = builder.getDefaultChainingMode();
- chainingModes = builder.buildChainingModes();
- trustedCACertificates = builder.getTrustedCACertificates();
- }
- catch (Throwable t) {
- throw new ConfigurationException("config.02", null, t);
- }
- }
-
- /**
- * Return a bean containing all information about the ProxyComponent
- * @return The ConnectionParameter for the Proxy Component
- */
- public ConnectionParameter getAuthComponentConnectionParameter() {
- return authComponentConnectionParameter;
- }
-
- /**
- * Build an array of OnlineApplication Parameter Beans containing all
- * information about the proxy component of the online application
- * @return An OAProxyParameter array containing beans
- * with all relevant information for the proxy component of the online
- * application
- */
- public OAProxyParameter[] getOnlineApplicationParameters() {
- return onlineApplicationProxyParameter;
- }
- /**
- * Provides configuration information regarding the online application behind
- * the given URL, relevant to the MOA-ID Proxy component.
- *
- * @param oaURL URL requested for an online application
- * @return an <code>OAProxyParameter</code>, or <code>null</code>
- * if none is applicable
- */
- public OAProxyParameter getOnlineApplicationParameter(String oaURL) {
- OAProxyParameter[] oaParams = getOnlineApplicationParameters();
- for (int i = 0; i < oaParams.length; i++) {
- OAProxyParameter oaParam = oaParams[i];
- if (oaURL.startsWith(oaParam.getPublicURLPrefix()))
- return oaParam;
- }
- return null;
- }
-
-} \ No newline at end of file
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/AuthenticationData.java b/id.server/src/at/gv/egovernment/moa/id/data/AuthenticationData.java
deleted file mode 100644
index aac1dc422..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/data/AuthenticationData.java
+++ /dev/null
@@ -1,314 +0,0 @@
-package at.gv.egovernment.moa.id.data;
-
-import java.util.Date;
-
-/**
- * Encapsulates authentication data contained in a <code>&lt;saml:Assertion&gt;</code>.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-
-public class AuthenticationData {
- /**
- * major version number of the SAML assertion
- */
- private int majorVersion;
- /**
- * minor version number of the SAML assertion
- */
- private int minorVersion;
- /**
- * identifier for this assertion
- */
- private String assertionID;
- /**
- * URL of the MOA-ID Auth component issueing this assertion
- */
- private String issuer;
- /**
- * time instant of issue of this assertion
- */
- private String issueInstant;
- /**
- * user identification (ZMR-Zahl); <code>null</code>,
- * if the authentication module is configured not to return this data
- */
- private String identificationValue;
- /**
- * application specific user identifier (VPK)
- */
- private String vpk;
- /**
- * given name of the user
- */
- private String givenName;
- /**
- * family name of the user
- */
- private String familyName;
- /**
- * date of birth of the user
- */
- private String dateOfBirth;
- /**
- * says whether the certificate is a qualified certificate or not
- */
- private boolean qualifiedCertificate;
- /**
- * says whether the certificate is a public authority or not
- */
- private boolean publicAuthority;
- /**
- * public authority code (Beh&ouml;rdenkennzeichen - BKZ)
- */
- private String publicAuthorityCode;
- /**
- * the corresponding <code>lt;saml:Assertion&gt;</code>
- */
- private String samlAssertion;
- /**
- * creation timestamp
- */
- Date timestamp;
-
- /**
- * Constructor for AuthenticationData.
- */
- public AuthenticationData() {
- timestamp = new Date();
- }
-
- /**
- * Returns the minorVersion.
- * @return int
- */
- public int getMinorVersion() {
- return minorVersion;
- }
-
- /**
- * Returns the publicAuthority.
- * @return boolean
- */
- public boolean isPublicAuthority() {
- return publicAuthority;
- }
-
- /**
- * Returns the publicAuthorityCode.
- * @return String
- */
- public String getPublicAuthorityCode() {
- return publicAuthorityCode;
- }
-
- /**
- * Returns the qualifiedCertificate.
- * @return boolean
- */
- public boolean isQualifiedCertificate() {
- return qualifiedCertificate;
- }
-
- /**
- * Returns the vpk.
- * @return String
- */
- public String getVPK() {
- return vpk;
- }
-
- /**
- * Sets the minorVersion.
- * @param minorVersion The minorVersion to set
- */
- public void setMinorVersion(int minorVersion) {
- this.minorVersion = minorVersion;
- }
-
- /**
- * Sets the publicAuthority.
- * @param publicAuthority The publicAuthority to set
- */
- public void setPublicAuthority(boolean publicAuthority) {
- this.publicAuthority = publicAuthority;
- }
-
- /**
- * Sets the publicAuthorityCode.
- * @param publicAuthorityCode The publicAuthorityCode to set
- */
- public void setPublicAuthorityCode(String publicAuthorityIdentification) {
- this.publicAuthorityCode = publicAuthorityIdentification;
- }
-
- /**
- * Sets the qualifiedCertificate.
- * @param qualifiedCertificate The qualifiedCertificate to set
- */
- public void setQualifiedCertificate(boolean qualifiedCertificate) {
- this.qualifiedCertificate = qualifiedCertificate;
- }
-
- /**
- * Sets the vpk.
- * @param vpk The vpk to set
- */
- public void setVPK(String vpk) {
- this.vpk = vpk;
- }
-
- /**
- * Returns the assertionID.
- * @return String
- */
- public String getAssertionID() {
- return assertionID;
- }
-
- /**
- * Returns the dateOfBirth.
- * @return String
- */
- public String getDateOfBirth() {
- return dateOfBirth;
- }
-
- /**
- * Returns the familyName.
- * @return String
- */
- public String getFamilyName() {
- return familyName;
- }
-
- /**
- * Returns the givenName.
- * @return String
- */
- public String getGivenName() {
- return givenName;
- }
-
- /**
- * Returns the identificationValue.
- * @return String
- */
- public String getIdentificationValue() {
- return identificationValue;
- }
-
- /**
- * Returns the issueInstant.
- * @return String
- */
- public String getIssueInstant() {
- return issueInstant;
- }
-
- /**
- * Returns the issuer.
- * @return String
- */
- public String getIssuer() {
- return issuer;
- }
-
- /**
- * Returns the majorVersion.
- * @return int
- */
- public int getMajorVersion() {
- return majorVersion;
- }
-
- /**
- * Sets the assertionID.
- * @param assertionID The assertionID to set
- */
- public void setAssertionID(String assertionID) {
- this.assertionID = assertionID;
- }
-
- /**
- * Sets the dateOfBirth.
- * @param dateOfBirth The dateOfBirth to set
- */
- public void setDateOfBirth(String dateOfBirth) {
- this.dateOfBirth = dateOfBirth;
- }
-
- /**
- * Sets the familyName.
- * @param familyName The familyName to set
- */
- public void setFamilyName(String gamilyName) {
- this.familyName = gamilyName;
- }
-
- /**
- * Sets the givenName.
- * @param givenName The givenName to set
- */
- public void setGivenName(String givenName) {
- this.givenName = givenName;
- }
-
- /**
- * Sets the identificationValue.
- * @param identificationValue The identificationValue to set
- */
- public void setIdentificationValue(String identificationValue) {
- this.identificationValue = identificationValue;
- }
-
- /**
- * Sets the issueInstant.
- * @param issueInstant The issueInstant to set
- */
- public void setIssueInstant(String issueInstant) {
- this.issueInstant = issueInstant;
- }
-
- /**
- * Sets the issuer.
- * @param issuer The issuer to set
- */
- public void setIssuer(String issuer) {
- this.issuer = issuer;
- }
-
- /**
- * Sets the majorVersion.
- * @param majorVersion The majorVersion to set
- */
- public void setMajorVersion(int majorVersion) {
- this.majorVersion = majorVersion;
- }
-
- /**
- * Returns the samlAssertion.
- * @return String
- */
- public String getSamlAssertion() {
- return samlAssertion;
- }
-
- /**
- * Sets the samlAssertion.
- * @param samlAssertion The samlAssertion to set
- */
- public void setSamlAssertion(String samlAssertion) {
- this.samlAssertion = samlAssertion;
- }
-
- /**
- * Returns the timestamp.
- * @return Date
- */
- public Date getTimestamp() {
- return timestamp;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/Cookie.java b/id.server/src/at/gv/egovernment/moa/id/data/Cookie.java
deleted file mode 100644
index 5729e54c3..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/data/Cookie.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package at.gv.egovernment.moa.id.data;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * The Cookie-class provides methods to save and return cookies for
- * each single session
- *
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class Cookie {
- /** A HahsMap containing all our cookies */
- HashMap cookies = new HashMap();
- /** A HashMap to temporarely store 'Set-Cookie' values from the OnlineApplication
- * to send them back to the client/browser as soon as possible */
- HashMap cookies401 = new HashMap();
-
- /**
- * Adds a Cookie from a response with response-code 401 to the cookie-pool
- * for sending it back to the browser / client
- * @param String: the complete 'Set-Cookie' - String
- */
- public void add401(String cookieString)
- {
- cookies401.put(getKey(cookieString),cookieString);
- }
-
- /**
- * Get the HashMap containing all cookies to be sent to the browser / client
- * @return HashMap with all cookies
- */
- public HashMap get401()
- {
- return cookies401;
- }
-
- /**
- * Clear the 401 cookie-pool
- */
- public void clear401()
- {
- cookies401.clear();
- }
-
- /**
- * Set a cookie that comes from the Online-Application
- * and save it in our "normal" cookie-pool
- * @param String the complete "Set-Cookie" - String from the Online-Application
- */
- public void setCookie(String value) {
- cookies.put(getKey(value), getValue(value));
- }
-
- /**
- * Method saveOldCookies.
- * @param String the complete "Set-Cookie" - String from the Online-Application
- */
- public void saveOldCookies(String value) {
- StringTokenizer st = new StringTokenizer(value,";");
- while (st.hasMoreTokens())
- {
- // We have to trim because the Tokenizer returns cookies including spaces at the beginning
- StringTokenizer st2 = new StringTokenizer(st.nextToken().trim(),"=");
- String cookieKey = st2.nextToken().trim();
- if (st2.hasMoreTokens())
- {
- String cookieValue = st2.nextToken().trim();
- if (!cookies.containsKey(cookieKey))
- cookies.put(cookieKey , cookieValue);
- }
- }
- Logger.debug("Found these cookies: " + getCookies());
- }
-
- /**
- * Get a String containing all cookies saved in that session seperated by '; '
- * to be sent back to the Online-Application
- * @return String containing all cookies saved in that session seperated by '; '
- */
- public String getCookies() {
- String result = "";
- if (cookies.size()==0)
- return null;
- Iterator i = cookies.keySet().iterator();
- while (i.hasNext()) {
- String key = (String) i.next();
- result += key + "=" + (String)cookies.get(key) + "; ";
- }
- return result.substring(0, result.length() - 2);
- }
-
- /**
- * Returns the key of a key-value-pair of a cookie
- * getKey("CookieA=1234") returns CookieA
- * @param String the complete "Set-cookie" String containing a key-value-pair of a cookie
- * @return String the key of a key-value-pair of a cookie
- */
- private String getKey(String input) {
- return input.substring(0, input.indexOf("="));
- }
-
- /**
- * Returns the value of a key-value-pair of a cookie
- * getKey("CookieA=1234") returns 1234
- * @param String the complete "Set-cookie" String containing a key-value-pair of a cookie
- * @return String the value of a key-value-pair of a cookie
- */
- private String getValue(String input) {
- if (input.indexOf(";") == -1)
- return input.substring(input.indexOf("=") + 1, input.getBytes().length);
- return input.substring(input.indexOf("=") + 1, input.indexOf(";"));
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/CookieManager.java b/id.server/src/at/gv/egovernment/moa/id/data/CookieManager.java
deleted file mode 100644
index 98f84c429..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/data/CookieManager.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package at.gv.egovernment.moa.id.data;
-
-import java.util.HashMap;
-
-/**
- * The CookieManager is a singleton to manage a Cookie-Object for
- * each session
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class CookieManager {
- /** the singleton instance of the CookieManager */
- private static CookieManager instance;
- /** a HashMap to bind a Cookie-object to every single session*/
- private static HashMap cookies = new HashMap();
-
- /**
- * Create a singleton of the CookieManager
- * @return CookieManager
- */
- public static CookieManager getInstance()
- {
- if(instance==null) instance=new CookieManager();
- return instance;
- }
-
- /**
- * Save a cookie to a specified session-id
- * @param String id the session id
- * @param String cookie_string - the complete 'Set-Cookie' String from the OnlineApplication
- */
- public void saveCookie(String id,String cookie_string)
- {
- getCookieWithID(id).setCookie(cookie_string);
- }
-
- /**
- * Method saveOldCookies.
- * @param id
- * @param cookie_string
- */
- public void saveOldCookies(String id,String cookie_string)
- {
- getCookieWithID(id).saveOldCookies(cookie_string);
- }
-
- /**
- * Get a Cookie-Object for a specified session-id
- * @param String id the session id
- * @return Cookie object containing all saved cookies for this session
- */
- public Cookie getCookieWithID(String id)
- {
- Cookie c = null;
- if(cookies.containsKey(id))
- c = (Cookie)cookies.get(id);
- else
- {
- c = new Cookie();
- cookies.put(id,c);
- }
- return c;
- }
-
-
- /**
- * Get a String containing all cookies of a specified session-id
- * saved in that session seperated by '; ' to be sent back to
- * the Online-Application
- * @param id the session-id
- * @return String containing all cookies saved in that session seperated by '; '
- */
- public String getCookie(String id)
- {
- Cookie result = (Cookie)cookies.get((String)id);
- if (result==null)
- return null;
- return result.getCookies();
-
- }
-
- /**
- * Adds a Cookie for a special session from a response with
- * response-code 401 to the cookie-pool for sending it back
- * to the browser / client
- * @param id the session-id
- * @param String: the complete 'Set-Cookie' - String
- */
- public void add401(String id,String value)
- {
- getCookieWithID(id).add401(value);
- }
-
- /**
- * Clear the 401 cookie-pool of a session
- * @param id the session-id
- */
- public void clear401(String id)
- {
- getCookieWithID(id).clear401();
- }
-
- /**
- * Get the HashMap containing all cookies of a session to be sent to the browser / client
- * @param id the session-id
- * @return HashMap with all cookies
- */
- public HashMap get401(String id)
- {
- return getCookieWithID(id).get401();
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/IssuerAndSerial.java b/id.server/src/at/gv/egovernment/moa/id/data/IssuerAndSerial.java
deleted file mode 100644
index a47dd8b29..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/data/IssuerAndSerial.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package at.gv.egovernment.moa.id.data;
-
-import java.math.BigInteger;
-import java.security.Principal;
-
-import iaik.asn1.structures.Name;
-import iaik.utils.RFC2253NameParser;
-import iaik.utils.RFC2253NameParserException;
-
-/**
- * A class containing the issuer and serial number of a certificate, which can
- * be used to uniquely identify the certificate.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class IssuerAndSerial {
- /** store the issuer as String*/
- private String issuerDN;
- /** store the serial as BigInteger*/
- private BigInteger serial;
-
- /**
- * Create an <code>IssuerAndSerial</code> object.
- *
- * The name of the issuer is converted to RFC2253. If it cannot be parsed, the
- * DN contained in the <code>issuer</code> is set.
- *
- * @param issuer The isser of a certificate.
- * @param serial The serial number of the certificate.
- */
- public IssuerAndSerial(Principal issuer, BigInteger serial) {
- RFC2253NameParser parser = new RFC2253NameParser(issuer.getName());
-
- try {
- this.issuerDN = ((Name) parser.parse()).getRFC2253String();
- } catch (RFC2253NameParserException e) {
- this.issuerDN = issuer.getName();
- }
- this.serial = serial;
- }
-
- /**
- * Create an <code>IssuerAndSerial</code> object.
- *
- * @param issuerDN The issuer distinguished name. Should be an RFC2253 name.
- * @param serial The serial number of the certificate.
- */
- public IssuerAndSerial(String issuerDN, BigInteger serial) {
- this.issuerDN = issuerDN;
- this.serial = serial;
- }
-
- /**
- * Return the issuer DN in RFC2253 format.
- *
- * @return The issuer part of this object.
- */
- public String getIssuerDN() {
- return issuerDN;
- }
-
- /**
- * Return the serial number.
- *
- * @return The serial number of this object.
- */
- public BigInteger getSerial() {
- return serial;
- }
-
- /**
- * Compare this <code>IssuerAndSerial</code> to another object.
- *
- * @return <code>true</code>, if <code>other</code> is an
- * <code>IssuerAndSerial</code> object and the <code>issuer</code> and
- * <code>serial</code> fields are both equal. <code>false</code> otherwise.
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object other) {
- if (other instanceof IssuerAndSerial) {
- IssuerAndSerial ias = (IssuerAndSerial) other;
- return getIssuerDN().equals(ias.getIssuerDN())
- && getSerial().equals(ias.getSerial());
- }
- return false;
- }
-
- /**
- * Return the hash code of this <code>IssuerAndSerial</code>.
- *
- * @return The hash code of this <code>IssuerAndSerial</code>.
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return issuerDN.hashCode() ^ serial.hashCode();
- }
-
- /**
- * Return a <code>String</code> representation of this
- * <code>IssuerAndSerial</code> object.
- *
- * @return The <code>String</code> representation.
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return ("(IssuerAndSerial - Issuer<" + getIssuerDN())
- + ("> Serial<" + serial.toString() + ">)");
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/data/SAMLStatus.java b/id.server/src/at/gv/egovernment/moa/id/data/SAMLStatus.java
deleted file mode 100644
index ed61827b6..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/data/SAMLStatus.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package at.gv.egovernment.moa.id.data;
-
-/**
- * Data contained in a <code>&lt;samlp:Status&gt;</code>
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLStatus {
-
- /** main status code */
- private String statusCode;
- /** sub status code */
- private String subStatusCode;
- /** status message */
- private String statusMessage;
-
- /**
- * @return status code
- */
- public String getStatusCode() {
- return statusCode;
- }
-
- /**
- * @return status message
- */
- public String getStatusMessage() {
- return statusMessage;
- }
-
- /**
- * @return enclosed sub-status code
- */
- public String getSubStatusCode() {
- return subStatusCode;
- }
-
- /**
- * @param string the status code
- */
- public void setStatusCode(String string) {
- statusCode = string;
- }
-
- /**
- * @param string the status message
- */
- public void setStatusMessage(String string) {
- statusMessage = string;
- }
-
- /**
- * @param string the enclosed sub-status code
- */
- public void setSubStatusCode(String string) {
- subStatusCode = string;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java b/id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
deleted file mode 100644
index 421286876..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package at.gv.egovernment.moa.id.iaik.config;
-
-import java.io.File;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.iaik.servertools.observer.ObservableImpl;
-import iaik.pki.store.certstore.CertStoreConfiguration;
-import iaik.pki.store.certstore.CertStoreParameters;
-import iaik.pki.store.certstore.CertStoreTypes;
-import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
-
-/**
- * Implementation of interface needed to initialize an IAIK JSSE <code>TrustManager</code>
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class CertStoreConfigurationImpl extends ObservableImpl
- implements CertStoreConfiguration, DirectoryCertStoreParameters {
- /** identifies the rootDirectory */
- private String rootDirectory;
- /** Array for storing all CertStoreParameters */
- private CertStoreParameters[] parameters;
-
- /**
- * Create a new <code>CertStoreConfigurationImpl</code>.
- *
- * @param conf The MOA configuration from which the configuration data is
- * @throws ConfigurationException an any config-error
- * being read.
- */
- public CertStoreConfigurationImpl(ConfigurationProvider conf) throws ConfigurationException {
- String paramName = ConfigurationProvider.DIRECTORY_CERTSTORE_PARAMETER_PROPERTY;
- String rootDirParam = conf.getGenericConfigurationParameter(paramName);
- if (rootDirParam == null)
- throw new ConfigurationException(
- "config.08", new Object[] {paramName});
- File f = new File(rootDirParam);
- if (f.isDirectory())
- rootDirectory = f.getAbsolutePath();
- else
- throw new ConfigurationException(
- "config.05", new Object[] {paramName});
-
- parameters = new CertStoreParameters[] { this };
- }
-
- /**
- * @see iaik.pki.store.certstore.CertStoreConfiguration#getParameters()
- */
- public CertStoreParameters[] getParameters() {
- return parameters;
- }
-
- /**
- * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#getRootDirectory()
- */
- public String getRootDirectory() {
- return rootDirectory;
- }
-
- /**
- * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#createNew()
- */
- public boolean createNew() {
- return false;
- }
-
- /**
- * @see iaik.pki.store.certstore.CertStoreParameters#getId()
- */
- public String getId() {
- return "MOA ID Directory CertStore";
- }
-
- /**
- * @see iaik.pki.store.certstore.CertStoreParameters#isReadOnly()
- */
- public boolean isReadOnly() {
- return false;
- }
-
- /**
- * @return <code>CertStoreTypes.DIRECTORY</code>
- * @see iaik.pki.store.certstore.CertStoreParameters#getType()
- */
- public String getType() {
- return CertStoreTypes.DIRECTORY;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/LoggerConfigImpl.java b/id.server/src/at/gv/egovernment/moa/id/iaik/config/LoggerConfigImpl.java
deleted file mode 100644
index 3cd02a2b5..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/LoggerConfigImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package at.gv.egovernment.moa.id.iaik.config;
-
-import iaik.logging.LogConfigurationException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-/**
- * Implementation of interface <needed to initialize an IAIK JSSE <code>TrustManager</code>
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class LoggerConfigImpl implements iaik.logging.LoggerConfig {
-
- /** logging properties **/
- private Properties loggingProperties;
-
- /**
- * Constructor
- */
- public LoggerConfigImpl(String propertyFileURL) throws IOException {
- InputStream in = new URL(propertyFileURL).openStream();
- loggingProperties = new Properties();
- loggingProperties.load(in);
- in.close();
- }
-
- /**
- * @see iaik.logging.LoggerConfig#getFactory()
- */
- public String getFactory() {
- return "iaik.logging.impl.Log4jFactory";
- }
-
- /**
- * @see iaik.logging.LoggerConfig#getProperties()
- */
- public Properties getProperties() throws LogConfigurationException {
- return loggingProperties;
- }
-
- /**
- * @see iaik.logging.LoggerConfig#getNodeId()
- */
- public String getNodeId() {
- return "iaik";
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/PKIConfigurationImpl.java b/id.server/src/at/gv/egovernment/moa/id/iaik/config/PKIConfigurationImpl.java
deleted file mode 100644
index 8d09e2bc9..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/PKIConfigurationImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package at.gv.egovernment.moa.id.iaik.config;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import iaik.pki.PKIConfiguration;
-import iaik.pki.pathvalidation.ValidationConfiguration;
-import iaik.pki.revocation.RevocationConfiguration;
-import iaik.pki.store.certstore.CertStoreConfiguration;
-import iaik.pki.store.revocation.archive.ArchiveConfiguration;
-
-/**
- * Implementation of interface <code>PKIConfiguration</code> needed to
- * initialize an IAIK JSSE <code>TrustManager</code>
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class PKIConfigurationImpl implements PKIConfiguration {
- /** The configuration for the CertStore */
- private CertStoreConfiguration certStoreConfiguration;
- /** The configuration for the RevocationChecks */
- private RevocationConfiguration revocationConfiguration;
- /** The configuration for the Validation */
- private ValidationConfiguration validationConfiguration;
-
- /**
- * Constructor
- * @param conf the Configuration for the PKIConfig
- * @throws ConfigurationException for any config error
- */
- public PKIConfigurationImpl(ConfigurationProvider conf) throws ConfigurationException {
- certStoreConfiguration = new CertStoreConfigurationImpl(conf);
- revocationConfiguration = new RevocationConfigurationImpl();
- validationConfiguration = new ValidationConfigurationImpl(conf);
- }
-
- /**
- * @see iaik.pki.PKIConfiguration#getCertStoreConfiguration()
- */
- public CertStoreConfiguration getCertStoreConfiguration() {
- return certStoreConfiguration;
- }
-
- /**
- * @see iaik.pki.PKIConfiguration#getRevocationConfiguration()
- */
- public RevocationConfiguration getRevocationConfiguration() {
- return revocationConfiguration;
- }
-
- /**
- * @see iaik.pki.PKIConfiguration#getArchiveConfiguration()
- */
- public ArchiveConfiguration getArchiveConfiguration() {
- return null;
- }
-
- /**
- * @see iaik.pki.PKIConfiguration#getValidationConfiguration()
- */
- public ValidationConfiguration getValidationConfiguration() {
- return validationConfiguration;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/RevocationConfigurationImpl.java b/id.server/src/at/gv/egovernment/moa/id/iaik/config/RevocationConfigurationImpl.java
deleted file mode 100644
index c583babdc..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/RevocationConfigurationImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package at.gv.egovernment.moa.id.iaik.config;
-
-import iaik.pki.revocation.RevocationConfiguration;
-
-import java.security.cert.X509Certificate;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Set;
-
-import at.gv.egovernment.moa.id.iaik.servertools.observer.*;
-
-/**
- * Implementation of interface needed to initialize an IAIK JSSE <code>TrustManager</code>
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class RevocationConfigurationImpl extends ObservableImpl implements RevocationConfiguration {
-
- /**
- * @see iaik.pki.revocation.RevocationConfiguration#getAlternativeDistributionPoints(java.security.cert.X509Certificate, java.util.Date)
- */
- public Set getAlternativeDistributionPoints(
- X509Certificate arg0,
- Date arg1) {
- return Collections.EMPTY_SET;
- }
-
- /**
- * @see iaik.pki.revocation.RevocationConfiguration#archiveRevocationInfo(java.lang.String, java.lang.String)
- */
- public boolean archiveRevocationInfo(String arg0, String arg1) {
- return false;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/ValidationConfigurationImpl.java b/id.server/src/at/gv/egovernment/moa/id/iaik/config/ValidationConfigurationImpl.java
deleted file mode 100644
index c500e2e8e..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/ValidationConfigurationImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package at.gv.egovernment.moa.id.iaik.config;
-
-import iaik.pki.pathvalidation.ValidationConfiguration;
-
-import java.security.cert.X509Certificate;
-import java.security.spec.AlgorithmParameterSpec;
-
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.iaik.servertools.observer.ObservableImpl;
-
-/**
- * Implementation of interface needed to initialize an IAIK JSSE <code>TrustManager</code>
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ValidationConfigurationImpl extends ObservableImpl
- implements ValidationConfiguration {
- /** The ConfigurationProvider for the validation*/
- private ConfigurationProvider conf;
-
- /**
- * Constructor
- * @param conf with the configuration
- */
- public ValidationConfigurationImpl(ConfigurationProvider conf) {
- this.conf = conf;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationConfiguration#getChainingMode(java.security.cert.X509Certificate)
- */
- public String getChainingMode(X509Certificate trustAnchor) {
- String chainingMode = conf.getChainingMode(trustAnchor);
- return chainingMode;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationConfiguration#getPublicKeyParamsAsSpec(java.security.cert.X509Certificate)
- */
- public AlgorithmParameterSpec getPublicKeyParamsAsSpec(X509Certificate arg0) {
- return null;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationConfiguration#getPublicKeyParamsAsCert(java.security.cert.X509Certificate)
- */
- public X509Certificate getPublicKeyParamsAsCert(X509Certificate arg0) {
- return null;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/pki/PKIProfileImpl.java b/id.server/src/at/gv/egovernment/moa/id/iaik/pki/PKIProfileImpl.java
deleted file mode 100644
index 882a9c255..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/pki/PKIProfileImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package at.gv.egovernment.moa.id.iaik.pki;
-
-import java.security.cert.X509Certificate;
-import java.util.Collections;
-import java.util.Set;
-
-import iaik.pki.PKIProfile;
-import iaik.pki.pathvalidation.ValidationProfile;
-import iaik.pki.revocation.RevocationProfile;
-import iaik.pki.revocation.RevocationSourceTypes;
-import iaik.pki.store.truststore.TrustStoreProfile;
-import iaik.pki.store.truststore.TrustStoreTypes;
-
-import at.gv.egovernment.moa.id.iaik.servertools.observer.ObservableImpl;
-
-/**
- * Implementation of the <code>PKIProfile</code> interface and subinterfaces
- * providing information needed for certificate path validation.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class PKIProfileImpl extends ObservableImpl
- implements PKIProfile, RevocationProfile, TrustStoreProfile, ValidationProfile {
-
- /**
- * URI to the truststore
- */
- private String trustStoreURI;
-
- /**
- * Create a new <code>PKIProfileImpl</code>.
- *
- * @param trustStoreURI trust store URI
- */
- public PKIProfileImpl(String trustStoreURI) {
- this.trustStoreURI = trustStoreURI;
- }
-
- /**
- * @see iaik.pki.PKIProfile#autoAddCertificates()
- */
- public boolean autoAddCertificates() {
- return true;
- }
-
- /**
- * @see iaik.pki.PKIProfile#getRevocationProfile()
- */
- public RevocationProfile getRevocationProfile() {
- return this;
- }
-
- /**
- * @see iaik.pki.PKIProfile#getTrustStoreProfile()
- */
- public TrustStoreProfile getTrustStoreProfile() {
- return this;
- }
-
- /**
- * @see iaik.pki.PKIProfile#getValidationProfile()
- */
- public ValidationProfile getValidationProfile() {
- return this;
- }
-
- /**
- * @see iaik.pki.PKIProfile#useAuthorityInfoAccess()
- */
- public boolean useAuthorityInfoAccess() {
- return true;
- }
-
- /**
- * @see iaik.pki.revocation.RevocationProfile#getMaxRevocationAge(java.lang.String)
- */
- public long getMaxRevocationAge(String arg0) {
- return 0;
- }
-
- /**
- * @see iaik.pki.revocation.RevocationProfile#getOCSPRequestHashAlgorithm()
- */
- public String getOCSPRequestHashAlgorithm() {
- return null;
- }
-
- /**
- * @see iaik.pki.revocation.RevocationProfile#getPreferredServiceOrder(java.security.cert.X509Certificate)
- */
- public String[] getPreferredServiceOrder(X509Certificate arg0) {
- return new String[] {RevocationSourceTypes.CRL};
- }
-
- /**
- * @see iaik.pki.store.truststore.TrustStoreProfile#getType()
- */
- public String getType() {
- return TrustStoreTypes.DIRECTORY;
- }
-
- /**
- * @see iaik.pki.store.truststore.TrustStoreProfile#getURI()
- */
- public String getURI() {
- return trustStoreURI;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getInitialAnyPolicyInhibit()
- */
- public boolean getInitialAnyPolicyInhibit() {
- return false;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getInitialExplicitPolicy()
- */
- public boolean getInitialExplicitPolicy() {
- return false;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getInitialPolicyMappingInhibit()
- */
- public boolean getInitialPolicyMappingInhibit() {
- return false;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getInitialPolicySet()
- */
- public Set getInitialPolicySet() {
- return Collections.EMPTY_SET;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getNameConstraintsProcessing()
- */
- public boolean getNameConstraintsProcessing() {
- return false;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getPolicyProcessing()
- */
- public boolean getPolicyProcessing() {
- return false;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getRevocationChecking()
- */
- public boolean getRevocationChecking() {
- return true;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/pki/jsse/MOAIDTrustManager.java b/id.server/src/at/gv/egovernment/moa/id/iaik/pki/jsse/MOAIDTrustManager.java
deleted file mode 100644
index 9da006d35..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/pki/jsse/MOAIDTrustManager.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package at.gv.egovernment.moa.id.iaik.pki.jsse;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
-import iaik.pki.jsse.IAIKX509TrustManager;
-
-/**
- * <code>TrustManager</code> implementation featuring CRL checking (inherited from
- * <code>IAIKX509TrustManager</code>), plus server-end-SSL-certificate checking.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class MOAIDTrustManager extends IAIKX509TrustManager {
-
- /** an x509Certificate array containing all accepted server certificates*/
- private X509Certificate[] acceptedServerCertificates;
-
- /**
- * Constructor
- * @param acceptedServerCertificateStoreURL the url leading to the acceptedServer cert store
- * @throws GeneralSecurityException occurs on security errors
- * @throws IOException occurs on IO errors
- */
- public MOAIDTrustManager(String acceptedServerCertificateStoreURL)
- throws IOException, GeneralSecurityException {
-
- if (acceptedServerCertificateStoreURL != null)
- buildAcceptedServerCertificates(acceptedServerCertificateStoreURL);
- else
- acceptedServerCertificates = null;
- }
-
-
- /**
- * Initializes the LoggingContextManager logging context.
- * Fixes a bug occuring in the case MOA-SP is called by API.
- * In this case, IAIKX509TrustManager uses the LogginConfig of MOA-SP.
- * This method must be called before a MOAIDTrustManager is constructed,
- * from every thread.
- */
- public static void initializeLoggingContext() {
- if (LoggingContextManager.getInstance().getLoggingContext() == null)
- LoggingContextManager.getInstance().setLoggingContext(
- new LoggingContext(Thread.currentThread().getName()));
- }
-
-
- /**
- * Builds an Array of accepted server certificates from an URL,
- * and stores it in <code>acceptedServerCertificates</code>.
- * @param acceptedServerCertificateStoreURL file URL pointing to the directory
- * containing accepted server X509 certificates
- * @throws GeneralSecurityException on security errors
- * @throws IOException on any IO errors
- */
- private void buildAcceptedServerCertificates(String acceptedServerCertificateStoreURL)
- throws IOException, GeneralSecurityException {
-
- List certList = new ArrayList();
- URL storeURL = new URL(acceptedServerCertificateStoreURL);
- File storeDir = new File(storeURL.getFile());
- // list certificate files in directory
- File[] certFiles = storeDir.listFiles();
- for (int i = 0; i < certFiles.length; i++) {
- // for each: create an X509Certificate and store it in list
- File certFile = certFiles[i];
- FileInputStream fis = new FileInputStream(certFile.getPath());
- CertificateFactory certFact = CertificateFactory.getInstance("X.509");
- X509Certificate cert = (X509Certificate)certFact.generateCertificate(fis);
- fis.close();
- certList.add(cert);
- }
- // store acceptedServerCertificates
- acceptedServerCertificates = (X509Certificate[]) certList.toArray(new X509Certificate[0]);
- }
-
- /**
- * Does additional server-end-SSL-certificate checking.
- * @see com.sun.net.ssl.X509TrustManager#isServerTrusted(java.security.cert.X509Certificate[])
- */
- public boolean isServerTrusted(X509Certificate[] certChain) {
- boolean trusted = super.isServerTrusted(certChain);
- if (! trusted || acceptedServerCertificates == null)
- return trusted;
- else {
- // check server-end-SSL-certificate with acceptedServerCertificates
- X509Certificate serverCert = certChain[0];
- for (int i = 0; i < acceptedServerCertificates.length; i++) {
- X509Certificate acceptedServerCert = acceptedServerCertificates[i];
- if (serverCert.equals(acceptedServerCert))
- return true;
- }
- Logger.warn(MOAIDMessageProvider.getInstance().getMessage("ssl.01", null));
- return false;
- }
- }
- /**
- * In rare cases, this method is being called although it should not be.
- * @see com.sun.net.ssl.X509TrustManager#isClientTrusted(X509Certificate[])
- */
- public boolean isClientTrusted(java.security.cert.X509Certificate arg0[])
- {
- return true;
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/servertools/observer/ObservableImpl.java b/id.server/src/at/gv/egovernment/moa/id/iaik/servertools/observer/ObservableImpl.java
deleted file mode 100644
index 6f6949ad6..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/servertools/observer/ObservableImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package at.gv.egovernment.moa.id.iaik.servertools.observer;
-
-import iaik.servertools.observer.NotificationData;
-import iaik.servertools.observer.Observable;
-import iaik.servertools.observer.Observer;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-
-/**
- * Implementation of interface <needed to initialize an IAIK JSSE <code>TrustManager</code>
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ObservableImpl implements Observable {
- /** a List for all observers */
- private List observers = new ArrayList();
-
- /**
- * @see iaik.servertools.observer.Observable#addObserver(iaik.servertools.observer.Observable)
- */
- public void addObserver(Observer observer) {
- observers.add(observer);
- }
-
- /**
- * @see iaik.servertools.observer.Observable#removeObserver(iaik.servertools.observer.Observable)
- */
- public boolean removeObserver(Observer observer) {
- return observers.remove(observer);
- }
-
- /**
- * @see iaik.servertools.observer.Observable#notify(iaik.servertools.observer.NotificationData)
- */
- public void notify(NotificationData data) {
- Iterator iter = observers.iterator();
- for (iter = observers.iterator(); iter.hasNext();) {
- Observer observer = (Observer) iter.next();
- observer.notify(data);
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java b/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java
deleted file mode 100644
index 8039b67a6..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package at.gv.egovernment.moa.id.proxy;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.util.Map;
-
-import javax.net.ssl.SSLSocketFactory;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Builder for {@link java.net.URLConnection} objects used to forward requests
- * to the remote online application.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-
-public interface ConnectionBuilder {
-
- /**
- * Builds an HttpURLConnection to a {@link java.net.URL} which is derived
- * from an {@link HttpServletRequest} URL, by substitution of a
- * public URL prefix for the real URL prefix.<br>
- * The HttpURLConnection has been created by {@link java.net.URL#openConnection}, but
- * it has not yet been connected to by {@link java.net.URLConnection#connect}.<br>
- * The field settings of the HttpURLConnection are:
- * <ul>
- * <li><code>allowUserInteraction = false</code></li>
- * <li><code>doInput = true</code></li>
- * <li><code>doOutput = true</code></li>
- * <li><code>requestMethod = request.getMethod()</code></li>
- * <li><code>useCaches = false</code></li>
- * </ul>
- *
- * @param request the incoming request which shall be forwarded
- * @param publicURLPrefix the public URL prefix to be substituted by the real URL prefix
- * @param realURLPrefix the URL prefix to substitute the public URL prefix
- * @param sslSocketFactory factory to be used for creating an SSL socket in case
- * of a URL for scheme <code>"https:"</code>;
- * <br>if <code>null</code>, the default SSL socket factory would be used
- * @param parameters parameters to be forwarded
- * @return a URLConnection created by {@link java.net.URL#openConnection}, connecting to
- * the requested URL with <code>publicURLPrefix</code> substituted by <code>realURLPrefix</code>
- * @throws IOException if an I/O exception occurs during opening the connection
- * @see java.net.URL#openConnection()
- * @see com.sun.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()
- */
- public HttpURLConnection buildConnection(
- HttpServletRequest request,
- String publicURLPrefix,
- String realURLPrefix,
- SSLSocketFactory sslSocketFactory,
- Map parameters) throws IOException;
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilderFactory.java b/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilderFactory.java
deleted file mode 100644
index 7a6c3e575..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/ConnectionBuilderFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package at.gv.egovernment.moa.id.proxy;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
-import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter;
-
-/**
- * Factory delivering a {@link ConnectionBuilder} implementation for
- * an online application, initialized from configuration data.
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ConnectionBuilderFactory {
-
- /** default connection builder to be used for online application
- * where no special implementation of the <code>ConnectionBuilder</code>
- * interface is configured
- */
- private static ConnectionBuilder defaultConnectionBuilder;
- /** mapping from online application public URL prefix to an implementation
- * of the <code>ConnectionBuilder</code> interface to be used;
- * if no mapping is given for an online application, the
- * <code>DefaultConnectionBuilder</code> will be used */
- private static Map connectionBuilderMap;
-
- /**
- * Initializes the <code>ConnectionBuilder</code> map from the configuration data.
- * @throws ConfigurationException when the configuration cannot be read,
- * or when a class name configured cannot be instantiated
- */
- public static void initialize() throws ConfigurationException {
- defaultConnectionBuilder = new DefaultConnectionBuilder();
- connectionBuilderMap = new HashMap();
- ProxyConfigurationProvider proxyConf = ProxyConfigurationProvider.getInstance();
- for (int i = 0; i < proxyConf.getOnlineApplicationParameters().length; i++) {
- OAProxyParameter oaParam = proxyConf.getOnlineApplicationParameters()[i];
- String publicURLPrefix = oaParam.getPublicURLPrefix();
- String className = oaParam.getConnectionBuilderImpl();
- if (className != null) {
- try {
- ConnectionBuilder cb = (ConnectionBuilder)Class.forName(className).newInstance();
- connectionBuilderMap.put(publicURLPrefix, cb);
- }
- catch (Throwable ex) {
- throw new ConfigurationException("config.07", new Object[] {publicURLPrefix}, ex);
- }
- }
- }
- }
-
- /**
- * Gets the <code>ConnectionBuilder</code> implementation to be used for the given
- * online application.
- * @param publicURLPrefix public URL prefix of the online application
- * @return <code>ConnectionBuilder</code> implementation
- */
- public static ConnectionBuilder getConnectionBuilder(String publicURLPrefix) {
- ConnectionBuilder cb = (ConnectionBuilder) connectionBuilderMap.get(publicURLPrefix);
- if (cb == null)
- return defaultConnectionBuilder;
- else
- return cb;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultConnectionBuilder.java b/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultConnectionBuilder.java
deleted file mode 100644
index 48e21f673..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultConnectionBuilder.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package at.gv.egovernment.moa.id.proxy;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.net.ssl.SSLSocketFactory;
-import javax.servlet.http.HttpServletRequest;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.BoolUtils;
-
-import com.sun.net.ssl.HostnameVerifier;
-import com.sun.net.ssl.HttpsURLConnection;
-
-/**
- * Defaultimplementierung von <code>ConnectionBuilder</code>.
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class DefaultConnectionBuilder implements ConnectionBuilder {
-
- /** a boolean to disable the HostnameVerification (default = false)*/
- private static boolean disableHostnameVerification = false;
-
- /**
- * Constructor for DefaultConnectionBuilder.
- * @throws ConfigurationException on any config error
- */
- public DefaultConnectionBuilder() throws ConfigurationException {
- disableHostnameVerification = BoolUtils.valueOf(
- ProxyConfigurationProvider.getInstance().getGenericConfigurationParameter(
- "ProxyComponent.DisableHostnameVerification"));
- if (disableHostnameVerification)
- Logger.warn("ProxyComponent.DisableHostnameVerification: " + disableHostnameVerification);
- }
-
- /**
- * @see at.gv.egovernment.moa.id.proxy.ConnectionBuilder#buildConnection
- */
- public HttpURLConnection buildConnection(
- HttpServletRequest req,
- String publicURLPrefix,
- String realURLPrefix,
- SSLSocketFactory sslSocketFactory,
- Map parameters)
- throws IOException {
-
- String requestedURL = req.getRequestURL().toString();
- // check whether requested URL starts with publicURLPrefix
- if (! requestedURL.startsWith(publicURLPrefix))
- throw new IOException(MOAIDMessageProvider.getInstance().getMessage(
- "proxy.01", new Object[] {requestedURL, publicURLPrefix}));
- // in case of GET request, append query string to requested URL;
- // otherwise, HttpURLConnection would perform a POST request
- if ("get".equalsIgnoreCase(req.getMethod()) && ! parameters.isEmpty()) {
- requestedURL = appendQueryString(requestedURL, parameters);
- }
- // build real URL in online application
- String realURLString = realURLPrefix + requestedURL.substring(publicURLPrefix.length());
- URL url = new URL(realURLString);
- Logger.debug("OA Request: " + req.getMethod() + " " + url.toString());
-
- HttpURLConnection conn = (HttpURLConnection)url.openConnection();
- conn.setRequestMethod(req.getMethod());
- conn.setDoInput(true);
- conn.setDoOutput(true);
- //conn.setUseCaches(false);
- conn.setAllowUserInteraction(true);
- conn.setInstanceFollowRedirects(false);
- if (conn instanceof HttpsURLConnection && sslSocketFactory != null) {
- HttpsURLConnection httpsConn = (HttpsURLConnection) conn;
- httpsConn.setSSLSocketFactory(sslSocketFactory);
- if (disableHostnameVerification)
- httpsConn.setHostnameVerifier(new HostnameNonVerifier());
- }
- return conn;
- }
- /**
- * @param requestedURL
- * @param parameters
- * @return
- */
- private String appendQueryString(String requestedURL, Map parameters) {
- String newURL = requestedURL;
- for (Iterator iter = parameters.keySet().iterator(); iter.hasNext();) {
- String paramName = (String)iter.next();
- String paramValue = (String)parameters.get(paramName);
- String paramString = paramName + "=" + paramValue;
- if (newURL.indexOf("?") < 0)
- newURL = newURL + "?" + paramString;
- else
- newURL = newURL + "&" + paramString;
- }
- return newURL;
- }
-
- /**
- * @author Stefan Knirsch
- * @version $Id$
- * A private class to change the standard HostName verifier to disable the
- * Hostname Verification Check
- */
- private class HostnameNonVerifier implements HostnameVerifier {
-
- /**
- * @see com.sun.net.ssl.HostnameVerifier#verify(String, String)
- */
- public boolean verify(String arg0, String arg1) {
- return true;
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java b/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
deleted file mode 100644
index db3c452bc..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package at.gv.egovernment.moa.id.proxy;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import at.gv.egovernment.moa.id.config.proxy.OAConfiguration;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * Implementation of interface <code>LoginParameterResolver</code>
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class DefaultLoginParameterResolver implements LoginParameterResolver {
-
- /**
- * Constructor
- */
- public DefaultLoginParameterResolver() {
- }
-
- /**
- * @see at.gv.egovernment.moa.id.proxy.LoginParameterResolver#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.auth.data.AuthenticationData, java.lang.String)
- */
- public Map getAuthenticationHeaders(
- OAConfiguration oaConf,
- AuthenticationData authData,
- String clientIPAddress) {
-
- Map result = new HashMap();
-
- if (oaConf.getAuthType().equals(OAConfiguration.BASIC_AUTH)) {
- String useridPredicate = oaConf.getBasicAuthUserIDMapping();
- String userid = resolveValue(useridPredicate, authData, clientIPAddress);
- String passwordPredicate = oaConf.getBasicAuthPasswordMapping();
- String password = resolveValue(passwordPredicate, authData, clientIPAddress);
-
- try {
- String userIDPassword = userid + ":" + password;
- String credentials = Base64Utils.encode(userIDPassword.getBytes());
- result.put("Authorization", "Basic " + credentials);
- }
- catch (IOException ignore) {
- }
- }
- else if (oaConf.getAuthType().equals(OAConfiguration.HEADER_AUTH)) {
- for (Iterator iter = oaConf.getHeaderAuthMapping().keySet().iterator(); iter.hasNext();) {
- String key = (String) iter.next();
- String predicate = (String) oaConf.getHeaderAuthMapping().get(key);
- String resolvedValue = resolveValue(predicate, authData, clientIPAddress);
- result.put(key, resolvedValue);
- }
- }
-
- return result;
- }
-
- /**
- * @see at.gv.egovernment.moa.id.proxy.LoginParameterResolver#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.auth.data.AuthenticationData, java.lang.String)
- */
- public Map getAuthenticationParameters(
- OAConfiguration oaConf,
- AuthenticationData authData,
- String clientIPAddress) {
-
- Map result = new HashMap();
-
- if (oaConf.getAuthType().equals(OAConfiguration.PARAM_AUTH)) {
- for (Iterator iter = oaConf.getParamAuthMapping().keySet().iterator(); iter.hasNext();) {
- String key = (String) iter.next();
- String predicate = (String) oaConf.getParamAuthMapping().get(key);
- String resolvedValue = resolveValue(predicate, authData, clientIPAddress);
- result.put(key, resolvedValue);
- }
- }
-
- return result;
- }
-
- /**
- * Resolves a login header or parameter value.
- * @param predicate header or parameter predicate name from online application configuration
- * @param authData authentication data for current login
- * @param clientIPAddress client IP address
- * @return header or parameter value resolved; <code>null</code> if unknown name is given
- */
- private static String resolveValue(String predicate, AuthenticationData authData, String clientIPAddress) {
- if (predicate.equals(MOAGivenName))
- return authData.getGivenName();
- else if (predicate.equals(MOAFamilyName))
- return authData.getFamilyName();
- else if (predicate.equals(MOADateOfBirth))
- return authData.getDateOfBirth();
- else if (predicate.equals(MOAVPK))
- return authData.getVPK();
- else if (predicate.equals(MOAPublicAuthority))
- if (authData.isPublicAuthority())
- return "true";
- else
- return "false";
- else if (predicate.equals(MOABKZ))
- return authData.getPublicAuthorityCode();
- else if (predicate.equals(MOAQualifiedCertificate))
- if (authData.isQualifiedCertificate())
- return "true";
- else
- return "false";
- else if (predicate.equals(MOAZMRZahl))
- return authData.getIdentificationValue();
- else if (predicate.equals(MOAIPAddress))
- return clientIPAddress;
- else return null;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java b/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java
deleted file mode 100644
index 497176a96..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package at.gv.egovernment.moa.id.proxy;
-
-import java.util.Map;
-
-import at.gv.egovernment.moa.id.config.proxy.OAConfiguration;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-
-/**
- * Determines authentication parameters and headers to be added to a {@link java.net.URLConnection}
- * to the remote online application.
- * Utilizes {@link OAConfiguration} and {@link AuthenticationData}.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public interface LoginParameterResolver {
-
- /** Constants used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code>,
- * naming predicates used by the <code>LoginParameterResolver</code>. */
- public static final String MOAGivenName = "MOAGivenName";
- /** Constant used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code> */
- public static final String MOAFamilyName = "MOAFamilyName";
- /** Constant used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code> */
- public static final String MOADateOfBirth = "MOADateOfBirth";
- /** Constant used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code> */
- public static final String MOAVPK = "MOAVPK";
- /** Constant used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code> */
- public static final String MOAPublicAuthority = "MOAPublicAuthority";
- /** Constant used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code> */
- public static final String MOABKZ = "MOABKZ";
- /** Constant used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code> */
- public static final String MOAQualifiedCertificate = "MOAQualifiedCertificate";
- /** Constant used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code> */
- public static final String MOAZMRZahl = "MOAZMRZahl";
- /** Constant used in <code>MOAIDConfiguration-1.1.xsd</code>, type <code>MOAAuthDataType</code> */
- public static final String MOAIPAddress = "MOAIPAddress";
-
- /**
- * Returns authentication headers to be added to a URLConnection.
- *
- * @param oaConf configuration data
- * @param authData authentication data
- * @param clientIPAddress client IP address
- * @return A map, the keys being header names and values being corresponding header values.
- * <br>In case of authentication type <code>"basic-auth"</code>, header fields
- * <code>username</code> and <code>password</code>.
- * <br>In case of authentication type <code>"header-auth"</code>, header fields
- * derived from parameter mapping and authentication data provided.
- * <br>Otherwise, an empty map.
- */
- public Map getAuthenticationHeaders (
- OAConfiguration oaConf,
- AuthenticationData authData,
- String clientIPAddress);
-
- /**
- * Returns request parameters to be added to a URLConnection.
- *
- * @param oaConf configuration data
- * @param authData authentication data
- * @param clientIPAddress client IP address
- * @return A map, the keys being parameter names and values being corresponding parameter values.
- * <br>In case of authentication type <code>"param-auth"</code>, parameters
- * derived from parameter mapping and authentication data provided.
- * <br>Otherwise, an empty map.
- */
- public Map getAuthenticationParameters (
- OAConfiguration oaConf,
- AuthenticationData authData,
- String clientIPAddress);
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverFactory.java b/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverFactory.java
deleted file mode 100644
index 2ab245923..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package at.gv.egovernment.moa.id.proxy;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
-import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter;
-
-/**
- * Factory delivering a {@link LoginParameterResolver} implementation for
- * an online application, initialized from configuration data.
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class LoginParameterResolverFactory {
-
- /** default login parameter resolver to be used for online application
- * where no special implementation of the <code>LoginParameterResolver</code>
- * interface is configured
- */
- private static LoginParameterResolver defaultLoginParameterResolver;
- /** mapping from online application public URL prefix to an implementation
- * of the <code>LoginParameterResolver</code> interface to be used;
- * if no mapping is given for an online application, the
- * <code>DefaultLoginParameterResolver</code> will be used */
- private static Map loginParameterResolverMap;
-
- /**
- * Initializes the <code>LoginParameterResolver</code> map from the configuration data.
- * @throws ConfigurationException when the configuration cannot be read,
- * or when a class name configured cannot be instantiated
- */
- public static void initialize() throws ConfigurationException {
- defaultLoginParameterResolver = new DefaultLoginParameterResolver();
- loginParameterResolverMap = new HashMap();
- ProxyConfigurationProvider proxyConf = ProxyConfigurationProvider.getInstance();
- for (int i = 0; i < proxyConf.getOnlineApplicationParameters().length; i++) {
- OAProxyParameter oaParam = proxyConf.getOnlineApplicationParameters()[i];
- String publicURLPrefix = oaParam.getPublicURLPrefix();
- String className = oaParam.getLoginParameterResolverImpl();
- if (className != null) {
- try {
- LoginParameterResolver lpr = (LoginParameterResolver)Class.forName(className).newInstance();
- loginParameterResolverMap.put(publicURLPrefix, lpr);
- }
- catch (Throwable ex) {
- throw new ConfigurationException("config.07", new Object[] {publicURLPrefix}, ex);
- }
- }
- }
- }
-
- /**
- * Gets the <code>LoginParameterResolver</code> implementation to be used for the given
- * online application.
- * @param publicURLPrefix public URL prefix of the online application
- * @return <code>LoginParameterResolver</code> implementation
- */
- public static LoginParameterResolver getLoginParameterResolver(String publicURLPrefix) {
- LoginParameterResolver lpr = (LoginParameterResolver) loginParameterResolverMap.get(publicURLPrefix);
- if (lpr == null)
- return defaultLoginParameterResolver;
- else
- return lpr;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java b/id.server/src/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
deleted file mode 100644
index da5d36678..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/MOAIDProxyInitializer.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package at.gv.egovernment.moa.id.proxy;
-
-import iaik.pki.PKIException;
-import iaik.pki.jsse.IAIKX509TrustManager;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-
-import javax.net.ssl.SSLSocketFactory;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter;
-import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
-import at.gv.egovernment.moa.id.iaik.config.LoggerConfigImpl;
-import at.gv.egovernment.moa.id.util.AxisSecureSocketFactory;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.id.util.SSLUtils;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Web application initializer
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class MOAIDProxyInitializer {
-
- /**
- * Initializes the web application components which need initialization:
- * logging, JSSE, MOA-ID Auth configuration, Axis, session cleaner.
- */
- public static void initialize()
- throws ConfigurationException, IOException, GeneralSecurityException, PKIException {
-
- Logger.setHierarchy("moa.id.proxy");
-
- // Restricts TLS cipher suites
- System.setProperty("https.cipherSuites", "SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_3DES_EDE_CBC_SHA");
-
- // load some jsse classes so that the integrity of the jars can be verified
- // before the iaik jce is installed as the security provider
- // this workaround is only needed when sun jsse is used in conjunction with
- // iaik-jce (on jdk1.3)
- ClassLoader cl = MOAIDProxyInitializer.class.getClassLoader();
- try {
- cl.loadClass("javax.security.cert.Certificate"); // from jcert.jar
- }
- catch (ClassNotFoundException e) {
- Logger.warn(MOAIDMessageProvider.getInstance().getMessage("init.01", null), e);
- }
-
- // Initializes the SSLSocketFactory store
- SSLUtils.initialize();
-
- // Initializes IAIKX509TrustManager logging
- String log4jConfigURL = System.getProperty("log4j.configuration");
- if (log4jConfigURL != null) {
- IAIKX509TrustManager.initLog(new LoggerConfigImpl(log4jConfigURL));
- }
-
- // Loads the configuration
- ProxyConfigurationProvider proxyConf = ProxyConfigurationProvider.reload();
-
- // Initializes the Axis secure socket factory for use in calling the MOA-Auth web service,
- // using configuration data
- ConnectionParameter connParamAuth = proxyConf.getAuthComponentConnectionParameter();
- if (connParamAuth.isHTTPSURL()) {
- SSLSocketFactory ssf = SSLUtils.getSSLSocketFactory(proxyConf, connParamAuth);
- AxisSecureSocketFactory.initialize(ssf);
- }
-
- // Initializes the Axis secure socket factories for use in calling the online applications,
- // using configuration data
- OAProxyParameter[] oaParams = proxyConf.getOnlineApplicationParameters();
- for (int i = 0; i < oaParams.length; i++) {
- OAProxyParameter oaParam = oaParams[i];
- ConnectionParameter oaConnParam = oaParam.getConnectionParameter();
- if (oaConnParam.isHTTPSURL())
- SSLUtils.getSSLSocketFactory(proxyConf, oaConnParam);
- }
-
- // Initializes the ConnectionBuilderFactory from configuration data
- ConnectionBuilderFactory.initialize();
-
- // Initializes the LoginParameterResolverFactory from configuration data
- LoginParameterResolverFactory.initialize();
-
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/WebmailLoginParameterResolver.class b/id.server/src/at/gv/egovernment/moa/id/proxy/WebmailLoginParameterResolver.class
deleted file mode 100644
index 49200265a..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/WebmailLoginParameterResolver.class
+++ /dev/null
Binary files differ
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilder.java
deleted file mode 100644
index e0e1fde4a..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package at.gv.egovernment.moa.id.proxy.builder;
-
-import java.text.MessageFormat;
-import java.util.Calendar;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.DateTimeUtils;
-
-/**
- * Builder for the <code>&lt;samlp:Request&gt;</code> used for querying
- * the authentication data <code>&lt;saml:Assertion&gt;</code>.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLRequestBuilder implements Constants {
- /** samlp-Request template */
- private static final String REQUEST =
- "<samlp:Request xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\" RequestID=\"{0}\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"{1}\">" +
- "<samlp:AssertionArtifact>{2}</samlp:AssertionArtifact>" +
- "</samlp:Request>";
-
- /**
- * Constructor for SAMLRequestBuilder.
- */
- public SAMLRequestBuilder() {
- super();
- }
-
- /**
- * Builds the <code>&lt;samlp:Request&gt;</code>.
- * @param requestID request ID
- * @param samlArtifactBase64 SAML artifact, encoded BASE64
- * @return the DOM element
- */
- public Element build(String requestID, String samlArtifactBase64) throws BuildException {
- try {
- String issueInstant = DateTimeUtils.buildDateTime(Calendar.getInstance());
- String request = MessageFormat.format(REQUEST, new Object[] {requestID, issueInstant, samlArtifactBase64});
- Element requestElem = DOMUtils.parseDocument(request, false, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
- return requestElem;
- }
- catch (Throwable ex) {
- throw new BuildException(
- "builder.00",
- new Object[] {"samlp:Request", ex.toString()},
- ex);
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/invoke/GetAuthenticationDataInvoker.java b/id.server/src/at/gv/egovernment/moa/id/proxy/invoke/GetAuthenticationDataInvoker.java
deleted file mode 100644
index 4e9a72111..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/invoke/GetAuthenticationDataInvoker.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package at.gv.egovernment.moa.id.proxy.invoke;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-
-import org.apache.axis.message.SOAPBodyElement;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.AuthenticationException;
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.id.ServiceException;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.id.data.SAMLStatus;
-import at.gv.egovernment.moa.id.proxy.builder.SAMLRequestBuilder;
-import at.gv.egovernment.moa.id.proxy.parser.SAMLResponseParser;
-import at.gv.egovernment.moa.id.proxy.servlet.ProxyException;
-import at.gv.egovernment.moa.id.util.Random;
-
-/**
- * Invoker of
- * <ul>
- * <li>either the GetAuthenticationData web service of MOA-ID Auth</li>
- * <li>or the API call {@link at.gv.egovernment.moa.id.auth.AuthenticationServer#getAuthenticationData},</li>
- * </ul>
- * depending of the configuration.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class GetAuthenticationDataInvoker {
- /** Create a new QName object for the webservice endpoint */
- private static final QName SERVICE_QNAME = new QName("GetAuthenticationData");
-
- /** invoked object for API call of MOA-ID Auth */
- private static Object apiServer = null;
- /** invoked method for API call of MOA-ID Auth */
- private static Method apiMethod = null;
-
- /**
- * Invokes the service passing domain model objects.
- * @param samlArtifact SAML artifact
- * @return AuthenticationData object
- * @throws ServiceException on any exception thrown
- */
- /**
- * Get authentication data from the MOA-ID Auth component,
- * either via API call or via web service call.
- * @param samlArtifact SAML artifact to be used as a parameter
- * @return AuthenticationData
- */
- public AuthenticationData getAuthenticationData(String samlArtifact)
- throws ConfigurationException, ProxyException, BuildException, ServiceException, ParseException, AuthenticationException {
-
- ConnectionParameter authConnParam =
- ProxyConfigurationProvider.getInstance().getAuthComponentConnectionParameter();
- if (authConnParam == null) {
- try {
- if (apiServer == null) {
- Class serverClass = Class.forName("at.gv.egovernment.moa.id.auth.AuthenticationServer");
- Method getInstanceMethod = serverClass.getMethod("getInstance", null);
- apiServer = getInstanceMethod.invoke(null, null);
- apiMethod = serverClass.getMethod(
- "getAuthenticationData", new Class[] {String.class});
- }
- AuthenticationData authData = (AuthenticationData)apiMethod.invoke(apiServer, new Object[] {samlArtifact});
- return authData;
- }
- catch (InvocationTargetException ex) {
- Throwable targetEx = ex.getTargetException();
- if (targetEx instanceof AuthenticationException)
- throw (AuthenticationException) targetEx;
- else
- throw new ProxyException("proxy.09", new Object[] {targetEx.toString()});
- }
- catch (Throwable ex) {
- throw new ProxyException("proxy.09", new Object[] {ex.toString()});
- }
- }
- else {
- Element samlpRequest = new SAMLRequestBuilder().build(Random.nextRandom(), samlArtifact);
- Element samlpResponse = getAuthenticationData(samlpRequest);
- SAMLResponseParser srp = new SAMLResponseParser(samlpResponse);
- SAMLStatus status = srp.parseStatusCode();
- if (! "samlp:Success".equals(status.getStatusCode())) {
- // on error status throw exception
- String code = status.getStatusCode();
- if (status.getSubStatusCode() != null && status.getSubStatusCode().length() > 0)
- code += "(" + status.getSubStatusCode() + ")";
- throw new ServiceException("service.02", new Object[] {code, status.getStatusMessage()});
- }
- return srp.parseAuthenticationData();
- }
- }
-
- /**
- * Invokes the service passing DOM elements.
- * @param request request DOM element
- * @return response DOM element
- * @throws ServiceException on any exception thrown
- */
- public Element getAuthenticationData(Element request) throws ServiceException {
- try {
- Service service = ServiceFactory.newInstance().createService(SERVICE_QNAME);
- Call call = service.createCall();
- SOAPBodyElement body =
- new SOAPBodyElement(request);
- SOAPBodyElement[] params = new SOAPBodyElement[] {body};
- Vector responses;
- SOAPBodyElement response;
-
- String endPoint;
- ConnectionParameter authConnParam =
- ProxyConfigurationProvider.getInstance().getAuthComponentConnectionParameter();
-
- //If the ConnectionParameter do NOT exist, we throw an exception ....
- if (authConnParam!=null) {
- endPoint = authConnParam.getUrl();
- call.setTargetEndpointAddress(endPoint);
- responses = (Vector) call.invoke(SERVICE_QNAME, params);
- response = (SOAPBodyElement) responses.get(0);
- return response.getAsDOM();
- }
- else
- {
- throw new ServiceException("service.01", null);
- }
- }
- catch (Exception ex) {
- throw new ServiceException("service.00", new Object[] {ex.toString()}, ex);
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java b/id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
deleted file mode 100644
index ce0743b3d..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package at.gv.egovernment.moa.id.proxy.parser;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.util.BoolUtils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Parser for the <code>&lt;saml:Assertion&gt;</code> returned by the
- * <code>GetAuthenticationData</code> web service.
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationDataAssertionParser implements Constants {
-
- /** Prefix for SAML-Xpath-expressions */
- private static String SAML = SAML_PREFIX + ":";
- /** Prefix for PersonData-Xpath-expressions */
- private static String PR = PD_PREFIX + ":";
- /** Prefix for Attribute MajorVersion in an Xpath-expression */
- private static String MAJOR_VERSION_XPATH =
- "@MajorVersion";
- /** Prefix for Attribute MinorVersion in an Xpath-expression */
- private static String MINOR_VERSION_XPATH =
- "@MinorVersion";
- /** Prefix for Attribute AssertionID in an Xpath-expression */
- private static String ASSERTION_ID_XPATH =
- "@AssertionID";
- /** Prefix for Attribute Issuer in an Xpath-expression */
- private static String ISSUER_XPATH =
- "@Issuer";
- /** Prefix for Attribute IssueInstant in an Xpath-expression */
- private static String ISSUE_INSTANT_XPATH =
- "@IssueInstant";
- /** Prefix for Element AttributeStatement in an Xpath-expression */
- private static String ATTRIBUTESTATEMENT_XPATH =
- SAML + "AttributeStatement/";
- /** Prefix for Element NameIdentifier in an Xpath-expression */
- private static String VPK_XPATH =
- ATTRIBUTESTATEMENT_XPATH +
- SAML + "Subject/" +
- SAML + "NameIdentifier";
- /** Prefix for Element Person in an Xpath-expression */
- private static String PERSONDATA_XPATH =
- ATTRIBUTESTATEMENT_XPATH +
- SAML + "Attribute[@AttributeName=\"PersonData\"]/" +
- SAML + "AttributeValue/" +
- PR + "Person/";
- /** Prefix for Element Value in an Xpath-expression */
- private static String ZMRZAHL_XPATH =
- PERSONDATA_XPATH +
- PR + "Identification/" +
- PR + "Value";
- /** Prefix for Element GivenName in an Xpath-expression */
- private static String GIVEN_NAME_XPATH =
- PERSONDATA_XPATH +
- PR + "Name/" +
- PR + "GivenName";
- /** Prefix for Element FamilyName in an Xpath-expression */
- private static String FAMILY_NAME_XPATH =
- PERSONDATA_XPATH +
- PR + "Name/" +
- PR + "FamilyName";
- /** Prefix for Element DateOfBirth in an Xpath-expression */
- private static String DATE_OF_BIRTH_XPATH =
- PERSONDATA_XPATH +
- PR + "DateOfBirth";
- /** Prefix for Element AttributeValue in an Xpath-expression */
- private static String IS_QUALIFIED_CERT_XPATH =
- ATTRIBUTESTATEMENT_XPATH +
- SAML + "Attribute[@AttributeName=\"isQualifiedCertificate\"]/" +
- SAML + "AttributeValue";
- /** Prefix for Element AttributeValue in an Xpath-expression */
- private static String PUBLIC_AUTHORITY_XPATH =
- ATTRIBUTESTATEMENT_XPATH +
- SAML + "Attribute[@AttributeName=\"isPublicAuthority\"]/" +
- SAML + "AttributeValue";
- /** Element samlAssertion represents the SAML:Assertion */
- private Element samlAssertion;
-
- /**
- * Constructor
- * @param samlAssertion samlpResponse the <code>&lt;samlp:Response&gt;</code> as a DOM element
- */
- public AuthenticationDataAssertionParser(Element samlAssertion) {
- this.samlAssertion = samlAssertion;
- }
-
- /**
- * Parses the <code>&lt;saml:Assertion&gt;</code>.
- * @return <code>AuthenticationData</code> object
- * @throws ParseException on any error
- */
- public AuthenticationData parseAuthenticationData()
- throws ParseException {
-
- try {
- AuthenticationData authData = new AuthenticationData();
- //ÄNDERN: NUR der Identification-Teil
- authData.setSamlAssertion(DOMUtils.serializeNode(samlAssertion));
- authData.setMajorVersion(new Integer(
- XPathUtils.getAttributeValue(samlAssertion, MAJOR_VERSION_XPATH, "-1")).intValue());
- authData.setMinorVersion(new Integer(
- XPathUtils.getAttributeValue(samlAssertion, MINOR_VERSION_XPATH, "-1")).intValue());
- authData.setAssertionID(
- XPathUtils.getAttributeValue(samlAssertion, ASSERTION_ID_XPATH, ""));
- authData.setIssuer(
- XPathUtils.getAttributeValue(samlAssertion, ISSUER_XPATH, ""));
- authData.setIssueInstant(
- XPathUtils.getAttributeValue(samlAssertion, ISSUE_INSTANT_XPATH, ""));
- authData.setVPK(
- XPathUtils.getElementValue(samlAssertion, VPK_XPATH, ""));
- authData.setIdentificationValue(
- XPathUtils.getElementValue(samlAssertion, ZMRZAHL_XPATH, ""));
- authData.setGivenName(
- XPathUtils.getElementValue(samlAssertion, GIVEN_NAME_XPATH, ""));
- authData.setFamilyName(
- XPathUtils.getElementValue(samlAssertion, FAMILY_NAME_XPATH, ""));
- authData.setDateOfBirth(
- XPathUtils.getElementValue(samlAssertion, DATE_OF_BIRTH_XPATH, ""));
- authData.setQualifiedCertificate(BoolUtils.valueOf(
- XPathUtils.getElementValue(samlAssertion, IS_QUALIFIED_CERT_XPATH, "")));
- String publicAuthority =
- XPathUtils.getElementValue(samlAssertion, PUBLIC_AUTHORITY_XPATH, null);
- if (publicAuthority == null) {
- authData.setPublicAuthority(false);
- authData.setPublicAuthorityCode("");
- }
- else {
- authData.setPublicAuthority(true);
- if (! publicAuthority.equalsIgnoreCase("true"))
- authData.setPublicAuthorityCode(publicAuthority);
- }
- return authData;
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString() }, t);
- }
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParser.java
deleted file mode 100644
index 9f77578fd..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParser.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package at.gv.egovernment.moa.id.proxy.parser;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.id.data.SAMLStatus;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Parser for the <code>&lt;samlp:Response&gt;</code> returned by the
- * <code>GetAuthenticationData</code> web service.
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLResponseParser implements Constants {
- /** Element containing the samlResponse */
- private Element samlResponse;
- /** Xpath prefix for reaching SAMLP Namespaces */
- private static String SAMLP = SAMLP_PREFIX + ":";
- /** Xpath prefix for reaching SAML Namespaces */
- private static String SAML = SAML_PREFIX + ":";
- /** Xpath prefix for reaching PersonData Namespaces */
- private static String PR = PD_PREFIX + ":";
- /** Xpath expression for reaching the SAMLP:Response element */
- private static final String ROOT =
- "/" + SAMLP + "Response/";
- /** Xpath expression for reaching the SAMLP:Status element */
- private static final String STATUS_XPATH =
- ROOT +
- SAMLP + "Status/";
- /** Xpath expression for reaching the SAMLP:StatusCode_Value attribute */
- private static final String STATUSCODE_XPATH =
- STATUS_XPATH +
- SAMLP + "StatusCode/@Value";
- /** Xpath expression for reaching the SAMLP:SubStatusCode_Value attribute */
- private static final String SUBSTATUSCODE_XPATH =
- STATUS_XPATH +
- SAMLP + "StatusCode/" +
- SAMLP + "StatusCode/@Value";
- /** Xpath expression for reaching the SAMLP:StatusMessage element */
- private static final String STATUSMESSAGE_XPATH =
- STATUS_XPATH +
- SAMLP + "StatusMessage";
- /** Xpath expression for reaching the SAML:Assertion element */
- private static String ASSERTION_XPATH =
- ROOT +
- SAML + "Assertion";
-
- /**
- * Constructor
- * @param samlResponse the <code>&lt;samlp:Response&gt;</code> as a DOM element
- */
- public SAMLResponseParser(Element samlResponse) {
- this.samlResponse = samlResponse;
- }
-
- /**
- * Parses the <code>&lt;samlp:StatusCode&gt;</code> from the <code>&lt;samlp:Response&gt;</code>.
- * @return <code>AuthenticationData</code> object
- * @throws ParseException on any parsing error
- */
- public SAMLStatus parseStatusCode()
- throws ParseException {
-
- SAMLStatus status = new SAMLStatus();
- try {
- status.setStatusCode(
- XPathUtils.getAttributeValue(samlResponse, STATUSCODE_XPATH, ""));
- status.setSubStatusCode(
- XPathUtils.getAttributeValue(samlResponse, SUBSTATUSCODE_XPATH, ""));
- status.setStatusMessage(
- XPathUtils.getElementValue(samlResponse, STATUSMESSAGE_XPATH, ""));
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString() }, t);
- }
- return status;
- }
-
- /**
- * Parses the <code>&lt;saml:Assertion&gt;</code> from the <code>&lt;samlp:Response&gt;</code>.
- * @return <code>AuthenticationData</code> object
- * @throws ParseException on any parsing error
- */
- public AuthenticationData parseAuthenticationData()
- throws ParseException {
-
- Element samlAssertion;
- try {
- samlAssertion = (Element)XPathUtils.selectSingleNode(samlResponse, ASSERTION_XPATH);
- }
- catch (Throwable t) {
- throw new ParseException("parser.01", new Object[] { t.toString() }, t);
- }
- return new AuthenticationDataAssertionParser(samlAssertion).parseAuthenticationData();
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java b/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java
deleted file mode 100644
index a00c48387..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package at.gv.egovernment.moa.id.proxy.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import at.gv.egovernment.moa.id.proxy.MOAIDProxyInitializer;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Servlet requested for updating the MOA-ID Auth configuration from configuration file
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ConfigurationServlet extends HttpServlet {
- /** The standard String for DTD Doc-type */
- private static final String DOC_TYPE =
- "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n";
-
- /**
- * Handle a HTTP GET request, used to indicated that the MOA
- * configuration needs to be updated (reloaded).
- *
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest, HttpServletResponse)
- */
- public void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
-
- MOAIDMessageProvider msg = MOAIDMessageProvider.getInstance();
- PrintWriter out;
-
- response.setContentType("text/html");
- out = response.getWriter();
- out.println(DOC_TYPE);
- out.println("<head><title>MOA configuration update</title></head>");
- out.println("<body bgcolor=\"#FFFFFF\">");
- try {
- MOAIDProxyInitializer.initialize();
- String message = msg.getMessage("config.00", null);
- Logger.info(message);
- out.println("<p><b>");
- out.println(message);
- out.println("</b></p>");
- } catch (Throwable t) {
- String errorMessage = msg.getMessage("config.04", null);
- Logger.error(errorMessage, t);
- out.println("<p><b>");
- out.println(errorMessage);
- out.println("</b></p>");
- }
- out.println("</body>");
-
- out.flush();
- out.close();
- }
-
- /**
- * Do the same as <code>doGet</code>.
- *
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest, HttpServletResponse)
- */
- public void doPost(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- doGet(request, response);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java b/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java
deleted file mode 100644
index 0080c010e..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package at.gv.egovernment.moa.id.proxy.servlet;
-
-import at.gv.egovernment.moa.id.MOAIDException;
-
-/**
- * Exception thrown while proxying a request to the online application
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ProxyException extends MOAIDException {
-
- /**
- * Constructor for ProxyException.
- * @param messageId
- * @param parameters
- */
- public ProxyException(String messageId, Object[] parameters) {
- super(messageId, parameters);
- }
-
- /**
- * Constructor for ProxyException.
- * @param messageId
- * @param parameters
- * @param wrapped
- */
- public ProxyException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
- super(messageId, parameters, wrapped);
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java b/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
deleted file mode 100644
index c52de2ba8..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
+++ /dev/null
@@ -1,531 +0,0 @@
-package at.gv.egovernment.moa.id.proxy.servlet;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.HttpURLConnection;
-import java.net.URLEncoder;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.net.ssl.SSLSocketFactory;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import at.gv.egovernment.moa.id.AuthenticationException;
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.id.MOAIDException;
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.id.ServiceException;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
-import at.gv.egovernment.moa.id.config.proxy.OAConfiguration;
-import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.id.data.CookieManager;
-import at.gv.egovernment.moa.id.proxy.ConnectionBuilder;
-import at.gv.egovernment.moa.id.proxy.ConnectionBuilderFactory;
-import at.gv.egovernment.moa.id.proxy.LoginParameterResolver;
-import at.gv.egovernment.moa.id.proxy.LoginParameterResolverFactory;
-import at.gv.egovernment.moa.id.proxy.MOAIDProxyInitializer;
-import at.gv.egovernment.moa.id.proxy.invoke.GetAuthenticationDataInvoker;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.id.util.SSLUtils;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * Servlet requested for logging in at an online application,
- * and then for proxying requests to the online application.
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class ProxyServlet extends HttpServlet {
- /** Name of the Parameter for the Target */
- private static final String PARAM_TARGET = "Target";
- /** Name of the Parameter for the SAMLArtifact */
- private static final String PARAM_SAMLARTIFACT = "SAMLArtifact";
-
- /** Name of the Attribute for the PublicURLPrefix */
- private static final String ATT_PUBLIC_URLPREFIX = "PublicURLPrefix";
- /** Name of the Attribute for the RealURLPrefix */
- private static final String ATT_REAL_URLPREFIX = "RealURLPrefix";
- /** Name of the Attribute for the SSLSocketFactory */
- private static final String ATT_SSL_SOCKET_FACTORY = "SSLSocketFactory";
- /** Name of the Attribute for the LoginHeaders */
- private static final String ATT_LOGIN_HEADERS = "LoginHeaders";
- /** Name of the Attribute for the LoginParameters */
- private static final String ATT_LOGIN_PARAMETERS = "LoginParameters";
-
- /**
- * @see javax.servlet.http.HttpServlet#service(HttpServletRequest, HttpServletResponse)
- */
- protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-
- Logger.debug("getRequestURL:" + req.getRequestURL().toString());
- try {
- if (req.getParameter(PARAM_SAMLARTIFACT) != null && req.getParameter(PARAM_TARGET) != null)
- login(req, resp);
- else
- tunnelRequest(req, resp);
- }
- catch (MOAIDException ex) {
- handleError(resp, ex.toString(), ex);
- }
- catch (Throwable ex) {
- handleError(resp, ex.toString(), ex);
- }
- }
-
- /**
- * Login to online application at first call of servlet for a user session.<br/>
- * <ul>
- * <li>Acquires authentication data from the MOA-ID Auth component.</li>
- * <li>Reads configuration data for the online application.</li>
- * <li>Resolves login parameters.</li>
- * <li>Sets up an SSLSocketFactory in case of a secure connection to the online application.</li>
- * <li>For a stateless online application, stores data in the HttpSession.</li>
- * <li>Tunnels the request to the online application.</li>
- * </ul>
- * @param req
- * @param resp
- * @throws ConfigurationException when wrong configuration is encountered
- * @throws ProxyException when wrong configuration is encountered
- * @throws BuildException while building the request for MOA-ID Auth
- * @throws ServiceException while invoking MOA-ID Auth
- * @throws ParseException while parsing the response from MOA-ID Auth
- */
- private void login(HttpServletRequest req, HttpServletResponse resp) throws ConfigurationException, ProxyException, BuildException, ServiceException, ParseException, AuthenticationException {
-
- String samlArtifact = req.getParameter(PARAM_SAMLARTIFACT);
- Logger.debug("moa-id-proxy login " + PARAM_SAMLARTIFACT + ": " + samlArtifact);
- // String target = req.getParameter(PARAM_TARGET); parameter given but not processed
-
- // get authentication data from the MOA-ID Auth component
- AuthenticationData authData = new GetAuthenticationDataInvoker().getAuthenticationData(samlArtifact);
-
- String urlRequested = req.getRequestURL().toString();
-
- // read configuration data
- ProxyConfigurationProvider proxyConf = ProxyConfigurationProvider.getInstance();
- OAProxyParameter oaParam = proxyConf.getOnlineApplicationParameter(urlRequested);
- if (oaParam == null) {
- throw new ProxyException("proxy.02", new Object[] { urlRequested });
- }
- String publicURLPrefix = oaParam.getPublicURLPrefix();
- Logger.debug("OA: " + publicURLPrefix);
- OAConfiguration oaConf = oaParam.getOaConfiguration();
- ConnectionParameter oaConnParam = oaParam.getConnectionParameter();
- String realURLPrefix = oaConnParam.getUrl();
-
- // resolve login parameters to be forwarded to online application
- LoginParameterResolver lpr = LoginParameterResolverFactory.getLoginParameterResolver(publicURLPrefix);
- String clientIPAddress = req.getRemoteAddr();
- Map loginHeaders = null;
- Map loginParameters = null;
- if (oaConf.getAuthType().equals(OAConfiguration.PARAM_AUTH))
- loginParameters = lpr.getAuthenticationParameters(oaConf, authData, clientIPAddress);
- else
- loginHeaders = lpr.getAuthenticationHeaders(oaConf, authData, clientIPAddress);
-
- // setup SSLSocketFactory for communication with the online application
- SSLSocketFactory ssf = null;
- if (oaConnParam.isHTTPSURL()) {
- try {
- ssf = SSLUtils.getSSLSocketFactory(proxyConf, oaConnParam);
- }
- catch (Throwable ex) {
- throw new ProxyException("proxy.05", new Object[] { oaConnParam.getUrl(), ex.toString()}, ex);
- }
- }
-
- try {
- // for stateless online application, store data in HttpSession
- String loginType = oaConf.getLoginType();
- Logger.debug("Login type: " + loginType);
- if (loginType.equals(OAConfiguration.LOGINTYPE_STATELESS)) {
- HttpSession session = req.getSession();
- int sessionTimeOut = oaParam.getSessionTimeOut();
- if (sessionTimeOut == 0)
- sessionTimeOut = 60 * 60; // default 1 h
- session.setMaxInactiveInterval(sessionTimeOut);
- session.setAttribute(ATT_PUBLIC_URLPREFIX, publicURLPrefix);
- session.setAttribute(ATT_REAL_URLPREFIX, realURLPrefix);
- session.setAttribute(ATT_SSL_SOCKET_FACTORY, ssf);
- session.setAttribute(ATT_LOGIN_HEADERS, loginHeaders);
- session.setAttribute(ATT_LOGIN_PARAMETERS, loginParameters);
- Logger.debug("moa-id-proxy: HTTPSession angelegt");
- }
-
- // tunnel request to the online application
- int respcode = tunnelRequest(req, resp, loginHeaders, loginParameters, publicURLPrefix, realURLPrefix, ssf);
- if (respcode == 401)
- {
- Logger.debug("Got 401, trying again");
-
- respcode = tunnelRequest(req, resp, loginHeaders, loginParameters, publicURLPrefix, realURLPrefix, ssf);
- if (respcode == 401)
- throw new ProxyException("proxy.12", new Object[] { realURLPrefix});
- }
- }
- catch (ProxyException ex) {
- throw new ProxyException("proxy.12", new Object[] { realURLPrefix});
- }
- catch (Throwable ex) {
- throw new ProxyException("proxy.04", new Object[] { urlRequested, ex.toString()}, ex);
- }
- }
-
- /**
- * Tunnels a request to the stateless online application using data stored in the HTTP session.
- * @param req HTTP request
- * @param resp HTTP response
- * @throws IOException if an I/O error occurs
- */
- private void tunnelRequest(HttpServletRequest req, HttpServletResponse resp) throws ProxyException, IOException {
-
- Logger.debug("Tunnel request (stateless)");
- HttpSession session = req.getSession(false);
- if (session == null)
- throw new ProxyException("proxy.07", null);
- String publicURLPrefix = (String) session.getAttribute(ATT_PUBLIC_URLPREFIX);
- String realURLPrefix = (String) session.getAttribute(ATT_REAL_URLPREFIX);
- SSLSocketFactory ssf = (SSLSocketFactory) session.getAttribute(ATT_SSL_SOCKET_FACTORY);
- Map loginHeaders = (Map) session.getAttribute(ATT_LOGIN_HEADERS);
- Map loginParameters = (Map) session.getAttribute(ATT_LOGIN_PARAMETERS);
- if (publicURLPrefix == null || realURLPrefix == null)
- throw new ProxyException("proxy.08", new Object[] { req.getRequestURL().toString()});
-
- int respcode = tunnelRequest(req, resp, loginHeaders, loginParameters, publicURLPrefix, realURLPrefix, ssf);
- if (respcode == 401)
- {
- Logger.debug("Got 401, trying again");
- respcode = tunnelRequest(req, resp, loginHeaders, loginParameters, publicURLPrefix, realURLPrefix, ssf);
- if (respcode == 401)
- throw new ProxyException("proxy.12", new Object[] { realURLPrefix});
- }
- }
-
-/**
- * Tunnels a request to the online application using given URL mapping and SSLSocketFactory.
- * This method returns the ResponseCode of the request to the online application.
- * @param req HTTP request
- * @param resp HTTP response
- * @param loginHeaders header field/values to be inserted for purposes of authentication;
- * may be <code>null</code>
- * @param loginParameters parameter name/values to be inserted for purposes of authentication;
- * may be <code>null</code>
- * @param publicURLPrefix prefix of request URL to be substituted for the <code>realURLPrefix</code>
- * @param realURLPrefix prefix of online application URL to substitute the <code>publicURLPrefix</code>
- * @param ssf SSLSocketFactory to use
- * @throws IOException if an I/O error occurs
- */
-private int tunnelRequest(HttpServletRequest req, HttpServletResponse resp, Map loginHeaders, Map loginParameters, String publicURLPrefix, String realURLPrefix, SSLSocketFactory ssf)
- throws IOException {
-
- // collect headers from request
- Map headers = new HashMap();
- for (Enumeration enum = req.getHeaderNames(); enum.hasMoreElements();) {
- String headerKey = (String) enum.nextElement();
- //We ignore any Basic-Auth-Headers from the client
- if (headerKey.equalsIgnoreCase("Authorization"))
- { Logger.debug("Ignoring authorization-header from browser: " +req.getHeader(headerKey) );
- }
- else
- headers.put(headerKey, req.getHeader(headerKey));
- }
- // collect login headers, possibly overwriting headers from request
- if (loginHeaders != null) {
- for (Iterator iter = loginHeaders.keySet().iterator(); iter.hasNext();) {
- String headerKey = (String) iter.next();
- headers.put(headerKey, loginHeaders.get(headerKey));
- }
- }
- // collect parameters from request
- Map parameters = new HashMap();
- for (Enumeration enum = req.getParameterNames(); enum.hasMoreElements();) {
- String paramName = (String) enum.nextElement();
- parameters.put(paramName, req.getParameter(paramName));
- }
- // collect login parameters, possibly overwriting parameters from request
- if (loginParameters != null) {
- for (Iterator iter = loginParameters.keySet().iterator(); iter.hasNext();) {
- String paramName = (String) iter.next();
- parameters.put(paramName, loginParameters.get(paramName));
- }
- }
-
- headers.remove("content-length");
- parameters.remove(PARAM_SAMLARTIFACT);
- parameters.remove(PARAM_TARGET);
-
- ConnectionBuilder cb = ConnectionBuilderFactory.getConnectionBuilder(publicURLPrefix);
- HttpURLConnection conn = cb.buildConnection(req, publicURLPrefix, realURLPrefix, ssf, parameters);
-
- //Set Cookies...
-
- String cookieString = CookieManager.getInstance().getCookie(req.getSession().getId());
- if (cookieString!=null)
- {
- //If we get Cookies from Client, we put them throgh if they dont exist/conflict with the stored Cookies
- for (Iterator iter = headers.keySet().iterator(); iter.hasNext();) {
- String headerKey = (String) iter.next();
- String headerValue = (String) headers.get(headerKey);
- if (headerKey.equalsIgnoreCase("Cookie"))
- CookieManager.getInstance().saveOldCookies(req.getSession().getId(), headerValue);
- }
- cookieString = CookieManager.getInstance().getCookie(req.getSession().getId());
- headers.put("cookie", cookieString);
- }
-
- // set headers as request properties of URLConnection
- for (Iterator iter = headers.keySet().iterator(); iter.hasNext();) {
- String headerKey = (String) iter.next();
- String headerValue = (String) headers.get(headerKey);
- conn.setRequestProperty(headerKey, headerValue);
- Logger.debug("Req header " + headerKey + ": " + headers.get(headerKey));
- if (Logger.isDebugEnabled() && isBasicAuthenticationHeader(headerKey, headerValue)) {
- String credentials = headerValue.substring(6);
- String userIDPassword = new String(Base64Utils.decode(credentials, false));
- Logger.debug(":UserID:Password: :" + userIDPassword + ":");
- }
- }
- // Write out parameters into output stream of URLConnection.
- // On GET request, do not send parameters in any case,
- // otherwise HttpURLConnection would send a POST.
- if (!"get".equalsIgnoreCase(req.getMethod()) && !parameters.isEmpty()) {
- boolean firstParam = true;
- StringWriter sb = new StringWriter();
- for (Iterator iter = parameters.keySet().iterator(); iter.hasNext();) {
- String paramname = (String) iter.next();
- String value = URLEncoder.encode((String) parameters.get(paramname));
- if (firstParam)
- firstParam = false;
- else
- sb.write("&");
- sb.write(paramname);
- sb.write("=");
- sb.write(value);
- Logger.debug("Req param " + paramname + ": " + value);
- }
- PrintWriter reqOut = new PrintWriter(conn.getOutputStream());
- reqOut.write(sb.toString());
- reqOut.flush();
- reqOut.close();
- }
- // connect
- conn.connect();
-
- // Read response status and content type.
- // If the connection returns a 401 disconnect and return
- // otherwise the attempt to read data from that connection
- // will result in an error
-
- if (conn.getResponseCode()==HttpURLConnection.HTTP_UNAUTHORIZED)
- {
- Logger.debug("Found 401... searching cookies");
- String headerKey;
-
- int i = 1;
- CookieManager cm = CookieManager.getInstance();
- while ((headerKey = conn.getHeaderFieldKey(i)) != null) {
- String headerValue = conn.getHeaderField(i);
- if (headerKey.equalsIgnoreCase("set-cookie"))
- { cm.saveCookie(req.getSession().getId(), headerValue);
- cm.add401(req.getSession().getId(),headerValue);
- Logger.debug("Cookie " + headerValue);
- Logger.debug("CookieSession " + req.getSession().getId());
- }
- i++;
- }
-
- conn.disconnect();
- return conn.getResponseCode();
- }
- resp.setStatus(conn.getResponseCode());
- resp.setContentType(conn.getContentType());
-
- // Read response headers
- // Omit response header "content-length" if response header "Transfer-encoding: chunked" is set.
- // Otherwise, the connection will not be kept alive, resulting in subsequent missing requests.
- // See JavaDoc of javax.servlet.http.HttpServlet:
- // When using HTTP 1.1 chunked encoding (which means that the response has a Transfer-Encoding header), do not set the Content-Length header.
- Map respHeaders = new HashMap();
- boolean chunked = false;
- String contentLengthKey = null;
- String transferEncodingKey = null;
- int i = 1;
- String headerKey;
- while ((headerKey = conn.getHeaderFieldKey(i)) != null) {
- String headerValue = conn.getHeaderField(i);
- respHeaders.put(headerKey, headerValue);
- if (isTransferEncodingChunkedHeader(headerKey, headerValue)) {
- chunked = true;
- transferEncodingKey = headerKey;
- }
- CookieManager cm = CookieManager.getInstance();
- if (headerKey.equalsIgnoreCase("set-cookie"))
- { cm.saveCookie(req.getSession().getId(), headerValue);
- Logger.debug("Cookie " + headerValue);
- Logger.debug("CookieSession " + req.getSession().getId());
- }
- if ("content-length".equalsIgnoreCase(headerKey))
- contentLengthKey = headerKey;
- Logger.debug("Resp header " + headerKey + ": " + headerValue);
- i++;
- }
- if (chunked && contentLengthKey != null) {
- respHeaders.remove(transferEncodingKey);
- Logger.debug("Resp header " + transferEncodingKey + " REMOVED");
- }
-
- //Get a Hash-Map of all 401-set-cookies
- HashMap cookies401 = CookieManager.getInstance().get401(req.getSession().getId());
-
- for (Iterator iter = respHeaders.keySet().iterator(); iter.hasNext();) {
- headerKey = (String) iter.next();
-
- if (headerKey.equalsIgnoreCase("Set-Cookie"))
- {
- String headerValue = (String) respHeaders.get(headerKey);
- Logger.debug("Found 'Set-Cookie' in ResponseHeaders: " + headerValue);
- if(!cookies401.containsKey(headerValue.substring(0, headerValue.indexOf("="))))
- {
- // If we dont already have a Set-Cookie-Value for THAT Cookie we create one...
- CookieManager.getInstance().add401(req.getSession().getId(), headerValue);
- }
- }
- }
-
- //write out all Responseheaders != "set-cookie"
- for (Iterator iter = respHeaders.keySet().iterator(); iter.hasNext();) {
- headerKey = (String) iter.next();
- if (!headerKey.equalsIgnoreCase("Set-Cookie"))
- resp.addHeader(headerKey, (String) respHeaders.get(headerKey));
- }
-
- //write out all Responseheaders = "set-cookie"
- cookies401 = CookieManager.getInstance().get401(req.getSession().getId());
- Iterator cookie_i = cookies401.values().iterator();
- while (cookie_i.hasNext()) {
- String element = (String) cookie_i.next();
- resp.addHeader("Set-Cookie", element);
- }
- //Delete all "Set-Cookie" - Values
- CookieManager.getInstance().clear401(req.getSession().getId());
-
- // read response stream
- Logger.debug("Resp from " + conn.getURL().toString() + ": status " + conn.getResponseCode());
- // Load content unless the server lets us know that the content is NOT MODIFIED...
- if (conn.getResponseCode()!=HttpURLConnection.HTTP_NOT_MODIFIED)
- {
- BufferedInputStream respIn = new BufferedInputStream(conn.getInputStream());
- Logger.debug("Got Inputstream");
- BufferedOutputStream respOut = new BufferedOutputStream(resp.getOutputStream());
- Logger.debug("Got Outputstream");
- int ch;
- while ((ch = respIn.read()) >= 0)
- respOut.write(ch);
- respOut.close();
- respIn.close();
- }
- else
- Logger.debug("Found 304 NOT MODIFIED...");
- conn.disconnect();
- Logger.debug("Request done");
-
-
- return conn.getResponseCode();
-}
-/**
- * Determines whether a HTTP header is a basic authentication header of the kind "Authorization: Basic ..."
- *
- * @param headerKey header name
- * @param headerValue header value
- * @return true for a basic authentication header
- */
-private boolean isBasicAuthenticationHeader(String headerKey, String headerValue) {
- if (!"authorization".equalsIgnoreCase(headerKey))
- return false;
- if (headerValue.length() < "basic".length())
- return false;
- String authenticationSchema = headerValue.substring(0, "basic".length());
- return "basic".equalsIgnoreCase(authenticationSchema);
-}
-/**
- * Determines whether a HTTP header is "Transfer-encoding" header with value containing "chunked"
- *
- * @param headerKey header name
- * @param headerValue header value
- * @return true for a "Transfer-encoding: chunked" header
- */
-private boolean isTransferEncodingChunkedHeader(String headerKey, String headerValue) {
- if (!"transfer-encoding".equalsIgnoreCase(headerKey))
- return false;
- return headerValue.indexOf("chunked") >= 0 || headerValue.indexOf("Chunked") >= 0 || headerValue.indexOf("CHUNKED") >= 0;
-}
-
-/**
- * Calls the web application initializer.
- *
- * @see javax.servlet.Servlet#init(ServletConfig)
- */
-public void init(ServletConfig servletConfig) throws ServletException {
- try {
- MOAIDProxyInitializer.initialize();
- Logger.info(MOAIDMessageProvider.getInstance().getMessage("proxy.00", null));
- }
- catch (Exception ex) {
- Logger.fatal(MOAIDMessageProvider.getInstance().getMessage("proxy.06", null), ex);
- throw new ServletException(ex);
- }
-}
-/**
- * Handles an error in proxying the request.
- * <ul>
- * <li>Logs the error.</li>
- * <li>Outputs an HTML error page.</li>
- * </ul>
- * @param resp the HttpServletResponse
- * @param errorMessage error message to be used
- * @param ex the exception to be logged
- */
-private void handleError(HttpServletResponse resp, String errorMessage, Throwable ex) {
- Logger.error(errorMessage, ex);
- String htmlCode =
- "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"
- + "<html><head><title>"
- + MOAIDMessageProvider.getInstance().getMessage("proxy.10", null)
- + "</title></head><body>"
- + "<h1>"
- + MOAIDMessageProvider.getInstance().getMessage("proxy.10", null)
- + "</h1>"
- + "<p>"
- + MOAIDMessageProvider.getInstance().getMessage("proxy.11", null)
- + "</p>"
- + "<p>"
- + errorMessage
- + "</p>"
- + "</body></html>";
- resp.setContentType("text/html");
- try {
- OutputStream respOut = resp.getOutputStream();
- respOut.write(htmlCode.getBytes());
- respOut.flush();
- }
- catch (IOException ioex) {
- Logger.error("", ioex);
- }
-}
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/AxisSecureSocketFactory.java b/id.server/src/at/gv/egovernment/moa/id/util/AxisSecureSocketFactory.java
deleted file mode 100644
index 8967bdbba..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/util/AxisSecureSocketFactory.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package at.gv.egovernment.moa.id.util;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.security.GeneralSecurityException;
-import java.util.Hashtable;
-
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.apache.axis.components.net.BooleanHolder;
-import org.apache.axis.components.net.DefaultSocketFactory;
-import org.apache.axis.components.net.SecureSocketFactory;
-import org.apache.axis.components.net.TransportClientProperties;
-import org.apache.axis.components.net.TransportClientPropertiesFactory;
-import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.XMLUtils;
-
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Secure socket factory for Axis webs service clients of the MOA-ID component,
- * which are the MOA-SP calls from MOA-ID Auth,
- * and the MOA-ID Auth calls from MOA-ID Proxy.
- * <br/>Use this initialization code:<br/>
- * <code> // ConnectionParameter connParam = ... get from ConfigurationProvider
- * AxisSecureSocketFactory.initialize(connParam);</code>
- * <br/>See the Apache Axis documentation on how to configure this class
- * as the default secure socket factory to be used by Axis.
- * <br/>
- * This code has been copied from <code>JSSESocketFactory</code>, the
- * method <code>initialize()</code> has been added.
- *
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AxisSecureSocketFactory
- extends DefaultSocketFactory implements SecureSocketFactory {
-
- /** Field sslFactory */
- private static SSLSocketFactory sslFactory;
-
- /**
- * Constructor for AxisSecureSocketFactory.
- * @param attributes ???
- */
- public AxisSecureSocketFactory(Hashtable attributes) {
- super(attributes);
- }
- /**
- * Initializes the factory by setting the connection parameters to be used for
- * setting the secure socket factory, and by setting the system property
- * <code>axis.socketSecureFactory</code>.
- * @param connParam <code>ConnectionParameter</code> to derive the
- * secure socket factory from
- */
- public static void initialize(SSLSocketFactory ssf)
- throws IOException, GeneralSecurityException {
-
- Logger.debug("Initialize AxisSecureSocketFactory");
- sslFactory = ssf;
- }
-
- /**
- * creates a secure socket
- *
- * @param host
- * @param port
- * @param otherHeaders
- * @param useFullURL
- *
- * @return Socket
- * @throws Exception
- */
- public Socket create(
- String host,
- int port,
- StringBuffer otherHeaders,
- BooleanHolder useFullURL)
- throws Exception {
- if (port == -1) {
- port = 443;
- }
-
- TransportClientProperties tcp =
- TransportClientPropertiesFactory.create("https");
-
- boolean hostInNonProxyList =
- isHostInNonProxyList(host, tcp.getNonProxyHosts());
-
- Socket sslSocket = null;
- if (tcp.getProxyHost().length() == 0 || hostInNonProxyList) {
- // direct SSL connection
- sslSocket = sslFactory.createSocket(host, port);
- }
- else {
-
- // Default proxy port is 80, even for https
- int tunnelPort =
- (tcp.getProxyPort().length() != 0)
- ? Integer.parseInt(tcp.getProxyPort())
- : 80;
- if (tunnelPort < 0)
- tunnelPort = 80;
-
- // Create the regular socket connection to the proxy
- Socket tunnel = new Socket(tcp.getProxyHost(), tunnelPort);
-
- // The tunnel handshake method (condensed and made reflexive)
- OutputStream tunnelOutputStream = tunnel.getOutputStream();
- PrintWriter out =
- new PrintWriter(
- new BufferedWriter(new OutputStreamWriter(tunnelOutputStream)));
-
- // More secure version... engage later?
- // PasswordAuthentication pa =
- // Authenticator.requestPasswordAuthentication(
- // InetAddress.getByName(tunnelHost),
- // tunnelPort, "SOCK", "Proxy","HTTP");
- // if(pa == null){
- // printDebug("No Authenticator set.");
- // }else{
- // printDebug("Using Authenticator.");
- // tunnelUser = pa.getUserName();
- // tunnelPassword = new String(pa.getPassword());
- // }
- out.print(
- "CONNECT "
- + host
- + ":"
- + port
- + " HTTP/1.0\r\n"
- + "User-Agent: AxisClient");
- if (tcp.getProxyUser().length() != 0
- && tcp.getProxyPassword().length() != 0) {
-
- // add basic authentication header for the proxy
- String encodedPassword =
- XMLUtils.base64encode(
- (tcp.getProxyUser() + ":" + tcp.getProxyPassword()).getBytes());
-
- out.print("\nProxy-Authorization: Basic " + encodedPassword);
- }
- out.print("\nContent-Length: 0");
- out.print("\nPragma: no-cache");
- out.print("\r\n\r\n");
- out.flush();
- InputStream tunnelInputStream = tunnel.getInputStream();
-
- if (log.isDebugEnabled()) {
- log.debug(
- Messages.getMessage(
- "isNull00",
- "tunnelInputStream",
- "" + (tunnelInputStream == null)));
- }
- String replyStr = "";
-
- // Make sure to read all the response from the proxy to prevent SSL negotiation failure
- // Response message terminated by two sequential newlines
- int newlinesSeen = 0;
- boolean headerDone = false; /* Done on first newline */
-
- while (newlinesSeen < 2) {
- int i = tunnelInputStream.read();
-
- if (i < 0) {
- throw new IOException("Unexpected EOF from proxy");
- }
- if (i == '\n') {
- headerDone = true;
- ++newlinesSeen;
- }
- else if (i != '\r') {
- newlinesSeen = 0;
- if (!headerDone) {
- replyStr += String.valueOf((char) i);
- }
- }
- }
- if (!replyStr.startsWith("HTTP/1.0 200")
- && !replyStr.startsWith("HTTP/1.1 200")) {
- throw new IOException(
- Messages.getMessage(
- "cantTunnel00",
- new String[] { tcp.getProxyHost(), "" + tunnelPort, replyStr }));
- }
-
- // End of condensed reflective tunnel handshake method
- sslSocket = sslFactory.createSocket(tunnel, host, port, true);
- if (log.isDebugEnabled()) {
- log.debug(
- Messages.getMessage(
- "setupTunnel00",
- tcp.getProxyHost(),
- "" + tunnelPort));
- }
- }
-
- ((SSLSocket) sslSocket).startHandshake();
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage("createdSSL00"));
- }
- return sslSocket;
- }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/MOAIDMessageProvider.java b/id.server/src/at/gv/egovernment/moa/id/util/MOAIDMessageProvider.java
deleted file mode 100644
index d31aa6ec1..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/util/MOAIDMessageProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package at.gv.egovernment.moa.id.util;
-
-import java.util.Locale;
-
-import at.gv.egovernment.moa.util.Messages;
-
-/**
- * A singleton wrapper around a <code>Message</code> object, providing the messages used in MOA-ID.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class MOAIDMessageProvider {
-
- /** DEFAULT_MESSAGE_RESOURCES are resources/properties/id_messages */
- private static final String[] DEFAULT_MESSAGE_RESOURCES =
- { "resources/properties/id_messages" };
- /** DEFAULT_MESSAGE_LOCALES are "de", "AT" */
- private static final Locale[] DEFAULT_MESSAGE_LOCALES =
- new Locale[] { new Locale("de", "AT") };
- /** The instance for our singleton */
- private static MOAIDMessageProvider instance;
- /** The Messages */
- private Messages messages;
-
- /**
- * Returns the single instance of <code>MOAIDMessageProvider</code>.
- *
- * @return the single instance of <code>MOAIDMessageProvider</code>
- */
- public static MOAIDMessageProvider getInstance() {
- if (instance == null)
- instance = new MOAIDMessageProvider(DEFAULT_MESSAGE_RESOURCES, DEFAULT_MESSAGE_LOCALES);
- return instance;
- }
-
- /**
- * Create a <code>MOAIDMessageProvider</code>.
- *
- * @param resourceNames The names of the resources containing the messages.
- * @param locales The corresponding locales.
- */
- protected MOAIDMessageProvider(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/id.server/src/at/gv/egovernment/moa/id/util/Random.java b/id.server/src/at/gv/egovernment/moa/id/util/Random.java
deleted file mode 100644
index da75b4213..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/util/Random.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package at.gv.egovernment.moa.id.util;
-
-import java.util.Date;
-
-/**
- * Random number generator used to generate ID's
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class Random {
-
- /** random number generator used */
- private static java.util.Random random = new java.util.Random(new Date().getTime());
- /**
- * Creates a new random number, to be used as an ID.
- *
- * @return random long as a String
- */
- public static String nextRandom() {
- return "" + random.nextLong();
- }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/util/SSLUtils.java b/id.server/src/at/gv/egovernment/moa/id/util/SSLUtils.java
deleted file mode 100644
index f21b0880e..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/util/SSLUtils.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package at.gv.egovernment.moa.id.util;
-
-import iaik.pki.PKIConfiguration;
-import iaik.pki.PKIException;
-import iaik.pki.PKIFactory;
-import iaik.pki.PKIProfile;
-import iaik.pki.jsse.IAIKX509TrustManager;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.security.Security;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.net.ssl.SSLSocketFactory;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.iaik.config.PKIConfigurationImpl;
-import at.gv.egovernment.moa.id.iaik.pki.PKIProfileImpl;
-import at.gv.egovernment.moa.id.iaik.pki.jsse.MOAIDTrustManager;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.StreamUtils;
-
-import com.sun.net.ssl.HttpsURLConnection;
-import com.sun.net.ssl.KeyManager;
-import com.sun.net.ssl.SSLContext;
-import com.sun.net.ssl.TrustManager;
-
-/**
- * Utility for a obtaining a secure socket factory using <code>IAIKX509TrustManager</code>.
- * This <code>TrustManager</code> implementation features CRL checking.<br/>
- * <code>SSLUtils</code> caches secure socket factories for given <code>ConnectionParameter</code>s.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SSLUtils {
-
- /** SSLSocketFactory store, mapping URL->SSLSocketFactory **/
- private static Map sslSocketFactories = new HashMap();
-
- /**
- * Initializes the SSLSocketFactory store.
- */
- public static void initialize() {
- sslSocketFactories = new HashMap();
- Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
- System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
- }
-
- /**
- * Creates an <code>SSLSocketFactory</code> which utilizes an
- * <code>IAIKX509TrustManager</code> for the given trust store,
- * and the given key store.
- *
- * @param conf configuration provider providing a generic properties pointing
- * to trusted CA store and certificate store root
- * @param connParam connection parameter containing the client key store settings
- * to be used in case of client authentication;
- * if <code>connParam.getClientKeyStore() == null</code>, client authentication
- * is assumed to be disabled
- * @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
- * @throws ConfigurationException on invalid configuration data
- * @throws PKIException while initializing the <code>IAIKX509TrustManager</code>
- */
- public static SSLSocketFactory getSSLSocketFactory(
- ConfigurationProvider conf,
- ConnectionParameter connParam)
- throws IOException, GeneralSecurityException, ConfigurationException, PKIException {
-
- Logger.debug("Get SSLSocketFactory for " + connParam.getUrl());
- // retrieve SSLSocketFactory if already created
- SSLSocketFactory ssf = (SSLSocketFactory)sslSocketFactories.get(connParam.getUrl());
- if (ssf != null)
- return ssf;
- // else create new SSLSocketFactory
- String trustStoreURL = conf.getTrustedCACertificates();
- if (trustStoreURL == null)
- throw new ConfigurationException(
- "config.08", new Object[] {"TrustedCACertificates"});
- String acceptedServerCertURL = connParam.getAcceptedServerCertificates();
- TrustManager[] tms = getTrustManagers(conf, trustStoreURL, acceptedServerCertURL);
- KeyManager[] kms = at.gv.egovernment.moa.util.SSLUtils.getKeyManagers(
- "pkcs12", connParam.getClientKeyStore(), connParam.getClientKeyStorePassword());
- SSLContext ctx = SSLContext.getInstance("TLS");
- ctx.init(kms, tms, null);
- ssf = ctx.getSocketFactory();
- // store SSLSocketFactory
- sslSocketFactories.put(connParam.getUrl(), ssf);
- return ssf;
- }
-
- /**
- * Initializes an <code>IAIKX509TrustManager</code> for a given trust store,
- * using configuration data.
- *
- * @param conf MOA-ID configuration provider
- * @param trustStoreURL trust store URL
- * @param acceptedServerCertURL file URL pointing to directory containing accepted server SSL certificates
- * @return <code>TrustManager</code> array containing the <code>IAIKX509TrustManager</code>
- * @throws ConfigurationException on invalid configuration data
- * @throws IOException on data-reading problems
- * @throws PKIException while initializing the <code>IAIKX509TrustManager</code>
- */
- public static TrustManager[] getTrustManagers(
- ConfigurationProvider conf, String trustStoreURL, String acceptedServerCertURL)
- throws ConfigurationException, PKIException, IOException, GeneralSecurityException {
-
- PKIConfiguration cfg = null;
- if (! PKIFactory.getInstance().isAlreadyConfigured())
- cfg = new PKIConfigurationImpl(conf);
- PKIProfile profile = new PKIProfileImpl(trustStoreURL);
- // This call fixes a bug occuring when PKIConfiguration is
- // initialized by the MOA-SP initialization code, in case
- // MOA-SP is called by API
- MOAIDTrustManager.initializeLoggingContext();
- IAIKX509TrustManager tm = new MOAIDTrustManager(acceptedServerCertURL);
- tm.init(cfg, profile);
- return new TrustManager[] {tm};
- }
- /**
- * Reads a file, given by URL, into a byte array,
- * securing the connection by IAIKX509TrustManager.
- * @param connParam containing URL and accepted server certificates
- * @param conf ConfigurationProvider for reading
- * @return file content
- * @throws ConfigurationException on invalid configuration data
- * @throws PKIException on invalid configuration data
- * @throws IOException on data-reading problems
- * @throws GeneralSecurityException on security issues
- */
- public static byte[] readHttpsURL(ConfigurationProvider conf, ConnectionParameter connParam)
- throws ConfigurationException, PKIException, IOException, GeneralSecurityException {
-
- URL url = new URL(connParam.getUrl());
- HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
- conn.setRequestMethod("GET");
- conn.setDoInput(true);
- SSLSocketFactory sslSocketFactory = getSSLSocketFactory(conf, connParam);
- conn.setSSLSocketFactory(sslSocketFactory);
- conn.connect();
- InputStream in = new BufferedInputStream(conn.getInputStream());
- byte[] content = StreamUtils.readStream(in);
- in.close();
- conn.disconnect();
- return content;
- }
-
-}
diff --git a/id.server/src/test/MOAIDTestCase.java b/id.server/src/test/MOAIDTestCase.java
deleted file mode 100644
index 725fa1386..000000000
--- a/id.server/src/test/MOAIDTestCase.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.transform.TransformerException;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.StreamUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-import iaik.ixsil.algorithms.Transform;
-import iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXML;
-import iaik.ixsil.exceptions.AlgorithmException;
-import iaik.ixsil.exceptions.InitException;
-import iaik.ixsil.exceptions.URIException;
-import iaik.ixsil.init.IXSILInit;
-import iaik.ixsil.util.URI;
-import test.at.gv.egovernment.moa.MOATestCase;
-
-/*
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class MOAIDTestCase extends MOATestCase implements Constants {
-
- public static final String XML_DECL =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>";
- protected static final String nl = "\n";
-
- public MOAIDTestCase(String name) {
- super(name);
- }
-
- protected void initIxsil() throws InitException, URIException {
- IXSILInit.init(new URI("init/properties/init.properties"));
- // Switch on debug information
- IXSILInit.setPrintDebugLog(true);
- }
- //STRING <==> STRING
- protected void assertXmlEquals(String xml1, String xml2)
- throws AlgorithmException, IOException, InitException, URIException{
- initIxsil();
- String canXml1 = canonicalTransform(xml1);
- String canXml2 = canonicalTransform(xml2);
- assertEquals(canXml1, canXml2); }
- // ELEMENT <==> ELEMENT
- protected void assertXmlEquals(Element xml1, Element xml2)
- throws AlgorithmException, IOException, InitException , URIException, TransformerException{
- initIxsil();
- assertEquals(canonicalTransform(DOMUtils.serializeNode(xml1)),canonicalTransform(DOMUtils.serializeNode(xml2)));
- }
- // INPUTSTREAM <==> INPUTSTREAM
- protected void assertXmlEquals(InputStream xml1, InputStream xml2)
- throws AlgorithmException, IOException, InitException , URIException{
- initIxsil();
- assertEquals(canonicalTransform(xml1),canonicalTransform(xml2));
- }
- // ELEMENT <==> STRING
- protected void assertXmlEquals(Element xml1, String xml2)
- throws AlgorithmException, IOException, InitException , URIException, TransformerException {
- initIxsil();
- assertEquals(canonicalTransform(xml1),canonicalTransform(xml2));
- }
- // ELEMENT <==> INPUTSTREAM
- protected void assertXmlEquals(Element xml1, InputStream xml2)
- throws AlgorithmException, IOException, InitException , URIException, TransformerException{
- initIxsil();
- assertEquals(canonicalTransform(xml1),canonicalTransform(xml2));
- }
- // STRING <==> INPUTSTREAM
- protected void assertXmlEquals(String xml1, InputStream xml2)
- throws AlgorithmException, IOException, InitException , URIException{
- initIxsil();
- assertEquals(canonicalTransform(xml1),canonicalTransform(xml2));
- }
-
- /**
- * Method canonicalTransform.
- * @param input as STRING
- * @return String
- */
- protected String canonicalTransform(String input)
- throws AlgorithmException, IOException {
-
- Transform tr = new TransformImplExclusiveCanonicalXML();
- InputStream s = new ByteArrayInputStream(input.getBytes("UTF-8"));
- tr.setInput(s, null);
- ByteArrayInputStream transResult = (ByteArrayInputStream) tr.transform();
- return killWhiteSpace(readString(transResult));
- }
- /**
- * Method canonicalTransform.
- * @param input as Element
- * @return String
- */
- protected String canonicalTransform(Element input)
- throws AlgorithmException, IOException {
-
- Transform tr = new TransformImplExclusiveCanonicalXML();
- tr.setInput(XPathUtils.selectNodeList(input, XPathUtils.ALL_NODES_XPATH), null);
- ByteArrayInputStream transResult = (ByteArrayInputStream) tr.transform();
-
- return killWhiteSpace(readString(transResult));
- }
-
- /**
- * Method canonicalTransform.
- * @param input as InputStream
- * @return String
- */
- protected String canonicalTransform(InputStream input)
- throws AlgorithmException, IOException {
-
- Transform tr = new TransformImplExclusiveCanonicalXML(); tr.setInput(input, null);
- ByteArrayInputStream transResult = (ByteArrayInputStream) tr.transform();
-
- return killWhiteSpace(readString(transResult));
- }
-
- public static String killWhiteSpace(String input)
- {
- int start=0;
- int ende;
- String result;
- String middle;
- result = input;
- do {
- start = result.indexOf(">", start);
- ende = result.indexOf("<", start);
- middle = result.substring(start+1,ende).trim();
- result = result.substring(0,start+1) +middle + result.substring(ende,result.length());
- start++;
- } while (result.indexOf("<", ende + 1)>0);
-
- return result;
- }
-
- /**
- * Method killExclusive.: The values startsWith and endsWith will be included into the answer.
- * @param input
- * @param startsWith
- * @param endsWith
- * @param newValue
- * @return String
- */
- public static String killExclusive(String input, String startsWith, String endsWith, String newValue)
- {
- int start=0;
- int ende;
- String result;
- result = input;
- do {
- start = result.indexOf(startsWith, start) + startsWith.length();
- ende = result.indexOf(endsWith, start);
- result = result.substring(0,start) + newValue + result.substring(ende,result.length());
- start++;
- } while (result.indexOf(startsWith, ende + 1)>0);
-
- return result;
- }
-
- /**
- * Method killInclusive. : The values startsWith and endsWith will NOT be included into the answer.
- * @param input
- * @param startsWith
- * @param endsWith
- * @param newValue
- * @return String
- */
- public static String killInclusive(String input, String startsWith, String endsWith, String newValue)
- {
- int start=0;
- int ende;
- String result;
- result = input;
- do {
- start = result.indexOf(startsWith, start) + startsWith.length();
- ende = result.indexOf(endsWith, start);
- result = result.substring(0,start - startsWith.length() ) + newValue + result.substring(ende + endsWith.length(),result.length());
- start++;
- } while (result.indexOf(startsWith, ende + 1)>0);
-
- return result;
- }
-
- protected String readFile(String filename) throws IOException {
- return readFile(filename, "UTF-8");
- }
- protected String readFile(String filename, String encoding) throws IOException {
- return FileUtils.readFile(filename, encoding);
- }
- protected String readString(InputStream input) throws IOException
- {
- return StreamUtils.readStream(input, "UTF-8");
- }
-
-}
diff --git a/id.server/src/test/abnahme/A/Test100StartAuthentication.java b/id.server/src/test/abnahme/A/Test100StartAuthentication.java
deleted file mode 100644
index 0d72691aa..000000000
--- a/id.server/src/test/abnahme/A/Test100StartAuthentication.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package test.abnahme.A;
-
-import test.abnahme.AbnahmeTestCase;
-import at.gv.egovernment.moa.id.AuthenticationException;
-import at.gv.egovernment.moa.id.auth.WrongParametersException;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class Test100StartAuthentication extends AbnahmeTestCase {
-
- public Test100StartAuthentication(String name) {
- super(name);
- }
-
- public void testA101() throws Exception {
- try {
- String htmlForm = server.startAuthentication("https://localhost:8443/auth", //authURL
- "gb", //target
- "http://localhost:9080/", //oaURL
- "file:" + findXmldata("AuthTemplate.html"),
- "http://localhost:3495/http-security-layer-request",
- null);
- htmlForm = killExclusive(htmlForm, "MOASessionID=","\"","DELETED");
- //writeXmldata("htmlForm_out.html",htmlForm.getBytes("UTF-8"));
- assertEquals(readXmldata("htmlForm.html"),htmlForm);
- System.out.println("-----------------------\nTestfall " + this.getName() + " erfolgreich abgearbeitet! \n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA102() throws Exception {
- try {
- String htmlForm = server.startAuthentication("https://localhost:8443/auth", //authURL
- "gb", //target
- "http://localhost:9080/", //oaURL
- null,
- "http://localhost:3495/http-security-layer-request", null);
- htmlForm = killExclusive(htmlForm, "MOASessionID=","\"","DELETED");
- //writeXmldata("htmlForm_out.html",htmlForm.getBytes("UTF-8"));
- assertEquals(readXmldata("htmlForm.html"),htmlForm);
-
- System.out.println("-----------------------\nTestfall " + this.getName() + " erfolgreich abgearbeitet! \n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA103() throws Exception {
- try {
- String htmlForm = server.startAuthentication("https://localhost:8443/auth", //authURL
- "gb", //target
- "http://localhost:9080/", //oaURL
- "file:" + findXmldata("AuthTemplate.html"),
- null,
- null);
- htmlForm = killExclusive(htmlForm, "MOASessionID=","\"","DELETED");
- //writeXmldata("htmlForm_out.html",htmlForm.getBytes("UTF-8"));
- assertEquals(readXmldata("htmlForm.html"),htmlForm);
- System.out.println("-----------------------\nTestfall " + this.getName() + " erfolgreich abgearbeitet! \n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA151() throws Exception {
- try {
- try {
- server.startAuthentication(null, //authURL
- "gb", //target
- "http://localhost:9080/", //oaURL
- null, null, null);
- //assertEquals("",htmlForm);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (WrongParametersException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
-
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA152() throws Exception {
- try {
- try {
- server.startAuthentication("http://localhost:8080/auth", //authURL
- "gb", "http://localhost:9080/", //oaURL
- null, null, null);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA153() throws Exception {
- try {
- try {
- server.startAuthentication("https://localhost:8443/auth", //authURL
- "gb", "http://host_not_in_config/", //oaURL
- null, null, null);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
-
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA154() throws Exception {
- try {
- try {
- server.startAuthentication("https://localhost:8443/auth", //authURL
- "gb", null, //oaURL
- null, null, null);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (WrongParametersException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA155() throws Exception {
- try {
- try {
- server.startAuthentication("https://localhost:8443/auth", //authURL
- null, "http://localhost:9080/", //oaURL
- null, null, null);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (WrongParametersException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- //assertEquals("",htmlForm);
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
-}
diff --git a/id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java b/id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java
deleted file mode 100644
index ed4410521..000000000
--- a/id.server/src/test/abnahme/A/Test200VerifyIdentityLink.java
+++ /dev/null
@@ -1,336 +0,0 @@
-package test.abnahme.A;
-
-import org.w3c.dom.Element;
-import test.abnahme.AbnahmeTestCase;
-
-import at.gv.egovernment.moa.id.AuthenticationException;
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.validator.ValidateException;
-import at.gv.egovernment.moa.id.auth.validator.VerifyXMLSignatureResponseValidator;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class Test200VerifyIdentityLink extends AbnahmeTestCase {
-
- public Test200VerifyIdentityLink(String name) {
- super(name);
- }
-
- public void testA201() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
-
- String createXMLSignatureRequest = server.verifyIdentityLink(sessionID, infoboxReadResponse);
-
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, AuthConfigurationProvider.getInstance().getMoaSpAuthBlockTrustProfileID());
- Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
-
- VerifyXMLSignatureResponseParser respParser = new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse);
- VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames(), VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK);
-
- /*
- * HINWEIS: clearSamlAssertion löscht aus einer beliebiegen String-Repräsentation einer XML-Struktur
- * AUSSLIESSLICH die Attribute IssueInstand und die AssertionID heraus, von dem her ist diese
- * Method hier verwendbar
- */
-
- assertXmlEquals(clearSamlAssertion(readXmldata("CreateXMLSignatureRequest.xml")), clearSamlAssertion(createXMLSignatureRequest));
- System.out.println("-----------------------\nTestfall " + this.getName() + " erfolgreich abgearbeitet! \n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
-
- }
- public void testA251() throws Exception {
- try {
- startAuthentication();
- String sessionID = "0";
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA252() throws Exception {
- try {
- String sessionID = startAuthentication();
-
- server.setSecondsSessionTimeOut(-100);
- server.cleanup();
- server.setSecondsSessionTimeOut(1000);
-
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
-
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA253() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA254() throws Exception {
- try {
- String sessionID = startAuthentication();
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (ValidateException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA255() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- }
- catch (ParseException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA256() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- }
- catch (ValidateException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
-
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA257() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
-
- }
- catch (ValidateException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA258() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (ValidateException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA259() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (ValidateException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA260() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (ValidateException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA261() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
-
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (ValidateException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
-
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA262() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- new InfoboxReadResponseParser(infoboxReadResponse).parseIdentityLink();
- // System.out.println(infoboxReadResponse);
-
- try {
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (ValidateException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA263() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, AuthConfigurationProvider.getInstance().getMoaSpAuthBlockTrustProfileID());
- Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
-
- VerifyXMLSignatureResponseParser respParser = new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse);
-
- // String createXMLSignatureRequest = server.verifyIdentityLink(sessionID, infoboxReadResponse);
- // System.out.println(createXMLSignatureRequest);
- // String createXMLSignatureResponse = readFile(TESTDATA_ROOT + "xmldata/standard/"+"CreateXMLSignatureResponse.xml");
- // String samlArtifact = server.verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
- try {
- VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), new String[] { "CN=TEST,OU=TEST,O=TEST,C=AT" }, VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK);
- System.err.println(this.getName() + " hat KEINE FEHLER geworfen");
- fail(this.getName() + " hat KEINE FEHLER geworfen");
- }
- catch (ValidateException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-}
diff --git a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java b/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
deleted file mode 100644
index d9e69eba4..000000000
--- a/id.server/src/test/abnahme/A/Test300VerifyAuthBlock.java
+++ /dev/null
@@ -1,597 +0,0 @@
-package test.abnahme.A;
-
-import java.util.Calendar;
-
-import org.w3c.dom.Element;
-import test.abnahme.AbnahmeTestCase;
-
-import at.gv.egovernment.moa.id.AuthenticationException;
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
-import at.gv.egovernment.moa.id.auth.builder.AuthenticationDataAssertionBuilder;
-import at.gv.egovernment.moa.id.auth.builder.PersonDataBuilder;
-import at.gv.egovernment.moa.id.auth.builder.VPKBuilder;
-import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
-import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker;
-import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.validator.CreateXMLSignatureResponseValidator;
-import at.gv.egovernment.moa.id.auth.validator.ValidateException;
-import at.gv.egovernment.moa.id.auth.validator.VerifyXMLSignatureResponseValidator;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.id.util.Random;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.DateTimeUtils;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-
-public class Test300VerifyAuthBlock extends AbnahmeTestCase {
-
- public Test300VerifyAuthBlock(String name) {
- super(name);
- }
-
- public void testA301() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServer(sessionID);
- //authDataWriter(authData,this.getName()+"new.xml");
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA302() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServer(sessionID);
- //authDataWriter(authData,this.getName()+"new.xml");
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA303() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServer(sessionID);
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA304() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServer(sessionID);
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA305() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServer(sessionID);
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA306() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServer(sessionID);
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA307() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServer(sessionID);
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA308() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServer(sessionID);
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
-
- }
-
- public void testA309() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServerWithoutValidateAuthBlock(sessionID);
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA310() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServerWithoutValidateAuthBlock(sessionID);
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA311() throws Exception {
- try {
- String sessionID = startAuthentication();
- AuthenticationData authData = initServerWithoutValidateAuthBlock(sessionID);
- assertXmlEquals(readXmldata("AuthenticationData.xml"), clearSamlAssertion(authData.getSamlAssertion()));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA351() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, AuthConfigurationProvider.getInstance().getMoaSpAuthBlockTrustProfileID());
- Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
- new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse);
- //VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames());
- // System.out.println(createXMLSignatureRequest);
- String createXMLSignatureResponse = readXmldata("CreateXMLSignatureResponse.xml");
-
- // nicht existierende Session....
- try {
- server.verifyAuthenticationBlock("0", createXMLSignatureResponse);
- fail();
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
-
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA352() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- server.setSecondsSessionTimeOut(-100);
- server.cleanup();
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, AuthConfigurationProvider.getInstance().getMoaSpAuthBlockTrustProfileID());
- Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
- new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse);
- //VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames());
- // System.out.println(createXMLSignatureRequest);
- String createXMLSignatureResponse = readXmldata("CreateXMLSignatureResponse.xml");
-
- // abgelaufene Session....
- server.setSecondsSessionTimeOut(1000);
- try {
- server.verifyAuthenticationBlock("0", createXMLSignatureResponse);
- fail();
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
-
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA353() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
-
- String createXMLSignatureResponse = readXmldata("CreateXMLSignatureResponse.xml");
-
- // Session for VerifyIdentityLink-Aufruf
- try {
-
- server.verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
- fail();
- }
- //NOCH SEHR UNSCHÖN..... (fliegt raus im AuthenticationServer, Methode buildAuthenticationData
- // ( IdentityLink identityLink = session.getIdentityLink(); ==> liefert dann NULL...
- catch (NullPointerException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA354() throws Exception {
- try {
- String sessionID = startAuthentication();
- System.out.println(sessionID);
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, AuthConfigurationProvider.getInstance().getMoaSpAuthBlockTrustProfileID());
- Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
- new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse);
- //VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames());
- // System.out.println(createXMLSignatureRequest);
- String createXMLSignatureResponse = readXmldata("CreateXMLSignatureResponse.xml");
-
- // nicht existierende Session....
-
- server.verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
- try {
- server.verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
- fail();
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA355() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ParseException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA356() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ParseException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA357() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA358() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA359() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA360() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA361() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA362() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA363() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA364() throws Exception {
- try {
- String sessionID = startAuthentication();
- try {
-
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- /* public void testA365() throws Exception {
- String sessionID = startAuthentication();
- try {
- // wegen sinnlosigkeit gestrichen
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage()+ "-----------------------");}
- }*/
-
- public void testA366() throws Exception {
-
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage()+ "-----------------------");}
- }
- public void testA367() throws Exception {
- String sessionID = startAuthentication();
- try {
- initServer(sessionID);
- fail();
- }
- catch (ValidateException e) {System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage()+ "-----------------------");}
- }
-
-
- private AuthenticationData initServer(String sessionID) throws Exception {
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, "TrustProfile1");
- Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
- new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse);
- //VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames());
- // System.out.println(createXMLSignatureRequest);
- String createXMLSignatureResponse = readXmldata("CreateXMLSignatureResponse.xml");
- // CreateXMLSignatureResponseValidator.getInstance().validate(new CreateXMLSignatureResponseParser(createXMLSignatureResponse).parseResponse(),"gb","https://localhost:9443/");
- String samlArtifact = server.verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
- AuthenticationData authData = server.getAuthenticationData(samlArtifact);
- return authData;
- }
-
- private AuthenticationData initServerWithoutValidateAuthBlock(String sessionID) throws Exception {
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, "TrustProfile1");
- Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
- new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse);
- //VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames());
- // System.out.println(createXMLSignatureRequest);
- String createXMLSignatureResponse = readXmldata("CreateXMLSignatureResponse.xml");
- // CreateXMLSignatureResponseValidator.getInstance().validate(new CreateXMLSignatureResponseParser(createXMLSignatureResponse).parseResponse(),"gb","https://localhost:9443/");
-
- AuthenticationSession session = AuthenticationServer.getSession(sessionID);
- AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
- // parses <CreateXMLSignatureResponse>
- CreateXMLSignatureResponse csresp =
- new CreateXMLSignatureResponseParser(createXMLSignatureResponse).parseResponse();
- // validates <CreateXMLSignatureResponse>
- new CreateXMLSignatureResponseValidator().validate(csresp, session.getTarget(), session.getPublicOAURLPrefix());
- // builds a <VerifyXMLSignatureRequest> for a MOA-SPSS call
- String[] vtids = authConf.getMoaSpAuthBlockVerifyTransformsInfoIDs();
- String tpid = authConf.getMoaSpAuthBlockTrustProfileID();
- Element domVsreq = new VerifyXMLSignatureRequestBuilder().build(csresp, vtids, tpid);
- // invokes the call
- Element domVsresp = new SignatureVerificationInvoker().verifyXMLSignature(domVsreq);
- // parses the <VerifyXMLSignatureResponse>
- VerifyXMLSignatureResponse vsresp = new VerifyXMLSignatureResponseParser(domVsresp).parseData();
- // validates the <VerifyXMLSignatureResponse>
- VerifyXMLSignatureResponseValidator.getInstance().validate(vsresp, null, VerifyXMLSignatureResponseValidator.CHECK_AUTH_BLOCK);
- // compares the public keys from the identityLink with the AuthBlock
-
- // builds authentication data and stores it together with a SAML artifact
- AuthenticationData authData = buildAuthenticationData(session, vsresp);
- return authData;
- }
- private AuthenticationData buildAuthenticationData(
- AuthenticationSession session,
- VerifyXMLSignatureResponse verifyXMLSigResp)
- throws ConfigurationException, BuildException {
-
- IdentityLink identityLink = session.getIdentityLink();
- AuthenticationData authData = new AuthenticationData();
- authData.setMajorVersion(1);
- authData.setMinorVersion(0);
- authData.setAssertionID(Random.nextRandom());
- authData.setIssuer(session.getAuthURL());
- authData.setIssueInstant(DateTimeUtils.buildDateTime(Calendar.getInstance()));
- String vpkBase64 = new VPKBuilder().buildVPK(
- identityLink.getIdentificationValue(), identityLink.getDateOfBirth(), session.getTarget());
- authData.setVPK(vpkBase64);
- authData.setGivenName(identityLink.getGivenName());
- authData.setFamilyName(identityLink.getFamilyName());
- authData.setDateOfBirth(identityLink.getDateOfBirth());
- authData.setQualifiedCertificate(verifyXMLSigResp.isQualifiedCertificate());
- authData.setPublicAuthority(verifyXMLSigResp.isPublicAuthority());
- authData.setPublicAuthorityCode(verifyXMLSigResp.getPublicAuthorityCode());
- OAAuthParameter oaParam =
- AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(
- session.getPublicOAURLPrefix());
- String prPerson = new PersonDataBuilder().build(
- identityLink, oaParam.getProvideZMRZahl());
-
- try {
- String ilAssertion =
- oaParam.getProvideIdentityLink() ? DOMUtils.serializeNode(identityLink.getSamlAssertion()) : "";
- String authBlock = oaParam.getProvideAuthBlock() ? session.getAuthBlock() : "";
- String samlAssertion = new AuthenticationDataAssertionBuilder().build(
- authData, prPerson, authBlock, ilAssertion);
- authData.setSamlAssertion(samlAssertion);
- return authData;
- }
- catch (Throwable ex) {
- throw new BuildException(
- "builder.00",
- new Object[] { "AuthenticationData", ex.getMessage() },
- ex);
- }
- }
-}
diff --git a/id.server/src/test/abnahme/A/Test400GetAuthenticationData.java b/id.server/src/test/abnahme/A/Test400GetAuthenticationData.java
deleted file mode 100644
index b05e2b92c..000000000
--- a/id.server/src/test/abnahme/A/Test400GetAuthenticationData.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package test.abnahme.A;
-
-import org.w3c.dom.Element;
-import test.abnahme.AbnahmeTestCase;
-
-import at.gv.egovernment.moa.id.AuthenticationException;
-import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker;
-import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.validator.CreateXMLSignatureResponseValidator;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- */
-
-public class Test400GetAuthenticationData extends AbnahmeTestCase {
-
- private String samlArtifact;
-
- public Test400GetAuthenticationData(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- String sessionID = startAuthentication();
- String infoboxReadResponse = readXmldata("InfoBoxReadResponse.xml");
- server.verifyIdentityLink(sessionID, infoboxReadResponse);
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(infoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder().build(idl, AuthConfigurationProvider.getInstance().getMoaSpAuthBlockTrustProfileID());
- Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
- new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse);
- //VerifyXMLSignatureResponseValidator.getInstance().validate(respParser.parseData(), AuthConfigurationProvider.getInstance().getIdentityLinkX509SubjectNames());
- // System.out.println(createXMLSignatureRequest);
- String createXMLSignatureResponse = readXmldata("CreateXMLSignatureResponse.xml");
- CreateXMLSignatureResponseValidator.getInstance().validate(new CreateXMLSignatureResponseParser(createXMLSignatureResponse).parseResponse(), "gb", "https://localhost:9443/");
- samlArtifact = server.verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
- }
-
- public void testA401() throws Exception {
- try {
-
- AuthenticationData authData = server.getAuthenticationData(samlArtifact);
-// authDataWriter(authData,"NEWA401");
- assertXmlEquals(clearSamlAssertion(authData.getSamlAssertion()), readXmldata("AuthenticationData.xml"));
- System.out.println("-----------------------\nTestfall " + this.getName() + " erfolgreich abgearbeitet! \n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA451() throws Exception {
- try {
- try {
- AuthenticationData authData = server.getAuthenticationData("AAGu1JFbyGKqJ+3NAonwMu5bNyUc7kooeMK6bxeXBbnK6NL0DfuVJsGi");
- authDataWriter(authData, "A45");
- if (authData != null)
- fail();
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA452() throws Exception {
- try {
- server.getAuthenticationData(samlArtifact);
- try {
- server.getAuthenticationData(samlArtifact);
- fail();
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA453() throws Exception {
- try {
- server.setSecondsAuthDataTimeOut(-1000);
- server.cleanup();
- try {
- server.getAuthenticationData(samlArtifact);
- fail();
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA454() throws Exception {
- try {
- try {
- server.getAuthenticationData("blabla123");
- fail();
- }
- catch (AuthenticationException e) {
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "\n-----------------------");
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
-}
diff --git a/id.server/src/test/abnahme/A/Test500StartAuthenticationServlet.java b/id.server/src/test/abnahme/A/Test500StartAuthenticationServlet.java
deleted file mode 100644
index f4f37a871..000000000
--- a/id.server/src/test/abnahme/A/Test500StartAuthenticationServlet.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package test.abnahme.A;
-
-import java.io.OutputStream;
-import java.net.URL;
-import java.security.Security;
-
-import javax.net.ssl.SSLSocketFactory;
-
-import test.abnahme.AbnahmeTestCase;
-
-import at.gv.egovernment.moa.util.StreamUtils;
-import at.gv.egovernment.moa.util.URLEncoder;
-
-import com.sun.net.ssl.HostnameVerifier;
-import com.sun.net.ssl.HttpsURLConnection;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class Test500StartAuthenticationServlet extends AbnahmeTestCase {
-
- private String testdataRoot = TESTDATA_ROOT + "xmldata/standard/";
- SSLSocketFactory ssf;
- public Test500StartAuthenticationServlet(String name) {
- super(name);
- }
- protected void setUp() throws Exception {
- super.setUp();
- 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("javax.net.ssl.trustStore", "C:/Programme/ApacheGroup/abnahme/server.keystore");
- System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
- }
-
- public void testA501() throws Exception {
- //NUR einmal für alle folgenden Testfälle
- //----------------------------------------
-
- //----------------------------------------
-
- try {
- String targetURL = getURL("https://localhost:8443/moa-id-auth/", "gb", "https://localhost:9443/");
- HttpsURLConnection conn = giveConnection(targetURL, "GET");
- conn.connect();
- int resultCode = conn.getResponseCode();
- String contentType = conn.getHeaderField("Content-Type");
- if (resultCode != 200)
- fail("Wrong HTTP-Code");
- if (!conn.getHeaderField("Content-Type").equalsIgnoreCase("text/html"))
- fail("Wrong contentType: expected text/html and was " + conn.getHeaderField("Content-Type"));
- conn.disconnect();
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
-
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA502() throws Exception {
- try {
- String URL = getURL("https://localhost:8443/moa-id-auth/", "gb", "https://localhost:9443/");
- HttpsURLConnection conn = giveConnection(URL, "GET");
- conn.connect();
- int resultCode = conn.getResponseCode();
- String contentType = conn.getHeaderField("Content-Type");
- if (resultCode != 200)
- fail("Wrong HTTP-Code: expected '200' and was '" + resultCode + "'");
- if (!conn.getHeaderField("Content-Type").equalsIgnoreCase("text/html"))
- fail("Wrong contentType: expected text/html and was " + conn.getHeaderField("Content-Type"));
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
-
- conn.disconnect();
-
- URL = parseDataURL(result);
- conn = giveConnection(URL, "POST");
- conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
-
- String infoboxReadResponse = readXmldata("InfoboxReadResponse.xml");
- System.out.println("File gelesen, Daten in Outputstream einpflegen");
- OutputStream out = conn.getOutputStream();
- out.write(new String("XMLResponse=" + URLEncoder.encode(infoboxReadResponse, "UTF-8")).getBytes("UTF-8"));
- out.flush();
- out.close();
-
- System.out.println("Verbinden zu " + URL);
- conn.connect();
- resultCode = conn.getResponseCode();
- System.out.println("resultCode :" + resultCode);
- String redirectLoc = conn.getHeaderField("Location");
- System.out.println("redirectLoc :" + redirectLoc);
- // Austausch von VerifyIdentityLink in der POST-URL durch VerifyAuthBlock... rest MUSS gleich sein!
- if (!killInclusive(URL, "VerifyI", "Link", "VerifyAuthBlock").equals(redirectLoc))
- fail("Wrong Redirect-Location: expected " + URL + " and was " + conn.getHeaderField("Location"));
- if (!conn.getHeaderField("Content-Type").equalsIgnoreCase("text/xml"))
- fail("Wrong contentType: expected text/xml and was " + conn.getHeaderField("Content-Type"));
- conn.disconnect();
- System.out.println("-----------------------\nTestfall " + this.getName() + " erfolgreich abgearbeitet! \n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA503() throws Exception {
- try {
- String URL = getURL("https://localhost:8443/moa-id-auth/", "gb", "https://localhost:9443/");
- HttpsURLConnection conn = giveConnection(URL, "GET");
- conn.connect();
-
- assertEquals(200,conn.getResponseCode());
- if (!conn.getHeaderField("Content-Type").equalsIgnoreCase("text/html"))
- fail("Wrong contentType: expected text/html and was " + conn.getHeaderField("Content-Type"));
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
- URL = parseDataURL(result);
-
- conn.disconnect();
- conn = giveConnection(URL, "POST");
- conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
- String infoboxReadResponse = readXmldata("InfoboxReadResponse.xml");
- OutputStream out = conn.getOutputStream();
- out.write(new String("XMLResponse=" + URLEncoder.encode(infoboxReadResponse, "UTF-8")).getBytes());
- out.flush();
- out.close();
- conn.connect();
- String redirectLoc = conn.getHeaderField("Location");
- // Austausch von VerifyIdentityLink in der POST-URL durch VerifyAuthBlock... rest MUSS gleich sein!
- if (!killInclusive(URL, "VerifyI", "Link", "VerifyAuthBlock").equals(redirectLoc))
- fail("Wrong Redirect-Location: expected " + URL + " and was " + conn.getHeaderField("Location"));
- if (!conn.getHeaderField("Content-Type").equalsIgnoreCase("text/xml"))
- fail("Wrong contentType: expected text/xml and was " + conn.getHeaderField("Content-Type"));
- conn.disconnect();
-
- conn = giveConnection(redirectLoc, "POST");
- System.out.println("Redirect Location: " + redirectLoc);
- String createXMLSignatureResponse = URLEncoder.encode(readXmldata("CreateXMLSignatureResponse.xml"), "UTF-8");
- out = conn.getOutputStream();
- out.write(("XMLResponse=" +createXMLSignatureResponse).getBytes());
- out.flush();
- out.close();
-
- System.out.println("Sending Data to " + redirectLoc);
- conn.connect();
-
- redirectLoc = conn.getHeaderField("Location");
- System.out.println("redirectLoc: " + redirectLoc);
- /* RandomAccessFile raf = new RandomAccessFile("C://503.xml", "rw");
- raf.write(StreamUtils.readStream(conn.getInputStream()));
- raf.close();*/
- conn.disconnect();
- assertEquals(302, conn.getResponseCode());
- assertTrue(redirectLoc.startsWith("https://localhost:9443/?Target=gb&SAMLArtifact="));
- System.out.println("-----------------------\nTestfall " + this.getName() + " erfolgreich abgearbeitet! \n-----------------------");
-
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA551() throws Exception {
- try {
- String targetURL = getURL("https://localhost:8443/moa-id-auth/", "gb", "");
- HttpsURLConnection conn = giveConnection(targetURL, "GET");
- conn.connect();
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
- assertTrue(result.indexOf("Die Angabe der Parameter ist unvollst&auml;ndig") >= 0);
- conn.disconnect();
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: Die Angabe der Parameter ist unvollständig.\n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA552() throws Exception {
- try {
- String URL = getURL("https://localhost:8443/moa-id-auth/", "gb", "https://localhost:9443/");
- HttpsURLConnection conn = giveConnection(URL, "GET");
- conn.connect();
- int resultCode = conn.getResponseCode();
- assertEquals(200, resultCode);
- if (!conn.getHeaderField("Content-Type").equalsIgnoreCase("text/html"))
- fail("Wrong contentType: expected text/html and was " + conn.getHeaderField("Content-Type"));
- conn.disconnect();
- URL = "https://localhost:8443/moa-id-auth/" + "VerifyIdentityLink?MOASessionID=0000";
- conn = giveConnection(URL, "POST");
- conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
-
- String infoboxReadResponse = readXmldata("InfoboxReadResponse.xml");
- OutputStream out = conn.getOutputStream();
- out.write(new String("XMLResponse=" + URLEncoder.encode(infoboxReadResponse, "UTF-8")).getBytes());
- out.flush();
- out.close();
-
- conn.connect();
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
- assertTrue(result.indexOf("MOASessionID ist unbekannt") >= 0);
- System.out.println("Fehler in testA552 erfolgreich abgefangen: MOASessionID ist unbekannt");
- conn.disconnect();
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testA553() throws Exception {
- try {
- String URL = getURL("https://localhost:8443/moa-id-auth/", "gb", "https://localhost:9443/");
- HttpsURLConnection conn = giveConnection(URL, "GET");
- conn.connect();
- int resultCode = conn.getResponseCode();
- assertEquals(200,resultCode);
- if (!conn.getHeaderField("Content-Type").equalsIgnoreCase("text/html"))
- fail("Wrong contentType: expected text/html and was " + conn.getHeaderField("Content-Type"));
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
- String MOASessionID = parseSessionIDFromForm(result);
- URL = parseDataURL(result);
- conn.disconnect();
-
- conn = giveConnection(URL, "POST");
- conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
-
- String infoboxReadResponse = readXmldata("InfoboxReadResponse.xml");
- OutputStream out = conn.getOutputStream();
- out.write(new String("XMLResponse=" + URLEncoder.encode(infoboxReadResponse, "UTF-8")).getBytes());
- out.flush();
- out.close();
- conn.connect();
- result = new String(StreamUtils.readStream(conn.getInputStream()));
- String redirectLoc = conn.getHeaderField("Location");
- // Austausch von VerifyIdentityLink in der POST-URL durch VerifyAuthBlock... rest MUSS gleich sein!
- if (!killInclusive(URL, "VerifyI", "Link", "VerifyAuthBlock").equals(redirectLoc))
- fail("Wrong Redirect-Location: expected " + URL + " and was " + conn.getHeaderField("Location"));
- if (!conn.getHeaderField("Content-Type").equalsIgnoreCase("text/xml"))
- fail("Wrong contentType: expected text/xml and was " + conn.getHeaderField("Content-Type"));
- conn.disconnect();
- conn = giveConnection(redirectLoc + "XXX", "POST");
- System.out.println("Redirect Location: " + redirectLoc + "XXX");
- String createXMLSignatureResponse = "XMLResponse=" + URLEncoder.encode(readXmldata("CreateXMLSignatureResponse.xml"), "UTF-8");
-
- out = conn.getOutputStream();
- out.write(new String("MOASessionID=" + MOASessionID + "&").getBytes());
- out.write(createXMLSignatureResponse.getBytes("UTF-8"));
- out.flush();
- out.close();
- System.out.println("Sending Data to " + redirectLoc);
- conn.connect();
- resultCode = conn.getResponseCode();
-
- result = new String(StreamUtils.readStream(conn.getInputStream()));
- conn.disconnect();
- assertEquals(200, resultCode);
- assertTrue(result.indexOf("MOASessionID ist unbekannt") >= 0);
- System.out.println("-----------------------\nTestfall " + this.getName() + " erfolgreich abgearbeitet! \n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- private String parseDataURL(String input) {
- String ret = getSubString(input.substring(input.indexOf("DataURL"), input.length()), "value=\"", "\"");
- return ret;
- }
-
- private String getSubString(String input, String startsWith, String endsWith) {
- return input.substring(input.indexOf(startsWith) + startsWith.length(), input.indexOf(endsWith, input.indexOf(startsWith) + startsWith.length()));
- }
- private String getURL(String authURL, String target, String oaURL) {
- return authURL + "StartAuthentication?Target=" + target + "&OA=" + oaURL;
- }
- private String parseSessionIDFromForm(String htmlForm) {
- String parName = "MOASessionID=";
- assertTrue("HTML Form enthält keine SessionID", htmlForm.indexOf(parName) >= 0);
- int i1 = htmlForm.indexOf(parName) + parName.length();
- int i2 = htmlForm.indexOf("\"", i1);
- assertTrue("HTML Form enthält keine gültige SessionID", i2 > i1);
- return htmlForm.substring(i1, i2);
- }
-
- private class HostnameVerifierHack implements HostnameVerifier {
- public boolean verify(String arg0, String arg1) {
- return true;
- }
- }
- private HttpsURLConnection giveConnection(String targetURL, String requestMethod) throws Exception {
- URL url = new URL(targetURL);
- HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
- conn.setRequestMethod(requestMethod);
- conn.setDoInput(true);
- conn.setDoOutput(true);
- conn.setUseCaches(false);
- conn.setAllowUserInteraction(false);
- conn.setHostnameVerifier(new HostnameVerifierHack());
- return conn;
- }
-
-} \ No newline at end of file
diff --git a/id.server/src/test/abnahme/A/Test600GetAuthenticationDataService.java b/id.server/src/test/abnahme/A/Test600GetAuthenticationDataService.java
deleted file mode 100644
index b44852346..000000000
--- a/id.server/src/test/abnahme/A/Test600GetAuthenticationDataService.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package test.abnahme.A;
-
-import java.io.OutputStream;
-import java.net.URL;
-import java.security.Security;
-import java.util.Calendar;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-
-import org.apache.axis.message.SOAPBodyElement;
-import org.w3c.dom.Element;
-
-import com.sun.net.ssl.HostnameVerifier;
-import com.sun.net.ssl.HttpsURLConnection;
-
-import test.abnahme.AbnahmeTestCase;
-
-import at.gv.egovernment.moa.id.proxy.builder.SAMLRequestBuilder;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.DateTimeUtils;
-import at.gv.egovernment.moa.util.StreamUtils;
-import at.gv.egovernment.moa.util.URLDecoder;
-import at.gv.egovernment.moa.util.URLEncoder;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- */
-
-public class Test600GetAuthenticationDataService extends AbnahmeTestCase {
-
- private String moaSessionID;
- private String samlArtifact;
- private static final QName SERVICE_QNAME = new QName("SignatureCreation");
-
- public Test600GetAuthenticationDataService(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- 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("javax.net.ssl.trustStore", "C:/Programme/ApacheGroup/abnahme/server.keystore");
- System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
- }
-
- public void testA601() throws Exception {
- try {
-
- // Anmelden
- String URL = getURL("https://localhost:8443/moa-id-auth/", "gb", "https://localhost:9443/");
- HttpsURLConnection conn = giveConnection(URL, "GET");
- conn.connect();
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
- String MOASessionID = parseSessionIDFromForm(result);
- conn.disconnect();
-
- URL = parseDataURL(result);
- // Verify Identity Link
- conn = giveConnection(URL, "POST");
- conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
- String infoboxReadResponse = readXmldata("InfoboxReadResponse.xml");
- OutputStream out = conn.getOutputStream();
- out.write(new String("XMLResponse=" + URLEncoder.encode(infoboxReadResponse, "UTF-8")).getBytes());
- out.flush();
- out.close();
- conn.connect();
- String redirectLoc = conn.getHeaderField("Location");
- conn.disconnect();
- //Verify Auth Block
- conn = giveConnection(redirectLoc, "POST");
- String createXMLSignatureResponse = URLEncoder.encode(readXmldata("CreateXMLSignatureResponse.xml"), "UTF-8");
- out = conn.getOutputStream();
- out.write(("MOASessionID=" + moaSessionID + "&XMLResponse=" + createXMLSignatureResponse).getBytes("UTF-8"));
- out.flush();
- out.close();
- conn.connect();
- redirectLoc = conn.getHeaderField("Location");
- samlArtifact = parseSamlArtifact(redirectLoc);
- System.out.println("SamlArtifact: " + samlArtifact);
- conn.disconnect();
-
- assertTrue(redirectLoc.startsWith("https://localhost:9443/?Target=gb&SAMLArtifact="));
-
- conn = null;
-
- SAMLRequestBuilder srb = new SAMLRequestBuilder();
-
- Element erg = doCall(srb.build(moaSessionID,URLDecoder.decode(samlArtifact, "UTF-8")));
- result = DOMUtils.serializeNode(erg);
- result = killInclusive(result,"IssueInstant=\"","\"","");
- result = killInclusive(result,"AssertionID=\"","\"","");
- result = killInclusive(result,"ResponseID=\"","\"","");
-
-// writeXmldata("GetAuthenticationDataWebServiceResponse.xml", result.getBytes("UTF-8"));
-
- assertEquals(result,readXmldata("GetAuthenticationDataWebServiceResponse.xml"));
-
- System.out.println("-----------------------\nTestfall " + this.getName() + " erfolgreich abgearbeitet! \n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA651() throws Exception {
- try {
-
- // Anmelden
- String URL = getURL("https://localhost:8443/moa-id-auth/", "gb", "https://localhost:9443/");
- HttpsURLConnection conn = giveConnection(URL, "GET");
- conn.connect();
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
- String MOASessionID = parseSessionIDFromForm(result);
- conn.disconnect();
-
- URL = parseDataURL(result);
- // Verify Identity Link
- conn = giveConnection(URL, "POST");
- conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
- String infoboxReadResponse = readXmldata("InfoboxReadResponse.xml");
- OutputStream out = conn.getOutputStream();
- out.write(new String("XMLResponse=" + URLEncoder.encode(infoboxReadResponse, "UTF-8")).getBytes());
- out.flush();
- out.close();
- conn.connect();
- String redirectLoc = conn.getHeaderField("Location");
- conn.disconnect();
- //Verify Auth Block
- conn = giveConnection(redirectLoc, "POST");
- String createXMLSignatureResponse = URLEncoder.encode(readXmldata("CreateXMLSignatureResponse.xml"), "UTF-8");
- out = conn.getOutputStream();
- out.write(("MOASessionID=" + moaSessionID + "&XMLResponse=" + createXMLSignatureResponse).getBytes("UTF-8"));
- out.flush();
- out.close();
- conn.connect();
- redirectLoc = conn.getHeaderField("Location");
- samlArtifact = "AAGu1JFbyGKqJ+3NAonwMu5bNyUc7kooeMK6bxeXBbnK6NL0DfuVJsGi";
- System.out.println("SamlArtifact: " + samlArtifact);
- conn.disconnect();
-
- assertTrue(redirectLoc.startsWith("https://localhost:9443/?Target=gb&SAMLArtifact="));
-
- conn = null;
-
- SAMLRequestBuilder srb = new SAMLRequestBuilder();
- Element samlPRequest = srb.build(moaSessionID,samlArtifact);
-
- assertTrue(DOMUtils.serializeNode(doCall(samlPRequest)).indexOf("unbekanntes SAML-Artifakt")!=-1);
-
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: Fehler beim Abholen der Anmeldedaten, unbekanntes SAML-Artifakt\n-----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testA652() throws Exception {
- try {
-
- // Anmelden
- String URL = getURL("https://localhost:8443/moa-id-auth/", "gb", "https://localhost:9443/");
- HttpsURLConnection conn = giveConnection(URL, "GET");
- conn.connect();
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
- String MOASessionID = parseSessionIDFromForm(result);
- conn.disconnect();
-
- URL = parseDataURL(result);
- // Verify Identity Link
- conn = giveConnection(URL, "POST");
- conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
- String infoboxReadResponse = readXmldata("InfoboxReadResponse.xml");
- OutputStream out = conn.getOutputStream();
- out.write(new String("XMLResponse=" + URLEncoder.encode(infoboxReadResponse, "UTF-8")).getBytes());
- out.flush();
- out.close();
- conn.connect();
- String redirectLoc = conn.getHeaderField("Location");
- conn.disconnect();
- //Verify Auth Block
- conn = giveConnection(redirectLoc, "POST");
- String createXMLSignatureResponse = URLEncoder.encode(readXmldata("CreateXMLSignatureResponse.xml"), "UTF-8");
- out = conn.getOutputStream();
- out.write(("MOASessionID=" + moaSessionID + "&XMLResponse=" + createXMLSignatureResponse).getBytes("UTF-8"));
- out.flush();
- out.close();
- conn.connect();
- redirectLoc = conn.getHeaderField("Location");
- samlArtifact = parseSamlArtifact(redirectLoc);
- System.out.println("SamlArtifact: " + samlArtifact);
- conn.disconnect();
-
- assertTrue(redirectLoc.startsWith("https://localhost:9443/?Target=gb&SAMLArtifact="));
-
- conn = null;
- String request =
- "<samlp:Request xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\" RequestID=\"" +
- moaSessionID + "\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"" +
- DateTimeUtils.buildDateTime(Calendar.getInstance())+"\">" +
- "</samlp:Request>";
-
- Element samlPRequest = DOMUtils.parseDocument(request, false, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
-
- assertTrue(DOMUtils.serializeNode(doCall(samlPRequest)).indexOf("Fehlerhaftes Requestformat")!=-1);
-// writeXmldata("GetAuthenticationDataWebServiceResponse.xml", result.getBytes("UTF-8"));
- System.out.println("-----------------------\nFehler in " + this.getName() + " erfolgreich abgefangen: Fehlerhaftes Requestformat\n-----------------------"); }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- protected Element doCall(Element request)
- throws Exception {
- QName serviceName = new QName("GetAuthenticationData");
- String endPoint = "http://localhost:8080/moa-id-auth/services/GetAuthenticationData";
- Service service = ServiceFactory.newInstance().createService(serviceName);
- Call call = service.createCall();
- SOAPBodyElement body =
- new SOAPBodyElement(request);
- SOAPBodyElement[] params = new SOAPBodyElement[] {body};
- Vector responses;
- SOAPBodyElement response;
-
- call.setTargetEndpointAddress(endPoint);
- responses = (Vector) call.invoke(params);
- response = (SOAPBodyElement) responses.get(0);
-
- return response.getAsDOM();
- }
-
- private String parseDataURL(String input)
- {
- return getSubString(input.substring(input.indexOf("DataURL"),input.length()),"value=\"","\"");
- }
- private String parseSamlArtifact(String input)
- {
- return getSubString(input+"@@@","SAMLArtifact=","@@@");
- }
- private String getSubString(String input, String startsWith, String endsWith)
- {
- return input.substring(input.indexOf(startsWith)+startsWith.length(), input.indexOf(endsWith, input.indexOf(startsWith)+startsWith.length()));
- }
- private String getURL(String authURL, String target, String oaURL)
- {
- return authURL + "StartAuthentication?Target=" + target + "&OA=" + oaURL;
- }
- private String parseSessionIDFromForm(String htmlForm) {
- String parName = "MOASessionID=";
- assertTrue(
- "HTML Form enthält keine SessionID",
- htmlForm.indexOf(parName) >= 0);
- int i1 = htmlForm.indexOf(parName) + parName.length();
- int i2 = htmlForm.indexOf("\"", i1);
- assertTrue("HTML Form enthält keine gültige SessionID", i2 > i1);
- return htmlForm.substring(i1, i2);
- }
- private HttpsURLConnection giveConnection(String targetURL, String requestMethod) throws Exception {
- HttpsURLConnection conn = (HttpsURLConnection) new URL(targetURL).openConnection();
- conn.setRequestMethod(requestMethod);
- conn.setDoInput(true);
- conn.setDoOutput(true);
- conn.setUseCaches(false);
- conn.setAllowUserInteraction(false);
- conn.setHostnameVerifier(new HostnameVerifierHack());
- return conn;
- }
- private class HostnameVerifierHack implements HostnameVerifier {
- public boolean verify(String arg0, String arg1) {
- return true;
- }
- }
-}
diff --git a/id.server/src/test/abnahme/A/Test700SelectBKU.java b/id.server/src/test/abnahme/A/Test700SelectBKU.java
deleted file mode 100644
index 9cfa47033..000000000
--- a/id.server/src/test/abnahme/A/Test700SelectBKU.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package test.abnahme.A;
-
-import test.abnahme.AbnahmeTestCase;
-
-/*
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class Test700SelectBKU extends AbnahmeTestCase {
-
- public Test700SelectBKU(String name) {
- super(name);
- }
-
- public void testA701() throws Exception {
- try {
- String form = server.selectBKU(
- "https://localhost:8443/auth",
- "gb",
- "https://localhost:9443/",
- "file:" + getTestCaseDirectory() + "BKUSelectionTemplate.html",
- "file:" + getTestCaseDirectory() + "Template.html");
- //writeXmldata("SelectBKUForm_out.html", form.getBytes());
- assertEqualsIgnoreSessionID(readXmldata("SelectBKUForm.html"), form);
- }
- catch (Exception ex) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + ex.getLocalizedMessage());
- throw ex;
- }
- }
- public void testA702() throws Exception {
- try {
- String form = server.selectBKU(
- "https://localhost:8443/auth",
- "gb",
- "https://localhost:9443/",
- null,
- null);
- //writeXmldata("SelectBKUForm_out.html", form.getBytes());
- assertEqualsIgnoreSessionID(readXmldata("SelectBKUForm.html"), form);
- }
- catch (Exception ex) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + ex.getLocalizedMessage());
- throw ex;
- }
- }
- public void testA703() throws Exception {
- try {
- String form = server.selectBKU(
- "https://localhost:8443/auth",
- "gb",
- "https://localhost:9443/",
- null,
- null);
- //writeXmldata("SelectBKUForm_out.html", form.getBytes());
- assertEqualsIgnoreSessionID(readXmldata("SelectBKUForm.html"), form);
- }
- catch (Exception ex) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + ex.getLocalizedMessage());
- throw ex;
- }
- }
-}
diff --git a/id.server/src/test/abnahme/AbnahmeTestCase.java b/id.server/src/test/abnahme/AbnahmeTestCase.java
deleted file mode 100644
index e0e6fc183..000000000
--- a/id.server/src/test/abnahme/AbnahmeTestCase.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package test.abnahme;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-import test.MOAIDTestCase;
-
-import at.gv.egovernment.moa.id.MOAIDException;
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-
-/**
- * Base class for MOA ID test cases.
- *
- * Provides some utility functions.
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class AbnahmeTestCase extends MOAIDTestCase {
-
- protected static final String TESTDATA_ROOT = "data/abnahme-test/";
- protected static final String TESTDATA_XMLDATA = "data/abnahme-test/xmldata/";
- protected static final String AUTH_ENDPOINT = "http://localhost:8080/moa-id-auth/";
- protected AuthenticationServer server;
-
- /**
- * Constructor for MOATestCase.
- * @param arg0
- */
- public AbnahmeTestCase(String name) {
- super(name);
- }
- /**
- * Set up a transaction context with a test configuration.
- */
- protected void setUp() throws Exception {
-
- System.out.print("--------S-T-A-R-T----V-O-N----");
- System.out.print(getName().toUpperCase().substring(4,getName().length()));
- System.out.print("-----------------------------\n");
-
- // Set moa.spss.server.configuration property
- System.setProperty("moa.spss.server.configuration",TESTDATA_ROOT + "conf/moa/ConfigurationTest.xml");
-
- // Set moa.id.configuration property
- String pathname = findXmldata("Configuration.xml");
- System.setProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME, pathname);
- System.out.println("Konfiguration " + pathname);
- AuthConfigurationProvider.reload();
-
- server = AuthenticationServer.getInstance();
- }
- /** Test case z.B. "A153" */
- protected String getID() {
- return getName().toUpperCase().substring(4,getName().length());
- }
- /** Test group z.B. "A100" */
- protected String getTestGroup() {
- return getID().substring(0, 2) + "00";
- }
- /** Test case data directory */
- protected String getTestCaseDirectory() {
- return getTestGroupDirectory() + getID() + "/";
- }
- /** Test group data directory */
- protected String getTestGroupDirectory() {
- return TESTDATA_XMLDATA + getTestGroup() + "/";
- }
- /** Finds a file in the xmldata directory */
- protected String findXmldata(String filename) {
- String pathname = getTestCaseDirectory() + filename;
- if (! new File(pathname).exists()) {
- pathname = getTestGroupDirectory() + filename;
- if (! new File(pathname).exists()) {
- pathname = TESTDATA_XMLDATA + filename;
- }
- }
- return pathname;
- }
- /** Finds and reads a file in the xmldata directory */
- protected String readXmldata(String filename) throws IOException {
- String pathname = findXmldata(filename);
- System.out.println("Read file " + pathname);
- return readFile(pathname);
- }
- protected void writeXmldata(String filename, byte[] content) throws Exception {
- String pathname = getTestCaseDirectory() + filename;
- System.out.println("Write file " + pathname);
- RandomAccessFile raf = new RandomAccessFile(pathname, "rw");
- byte[] data = content;
- raf.write(data);
- raf.setLength(data.length);
- raf.close();
- }
-
- /**
- * Creates a session using standard parameters,
- * and returns the session ID.
- */
- protected String startAuthentication() throws MOAIDException {
- return startAuthentication("https://localhost:9443/");
- }
- /**
- * Creates a session using standard parameters,
- * and returns the session ID.
- */
- protected String startAuthentication(String oaURL) throws MOAIDException {
- String htmlForm = AuthenticationServer.getInstance().startAuthentication(
- "https://localhost:8443/auth",
- "gb",
- oaURL,
- null,
- null,
- null);
- String sessionID = parseSessionIDFromForm(htmlForm);
- return sessionID;
- }
- private String parseSessionIDFromForm(String htmlForm) {
- String parName = "MOASessionID=";
- assertTrue(
- "HTML Form enthält keine SessionID",
- htmlForm.indexOf(parName) >= 0);
- int i1 = htmlForm.indexOf(parName) + parName.length();
- int i2 = i1;
- while(i2 < htmlForm.length() &&
- (htmlForm.charAt(i2) == '-' || (htmlForm.charAt(i2) >= '0' && htmlForm.charAt(i2) <= '9')))
- i2++;
- assertTrue("HTML Form enthält keine gültige SessionID", i2 > i1);
- return htmlForm.substring(i1, i2);
- }
- protected String clearSessionID(String htmlForm) {
- String sessionID = parseSessionIDFromForm(htmlForm);
- int i1 = htmlForm.indexOf(sessionID);
- int i2 = i1 + sessionID.length();
- return htmlForm.substring(0, i1) + htmlForm.substring(i2);
- }
- protected void assertEqualsIgnoreSessionID(String s1, String s2) {
- String ss1 = clearSessionID(s1);
- String ss2 = clearSessionID(s2);
- assertEquals(ss1, ss2);
- }
- protected void authDataWriter(AuthenticationData authData, String filename) throws Exception
- {
- writeXmldata("AuthenticationDataNEW.xml", clearSamlAssertion(authData.getSamlAssertion()).getBytes("UTF-8"));
- }
-
- /**
- * clearSamlAssertion löscht aus einer beliebiegen String-Repräsentation einer XML-Struktur
- * AUSSLIESSLICH die Attribute 'IssueInstant' und 'AssertionID' heraus.
- * @param samlAssertion
- * @return String
- */
- protected String clearSamlAssertion(String samlAssertion)
- {
- String result = killInclusive(samlAssertion,"IssueInstant='", "'","");
- result = killInclusive(result,"AssertionID='", "'","");
- return result;
- }
-} \ No newline at end of file
diff --git a/id.server/src/test/abnahme/AllTests.java b/id.server/src/test/abnahme/AllTests.java
deleted file mode 100644
index 56a38be28..000000000
--- a/id.server/src/test/abnahme/AllTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package test.abnahme;
-
-import junit.awtui.TestRunner;
-import junit.framework.*;
-
-import test.abnahme.A.Test100StartAuthentication;
-import test.abnahme.A.Test200VerifyIdentityLink;
-import test.abnahme.A.Test300VerifyAuthBlock;
-import test.abnahme.A.Test400GetAuthenticationData;
-import test.abnahme.A.Test500StartAuthenticationServlet;
-import test.abnahme.A.Test600GetAuthenticationDataService;
-import test.abnahme.A.Test700SelectBKU;
-import test.abnahme.C.Test100Konfiguration;
-import test.abnahme.P.Test100LoginParameterResolver;
-
-
-
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
-
- suite.addTestSuite(Test100StartAuthentication.class);
- suite.addTestSuite(Test200VerifyIdentityLink.class);
- suite.addTestSuite(Test300VerifyAuthBlock.class);
- suite.addTestSuite(Test400GetAuthenticationData.class);
- suite.addTestSuite(Test500StartAuthenticationServlet.class);
- suite.addTestSuite(Test600GetAuthenticationDataService.class);
- suite.addTestSuite(Test700SelectBKU.class);
-
- suite.addTestSuite(Test100LoginParameterResolver.class);
-
- suite.addTestSuite(Test100Konfiguration.class);
- return suite;
- }
-
- public static void main(String[] args) {
- try {
- TestRunner.run(AllTests.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/id.server/src/test/abnahme/C/Test100Konfiguration.java b/id.server/src/test/abnahme/C/Test100Konfiguration.java
deleted file mode 100644
index 7da5a7449..000000000
--- a/id.server/src/test/abnahme/C/Test100Konfiguration.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package test.abnahme.C;
-
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-
-import test.abnahme.AbnahmeTestCase;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-
-public class Test100Konfiguration extends AbnahmeTestCase {
-
- public Test100Konfiguration(String name) {
- super(name);
- }
-
- public void testC001() throws Exception {
- try {
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testC002() throws Exception {
- try {
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testC003() throws Exception {
- try {
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
- public void testC051() throws Exception {
- try {
- // Set moa.id.configuration property
- String pathname = findXmldata("ConfigurationC051.xml");
- System.setProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME, pathname);
- System.out.println("Konfiguration " + pathname);
- AuthConfigurationProvider.reload();
- }
- catch (Exception e) {
- System.out.println("-----------------------Fehler in " + this.getName() + " erfolgreich abgefangen: " + e.getLocalizedMessage() + "-----------------------");
- }
- // AuthConfigurationProvider.getInstance().getBKUConnectionParameter().getAcceptedServerCertificates()
- }
-}
diff --git a/id.server/src/test/abnahme/P/Test100LoginParameterResolver.java b/id.server/src/test/abnahme/P/Test100LoginParameterResolver.java
deleted file mode 100644
index 8b7b2002f..000000000
--- a/id.server/src/test/abnahme/P/Test100LoginParameterResolver.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package test.abnahme.P;
-import java.util.Map;
-
-import sun.misc.BASE64Decoder;
-import test.abnahme.AbnahmeTestCase;
-
-import at.gv.egovernment.moa.id.config.proxy.OAConfiguration;
-import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter;
-import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.id.proxy.LoginParameterResolver;
-import at.gv.egovernment.moa.id.proxy.LoginParameterResolverFactory;
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-
-public class Test100LoginParameterResolver extends AbnahmeTestCase {
-
- private static final String CLIENT_IP_ADDRESS = "56.246.75.11";
- private OAConfiguration oaConf;
- private LoginParameterResolver lpr;
-
- public Test100LoginParameterResolver(String name) {
- super(name);
- }
-
- private void setUp(String publicURLPrefix)
- throws Exception {
-
- // get configuration data
- ProxyConfigurationProvider proxyConf = ProxyConfigurationProvider.getInstance();
- OAProxyParameter oaParam = proxyConf.getOnlineApplicationParameter(publicURLPrefix);
- oaConf = oaParam.getOaConfiguration();
- System.out.println("Parameterübergabe: " + oaConf.getAuthType());
-
- // get login parameter resolver
- LoginParameterResolverFactory.initialize();
- lpr = LoginParameterResolverFactory.getLoginParameterResolver(publicURLPrefix);
- }
- public void testP101() throws Exception {
- try {
- // read configuration and set up LoginParameterResolver
- setUp("https://testP101:9443/");
- if (! oaConf.getAuthType().equals(OAConfiguration.BASIC_AUTH))
- fail();
-
- // assemble authentication data
- AuthenticationData authData = new AuthenticationData();
- authData.setFamilyName("Huber");
- authData.setGivenName("Hugo");
-
- // resolve login headers
- Map loginHeaders = lpr.getAuthenticationHeaders(oaConf, authData, CLIENT_IP_ADDRESS);
-
- // validate login headers
- assertEquals(1, loginHeaders.keySet().size());
- System.out.println("Header Authorization: " + loginHeaders.get("Authorization"));
- System.out.println("Decoded UserID:Password " +
- new String(new BASE64Decoder().decodeBuffer(((String)loginHeaders.get("Authorization")).substring(6))));
- String userIDPassword = "Hugo:Huber";
- String credentials = Base64Utils.encode(userIDPassword.getBytes());
- assertEquals("Basic " + credentials, loginHeaders.get("Authorization"));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
-
- }
- public void testP102() throws Exception {
- try {
- // read configuration and set up LoginParameterResolver
- setUp("https://testP102:9443/");
- if (! oaConf.getAuthType().equals(OAConfiguration.PARAM_AUTH))
- fail();
-
- // assemble authentication data
- AuthenticationData authData = new AuthenticationData();
- String DATE_OF_BIRTH = "1963-12-29";
- String VPK = "kp6hOq6LRAkLtrqm6EvDm6bMwJw=";
- authData.setDateOfBirth(DATE_OF_BIRTH);
- authData.setVPK(VPK);
-
- // resolve login parameters
- Map loginParameters = lpr.getAuthenticationParameters(oaConf, authData, CLIENT_IP_ADDRESS);
-
- // validate login headers
- assertEquals(2, loginParameters.keySet().size());
- System.out.println("Param1: " + loginParameters.get("Param1"));
- System.out.println("Param2: " + loginParameters.get("Param2"));
- assertEquals(DATE_OF_BIRTH, loginParameters.get("Param1"));
- assertEquals(VPK, loginParameters.get("Param2"));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-
- public void testP103() throws Exception {
- try {
- // read configuration and set up LoginParameterResolver
- setUp("https://localhost:9443/");
- if (! oaConf.getAuthType().equals(OAConfiguration.HEADER_AUTH))
- fail();
-
- // assemble authentication data
- AuthenticationData authData = new AuthenticationData();
- boolean PUBLIC_AUTH = true;
- String BKZ = "FinanzamtWien23Leitstelle";
- boolean QUAL_CERT = false;
- String ZMR_ZAHL = "3456789012";
- authData.setPublicAuthority(PUBLIC_AUTH);
- authData.setPublicAuthorityCode(BKZ);
- authData.setQualifiedCertificate(QUAL_CERT);
- authData.setIdentificationValue(ZMR_ZAHL);
-
- // resolve login headers
- Map loginHeaders = lpr.getAuthenticationHeaders(oaConf, authData, CLIENT_IP_ADDRESS);
-
- // validate login headers
- assertEquals(5, loginHeaders.keySet().size());
- System.out.println("Header Param1: " + loginHeaders.get("Param1"));
- System.out.println("Header Param2: " + loginHeaders.get("Param2"));
- System.out.println("Header Param3: " + loginHeaders.get("Param3"));
- System.out.println("Header Param4: " + loginHeaders.get("Param4"));
- System.out.println("Header Param5: " + loginHeaders.get("Param5"));
- assertEquals(String.valueOf(PUBLIC_AUTH), loginHeaders.get("Param1"));
- assertEquals(BKZ, loginHeaders.get("Param2"));
- assertEquals(String.valueOf(QUAL_CERT), loginHeaders.get("Param3"));
- assertEquals(ZMR_ZAHL, loginHeaders.get("Param4"));
- assertEquals(CLIENT_IP_ADDRESS, loginHeaders.get("Param5"));
- System.out.println("-----------------------Testfall " + this.getName() + " erfolgreich abgearbeitet! -----------------------");
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN " + this.getName() + ":" + e.getLocalizedMessage());
- throw e;
- }
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/AllTests.java b/id.server/src/test/at/gv/egovernment/moa/id/AllTests.java
deleted file mode 100644
index 69ed3d12b..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/AllTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package test.at.gv.egovernment.moa.id;
-
-import test.at.gv.egovernment.moa.id.auth.AuthenticationServerTest;
-import test.at.gv.egovernment.moa.id.auth.servlet.GetAuthenticationDataServiceTest;
-import test.at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationTest;
-import test.at.gv.egovernment.moa.id.config.auth.MOAIDAuthConfigurationProviderTest;
-import test.at.gv.egovernment.moa.id.config.proxy.MOAIDProxyConfigurationProviderTest;
-
-import junit.awtui.TestRunner;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
-
- suite.addTestSuite(AuthenticationServerTest.class);
- suite.addTest(test.at.gv.egovernment.moa.id.auth.builder.AllTests.suite());
- suite.addTest(test.at.gv.egovernment.moa.id.auth.parser.AllTests.suite());
- suite.addTestSuite(GetAuthenticationDataServiceTest.class);
- suite.addTestSuite(SignatureVerificationTest.class);
- suite.addTestSuite(MOAIDAuthConfigurationProviderTest.class);
- suite.addTestSuite(MOAIDProxyConfigurationProviderTest.class);
- suite.addTest(test.at.gv.egovernment.moa.id.proxy.AllTests.suite());
-
- return suite;
- }
-
- public static void main(String[] args) {
- try {
- TestRunner.run(AllTests.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/UnitTestCase.java b/id.server/src/test/at/gv/egovernment/moa/id/UnitTestCase.java
deleted file mode 100644
index 8309a4f7e..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/UnitTestCase.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package test.at.gv.egovernment.moa.id;
-
-import test.MOAIDTestCase;
-
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-
-/**
- * Base class for MOA ID test cases.
- *
- * Provides some utility functions.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class UnitTestCase extends MOAIDTestCase {
-
- protected static final String TESTDATA_ROOT = "data/test/";
-
- /**
- * Constructor for MOATestCase.
- * @param arg0
- */
- public UnitTestCase(String name) {
- super(name);
- }
- /**
- * Set up a transaction context with a test configuration.
- */
- protected void setUp() throws Exception {
- System.setProperty(
- ConfigurationProvider.CONFIG_PROPERTY_NAME,
- TESTDATA_ROOT + "conf/ConfigurationTest.xml");
- }
-
-} \ No newline at end of file
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java
deleted file mode 100644
index 753b2ef12..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/AuthenticationServerTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth;
-
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationServerTest extends UnitTestCase {
-
- public AuthenticationServerTest(String name) {
- super(name);
- }
-
- public void testStandard() throws Exception {
- doTest(
- "standard",
- "https://localhost:8443/auth",
- "gb",
- "https://localhost:9443/",
- null,
- null);
- }
- public void doTest(String testdataDirectory, String authURL, String target, String oaURL, String bkuURL, String templateURL) throws Exception {
- String testdataRoot = TESTDATA_ROOT + "xmldata/" + testdataDirectory + "/";
- AuthenticationServer server = AuthenticationServer.getInstance();
- String htmlForm = server.startAuthentication(authURL, target, oaURL, templateURL, bkuURL, null);
- String sessionID = parseSessionIDFromForm(htmlForm);
- String infoboxReadResponse = readFile(TESTDATA_ROOT + "xmldata/testperson1/" + "InfoboxReadResponse.xml");
- String createXMLSignatureRequest = server.verifyIdentityLink(sessionID, infoboxReadResponse);
- String createXMLSignatureRequestShould = readFile(testdataRoot + "CreateXMLSignatureRequest.xml");
- assertXmlEquals(createXMLSignatureRequestShould, createXMLSignatureRequest);
- String createXMLSignatureResponse = readFile(testdataRoot + "CreateXMLSignatureResponse.xml");
- String samlArtifact = server.verifyAuthenticationBlock(sessionID, createXMLSignatureResponse);
- AuthenticationData authData = server.getAuthenticationData(samlArtifact);
- String authDataShould = readFile(testdataRoot + "AuthenticationDataAssertion.xml");
- assertXmlEquals(authDataShould, authData.getSamlAssertion());
- }
- private String parseSessionIDFromForm(String htmlForm) {
- String parName = "MOASessionID=";
- assertTrue("HTML Form enthält keine SessionID", htmlForm.indexOf(parName) >= 0);
- int i1 = htmlForm.indexOf(parName) + parName.length();
- int i2 = htmlForm.indexOf("\"", i1);
- assertTrue("HTML Form enthält keine gültige SessionID", i2 > i1);
- return htmlForm.substring(i1, i2);
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java
deleted file mode 100644
index afaf4a199..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth;
-
-import java.io.ByteArrayInputStream;
-import java.security.KeyStore;
-import java.util.Enumeration;
-
-import iaik.pkcs.pkcs12.PKCS12;
-import iaik.security.provider.IAIK;
-
-import at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.util.SSLUtils;
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.KeyStoreUtils;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class MOAIDAuthInitialiserTest extends UnitTestCase {
-
- public MOAIDAuthInitialiserTest(String name) {
- super(name);
- }
-
- public void testInit() throws Exception
- {
-// System.setProperty(
-// ConfigurationProvider.CONFIG_PROPERTY_NAME,"C://Programme/ApacheGroup/abnahme/conf/moa-id/SampleMOAIDConfiguration.xml");
-// System.setProperty(
-// ConfigurationProvider.CONFIG_PROPERTY_NAME,"D://Daten/_Projects/moa_id_maengel/SampleMOAIDConfiguration.xml");
- SSLUtils.initialize();
-
- try {
- KeyStore s = KeyStoreUtils.loadKeyStore("pkcs12","file:C:/Programme/ApacheGroup/abnahme/cert/keystore.p12","changeit");
- System.out.println(s.getProvider().getClass().getName());
- Enumeration enum = s.aliases();
- while (enum.hasMoreElements()) {
- String element = (String) enum.nextElement();
- System.out.print(element+":");
- System.out.println(s.getCertificate(element).getPublicKey().getAlgorithm());
- System.out.println(s.getCertificate(element).getType());
- }
-
-
- System.out.println(s.getCertificate("pc41408").getPublicKey().getFormat());
-
- }
- catch (Exception e) {e.printStackTrace();};
-
- }
-
- }
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AllTests.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AllTests.java
deleted file mode 100644
index 77dff29aa..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AllTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.builder;
-
-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(AuthenticationBlockAssertionBuilderTest.class);
- suite.addTestSuite(CreateXMLSignatureBuilderTest.class);
- suite.addTestSuite(GetIdentityLinkFormBuilderTest.class);
- suite.addTestSuite(InfoboxReadRequestBuilderTest.class);
- suite.addTestSuite(PersonDataBuilderTest.class);
- suite.addTestSuite(SAMLArtifactBuilderTest.class);
-
- return suite;
- }
-
- public static void main(String[] args) {
- try {
- TestRunner.run(AllTests.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java
deleted file mode 100644
index 2717ee8c0..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.builder;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-import at.gv.egovernment.moa.id.auth.builder.AuthenticationBlockAssertionBuilder;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationBlockAssertionBuilderTest extends UnitTestCase {
- private static final String nl = "\n";
- private static final String ISSUER = "Hugo Mustermann";
- private static final String ISSUE_INSTANT = "2003-03-15T22:50:21+01:00";
- private static final String AUTH_URL = "https://auth.moa.gv.at/";
- private static final String TARGET = "Grundbuch";
- private static final String OA_URL = "https://grundbuch.gv.at/";
-
- // wird auch von CreateXMLSignatureBuilderTest verwendet !
- public static final String ASSERTION_SHOULD =
-"<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' MajorVersion='1' MinorVersion='0' AssertionID='any' Issuer='" + ISSUER + "' IssueInstant='" + ISSUE_INSTANT + "'>" + nl +
-" <saml:AttributeStatement>" + nl +
-" <saml:Subject>" + nl +
-" <saml:NameIdentifier>" + AUTH_URL + "</saml:NameIdentifier>" + nl +
-" </saml:Subject>" + nl +
-" <saml:Attribute AttributeName='Geschäftsbereich' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>" + nl +
-" <saml:AttributeValue>" + TARGET + "</saml:AttributeValue>" + nl +
-" </saml:Attribute>" + nl +
-" <saml:Attribute AttributeName='OA' AttributeNamespace='http://reference.e-government.gv.at/namespace/moa/20020822#'>" + nl +
-" <saml:AttributeValue>" + OA_URL + "</saml:AttributeValue>" + nl +
-" </saml:Attribute>" + nl +
-" </saml:AttributeStatement>" + nl +
-"</saml:Assertion>";
-
- public AuthenticationBlockAssertionBuilderTest(String name) {
- super(name);
- }
-
- public void testBuild() throws Exception {
- AuthenticationBlockAssertionBuilder builder = new AuthenticationBlockAssertionBuilder();
- String assertionBuilt = builder.build(ISSUER, ISSUE_INSTANT, AUTH_URL, TARGET, OA_URL);
- assertionBuilt = XML_DECL + assertionBuilt;
- String assertionShould = XML_DECL + ASSERTION_SHOULD;
- assertXmlEquals(assertionShould, assertionBuilt);
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java
deleted file mode 100644
index 13f86efee..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureBuilderTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.id.auth.builder.CreateXMLSignatureRequestBuilder;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class CreateXMLSignatureBuilderTest extends UnitTestCase {
- private static final String nl = "\n";
- public static final String TRANSFORMS_INFO =
- " <sl10:TransformsInfo>" + nl +
- " <dsig:Transforms>" + nl +
- " <dsig:Transform Algorithm='http://www.w3.org/2000/09/xmldsig#enveloped-signature'/>" + nl +
- " <dsig:Transform Algorithm='http://www.w3.org/TR/1999/REC-xslt-19991116'>" + nl +
-"<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:saml='urn:oasis:names:tc:SAML:1.0:assertion' >" + nl +
-"<xsl:template match='/'>" + nl +
-"<html>" + nl +
-"<body>" + nl +
-"</body>" + nl +
-"</html>" + nl +
-"</xsl:template>" + nl +
-"</xsl:stylesheet>" + nl +
- " </dsig:Transform>" + nl +
- " </dsig:Transforms>" + nl +
- " <sl10:FinalDataMetaInfo>" + nl +
- " <sl10:MimeType>text/html</sl10:MimeType>" + nl +
- " </sl10:FinalDataMetaInfo>" + nl +
- " </sl10:TransformsInfo>" + nl;
- public static final String REQUEST_SHOULD =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + nl +
-"<sl11:CreateXMLSignatureRequest xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:sl10=\"http://www.buergerkarte.at/namespaces/securitylayer/20020225#\" xmlns:sl11=\"http://www.buergerkarte.at/namespaces/securitylayer/20020831#\">" + nl +
-" <sl11:KeyboxIdentifier>SecureSignatureKeypair</sl11:KeyboxIdentifier>" + nl +
-" <sl11:DataObjectInfo Structure=\"detached\">" + nl +
-" <sl10:DataObject Reference=\"\"/>" + nl +
-TRANSFORMS_INFO +
-" </sl11:DataObjectInfo>" + nl +
-" <sl11:SignatureInfo>" + nl +
-" <sl11:SignatureEnvironment>" + nl +
-" <sl10:XMLContent>" + AuthenticationBlockAssertionBuilderTest.ASSERTION_SHOULD + "</sl10:XMLContent>" + nl +
-" </sl11:SignatureEnvironment>" + nl +
-" <sl11:SignatureLocation Index=\"2\">/saml:Assertion</sl11:SignatureLocation>" + nl +
-" </sl11:SignatureInfo>" + nl +
-"</sl11:CreateXMLSignatureRequest>";
-
- public CreateXMLSignatureBuilderTest(String name) {
- super(name);
- }
-
- public void testBuild() throws Exception {
- String request = new CreateXMLSignatureRequestBuilder().build(
- AuthenticationBlockAssertionBuilderTest.ASSERTION_SHOULD,
- new String[] {TRANSFORMS_INFO});
- assertXmlEquals(REQUEST_SHOULD, request);
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java
deleted file mode 100644
index 9142a8e42..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.builder;
-
-import java.text.MessageFormat;
-
-import junit.framework.TestCase;
-
-import at.gv.egovernment.moa.id.auth.builder.CertInfoVerifyXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.builder.GetIdentityLinkFormBuilder;
-import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilder;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class GetIdentityLinkFormBuilderTest extends TestCase {
- private static String nl = "\n";
- public static String FORM =
- "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
- "<html>" + nl +
- "<head>" + nl +
- "<title>Auslesen der Personenbindung</title>" + nl +
- "</head>" + nl +
- "<body>" + nl +
- "<form name=\"GetIdentityLinkForm\"" + nl +
- " action=\"{0}\"" + nl +
- " method=\"post\">" + nl +
- " <input type=\"hidden\" " + nl +
- " name=\"XMLRequest\"" + nl +
- " value=\"{1}\"/>" + nl +
- " <input type=\"hidden\" " + nl +
- " name=\"DataURL\"" + nl +
- " value=\"{2}\"/>" + nl +
- " <input type=\"submit\" value=\"Auslesen der Personenbindung\"/>" + nl +
- "</form>" + nl +
- "<form name=\"CertificateInfoForm\"" + nl +
- " action=\"{0}\"" + nl +
- " method=\"post\">" + nl +
- " <input type=\"hidden\" " + nl +
- " name=\"XMLRequest\"" + nl +
- " value=\"{3}\"/>" + nl +
- " <input type=\"hidden\" " + nl +
- " name=\"DataURL\"" + nl +
- " value=\"{4}\"/>" + nl +
- " <input type=\"submit\" value=\"Information zu Wurzelzertifikaten\"/>" + nl +
- "</form>" + nl +
- "</body>" + nl +
- "</html>";
- public static String BKU =
- "http://localhost:3495/http-security-layer-request";
-
- public void testBuild() throws Exception {
- String xmlRequest = new InfoboxReadRequestBuilder().build();
- String dataURL = "https://1.2.3.4/auth/VerifyIdentityLink?MOASessionID=1234567";
- String infoRequest = new CertInfoVerifyXMLSignatureRequestBuilder().build();
- String infoDataURL = "https://1.2.3.4/auth/StartAuthentication?Target=gb&OA=https://oa.gv.at/";
- String form = new GetIdentityLinkFormBuilder().build(null, null, xmlRequest, dataURL, infoRequest, infoDataURL);
- String formShould = MessageFormat.format(
- FORM, new Object[] { BKU, xmlRequest, dataURL, infoRequest, infoDataURL });
- assertEquals(formShould, form);
- }
- public void testBuildCustomBKU() throws Exception {
- String xmlRequest = new InfoboxReadRequestBuilder().build();
- String dataURL = "https://1.2.3.4/auth/AuthServlet/StartAuthentication?MOASessionID=1234567";
- String infoRequest = new CertInfoVerifyXMLSignatureRequestBuilder().build();
- String infoDataURL = "https://1.2.3.4/auth/StartAuthentication?Target=gb&OA=https://oa.gv.at/";
- String bkuURL = "http://bku.at/";
- String form = new GetIdentityLinkFormBuilder().build(null, bkuURL, xmlRequest, dataURL, infoRequest, infoDataURL);
- String formShould = MessageFormat.format(
- FORM, new Object[] { bkuURL, xmlRequest, dataURL, infoRequest, infoDataURL });
- assertEquals(formShould, form);
- }
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java
deleted file mode 100644
index b65fc9ecf..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.builder;
-
-import org.w3c.dom.Document;
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilder;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class InfoboxReadRequestBuilderTest extends UnitTestCase implements Constants {
-
- public InfoboxReadRequestBuilderTest(String name) {
- super(name);
- }
-
- public void testBuild() throws Exception {
- InfoboxReadRequestBuilder builder = new InfoboxReadRequestBuilder();
- String xmlBuilt = builder.build();
- Document docBuilt = DOMUtils.parseDocument(xmlBuilt, false, ALL_SCHEMA_LOCATIONS, null);
- String xmlBuiltSerialized = DOMUtils.serializeNode(docBuilt);
- // xmlShould was generated by Hot:Sign Tester
- String xmlShould = "<?xml version='1.0' encoding='utf-8'?><sl10:InfoboxReadRequest xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/20020225#'><sl10:InfoboxIdentifier>IdentityLink</sl10:InfoboxIdentifier><sl10:BinaryFileParameters ContentIsXMLEntity='true'/></sl10:InfoboxReadRequest>";
- assertXmlEquals(xmlShould, xmlBuiltSerialized);
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java
deleted file mode 100644
index 504679fd5..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.id.auth.builder.PersonDataBuilder;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
-import at.gv.egovernment.moa.util.Constants;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class PersonDataBuilderTest extends UnitTestCase implements Constants {
-
- /**
- * Constructor for PersonDataBuilderTest.
- */
- public PersonDataBuilderTest(String arg) {
- super(arg);
- }
- public void testBuild() throws Exception {
- String xmlInfoboxReadResponse = readFile("data/test/xmldata/testperson1/InfoboxReadResponse.xml");
- IdentityLink il = new InfoboxReadResponseParser(xmlInfoboxReadResponse).parseIdentityLink();
- String xmlPersonData = new PersonDataBuilder().build(il, true);
- String xmlPersonDataShould = "<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>";
- assertPersonDataEquals(xmlPersonDataShould, xmlPersonData);
- }
- public void testBuildNoZMRZahl() throws Exception {
- String xmlInfoboxReadResponse = readFile("data/test/xmldata/testperson1/InfoboxReadResponse.xml");
- IdentityLink il = new InfoboxReadResponseParser(xmlInfoboxReadResponse).parseIdentityLink();
- String xmlPersonData = new PersonDataBuilder().build(il, false);
- String xmlPersonDataShould = XML_DECL + "<pr:Person xsi:type=\"pr:PhysicalPersonType\"><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>";
- assertPersonDataEquals(xmlPersonDataShould, xmlPersonData);
- }
- private void assertPersonDataEquals(String s1, String s2) throws Exception {
- String ss1 = insertPrNS(s1);
- String ss2 = insertPrNS(s2);
- assertXmlEquals(ss1, ss2);
- }
- private String insertPrNS(String xmlPersonData) {
- int startNS = xmlPersonData.indexOf("Person") + "Person".length() + 1;
- String s =
- xmlPersonData.substring(0, startNS) +
- "xmlns:pr=\"" + PD_NS_URI + "\" " +
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
- xmlPersonData.substring(startNS);
- return s;
- }
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java
deleted file mode 100644
index 3ec73ee4c..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.id.auth.builder.SAMLArtifactBuilder;
-import at.gv.egovernment.moa.util.Base64Utils;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLArtifactBuilderTest extends UnitTestCase {
-
- private static final String AUTH_URL = "https://moa.gv.at/auth/";
- private static final String SESSION_ID_1 = "123456";
- private static final String SESSION_ID_2 = "123457";
- private static final String SESSION_ID_3 = "1234567";
-
- private SAMLArtifactBuilder builder;
- private byte[] artifact1;
- private byte[] artifact2;
- private byte[] artifact3;
-
- public SAMLArtifactBuilderTest(String name) {
- super(name);
- }
- protected void setUp() throws Exception {
- builder = new SAMLArtifactBuilder();
- artifact1 = Base64Utils.decode(builder.build(AUTH_URL, SESSION_ID_1), false);
- artifact2 = Base64Utils.decode(builder.build(AUTH_URL, SESSION_ID_2), false);
- artifact3 = Base64Utils.decode(builder.build(AUTH_URL, SESSION_ID_3), false);
- }
-
- public void testBuildArtifactLength() throws BuildException {
- assertEquals(42, artifact1.length);
- assertEquals(42, artifact2.length);
- assertEquals(42, artifact3.length);
- }
- public void testBuildSameArtifact() throws Exception {
- byte[] artifact1Clone = Base64Utils.decode(builder.build(AUTH_URL, SESSION_ID_1), false);
- assertEquals(new String(artifact1), new String(artifact1Clone));
- }
- public void testBuildDifferentArtifacts() throws BuildException {
- String msg = "SAML Artifacts should be different";
- assertFalse(msg, new String(artifact1).equals(new String(artifact2)));
- assertFalse(msg, new String(artifact1).equals(new String(artifact3)));
- assertFalse(msg, new String(artifact3).equals(new String(artifact2)));
- }
-
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java
deleted file mode 100644
index 5b3bb5906..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.builder;
-
-import java.io.FileInputStream;
-import java.io.RandomAccessFile;
-
-import org.w3c.dom.Element;
-import test.at.gv.egovernment.moa.id.auth.invoke.MOASPSSTestCase;
-
-import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
-import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-
-
-
-/**
- * Test case for the signature verification web service.
- *
- * This test requires a running SignatureVerification web service.
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class VerifyXMLSignatureRequestBuilderTest extends MOASPSSTestCase {
-
-
- private SignatureVerificationInvoker caller;
-
- public VerifyXMLSignatureRequestBuilderTest(String name) {
- super(name);
- }
-
- public void setUp() {
- System.setProperty(
- ConfigurationProvider.CONFIG_PROPERTY_NAME,
- "data/test/conf/ConfigurationTest.xml");
- caller = new SignatureVerificationInvoker();
- }
-
- public void testVerifyXMLSignatureRequestBuilderIdentityLink() throws Exception {
-
- RandomAccessFile infoBox = new RandomAccessFile(
- "data/test/xmldata/testperson1/InfoboxReadResponse.xml","r");
- byte[] b = new byte[(int) infoBox.length()];
- infoBox.read(b);
- infoBox.close();
- String xmlInfoboxReadResponse = new String(b, "UTF-8");
-
-
- RandomAccessFile vr = new RandomAccessFile(
- "data/test/xmldata/standard/VerifyXMLSignatureRequestIdentityLink.xml","r");
- b = new byte[(int) vr.length()];
- vr.read(b);
- vr.close();
- String xmlResponse = new String(b, "UTF-8");
-
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(xmlInfoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- VerifyXMLSignatureRequestBuilder vsrb = new VerifyXMLSignatureRequestBuilder();
- AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-
- Element requestBuild = vsrb.build(idl, authConf.getMoaSpIdentityLinkTrustProfileID());
-
- assertXmlEquals(requestBuild, xmlResponse);
-
- }
-
- public void testVerifyXMLSignature2() throws Exception {
-
- RandomAccessFile s = new RandomAccessFile("data/test/xmldata/standard/CreateXMLSignatureResponse.xml","r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- s.close();
- String xmlCreateXMLSignatureResponse = new String(b, "UTF-8");
-
- CreateXMLSignatureResponseParser cXMLsrp = new CreateXMLSignatureResponseParser(xmlCreateXMLSignatureResponse);
- CreateXMLSignatureResponse csr = cXMLsrp.parseResponse();
-
- VerifyXMLSignatureRequestBuilder vsrb = new VerifyXMLSignatureRequestBuilder();
-
- AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-
- Element request = vsrb.build(csr, authConf.getMoaSpAuthBlockVerifyTransformsInfoIDs(), authConf.getMoaSpIdentityLinkTrustProfileID());
-
- // check the result
- assertXmlEquals(request, new FileInputStream("data/test/xmldata/standard/VerifyXMLSignatureRequestCreateXML.xml"));
-
- }
- }
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java
deleted file mode 100644
index 7ae6f70ef..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.invoke;
-
-import java.security.Security;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-/**
- * Base class for end-to-end tests of MOA web-services.
- *
- * Initializes the test system and provides some properties.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class MOASPSSTestCase extends UnitTestCase {
-
- public MOASPSSTestCase(String name) {
- super(name);
- }
-
-
- protected void setupSSL() {
- 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(
- "javax.net.ssl.keyStore",
- "data/test/security/client.keystore");
- System.setProperty("javax.net.ssl.keyStorePassword", "changeit");
- System.setProperty(
- "javax.net.ssl.trustStore",
- "data/test/security/client.keystore");
- System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
- }
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java
deleted file mode 100644
index e56dcde91..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.invoke;
-
-import java.io.RandomAccessFile;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
-import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser;
-import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker;
-import at.gv.egovernment.moa.id.auth.validator.VerifyXMLSignatureResponseValidator;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-
-
-/**
- * Test case for the signature verification web service.
- *
- * This test requires a running SignatureVerification web service.
- *
- * @author Patrick Peck
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class SignatureVerificationTest extends MOASPSSTestCase {
-
-
- private SignatureVerificationInvoker caller;
-
- public SignatureVerificationTest(String name) {
- super(name);
- }
-
- public void setUp() {
-System.setProperty(
- ConfigurationProvider.CONFIG_PROPERTY_NAME,
- "data/test/conf/ConfigurationTest.xml");
- caller = new SignatureVerificationInvoker();
- }
-
-/* public void testVerifyCMSSignature() throws Exception {
- Element request =
- parseXml("data/test/xml/VCSQ000.xml").getDocumentElement();
- Element result;
-
- // call the service
- result = caller.verifyXMLSignature(request);
-
- // check the result
- assertEquals("VerifyCMSSignatureResponse", result.getTagName());
- }*/
-
- public void testVerifyXMLSignature1() throws Exception {
-
- //Momentan zeigt die Konfiguration als Endpunkt aus localhost:8081 zum
- //Protokollieren per TCPMon... der ECHT Endpunkt ist 10.16.46.108:8080
- RandomAccessFile s =
- new RandomAccessFile(
- "data/test/xmldata/testperson1/InfoboxReadResponse.xml","r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- String xmlInfoboxReadResponse =new String(b,"UTF8");
-
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(xmlInfoboxReadResponse);
- IdentityLink idl = irrp.parseIdentityLink();
- VerifyXMLSignatureRequestBuilder vsrb = new VerifyXMLSignatureRequestBuilder();
-
- AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-
- Element request = vsrb.build(idl, authConf.getMoaSpIdentityLinkTrustProfileID());
- s =new RandomAccessFile("D://PatricksVerifyXMLSignatureRequestWithInfoboxReadResponse.xml","rw");
- s.write(DOMUtils.serializeNode(request).getBytes("UTF-8"));
- s.close();
-// Element request = DOMUtils.parseDocument(vsrb.build(xmlInfoboxReadResponse,"TrustProfile1"),false,null,null).getDocumentElement();
-// Element request = DOMUtils.parseDocument(xmlInfoboxReadResponse,false,null,null).getDocumentElement();
-// call the service
- Element response = caller.verifyXMLSignature(request);
- VerifyXMLSignatureResponseParser vParser = new VerifyXMLSignatureResponseParser(response);
- VerifyXMLSignatureResponse vData = vParser.parseData();
- VerifyXMLSignatureResponseValidator vValidate = VerifyXMLSignatureResponseValidator.getInstance();
- vValidate.validate(vData, authConf.getIdentityLinkX509SubjectNames(), VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK);
- vValidate.validateCertificate(vData,idl);
-
- // check the result
- assertXmlEquals(response, request);
-
- }
-
- public void testVerifyXMLSignature2() throws Exception {
- // Prüft den 2. Aufruf mit dem CreateXMLSIgnatureResponse als Parameter
- //Momentan zeigt die Konfiguration als Endpunkt aus localhost:8081 zum
- //Protokollieren per TCPMon... der ECHT Endpunkt ist 10.16.46.108:8080
- RandomAccessFile s =
- new RandomAccessFile(
- "data/test/xmldata/standard/CreateXMLSignatureResponse.xml","r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- String xmlCreateXMLSignatureResponse = new String(b, "UTF8");
-
- CreateXMLSignatureResponseParser cXMLsrp = new CreateXMLSignatureResponseParser(xmlCreateXMLSignatureResponse);
-// CreateXMLSignatureResponseParser cXMLsrp = new CreateXMLSignatureResponseParser(xmlCreateXMLSignatureResponse);
- CreateXMLSignatureResponse csr = cXMLsrp.parseResponse();
-
- VerifyXMLSignatureRequestBuilder vsrb = new VerifyXMLSignatureRequestBuilder();
-
- AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-
- Element request = vsrb.build(csr, authConf.getMoaSpAuthBlockVerifyTransformsInfoIDs(), authConf.getMoaSpIdentityLinkTrustProfileID());
- // Element request = DOMUtils.parseDocument(vsrb.build(xmlInfoboxReadResponse,"TrustProfile1"),false,null,null).getDocumentElement();
-// Element request = DOMUtils.parseDocument(xmlInfoboxReadResponse,false,null,null).getDocumentElement();
- Element result;
-/*s =new RandomAccessFile("D://PatricksVerifyXMLSignatureRequestWithAuthBlock.xml","rw");
- s.write(DOMUtils.serializeNode(request).getBytes("UTF-8"));
- s.close();*/
- // call the service
- result = caller.verifyXMLSignature(request);
- // check the result
- assertEquals("VerifyXMLSignatureResponse", result.getTagName());
-
- }
-
-
- public void testParseCreateXMLSignatureResponse() throws Exception {
-
- //Später soll die Datei direkt vom Server geholt werden...
-
- RandomAccessFile s =
- new RandomAccessFile(
- "data/test/xmldata/standard/CreateXMLSignatureResponse.xml",
-
- "r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- String xmlCreateXMLSignatureResponse = new String(b, "UTF-8");
-
- CreateXMLSignatureResponseParser cXMLsrp = new CreateXMLSignatureResponseParser(xmlCreateXMLSignatureResponse);
- CreateXMLSignatureResponse csr = cXMLsrp.parseResponse();
-
- }
-
- public void testParseVerifyXMLSignatureResponse() throws Exception {
-
- //Später soll die Datei direkt vom Server geholt werden...
-
- RandomAccessFile s =
- new RandomAccessFile(
- "data/test/xmldata/standard/VerifyXMLSignaterResponse.xml",
-
- "r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- String xmlVerifyXMLSignatureResponse = new String(b, "UTF-8");
-
- VerifyXMLSignatureResponseParser vXMLsrp = new VerifyXMLSignatureResponseParser(xmlVerifyXMLSignatureResponse);
- VerifyXMLSignatureResponse vsr = vXMLsrp.parseData();
-
- }
-
-
- }
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/AllTests.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/AllTests.java
deleted file mode 100644
index 84f5110b0..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/AllTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.parser;
-
-import junit.awtui.TestRunner;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
-
- suite.addTestSuite(IdentityLinkAssertionParserTest.class);
- suite.addTestSuite(SAMLArtifactParserTest.class);
-
- return suite;
- }
-
- public static void main(String[] args) {
- try {
- TestRunner.run(AllTests.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java
deleted file mode 100644
index 77eb360bc..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.parser;
-
-import iaik.security.rsa.RSAPublicKey;
-
-import java.io.FileOutputStream;
-import java.io.RandomAccessFile;
-import java.security.PublicKey;
-
-import org.w3c.dom.Document;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.parser.ECDSAKeyValueConverter;
-import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
-import at.gv.egovernment.moa.id.auth.validator.IdentityLinkValidator;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class IdentityLinkAssertionParserTest extends UnitTestCase {
-
- IdentityLinkAssertionParser ilap;
-
- public IdentityLinkAssertionParserTest(String name) {
- super(name);
- }
-
- public void setUp() {
- try {
- RandomAccessFile s =
- new RandomAccessFile(
- "data/test/xmldata/testperson1/InfoboxReadResponse.xml",
- "r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- String xmlInfoboxReadResponse = new String(b, "UTF-8");
-
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(xmlInfoboxReadResponse);
- ilap = new IdentityLinkAssertionParser(irrp.parseSAMLAssertion());
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void testParseIdentityLink() throws Exception {
- IdentityLink idl = ilap.parseIdentityLink();
- System.out.println(idl.getGivenName());
- System.out.println(idl.getFamilyName());
- System.out.println(idl.getDateOfBirth());
- System.out.println(idl.getIdentificationValue());
-
- VerifyXMLSignatureRequestBuilder vx = new VerifyXMLSignatureRequestBuilder();
-
- // Element zurück bekommen: vx.build(idl.getSamlAssertion());
-
- IdentityLinkValidator idVali = IdentityLinkValidator.getInstance();
- idVali.validate(idl);
-
- }
-
- public void testParseIdentityLinkECC() throws Exception {
- RandomAccessFile s =
- new RandomAccessFile(
- "data/test/xmldata/IL.ResponseToRequest.01.ECDSA.xml",
- "r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- String xmlInfoboxReadResponse = new String(b);
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(xmlInfoboxReadResponse);
- String SAML = irrp.parseSAMLAssertion();
- ilap = new IdentityLinkAssertionParser(SAML);
- IdentityLink idl = ilap.parseIdentityLink();
- System.out.println(idl.getGivenName());
- System.out.println(idl.getFamilyName());
- System.out.println(idl.getDateOfBirth());
- System.out.println(idl.getIdentificationValue());
-
- VerifyXMLSignatureRequestBuilder vx = new VerifyXMLSignatureRequestBuilder();
-
- // Element zurück bekommen: vx.build(idl.getSamlAssertion());
-
- IdentityLinkValidator idVali = IdentityLinkValidator.getInstance();
- idVali.validate(idl);
-
- }
-
- public void testRSAPublicKeys() throws Exception {
- if (ilap.getPublicKeys()[0].getClass().getName().equals("iaik.security.rsa.RSAPublicKey"))
- {
-
- for (int i = 0; i < ilap.getPublicKeys().length; i++) {
- RSAPublicKey result = (RSAPublicKey)ilap.getPublicKeys()[i];
- System.out.println("RSA Public Key No" + i);
- System.out.println("Modulus: " + result.getModulus());
- System.out.println("Exponent: " + result.getPublicExponent());
- }
-
- }
- }
-
- public void testECDSAPublicKeys() throws Exception {
-
- RandomAccessFile s =
- new RandomAccessFile(
- "data/test/xmldata/ECDSAKeyExample.xml",
- "r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- String ecdsaKey = new String(b, "UTF-8");
- Document e = DOMUtils.parseDocument(ecdsaKey,true,Constants.ALL_SCHEMA_LOCATIONS, null);
- PublicKey p = ECDSAKeyValueConverter.element2ECDSAPublicKey(e.getDocumentElement());
-
- }
-
-
- public void testDsigCertificates() throws Exception {
-
- String[] result = ilap.getCertificates();
- for (int i = 0; i < result.length; i++) {
-
- System.out.println("DSIG Certificate Length: " + result[i].length() + " No" + i + "\n" + result[i]);
- FileOutputStream raf = new FileOutputStream("data/test/certs/cert" + i + ".cer");
- raf.write(result[i].getBytes());
- raf.flush();
- raf.close();
- }
-
- }
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java
deleted file mode 100644
index 9a878be2c..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.parser;
-
-import java.io.RandomAccessFile;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
-import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class InfoboxReadResponseParserTest extends UnitTestCase {
-
- IdentityLinkAssertionParser ilap;
-
- public InfoboxReadResponseParserTest(String name) {
- super(name);
- }
-
- public void setUp() {
- }
-
- public void testParseInfoboxReadResponse() throws Exception {
- RandomAccessFile s =
- new RandomAccessFile(
- "data/test/xmldata/testperson1/InfoboxReadResponse.xml",
- "r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- String xmlInfoboxReadResponse = new String(b, "UTF-8");
-
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(xmlInfoboxReadResponse);
- ilap = new IdentityLinkAssertionParser(irrp.parseSAMLAssertion());
-
- IdentityLink idl = ilap.parseIdentityLink();
- System.out.println(idl.getGivenName());
- System.out.println(idl.getFamilyName());
- System.out.println(idl.getDateOfBirth());
- System.out.println(idl.getIdentificationValue());
-
- }
-
- public void testParseInfoboxReadResponseError() throws Exception {
- RandomAccessFile s =
- new RandomAccessFile(
- "data/test/xmldata/ErrorResponse.xml",
- "r");
- byte[] b = new byte[(int) s.length()];
- s.read(b);
- String xmlInfoboxReadResponse = new String(b, "UTF-8");
-
- InfoboxReadResponseParser irrp = new InfoboxReadResponseParser(xmlInfoboxReadResponse);
- ilap = new IdentityLinkAssertionParser(irrp.parseSAMLAssertion());
-
- IdentityLink idl = ilap.parseIdentityLink();
- System.out.println(idl.getGivenName());
- System.out.println(idl.getFamilyName());
- System.out.println(idl.getDateOfBirth());
- System.out.println(idl.getIdentificationValue());
-
- }
-
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java
deleted file mode 100644
index 992e799bd..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.parser;
-
-import at.gv.egovernment.moa.id.auth.builder.SAMLArtifactBuilder;
-import at.gv.egovernment.moa.id.auth.parser.SAMLArtifactParser;
-import at.gv.egovernment.moa.id.util.Random;
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-/*
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLArtifactParserTest extends UnitTestCase {
-
- private static String URL1 = "http://moa.gv.at/auth";
- private static String URL2 = "https://moa.gv.at/auth";
-
- public SAMLArtifactParserTest(String name) {
- super(name);
- }
-
- public void testParseTypeCode() throws Exception {
- String sessionID = Random.nextRandom();
- String samlArtifact = new SAMLArtifactBuilder().build(URL1, sessionID);
- byte[] typeCode = new SAMLArtifactParser(samlArtifact).parseTypeCode();
- assertEquals(typeCode[0], 0);
- assertEquals(typeCode[1], 1);
- }
- public void testParseAssertionHandleSameSessionID() throws Exception {
- // SAML artifacts for different authURL's but same sessionID MUST give same assertion handle
- String sessionID = Random.nextRandom();
- String samlArtifact1 = new SAMLArtifactBuilder().build(URL1, sessionID);
- String samlArtifact2 = new SAMLArtifactBuilder().build(URL2, sessionID);
- String assertionHandle1 = new SAMLArtifactParser(samlArtifact1).parseAssertionHandle();
- String assertionHandle2 = new SAMLArtifactParser(samlArtifact2).parseAssertionHandle();
- assertEquals(assertionHandle1, assertionHandle2);
- }
- public void testParseAssertionHandleSameURL() throws Exception {
- // SAML artifacts for same authURL but different sessionID's MUST give different assertion handles
- String sessionID1 = Random.nextRandom();
- String sessionID2 = Random.nextRandom();
- String samlArtifact1 = new SAMLArtifactBuilder().build(URL1, sessionID1);
- String samlArtifact2 = new SAMLArtifactBuilder().build(URL1, sessionID2);
- String assertionHandle1 = new SAMLArtifactParser(samlArtifact1).parseAssertionHandle();
- String assertionHandle2 = new SAMLArtifactParser(samlArtifact2).parseAssertionHandle();
- assertFalse(assertionHandle1.equals(assertionHandle2));
- }
- public void testParseAssertionHandleSameSAMLArtifact() throws Exception {
- // SAML artifact parsed twice MUST give same assertion handle each time
- String sessionID = Random.nextRandom();
- String samlArtifact = new SAMLArtifactBuilder().build(URL1, sessionID);
- String assertionHandle1 = new SAMLArtifactParser(samlArtifact).parseAssertionHandle();
- String assertionHandle2 = new SAMLArtifactParser(samlArtifact).parseAssertionHandle();
- assertEquals(assertionHandle1, assertionHandle2);
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataServiceTest.java b/id.server/src/test/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataServiceTest.java
deleted file mode 100644
index c78651fdb..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/auth/servlet/GetAuthenticationDataServiceTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package test.at.gv.egovernment.moa.id.auth.servlet;
-
-import org.w3c.dom.Element;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-import at.gv.egovernment.moa.id.auth.servlet.GetAuthenticationDataService;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Test case instantiates GetAuthenticationDataService and calls the Request() method.
- * It DOES NOT call the web service via Axis.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class GetAuthenticationDataServiceTest extends UnitTestCase implements Constants {
-
- private GetAuthenticationDataService service;
-
- public GetAuthenticationDataServiceTest(String arg0) {
- super(arg0);
- }
- protected void setUp() throws Exception {
- service = new GetAuthenticationDataService();
- }
-
- public void testService2Requests() throws Exception {
- String requestString =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
- "<samlp:Request xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" RequestID=\"123456\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"2003-02-13T13:59:00\">" +
- "<saml:AssertionIDReference>123</saml:AssertionIDReference>" +
- "</samlp:Request>";
- Element request = DOMUtils.parseDocument(requestString, false, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
- Element response = service.Request(new Element[] {request, request})[0];
- assertStatus(response, "samlp:Requester", "samlp:TooManyResponses");
- }
- public void testServiceNoSAMLArtifact() throws Exception {
- String requestString =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
- "<samlp:Request xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" RequestID=\"123456\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"2003-02-13T13:59:00\">" +
- "<saml:AssertionIDReference>123</saml:AssertionIDReference>" +
- "</samlp:Request>";
- Element request = DOMUtils.parseDocument(requestString, false, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
- Element response = service.Request(new Element[] {request})[0];
- assertStatus(response, "samlp:Requester", null);
- }
- public void testService2SAMLArtifacts() throws Exception {
- String requestString =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
- "<samlp:Request xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" RequestID=\"123456\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"2003-02-13T13:59:00\">" +
- "<samlp:AssertionArtifact>123</samlp:AssertionArtifact>" +
- "<samlp:AssertionArtifact>456</samlp:AssertionArtifact>" +
- "</samlp:Request>";
- Element request = DOMUtils.parseDocument(requestString, false, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
- Element response = service.Request(new Element[] {request})[0];
- assertStatus(response, "samlp:Requester", "samlp:TooManyResponses");
- }
- public void testServiceWrongFormat() throws Exception {
- String requestString =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
- "<samlp:Request xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" RequestID=\"123456\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"2003-02-13T13:59:00\">" +
- "</samlp:Request>";
- Element request = DOMUtils.parseDocument(requestString, false, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
- Element response = service.Request(new Element[] {request})[0];
- assertStatus(response, "samlp:Requester", null);
- }
- public void testServiceWrongSAMLArtifact() throws Exception {
- String requestString =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
- "<samlp:Request xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" RequestID=\"123456\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"2003-02-13T13:59:00\">" +
- "<samlp:AssertionArtifact>WRONGARTIFACT</samlp:AssertionArtifact>" +
- "</samlp:Request>";
- Element request = DOMUtils.parseDocument(requestString, false, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
- Element response = service.Request(new Element[] {request})[0];
- assertStatus(response, "samlp:Requester", "samlp:ResourceNotRecognized");
- }
- private void assertStatus(Element response, String statusCodeShould, String subStatusCodeShould) throws Exception {
- Element statusCodeNode = (Element)XPathUtils.selectSingleNode(response, "//samlp:StatusCode");
- String statusCode = statusCodeNode.getAttribute("Value");
- Element subStatusCodeNode = (Element)XPathUtils.selectSingleNode(statusCodeNode, "//samlp:StatusCode/samlp:StatusCode");
- String subStatusCode = subStatusCodeNode == null ? null : subStatusCodeNode.getAttribute("Value");
- System.out.println(statusCode + subStatusCode);
- assertEquals(statusCodeShould, statusCode);
- assertEquals(subStatusCodeShould, subStatusCode);
- }
-
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java
deleted file mode 100644
index 7935c5179..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/config/auth/MOAIDAuthConfigurationProviderTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package test.at.gv.egovernment.moa.id.config.auth;
-
-import java.util.Map;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class MOAIDAuthConfigurationProviderTest extends UnitTestCase {
- private AuthConfigurationProvider provider;
-
- /**
- * Constructor for MOAAuthConfigTest.
- * @param name
- */
- public MOAIDAuthConfigurationProviderTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
-
- provider =
- new AuthConfigurationProvider(TESTDATA_ROOT + "conf/ConfigurationTest.xml");
-
- }
- public void testGetTransformsInfoFileNames() {
- String[] transformsInfoFileNames;
- transformsInfoFileNames = provider.getTransformsInfoFileNames();
-// for (int i = 0; i < transformsInfoFileNames.length; i++) {
-// System.out.println(
-// "getTransformsInfoFileNames: " + transformsInfoFileNames[i]);
- assertEquals(transformsInfoFileNames[0],"http://StringsecLayerTranformsInfo1");
- assertEquals(transformsInfoFileNames[1],"http://StringsecLayerTranformsInfo2");
-// }
-
- }
-
- public void testGetMOASPConnectionParameters() {
- ConnectionParameter cp;
- cp = provider.getMoaSpConnectionParameter();
- assertEquals(cp.getUrl(),"MOA-SP-URL");
- assertEquals(cp.getAcceptedServerCertificates(),"http://AcceptedServerCertificates");
- assertEquals(cp.getClientKeyStorePassword(),"Keystore Pass");
- assertEquals(cp.getClientKeyStore(),"URLtoClientKeystoreAUTH");
-/* System.out.println();
- System.out.println("getMoaSpConnectionParameter :" + cp.getUrl());
- System.out.println(
- "getMoaSpConnectionParameter :" + cp.getAcceptedServerCertificates());
- System.out.println(
- "getMoaSpConnectionParameter :" + cp.getClientKeyStorePassword());
- System.out.println(
- "getMoaSpConnectionParameter :" + cp.getClientKeyStore());*/
- }
- public void testGetMoaSpIdentityLinkTrustProfileID() {
-
- assertEquals(provider.getMoaSpIdentityLinkTrustProfileID(),"StringVerifyIdentiyLinkTrustID");
-
- }
- public void testGetMoaSpAuthBlockTrustProfileID() {
- assertEquals(provider.getMoaSpAuthBlockTrustProfileID(),"StringVerifyAuthBlockTransformID");
- }
-
- public void testGetMoaSpAuthBlockVerifyTransformsInfoIDs() {
- String[] result = provider.getMoaSpAuthBlockVerifyTransformsInfoIDs();
- assertEquals(result[0],"StringVerifyTransformsInfoID1");
- assertEquals(result[1],"StringVerifyTransformsInfoID2");
-
- }
-
- public void testGetOnlineApplicationAuthParameter() {
- OAAuthParameter[] result = provider.getOnlineApplicationParameters();
-
- assertEquals(result[0].getPublicURLPrefix(),"StringOALoginURL");
- assertEquals(result[0].getProvideZMRZahl(),false);
- assertEquals(result[0].getProvideAuthBlock(),false);
- assertEquals(result[0].getProvideIdentityLink(),false);
-
- assertEquals(result[1].getPublicURLPrefix(),"StringOALoginURL2");
- assertEquals(result[1].getProvideZMRZahl(),true);
- assertEquals(result[1].getProvideAuthBlock(),true);
- assertEquals(result[1].getProvideIdentityLink(),true);
-
-
-/* for (int i = 0; i < result.length; i++) {
- System.out.println();
- System.out.println("getOnlineApplicationParameters Url: " + result[i].getUrl());
- System.out.println("getOnlineApplicationParameters ProvideZMRZahl: " + result[i].getProvideZMRZahl());
- System.out.println("getOnlineApplicationParameters ProvideAuthBlock: " + result[i].getProvideAuthBlock());
- System.out.println("getOnlineApplicationParameters ProvideIdentityLink: " + result[i].getProvideIdentityLink());
- }*/
- }
-
- public void testGetGenericConfiguration() {
- Map result = provider.getGenericConfiguration();
- assertEquals(result.containsKey("Generic Name 1"),true);
- assertEquals(result.containsKey("Generic Name 2"),true);
- assertEquals(result.get("Generic Name 1"),"Value1");
- assertEquals(result.get("Generic Name 2"),"Value2");
- /* for (Iterator iter = result.keySet().iterator(); iter.hasNext();) {
- String element = (String) iter.next();
- System.out.println("getGenericConfiguration Key:" + element);
- System.out.println("getGenericConfiguration Value:" + result.get(element));
- }*/
- }
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java
deleted file mode 100644
index 12eddf8c3..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/config/proxy/MOAIDProxyConfigurationProviderTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package test.at.gv.egovernment.moa.id.config.proxy;
-
-import java.util.Map;
-
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.proxy.OAConfiguration;
-import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
-import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class MOAIDProxyConfigurationProviderTest extends UnitTestCase {
- private ProxyConfigurationProvider provider;
-
- /**
- * Constructor for MOAProxyConfigTest.
- * @param name
- */
- public MOAIDProxyConfigurationProviderTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
-
- provider =
-// new ProxyConfigurationProvider(TESTDATA_ROOT + "conf/ConfigurationTest.xml");
- new ProxyConfigurationProvider("data/deploy/conf/moa-id/ConfigurationTest.xml");
- }
- public void testGetAuthComponentConnectionParameter()
- {
- ConnectionParameter cp;
- cp = provider.getAuthComponentConnectionParameter();
- assertEquals(cp.getUrl(),"AuthComponentURL");
- assertEquals( cp.getAcceptedServerCertificates(),"http://www.altova.com");
- assertEquals(cp.getClientKeyStorePassword(),"String");
- assertEquals(cp.getClientKeyStore(),"http://www.altova.com");
- /* System.out.println();
- System.out.println("getProxyComponentConnectionParameter :" + cp.getUrl());
- System.out.println(
- "getProxyComponentConnectionParameter :" + cp.getAcceptedServerCertificates());
- System.out.println(
- "getProxyComponentConnectionParameter :" + cp.getClientKeyStorePassword());
- System.out.println(
- "getProxyComponentConnectionParameter :" + cp.getClientKeyStore());*/
-}
-
- public void testGetOAProxyParameter() {
- OAProxyParameter[] result = provider.getOnlineApplicationParameters();
-
- assertEquals("http://localhost:9080/", result[0].getPublicURLPrefix());
- assertEquals("file:data/test/conf/OAConfParamAuth.xml", result[0].getConfigFileURL());
- assertEquals(10, result[0].getSessionTimeOut());
- assertEquals("StringloginParameterResolverImpl1", result[0].getLoginParameterResolverImpl());
- assertEquals("StringconnectionBuilderImpl1", result[0].getConnectionBuilderImpl());
-
- assertEquals("ProxyComponentURL", result[0].getConnectionParameter().getUrl());
- assertEquals("url:AcceptedServerCertificates", result[0].getConnectionParameter().getAcceptedServerCertificates());
- assertEquals("URL:toClientKeystoreOA", result[0].getConnectionParameter().getClientKeyStore());
- assertEquals("ClientKeystoreOAPAss", result[0].getConnectionParameter().getClientKeyStorePassword());
-
- assertEquals("StringOALoginURL2", result[1].getPublicURLPrefix());
- assertEquals("file:data/test/conf/OAConfHeaderAuth.xml", result[1].getConfigFileURL());
- assertEquals(20, result[1].getSessionTimeOut());
- assertEquals("StringloginParameterResolverImpl2",result[1].getLoginParameterResolverImpl());
- assertEquals("StringconnectionBuilderImpl2", result[1].getConnectionBuilderImpl());
-
- assertEquals("ProxyComponentURL2", result[1].getConnectionParameter().getUrl());
- assertEquals("url:AcceptedServerCertificates2", result[1].getConnectionParameter().getAcceptedServerCertificates());
- assertEquals("URL:toClientKeystoreOA2", result[1].getConnectionParameter().getClientKeyStore());
- assertEquals("ClientKeystoreOAPAss2", result[1].getConnectionParameter().getClientKeyStorePassword());
-
- assertEquals("StringOALoginURL3", result[2].getPublicURLPrefix());
- assertEquals("file:data/test/conf/OAConfBasicAuth.xml", result[2].getConfigFileURL());
- assertEquals(20, result[2].getSessionTimeOut());
- assertEquals("StringloginParameterResolverImpl3",result[2].getLoginParameterResolverImpl());
- assertEquals("StringconnectionBuilderImpl3", result[2].getConnectionBuilderImpl());
-
- assertEquals("ProxyComponentURL3", result[2].getConnectionParameter().getUrl());
- assertEquals("url:AcceptedServerCertificates3", result[2].getConnectionParameter().getAcceptedServerCertificates());
- assertEquals("URL:toClientKeystoreOA3", result[2].getConnectionParameter().getClientKeyStore());
- assertEquals("ClientKeystoreOAPAss3", result[2].getConnectionParameter().getClientKeyStorePassword());
- }
-
- public void testGetGenericConfiguration() {
- Map result = provider.getGenericConfiguration();
- assertEquals(true, result.containsKey("authenticationSessionTimeOut"));
- assertEquals(true, result.containsKey("authenticationDataTimeOut"));
- assertEquals("600", result.get("authenticationSessionTimeOut"));
- assertEquals("120", result.get("authenticationDataTimeOut"));
- }
-
- public void testOAConfigurationProvider() throws Exception
- {
- OAProxyParameter[] result = provider.getOnlineApplicationParameters();
- // für jeden Parameter müsste theoretisch bereits ein Provider instanziiert worden sein,
- // aus diesem Grund braucht man NICHT mehr die File-URL anzugeben, PublicURLPrefix reicht
-
- // sollte ParamAuth sein
- OAConfiguration oac1 = result[0].getOaConfiguration();
- assertEquals(OAConfiguration.PARAM_AUTH, oac1.getAuthType());
- assertEquals("MOADateOfBirth", oac1.getParamAuthMapping().get("Param1"));
- assertEquals("MOAVPK", oac1.getParamAuthMapping().get("Param2"));
- // sollte HeaderAuth sein
- OAConfiguration oac2 = result[1].getOaConfiguration();
- assertEquals(OAConfiguration.HEADER_AUTH, oac2.getAuthType());
- assertEquals("MOAPublicAuthority", oac2.getHeaderAuthMapping().get("Param1"));
- assertEquals("MOABKZ", oac2.getHeaderAuthMapping().get("Param2"));
- assertEquals("MOAQualifiedCertificate", oac2.getHeaderAuthMapping().get("Param3"));
- assertEquals("MOAZMRZahl", oac2.getHeaderAuthMapping().get("Param4"));
- assertEquals("MOAIPAddress", oac2.getHeaderAuthMapping().get("Param5"));
-
- // sollte BasicAuth sein
- OAConfiguration oac3 = result[2].getOaConfiguration();
- assertEquals(OAConfiguration.BASIC_AUTH, oac3.getAuthType());
- assertEquals("MOAGivenName", oac3.getBasicAuthUserIDMapping());
- assertEquals("MOAFamilyName", oac3.getBasicAuthPasswordMapping());
- //Fehlerfall:
-
-
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/AllTests.java b/id.server/src/test/at/gv/egovernment/moa/id/proxy/AllTests.java
deleted file mode 100644
index 2dd6cd35e..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/AllTests.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package test.at.gv.egovernment.moa.id.proxy;
-
-import test.at.gv.egovernment.moa.id.proxy.builder.SAMLRequestBuilderTest;
-import test.at.gv.egovernment.moa.id.proxy.parser.SAMLResponseParserTest;
-import junit.awtui.TestRunner;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
-
- suite.addTestSuite(SAMLRequestBuilderTest.class);
- suite.addTestSuite(SAMLResponseParserTest.class);
-
- return suite;
- }
-
- public static void main(String[] args) {
- try {
- TestRunner.run(AllTests.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/DOMTreeCompare.java b/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/DOMTreeCompare.java
deleted file mode 100644
index aec14ce1c..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/DOMTreeCompare.java
+++ /dev/null
@@ -1,462 +0,0 @@
-package test.at.gv.egovernment.moa.id.proxy.builder;
-
-import java.io.PrintStream;
-import java.util.ArrayList;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DOMTreeCompare {
-
- boolean debug = true;
-
- private static PrintStream Log = null;
-
- static
- {
- Log = System.out;
- }
-
- public boolean compareElements(Element root1, Element root2)
- {
- //Log.println("----- Compare Elements:"+root1.getNodeName()+" "+root2.getNodeName());
- filterTree(root1);
- filterTree(root2);
- return compareNodes(root1,root2,0,"root/",false);
- }
-
- private boolean compareNodes(Node n1, Node n2, int level,String path,boolean attribute)
- {
- /*try {
- Log.println(DOMUtils.serializeNode(n1));
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }*/
- boolean equal = false;
- //Log.println("----- Compare Node "+level+":"+n1+" "+n2);
- //Log.println("----- Compare Node "+level+":"+n1.getNodeName()+" "+n2.getNodeName());
- //Log.println("----- Checking:"+path+getPathString(n1));
- NodeList nl1 = n1.getChildNodes();
- NodeList nl2 = n2.getChildNodes();
-
- int size1 = nl1.getLength();
- int size2 = nl2.getLength();
-
- if(debug)display_one(n1);
- if(debug)display_one(n2);
-
-
- if(debug)
- if(n1.getNodeName().equals("Base64Content") && n2.getNodeName().equals("Base64Content"))
- {
- try {
- Log.println("CONT:"+new String(Base64Utils.decode(strip(n1.getChildNodes().item(0).getNodeValue()),false)));
- Log.println("CONT:"+new String(Base64Utils.decode(strip(n2.getChildNodes().item(0).getNodeValue()),false)));
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }
- }
-
- if(size1 != size2)
- {
- Log.println("----- Anzahl der Kinder nicht gleich:"+path+getPathString(n1)+":"+getPathString(n2));
- return false;
- }
-
- equal = compareNodeExact(n1,n2,level,path+getPathString(n1)+"/");
- if(!equal)
- {
- Log.println("----- Knoten sind nicht identisch:"+path+getPathString(n1));
- return false;
- }
-
- if(n1.hasAttributes() || n2.hasAttributes())
- {
- equal = compareNodeAttriubtes(n1,n2,level+1,path+getPathString(n1)+"/(a)");
- if(!equal)
- {
- Log.println("----- Attribute stimmen nicht überein:"+path+getPathString(n1));
- return false;
- }
- }
- if(size1==0)
- {
- return true;
- }
-
- for(int counter=0;counter<size1;counter++)
- {
- boolean found = false;
- Node comp_n1 = nl1.item(counter);
-
- //if(comp_n1==null) return false;
-
- Node comp_n2 = null;
- size2 = nl2.getLength();
- for(int counter2=0;counter2<size2;counter2++)
- {
- comp_n2 = nl2.item(counter2);
-
- /*equal = compareNodeExact(comp_n1,comp_n2,level+1);
- if(equal) return false;*/
- //Log.println("COMP_N1:"+comp_n1);
- //Log.println("COMP_N2:"+comp_n2);
- equal = compareNodes(comp_n1,comp_n2,level+1,path+getPathString(comp_n1)+"/",false);
- if(equal)
- {
- n2.removeChild(comp_n2);
- counter2=size2;
- nl2 = n2.getChildNodes();
- size2 = nl2.getLength();
- }
-
- }
-
- if(!equal)
- {
- Log.println("----- Keine Übereinstimmung gefunden:"+path+getPathString(comp_n1));
- return false;
- }
- }
- return true;
- }
-
- private boolean compareNodeExact(Node n1,Node n2,int level,String path)
- {
- if(n1.getNodeType() == Node.TEXT_NODE)
- {
- Text textnode = (Text)n1;
- /*Log.println("----- *****"+textnode.getNodeName());
- Log.println("----- *****"+textnode.getParentNode().getNodeName());
- Log.println("----- *****"+textnode.getNodeValue());*/
- }
-
- //Log.println("----- Checking:"+path);
- String n1_name = n1.getNodeName();
- String n2_name = n2.getNodeName();
- /*Log.println("----- !!!!!"+n1.getNodeName());
- Log.println("----- !!!!!"+n1.getNodeValue());
- Log.println("----- !!!!!"+n1.getLocalName());
- Log.println("----- !!!!!"+n1.getPrefix());
- Log.println("----- !!!!!"+n1.getNextSibling());
- Log.println("----- !!!!!"+n1.getPreviousSibling());*/
-
- //Log.println("----- Compare Node "+level+":"+n1_name+" "+n2_name);
- if(!((n1_name==null && n2_name==null) ||
- (n1_name!=null && n2_name!=null && n1_name.equals(n2_name))))
- {
- Log.println("----- Name stimmt nicht überein:"+path);
- return false;
- }
-
- //Log.println("----- Compare Node "+level+":"+n1.getNodeType()+" "+n2.getNodeType());
- if(n1.getNodeType() != n2.getNodeType())
- {
- Log.println("----- Knotentyp stimmt nicht überein:"+path);
- return false;
- }
-
- String n1_ns = n1.getPrefix();
- String n2_ns = n2.getPrefix();
- //Log.println("----- Compare Node "+level+":"+n1_ns+" "+n2_ns);
- if(!((n1_ns==null && n2_ns==null) ||
- (n1_ns!=null && n2_ns!=null && n1_ns.equals(n2_ns))))
- {
- Log.println("----- NameSpace stimmt nicht überein:"+path);
- return false;
- }
-
- String n1_value = n1.getNodeValue();
- String n2_value = n2.getNodeValue();
-
- boolean special = false;
- special = specialValues(n1_value,n2_value,path);
- if(special) return true;
-
- //Log.println("----- Compare Node "+level+":"+n1_value+" "+n2_value);
- if(!((n1_value==null && n2_value==null) ||
- (n1_value!=null && n2_value!=null && n1_value.equals(n2_value))))
- {
- Log.println("----- Wert stimmt nicht überein:"+path);
- Log.println("----- Value1:\n"+n1_value);
- Log.println("----- Value2:\n"+n2_value);
- return false;
- }
-
-
- return true;
- }
-
- private boolean compareNodeAttriubtesWithoutSize(Node n1, Node n2, int level,String path)
- {
- return true;
- }
-
- private boolean compareNodeAttriubtes(Node n1, Node n2, int level,String path)
- {
- //Log.println("----- Compare NodeAttributes "+level+":"+n1.getNodeName()+" "+n2.getNodeName());
- Element n1elem = (Element)n1;
- Element n2elem = (Element)n2;
-
- NamedNodeMap nnm1 = n1.getAttributes();
- NamedNodeMap nnm2 = n2.getAttributes();
-
- int size1 = 0;
- int size2 = 0;
-
- boolean specialattrs = specialAttributesSize(path);
-
- if(!specialattrs)
- {
-
- if(nnm1==null && nnm2==null) return true;
- if(nnm1==null || nnm2==null)
- {
- Log.println("----- Anzahl der Attribute nicht gleich:"+path+":"+getPathString(n1));
- return false;
- }
- size1 = nnm1.getLength();
- size2 = nnm2.getLength();
-
- if(size1 != size2)
- {
- Log.println("----- Anzahl der Attribute nicht gleich:"+path+":"+getPathString(n1));
- return false;
- }
-
- }
- else
- {
- return compareNodeAttriubtesWithoutSize(n1,n2,level,path);
- }
-
- for(int counter=0;counter<size1;counter++)
- {
- Node attribute_node1 = nnm1.item(counter);
- Node attribute_node2 = nnm2.item(counter);
-
- String attr1_name = attribute_node1.getNodeName();
- String attr2_name = attribute_node2.getNodeName();
-
- String value1 = n1elem.getAttribute(attr1_name);
- String value2 = n2elem.getAttribute(attr2_name);
-
- boolean special = false;
-
- special = specialAttributes(path,attr1_name,value1,attr2_name,value2);
- if(special)
- {
- return special;
- }
-
- if(!value1.equals(value2))
- {
- Log.println("----- Keine Übereinstimmung gefunden:"+path+getPathString(n1));
- return false;
- }
- }
-
- return true;
- }
-
- private boolean checkNode(Node base,String name)
- {
- if(base.getNodeName().equals(name))
- {
- return true;
- }
-
- NodeList children = base.getChildNodes();
- int size = children.getLength();
- for(int counter=0;counter<size;counter++)
- {
- boolean found = checkNode(children.item(counter),name);
- if(found) return true;
- }
- return false;
- }
-
- private void display_one(Node base)
- {
- int att_size=0;
- if(base.getAttributes()!=null)
- {
- att_size=base.getAttributes().getLength();
- }
- if(base.getNodeName().equals("#text"))
- Log.println(base.getNodeName()+base.getChildNodes().getLength()+":"+att_size+" ("+base.getNodeValue()+")");
- else
- Log.println(base.getNodeName()+base.getChildNodes().getLength()+":"+att_size);
- }
-
- private void display(Node base)
- {
- display(base,1);
- }
-
- private void display(Node base,int level)
- {
- String spacer = "";
- for(int counter=0;counter<level;counter++)
- {
- spacer+=" ";
- }
-
- int att_size=0;
- if(base.getAttributes()!=null)
- {
- att_size=base.getAttributes().getLength();
- }
- if(base.getNodeName().equals("#text"))
- Log.println(spacer+base.getNodeName()+base.getChildNodes().getLength()+":"+att_size+" ("+base.getNodeValue()+")");
- else
- Log.println(spacer+base.getNodeName()+base.getChildNodes().getLength()+":"+att_size);
-
- NodeList children = base.getChildNodes();
- int size = children.getLength();
- for(int counter=0;counter<size;counter++)
- {
- display(children.item(counter),level+1);
- }
- }
-
- private void filterTree(Node base)
- {
- ArrayList removeList = new ArrayList();
-
- NodeList children = base.getChildNodes();
- int size = children.getLength();
- for(int counter=0;counter<size;counter++)
- {
- Node child1 = children.item(counter);
- if(child1.getNodeType() == Node.TEXT_NODE && child1.getNodeValue().trim().equals(""))
- {
- removeList.add(child1);
- }
- }
-
- size = removeList.size();
- for(int counter=0;counter<size;counter++)
- {
- base.removeChild((Node)removeList.get(counter));
- }
-
- children = base.getChildNodes();
- size = children.getLength();
- for(int counter=0;counter<size;counter++)
- {
- filterTree(children.item(counter));
- }
-
- }
-
- private String getPathString(Node n)
- {
- if(n.getNodeType()==Node.TEXT_NODE)
- {
- return n.getParentNode().getNodeName()+"(text)";
- }
- else
- {
- return n.getNodeName();
- }
-
- }
-
- public boolean specialAttributes(String path,String attr1_name,String value1,String attr2_name,String value2)
- {
- //if(value1.startsWith("reference-") && value2.startsWith("reference-")) return true;
- //if(value1.startsWith("signature-") && value2.startsWith("signature-")) return true;
-
- return false;
- }
-
- public boolean specialAttributesSize(String path)
- {
- //if(path.endsWith("/xsl:template/(a)")) return true;
- return false;
- }
-
- public boolean specialValues(String value1,String value2,String path)
- {
-
- //Log.println(path);
- /*if(ignoreSignatureValue)
- {
- if(path.endsWith("/dsig:SignatureValue(text)/"))
- {
- return true;
- }
- }
- else
- {
- if(path.endsWith("/dsig:SignatureValue(text)/"))
- {
- String stripped_1 = strip(value1);
- String stripped_2 = strip(value2);
- return stripped_1.equals(stripped_2);
- }
- }*/
-
- return false;
- }
-
- private String strip(String input)
- {
- String output = replaceStringAll(input," ","");
- output = replaceStringAll(output,"\n","");
- output = replaceStringAll(output,"\r","");
- return output;
- }
-
- private static String replaceStringAll(
- String input,
- String oldPart,
- String newPart)
- {
-
- String erg = null;
-
- int pos = input.indexOf(oldPart);
- if(pos==-1) return input;
-
- while(true)
- {
-
- //First Part
- pos = input.indexOf(oldPart);
- if(pos==-1) break;
- erg = input.substring(0, pos);
-
- //Insert new Part
- erg += newPart;
-
- //insert REST
- erg
- += input.substring(
- input.indexOf(oldPart) + oldPart.length(),
- input.length());
-
- input = erg;
- }
- return erg;
- }
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java b/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java
deleted file mode 100644
index b6eda3c39..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package test.at.gv.egovernment.moa.id.proxy.builder;
-
-import org.w3c.dom.Element;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-import at.gv.egovernment.moa.id.auth.builder.SAMLArtifactBuilder;
-import at.gv.egovernment.moa.id.proxy.builder.SAMLRequestBuilder;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/*
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLRequestBuilderTest extends UnitTestCase {
-
- public SAMLRequestBuilderTest(String arg0) {
- super(arg0);
- }
-
- public void testBuild() throws Exception {
- String requestID = "123";
- String samlArtifact = new SAMLArtifactBuilder().build("https://moa.gv.at/auth/", "12345678901234567890");
- String REQUEST_SHOULD = "<samlp:Request xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\" RequestID=\"" +
- requestID + "\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"IGNORE\">" +
- "<samlp:AssertionArtifact>" + samlArtifact + "</samlp:AssertionArtifact>" +
- "</samlp:Request>";
- Element request = new SAMLRequestBuilder().build(requestID, samlArtifact);
- Element requestShould = DOMUtils.parseDocument(REQUEST_SHOULD, false, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
- assertTrue(new SAMLRequestCompare().compareElements(requestShould, request));
- }
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestCompare.java b/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestCompare.java
deleted file mode 100644
index 5685129a1..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestCompare.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package test.at.gv.egovernment.moa.id.proxy.builder;
-
-/*
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLRequestCompare extends test.at.gv.egovernment.moa.id.proxy.builder.DOMTreeCompare {
-
-
- /*
- * @see at.gv.egovernment.moa.util.SAMLRequestCompare#specialAttributes(java.lang.String, java.lang.String)
- */
- public boolean specialAttributes(String path,String attr1_name,String value1,String attr2_name,String value2) {
- if(attr1_name.equals("IssueInstant"))
- return true;
- return false;
- }
-
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java b/id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java
deleted file mode 100644
index 39e7240d1..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package test.at.gv.egovernment.moa.id.proxy.parser;
-
-import org.w3c.dom.Element;
-
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.id.data.SAMLStatus;
-import at.gv.egovernment.moa.id.proxy.parser.SAMLResponseParser;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/*
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLResponseParserTest extends UnitTestCase {
-
- public SAMLResponseParserTest(String arg0) {
- super(arg0);
- }
-
- public void testParse() throws Exception {
- String samlResponse =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<samlp:Response xmlns:samlp=\"urn:oasis:names:tc:SAML:1.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\"" +
- " ResponseID=\"\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"2003-03-29T06:00:00+02:00\">" +
- "<samlp:Status>" +
- "<samlp:StatusCode Value=\"samlp:Success\"><samlp:StatusCode Value=\"samlp:Success\"></samlp:StatusCode></samlp:StatusCode>" +
- "<samlp:StatusMessage>Ollas leiwand</samlp:StatusMessage>" +
- "</samlp:Status>" +
-"<saml:Assertion xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:pr=\"http://reference.e-government.gv.at/namespace/persondata/20020228#\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" MajorVersion=\"1\" MinorVersion=\"0\" AssertionID=\"-4633313027464114584\" Issuer=\"http://localhost:8080/moa-id-auth/\" IssueInstant=\"2003-04-02T14:55:42+02:00\">" +
- "<saml:AttributeStatement>" +
- "<saml:Subject>" +
- "<saml:NameIdentifier NameQualifier=\"http://reference.e-government.gv.at/names/vpk/20020221#\">MTk2OC0xMC0yMmdi</saml:NameIdentifier>" +
- "<saml:SubjectConfirmation>" +
- "<saml:ConfirmationMethod>http://reference.e-government.gv.at/namespace/moa/20020822#cm</saml:ConfirmationMethod>" +
- "<saml:SubjectConfirmationData>" +
- "<saml:Assertion xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" MajorVersion=\"1\" MinorVersion=\"0\" AssertionID=\"any\" Issuer=\"Hermann Muster\" IssueInstant=\"2003-04-02T14:55:27+02:00\">" +
- "<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>" +
- "</saml:Assertion>" +
- "<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>" +
- "</saml:SubjectConfirmationData>" +
- "</saml:SubjectConfirmation>" +
- "</saml:Subject>" +
- "<saml:Attribute AttributeName=\"PersonData\" AttributeNamespace=\"http://reference.e-government.gv.at/namespace/persondata/20020228#\">" +
- "<saml:AttributeValue>" +
- "<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:AttributeValue>" +
- "</saml:Attribute>" +
- "<saml:Attribute AttributeName=\"isQualifiedCertificate\" AttributeNamespace=\"http://reference.e-government.gv.at/namespace/moa/20020822#\">" +
- "<saml:AttributeValue>true</saml:AttributeValue>" +
- "</saml:Attribute>" +
- "</saml:AttributeStatement>" +
-"</saml:Assertion>" +
- "</samlp:Response>";
-
- Element samlResponseElem =
- DOMUtils.parseDocument(samlResponse, true, Constants.ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
- SAMLResponseParser parser = new SAMLResponseParser(samlResponseElem);
- SAMLStatus status = parser.parseStatusCode();
- assertEquals("samlp:Success", status.getStatusCode());
- assertEquals("samlp:Success", status.getSubStatusCode());
- assertEquals("Ollas leiwand", status.getStatusMessage());
- AuthenticationData authData = parser.parseAuthenticationData();
- assertEquals(1, authData.getMajorVersion());
- assertEquals(0, authData.getMinorVersion());
- assertEquals("-4633313027464114584", authData.getAssertionID());
- assertEquals("http://localhost:8080/moa-id-auth/", authData.getIssuer());
- assertEquals("2003-04-02T14:55:42+02:00", authData.getIssueInstant());
- assertEquals("123456789012", authData.getIdentificationValue());
- assertEquals("MTk2OC0xMC0yMmdi", authData.getVPK());
- assertEquals("Hermann", authData.getGivenName());
- assertEquals("Muster", authData.getFamilyName());
- assertEquals("1968-10-22", authData.getDateOfBirth());
- assertTrue(authData.isQualifiedCertificate());
- assertFalse(authData.isPublicAuthority());
- }
-}
diff --git a/id.server/src/test/at/gv/egovernment/moa/id/util/SSLUtilsTest.java b/id.server/src/test/at/gv/egovernment/moa/id/util/SSLUtilsTest.java
deleted file mode 100644
index 351ca0bd5..000000000
--- a/id.server/src/test/at/gv/egovernment/moa/id/util/SSLUtilsTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package test.at.gv.egovernment.moa.id.util;
-
-import iaik.pki.jsse.IAIKX509TrustManager;
-
-import java.net.URL;
-import java.security.Security;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocketFactory;
-
-import com.sun.net.ssl.HttpsURLConnection;
-
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.config.proxy.OAProxyParameter;
-import at.gv.egovernment.moa.id.config.proxy.ProxyConfigurationProvider;
-import at.gv.egovernment.moa.id.iaik.config.LoggerConfigImpl;
-import at.gv.egovernment.moa.id.util.SSLUtils;
-import test.at.gv.egovernment.moa.id.UnitTestCase;
-
-/*
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SSLUtilsTest extends UnitTestCase {
-
- public SSLUtilsTest(String name) {
- super(name);
- }
-
- 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");
- IAIKX509TrustManager.initLog(new LoggerConfigImpl("file:" + TESTDATA_ROOT + "conf/log4j.properties"));
- 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 testVerisignOK() throws Exception {
- doTestOA("conf/ConfigurationTest.xml", "http://verisign.moa.gv.at/", true, null);
- }
- public void testATrustOK() throws Exception {
- doTestOA("conf/ConfigurationTest.xml", "http://a-trust.moa.gv.at/", true, null);
- }
- public void testBaltimoreOK() throws Exception {
- doTestOA("conf/ConfigurationTest.xml", "http://baltimore.moa.gv.at/", true, null);
- }
- public void testCIOOK() throws Exception {
- doTestOA("conf/ConfigurationTest.xml", "http://cio.moa.gv.at/", true, null);
- }
- public void testMOASPOK() throws Exception {
- System.setProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME,
- TESTDATA_ROOT + "conf/ConfigurationTest.xml");
- ConnectionParameter connParam = AuthConfigurationProvider.getInstance().getMoaSpConnectionParameter();
- doTest(connParam, true, null);
- }
- private void doTestOA(String configFile, String publicURLPrefix, boolean shouldOK, String exMessageFragment) throws Exception {
- System.setProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME,
- TESTDATA_ROOT + configFile);
- ProxyConfigurationProvider proxyConf =
- ProxyConfigurationProvider.getInstance();
- OAProxyParameter oaParam = proxyConf.getOnlineApplicationParameter(publicURLPrefix);
- ConnectionParameter connParam = oaParam.getConnectionParameter();
- doTest(connParam, shouldOK, exMessageFragment);
- }
- private void doTest(ConnectionParameter connParam, boolean shouldOK, String exMessageFragment) throws Exception {
- SSLUtils.initialize();
- AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
- SSLSocketFactory ssf = SSLUtils.getSSLSocketFactory(authConf, connParam);
- URL url = new URL(connParam.getUrl());
- HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
- conn.setRequestMethod("GET");
- conn.setDoInput(true);
- conn.setDoOutput(true);
- conn.setUseCaches(false);
- conn.setAllowUserInteraction(false);
- conn.setSSLSocketFactory(ssf);
- try {
- conn.connect();
- assertTrue(shouldOK);
- assertEquals(200, conn.getResponseCode());
- conn.disconnect();
- }
- catch (SSLException ex) {
- ex.printStackTrace();
- assertFalse(shouldOK);
- assertTrue(ex.getMessage().indexOf(exMessageFragment) >= 0);
- }
- }
-
-}
diff --git a/id.server/src/test/lasttest/Dispatcher.java b/id.server/src/test/lasttest/Dispatcher.java
deleted file mode 100644
index ad8f10fb4..000000000
--- a/id.server/src/test/lasttest/Dispatcher.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package test.lasttest;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class Dispatcher extends Thread {
- private LasttestClient parent = null;
- private int max;
- private int turns;
- private int turn_counter;
- private int turn;
- private int time;
- private long sum;
- private int turnnum;
-
- public Dispatcher(LasttestClient parent, int max, int turns, int time, long sum) {
- this.parent = parent;
- this.max = max;
- this.turns = turns;
- this.time = time;
- this.sum = sum;
- turnnum=0;
- }
-
- public void run() {
- this.setPriority(Thread.NORM_PRIORITY + 1);
- System.out.println("Dispatcher wird gestartet...");
- TestThread[] old_reqs = buildRequests(0);
- for (turn_counter = 0; turns == 0 ? true : (turn_counter < turns); turn_counter++) {
- try {
-// LasttestClient.Log.write(("Starte Durchlauf " + turn_counter + "\n").getBytes());
- }
- catch (Exception e) {}
-
-// System.out.println("Starte Durchlauf " + turn_counter);
- turn = turn_counter;
- if (turns == 0)
- turn_counter--;
- TestThread[] reqs = buildRequests(turn_counter);
- for (int counter = 0; counter < max; counter++) {
- old_reqs[counter].start();
- }
- old_reqs = reqs;
- try {
- Thread.sleep(time);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
- parent.stop = true;
- }
-
- public TestThread[] buildRequests(int turnNo) {
- TestThread[] ret = new TestThread[max];
- for (int counter = 0; counter < max; counter++) {
-// turnnum ++;
- ret[counter] = new TestThread(parent, turnNo);
- }
- return ret;
- }
-}
diff --git a/id.server/src/test/lasttest/HostnameVerifierHack.java b/id.server/src/test/lasttest/HostnameVerifierHack.java
deleted file mode 100644
index cf34b621a..000000000
--- a/id.server/src/test/lasttest/HostnameVerifierHack.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package test.lasttest;
-
-import com.sun.net.ssl.HostnameVerifier;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class HostnameVerifierHack implements HostnameVerifier{
- public boolean verify(String arg0, String arg1) {
- return true;
- }}
diff --git a/id.server/src/test/lasttest/LasttestClient.java b/id.server/src/test/lasttest/LasttestClient.java
deleted file mode 100644
index bad5161ba..000000000
--- a/id.server/src/test/lasttest/LasttestClient.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package test.lasttest;
-
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.security.Security;
-import java.util.Date;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.auth.AuthenticationServer;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.proxy.builder.SAMLRequestBuilder;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.StreamUtils;
-import at.gv.egovernment.moa.util.URLDecoder;
-import at.gv.egovernment.moa.util.URLEncoder;
-import com.sun.net.ssl.HttpsURLConnection;
-
-/**
- * @author Sven
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- *
- * Aufruf: Requestdatei (==null), ServerURL, Anzahl der Requests pro Sekunde, Anzahl der Wiederholungen
- * z.b. "data/CX0/TestGeneratorCX0.001.Req.xml" "http://127.0.0.1:8080/" 5 100
- *
- * ==> GEÄNDERT: ersten 2 Parameter gekillt... nur noch 5 100
- */
-public class LasttestClient {
-
- protected static final String TESTDATA_ROOT = "data/abnahme-test/";
- protected static final String MOA_AUTH_SERVER = "https://localhost:8443/moa-id-auth/";
- protected AuthenticationServer server;
-
- public int max_thread_count = 300;
- public int thread_counter = 0;
- public int error_count = 0;
- public int turns = 0;
- public long sum = 0;
- public long max = 0;
- public long min = Long.MAX_VALUE;
-
- public static PrintStream Log = null;
-
- public boolean stop = false;
-
- public static final String trustStore = "javax.net.ssl.trustStore";
- public static final String trustStorePassword = "javax.net.ssl.trustStorePassword";
- public static final String handler = "java.protocol.handler.pkgs";
-
- public void startTest(int req_per_second, int turns, int time) throws Exception {
- 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("javax.net.ssl.trustStore", "C:/Programme/ApacheGroup/abnahme/server.keystore");
- System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
-
- System.setProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME, TESTDATA_ROOT + "xmldata/L000/Configuration.xml");
-
- AuthConfigurationProvider.reload();
-
- this.turns = turns;
-
- boolean result = new TestThread(this,0).doRequest(0);// doTestRequest();
- if (result) {
- System.out.println("TestRequest OK. Lasttest wird gestartet.");
- sum=0;
- max=0;
- Dispatcher dp = new Dispatcher(this, req_per_second, turns, time, sum);
- dp.start();
- while (!stop) {
- try {
- Log.println(new String(("Checking Stop Condition ...(Running " + thread_counter + ", Min " + (min) + ", Max " + (max) + ", " + new Date(System.currentTimeMillis()) + ")")));
- Log.flush();
- }
- catch (Exception e) {}
-
- System.out.println("Checking Stop Condition ...(Running " + thread_counter + ", Min " + (min) + ", Max " + (max) + ", " + new Date(System.currentTimeMillis()) + ")");
- Thread.sleep(10000);
- }
- System.out.println("Fehler:" + error_count + " (Running " + thread_counter + ", Min " + (min) + ", Max " + (max) + ", " + new Date(System.currentTimeMillis()) + ")");
- }
- else {
- System.out.println("TestRequest lieferte einen Fehler. Lasttest wird nicht gestartet.");
- }
- }
-
-
- public boolean doTestRequest() throws Exception {
-
- try {
-
- TestThread tt = new TestThread(null,0);
-
- // Anmelden
- String URL = tt.getURL(MOA_AUTH_SERVER, "gb", "http://10.16.126.28:9080/moa-id-proxy/");
- HttpsURLConnection conn = tt.giveConnection(URL, "GET");
-
- conn.connect();
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
- String MOASessionID = tt.parseSessionIDFromForm(result);
- conn.disconnect();
-
- URL = tt.parseDataURL(result);
- // Verify Identity Link
- conn = tt.giveConnection(URL, "POST");
- conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
- String infoboxReadResponse = tt.readXmldata("InfoboxReadResponse.xml");
- OutputStream out = conn.getOutputStream();
- out.write(new String("XMLResponse=" + URLEncoder.encode(infoboxReadResponse, "UTF-8")).getBytes());
- out.flush();
- out.close();
- conn.connect();
- String redirectLoc = conn.getHeaderField("Location");
- conn.disconnect();
- //Verify Auth Block
- conn = tt.giveConnection(redirectLoc, "POST");
- String createXMLSignatureResponse = URLEncoder.encode(tt.readXmldata("CreateXMLSignatureResponse.xml"), "UTF-8");
- out = conn.getOutputStream();
- out.write(("XMLResponse=" + createXMLSignatureResponse).getBytes("UTF-8"));
- out.flush();
- out.close();
- conn.connect();
- redirectLoc = conn.getHeaderField("Location");
- String samlArtifact = tt.parseSamlArtifact(redirectLoc);
- System.out.println("SamlArtifact: " + samlArtifact);
-
- conn.disconnect();
-
- conn = null;
-
- SAMLRequestBuilder srb = new SAMLRequestBuilder();
-
- Element erg = tt.doCall(srb.build(MOASessionID, URLDecoder.decode(samlArtifact, "UTF-8")),MOA_AUTH_SERVER);
- result = DOMUtils.serializeNode(erg);
- if (result.indexOf("saml:Assertion")<0)
- {
- System.err.println("Falsche Antwort vom Webservice:\n" + result);
- throw new Exception("Falsche Antwort vom Webservice");
-
- }
- }
- catch (Exception e) {
- System.err.println("------ FEHLER IN LASTTEST :" + e.getLocalizedMessage());
- throw e;
- }
-
- return true;
-
- }
-
- public String replaceString(String input, String oldPart, String newPart) throws Exception {
- String erg = null;
-
- //First Part
- erg = input.substring(0, input.indexOf(oldPart));
- //Insert new Part
- erg += newPart;
-
- //insert REST
- erg += input.substring(input.indexOf(oldPart) + oldPart.length(), input.length());
-
- return erg;
- }
-
- public static void main(String[] args) throws Exception {
- Log = new PrintStream(new FileOutputStream("C:/Lasttest.log"));
- int time = 0;
- int sek = 0;
- int turns = 0;
-
- if (args.length != 3) {
- System.out.println("Parameteranzahl falsch. Bitte verwenden Sie die Syntax <Request_pro_Zeiteinheit(Zahl)> <Anzahl_der_Durchläufe(Zahl oder INF)> <Zeit_zwischen_Aufrufen_in_ms(Zahl)>");
- return;
- }
-
- try {
- sek = Integer.parseInt(args[0]);
- time = Integer.parseInt(args[2]);
- if (args[1].equals("INF")) {
- turns = 0;
- }
- else
- turns = Integer.parseInt(args[1]);
- }
- catch (NumberFormatException e) {
- System.out.println("Einer der Parameter (Requestanzahl oder Testanzahl) ist keine Zahl !");
- return;
- }
-
- System.out.println("Starte Lastest mit folgenden Parametern ...");
- System.out.println("ServerURL: " + MOA_AUTH_SERVER);
- double reqPerSek = sek*1000;
- System.out.println("Requests pro Sekunde: " + reqPerSek/time);
- System.out.println("Durchläufe: " + (turns == 0 ? "INF" : turns + ""));
-
- Log.println("Starte Lastest mit folgenden Parametern ...");
- Log.println("ServerURL: " + MOA_AUTH_SERVER);
- Log.println("Requests pro Sekunde: " + reqPerSek / time);
- Log.println("Durchläufe: " + (turns == 0 ? "INF" : turns + ""));
-
-
- try {
- LasttestClient lc = new LasttestClient();
- //lc.startTest("data/CX0/TestGeneratorCX0.001.Req.xml","http://161.106.2.255:8080/",10,1000);
- lc.startTest(sek, turns, time);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
-
diff --git a/id.server/src/test/lasttest/TestThread.java b/id.server/src/test/lasttest/TestThread.java
deleted file mode 100644
index 0d2973c7f..000000000
--- a/id.server/src/test/lasttest/TestThread.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package test.lasttest;
-
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-
-import org.apache.axis.message.SOAPBodyElement;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.proxy.builder.SAMLRequestBuilder;
-import at.gv.egovernment.moa.id.util.AxisSecureSocketFactory;
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.StreamUtils;
-import at.gv.egovernment.moa.util.URLDecoder;
-import at.gv.egovernment.moa.util.URLEncoder;
-import com.sun.net.ssl.HttpsURLConnection;
-
-/**
- * @author Stefan Knirsch
- * @version $Id$
- *
- */
-public class TestThread extends Thread {
- private LasttestClient parent = null;
- private int turn_no;
- private Dispatcher disp = null;
-
- public TestThread( LasttestClient parent, int durchlauf_nr) {
- turn_no = durchlauf_nr;
- this.parent = parent;
-
- }
-
- protected Element doCall(Element request, String server) throws Exception {
-
- /* QName serviceName = new QName("GetAuthenticationData");
-
- String endPoint = server + "services/GetAuthenticationData";
- Service service = ServiceFactory.newInstance().createService(serviceName);
- Call call = service.createCall();
- SOAPBodyElement body = new SOAPBodyElement(request);
- SOAPBodyElement[] params = new SOAPBodyElement[] { body };
- Vector responses;
- SOAPBodyElement response;
-
-
- System.out.println(DOMUtils.serializeNode(body.getAsDOM()));
- call.setTargetEndpointAddress(endPoint);
- System.out.println("Rufe WS auf: " + endPoint);
- responses = (Vector) call.invoke(params);
- System.out.println("WS aufgerufen.");
- response = (SOAPBodyElement) responses.get(0);
- System.out.println(DOMUtils.serializeNode(response.getAsDOM()));
- return response.getAsDOM();*/
-
- QName serviceName = new QName("GetAuthenticationData");
- String endPoint = server + "services/GetAuthenticationData";
- Service service = ServiceFactory.newInstance().createService(serviceName);
- Call call = service.createCall();
-
- System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
- System.setProperty("javax.net.ssl.trustStore", "C:/Programme/ApacheGroup/abnahme/server.keystore");
- System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
- SOAPBodyElement body = new SOAPBodyElement(request);
- SOAPBodyElement[] params = new SOAPBodyElement[] { body };
- Vector responses;
- SOAPBodyElement response;
-
- call.setTargetEndpointAddress(endPoint);
- responses = (Vector) call.invoke(params);
- response = (SOAPBodyElement) responses.get(0);
- return response.getAsDOM();
- }
-
- public boolean doRequest(int turnNo) throws Exception {
- long start = System.currentTimeMillis();
-
- try {
- LasttestClient.Log.write(("Starte Durchlauf " + turnNo + "\n").getBytes());
- }
- catch (Exception e) {}
-
- System.out.println("Starte Durchlauf " + turnNo);
- // Anmelden
- String URL = getURL(LasttestClient.MOA_AUTH_SERVER, "gb", "http://10.16.126.28:9080/moa-id-proxy/");
- HttpsURLConnection conn = giveConnection(URL, "GET");
- conn.connect();
- String result = new String(StreamUtils.readStream(conn.getInputStream()));
- /*
- * FOR DEBUG ONLY
- */
- // System.out.println(URL);
- // System.out.println(result);
- //----------------
-
- String MOASessionID = parseSessionIDFromForm(result);
- conn.disconnect();
-
- URL = parseDataURL(result);
- // Verify Identity Link
- conn = giveConnection(URL, "POST");
- conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded");
- String infoboxReadResponse = readXmldata("InfoboxReadResponse.xml");
- OutputStream out = conn.getOutputStream();
- out.write(new String("XMLResponse=" + URLEncoder.encode(infoboxReadResponse, "UTF-8")).getBytes());
- out.flush();
- out.close();
- conn.connect();
-
- /*
- * FOR DEBUG ONLY
- */
- // System.out.println(URL);
- // System.out.println(new String(StreamUtils.readStream(conn.getInputStream())));
- //----------------
-
- String redirectLoc = conn.getHeaderField("Location");
- conn.disconnect();
- //Verify Auth Block
- conn = giveConnection(redirectLoc, "POST");
- String createXMLSignatureResponse = URLEncoder.encode(readXmldata("CreateXMLSignatureResponse.xml"), "UTF-8");
- out = conn.getOutputStream();
- out.write(("XMLResponse=" + createXMLSignatureResponse).getBytes("UTF-8"));
- out.flush();
- out.close();
- conn.connect();
- redirectLoc = conn.getHeaderField("Location");
-
- /*
- * FOR DEBUG ONLY
- */
- // System.out.println(redirectLoc);
- // System.out.println(new String(StreamUtils.readStream(conn.getInputStream())));
- //----------------
- String samlArtifact = parseSamlArtifact(redirectLoc);
-
- // System.out.println("SamlArtifact: " + samlArtifact);
-
- AxisSecureSocketFactory.initialize(conn.getSSLSocketFactory());
- conn.disconnect();
-
- conn = null;
-
- SAMLRequestBuilder srb = new SAMLRequestBuilder();
-
- doCall(srb.build(MOASessionID, URLDecoder.decode(samlArtifact, "UTF-8")), LasttestClient.MOA_AUTH_SERVER);
- // writeXmldata("GetAuthenticationDataWebServiceResponse.xml", result.getBytes("UTF-8"));
-
- long end = System.currentTimeMillis();
- long diff = end - start;
- parent.sum +=diff;
- if (parent.max < diff) {
- parent.max = diff;
- }
- if (parent.min > diff) {
- parent.min = diff;
- }
- if (turnNo>0) {
- long totalmem = Runtime.getRuntime().totalMemory();
- long freemem = Runtime.getRuntime().freeMemory();
- try {
- LasttestClient.Log.write(new String("Ende Durchlauf: " + turnNo + " ==> Dauer:" + diff + " Schnitt: " + (parent.sum/turnNo/2) + " Total-Mem: " + totalmem + " Free-Mem: " + freemem + "\n").getBytes());
- LasttestClient.Log.flush();
- }
- catch (Exception e) {}
- System.out.println(new String("Ende Durchlauf: " + turnNo + " ==> Dauer:" + diff + " Schnitt: " + (parent.sum/turnNo/2) + " Total-Mem: " + totalmem + " Free-Mem: " + freemem));
- }
- return true;
-
- }
-
- public String getSubString(String input, String startsWith, String endsWith) {
- return input.substring(input.indexOf(startsWith) + startsWith.length(), input.indexOf(endsWith, input.indexOf(startsWith) + startsWith.length()));
- }
-
- public String getURL(String authURL, String target, String oaURL) {
- return authURL + "StartAuthentication?Target=" + target + "&OA=" + oaURL;
- }
-
- public HttpsURLConnection giveConnection(String targetURL, String requestMethod) throws Exception {
- HttpsURLConnection conn = (HttpsURLConnection) new URL(targetURL).openConnection();
- conn.setRequestMethod(requestMethod);
- conn.setDoInput(true);
- conn.setDoOutput(true);
- conn.setUseCaches(false);
- conn.setAllowUserInteraction(false);
- conn.setHostnameVerifier(new HostnameVerifierHack());
- return conn;
- }
-
- public String killInclusive(String input, String startsWith, String endsWith, String newValue) {
- int start = 0;
- int ende;
- String result;
- result = input;
- do {
- start = result.indexOf(startsWith, start) + startsWith.length();
- ende = result.indexOf(endsWith, start);
- result = result.substring(0, start - startsWith.length()) + newValue + result.substring(ende + endsWith.length(), result.length());
- start++;
- }
- while (result.indexOf(startsWith, ende + 1) > 0);
-
- return result;
- }
-
- public String parseDataURL(String input) {
- return getSubString(input.substring(input.indexOf("DataURL"), input.length()), "value=\"", "\"");
- }
-
- public String parseSamlArtifact(String input) {
-// System.out.println(input);
- return getSubString(input + "@@@", "SAMLArtifact=", "@@@");
- }
-
- public String parseSessionIDFromForm(String htmlForm) {
- String parName = "MOASessionID=";
- int i1 = htmlForm.indexOf(parName) + parName.length();
- int i2 = htmlForm.indexOf("\"", i1);
- return htmlForm.substring(i1, i2);
- }
-
- public String readXmldata(String filename) throws Exception {
-
- return FileUtils.readFile(LasttestClient.TESTDATA_ROOT + "xmldata/L000/" + filename, "UTF-8");
- }
-
- /**
- * @see java.lang.Runnable#run()
- */
- public void run() {
- parent.thread_counter++;
-
- try {
- if (!doRequest(turn_no)) {
- parent.error_count++;
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- parent.error_count++;
- }
- parent.thread_counter--;
- }
-
-}
diff --git a/spss.server/.classpath b/spss.server/.classpath
deleted file mode 100644
index ac7c752a3..000000000
--- a/spss.server/.classpath
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="res"/>
- <classpathentry kind="lib" path="lib/axis-1.0/axis.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.0/jaxrpc.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.0/saaj.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging-1.0.2/commons-logging-api.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging-1.0.2/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip"/>
- <classpathentry kind="lib" path="lib/junit-3.8.1/junit.jar"/>
- <classpathentry kind="lib" path="lib/jaxp-1.2_01/dom.jar"/>
- <classpathentry kind="lib" path="lib/jaxp-1.2_01/jaxp-api.jar"/>
- <classpathentry kind="lib" path="lib/jaxp-1.2_01/sax.jar"/>
- <classpathentry kind="lib" path="lib/jaxen-1.0/jaxen-core.jar"/>
- <classpathentry kind="lib" path="lib/jaxen-1.0/jaxen-dom.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.7/log4j-1.2.7.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/xerces-j-2.0.2/xmlParserAPIs.jar"/>
- <classpathentry kind="lib" path="lib/xalan-j-2.2/xalan.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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/commons-discovery-0.2/commons-discovery.jar"/>
- <classpathentry kind="src" path="/MOA common"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik_cms.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik_ecc.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik_jce_full.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik-moa-full.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaikPkcs11Provider.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaikPkcs11Wrapper.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/ixsil.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/spss.server/.cvsignore b/spss.server/.cvsignore
index 795bc497e..c828a607d 100644
--- a/spss.server/.cvsignore
+++ b/spss.server/.cvsignore
@@ -1,3 +1,4 @@
bin
tmp
releases
+.classpath
diff --git a/spss.server/doc/history.txt b/spss.server/doc/history.txt
index d499a075d..a5fb63307 100644
--- a/spss.server/doc/history.txt
+++ b/spss.server/doc/history.txt
@@ -1,4 +1,12 @@
##############
+1.2.0D02
+##############
+
+- Im Befehl CreateXMLSignatureRequest kann nun in FinalDataMetaInfo das
+ zusätzliche Element "Type" angegeben werden. Der Textinhalt dieses Elements
+ wird als Type-Attribut der korrespondierenden dsig:Reference gesetzt.
+
+##############
1.2.0D01
##############
diff --git a/spss.server/res/resources/properties/spss_messages_de.properties b/spss.server/res/resources/properties/spss_messages_de.properties
index f98a6f84c..6e8cfbcaa 100644
--- a/spss.server/res/resources/properties/spss_messages_de.properties
+++ b/spss.server/res/resources/properties/spss_messages_de.properties
@@ -81,9 +81,9 @@
2900=Interner Server-Fehler
-3201=Objekt kann nicht geladen werden (Reference="{0}", LocRef-URI="{0}")
-3202=Supplement für Signaturumgebung kann nicht geladen werden (Reference="{0}", LocRef-URI="{0}")
-3203=Signaturumgebung kann nicht geladen werden (Reference="{0}", LocRef-URI="{0}")
+3201=Objekt kann nicht geladen werden (Reference="{0}", LocRef-URI="{1}")
+3202=Supplement für Signaturumgebung kann nicht geladen werden (Reference="{0}", LocRef-URI="{1}")
+3203=Signaturumgebung kann nicht geladen werden (Reference="{0}", LocRef-URI="{1}")
9900=Nicht klassifizierter Fehler in Subsystem
9901=Nicht klassifizierter Laufzeitfehler in Subsystem
diff --git a/spss.slinterface/.classpath b/spss.slinterface/.classpath
deleted file mode 100644
index 8c14ea4ef..000000000
--- a/spss.slinterface/.classpath
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="TOMCAT_HOME/common/lib/servlet.jar"/>
- <classpathentry kind="var" path="TOMCAT_HOME/common/lib/jasper-runtime.jar"/>
- <classpathentry kind="src" path="WEB-INF/src"/>
- <classpathentry kind="src" path="res"/>
- <classpathentry kind="lib" path="WEB-INF/lib/log4j-1.2.7.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/xalan-2.5.1.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/commons-fileupload-1.0.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/axis.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/axis-ant.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/commons-discovery.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/commons-logging.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/jaxrpc.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/saaj.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/wsdl4j.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/xerces-2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="lib" path="WEB-INF/lib/xerces-2.4.0/xmlParserAPIs-2.4.0.jar"/>
- <classpathentry kind="output" path="WEB-INF/classes"/>
-</classpath>
diff --git a/spss.slinterface/.project b/spss.slinterface/.project
deleted file mode 100644
index aec5cc99a..000000000
--- a/spss.slinterface/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>MOA SPSS SL-Interface</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>
- <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
- </natures>
-</projectDescription>
diff --git a/spss.slinterface/.tomcatplugin b/spss.slinterface/.tomcatplugin
deleted file mode 100644
index 2e649ba5e..000000000
--- a/spss.slinterface/.tomcatplugin
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tomcatProjectProperties>
- <rootDir>/</rootDir>
- <exportSource>false</exportSource>
- <reloadable>true</reloadable>
- <redirectLogger>false</redirectLogger>
- <updateXml>false</updateXml>
- <warLocation></warLocation>
- <webPath>/moa-spss-sl</webPath>
-</tomcatProjectProperties>
diff --git a/spss.slinterface/WEB-INF/lib/axis-ant.jar b/spss.slinterface/WEB-INF/lib/axis-ant.jar
deleted file mode 100644
index 9cb30a98a..000000000
--- a/spss.slinterface/WEB-INF/lib/axis-ant.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/axis.jar b/spss.slinterface/WEB-INF/lib/axis.jar
deleted file mode 100644
index 869ee16f5..000000000
--- a/spss.slinterface/WEB-INF/lib/axis.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/commons-discovery.jar b/spss.slinterface/WEB-INF/lib/commons-discovery.jar
deleted file mode 100644
index b88554847..000000000
--- a/spss.slinterface/WEB-INF/lib/commons-discovery.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/commons-fileupload-1.0.jar b/spss.slinterface/WEB-INF/lib/commons-fileupload-1.0.jar
deleted file mode 100644
index 1ca4a9cd3..000000000
--- a/spss.slinterface/WEB-INF/lib/commons-fileupload-1.0.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/commons-logging.jar b/spss.slinterface/WEB-INF/lib/commons-logging.jar
deleted file mode 100644
index b99c9375a..000000000
--- a/spss.slinterface/WEB-INF/lib/commons-logging.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/jaxrpc.jar b/spss.slinterface/WEB-INF/lib/jaxrpc.jar
deleted file mode 100644
index 5f6a56f02..000000000
--- a/spss.slinterface/WEB-INF/lib/jaxrpc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/log4j-1.2.7.jar b/spss.slinterface/WEB-INF/lib/log4j-1.2.7.jar
deleted file mode 100644
index 1595a56ef..000000000
--- a/spss.slinterface/WEB-INF/lib/log4j-1.2.7.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/saaj.jar b/spss.slinterface/WEB-INF/lib/saaj.jar
deleted file mode 100644
index f2242abe5..000000000
--- a/spss.slinterface/WEB-INF/lib/saaj.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/wsdl4j.jar b/spss.slinterface/WEB-INF/lib/wsdl4j.jar
deleted file mode 100644
index 820abd082..000000000
--- a/spss.slinterface/WEB-INF/lib/wsdl4j.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/xalan-2.5.1.jar b/spss.slinterface/WEB-INF/lib/xalan-2.5.1.jar
deleted file mode 100644
index 44d4d094d..000000000
--- a/spss.slinterface/WEB-INF/lib/xalan-2.5.1.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/xerces-2.4.0/xercesImpl-2.4.0.jar b/spss.slinterface/WEB-INF/lib/xerces-2.4.0/xercesImpl-2.4.0.jar
deleted file mode 100644
index 99cc23f2a..000000000
--- a/spss.slinterface/WEB-INF/lib/xerces-2.4.0/xercesImpl-2.4.0.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/lib/xerces-2.4.0/xmlParserAPIs-2.4.0.jar b/spss.slinterface/WEB-INF/lib/xerces-2.4.0/xmlParserAPIs-2.4.0.jar
deleted file mode 100644
index 6ba4ff805..000000000
--- a/spss.slinterface/WEB-INF/lib/xerces-2.4.0/xmlParserAPIs-2.4.0.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/Constants.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/Constants.java
deleted file mode 100644
index cb37fe843..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/Constants.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Created on 18.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class Constants
-{
- // System properties
- public static final String SP_INIT_PROPS_LOC_ =
- "at.gv.egovernment.moa.spss.slinterface.PropertiesLocation";
-
- // Init properties
- public static final String IP_SL2MOA_STYLESHEET_ = "location.stylesheet.sl2moa";
- public static final String IP_MOA2SL_STYLESHEET_ = "location.stylesheet.moa2sl";
- public static final String IP_SL_SCHEMA_ = "location.schema.sl";
- public static final String IP_MOA_SCHEMA_ = "location.schema.moa";
- public static final String IP_SP_ENDPOINT_ = "service.sp.endpoint";
- public static final String IP_SP_TRUSTPROFILEID_ = "service.sp.trustProfileId";
-
- // Logging hierarchies
-
- public static final String LH_BASE_ = "slinterface";
- public static final String LH_LISTENERS_ = LH_BASE_ + ".listeners";
- public static final String LH_FILTERS_ = LH_BASE_ + ".filters";
- public static final String LH_SERVLETS_ = LH_BASE_ + ".servlets";
- public static final String LH_TEST_ = LH_BASE_ + ".test";
-
- // Web service context parameters
-
- public static final String WSCP_INIT_PROPS_ = "initProperties";
- public static final String WSCP_SL2MOA_TRANSFORMER_ = "sl2MoaTransformer";
- public static final String WSCP_MOA2SL_TRANSFORMER_ = "moa2SlTransformer";
- public static final String WSCP_XMLPARSER_ = "xmlParser";
-
- // Security-Layer constants
-
- public static final String SLC_NAME_HTTP_REQUEST_ = "http-security-layer-request";
- public static final String SLC_NAME_XML_REQUEST_ = "XMLRequest";
- public static final String SLC_NAME_DATA_URL_ = "DataURL";
- public static final String SLC_NAME_STYLESHEET_URL_ = "StylesheetURL";
- public static final String SLC_NAME_REDIRECT_URL_ = "RedirectURL";
-
- // Namespace URIs
-
- public static final String NSURI_SL_10_ = "http://www.buergerkarte.at/namespaces/securitylayer/20020225#";
- public static final String NSURI_SL_11_ = "http://www.buergerkarte.at/namespaces/securitylayer/20020831#";
- public static final String NSURI_SL_12_ = "http://www.buergerkarte.at/namespaces/securitylayer/20031231#";
- public static final String NSURI_MOA_12_ = "http://reference.e-government.gv.at/namespace/moa/20020822#";
- public static final String NSURI_NAMESPACES_ = "http://www.w3.org/2000/xmlns/";
- public static final String NSURI_XML_ = "http://www.w3.org/XML/1998/namespace";
-
- // Namespace prefixes
- public static final String NSPRE_SL_10_ = "sl10";
- public static final String NSPRE_SL_11_ = "sl11";
- public static final String NSPRE_SL_12_ = "sl12";
- public static final String NSPRE_MOA_12_ = "moa";
-
- // MOA invoker constants
-
- public static final String MI_SP_QNAME_ = "SignatureVerification";
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/Utils.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/Utils.java
deleted file mode 100644
index 8c1292734..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/Utils.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Created on 25.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class Utils
-{
- public static byte[] readFromInputStream(InputStream inputStream) throws IOException
- {
- byte[] currentBytes = new byte[500];
- int bytesRead;
- ByteArrayOutputStream result = new ByteArrayOutputStream();
- do
- {
- bytesRead = inputStream.read(currentBytes);
- if (bytesRead > 0)
- {
- result.write(currentBytes, 0, bytesRead);
- }
- }
- while (bytesRead != -1);
- return result.toByteArray();
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/RequestWrapper.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/RequestWrapper.java
deleted file mode 100644
index a6652a56e..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/RequestWrapper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Created on 19.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.filters;
-
-import java.io.ByteArrayInputStream;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class RequestWrapper extends HttpServletRequestWrapper
-{
-
- private ServletInputStream inputStream_;
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Generates a request wrapper around a particular request.
- *
- * @param request The request to be wrapped.
- *
- * @param inputStream The new inputstream, which will be returned by method {@link #getInputStream}, and
- * whose length will be returned by method {@link #getContentLength}.
- */
- public RequestWrapper(HttpServletRequest request, ByteArrayInputStream inputStream)
- {
- super(request);
- inputStream_ = new ServletInputStream(inputStream);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see #RequestWrapper(HttpServletRequest, ByteArrayInputStream)
- */
- public javax.servlet.ServletInputStream getInputStream()
- {
- return inputStream_;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see #RequestWrapper(HttpServletRequest, ByteArrayInputStream)
- */
- public int getContentLength()
- {
- return inputStream_.getContentLength();
- }
-
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ResponseWrapper.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ResponseWrapper.java
deleted file mode 100644
index 420723abb..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ResponseWrapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Created on 18.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.filters;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class ResponseWrapper extends HttpServletResponseWrapper
-{
- private ServletOutputStream outputStream_;
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public ResponseWrapper(HttpServletResponse response)
- {
- super(response);
- outputStream_ = new ServletOutputStream();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public javax.servlet.ServletOutputStream getOutputStream()
- {
- return outputStream_;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Returns the wrapped response as a byte array.
- *
- * @return the response as a byte array.
- */
- public byte[] toByteArray()
- {
- return outputStream_.toByteArray();
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/SL2MOAFilter.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/SL2MOAFilter.java
deleted file mode 100644
index 08b8635ba..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/SL2MOAFilter.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Created on 18.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.filters;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.commons.fileupload.DiskFileUpload;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUpload;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.xerces.parsers.DOMParser;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-import at.gv.egovernment.moa.spss.slinterface.moainvoker.MOAInvoker;
-import at.gv.egovernment.moa.spss.slinterface.servlets.SLRequest;
-import at.gv.egovernment.moa.spss.slinterface.transformers.MOA2SL;
-import at.gv.egovernment.moa.spss.slinterface.transformers.SL2MOA;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class SL2MOAFilter implements Filter
-{
- private static Logger logger_ = Logger.getLogger(Constants.LH_FILTERS_);
-
- private FilterConfig config_;
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
- */
- public void init(FilterConfig config) throws ServletException
- {
- // Store filter configuration
- config_ = config;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse,
- * javax.servlet.FilterChain)
- */
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException
- {
- // Create session
- HttpSession session = ((HttpServletRequest) request).getSession(true);
-
- // Check if request is HTTP-POST
- checkHttpPost((HttpServletRequest) request);
-
- // Get SL request from content of request
- SLRequest slRequest = parseRequest((HttpServletRequest) request);
- session.setAttribute("slRequest", slRequest);
-
- // Schema validate SL request
- CharArrayReader slXmlRequestCAR = new CharArrayReader(slRequest.xmlRequest_.toCharArray());
- Document slXMLRequestDoc = parseSlXmlRequest(slXmlRequestCAR);
-
- // Transform SL request into a MOA SPSS request
- Properties initProps = (Properties)config_.getServletContext().getAttribute(Constants.WSCP_INIT_PROPS_);
- String trustProfileId = initProps.getProperty(Constants.IP_SP_TRUSTPROFILEID_);
- Document moaXMLRequestDoc = SL2MOA.toMoaVerifyXMLSignatureRequest(slXMLRequestDoc, trustProfileId);
- ByteArrayOutputStream moaRequestBOS = new ByteArrayOutputStream();
- MOAInvoker.serializeDocument(moaXMLRequestDoc, moaRequestBOS);
- logger_.debug("SL request transformed into MOA request:\n" + moaRequestBOS);
- ByteArrayInputStream moaRequestIS = new ByteArrayInputStream(moaRequestBOS.toByteArray());
-
- // Invoke MOA SPSS
- RequestWrapper requestWrapper = new RequestWrapper((HttpServletRequest) request, moaRequestIS);
- ResponseWrapper responseWrapper = new ResponseWrapper((HttpServletResponse) response);
- chain.doFilter(requestWrapper, responseWrapper);
-
- // Transform MOA response into a SL response
- DOMParser xmlParser = (DOMParser) config_.getServletContext().getAttribute(Constants.WSCP_XMLPARSER_);
- ServletOutputStream moaResponseSOS = (ServletOutputStream) responseWrapper.getOutputStream();
- ByteArrayInputStream moaResponseBIS = new ByteArrayInputStream(moaResponseSOS.toByteArray());
- InputSource responseSource = new InputSource(moaResponseBIS);
- Document slResponseDoc;
- try
- {
- xmlParser.parse(responseSource);
- Document moaResponseDoc = xmlParser.getDocument();
- slResponseDoc = MOA2SL.toSlVerifyXMLSignatureResponse(moaResponseDoc);
- }
- catch (SAXException e)
- {
- String message = "Transforming MOA XML response into SL XML response failed.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- session.setAttribute("slResponseDoc", slResponseDoc);
-
- String continueURL = ((HttpServletRequest) request).getContextPath() + "/results";
- continueURL = ((HttpServletResponse) response).encodeURL(continueURL);
- String responseStr = "<html><body><a href=\"" + continueURL + ">Und weiter geht es ...</a></body></html>";
-
- response.setContentType("text/html");
- OutputStream responseOS = response.getOutputStream();
- responseOS.write(responseStr.getBytes("UTF-8"));
- responseOS.flush();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see javax.servlet.Filter#destroy()
- */
- public void destroy()
- {
- // Nothing to do here at the moment.
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private void initTransformer(ServletContext context, String initPropStylesheetLoc) throws ServletException
- {
- String stylesheetName =
- (Constants.IP_SL2MOA_STYLESHEET_.equals(initPropStylesheetLoc))
- ? "sl2Moa"
- : "moa2Sl";
-
- String contextAttrName =
- (Constants.IP_SL2MOA_STYLESHEET_.equals(initPropStylesheetLoc))
- ? Constants.WSCP_SL2MOA_TRANSFORMER_
- : Constants.WSCP_MOA2SL_TRANSFORMER_;
-
- TransformerFactory transformerFactory = TransformerFactory.newInstance();
- Properties initProps = (Properties) context.getAttribute(Constants.WSCP_INIT_PROPS_);
- String stylesheetLoc = initProps.getProperty(initPropStylesheetLoc);
- InputStream stylesheetIS = context.getResourceAsStream(stylesheetLoc);
- if (stylesheetIS == null)
- {
- String message =
- "Cannot load " + stylesheetName + " stylesheet from location \"" + stylesheetLoc + "\".";
- logger_.error(message);
- throw new ServletException(message);
- }
- Transformer transformer;
- try
- {
- StreamSource stylesheetSS = new StreamSource(stylesheetIS);
- transformer = transformerFactory.newTransformer(stylesheetSS);
- }
- catch (TransformerConfigurationException e)
- {
- String message = "Cannot create XSLT transformer with " + stylesheetName + " stylesheet.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- context.setAttribute(contextAttrName, transformer);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Parses the http request.
- */
- private SLRequest parseRequest(HttpServletRequest request) throws IOException
- {
- SLRequest slRequest = new SLRequest();
-
- // Check if request URL ends with "http-security-layer-request"
- // @TODO Don't know if this check is sufficient - spec says request URL must have this value as path
- String requestURI = request.getRequestURI();
- if (!requestURI.endsWith(Constants.SLC_NAME_HTTP_REQUEST_))
- {
- String message = "Request does not end with \"" + Constants.SLC_NAME_HTTP_REQUEST_ + "\".";
- logger_.error(message);
- throw new IOException(message);
- }
-
- if (FileUpload.isMultipartContent(request))
- {
- // Request is encoded as mulitpart/form-data
- List items;
- try
- {
- DiskFileUpload upload = new DiskFileUpload();
- items = upload.parseRequest(request);
- }
- catch (FileUploadException e)
- {
- String message = "Cannot parse multipart/form-data request.";
- logger_.error(message);
- throw new IOException(message);
- }
-
- Iterator itemsIt = items.iterator();
- while (itemsIt.hasNext())
- {
- FileItem currItem = (FileItem) itemsIt.next();
- String currItemName = currItem.getFieldName();
- if (Constants.SLC_NAME_XML_REQUEST_.equals(currItemName))
- slRequest.xmlRequest_ = currItem.getString();
- else if (Constants.SLC_NAME_DATA_URL_.equals(currItemName))
- slRequest.dataUrl_ = currItem.getString();
- else if (Constants.SLC_NAME_STYLESHEET_URL_.equals(currItemName))
- slRequest.stylesheetUrl_ = currItem.getString();
- else if (Constants.SLC_NAME_REDIRECT_URL_.equals(currItemName))
- slRequest.redirectUrl_ = currItem.getString();
- else
- continue; // @TODO Do not evaluate other params at the moment
- }
- }
- else
- {
- // Request is encoded as application/x-www-form-urlencoded
- Map paramsMap = request.getParameterMap();
- Iterator paramNames = paramsMap.keySet().iterator();
- while (paramNames.hasNext())
- {
- String currName = (String) paramNames.next();
- String[] currValues = (String[]) paramsMap.get(currName);
- if (Constants.SLC_NAME_XML_REQUEST_.equals(currName))
- slRequest.xmlRequest_ = currValues[0];
- else if (Constants.SLC_NAME_DATA_URL_.equals(currName))
- slRequest.dataUrl_ = currValues[0];
- else if (Constants.SLC_NAME_STYLESHEET_URL_.equals(currName))
- slRequest.stylesheetUrl_ = currValues[0];
- else if (Constants.SLC_NAME_REDIRECT_URL_.equals(currName))
- slRequest.redirectUrl_ = currValues[0];
- else
- continue; // @TODO Do not evaluate other params at the moment
- }
- }
-
- if (slRequest.xmlRequest_ == null || slRequest.dataUrl_ == null ||
- slRequest.stylesheetUrl_ != null || slRequest.redirectUrl_ != null)
- {
- // @TODO Only combination of XMLRequest and DataURL allowed at the moment
- String message = "Currently only (XMLRequest + DataURL) is supported.";
- logger_.error(message);
- throw new IOException(message);
- }
-
- return slRequest;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private Document parseSlXmlRequest(Reader slXmlRequest) throws ServletException
- {
- // Parse sl request
- InputSource slXMLRequestIS = new InputSource(slXmlRequest);
- Document slXmlRequestDoc = null;
- try
- {
- DOMParser xmlParser = (DOMParser) config_.getServletContext().getAttribute(Constants.WSCP_XMLPARSER_);
- xmlParser.parse(slXMLRequestIS);
- slXmlRequestDoc = xmlParser.getDocument();
- }
- catch (Exception e)
- {
- String message = "Parsing Security-Layer request failed.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- if (logger_.getEffectiveLevel().isGreaterOrEqual(Level.DEBUG))
- {
- ByteArrayOutputStream debugOutputStream = new ByteArrayOutputStream();
- try
- {
- MOAInvoker.serializeDocument(slXmlRequestDoc, debugOutputStream);
- logger_.debug("XML-Request received:\n" + debugOutputStream);
- }
- catch (IOException e)
- {
- // No debug output if this fails
- }
- }
-
- // Check if namespace is correct
- String namespaceURI = slXmlRequestDoc.getDocumentElement().getNamespaceURI();
- if (!Constants.NSURI_SL_11_.equals(namespaceURI) && !Constants.NSURI_SL_12_.equals(namespaceURI))
- {
- String message = "XML request has invalid namespace: \"" + namespaceURI + "\".";
- logger_.error(message);
- throw new ServletException(message);
- }
-
- return slXmlRequestDoc;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private void checkHttpPost(HttpServletRequest request) throws ServletException
- {
- String method = request.getMethod();
- if (!"POST".equals(method))
- {
- String message = "HTTP method \"" + method + "\" not supported. Must be \"POST\".";
- logger_.error(message);
- throw new ServletException(message);
- }
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletInputStream.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletInputStream.java
deleted file mode 100644
index b0609c2f8..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletInputStream.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Created on 19.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.filters;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class ServletInputStream extends javax.servlet.ServletInputStream
-{
- private ByteArrayInputStream inputStream_;
- private int length_;
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Generates a new <code>ServletInputStram</code> from the specified stream.
- *
- * @param inputStream See above.
- */
- public ServletInputStream(ByteArrayInputStream inputStream)
- {
- super();
- inputStream_ = inputStream;
- length_ = inputStream_.available();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Reads a single byte from the underlying <code>ByteArrayInputStream</code>.
- *
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException
- {
- return inputStream_.read();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Gets the length of the content from this input stream. This equals to the number of bytes which where
- * available at the time of creating this <code>ServletInputStream</code>.
- */
- public int getContentLength()
- {
- return length_;
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletOutputStream.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletOutputStream.java
deleted file mode 100644
index b790ee55c..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletOutputStream.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Created on 18.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.filters;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class ServletOutputStream extends javax.servlet.ServletOutputStream
-{
- private ByteArrayOutputStream outputStream_;
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Default constructor.
- */
- public ServletOutputStream()
- {
- super();
- outputStream_ = new ByteArrayOutputStream();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see java.io.OutputStream#write(int)
- */
- public void write(int b) throws IOException
- {
- outputStream_.write(b);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Returns the content of this stream as a byte array.
- *
- * @return the content of this stream as a byte array.
- */
- public byte[] toByteArray()
- {
- return outputStream_.toByteArray();
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/listeners/ContextListener.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/listeners/ContextListener.java
deleted file mode 100644
index 0b3980a50..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/listeners/ContextListener.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Created on 18.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.listeners;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.log4j.Logger;
-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.XMLGrammarDescription;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.xml.sax.SAXException;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class ContextListener implements ServletContextListener
-{
- private static final String SAX_NAMESPACES_FEATURE = "http://xml.org/sax/features/namespaces";
- private static final String SAX_VALIDATION_FEATURE = "http://xml.org/sax/features/validation";
-
- private static final String XERCES_SCHEMA_VALIDATION_FEATURE =
- "http://apache.org/xml/features/validation/schema";
- private static final String XERCES_NORMALIZED_VALUE_FEATURE =
- "http://apache.org/xml/features/validation/schema/normalized-value";
- private static final String XERCES_INCLUDE_IGNORABLE_WHITESPACE_FEATURE =
- "http://apache.org/xml/features/dom/include-ignorable-whitespace";
- private static final String XERCES_CREATE_ENTITY_REF_NODES_FEATURE =
- "http://apache.org/xml/features/dom/create-entity-ref-nodes";
- protected static final String XERCES_DEFER_NODE_EXPANSION_ =
- "http://apache.org/xml/features/dom/defer-node-expansion";
-
- private static final int BIG_PRIME = 2039;
-
- private static Logger logger_ = Logger.getLogger(Constants.LH_LISTENERS_);
-
- /**
- * Initializes the web application.
- *
- * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
- */
- public void contextInitialized(ServletContextEvent event)
- {
- logger_.debug("Context is being initialized.");
-
- ServletContext context = event.getServletContext();
-
- String initPropsLoc = System.getProperty(Constants.SP_INIT_PROPS_LOC_);
- if (initPropsLoc == null)
- {
- logger_.error("System property \"" + Constants.SP_INIT_PROPS_LOC_ + "\" not set.");
- return;
- }
-
- // Load init properties
- try
- {
- InputStream initPropsIS = context.getResourceAsStream(initPropsLoc);
- Properties initProps = new Properties();
- initProps.load(initPropsIS);
- context.setAttribute(Constants.WSCP_INIT_PROPS_, initProps);
- }
- catch (IOException e)
- {
- logger_.error("Cannot load initialization properties from location \"" + initPropsLoc + "\".", e);
- }
-
- // Initialize XML parser
- SymbolTable symbolTable = new SymbolTable(BIG_PRIME);
- XMLGrammarPool grammarPool = new XMLGrammarPoolImpl();
-
- XMLGrammarPreparser preparser = new XMLGrammarPreparser(symbolTable);
- preparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA, null);
- preparser.setProperty(org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX
- + org.apache.xerces.impl.Constants.XMLGRAMMAR_POOL_PROPERTY, grammarPool);
- preparser.setFeature(SAX_NAMESPACES_FEATURE, true);
- preparser.setFeature(SAX_VALIDATION_FEATURE, true);
-
- Properties initProps = (Properties) context.getAttribute(Constants.WSCP_INIT_PROPS_);
- String slSchemaLoc = initProps.getProperty(Constants.IP_SL_SCHEMA_);
- preparseSchema(context, preparser, slSchemaLoc);
- String moaSchemaLoc = initProps.getProperty(Constants.IP_MOA_SCHEMA_);
- preparseSchema(context, preparser, moaSchemaLoc);
-
- DOMParser xmlParser = new DOMParser(symbolTable, grammarPool);
- try
- {
- xmlParser.setFeature(SAX_NAMESPACES_FEATURE, true);
- xmlParser.setFeature(SAX_VALIDATION_FEATURE, true);
- xmlParser.setFeature(XERCES_SCHEMA_VALIDATION_FEATURE, true);
- xmlParser.setFeature(XERCES_NORMALIZED_VALUE_FEATURE, false);
- xmlParser.setFeature(XERCES_INCLUDE_IGNORABLE_WHITESPACE_FEATURE, true);
- xmlParser.setFeature(XERCES_CREATE_ENTITY_REF_NODES_FEATURE, false);
- xmlParser.setFeature(XERCES_DEFER_NODE_EXPANSION_, false);
-
- }
- catch (SAXException e)
- {
- String message = "Initialization of XML parser failed.";
- logger_.error(message, e);
- }
- context.setAttribute(Constants.WSCP_XMLPARSER_, xmlParser);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Does some clean up at finalization of the web application.
- *
- * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
- */
- public void contextDestroyed(ServletContextEvent event)
- {
- // Remove init properties from web service context
- Properties initProps = (Properties) event.getServletContext().getAttribute(Constants.WSCP_INIT_PROPS_);
- if (initProps != null) event.getServletContext().removeAttribute(Constants.WSCP_INIT_PROPS_);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private void preparseSchema(ServletContext context, XMLGrammarPreparser preparser, String schemaLoc)
- {
- InputStream schemaIS = context.getResourceAsStream(schemaLoc);
- if (schemaIS == null)
- {
- String message = "Cannot load schema from location \"" + schemaLoc + "\".";
- logger_.error(message);
- }
- try
- {
- String schemaSystemId = context.getResource(schemaLoc).toExternalForm();
- preparser.preparseGrammar(XMLGrammarDescription.XML_SCHEMA,
- new XMLInputSource(null, schemaSystemId, null, schemaIS, null));
- }
- catch (Exception e)
- {
- String message = "Parsing schema loaded from location \"" + schemaLoc + "\" failed.";
- logger_.error(message, e);
- }
- }
-
-
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/moainvoker/MOAInvoker.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/moainvoker/MOAInvoker.java
deleted file mode 100644
index e89d255f0..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/moainvoker/MOAInvoker.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Created on 19.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.moainvoker;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.rmi.RemoteException;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceException;
-import javax.xml.rpc.ServiceFactory;
-
-import org.apache.axis.message.SOAPBodyElement;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class MOAInvoker
-{
- /**
- * Invokes MOA SP.
- *
- * @param request The XML request to be sent to MOA SP.
- *
- * @param endpoint The endpoint of the SOAP service where to send the XML request to.
- *
- * @return the XML response from the service.
- *
- * @throws Exception if getting the XML response from the SOAP response body fails.
- *
- * @throws RemoteException if MOA SP signals an error.
- *
- * @throws ServiceException if the SOAP client invoking MOA SP signals an error.
- */
- public static Document invokeSP(Document request, String endpoint)
- throws Exception, RemoteException, ServiceException
- {
- QName serviceQName = new QName(Constants.MI_SP_QNAME_);
- return invoke(request, endpoint, serviceQName);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private static Document invoke(Document request, String endpoint, QName serviceQName) throws Exception
- {
- // Instantiate AXIS service
- Service service = ServiceFactory.newInstance().createService(serviceQName);
-
- // Create and configure service call
- Call call = service.createCall();
- call.setTargetEndpointAddress(endpoint);
-
- // Create SOAP body
- SOAPBodyElement body = new SOAPBodyElement(request.getDocumentElement());
- SOAPBodyElement[] params = new SOAPBodyElement[] {body};
-
- // Make call
- Vector responses = (Vector) call.invoke(params);
-
- // Get response
- SOAPBodyElement responseBody = (SOAPBodyElement) responses.get(0);
- Document response = responseBody.getAsDocument();
- return response;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public static void serializeDocument(Document doc, OutputStream out) throws IOException
- {
- OutputFormat format = new OutputFormat(doc);
-
- format.setLineSeparator("\n");
- format.setIndenting(false);
- format.setPreserveSpace(true);
- format.setOmitXMLDeclaration(false);
- format.setEncoding("UTF-8");
-
- XMLSerializer serializer = new XMLSerializer(out, format);
- serializer.serialize(doc);
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/MOAServlet.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/MOAServlet.java
deleted file mode 100644
index 1ec18e5cb..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/MOAServlet.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Created on 19.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.servlets;
-
-import java.io.IOException;
-import java.rmi.RemoteException;
-import java.util.Properties;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.rpc.ServiceException;
-
-import org.apache.log4j.Logger;
-import org.apache.xerces.parsers.DOMParser;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-import at.gv.egovernment.moa.spss.slinterface.moainvoker.MOAInvoker;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class MOAServlet extends HttpServlet
-{
- private static Logger logger_ = Logger.getLogger(Constants.LH_SERVLETS_);
-
- /**
- * Default constructor.
- */
- public MOAServlet()
- {
- super();
- }
-
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException
- {
- // Get moa request form http request
- Document moaXmlRequest = null;
- DOMParser xmlParser = (DOMParser) this.getServletContext().getAttribute(Constants.WSCP_XMLPARSER_);
- try
- {
- InputSource requestIS = new InputSource(request.getInputStream());
- xmlParser.parse(requestIS);
- moaXmlRequest = xmlParser.getDocument();
- }
- catch (IOException ioe)
- {
- String message = "Getting MOA XML request from http request input failed.";
- logger_.error(message, ioe);
- throw new ServletException(message, ioe);
- }
- catch (SAXException se)
- {
- String message = "Parsing MOA XML request got from http request failed.";
- logger_.error(message, se);
- throw new ServletException(message, se);
- }
-
- // Send request to MOA SP
- Properties initProps = (Properties) this.getServletContext().getAttribute(Constants.WSCP_INIT_PROPS_);
- String endPoint = initProps.getProperty(Constants.IP_SP_ENDPOINT_);
- if (endPoint == null)
- {
- String message = "No endpoint configured for MOA SP service.";
- logger_.error(message);
- throw new ServletException(message);
- }
- Document moaXMLResponseDoc = null;
- try
- {
- moaXMLResponseDoc = MOAInvoker.invokeSP(moaXmlRequest, endPoint);
- }
- catch (Exception e)
- {
- String message;
- if (e instanceof RemoteException)
- {
- message = "MOA SP service indicated an error at request execution.";
- }
- else if (e instanceof ServiceException)
- {
- message = "MOA SP client indicated an error at request execution.";
- }
- else
- {
- message = "Could not create DOM Document from MOA SP service response.";
- }
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
-
- // Write moa response to http response
- try
- {
- MOAInvoker.serializeDocument(moaXMLResponseDoc, response.getOutputStream());
- }
- catch (IOException e)
- {
- String message = "Writing MOA SP XML response to http response failed.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/ResultServlet.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/ResultServlet.java
deleted file mode 100644
index 67397a1ee..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/ResultServlet.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Created on 25.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.servlets;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
-import org.w3c.dom.Document;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-import at.gv.egovernment.moa.spss.slinterface.Utils;
-import at.gv.egovernment.moa.spss.slinterface.moainvoker.MOAInvoker;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class ResultServlet extends HttpServlet
-{
-
- private static Logger logger_ = Logger.getLogger(Constants.LH_SERVLETS_);
-
- /**
- * Default constructor.
- */
- public ResultServlet()
- {
- super();
- }
-
- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException
- {
- // Get session
- HttpSession session = request.getSession(false);
- if (session == null)
- {
- String message = "No session available";
- logger_.error(message);
- throw new ServletException(message);
- }
-
- // Get original SL request from session
- SLRequest slRequest = (SLRequest) session.getAttribute("slRequest");
- if (slRequest == null)
- {
- String message = "Session object \"slRequest\" not available.";
- logger_.error(message);
- throw new ServletException(message);
- }
-
- // Get SL response from session
- Document slResponseDoc = (Document) session.getAttribute("slResponseDoc");
- if (slResponseDoc == null)
- {
- String message = "Session object \"slResponseDoc\" not available.";
- logger_.error(message);
- throw new ServletException(message);
- }
-
- URLConnection dataURLConn;
- try
- {
- // Open connection to DataURL
- URL dataURL = new URL(slRequest.dataUrl_);
- dataURLConn = dataURL.openConnection();
- dataURLConn.setDoOutput(true);
- OutputStream dataURLOS = dataURLConn.getOutputStream();
- MOAInvoker.serializeDocument(slResponseDoc, dataURLOS);
- dataURLOS.flush();
- }
- catch (Exception e)
- {
- String message = "Sending SL XML response to DataURL failed.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
-
- // Forward response from DataURL to client
- forwardResponse(dataURLConn, response);
-
- session.invalidate();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private void forwardResponse(URLConnection dataURLConn, ServletResponse response) throws ServletException
- {
- // Make sure that content type of DataURL response is text/html
- String dataURLContentType = dataURLConn.getContentType();
- if (dataURLContentType == null || !dataURLContentType.startsWith("text/html"))
- {
- String message = "Unsupported content type of DataURL response: \"" + dataURLContentType + "\".";
- logger_.error(message);
- throw new ServletException(message);
- }
-
- try
- {
- InputStream dataURLIS = dataURLConn.getInputStream();
- byte[] dataURLResponse = Utils.readFromInputStream(dataURLIS);
- response.setContentType("text/html");
- OutputStream responseOS = response.getOutputStream();
- responseOS.write(dataURLResponse);
- responseOS.flush();
- }
- catch (Exception e)
- {
- String message = "Forwarding DataURL response to client failed.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/SLRequest.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/SLRequest.java
deleted file mode 100644
index 3c19d5ff6..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/servlets/SLRequest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Created on 25.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.servlets;
-
-/**
- * Helper class, representing the fields of a Security-Layer request.
- *
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class SLRequest
-{
- public String xmlRequest_;
- public String dataUrl_;
- public String stylesheetUrl_;
- public String redirectUrl_;
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java
deleted file mode 100644
index a85917d81..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Created on 20.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.transformers;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class MOA2SL
-{
- /**
- * Transforms an MOA VerifyXMLSignatureResponse into a SL VerifyXMLSignatureResponse.
- *
- * @param moaVerifyXMLSignatureResponse The MOA VerifyXMLSignatureResponse to be transformed.
- *
- * @return the specified response document, transformed into a SL VerifyXMLSignatureResponse. Please note
- * that <code>moaVerifyXMLSignatureResponse</code> is modified into the sl response.
- *
- * @pre moaVerifyXMLSignatureResponse is a valid instance of the SL Schema (version 1.2 or 1.1).
- */
- public static Document toSlVerifyXMLSignatureResponse(Document moaVerifyXMLSignatureResponse)
- {
- // Namespace to namespace prefix mapping
- HashMap prefixMap = new HashMap(4);
- prefixMap.put(Constants.NSURI_SL_10_, Constants.NSPRE_SL_10_);
- prefixMap.put(Constants.NSURI_SL_11_, Constants.NSPRE_SL_11_);
- prefixMap.put(Constants.NSURI_SL_12_, Constants.NSPRE_SL_12_);
- prefixMap.put(Constants.NSURI_MOA_12_, Constants.NSPRE_MOA_12_);
-
- // Namespaces to be changed
- HashMap nsTransforms = new HashMap();
- nsTransforms.put(Constants.NSURI_MOA_12_, Constants.NSURI_SL_11_);
-
- // Names to be changed
- HashMap nameTransforms = new HashMap();
- nameTransforms.put(
- new QName(Constants.NSURI_MOA_12_, "PublicAuthority"),
- new QName(Constants.NSURI_MOA_12_,"PublicAuthority"));
-
- Element verifyResponseElem = moaVerifyXMLSignatureResponse.getDocumentElement();
- verifyResponseElem.setAttributeNS(Constants.NSURI_NAMESPACES_,
- "xmlns:" + Constants.NSPRE_SL_10_, Constants.NSURI_SL_10_);
- verifyResponseElem.setAttributeNS(Constants.NSURI_NAMESPACES_,
- "xmlns:" + Constants.NSPRE_SL_11_, Constants.NSURI_SL_11_);
-
- // Convert SL request into MOA request
- verifyResponseElem =
- Utils.transformDeep(verifyResponseElem, prefixMap, nsTransforms, nameTransforms);
-
- // Add SignatureManifestCheck element (Code = 98)
- Element signatureMFCheckElem = moaVerifyXMLSignatureResponse.createElementNS(
- Constants.NSURI_SL_11_, Constants.NSPRE_SL_11_ + ":SignatureManifestCheck");
- Element smfCodeElem = moaVerifyXMLSignatureResponse.createElementNS(
- Constants.NSURI_SL_11_, Constants.NSPRE_SL_11_ + ":Code");
- signatureMFCheckElem.appendChild(smfCodeElem);
- smfCodeElem.appendChild(moaVerifyXMLSignatureResponse.createTextNode("98"));
- Element signatureCheckElem = (Element) verifyResponseElem.getElementsByTagNameNS(
- Constants.NSURI_SL_11_, "SignatureCheck").item(0);
- verifyResponseElem.insertBefore(signatureMFCheckElem, signatureCheckElem.getNextSibling());
-
- // Siblings of Certificate check must be in sl10 namespace
- nsTransforms.clear();
- nsTransforms.put(Constants.NSURI_SL_11_, Constants.NSURI_SL_10_);
- nameTransforms.clear();
- NodeList signatureCheckChildren = signatureCheckElem.getElementsByTagName("*");
- ArrayList signatureCheckChildrenList = new ArrayList(signatureCheckChildren.getLength());
- for (int i = 0; i < signatureCheckChildren.getLength(); i++)
- {
- signatureCheckChildrenList.add(signatureCheckChildren.item(i));
- }
- for (int i = 0; i < signatureCheckChildrenList.size(); i++)
- Utils.transformDeep((Element) signatureCheckChildrenList.get(i), prefixMap, nsTransforms,
- nameTransforms);
-
- return moaVerifyXMLSignatureResponse;
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/QName.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/QName.java
deleted file mode 100644
index 6da0c433f..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/QName.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Created on 20.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.transformers;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class QName
-{
- public String nsUrl_;
- public String localName_;
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public QName(String nsUrl, String localName)
- {
- nsUrl_ = nsUrl;
- localName_ = localName;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public boolean equals(Object o)
- {
- if (o == null) return false;
- if (o instanceof QName)
- {
- QName toBeCompared = (QName) o;
-
- boolean nsURLEquals = (nsUrl_ == null)
- ? toBeCompared.nsUrl_ == null
- : nsUrl_.equals(toBeCompared.nsUrl_);
- boolean localNameEquals = (localName_ == null)
- ? toBeCompared.localName_ == null
- : localName_.equals(toBeCompared.localName_);
-
- return nsURLEquals && localNameEquals;
- }
- return false;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public int hashCode()
- {
- return new String(nsUrl_ + localName_).hashCode();
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/SL2MOA.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/SL2MOA.java
deleted file mode 100644
index 11855242e..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/SL2MOA.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Created on 20.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.transformers;
-
-import java.util.HashMap;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class SL2MOA
-{
- /**
- * Transforms an SL VerifyXMLSignatureRequest into a MOA VerifyXMLSignatureRequest.
- *
- * @param slVerifyXMLSignatureRequest The SL VerifyXMLSignatureRequest to be transformed.
- *
- * @return the specified request document, transformed into a MOA VerifyXMLSignatureRequest. Please note
- * that <code>slVerifyXMLSignatureRequest</code> is modified into the moa request.
- *
- * @pre slVerifyXMLSignatureRequest is a valid instance of the SL Schema (version 1.2 or 1.1).
- */
- public static Document toMoaVerifyXMLSignatureRequest(Document slVerifyXMLSignatureRequest,
- String trustProfileID)
- {
- // Namespace to namespace prefix mapping
- HashMap prefixMap = new HashMap(4);
- prefixMap.put(Constants.NSURI_SL_10_, Constants.NSPRE_SL_10_);
- prefixMap.put(Constants.NSURI_SL_11_, Constants.NSPRE_SL_11_);
- prefixMap.put(Constants.NSURI_SL_12_, Constants.NSPRE_SL_12_);
- prefixMap.put(Constants.NSURI_MOA_12_, Constants.NSPRE_MOA_12_);
-
- // Namespaces to be changed
- HashMap nsTransforms = new HashMap();
- nsTransforms.put(Constants.NSURI_SL_10_, Constants.NSURI_MOA_12_);
- nsTransforms.put(Constants.NSURI_SL_11_, Constants.NSURI_MOA_12_);
- nsTransforms.put(Constants.NSURI_SL_12_, Constants.NSURI_MOA_12_);
-
- // Names to be changed
- HashMap nameTransforms = new HashMap();
- nameTransforms.put(
- new QName(Constants.NSURI_SL_11_, "SignatureInfo"),
- new QName(Constants.NSURI_MOA_12_,"VerifySignatureInfo"));
- nameTransforms.put(
- new QName(Constants.NSURI_SL_12_, "SignatureInfo"),
- new QName(Constants.NSURI_MOA_12_,"VerifySignatureInfo"));
- nameTransforms.put(
- new QName(Constants.NSURI_SL_11_, "SignatureEnvironment"),
- new QName(Constants.NSURI_MOA_12_,"VerifySignatureEnvironment"));
- nameTransforms.put(
- new QName(Constants.NSURI_SL_12_, "SignatureEnvironment"),
- new QName(Constants.NSURI_MOA_12_,"VerifySignatureEnvironment"));
- nameTransforms.put(
- new QName(Constants.NSURI_SL_11_, "SignatureLocation"),
- new QName(Constants.NSURI_MOA_12_,"VerifySignatureLocation"));
- nameTransforms.put(
- new QName(Constants.NSURI_SL_12_, "SignatureLocation"),
- new QName(Constants.NSURI_MOA_12_,"VerifySignatureLocation"));
- nameTransforms.put(
- new QName(Constants.NSURI_SL_11_, "Supplement"),
- new QName(Constants.NSURI_MOA_12_,"SupplementProfile"));
- nameTransforms.put(
- new QName(Constants.NSURI_SL_12_, "Supplement"),
- new QName(Constants.NSURI_MOA_12_,"SupplementProfile"));
-
- Element verifyRequestElem = slVerifyXMLSignatureRequest.getDocumentElement();
- verifyRequestElem.setAttributeNS(Constants.NSURI_NAMESPACES_,
- "xmlns:" + Constants.NSPRE_MOA_12_, Constants.NSURI_MOA_12_);
-
- // Convert SL request into MOA request
- verifyRequestElem = Utils.transformDeep(verifyRequestElem, prefixMap, nsTransforms, nameTransforms);
-
- // Add trust profile ID element
- Element trustProfileIDElem = slVerifyXMLSignatureRequest.createElementNS(
- Constants.NSURI_MOA_12_, Constants.NSPRE_MOA_12_ + ":TrustProfileID");
- trustProfileIDElem.appendChild(slVerifyXMLSignatureRequest.createTextNode(trustProfileID));
- verifyRequestElem.appendChild(trustProfileIDElem);
-
- return slVerifyXMLSignatureRequest;
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/Utils.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/Utils.java
deleted file mode 100644
index d03895efe..000000000
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/Utils.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Created on 20.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.transformers;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.xerces.dom.DocumentImpl;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.traversal.DocumentTraversal;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.traversal.NodeIterator;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class Utils
-{
- /**
- *
- * @param elem
- * @param prefixes
- * @param namespaces
- * @param names
- *
- * @pre <code>elem</code> is backed by a <code>org.apache.xerces.dom.DocumentImpl</code>.
- */
- public static Element transformDeep(Element elem, Map prefixes, Map namespaces, Map names)
- {
- // Get node iterator for element
- DocumentTraversal docTraversal = (DocumentImpl) elem.getOwnerDocument();
- NodeIterator elemsIt = docTraversal.createNodeIterator(elem, NodeFilter.SHOW_ELEMENT, null, true);
-
- // Make iterator immutable
- List elemsList = new LinkedList();
- while (true)
- {
- Node currNode = elemsIt.nextNode();
- if (currNode == null) break;
- elemsList.add(currNode);
- }
-
- Iterator elemsImmIt = elemsList.iterator();
- Element returnValue = null;
- while (elemsImmIt.hasNext())
- {
- Element currElem = (Element) elemsImmIt.next();
-
- String nsUri = currElem.getNamespaceURI();
- String localName = currElem.getLocalName();
- QName qName = new QName(nsUri, localName);
-
- // Check if element is in "names"
- QName newQName = (QName)names.get(qName);
- if (newQName != null)
- {
- Element transformedElem = transformElem(currElem, newQName, prefixes);
- if (returnValue == null) returnValue = transformedElem;
- }
- else
- {
- String newNamespace = (String)namespaces.get(nsUri);
- if (newNamespace != null)
- {
- newQName = new QName(newNamespace, localName);
- Element transformedElem = transformElem(currElem, newQName, prefixes);
- if (returnValue == null) returnValue = transformedElem;
- }
- }
- }
- return returnValue;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private static Element transformElem(Element currElem, QName newQName, Map prefixes)
- {
- Element newElem = currElem.getOwnerDocument().createElementNS(newQName.nsUrl_,
- (String) prefixes.get(newQName.nsUrl_) + ":" + newQName.localName_);
-
- currElem.getParentNode().replaceChild(newElem, currElem);
-
- // Treat attributes of currElem
- NamedNodeMap currAttrs = currElem.getAttributes();
- ArrayList currAttrsList = new ArrayList(currAttrs.getLength());
- for (int i = 0; i < currAttrs.getLength(); i++) currAttrsList.add(currAttrs.item(i));
- for (int i = 0; i < currAttrsList.size(); i++)
- {
- Attr currAttr = (Attr)currAttrsList.get(i);
- currAttr.getOwnerElement().removeAttributeNode(currAttr);
-
- // Workaround for bad Xerces behaviour: default attributes in the xml namespace are created without
- // the xml prefix
- if (Constants.NSURI_XML_.equals(currAttr.getNamespaceURI()) && "space".equals(currAttr.getLocalName()))
- {
- newElem.setAttributeNS(Constants.NSURI_XML_, "xml:space", currAttr.getValue());
- }
- else
- {
- newElem.setAttributeNode(currAttr);
- }
- }
-
- // Treat child nodes of currElem
- NodeList currChildren = currElem.getChildNodes();
- ArrayList currChildrenList = new ArrayList(currChildren.getLength());
- for (int i = 0; i < currChildren.getLength(); i++) currChildrenList.add(currChildren.item(i));
- for (int i = 0; i < currChildrenList.size(); i++)
- {
- Node currChild = (Node)currChildrenList.get(i);
- currElem.removeChild(currChild);
- newElem.appendChild(currChild);
- }
-
- return newElem;
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLBean.java b/spss.slinterface/WEB-INF/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLBean.java
deleted file mode 100644
index 4cf099a45..000000000
--- a/spss.slinterface/WEB-INF/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLBean.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Created on 25.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package test.at.gv.egovernment.moa.spss.slinterface;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class DataURLBean
-{
- String title_;
- String contentType_;
- String content_;
-
- public DataURLBean()
- {
- super();
- title_="unknown";
- contentType_="unknown";
- content_="unknown";
- }
-
- public DataURLBean(String title, String contentType, String content)
- {
- title_ = title;
- contentType_ = contentType;
- content_ = content;
- }
-
- public String getTitle()
- {
- return title_;
- }
-
- public String getContentType()
- {
- return contentType_;
- }
-
- public String getContent()
- {
- return content_;
- }
-}
diff --git a/spss.slinterface/WEB-INF/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLServlet.java b/spss.slinterface/WEB-INF/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLServlet.java
deleted file mode 100644
index ff4cbbe59..000000000
--- a/spss.slinterface/WEB-INF/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLServlet.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Created on 25.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package test.at.gv.egovernment.moa.spss.slinterface;
-
-import java.io.IOException;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-import at.gv.egovernment.moa.spss.slinterface.Utils;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class DataURLServlet extends HttpServlet
-{
- private static Logger logger_ = Logger.getLogger(Constants.LH_TEST_);
-
- public DataURLServlet()
- {
- super();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException
- {
- // Read content form POST request
- try
- {
- logger_.debug("Received POST request:");
- logger_.debug("Content type: \"" + request.getContentType() + "\".");
- byte[] contentBytes = Utils.readFromInputStream(request.getInputStream());
- String contentStr = new String(contentBytes);
- logger_.debug("Content:\n" + new String(contentStr));
-
- StringBuffer contentStrBuf = new StringBuffer(contentStr);
- int startPos = 0;
- while (startPos < contentStrBuf.length())
- {
- if (contentStrBuf.charAt(startPos) == '<')
- {
- contentStrBuf.replace(startPos, startPos + 1, "&lt;");
- startPos += 4;
- }
- startPos++;
- }
- contentStr = contentStrBuf.toString();
-
- DataURLBean dataURLBean = new DataURLBean("Data URL Results", request.getContentType(), contentStr);
- request.setAttribute("dataURLResult", dataURLBean);
- }
- catch (Exception e)
- {
- String message = "Failed to read content from POST request.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
-
- // Invoke response JSP page
- try
- {
- response.setContentType("text/html");
- RequestDispatcher dispatcher = request.getRequestDispatcher("/pages/test/dataURL.jsp");
- dispatcher.include(request, response);
- }
- catch (IOException e)
- {
- String message = "Failed to send simple HTML answer to client.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- }
-}
diff --git a/spss.slinterface/WEB-INF/web.xml b/spss.slinterface/WEB-INF/web.xml
deleted file mode 100644
index b2907b1f2..000000000
--- a/spss.slinterface/WEB-INF/web.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
- <display-name>Security-Layer-Interface to MOA SPSS</display-name>
- <description>This web service provides a Security-Layer-Interface to MOA SPSS.</description>
-
- <filter>
- <filter-name>SL2MOAFilter</filter-name>
- <filter-class>at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>SL2MOAFilter</filter-name>
- <servlet-name>MOAServlet</servlet-name>
- </filter-mapping>
-
- <listener>
- <listener-class>at.gv.egovernment.moa.spss.slinterface.listeners.ContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>MOAServlet</servlet-name>
- <display-name>MOA Servlet</display-name>
- <servlet-class>
- at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>DataURLServlet</servlet-name>
- <display-name>DataURL test servlet</display-name>
- <servlet-class>
- test.at.gv.egovernment.moa.spss.slinterface.DataURLServlet
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>ResultServlet</servlet-name>
- <display-name>Result servlet</display-name>
- <servlet-class>
- at.gv.egovernment.moa.spss.slinterface.servlets.ResultServlet
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>MOAServlet</servlet-name>
- <url-pattern>/http-security-layer-request</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>DataURLServlet</servlet-name>
- <url-pattern>/dataurl</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ResultServlet</servlet-name>
- <url-pattern>/results</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/spss.slinterface/constraints.txt b/spss.slinterface/constraints.txt
deleted file mode 100644
index 1333c2d6c..000000000
--- a/spss.slinterface/constraints.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-- Prüfung eines ggf. vorhandenen SL-Manifests wird nicht durchgeführt.
- In der Antwort wird der Code 98 zurückgeliefert. \ No newline at end of file
diff --git a/spss.slinterface/pages/test/dataURL.jsp b/spss.slinterface/pages/test/dataURL.jsp
deleted file mode 100644
index c2b62697f..000000000
--- a/spss.slinterface/pages/test/dataURL.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean
- id="dataURLResult"
- class="test.at.gv.egovernment.moa.spss.slinterface.DataURLBean" scope="request">
-</jsp:useBean>
-
-<html>
- <head>
- <head><title><jsp:getProperty name="dataURLResult" property="title"/></title></head>
- </head>
- <body>
- <h1>Content-Type</h1>
- <p><pre><jsp:getProperty name="dataURLResult" property="contentType"/></pre></p>
- <h1>Content</h1>
- <p><pre><jsp:getProperty name="dataURLResult" property="content"/></pre></p>
- </body>
-</html> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/properties/init.properties b/spss.slinterface/res/resources/properties/init.properties
deleted file mode 100644
index 0946d3817..000000000
--- a/spss.slinterface/res/resources/properties/init.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-location.stylesheet.sl2moa = /WEB-INF/classes/resources/stylesheets/sl2moa.xsl
-location.stylesheet.moa2sl = /WEB-INF/classes/resources/stylesheets/moa2sl.xsl
-
-location.schema.sl = /WEB-INF/classes/resources/schemas/Core.20031231.xsd
-location.schema.moa = /WEB-INF/classes/resources/schemas/MOA-SPSS-1.2.xsd
-
-service.sp.endpoint = http://localhost:8080/moa-spss/services/SignatureVerification
-service.sp.trustProfileId = TrustProfile1 \ No newline at end of file
diff --git a/spss.slinterface/res/resources/schemas/Core.20020225.xsd b/spss.slinterface/res/resources/schemas/Core.20020225.xsd
deleted file mode 100644
index 627c74ea7..000000000
--- a/spss.slinterface/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="xmldsig-core-schema.xsd"/>
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="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/spss.slinterface/res/resources/schemas/Core.20020831.xsd b/spss.slinterface/res/resources/schemas/Core.20020831.xsd
deleted file mode 100644
index 48345fd4d..000000000
--- a/spss.slinterface/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="xmldsig-core-schema.xsd"/>
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="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/spss.slinterface/res/resources/schemas/Core.20031231.xsd b/spss.slinterface/res/resources/schemas/Core.20031231.xsd
deleted file mode 100644
index 194be22a8..000000000
--- a/spss.slinterface/res/resources/schemas/Core.20031231.xsd
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Securitylayer, Schnittstellenspezifikation -->
-<!-- XML-Schema für Schnittstellenspezifikation Version 1.2.0, Protokollelemente im datierten Namespace 20031231 -->
-<!-- 19. 11. 2003, Stabstelle IKT-Strategie, Bundeskanzleramt -->
-<xsd:schema targetNamespace="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" 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="xmldsig-core-schema.xsd"/>
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
- <xsd:import namespace="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" schemaLocation="Core.20020225.xsd"/>
- <xsd:import namespace="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" schemaLocation="Core.20020831.xsd"/>
- <!--########## 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="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="SignatureInfoVerificationType">
- <xsd:sequence>
- <xsd:element name="SignatureEnvironment" type="ContentOptionalRefType"/>
- <xsd:element name="SignatureLocation" type="xsd:token"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ContentBaseType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="sl10:XMLContentType"/>
- <xsd:element name="LocRefContent" type="xsd:anyURI"/>
- </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 minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="sl10: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="XMLDataObjectAssociationType">
- <xsd:sequence>
- <xsd:element name="MetaInfo" type="sl10:MetaInfoType" minOccurs="0"/>
- <xsd:element name="Content" type="ContentRequiredRefType"/>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
diff --git a/spss.slinterface/res/resources/schemas/MOA-SPSS-1.2.xsd b/spss.slinterface/res/resources/schemas/MOA-SPSS-1.2.xsd
deleted file mode 100644
index f0a53cfa0..000000000
--- a/spss.slinterface/res/resources/schemas/MOA-SPSS-1.2.xsd
+++ /dev/null
@@ -1,445 +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="xmldsig-core-schema.xsd"/>
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="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="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="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>
- <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/spss.slinterface/res/resources/schemas/xml.xsd b/spss.slinterface/res/resources/schemas/xml.xsd
deleted file mode 100644
index 117670acd..000000000
--- a/spss.slinterface/res/resources/schemas/xml.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/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/spss.slinterface/res/resources/schemas/xmldsig-core-schema.xsd b/spss.slinterface/res/resources/schemas/xmldsig-core-schema.xsd
deleted file mode 100644
index df126b30e..000000000
--- a/spss.slinterface/res/resources/schemas/xmldsig-core-schema.xsd
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
- PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/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: 2002/02/08 20:32:26 $ by $Author: reagle $
-
- 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 xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- targetNamespace="http://www.w3.org/2000/09/xmldsig#"
- version="0.1" elementFormDefault="qualified">
-
-<!-- Basic Types Defined for Signatures -->
-
-<simpleType name="CryptoBinary">
- <restriction base="base64Binary">
- </restriction>
-</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" minOccurs="0" type="ds:HMACOutputLengthType"/>
- <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"/>
- <!-- (1,1) elements from (0,unbounded) namespaces -->
- <element name="XPath" type="string"/>
- </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 processContents="lax" namespace="##other"/>
- <!-- (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"/> <!-- add a grep facet -->
- <attribute name="Encoding" type="anyURI" use="optional"/>
-</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/spss.slinterface/res/resources/simpleVerReq.moa.xml b/spss.slinterface/res/resources/simpleVerReq.moa.xml
deleted file mode 100644
index de6f34ed2..000000000
--- a/spss.slinterface/res/resources/simpleVerReq.moa.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><moa:VerifyXMLSignatureRequest xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#"><moa:VerifySignatureInfo><moa:VerifySignatureEnvironment><moa:XMLContent><dsig:Signature Id="HS_signature" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><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('signed-data')/node()</xf2:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>aylv7lNNes2pI022g7zfY1AOUmI=</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('refetsi')/etsi:QualifyingProperties/etsi:SignedProperties</xf2:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>rYJgLYFMHaAcQjIlwSpFqXp5d1A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VnwHohi/ootc3mIWh2WnInNvjA+/kJOr5bDRl5no1CMsNA+1qhoVZCErHt75gp9m
-O0MPBAcl7KfvkDTbHuMR1oG1Z4RUh52cE5oQietiwHGQIeuWEJ+IGcVcnkoayz4z
-2tQLkdotBhV0mCmkQjyADNn8P4H5yHNsdPq0joqy+2Q=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIE4DCCA8igAwIBAgICGEowDQYJKoZIhvcNAQEFBQAwgZcxCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxHjAcBgNVBAsTFWEtc2lnbi1QcmVt
-aXVtLVNpZy0wMTEeMBwGA1UEAxMVYS1zaWduLVByZW1pdW0tU2lnLTAxMB4XDTAz
-MDEyNzEwMTQxM1oXDTA2MDEyNzEwMTQxM1owZDELMAkGA1UEBhMCQVQxGTAXBgNV
-BAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQTCUthcmxpbmdlcjEPMA0GA1UE
-KhMGR3JlZ29yMRUwEwYDVQQFEww5MTM4OTU1NTI5MTEwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBANrnnGN6wiOyq/rskasBf/Tz4grEKI+NBAuDgO5aqObNDBAe
-PISMQ2nFNX2nzoSNx7j7esl4KdgySmJkZWs/nErpE5fB8lHOfrPRD61dodS+Nhwi
-RWlm+I+ua+mOwR18fg/Cwt3YpXZihzZ+ju7eFlxRifHtKJCLOld6IvdFdFCtAgMB
-AAGjggHqMIIB5jATBgNVHSMEDDAKgAhA1/OeG4c6zDA+BggrBgEFBQcBAwEB/wQv
-MC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVICAQACAQAwCgYIKwYBBQUHCwEw
-fQYIKwYBBQUHAQEEcTBvMEIGCCsGAQUFBzAChjZodHRwOi8vd3d3LmEtdHJ1c3Qu
-YXQvY2VydHMvYS1zaWduLVByZW1pdW0tU2lnLTAxYS5jcnQwKQYIKwYBBQUHMAGG
-HWh0dHA6Ly93d3cuYS10cnVzdC5hdDo4Mi9vY3NwME8GA1UdIARIMEYwRAYGKigA
-EQELMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2Nw
-L2Etc2lnbi1QcmVtaXVtMGoGA1UdHwRjMGEwX6BdoFuGWWxkYXA6Ly9sZGFwLmEt
-dHJ1c3QuYXQvb3U9YS1zaWduLVByZW1pdW0tU2lnLTAxLG89QS1UcnVzdCxjPUFU
-P2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/MBEGA1UdDgQKBAhOYExavdLCITAO
-BgNVHQ8BAf8EBAMCBsAwJQYDVR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8u
-Z3YuYXQwCQYDVR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEAL+A2+Z5gQvn6SnZe
-sLvVVVB1crHe7NI/Om2rEwha4PfEk2pV9UdOg7C1XSzRu9jCNXIAuUSIpxTtAoJH
-sCk82S+iuEEgyVaXU/zFcbgT/k7opHXHswEC6ab2SQnyOlugyG+o7e9nRwAQTzzj
-ryICr3KACQcVwCpLKCgsU6gYQL1bi/c5vk4rnDYquSm1U34+xIl77CefZN/peGU4
-26vUzGma30wHBepLX5M+NXT7ILRzRk4i8oyOccIzOMi/iwAODJmgSSMcYjUgAngE
-oGYK9ngWu7Rr1gvy4lvOwpGGRpz2MP3nU9H2IfKk36n6hhVpc3EC6aF02RdIBD+x
-8VxVsA==</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data">Das ist ein Test.</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-08-14T12:53:27Z</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>wl/zuayZxKuYlH2G2FQCTcosSSg=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=a-sign-Premium-Sig-01,OU=a-sign-Premium-Sig-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>6218</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/plain</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></moa:XMLContent></moa:VerifySignatureEnvironment><moa:VerifySignatureLocation></moa:VerifySignatureLocation></moa:VerifySignatureInfo><moa:ReturnHashInputData/><moa:Trustprofile>TrustProfile1</moa:Trustprofile></moa:VerifyXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/simpleVerReq.xml b/spss.slinterface/res/resources/simpleVerReq.xml
deleted file mode 100644
index 78180c2c3..000000000
--- a/spss.slinterface/res/resources/simpleVerReq.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 2 U (http://www.xmlspy.com) by Gregor Karlinger (Bundeskanzleramt) -->
-<sl11:VerifyXMLSignatureRequest xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.buergerkarte.at/namespaces/securitylayer/20020831#
-schemas\Core.20020831.xsd">
- <sl11:SignatureInfo>
- <sl11:SignatureEnvironment>
- <sl10:XMLContent>
- <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>aylv7lNNes2pI022g7zfY1AOUmI=</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>rYJgLYFMHaAcQjIlwSpFqXp5d1A=</dsig:DigestValue>
- </dsig:Reference>
- </dsig:SignedInfo>
- <dsig:SignatureValue>VnwHohi/ootc3mIWh2WnInNvjA+/kJOr5bDRl5no1CMsNA+1qhoVZCErHt75gp9m
-O0MPBAcl7KfvkDTbHuMR1oG1Z4RUh52cE5oQietiwHGQIeuWEJ+IGcVcnkoayz4z
-2tQLkdotBhV0mCmkQjyADNn8P4H5yHNsdPq0joqy+2Q=</dsig:SignatureValue>
- <dsig:KeyInfo>
- <dsig:X509Data>
- <dsig:X509Certificate>MIIE4DCCA8igAwIBAgICGEowDQYJKoZIhvcNAQEFBQAwgZcxCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxHjAcBgNVBAsTFWEtc2lnbi1QcmVt
-aXVtLVNpZy0wMTEeMBwGA1UEAxMVYS1zaWduLVByZW1pdW0tU2lnLTAxMB4XDTAz
-MDEyNzEwMTQxM1oXDTA2MDEyNzEwMTQxM1owZDELMAkGA1UEBhMCQVQxGTAXBgNV
-BAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQTCUthcmxpbmdlcjEPMA0GA1UE
-KhMGR3JlZ29yMRUwEwYDVQQFEww5MTM4OTU1NTI5MTEwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBANrnnGN6wiOyq/rskasBf/Tz4grEKI+NBAuDgO5aqObNDBAe
-PISMQ2nFNX2nzoSNx7j7esl4KdgySmJkZWs/nErpE5fB8lHOfrPRD61dodS+Nhwi
-RWlm+I+ua+mOwR18fg/Cwt3YpXZihzZ+ju7eFlxRifHtKJCLOld6IvdFdFCtAgMB
-AAGjggHqMIIB5jATBgNVHSMEDDAKgAhA1/OeG4c6zDA+BggrBgEFBQcBAwEB/wQv
-MC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVICAQACAQAwCgYIKwYBBQUHCwEw
-fQYIKwYBBQUHAQEEcTBvMEIGCCsGAQUFBzAChjZodHRwOi8vd3d3LmEtdHJ1c3Qu
-YXQvY2VydHMvYS1zaWduLVByZW1pdW0tU2lnLTAxYS5jcnQwKQYIKwYBBQUHMAGG
-HWh0dHA6Ly93d3cuYS10cnVzdC5hdDo4Mi9vY3NwME8GA1UdIARIMEYwRAYGKigA
-EQELMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2Nw
-L2Etc2lnbi1QcmVtaXVtMGoGA1UdHwRjMGEwX6BdoFuGWWxkYXA6Ly9sZGFwLmEt
-dHJ1c3QuYXQvb3U9YS1zaWduLVByZW1pdW0tU2lnLTAxLG89QS1UcnVzdCxjPUFU
-P2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/MBEGA1UdDgQKBAhOYExavdLCITAO
-BgNVHQ8BAf8EBAMCBsAwJQYDVR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8u
-Z3YuYXQwCQYDVR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEAL+A2+Z5gQvn6SnZe
-sLvVVVB1crHe7NI/Om2rEwha4PfEk2pV9UdOg7C1XSzRu9jCNXIAuUSIpxTtAoJH
-sCk82S+iuEEgyVaXU/zFcbgT/k7opHXHswEC6ab2SQnyOlugyG+o7e9nRwAQTzzj
-ryICr3KACQcVwCpLKCgsU6gYQL1bi/c5vk4rnDYquSm1U34+xIl77CefZN/peGU4
-26vUzGma30wHBepLX5M+NXT7ILRzRk4i8oyOccIzOMi/iwAODJmgSSMcYjUgAngE
-oGYK9ngWu7Rr1gvy4lvOwpGGRpz2MP3nU9H2IfKk36n6hhVpc3EC6aF02RdIBD+x
-8VxVsA==</dsig:X509Certificate>
- </dsig:X509Data>
- </dsig:KeyInfo>
- <dsig:Object Id="signed-data">Das ist ein Test.</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-08-14T12:53:27Z</etsi:SigningTime>
- <etsi:SigningCertificate>
- <etsi:Cert>
- <etsi:CertDigest>
- <etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <etsi:DigestValue>wl/zuayZxKuYlH2G2FQCTcosSSg=</etsi:DigestValue>
- </etsi:CertDigest>
- <etsi:IssuerSerial>
- <dsig:X509IssuerName>CN=a-sign-Premium-Sig-01,OU=a-sign-Premium-Sig-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>6218</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/plain</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/spss.slinterface/res/resources/stylesheets/moa2sl.xsl b/spss.slinterface/res/resources/stylesheets/moa2sl.xsl
deleted file mode 100644
index 2e3a09655..000000000
--- a/spss.slinterface/res/resources/stylesheets/moa2sl.xsl
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xmlspysamplexml E:\cio\projekte\basismodule\slinterface\res\resources\stylesheets\verifyresponse.moa.xml?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
- <!-- ################################################################################################# -->
- <!-- # Templates -->
- <!-- ################################################################################################# -->
- <!-- =================================================================================================== -->
- <!-- Template für / -->
- <!-- =================================================================================================== -->
- <xsl:template match="/">
- <xsl:apply-templates select="*"/>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template für moa:VerifyXMLSignatureResponse -->
- <!-- =================================================================================================== -->
- <xsl:template match="moa:VerifyXMLSignatureResponse">
- <sl11:VerifyXMLSignatureResponse>
- <xsl:apply-templates select="moa:SignerInfo"/>
- <sl11:SignatureCheck>
- <xsl:call-template name="checkResult">
- <xsl:with-param name="checkElem" select="moa:SignatureCheck"/>
- </xsl:call-template>
- </sl11:SignatureCheck>
- <xsl:if test="./moa:SignatureManifestCheck">
- <sl11:SignatureManifestCheck>
- <xsl:call-template name="checkResult">
- <xsl:with-param name="checkElem" select="moa:SignatureManifestCheck"/>
- </xsl:call-template>
- </sl11:SignatureManifestCheck>
- </xsl:if>
- <xsl:if test="./moa:XMLDSIGManifestCheck">
- <sl11:XMLDSIGManifestCheck>
- <xsl:call-template name="checkResult">
- <xsl:with-param name="checkElem" select="moa:XMLDSIGManifestCheck"/>
- </xsl:call-template>
- </sl11:XMLDSIGManifestCheck>
- </xsl:if>
- <sl11:CertificateCheck>
- <xsl:call-template name="checkResult">
- <xsl:with-param name="checkElem" select="moa:CertificateCheck"/>
- </xsl:call-template>
- </sl11:CertificateCheck>
- </sl11:VerifyXMLSignatureResponse>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template für moa:SignerInfo -->
- <!-- =================================================================================================== -->
- <xsl:template match="moa:SignerInfo">
- <sl11:SignerInfo>
- <xsl:for-each select="*">
- <xsl:choose>
- <xsl:when test="namespace-uri(.) = 'http://reference.e-government.gv.at/namespace/moa/20020822#'">
- <!-- suppress moa elements -->
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="."/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </sl11:SignerInfo>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template für moa:CheckResultType, moa:ReferencesCheckResultType, moa:ManifestRefsCheckResultType -->
- <!-- =================================================================================================== -->
- <xsl:template name="checkResult">
- <xsl:param name="checkElem">default</xsl:param>
- <xsl:param name="checkType">default</xsl:param>
- <sl10:Code>
- <xsl:value-of select="$checkElem/moa:Code/child::node()"/>
- </sl10:Code>
- <sl10:Info>
- <xsl:for-each select="$checkElem/moa:Info/child::node()">
- <xsl:choose>
- <xsl:when test="namespace-uri(.) = 'http://reference.e-government.gv.at/namespace/moa/20020822#'">
- <xsl:choose>
- <xsl:when test="local-name(.) = 'FailedReference'">
- <sl11:FailedReference>
- <xsl:value-of select="./node()"/>
- </sl11:FailedReference>
- </xsl:when>
- <xsl:when test="local-name(.) = 'ReferringSigReference'">
- <sl11:ReferringSigReference>
- <xsl:value-of select="./node()"/>
- </sl11:ReferringSigReference>
- </xsl:when>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="."/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </sl10:Info>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.slinterface/res/resources/stylesheets/simpleVerReq.sl11.xml b/spss.slinterface/res/resources/stylesheets/simpleVerReq.sl11.xml
deleted file mode 100644
index 78180c2c3..000000000
--- a/spss.slinterface/res/resources/stylesheets/simpleVerReq.sl11.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 2 U (http://www.xmlspy.com) by Gregor Karlinger (Bundeskanzleramt) -->
-<sl11:VerifyXMLSignatureRequest xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.buergerkarte.at/namespaces/securitylayer/20020831#
-schemas\Core.20020831.xsd">
- <sl11:SignatureInfo>
- <sl11:SignatureEnvironment>
- <sl10:XMLContent>
- <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>aylv7lNNes2pI022g7zfY1AOUmI=</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>rYJgLYFMHaAcQjIlwSpFqXp5d1A=</dsig:DigestValue>
- </dsig:Reference>
- </dsig:SignedInfo>
- <dsig:SignatureValue>VnwHohi/ootc3mIWh2WnInNvjA+/kJOr5bDRl5no1CMsNA+1qhoVZCErHt75gp9m
-O0MPBAcl7KfvkDTbHuMR1oG1Z4RUh52cE5oQietiwHGQIeuWEJ+IGcVcnkoayz4z
-2tQLkdotBhV0mCmkQjyADNn8P4H5yHNsdPq0joqy+2Q=</dsig:SignatureValue>
- <dsig:KeyInfo>
- <dsig:X509Data>
- <dsig:X509Certificate>MIIE4DCCA8igAwIBAgICGEowDQYJKoZIhvcNAQEFBQAwgZcxCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxHjAcBgNVBAsTFWEtc2lnbi1QcmVt
-aXVtLVNpZy0wMTEeMBwGA1UEAxMVYS1zaWduLVByZW1pdW0tU2lnLTAxMB4XDTAz
-MDEyNzEwMTQxM1oXDTA2MDEyNzEwMTQxM1owZDELMAkGA1UEBhMCQVQxGTAXBgNV
-BAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQTCUthcmxpbmdlcjEPMA0GA1UE
-KhMGR3JlZ29yMRUwEwYDVQQFEww5MTM4OTU1NTI5MTEwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBANrnnGN6wiOyq/rskasBf/Tz4grEKI+NBAuDgO5aqObNDBAe
-PISMQ2nFNX2nzoSNx7j7esl4KdgySmJkZWs/nErpE5fB8lHOfrPRD61dodS+Nhwi
-RWlm+I+ua+mOwR18fg/Cwt3YpXZihzZ+ju7eFlxRifHtKJCLOld6IvdFdFCtAgMB
-AAGjggHqMIIB5jATBgNVHSMEDDAKgAhA1/OeG4c6zDA+BggrBgEFBQcBAwEB/wQv
-MC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVICAQACAQAwCgYIKwYBBQUHCwEw
-fQYIKwYBBQUHAQEEcTBvMEIGCCsGAQUFBzAChjZodHRwOi8vd3d3LmEtdHJ1c3Qu
-YXQvY2VydHMvYS1zaWduLVByZW1pdW0tU2lnLTAxYS5jcnQwKQYIKwYBBQUHMAGG
-HWh0dHA6Ly93d3cuYS10cnVzdC5hdDo4Mi9vY3NwME8GA1UdIARIMEYwRAYGKigA
-EQELMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2Nw
-L2Etc2lnbi1QcmVtaXVtMGoGA1UdHwRjMGEwX6BdoFuGWWxkYXA6Ly9sZGFwLmEt
-dHJ1c3QuYXQvb3U9YS1zaWduLVByZW1pdW0tU2lnLTAxLG89QS1UcnVzdCxjPUFU
-P2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/MBEGA1UdDgQKBAhOYExavdLCITAO
-BgNVHQ8BAf8EBAMCBsAwJQYDVR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8u
-Z3YuYXQwCQYDVR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEAL+A2+Z5gQvn6SnZe
-sLvVVVB1crHe7NI/Om2rEwha4PfEk2pV9UdOg7C1XSzRu9jCNXIAuUSIpxTtAoJH
-sCk82S+iuEEgyVaXU/zFcbgT/k7opHXHswEC6ab2SQnyOlugyG+o7e9nRwAQTzzj
-ryICr3KACQcVwCpLKCgsU6gYQL1bi/c5vk4rnDYquSm1U34+xIl77CefZN/peGU4
-26vUzGma30wHBepLX5M+NXT7ILRzRk4i8oyOccIzOMi/iwAODJmgSSMcYjUgAngE
-oGYK9ngWu7Rr1gvy4lvOwpGGRpz2MP3nU9H2IfKk36n6hhVpc3EC6aF02RdIBD+x
-8VxVsA==</dsig:X509Certificate>
- </dsig:X509Data>
- </dsig:KeyInfo>
- <dsig:Object Id="signed-data">Das ist ein Test.</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-08-14T12:53:27Z</etsi:SigningTime>
- <etsi:SigningCertificate>
- <etsi:Cert>
- <etsi:CertDigest>
- <etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <etsi:DigestValue>wl/zuayZxKuYlH2G2FQCTcosSSg=</etsi:DigestValue>
- </etsi:CertDigest>
- <etsi:IssuerSerial>
- <dsig:X509IssuerName>CN=a-sign-Premium-Sig-01,OU=a-sign-Premium-Sig-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>6218</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/plain</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/spss.slinterface/res/resources/stylesheets/simpleVerReq.sl12.locref.moa.xml b/spss.slinterface/res/resources/stylesheets/simpleVerReq.sl12.locref.moa.xml
deleted file mode 100644
index 65e4f5de2..000000000
--- a/spss.slinterface/res/resources/stylesheets/simpleVerReq.sl12.locref.moa.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><moa:VerifyXMLSignatureRequest xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns:sl12="http://www.buergerkarte.at/namespaces/securitylayer/20031231#"><moa:DateTime>2003-03-24T12:41:54+01:00</moa:DateTime><moa:VerifySignatureInfo><moa:VerifySignatureEnvironment><moa:LocRefContent>http://anywhere.com/signature.xml</moa:LocRefContent></moa:VerifySignatureEnvironment><moa:VerifySignatureLocation>/dsig:Signature</moa:VerifySignatureLocation></moa:VerifySignatureInfo><moa:MetaInfo><moa:MimeType>text/xml</moa:MimeType><moa:Description>description</moa:Description></moa:MetaInfo><moa:Content Reference="supplement.xml"><moa:LocRefContent>http://anywhere.com/supplement.xml</moa:LocRefContent></moa:Content><moa:ReturnHashInputData/><moa:Trustprofile>TrustProfile1</moa:Trustprofile></moa:VerifyXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/stylesheets/simpleVerReq.sl12.locref.xml b/spss.slinterface/res/resources/stylesheets/simpleVerReq.sl12.locref.xml
deleted file mode 100644
index 25194465d..000000000
--- a/spss.slinterface/res/resources/stylesheets/simpleVerReq.sl12.locref.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 2 U (http://www.xmlspy.com) by Gregor Karlinger (Bundeskanzleramt) -->
-<sl12:VerifyXMLSignatureRequest xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl12="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">
- <sl12:DateTime>2003-03-24T12:41:54+01:00</sl12:DateTime>
- <sl12:SignatureInfo>
- <sl12:SignatureEnvironment>
- <sl12:LocRefContent>http://anywhere.com/signature.xml</sl12:LocRefContent>
- </sl12:SignatureEnvironment>
- <sl12:SignatureLocation Test="abc" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/dsig:Signature</sl12:SignatureLocation>
- </sl12:SignatureInfo>
- <sl12:Supplement>
- <sl12:MetaInfo>
- <sl10:MimeType>text/xml</sl10:MimeType>
- <sl10:Description>description</sl10:Description>
- </sl12:MetaInfo>
- <sl12:Content Reference="supplement.xml">
- <sl12:LocRefContent>http://anywhere.com/supplement.xml</sl12:LocRefContent>
- </sl12:Content>
- </sl12:Supplement>
-</sl12:VerifyXMLSignatureRequest>
diff --git a/spss.slinterface/res/resources/stylesheets/sl2moa.xsl b/spss.slinterface/res/resources/stylesheets/sl2moa.xsl
deleted file mode 100644
index a2c43527f..000000000
--- a/spss.slinterface/res/resources/stylesheets/sl2moa.xsl
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xmlspysamplexml E:\cio\projekte\basismodule\slinterface\res\resources\stylesheets\simpleVerReq.sl12.locref.xml?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sl12="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
- <xsl:variable name="trustProfileId">TrustProfile1</xsl:variable>
- <!-- ################################################################################################# -->
- <!-- # Templates -->
- <!-- ################################################################################################# -->
- <!-- =================================================================================================== -->
- <!-- Template für / -->
- <!-- =================================================================================================== -->
- <xsl:template match="/">
- <xsl:apply-templates select="*"/>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template für sl11:VerifyXMLSignatureRequest -->
- <!-- =================================================================================================== -->
- <xsl:template match="sl11:VerifyXMLSignatureRequest">
- <moa:VerifyXMLSignatureRequest>
- <xsl:call-template name="copyNSDeclarations">
- <xsl:with-param name="sourceElem" select="sl11:VerifyXMLSignatureRequest"/>
- </xsl:call-template>
- <xsl:apply-templates select="sl11:DateTime"/>
- <xsl:apply-templates select="sl11:SignatureInfo"/>
- <xsl:apply-templates select="sl11:Supplement"/>
- <moa:ReturnHashInputData/>
- <moa:TrustProfileID>
- <xsl:copy-of select="$trustProfileId"/>
- </moa:TrustProfileID>
- </moa:VerifyXMLSignatureRequest>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template für sl12:VerifyXMLSignatureRequest -->
- <!-- =================================================================================================== -->
- <xsl:template match="sl12:VerifyXMLSignatureRequest">
- <moa:VerifyXMLSignatureRequest>
- <xsl:call-template name="copyNSDeclarations">
- <xsl:with-param name="sourceElem" select="sl12:VerifyXMLSignatureRequest"/>
- </xsl:call-template>
- <xsl:apply-templates select="sl12:DateTime"/>
- <xsl:apply-templates select="sl12:SignatureInfo"/>
- <xsl:apply-templates select="sl12:Supplement"/>
- <moa:ReturnHashInputData/>
- <moa:Trustprofile>
- <xsl:copy-of select="$trustProfileId"/>
- </moa:Trustprofile>
- </moa:VerifyXMLSignatureRequest>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template für sl11:DateTime -->
- <!-- =================================================================================================== -->
- <xsl:template match="sl11:DateTime">
- <moa:DateTime>
- <xsl:value-of select="."/>
- </moa:DateTime>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template für sl12:DateTime -->
- <!-- =================================================================================================== -->
- <xsl:template match="sl12:DateTime">
- <moa:DateTime>
- <xsl:value-of select="."/>
- </moa:DateTime>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template for sl11:SignatureInfo -->
- <!-- =================================================================================================== -->
- <xsl:template match="sl11:SignatureInfo">
- <moa:VerifySignatureInfo>
- <moa:VerifySignatureEnvironment>
- <xsl:call-template name="content10">
- <xsl:with-param name="contentElem" select="sl11:SignatureEnvironment"/>
- </xsl:call-template>
- </moa:VerifySignatureEnvironment>
- <moa:VerifySignatureLocation xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <!-- Explicit namespace decl xmlns:dsig above is a workaround since damn Xalan does not correctly copy the namespace declarations -->
- <xsl:call-template name="copyNSDeclarations">
- <xsl:with-param name="sourceElem" select="./sl11:SignatureLocation"/>
- </xsl:call-template>
- <xsl:value-of select="sl11:SignatureLocation/node()"/>
- </moa:VerifySignatureLocation>
- </moa:VerifySignatureInfo>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template for sl12:SignatureInfo -->
- <!-- =================================================================================================== -->
- <xsl:template match="sl12:SignatureInfo">
- <moa:VerifySignatureInfo>
- <moa:VerifySignatureEnvironment>
- <xsl:call-template name="content12">
- <xsl:with-param name="contentElem" select="sl12:SignatureEnvironment"/>
- </xsl:call-template>
- </moa:VerifySignatureEnvironment>
- <moa:VerifySignatureLocation xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <!-- Explicit namespace decl xmlns:dsig above is a workaround since damn Xalan does not correctly copy the namespace declarations -->
- <xsl:call-template name="copyNSDeclarations">
- <xsl:with-param name="sourceElem" select="./sl12:SignatureLocation"/>
- </xsl:call-template>
- <xsl:value-of select="sl12:SignatureLocation/node()"/>
- </moa:VerifySignatureLocation>
- </moa:VerifySignatureInfo>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template for sl11:Supplement -->
- <!-- =================================================================================================== -->
- <xsl:template match="sl11:Supplement">
- <xsl:if test="sl10:MetaInfo">
- <moa:MetaInfo>
- <xsl:call-template name="metaInfo">
- <xsl:with-param name="metaInfoElem" select="sl10:MetaInfo"/>
- </xsl:call-template>
- </moa:MetaInfo>
- </xsl:if>
- <moa:Content>
- <xsl:call-template name="content10">
- <xsl:with-param name="contentElem" select="sl10:Content"/>
- </xsl:call-template>
- </moa:Content>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template for sl12:Supplement -->
- <!-- =================================================================================================== -->
- <xsl:template match="sl12:Supplement">
- <xsl:if test="sl12:MetaInfo">
- <moa:MetaInfo>
- <xsl:call-template name="metaInfo">
- <xsl:with-param name="metaInfoElem" select="sl12:MetaInfo"/>
- </xsl:call-template>
- </moa:MetaInfo>
- </xsl:if>
- <moa:Content>
- <xsl:call-template name="content12">
- <xsl:with-param name="contentElem" select="sl12:Content"/>
- </xsl:call-template>
- </moa:Content>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template for sl10:ContentOptionalRefType and sl10:ContentRequiredRefType -->
- <!-- =================================================================================================== -->
- <xsl:template name="content10">
- <xsl:param name="contentElem">default</xsl:param>
- <xsl:if test="$contentElem/@Reference">
- <xsl:attribute name="Reference"><xsl:value-of select="$contentElem/@Reference"/></xsl:attribute>
- </xsl:if>
- <xsl:choose>
- <xsl:when test="$contentElem/sl10:Base64Content">
- <moa:Base64Content>
- <xsl:value-of select="$contentElem/sl10:Base64Content/node()"/>
- </moa:Base64Content>
- </xsl:when>
- <xsl:otherwise>
- <moa:XMLContent>
- <xsl:if test="$contentElem/sl10:XMLContent/@xml:space">
- <xsl:attribute name="xml:space"><xsl:value-of select="$contentElem/sl10:XMLContent/@xml:space"/></xsl:attribute>
- </xsl:if>
- <xsl:copy-of select="$contentElem/sl10:XMLContent/node()"/>
- </moa:XMLContent>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template for sl12:ContentOptionalRefType and sl12:ContentRequiredRefType -->
- <!-- =================================================================================================== -->
- <xsl:template name="content12">
- <xsl:param name="contentElem">default</xsl:param>
- <xsl:if test="$contentElem/@Reference">
- <xsl:attribute name="Reference"><xsl:value-of select="$contentElem/@Reference"/></xsl:attribute>
- </xsl:if>
- <xsl:choose>
- <xsl:when test="$contentElem/sl12:Base64Content">
- <moa:Base64Content>
- <xsl:value-of select="$contentElem/sl12:Base64Content/node()"/>
- </moa:Base64Content>
- </xsl:when>
- <xsl:when test="$contentElem/sl12:LocRefContent">
- <moa:LocRefContent>
- <xsl:value-of select="$contentElem/sl12:LocRefContent/node()"/>
- </moa:LocRefContent>
- </xsl:when>
- <xsl:otherwise>
- <moa:XMLContent>
- <xsl:if test="$contentElem/sl12:XMLContent/@xml:space">
- <xsl:attribute name="xml:space"><xsl:value-of select="$contentElem/sl12:XMLContent/@xml:space"/></xsl:attribute>
- </xsl:if>
- <xsl:copy-of select="$contentElem/sl12:XMLContent/node()"/>
- </moa:XMLContent>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template for sl10:MetaInfoType -->
- <!-- =================================================================================================== -->
- <xsl:template name="metaInfo">
- <xsl:param name="metaInfoElem">default</xsl:param>
- <moa:MimeType>
- <xsl:value-of select="$metaInfoElem/sl10:MimeType/node()"/>
- </moa:MimeType>
- <xsl:if test="$metaInfoElem/sl10:Description">
- <moa:Description>
- <xsl:value-of select="$metaInfoElem/sl10:Description/node()"/>
- </moa:Description>
- </xsl:if>
- <xsl:if test="$metaInfoElem/*[not(self::sl10:MimeType or self::sl10:Description)]">
- <xsl:copy-of select="$metaInfoElem/*[not(self::sl10:MimeType or self::sl10:Description)]"/>
- </xsl:if>
- </xsl:template>
- <!-- =================================================================================================== -->
- <!-- Template for copying all namespace declarations of an element -->
- <!-- =================================================================================================== -->
- <xsl:template name="copyNSDeclarations">
- <xsl:param name="sourceElem">default</xsl:param>
- <xsl:for-each select="$sourceElem/namespace::*">
- <xsl:variable name="currentNodeName" select="name(.)"/>
- <xsl:variable name="currentNodeValue" select="string(.)"/>
- <xsl:attribute name="xmlns:{$currentNodeName}"><xsl:copy-of select="$currentNodeValue"></xsl:copy-of></xsl:attribute>
- </xsl:for-each>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.slinterface/res/resources/stylesheets/verifyresponse.moa.sl.xml b/spss.slinterface/res/resources/stylesheets/verifyresponse.moa.sl.xml
deleted file mode 100644
index 8033f8dae..000000000
--- a/spss.slinterface/res/resources/stylesheets/verifyresponse.moa.sl.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><sl11:VerifyXMLSignatureResponse xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#"><sl11:SignerInfo><dsig:X509Data xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></sl11:SignerInfo><sl11:SignatureCheck><sl10:Code>1</sl10:Code><sl10:Info>
- Text1<sl11:FailedReference>0</sl11:FailedReference>Text2<sl11:FailedReference>1</sl11:FailedReference></sl10:Info></sl11:SignatureCheck><sl11:SignatureManifestCheck><sl10:Code>2</sl10:Code><sl10:Info>
- Text1<sl11:FailedReference>0</sl11:FailedReference>Text2<sl11:FailedReference>1</sl11:FailedReference></sl10:Info></sl11:SignatureManifestCheck><sl11:XMLDSIGManifestCheck><sl10:Code>2</sl10:Code><sl10:Info>
- Text1<sl11:FailedReference>0</sl11:FailedReference>Text2<sl11:FailedReference>1</sl11:FailedReference>
- Text3<sl11:ReferringSigReference>1</sl11:ReferringSigReference></sl10:Info></sl11:XMLDSIGManifestCheck><sl11:CertificateCheck><sl10:Code>3</sl10:Code><sl10:Info>Text</sl10:Info></sl11:CertificateCheck></sl11:VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/stylesheets/verifyresponse.moa.xml b/spss.slinterface/res/resources/stylesheets/verifyresponse.moa.xml
deleted file mode 100644
index d591997ed..000000000
--- a/spss.slinterface/res/resources/stylesheets/verifyresponse.moa.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo>
- <SignatureCheck>
- <Code>1</Code>
- <Info>
- Text1<FailedReference>0</FailedReference>Text2<FailedReference>1</FailedReference>
- </Info>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>2</Code>
- <Info>
- Text1<FailedReference>0</FailedReference>Text2<FailedReference>1</FailedReference>
- </Info>
- </SignatureManifestCheck>
- <XMLDSIGManifestCheck>
- <Code>2</Code>
- <Info>
- Text1<FailedReference>0</FailedReference>Text2<FailedReference>1</FailedReference>
- Text3<ReferringSigReference>1</ReferringSigReference>
- </Info>
- </XMLDSIGManifestCheck>
- <CertificateCheck>
- <Code>3</Code>
- <Info>Text</Info>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/test.xml b/spss.slinterface/res/resources/test.xml
deleted file mode 100644
index a2f6a0740..000000000
--- a/spss.slinterface/res/resources/test.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Test>Inhalt</Test>
diff --git a/spss.slinterface/res/resources/test.xsl b/spss.slinterface/res/resources/test.xsl
deleted file mode 100644
index 6bb618072..000000000
--- a/spss.slinterface/res/resources/test.xsl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xmlspysamplexml e:\cio\projekte\basismodule\slinterface\res\resources\test.xml?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
- <xsl:template match="/">
- <xsl:call-template name="test">
- <xsl:with-param name="param1">hugo</xsl:with-param>
- </xsl:call-template>
- </xsl:template>
- <xsl:template name="test">
- <xsl:param name="param1">ursl</xsl:param>
- <Ergebnis attri="{$param1}"></Ergebnis>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.slinterface/test/forms/simpleForm.html b/spss.slinterface/test/forms/simpleForm.html
deleted file mode 100644
index 120fa8073..000000000
--- a/spss.slinterface/test/forms/simpleForm.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <title>Securitylayer Requests</title>
-
-</head>
- <body>
-<h1>Securitykapsel - HTTP-Bindung</h1>
-<form action="http://localhost:8080/moa-spss-sl/http-security-layer-request" method="post">
-<p>
-XMLRequest: <textarea name="XMLRequest" cols=80 rows=20></textarea>
-<p>
-<!--
-RedirectURL: <input name="RedirectURL" value="" size=70>
-http://stud.fbi.fh-darmstadt.de/~adams/mathe/poesie.html#bit
-<p>-->
-DataURL: <input name="DataURL" value="http://default.url" size=70/>
-<p>
-<!--StylesheetURL: <input name="StylesheetURL" value="" size=70>
-http://localhost/securitylayer.xsl-->
-<p>
-<input type="submit">
-</form>
-</body>
-</html>
diff --git a/spss.slinterface/test/slrequests/simpleVerReq.xml b/spss.slinterface/test/slrequests/simpleVerReq.xml
deleted file mode 100644
index fdc1daec9..000000000
--- a/spss.slinterface/test/slrequests/simpleVerReq.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl11:VerifyXMLSignatureRequest xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <sl11:SignatureInfo>
- <sl11:SignatureEnvironment>
- <sl10:XMLContent>
-<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>aylv7lNNes2pI022g7zfY1AOUmI=</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>rYJgLYFMHaAcQjIlwSpFqXp5d1A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VnwHohi/ootc3mIWh2WnInNvjA+/kJOr5bDRl5no1CMsNA+1qhoVZCErHt75gp9m
-O0MPBAcl7KfvkDTbHuMR1oG1Z4RUh52cE5oQietiwHGQIeuWEJ+IGcVcnkoayz4z
-2tQLkdotBhV0mCmkQjyADNn8P4H5yHNsdPq0joqy+2Q=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIE4DCCA8igAwIBAgICGEowDQYJKoZIhvcNAQEFBQAwgZcxCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxHjAcBgNVBAsTFWEtc2lnbi1QcmVt
-aXVtLVNpZy0wMTEeMBwGA1UEAxMVYS1zaWduLVByZW1pdW0tU2lnLTAxMB4XDTAz
-MDEyNzEwMTQxM1oXDTA2MDEyNzEwMTQxM1owZDELMAkGA1UEBhMCQVQxGTAXBgNV
-BAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQTCUthcmxpbmdlcjEPMA0GA1UE
-KhMGR3JlZ29yMRUwEwYDVQQFEww5MTM4OTU1NTI5MTEwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBANrnnGN6wiOyq/rskasBf/Tz4grEKI+NBAuDgO5aqObNDBAe
-PISMQ2nFNX2nzoSNx7j7esl4KdgySmJkZWs/nErpE5fB8lHOfrPRD61dodS+Nhwi
-RWlm+I+ua+mOwR18fg/Cwt3YpXZihzZ+ju7eFlxRifHtKJCLOld6IvdFdFCtAgMB
-AAGjggHqMIIB5jATBgNVHSMEDDAKgAhA1/OeG4c6zDA+BggrBgEFBQcBAwEB/wQv
-MC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVICAQACAQAwCgYIKwYBBQUHCwEw
-fQYIKwYBBQUHAQEEcTBvMEIGCCsGAQUFBzAChjZodHRwOi8vd3d3LmEtdHJ1c3Qu
-YXQvY2VydHMvYS1zaWduLVByZW1pdW0tU2lnLTAxYS5jcnQwKQYIKwYBBQUHMAGG
-HWh0dHA6Ly93d3cuYS10cnVzdC5hdDo4Mi9vY3NwME8GA1UdIARIMEYwRAYGKigA
-EQELMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2Nw
-L2Etc2lnbi1QcmVtaXVtMGoGA1UdHwRjMGEwX6BdoFuGWWxkYXA6Ly9sZGFwLmEt
-dHJ1c3QuYXQvb3U9YS1zaWduLVByZW1pdW0tU2lnLTAxLG89QS1UcnVzdCxjPUFU
-P2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/MBEGA1UdDgQKBAhOYExavdLCITAO
-BgNVHQ8BAf8EBAMCBsAwJQYDVR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8u
-Z3YuYXQwCQYDVR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEAL+A2+Z5gQvn6SnZe
-sLvVVVB1crHe7NI/Om2rEwha4PfEk2pV9UdOg7C1XSzRu9jCNXIAuUSIpxTtAoJH
-sCk82S+iuEEgyVaXU/zFcbgT/k7opHXHswEC6ab2SQnyOlugyG+o7e9nRwAQTzzj
-ryICr3KACQcVwCpLKCgsU6gYQL1bi/c5vk4rnDYquSm1U34+xIl77CefZN/peGU4
-26vUzGma30wHBepLX5M+NXT7ILRzRk4i8oyOccIzOMi/iwAODJmgSSMcYjUgAngE
-oGYK9ngWu7Rr1gvy4lvOwpGGRpz2MP3nU9H2IfKk36n6hhVpc3EC6aF02RdIBD+x
-8VxVsA==</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data">Das ist ein Test.</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-08-14T12:53:27Z</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>wl/zuayZxKuYlH2G2FQCTcosSSg=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=a-sign-Premium-Sig-01,OU=a-sign-Premium-Sig-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>6218</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/plain</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/spss.test/.classpath b/spss.test/.classpath
deleted file mode 100644
index 6c3fe75b5..000000000
--- a/spss.test/.classpath
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="resources"/>
- <classpathentry kind="lib" path="lib/jaxen-1.0/jaxen-dom.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.0/wsdl4j.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/signed/iaik_ecc.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.0/jaxrpc.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.0/axis.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaikPkcs11Provider.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/ixsil.jar"/>
- <classpathentry kind="lib" path="lib/jsse-1.0.3_01/jnet.jar"/>
- <classpathentry kind="lib" path="lib/jaxp-1.2_01/jaxp-api.jar"/>
- <classpathentry kind="lib" path="lib/commons-discovery-0.2/commons-discovery.jar"/>
- <classpathentry kind="lib" path="lib/jaxp-1.2_01/sax.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik-moa-full.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik_jce_full.jar"/>
- <classpathentry kind="lib" path="lib/xerces-j-2.0.2/xmlParserAPIs.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/signed/iaikPkcs11Provider_signed.jar"/>
- <classpathentry kind="lib" path="lib/xalan-j-2.2/xalan.jar"/>
- <classpathentry kind="lib" path="lib/xerces-j-2.0.2/xercesImpl.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik_ecc.jar"/>
- <classpathentry kind="lib" path="lib/jsse-1.0.3_01/jcert.jar"/>
- <classpathentry kind="lib" path="lib/jaxen-1.0/saxpath.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.0/saaj.jar"/>
- <classpathentry kind="lib" path="lib/jaxen-1.0/jaxen-core.jar"/>
- <classpathentry kind="lib" path="lib/SignatureAlgorithmImplECDSA.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/signed/iaik_jce_full.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik_cms.jar"/>
- <classpathentry kind="lib" path="lib/xalan-j-2.2/bsf.jar"/>
- <classpathentry kind="lib" path="lib/jsse-1.0.3_01/jsse.jar"/>
- <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaikPkcs11Wrapper.jar"/>
- <classpathentry kind="lib" path="lib/jaxp-1.2_01/dom.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JRE 1.3.1-09"/>
- <classpathentry kind="src" path="/MOA common"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/spss.test/.project b/spss.test/.project
deleted file mode 100644
index c64902805..000000000
--- a/spss.test/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>MOA spss.test</name>
- <comment></comment>
- <projects>
- <project>MOA common</project>
- </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/spss.test/Definitionen/Testfalldokumentation.doc b/spss.test/Definitionen/Testfalldokumentation.doc
deleted file mode 100644
index 4bf44403d..000000000
--- a/spss.test/Definitionen/Testfalldokumentation.doc
+++ /dev/null
Binary files differ
diff --git a/spss.test/data/CX0/TestGeneratorCX0.001.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.001.Req.xml
deleted file mode 100644
index 7ffb7cd3b..000000000
--- a/spss.test/data/CX0/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#">
- <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/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/spss.test/data/CX0/TestGeneratorCX0.001.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.001.Res.xml
deleted file mode 100644
index 9a8337324..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.001.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>gBB3qVsHcXriR5DRnqpoAtGSZozMUEprBtbt/pusEylilSrndPufeDaaCm8PtbUe
-c0ezEu7/xLJPc5qC/cqv0B3f0RDR2RPCSfZNu/vcc8YddLdgy+p+cDOEneXPUEOa
-FKkqvEmIJBGWsG/UbNobP6J1YFLeM3Wjbn+cUstfgVY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.002.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.002.Req.xml
deleted file mode 100644
index 7e8d820b4..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.002.Req.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><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="http://localhost:8080/moa-spss-testdata/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/spss.test/data/CX0/TestGeneratorCX0.002.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.002.Res.xml
deleted file mode 100644
index 9a8337324..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.002.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>gBB3qVsHcXriR5DRnqpoAtGSZozMUEprBtbt/pusEylilSrndPufeDaaCm8PtbUe
-c0ezEu7/xLJPc5qC/cqv0B3f0RDR2RPCSfZNu/vcc8YddLdgy+p+cDOEneXPUEOa
-FKkqvEmIJBGWsG/UbNobP6J1YFLeM3Wjbn+cUstfgVY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.003.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.003.Req.xml
deleted file mode 100644
index 94e7bec34..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.003.Req.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?><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="http://localhost:8080/moa-spss-testdata/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/spss.test/data/CX0/TestGeneratorCX0.003.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.003.Res.xml
deleted file mode 100644
index 9a8337324..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.003.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>gBB3qVsHcXriR5DRnqpoAtGSZozMUEprBtbt/pusEylilSrndPufeDaaCm8PtbUe
-c0ezEu7/xLJPc5qC/cqv0B3f0RDR2RPCSfZNu/vcc8YddLdgy+p+cDOEneXPUEOa
-FKkqvEmIJBGWsG/UbNobP6J1YFLeM3Wjbn+cUstfgVY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.005.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.005.Req.xml
deleted file mode 100644
index cfafd656c..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.005.Req.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?><CreateXMLSignatureRequest
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" >
- <KeyIdentifier>PKCS12ECDSAKey1</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.005.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.005.Res.xml
deleted file mode 100644
index 7005d6301..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.005.Res.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.buergerkarte.at/namespaces/ecdsa/200206030#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>IIqg3cRu7AnmCogBykcFk5vEj9LGtkpEPsn9ZP9hPh80/U/VoP/jyNToyyusilbx</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIICGDCCAdCgAwIBAgIDAQpMMAkGByqGSM49BAEwTTELMAkGA1UEBhMCQVQxDTAL
-BgNVBAoTBElBSUsxFTATBgNVBAsTDEphdmFTZWN1cml0eTEYMBYGA1UEAxMPSUFJ
-SyBFQ0RTQSBUZXN0MB4XDTAzMDIxMDA5NDgwN1oXDTA0MDIxMDA5NDgwN1owTTEL
-MAkGA1UEBhMCQVQxDTALBgNVBAoTBElBSUsxFTATBgNVBAsTDEphdmFTZWN1cml0
-eTEYMBYGA1UEAxMPSUFJSyBFQ0RTQSBUZXN0MIHrMIG0BgcqhkjOPQIBMIGoAgEB
-MB0GByqGSM49AQIwEgICAL8GCSqGSM49AQIDAgIBCTA0BBgoZlN7Z2dSY2po9WVU
-4SZAJ2tknvdSYmcEGC5F71cfAHhvZ7AIG5SVo9lUYvXeCqGF7AQxBDaz2viiMgb5
-xPKZ17IanDaRN/LISuGqDXZb5zQzs/leMyky5w6iRcokGOoO+YAY+wIYQAAAAAAA
-AAAAAAAABKIOkMOQZ8iTu7mlAgECAzIABFh+sRJVup8mJdsDqlk2w1Cer2qkFxJU
-7VeLKaB6z8+W/jN6fPrc2u8MYJCZlL7T0aMNMAswCQYDVR0TBAIwADAJBgcqhkjO
-PQQBAzcAMDQCGBjRkQdnZmCv4mLwj72JBSFW1b0DIYvXXAIYILVW1F8IHAldw56h
-C3FJH2VuOdON4tia</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.007.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.007.Req.xml
deleted file mode 100644
index 01ea3bcc2..000000000
--- a/spss.test/data/CX0/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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt">
- <XMLContent xml:space="preserve">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/spss.test/data/CX0/TestGeneratorCX0.007.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.007.Res.xml
deleted file mode 100644
index ddfdf07c2..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.007.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>KNSjqcRkcNASW4brqj5mgkxMRu8Wv0suTrvjmw7JyVHrsWQvPyTMjw9B0t7/ih5i
-DcgUAByQ++ijk/v+xnBePrTi5DVbyqAwWbnehMNGX1Un/ZhxVajbSKHxwjaU1loX
-cTH5w5m9goN7w7DN5o9vEbIoHkQpTDiGhp2zXvHHIaA=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.008.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.008.Req.xml
deleted file mode 100644
index 543c28ad0..000000000
--- a/spss.test/data/CX0/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="http://localhost:8080/moa-spss-testdata/resources/testSimple.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/spss.test/data/CX0/TestGeneratorCX0.008.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.008.Res.xml
deleted file mode 100644
index ddfdf07c2..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.008.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>KNSjqcRkcNASW4brqj5mgkxMRu8Wv0suTrvjmw7JyVHrsWQvPyTMjw9B0t7/ih5i
-DcgUAByQ++ijk/v+xnBePrTi5DVbyqAwWbnehMNGX1Un/ZhxVajbSKHxwjaU1loX
-cTH5w5m9goN7w7DN5o9vEbIoHkQpTDiGhp2zXvHHIaA=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.009.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.009.Req.xml
deleted file mode 100644
index 3645b9586..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.009.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#" >
- <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.009.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.009.Res.xml
deleted file mode 100644
index f2373768c..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.009.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id('signed-data-1-1-1')/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>BZcl/8GN5YI1fRFkTmv3YVstrVtFS5XquQoylfkXya4KsNRrhW8Sd0go+JxfbbaQ
-FP671mer7rlj42zYxgAB1rfr0zogy9gkSf69GftRdHH1z5w79lGgzQga5PbY7d24
-AKt/oETiJcGFH0C3XVWxOIZdK9z4jMrMvkAoEVJ06G4=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="signed-data-1-1-1">RGllcyBzaW5kIFRlc3RkYXRlbg==</dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.010.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.010.Req.xml
deleted file mode 100644
index 6fba03be0..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.010.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="enveloping" ChildOfManifest="false">
- <DataObject>
- <XMLContent xml:space="preserve"><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/spss.test/data/CX0/TestGeneratorCX0.010.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.010.Res.xml
deleted file mode 100644
index 8bc88b7e4..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.010.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id('signed-data-1-1-1')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>od5SQWC03fSOGu+CecxOpTv8FgA=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>xVA56wR2JvvMfULvvMbNSIqrJO8A5WOzkEYF72TLq80Oz3pGfD3VR3RpBBu+pfEi
-W+cEB3rPMxDdrkQwcxiCr6P7SeefXmOzj2LNFSs16TBEJoCRNELCVb1g7AOmlAuO
-LRSWsJlINrDoMWvxtmFI1oAhKWyphZSZRM/A2YXaMyM=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="signed-data-1-1-1"><Testdaten>Dies sind Testdaten</Testdaten></dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.011.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.011.Req.xml
deleted file mode 100644
index 6ea1a4799..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.011.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="enveloping" ChildOfManifest="false">
- <DataObject>
- <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/spss.test/data/CX0/TestGeneratorCX0.011.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.011.Res.xml
deleted file mode 100644
index f2373768c..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.011.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id('signed-data-1-1-1')/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>BZcl/8GN5YI1fRFkTmv3YVstrVtFS5XquQoylfkXya4KsNRrhW8Sd0go+JxfbbaQ
-FP671mer7rlj42zYxgAB1rfr0zogy9gkSf69GftRdHH1z5w79lGgzQga5PbY7d24
-AKt/oETiJcGFH0C3XVWxOIZdK9z4jMrMvkAoEVJ06G4=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="signed-data-1-1-1">RGllcyBzaW5kIFRlc3RkYXRlbg==</dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.012.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.012.Req.xml
deleted file mode 100644
index f7b82c65a..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.012.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" >
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt">
- <XMLContent xml:space="preserve">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/spss.test/data/CX0/TestGeneratorCX0.012.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.012.Res.xml
deleted file mode 100644
index ddfdf07c2..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.012.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>KNSjqcRkcNASW4brqj5mgkxMRu8Wv0suTrvjmw7JyVHrsWQvPyTMjw9B0t7/ih5i
-DcgUAByQ++ijk/v+xnBePrTi5DVbyqAwWbnehMNGX1Un/ZhxVajbSKHxwjaU1loX
-cTH5w5m9goN7w7DN5o9vEbIoHkQpTDiGhp2zXvHHIaA=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.013.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.013.Req.xml
deleted file mode 100644
index 7a82a48be..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.013.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#" >
- <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="true">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/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/spss.test/data/CX0/TestGeneratorCX0.013.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.013.Res.xml
deleted file mode 100644
index 48ccba2b2..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.013.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>dGNOIZnPdyscRdAsjM9zJUGORGg=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>yZ6KYqGZj/AhzuOpqHgzQtSeVhwLI0tBbVoztu+vdQ7eEh+IGO5/0/Q8bV3GKcWx
-adQ0MoN4hE++t0lY6kaUOg8Kp/qt3vepgtqivgGZvtZIXsvb5ENU6MLxlSyUD8Wn
-gkTe8sEd+7F61BHPKaNFT7Vd57OytcCvm2YnUOJSKPk=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.014.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.014.Req.xml
deleted file mode 100644
index dcb54f8b3..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.014.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#" >
- <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="true">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testUTF8.txt" />
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.014.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.014.Res.xml
deleted file mode 100644
index f24108481..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.014.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testUTF8.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+WMzUGbzSA35sXMMEes2VLiG7jU=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-signed-1-1')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bnFGv3/eK1vVnk1rq7WLXyNReps=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>1exWa5rr1K9NhNzIBVLlEAa8YR4vBkULm6F8h+UNJ5UFUi4kydNfPMhjtVJ5Y1xl
-rtFoidU2fyMCSIMmObNCscv+eBECWyoohVdv0ZV/ZQLe1nQCB95yWFqprpHEiA2v
-sJpk/6cOOreypueftxo/TySboyWtAAIcARs27isTn1A=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-05-10T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>text/plain</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.015.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.015.Req.xml
deleted file mode 100644
index f4ce69b27..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.015.Req.xml
+++ /dev/null
@@ -1,27 +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">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <DataObjectInfo Structure="detached">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.015.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.015.Res.xml
deleted file mode 100644
index aa01f5fc3..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.015.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-2" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>5UITYnwdTD4/aJoGU83mr4gIO/aJfmV8u3kYnNSuBghvQg6j7ERujItgx7VLVH09
-wCTZgfIJKkyZXvxDPQtpRsRQ53k387Zu0E72Y59ooTEYQsZ6Lw9aDMgqpnbB4VNt
-y04f2jgUnR+OtKUVNFMD0jOPNEPTDEDSPT8oyl3pKio=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.016.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.016.Req.xml
deleted file mode 100644
index 75e49a917..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.016.Req.xml
+++ /dev/null
@@ -1,31 +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="enveloping">
- <DataObject>
- <XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <DataObjectInfo Structure="enveloping">
- <DataObject>
- <XMLContent xml:space="preserve">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/spss.test/data/CX0/TestGeneratorCX0.016.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.016.Res.xml
deleted file mode 100644
index 369229118..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.016.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id('signed-data-1-1-1')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-2" URI="#xpointer(id('signed-data-1-2-1')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>G7aYovXJcXMF32DLByHNOdbvPJObYqCaIKAWoAftRFuJ4IgY8x5dJNp9YGHcFqb1
-E0KNqn6eqw7sIz9QILJYHEfNQwhlJf9+RBFGgFnr8PfFiQXciK5ylwSVKXwmtDAs
-SuWZ0W+UFFGg6W6vm2L9n88pG9KoyevzmYYtq3kj/F0=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="signed-data-1-1-1">Dies sind Testdaten</dsig:Object><dsig:Object Id="signed-data-1-2-1">Dies sind Testdaten</dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.017.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.017.Req.xml
deleted file mode 100644
index 705d8863b..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.017.Req.xml
+++ /dev/null
@@ -1,29 +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">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <DataObjectInfo Structure="enveloping">
- <DataObject>
- <XMLContent xml:space="preserve">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/spss.test/data/CX0/TestGeneratorCX0.017.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.017.Res.xml
deleted file mode 100644
index fc691dba0..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.017.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-2" URI="#xpointer(id('signed-data-1-2-1')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>cTj3gR4sBAwk9HkvwS4f3lmpMW7IoEIfZsXtXHAwjglTGM76Mb+yKSkMWX1UUAiQ
-Xp7n9Sig2V6N//pUDoatpjIzak4xntZHOU0wXX5a9hVU8rg9PvS6MXgMFfwMJ4QA
-VCMYpYRFq0qQwxMr8U2jqnitCy6kmnTPH6zXz323T5I=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="signed-data-1-2-1">Dies sind Testdaten</dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.018.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.018.Req.xml
deleted file mode 100644
index 8b1cffbda..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.018.Req.xml
+++ /dev/null
@@ -1,29 +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">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/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/spss.test/data/CX0/TestGeneratorCX0.018.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.018.Res.xml
deleted file mode 100644
index b5940bf18..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.018.Res.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>gBB3qVsHcXriR5DRnqpoAtGSZozMUEprBtbt/pusEylilSrndPufeDaaCm8PtbUe
-c0ezEu7/xLJPc5qC/cqv0B3f0RDR2RPCSfZNu/vcc8YddLdgy+p+cDOEneXPUEOa
-FKkqvEmIJBGWsG/UbNobP6J1YFLeM3Wjbn+cUstfgVY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment><SignatureEnvironment><dsig:Signature Id="signature-2-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-2-1" URI="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>x7QxfhPTLmWw0XAC0eyZLKbVXuNDqS11Yf97x2ADFQVYAEfx8L8RHDCIHwFL3Dx8
-tXTunXlPj0G+4eIWie0c8A5Q5rIukYaO4iCyRFOq6BcEWmdBC7Q43K/IYE09sj/y
-wTLizreXSFe/n9xjlaCsfPVokzI1k80AakMVXXcalZk=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.019.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.019.Req.xml
deleted file mode 100644
index 6630363ea..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.019.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#" >
- <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testXML.txt"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/xml</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.019.Res.xml b/spss.test/data/CX0/TestGeneratorCX0.019.Res.xml
deleted file mode 100644
index 0d0ae0805..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.019.Res.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id('signed-data-1-1-1')/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Z9Rr4wyNUP2Pe0sBdLz447sJt8o=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>0E3/PZv+Kw2L9Hwmgr7CQgVLdOx+VtogRrAFgLoloFAwcbnRNf3VnEiMjrcT0jSy
-sVyBwzD4T1tFwgzT23tStJa7eXdnLt7jbYGsiRiX6EyyXrSpXgij0s3tgplhw57p
-7UYGNiNzyFJ1+Za71l5DN8SauVG0YLRz1bvms3l6ujM=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="signed-data-1-1-1">PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxIdWdvPg0K&#13;
-CVRlc3QNCjwvSHVnbz4=</dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.051.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.051.ErrRes.xml
deleted file mode 100644
index 5b2b55035..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.051.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1100 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.051.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.051.Req.xml
deleted file mode 100644
index 3f30d232f..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.051.Req.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><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="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- <SuperExtraElementThatShouldNotBeValidWithTheSchema/>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.052.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.052.ErrRes.xml
deleted file mode 100644
index af2e09a3e..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.052.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-0000 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.052.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.052.Req.xml
deleted file mode 100644
index 2b35846c0..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.052.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml encoding="ISO-8859-1"?><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="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt">
- <!-- Hint -->
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.053.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.053.ErrRes.xml
deleted file mode 100644
index af2e09a3e..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.053.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-0000 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.053.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.053.Req.xml
deleted file mode 100644
index 7f819ccc8..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.053.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="5.0alpha3" encoding="ISO-8859-1"?><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="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt">
- <!-- Hint -->
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.054.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.054.ErrRes.xml
deleted file mode 100644
index af2e09a3e..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.054.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-0000 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.054.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.054.Req.xml
deleted file mode 100644
index e1024af59..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.054.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="SuperSvenEncoding:)"?><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="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt">
- <!-- Hint -->
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.055.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.055.ErrRes.xml
deleted file mode 100644
index 5b2b55035..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.055.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1100 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.055.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.055.Req.xml
deleted file mode 100644
index e7bc6bb3c..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.055.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><CreateXMLSignatureRequest
- xmlns="http://www.w3.org/2000/09/svens_schema#"
- xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt">
- <!-- Hint -->
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.056.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.056.ErrRes.xml
deleted file mode 100644
index 2416c2c45..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.056.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2231 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.056.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.056.Req.xml
deleted file mode 100644
index 5acf38c3f..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.056.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><CreateXMLSignatureRequest
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>wrong_value_KeyIdentifier</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt">
- <!-- Hint -->
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.057.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.057.ErrRes.xml
deleted file mode 100644
index 929701d34..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.057.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2220 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.057.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.057.Req.xml
deleted file mode 100644
index 79984a855..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.057.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><CreateXMLSignatureRequest
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>PKCS12RSAKeyExpired</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt">
- <!-- Hint -->
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.058.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.058.ErrRes.xml
deleted file mode 100644
index 929701d34..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.058.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2220 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.058.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.058.Req.xml
deleted file mode 100644
index c0647aa63..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.058.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><CreateXMLSignatureRequest
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>DSAinPKCS12</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt">
- <!-- Hint -->
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.059.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.059.ErrRes.xml
deleted file mode 100644
index 758e03adc..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.059.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2208 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.059.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.059.Req.xml
deleted file mode 100644
index e8d2ebf81..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.059.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><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="http://localhost:8080/moa-spss-testdata/not_here.txt">
- <!-- Hint -->
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.060.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.060.ErrRes.xml
deleted file mode 100644
index 4d642625f..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.060.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1102 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.060.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.060.Req.xml
deleted file mode 100644
index a371cf389..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.060.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><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 >
- <!-- Hint -->
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.062.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.062.ErrRes.xml
deleted file mode 100644
index 5b2b55035..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.062.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1100 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.062.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.062.Req.xml
deleted file mode 100644
index 8f4a32e24..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.062.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><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 >
- <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/spss.test/data/CX0/TestGeneratorCX0.064.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.064.ErrRes.xml
deleted file mode 100644
index 96e38be91..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.064.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1110 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.064.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.064.Req.xml
deleted file mode 100644
index 4c58db2f1..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.064.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="enveloping" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/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/spss.test/data/CX0/TestGeneratorCX0.065.ErrRes.xml b/spss.test/data/CX0/TestGeneratorCX0.065.ErrRes.xml
deleted file mode 100644
index 4d642625f..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.065.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1102 \ No newline at end of file
diff --git a/spss.test/data/CX0/TestGeneratorCX0.065.Req.xml b/spss.test/data/CX0/TestGeneratorCX0.065.Req.xml
deleted file mode 100644
index 17ebc8ca3..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.065.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>
- <XMLContent xml:space="preserve">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/spss.test/data/CX0/TestGeneratorCX0.Config.xml b/spss.test/data/CX0/TestGeneratorCX0.Config.xml
deleted file mode 100644
index 1f4feffa7..000000000
--- a/spss.test/data/CX0/TestGeneratorCX0.Config.xml
+++ /dev/null
@@ -1 +0,0 @@
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#"> <KeyGroup id="PKCS12RSAKey1"> <Key id="resources/test-ee2003_normal(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12RSAKeyExpired"> <Key id="sicher-demo(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12ECDSAKey1"> <Key id="ecc.p12"/> </KeyGroup> <KeyGroup id="DSAinPKCS12"> <Key id="DSA.512.p12"/> </KeyGroup> <KeyGroup id="HSMRSAKey1"> <Key id="???"/> </KeyGroup> <KeyGroup id="HSMECDSAKey1"> <Key id="???"/> </KeyGroup> <DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/> <SignatureAlgorithm name="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></MOAConfiguration> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.001.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.001.Req.xml
deleted file mode 100644
index 862027e78..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.001.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.001.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.001.Res.xml
deleted file mode 100644
index cd31aa035..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.001.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:output indent="no" method="html"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>YjKlNeYiWGTFMJfOtz4AAreHxfiGHrLUr2TT5D7rn2di7WyQKZcqmTQEnFdUC7pa
-lcqpPCTPpxEWRKxVoueMeXI2XVIlLZtydKtawfCXCR3UTANT8g944cnQLeLF4cxP
-nhKm0pMqTUBdqy34eQsPNutKyhDCPbze+bIrLj1wyWY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.002.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.002.Req.xml
deleted file mode 100644
index e7e302a46..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.002.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="true"><DataObjectInfo Structure="detached" ChildOfManifest="false"><DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.002.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.002.Res.xml
deleted file mode 100644
index d93e424ea..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.002.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:output indent="no" method="html"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-signed-1-1')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>e58AwoQMkj93QqalFkkzOxapv+c=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>D9fk9xEubUZCo1h1Mw/qEed4z9QwwspxP5z48V5ywwM1lyirhZZZVQi8RDOnQKbJ
-yrosd4zZ+IiUXs2wtKQ0jV6tK9gHIuxhMTgtKHJZrnTnIUknG3VmIX59cmP/JvIl
-989vBQA247wiWEYZ+Wxp5/SIDLztYP8cfxEffBl6OEo=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-05-10T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.003.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.003.Req.xml
deleted file mode 100644
index 690ec6a2f..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.003.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/1999/REC-xpath-19991116"><dsig:XPath xmlns:data="http://uri.data.org">//data:book/data:first-name</dsig:XPath></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/plain</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.003.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.003.Res.xml
deleted file mode 100644
index 1a3edd3f4..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.003.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>//data:book/data:first-name</dsig:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>fY1uE8z+IoSvkNCYLmLvjrJHZ7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ZSv8OQ/GXBnm/7bY+jMKJ2w5kGaqUYo8nQVMbSSDrNZ0V/lZTL7UC6id1LCmmim0
-ejWSpehabE/JX4/Kx4u0HzekL4kKv0sFZQ9z1rOdhWNZ3GgM2dJe/Bz+A5w7H+x6
-OZah1tDVIiyAJiAOHNsIhmuE8W2SQCEDPXCOC51TjiQ=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.004.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.004.Req.xml
deleted file mode 100644
index 98f052f15..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.004.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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"><xf2:XPath Filter="subtract" xmlns:xf2="http://www.w3.org/2002/06/xmldsig-filter2" xmlns:data="http://uri.data.org">//data:book/data:first-name</xf2:XPath></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/xml</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.004.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.004.Res.xml
deleted file mode 100644
index cd734cd2c..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.004.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2"><xf2:XPath Filter="subtract" xmlns:xf2="http://www.w3.org/2002/06/xmldsig-filter2">//data:book/data:first-name</xf2:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Sx4DuAkpeSaD7yHkYaRmxiRN174=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>OtZapSxxPtO2d02c5REzD7r96RmAPnY0p9Nuig1YpyuWrbqfkIQBrnz+IFlMXBMH
-VNH+iUTzJAi0kwTvic2kWBQyqhhw9MVsaBVFzXNlDCXamz8ekNtACGN/5v/2THmG
-wauafmZe96F2aNmHp1HeYnSBlKJBKxt4xRbCZNyiGSw=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.005.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.005.Req.xml
deleted file mode 100644
index cc3a97d02..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/2001/REC-xml-c14n-20010315"/></dsig:Transforms><FinalDataMetaInfo><MimeType>text/xml</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.005.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.005.Res.xml
deleted file mode 100644
index 66ed1c2aa..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.005.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>fY1uE8z+IoSvkNCYLmLvjrJHZ7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>FO3Cvncp/1evuLSp3PXPSuuOJ1r6YuCZTdvm7j2Bck0/uPPCBddUMLJwbhaKhbjI
-5LpSQ/K/DyA0zaFqEqP0sBuLYJP8ldhbqCLOHVi2sHSO0SXTre20EFwRQONow3JL
-EuQD+AkFw4rBRpXzlHp+uH79/OWpkGQfKEm6jFPgvco=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.006.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.006.Req.xml
deleted file mode 100644
index 8477b7f5e..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.006.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms><FinalDataMetaInfo><MimeType>text/xml</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.006.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.006.Res.xml
deleted file mode 100644
index 8570fd44d..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.006.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>fY1uE8z+IoSvkNCYLmLvjrJHZ7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ldzNP2YNW8YXi/ilYIXu44wUouG4SRZwObsdMU/NEMNP1I00/b6kdKiBzjmNGXQ1
-SvobxGs/iNrgbQmNKy47I64h59eEtVgVNZLEbCZxvFvnNundclN25NdEW409zOwr
-XlVWj1d0VuwewdGkD923YI4/uwobKpb6c1OTzGq+BxY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.007.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.007.Req.xml
deleted file mode 100644
index a1905644f..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.007.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="dsig" xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/xml</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.007.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.007.Res.xml
deleted file mode 100644
index 3c8f9e7a3..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.007.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec14n:InclusiveNamespaces PrefixList="dsig" xmlns:ec14n="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>fY1uE8z+IoSvkNCYLmLvjrJHZ7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>qKTb3HEawjYkKi6fpRld3thQQstB2R20D+eCT08iA8qZl6hCKXCGu3RCwt0BMb1O
-UQitL5wZRIRqjLhX/aTskA378m+8lhcRJlI+JTBk1Go71qnIJV8lQrEHm1gZaFJl
-iB4H4J+FPhjb4Lah3VSGJmxFpUC2HuVkSJ8awIeZVNE=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.008.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.008.Req.xml
deleted file mode 100644
index 689914a57..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.008.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/2001/10/xml-exc-c14n#WithComments"><ec:InclusiveNamespaces PrefixList="dsig" xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/xml</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.008.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.008.Res.xml
deleted file mode 100644
index 886661c4c..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.008.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"><ec14n:InclusiveNamespaces PrefixList="dsig" xmlns:ec14n="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>fY1uE8z+IoSvkNCYLmLvjrJHZ7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jteo5NXaQvd5YKxvaXwFVw6qUmbRaM2wLJe1EiaIaX7BNHGrxRq90qBMohCZmIFk
-yiIU3iZZaoHFUUcuTnzpgTQrh9Y1H3itEn4uE7CpP4Itsm2+HsORTy42d9oRBOKK
-rFXZIrfi3NwycElvf2F6ag1saDcKUFJZSnaZ/DY7W7M=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.009.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.009.Req.xml
deleted file mode 100644
index ddd39adda..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.009.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=""></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo><CreateSignatureEnvironment><XMLContent xml:space="preserve"><env:Document xmlns:env="http://uri.env.org">Text</env:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation xmlns:env="http://uri.env.org" Index="1">//env:Document</CreateSignatureLocation></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.009.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.009.Res.xml
deleted file mode 100644
index 68a626075..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.009.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><env:Document xmlns:env="http://uri.env.org">Text<dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>j4SLfpgzRuL1rQEgy97/rNCt4I8=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>16e/BfTIpoRU5TQi6NM/hOPIcw0YYn+Cm0ZuN4imMELPz80YSC2JGk/PYkC3TL24
-anJ+BNzaPNOAPCWwga8ityx47ssW7S2rsTIBGEj7ThF1WO9yI0+5wdJLCuomqEOQ
-/9MWrYCw8FvIZPiSjnaUbPIu9gf0bMvpY91CYa9/nsY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></env:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.010.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.010.Req.xml
deleted file mode 100644
index a72b29662..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.010.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/2001/REC-xml-c14n-20010315"/><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.010.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.010.Res.xml
deleted file mode 100644
index 006d323fb..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.010.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:output indent="no" method="html"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>3PsMFSPASX3rAnms24p61nOqdtjQ/9TzRj71A+qnLKwcy7TpQubH/CF9byovzPPK
-cp7oI1SEnG6QEmV9xZo6TTE9Xg2FdLSpqPg/wZUuWxUSvXLRRCVmSB5mv2AT9rS8
-Wj4M1T5natdUXYVm428n+hkq3UY4N/ykCAScbBEnxg4=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.011.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.011.Req.xml
deleted file mode 100644
index 832a47a18..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.011.Req.xml
+++ /dev/null
@@ -1,7 +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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book_not_here.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><Supplement><Content Reference="http://localhost:8080/moa-spss-testdata/resources/CX1_book_not_here.xsl"><Base64Content>PHhzbDpzdHlsZXNoZWV0IHhtbG5zOnhzbD0iaHR0cDovL3d3dy53My5vcmcvMTk5
-OS9YU0wvVHJhbnNmb3JtIiB2ZXJzaW9uPSIxLjAiPjx4c2w6b3V0cHV0IG1ldGhv
-ZD0iaHRtbCIgaW5kZW50PSJubyIvPjx4c2w6dGVtcGxhdGUgbWF0Y2g9ImRhdGE6
-Ym9vayIgeG1sbnM6ZGF0YT0iaHR0cDovL3VyaS5kYXRhLm9yZyI+PEhUTUw+PEJP
-RFk+PEgxPkJ1Y2g6IDx4c2w6dmFsdWUtb2Ygc2VsZWN0PSJkYXRhOnRpdGxlIi8+
-PC9IMT48L0JPRFk+PC9IVE1MPjwveHNsOnRlbXBsYXRlPjwveHNsOnN0eWxlc2hl
-ZXQ+</Base64Content></Content></Supplement></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.011.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.011.Res.xml
deleted file mode 100644
index 7de30dc09..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.011.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book_not_here.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>cgkUsu80j1PvYV44FIV8y4XF2yk0JUGVmoScFERV1ZxhhtaZ0BuoM0R7tzdW01q/
-pe7vai8yKY4tzWLo2kzDtH5AciWTGIVFbwgF5H/e09KD5yu8Q7+M91+DGth9lRjG
-kphe1ijmx51kT39Z39keuO7ZXVSmrUHjg8F8mqsg/Rc=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.012.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.012.Req.xml
deleted file mode 100644
index ef0b43e75..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.012.Req.xml
+++ /dev/null
@@ -1,7 +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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book_not_here.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><DataObjectInfo Structure="detached" ChildOfManifest="false"><DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book_not_here.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType></FinalDataMetaInfo></CreateTransformsInfo><Supplement><Content Reference="http://localhost:8080/moa-spss-testdata/resources/CX1_book_not_here.xsl"><Base64Content>PHhzbDpzdHlsZXNoZWV0IHhtbG5zOnhzbD0iaHR0cDovL3d3dy53My5vcmcvMTk5
-OS9YU0wvVHJhbnNmb3JtIiB2ZXJzaW9uPSIxLjAiPjx4c2w6b3V0cHV0IG1ldGhv
-ZD0iaHRtbCIgaW5kZW50PSJubyIvPjx4c2w6dGVtcGxhdGUgbWF0Y2g9ImRhdGE6
-Ym9vayIgeG1sbnM6ZGF0YT0iaHR0cDovL3VyaS5kYXRhLm9yZyI+PEhUTUw+PEJP
-RFk+PEgxPkJ1Y2g6IDx4c2w6dmFsdWUtb2Ygc2VsZWN0PSJkYXRhOnRpdGxlIi8+
-PC9IMT48L0JPRFk+PC9IVE1MPjwveHNsOnRlbXBsYXRlPjwveHNsOnN0eWxlc2hl
-ZXQ+</Base64Content></Content></Supplement></CreateTransformsInfoProfile></DataObjectInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.012.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.012.Res.xml
deleted file mode 100644
index 443968069..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.012.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book_not_here.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-2" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book_not_here.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>APYUrGycbhFMjWaejLXQbfN9Fg5GEgzmek/yap8DZc0fi8suyuSK83P0zeHOf2aP
-JRTr9McSlgUeCXAuX25NWUCz8K/GFAoIq4M5s2IybQZmG7ri1cCYjyZcZJTA0Upd
-at9EBtO1lJm2td7lBeEWIeXcTKczKNtSymt5z4n74W8=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.013.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.013.Req.xml
deleted file mode 100644
index 546b15e71..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.013.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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><CreateTransformsInfoProfileID>CreateTransformsInfoProfile1</CreateTransformsInfoProfileID></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.013.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.013.Res.xml
deleted file mode 100644
index cd31aa035..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.013.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:output indent="no" method="html"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>YjKlNeYiWGTFMJfOtz4AAreHxfiGHrLUr2TT5D7rn2di7WyQKZcqmTQEnFdUC7pa
-lcqpPCTPpxEWRKxVoueMeXI2XVIlLZtydKtawfCXCR3UTANT8g944cnQLeLF4cxP
-nhKm0pMqTUBdqy34eQsPNutKyhDCPbze+bIrLj1wyWY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.014.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.014.Req.xml
deleted file mode 100644
index d1ea0073b..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.014.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="http://localhost:8080/moa-spss-testdata/resources/testBase64.txt"></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><FinalDataMetaInfo><MimeType>text/plain</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.014.Res.xml b/spss.test/data/CX1/TestGeneratorCX1.014.Res.xml
deleted file mode 100644
index bb965d1cf..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.014.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testBase64.txt"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>gACu/OVI7EXTcH7ai8G7/P+kx3QU/ArzG2hx4bTmQlRJK4eQSy8YNM2BAz2d3omm
-mQ1bNcU+gRwupC9Lusz+OZ2r3f5O5bEjkd3paoFm3pyWM8125Tp7yxdIVk0Fgkms
-i+jZ3tHOaSNbR1JCcxjebqb821F5oViUA7GemjEbVnQ=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.051.ErrRes.xml b/spss.test/data/CX1/TestGeneratorCX1.051.ErrRes.xml
deleted file mode 100644
index 8e20b01e7..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.051.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2202 \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.051.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.051.Req.xml
deleted file mode 100644
index 5da128ec8..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.051.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="true"><DataObjectInfo Structure="detached" ChildOfManifest="false"><DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/1999/REC-xpath-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.052.ErrRes.xml b/spss.test/data/CX1/TestGeneratorCX1.052.ErrRes.xml
deleted file mode 100644
index 4ca71c787..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.052.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2215 \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.052.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.052.Req.xml
deleted file mode 100644
index 752a92c02..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.052.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/1999/REC-xslt-19991116"><XPath>/data:book/data:first-name/node()</XPath></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.053.ErrRes.xml b/spss.test/data/CX1/TestGeneratorCX1.053.ErrRes.xml
deleted file mode 100644
index 929701d34..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.053.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2220 \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.053.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.053.Req.xml
deleted file mode 100644
index 88ad8f421..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.053.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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/TR/1999/REC-xslt-19991116"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:include href="file:/transform.xsl"/> </xsl:stylesheet> </dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.054.ErrRes.xml b/spss.test/data/CX1/TestGeneratorCX1.054.ErrRes.xml
deleted file mode 100644
index 9a6039e94..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.054.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2234 \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.054.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.054.Req.xml
deleted file mode 100644
index 8b32973fc..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.054.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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><CreateTransformsInfoProfileID>CreateTransformsInfoProfileNonValid</CreateTransformsInfoProfileID></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.055.ErrRes.xml b/spss.test/data/CX1/TestGeneratorCX1.055.ErrRes.xml
deleted file mode 100644
index e542c6660..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.055.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2216 \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.055.Req.xml b/spss.test/data/CX1/TestGeneratorCX1.055.Req.xml
deleted file mode 100644
index 09359ab14..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.055.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="true"><DataObjectInfo Structure="detached" ChildOfManifest="false"><DataObject Reference="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><XMLContent xml:space="preserve"><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"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType><Description>http://www.description.com</Description></FinalDataMetaInfo></CreateTransformsInfo><!-- insert supp --></CreateTransformsInfoProfile></DataObjectInfo><!-- insert data2 --></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX1/TestGeneratorCX1.Config.xml b/spss.test/data/CX1/TestGeneratorCX1.Config.xml
deleted file mode 100644
index 22b0a824e..000000000
--- a/spss.test/data/CX1/TestGeneratorCX1.Config.xml
+++ /dev/null
@@ -1 +0,0 @@
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#"> <KeyGroup id="PKCS12RSAKey1"> <Key id="resources/test-ee2003_normal(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12RSAKeyExpired"> <Key id="sicher-demo(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12ECDSAKey1"> <Key id="ecc.p12"/> </KeyGroup> <KeyGroup id="HSMRSAKey1"> <Key id="???"/> </KeyGroup> <KeyGroup id="HSMECDSAKey1"> <Key id="???"/> </KeyGroup> <DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/> <SignatureAlgorithm name="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> <CreateTransformsInfoProfile id="CreateTransformsInfoProfile1" filename="file:/http://localhost:8080/moa-spss-testdata/CX1_bookprofile.xsl"/></MOAConfiguration> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.001.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.001.Req.xml
deleted file mode 100644
index 1431b2475..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.001.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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></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 xmlns:data="http://uri.data.org">Dies sind Testdaten</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.001.Res.xml b/spss.test/data/CX2/TestGeneratorCX2.001.Res.xml
deleted file mode 100644
index d294bfd6e..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.001.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><data:Document xmlns:data="http://uri.data.org"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pJbF/1V3pSy/NrgNGEmxlTpz49yy+WWfO9HAjD2oI2HAYLTWBIHwYhw5GKe2Zr1k
-nqEU14Uzuj/gFbmz3S739EHmBMOB24K7J1tnHx32moVEx7ghXde4gwFmJEx2SNcK
-/robwo/6bHo9tn+EuKNwOjVGwAyOymV/dTrMlFr+1fI=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.002.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.002.Req.xml
deleted file mode 100644
index 4ae8724e2..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.002.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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment Reference="http://localhost:8080/moa-spss-testdata/resources/testDocument.xml"/><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.002.Res.xml b/spss.test/data/CX2/TestGeneratorCX2.002.Res.xml
deleted file mode 100644
index d294bfd6e..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.002.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><data:Document xmlns:data="http://uri.data.org"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pJbF/1V3pSy/NrgNGEmxlTpz49yy+WWfO9HAjD2oI2HAYLTWBIHwYhw5GKe2Zr1k
-nqEU14Uzuj/gFbmz3S739EHmBMOB24K7J1tnHx32moVEx7ghXde4gwFmJEx2SNcK
-/robwo/6bHo9tn+EuKNwOjVGwAyOymV/dTrMlFr+1fI=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.003.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.003.Req.xml
deleted file mode 100644
index 2e68f04e6..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.003.Req.xml
+++ /dev/null
@@ -1,3 +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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NPGRhdGE6RG9j
-dW1lbnQgeG1sbnM6ZGF0YT0iaHR0cDovL3VyaS5kYXRhLm9yZyI+RGllcyBzaW5k
-IFRlc3RkYXRlbjwvZGF0YTpEb2N1bWVudD4N</Base64Content></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.003.Res.xml b/spss.test/data/CX2/TestGeneratorCX2.003.Res.xml
deleted file mode 100644
index d294bfd6e..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.003.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><data:Document xmlns:data="http://uri.data.org"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pJbF/1V3pSy/NrgNGEmxlTpz49yy+WWfO9HAjD2oI2HAYLTWBIHwYhw5GKe2Zr1k
-nqEU14Uzuj/gFbmz3S739EHmBMOB24K7J1tnHx32moVEx7ghXde4gwFmJEx2SNcK
-/robwo/6bHo9tn+EuKNwOjVGwAyOymV/dTrMlFr+1fI=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.004.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.004.Req.xml
deleted file mode 100644
index 1431b2475..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.004.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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></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 xmlns:data="http://uri.data.org">Dies sind Testdaten</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.004.Res.xml b/spss.test/data/CX2/TestGeneratorCX2.004.Res.xml
deleted file mode 100644
index d294bfd6e..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.004.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><data:Document xmlns:data="http://uri.data.org"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pJbF/1V3pSy/NrgNGEmxlTpz49yy+WWfO9HAjD2oI2HAYLTWBIHwYhw5GKe2Zr1k
-nqEU14Uzuj/gFbmz3S739EHmBMOB24K7J1tnHx32moVEx7ghXde4gwFmJEx2SNcK
-/robwo/6bHo9tn+EuKNwOjVGwAyOymV/dTrMlFr+1fI=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.005.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.005.Req.xml
deleted file mode 100644
index 148662f64..000000000
--- a/spss.test/data/CX2/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><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment><XMLContent xml:space="preserve"><data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" attr="document" xsi:schemaLocation="http://uri.data.org http://tollesSchema.org/test.xsd">Dies sind Testdaten</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><Supplement><Content Reference="http://tollesSchema.org/test.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" id="tollesSchema"><xsd:element name="Document"><xsd:complexType mixed="true"><xsd:sequence maxOccurs="unbounded" minOccurs="0"><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/spss.test/data/CX2/TestGeneratorCX2.005.Res.xml b/spss.test/data/CX2/TestGeneratorCX2.005.Res.xml
deleted file mode 100644
index 44d900fc2..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.005.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" attr="document" xsi:schemaLocation="http://uri.data.org http://tollesSchema.org/test.xsd"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#document"><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>YQuo5v1WFKeQdaZKngk/i8Y7U5I=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>uVdK8ctM1ZSxcpu9sk8j0OKzz1YPDEiEXlY9AHqsqAH/e3ICpIrUfucHTOU3PISm
-GojzDTTZqZ5vsmjo4MRzxC65Zu84xc9Qy8WlM85vpDPZkz5Z3kKv2TvSmT0BHdlc
-j+YWYFIMr7kxs+ls1KPd21OmMkiVTF0BAavEOg6XjRo=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.006.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.006.Req.xml
deleted file mode 100644
index a69466b9a..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.006.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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></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 xmlns:data="http://uri.data.org">Dies sind Testdaten</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfileID>CreateSignatureEnvironmentProfile1</CreateSignatureEnvironmentProfileID></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.006.Res.xml b/spss.test/data/CX2/TestGeneratorCX2.006.Res.xml
deleted file mode 100644
index d294bfd6e..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.006.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><data:Document xmlns:data="http://uri.data.org"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pJbF/1V3pSy/NrgNGEmxlTpz49yy+WWfO9HAjD2oI2HAYLTWBIHwYhw5GKe2Zr1k
-nqEU14Uzuj/gFbmz3S739EHmBMOB24K7J1tnHx32moVEx7ghXde4gwFmJEx2SNcK
-/robwo/6bHo9tn+EuKNwOjVGwAyOymV/dTrMlFr+1fI=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.007.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.007.Req.xml
deleted file mode 100644
index b9b2d65df..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.007.Req.xml
+++ /dev/null
@@ -1,6 +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><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo><CreateSignatureEnvironment><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IURPQ1RZUEUg
-RG9jdW1lbnQgU1lTVEVNICJodHRwOi8vZHRkLm9yZy90b2xsZXNEVEQuZHRkIj48
-RG9jdW1lbnQgYXR0cj0iZG9jdW1lbnQiPkRpZXMgc2luZCBUZXN0ZGF0ZW48L0Rv
-Y3VtZW50Pg==</Base64Content></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//Document</CreateSignatureLocation><Supplement><Content Reference="http://dtd.org/tollesDTD.dtd"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IUVMRU1FTlQg
-RG9jdW1lbnQgKCNQQ0RBVEEgfCBBTlkpKj48IUFUVExJU1QgRG9jdW1lbnQgYXR0
-ciBJRCAjUkVRVUlSRUQ+</Base64Content></Content></Supplement></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.007.Res.xml b/spss.test/data/CX2/TestGeneratorCX2.007.Res.xml
deleted file mode 100644
index 3119cc49e..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.007.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><Document attr="document" xmlns=""><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#document"><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>sI50Vkkj8mjE05Zr2+S3bmDL5sI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>MWIP6z8/rFfljUHeOQFVvcD6kLAxfrti6CL2KjNFPDIvr8cLoZalL0x812d27D2v
-qOk/bDwkUjAqV0UDdLhmUmt1rNfVA7JaYag35ybCmJ+p96dRehH0EcdcFZzJ9JdY
-ECXz90M9fKhulZbXmtf991UTa51fitBIW9itxzv8ynw=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.008.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.008.Req.xml
deleted file mode 100644
index 9f179cee2..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.008.Req.xml
+++ /dev/null
@@ -1,12 +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><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment><XMLContent xml:space="preserve"><data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" attr="document" xsi:schemaLocation="http://uri.data.org http://tollesSchema.org/test.xsd">Dies sind Testdaten</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><Supplement><Content Reference="http://tollesSchema.org/test.xsd"><Base64Content>PHhzZDpzY2hlbWEgdGFyZ2V0TmFtZXNwYWNlPSJodHRwOi8vdXJpLmRhdGEub3Jn
-IiB4bWxuczp4c2Q9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4
-bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3Rh
-bmNlIiB4bWxucz0iaHR0cDovL3VyaS5kYXRhLm9yZyIgZWxlbWVudEZvcm1EZWZh
-dWx0PSJxdWFsaWZpZWQiIGF0dHJpYnV0ZUZvcm1EZWZhdWx0PSJ1bnF1YWxpZmll
-ZCIgaWQ9InRvbGxlc1NjaGVtYSI+PHhzZDplbGVtZW50IG5hbWU9IkRvY3VtZW50
-Ij48eHNkOmNvbXBsZXhUeXBlIG1peGVkPSJ0cnVlIj48eHNkOnNlcXVlbmNlIG1h
-eE9jY3Vycz0idW5ib3VuZGVkIiBtaW5PY2N1cnM9IjAiPjx4c2Q6YW55IG5hbWVz
-cGFjZT0iIyNhbnkiIHByb2Nlc3NDb250ZW50cz0ibGF4Ii8+PC94c2Q6c2VxdWVu
-Y2U+PHhzZDphdHRyaWJ1dGUgbmFtZT0iYXR0ciIgdHlwZT0ieHNkOklEIiB1c2U9
-InJlcXVpcmVkIi8+PC94c2Q6Y29tcGxleFR5cGU+PC94c2Q6ZWxlbWVudD48L3hz
-ZDpzY2hlbWE+</Base64Content></Content></Supplement></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.008.Res.xml b/spss.test/data/CX2/TestGeneratorCX2.008.Res.xml
deleted file mode 100644
index 7bcc7b638..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.008.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><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/test.xsd"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#document"><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>YQuo5v1WFKeQdaZKngk/i8Y7U5I=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>uVdK8ctM1ZSxcpu9sk8j0OKzz1YPDEiEXlY9AHqsqAH/e3ICpIrUfucHTOU3PISm
-GojzDTTZqZ5vsmjo4MRzxC65Zu84xc9Qy8WlM85vpDPZkz5Z3kKv2TvSmT0BHdlc
-j+YWYFIMr7kxs+ls1KPd21OmMkiVTF0BAavEOg6XjRo=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.009.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.009.Req.xml
deleted file mode 100644
index 9cda00b5b..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.009.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="#xpointer(id(document))"></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment><XMLContent xml:space="preserve"><data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" attr="document" xsi:schemaLocation="http://uri.data.org http://tollesSchema.org/test.xsd">Dies sind Testdaten</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><Supplement><Content Reference="http://tollesSchema.org/test.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" id="tollesSchema"><xsd:element name="Document"><xsd:complexType mixed="true"><xsd:sequence maxOccurs="unbounded" minOccurs="0"><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/spss.test/data/CX2/TestGeneratorCX2.009.Res.xml b/spss.test/data/CX2/TestGeneratorCX2.009.Res.xml
deleted file mode 100644
index d1cacf052..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.009.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" attr="document" xsi:schemaLocation="http://uri.data.org http://tollesSchema.org/test.xsd"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(document))"><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>2jmj7l5rSw0yVb/vlWAYkK/YBwk=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>P8zWrteGcRaSiur/I+JUFKF0RpVhGCYsm678bUGBTn/ybYiyGIX+/tHsHx2xzAw2
-QGbhlidyMSd/E/DNNtspm6Ckj9G+vgt1QhHbBWBHf2H1VPBSZ35BgvHih/a9lj+z
-rI6LSqxXPHTSjQ40Ojtuyz9wm93nfA4xI+Yye3Y9ywA=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.051.ErrRes.xml b/spss.test/data/CX2/TestGeneratorCX2.051.ErrRes.xml
deleted file mode 100644
index 304a6a57d..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.051.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1109 \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.051.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.051.Req.xml
deleted file mode 100644
index 3fcecd018..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.051.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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo><CreateSignatureEnvironment><XMLContent xml:space="preserve"><data:Document xmlns:data="http://uri.data.org">daten</data:Document><Text>toller Text</Text></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0" xmlns:data="http://uri.data.org">//data:Document</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.052.ErrRes.xml b/spss.test/data/CX2/TestGeneratorCX2.052.ErrRes.xml
deleted file mode 100644
index 77f912c54..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.052.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2218 \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.052.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.052.Req.xml
deleted file mode 100644
index 106636e0a..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.052.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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment><Base64Content>PFRhZzE+PC9UYWcxPjxUYWcyPjwvVGFnMj4NCg0K</Base64Content><!-- Inhalt: <Tag1></Tag1><Tag2></Tag2> --></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.053.ErrRes.xml b/spss.test/data/CX2/TestGeneratorCX2.053.ErrRes.xml
deleted file mode 100644
index 96e38be91..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.053.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1110 \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.053.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.053.Req.xml
deleted file mode 100644
index dcdcc4eff..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.053.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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment/><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.054.ErrRes.xml b/spss.test/data/CX2/TestGeneratorCX2.054.ErrRes.xml
deleted file mode 100644
index 483d07b5d..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.054.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2212 \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.054.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.054.Req.xml
deleted file mode 100644
index c8f0010b6..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.054.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"/><CreateTransformsInfoProfile><CreateTransformsInfo><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>/data:book/data:first-name/node()</dsig:XPath></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/xml</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment><XMLContent xml:space="preserve"><data:Document xmlns:data="http://uri.data.org">Dies sind Testdaten</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document1</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.055.ErrRes.xml b/spss.test/data/CX2/TestGeneratorCX2.055.ErrRes.xml
deleted file mode 100644
index 96e38be91..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.055.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1110 \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.055.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.055.Req.xml
deleted file mode 100644
index 00d4f7d68..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.055.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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></DataObject><CreateTransformsInfoProfile><CreateTransformsInfo><FinalDataMetaInfo><MimeType>text/plain</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment Reference="http://localhost:8080/moa-spss-testdata/resources/CSEP.xml"><XMLContent xml:space="preserve"><data:Document>andereDaten als in http://localhost:8080/moa-spss-testdata/resources/CSEP.xml</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.056.ErrRes.xml b/spss.test/data/CX2/TestGeneratorCX2.056.ErrRes.xml
deleted file mode 100644
index a6f32fc63..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.056.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2236 \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.056.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.056.Req.xml
deleted file mode 100644
index 711a01b89..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.056.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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent></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>andereDaten als in http://localhost:8080/moa-spss-testdata/resources/CSEP.xml</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfileID>wrongCreateSignatureEnvironmentProfile</CreateSignatureEnvironmentProfileID></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.057.ErrRes.xml b/spss.test/data/CX2/TestGeneratorCX2.057.ErrRes.xml
deleted file mode 100644
index 483d07b5d..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.057.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2212 \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.057.Req.xml b/spss.test/data/CX2/TestGeneratorCX2.057.Req.xml
deleted file mode 100644
index 90d7ab5cc..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.057.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="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"/><CreateTransformsInfoProfile><CreateTransformsInfo><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath>/data:book/data:first-name/node()</dsig:XPath></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/xml</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile></DataObjectInfo><CreateSignatureInfo xmlns:data="http://uri.data.org"><CreateSignatureEnvironment><XMLContent xml:space="preserve"><data:Document xmlns:data="http://uri.data.org">Dies sind Testdaten</data:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation Index="0">]]'_'[[//data:Document</CreateSignatureLocation><!-- insert supp --></CreateSignatureEnvironmentProfile></CreateSignatureInfo></SingleSignatureInfo></CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/CX2/TestGeneratorCX2.Config.xml b/spss.test/data/CX2/TestGeneratorCX2.Config.xml
deleted file mode 100644
index 9b87114ea..000000000
--- a/spss.test/data/CX2/TestGeneratorCX2.Config.xml
+++ /dev/null
@@ -1 +0,0 @@
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#"> <KeyGroup id="PKCS12RSAKey1"> <Key id="resources/test-ee2003_normal(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12RSAKeyExpired"> <Key id="sicher-demo(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12ECDSAKey1"> <Key id="ecc.p12"/> </KeyGroup> <KeyGroup id="HSMRSAKey1"> <Key id="???"/> </KeyGroup> <KeyGroup id="HSMECDSAKey1"> <Key id="???"/> </KeyGroup> <DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/> <SignatureAlgorithm name="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> <CreateSignatureEnvironmentProfile id="CreateSignatureEnvironmentProfile1" filename="file:/http://localhost:8080/moa-spss-testdata/resources/CSEP.xml"/></MOAConfiguration> \ No newline at end of file
diff --git a/spss.test/data/CX3/TestGeneratorCX3.001.Req.xml b/spss.test/data/CX3/TestGeneratorCX3.001.Req.xml
deleted file mode 100644
index 7ffb7cd3b..000000000
--- a/spss.test/data/CX3/TestGeneratorCX3.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#">
- <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/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/spss.test/data/CX3/TestGeneratorCX3.001.Res.xml b/spss.test/data/CX3/TestGeneratorCX3.001.Res.xml
deleted file mode 100644
index 9a8337324..000000000
--- a/spss.test/data/CX3/TestGeneratorCX3.001.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>gBB3qVsHcXriR5DRnqpoAtGSZozMUEprBtbt/pusEylilSrndPufeDaaCm8PtbUe
-c0ezEu7/xLJPc5qC/cqv0B3f0RDR2RPCSfZNu/vcc8YddLdgy+p+cDOEneXPUEOa
-FKkqvEmIJBGWsG/UbNobP6J1YFLeM3Wjbn+cUstfgVY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/CX3/TestGeneratorCX3.052.ErrRes.xml b/spss.test/data/CX3/TestGeneratorCX3.052.ErrRes.xml
deleted file mode 100644
index 2416c2c45..000000000
--- a/spss.test/data/CX3/TestGeneratorCX3.052.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2231 \ No newline at end of file
diff --git a/spss.test/data/CX3/TestGeneratorCX3.052.Req.xml b/spss.test/data/CX3/TestGeneratorCX3.052.Req.xml
deleted file mode 100644
index 2da31e92a..000000000
--- a/spss.test/data/CX3/TestGeneratorCX3.052.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#">
- <KeyIdentifier>PKCS12RSAKeyNotAllowed</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/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/spss.test/data/CX3/TestGeneratorCX3.Config.xml b/spss.test/data/CX3/TestGeneratorCX3.Config.xml
deleted file mode 100644
index 1f4feffa7..000000000
--- a/spss.test/data/CX3/TestGeneratorCX3.Config.xml
+++ /dev/null
@@ -1 +0,0 @@
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#"> <KeyGroup id="PKCS12RSAKey1"> <Key id="resources/test-ee2003_normal(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12RSAKeyExpired"> <Key id="sicher-demo(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12ECDSAKey1"> <Key id="ecc.p12"/> </KeyGroup> <KeyGroup id="DSAinPKCS12"> <Key id="DSA.512.p12"/> </KeyGroup> <KeyGroup id="HSMRSAKey1"> <Key id="???"/> </KeyGroup> <KeyGroup id="HSMECDSAKey1"> <Key id="???"/> </KeyGroup> <DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/> <SignatureAlgorithm name="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></MOAConfiguration> \ No newline at end of file
diff --git a/spss.test/data/CX4/TestGeneratorCX4.051.ErrRes.xml b/spss.test/data/CX4/TestGeneratorCX4.051.ErrRes.xml
deleted file mode 100644
index af2e09a3e..000000000
--- a/spss.test/data/CX4/TestGeneratorCX4.051.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-0000 \ No newline at end of file
diff --git a/spss.test/data/CX4/TestGeneratorCX4.051.Req.xml b/spss.test/data/CX4/TestGeneratorCX4.051.Req.xml
deleted file mode 100644
index 7ffb7cd3b..000000000
--- a/spss.test/data/CX4/TestGeneratorCX4.051.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#">
- <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/moa-spss-testdata/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/spss.test/data/CX4/TestGeneratorCX4.Config.xml b/spss.test/data/CX4/TestGeneratorCX4.Config.xml
deleted file mode 100644
index 1f4feffa7..000000000
--- a/spss.test/data/CX4/TestGeneratorCX4.Config.xml
+++ /dev/null
@@ -1 +0,0 @@
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#"> <KeyGroup id="PKCS12RSAKey1"> <Key id="resources/test-ee2003_normal(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12RSAKeyExpired"> <Key id="sicher-demo(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12ECDSAKey1"> <Key id="ecc.p12"/> </KeyGroup> <KeyGroup id="DSAinPKCS12"> <Key id="DSA.512.p12"/> </KeyGroup> <KeyGroup id="HSMRSAKey1"> <Key id="???"/> </KeyGroup> <KeyGroup id="HSMECDSAKey1"> <Key id="???"/> </KeyGroup> <DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/> <SignatureAlgorithm name="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></MOAConfiguration> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.001.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.001.Req.xml
deleted file mode 100644
index c065b6675..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.001.Req.xml
+++ /dev/null
@@ -1,27 +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>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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.001.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.001.Res.xml
deleted file mode 100644
index d74966a52..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.001.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.002.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.002.Req.xml
deleted file mode 100644
index 3c2f1fd07..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.002.Req.xml
+++ /dev/null
@@ -1,33 +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>2003-04-04T09: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
-MzExMTAyMzI0MThaMCMGCSqGSIb3DQEJBDEWBBRZWhvnjTfgd9OhQEMASsvnPoYXGjANBgkqhkiG
-9w0BAQEFAASBgJE6AFzaNlrAbWsvBsECu9pt1cGxvdjKY32fFg8I7qsIM8jx4d7nVWoHjZ+RP6cI
-itiC5UjfL98OOHAKLg7e3OzGhF0Um2xchhNUm0oO6xt2K9n8XTrx0yy1BMN81OGJeEFjlCpjQFim
-Tn5ghJyUeyh15td+noJUBX0rfk0uJ8BCMIIBXQIBATCBtzCBrDELMAkGA1UEBhMCQVQxJjAkBgNV
-BAoTHUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3Ig
-QXBwbGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UE
-CxMMSUFJSyBUZXN0IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0ECBgDzJH01OzAMBggqhkiG9w0C
-BQUAMA0GCSqGSIb3DQEBAQUABIGAwhN2yOQ3bMd0n2HevuFZcyB6WgLE9TwMGnTHlzUZ+t5VoVS9
-5R9Al3OKmp/1bwZ2OSBZy9H4TIGVAj+UHxXrLeodAw9xXet4FeIemZXf5PKsoLAfDHhWC1v6y3lh
-xzPR5atzoj8gg9J6H4UF+kq1ylUnYkT9Ys6wVnci7hlqZAE=</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.002.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.002.Res.xml
deleted file mode 100644
index 7131c4003..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.002.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.003.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.003.Req.xml
deleted file mode 100644
index d182413af..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.003.Req.xml
+++ /dev/null
@@ -1,27 +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="all"><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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.003.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.003.Res.xml
deleted file mode 100644
index d74966a52..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.003.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.004.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.004.Req.xml
deleted file mode 100644
index 2421bbd93..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.004.Req.xml
+++ /dev/null
@@ -1,27 +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"><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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.004.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.004.Res.xml
deleted file mode 100644
index d74966a52..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.004.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.005.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.005.Req.xml
deleted file mode 100644
index c065b6675..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.005.Req.xml
+++ /dev/null
@@ -1,27 +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>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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.005.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.005.Res.xml
deleted file mode 100644
index d74966a52..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.005.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.006.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.006.Req.xml
deleted file mode 100644
index 11fdc7db2..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.006.Req.xml
+++ /dev/null
@@ -1,28 +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>2003-04-04T09:30:47-05:00</DateTime><CMSSignature>MIIGAAYJKoZIhvcNAQcCoIIF8TCCBe0CAQExCzAJBgUrDgMCGgUAMDsGCSqGSIb3DQEHAaAuBCxE
-aWVzIHNpbmQgVGVzdGRhdGVuDQoyLiBaZWlsZQ0KMy4gWmVpbGUNCmF1c6CCA9swggPXMIIDRKAD
-AgECAgYA8yR9NTswCQYFKw4DAh0FADCBrDELMAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5J
-VkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZv
-cm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UECxMMSUFJSyBUZXN0
-IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0EwHhcNMDMwMjAzMTYyMDU1WhcNMDMxMjMwMjI1OTMw
-WjCBmDELMAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5JVkVSU0lUWSBPRiBURUNITk9MT0dZ
-MUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZvcm1hdGlvbiBQcm9jZXNzaW5nIGFu
-ZCBDb21tdW5pY2F0aW9uczEYMBYGA1UEAxQPSXNvbGRlIEL8cmdlcmluMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDnebSqeDo73NUgC4nbY+z3Vf6l12EyID0/RC6wx7FD5ASR97jecQUhOhRn
-e66gBAV36fgxczoPry1ly0ZTk7hbkCr9sSMjh58gdLQROHOA0DKaqZP1n0ggSGqb/WOFDhJdNbff
-LdefeXHboOJN4Cl+25AHfzxiVX5Gz6tPIX2JFQIDAQABo4IBHDCCARgwDAYDVR0TAQH/BAIwADAO
-BgNVHQ8BAf8EBAMCBsAwEQYJYIZIAYb4QgEBBAQDAgUgMGcGA1UdIARgMF4wXAYMKwYBBAGVEgEC
-ewEBMEwwSgYIKwYBBQUHAgIwPho8VGhpcyBjZXJ0aWZpY2F0ZSBvbmx5IG1heSBiZSB1c2VkIGZv
-ciBkZW1vbnN0cmF0aW9uIHB1cnBvc2VzMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly93d3cuaWFp
-ay5hdC90ZXN0Q0EvaWFpa190ZXN0X3NpZy5jcmwwHQYDVR0OBBYEFCg66gjFLwzWj8NNmQlSzSWc
-3kDtMB8GA1UdIwQYMBaAFEwgsFYCDPeICpaIpRS0Ucw6tfK/MAkGBSsOAwIdBQADgYEAJjzWjybN
-vxgK5MyB6mXJKbmcCTGOy/VPmf8fPPVwt9IMlnQfI1NXH8YOzNj4PHbwx1b7oMuj2dY9IT/g/6T0
-dcl7/ATIC/jg6uO+nMYYqOqhzdfy/ivMyjowFE2W67SbfLWmS1NX+rhqJYP+dsZd2uf8CgoC85IB
-DdB7pf51P/UxggG9MIIBuQIBATCBtzCBrDELMAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5J
-VkVSU0lUWSBPRiBURUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZv
-cm1hdGlvbiBQcm9jZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UECxMMSUFJSyBUZXN0
-IENBMRUwEwYDVQQDEwxJQUlLIFRlc3QgQ0ECBgDzJH01OzAJBgUrDgMCGgUAoF0wGAYJKoZIhvcN
-AQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAjBgkqhkiG9w0B
-CQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc2jZawG1rLwbB
-ArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O3tzsxoRdFJts
-XIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6CVAV9K35NLifA
-Qg==</CMSSignature><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.006.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.006.Res.xml
deleted file mode 100644
index d74966a52..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.006.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.007.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.007.Req.xml
deleted file mode 100644
index 64e193d45..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.007.Req.xml
+++ /dev/null
@@ -1,27 +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>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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.007.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.007.Res.xml
deleted file mode 100644
index d74966a52..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.007.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.008.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.008.Req.xml
deleted file mode 100644
index c065b6675..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.008.Req.xml
+++ /dev/null
@@ -1,27 +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>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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.008.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.008.Res.xml
deleted file mode 100644
index d74966a52..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.008.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.009.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.009.Req.xml
deleted file mode 100644
index 21eff45c7..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.009.Req.xml
+++ /dev/null
@@ -1,27 +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>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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content Reference="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.009.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.009.Res.xml
deleted file mode 100644
index d74966a52..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.009.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.010.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.010.Req.xml
deleted file mode 100644
index 21eff45c7..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.010.Req.xml
+++ /dev/null
@@ -1,27 +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>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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content Reference="http://localhost:8080/moa-spss-testdata/resources/testDaten.txt"></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.010.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.010.Res.xml
deleted file mode 100644
index d74966a52..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.010.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></dsig:X509IssuerSerial><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></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.012.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.012.Req.xml
deleted file mode 100644
index 8c5659020..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.012.Req.xml
+++ /dev/null
@@ -1,27 +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>2003-04-04T09:30:47-05:00</DateTime><CMSSignature>MIIFxwYJKoZIhvcNAQcCoIIFuDCCBbQCAQExCzAJBgUrDgMCGgUAMCAGCSqGSIb3DQEHAaATBBFU
-aGlzIGlzIGEgbWVzc2FnZaCCA8UwggPBMIIDLqADAgECAhUA6fbXFMJ+J6++zepurwdEEeNeM08w
-CQYFKw4DAh0FADCBlTELMAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5JVkVSU0lUWSBPRiBU
-RUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZvcm1hdGlvbiBQcm9j
-ZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UEAxMMSUFJSyBUZXN0IENBMB4XDTAyMTEx
-NTA5NDA1MFoXDTAzMTIzMTIyNTkzMFoweTELMAkGA1UEBhMCQVQxDTALBgNVBAgTBFdpZW4xDTAL
-BgNVBAcTBFdpZW4xFjAUBgNVBAkTDU11c3Rlcmdhc3NlIDExGzAZBgNVBAoTEk11c3Rlcm9yZ2Fu
-aXNhdGlvbjEXMBUGA1UEAxMOTWF4IE11c3Rlcm1hbm4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAPAPGChznc4VFa5lwZGS5lhgfFN4zu0ugf714Wmq2iRYeu4U2fj0k1Y11TY8w95d7M7p5jDP
-/bXj8QH9K8LHllGUsLsaKSpRfRTIr+vfrOr1Dmc4wV9KgbjyEQiPMBRadzgUh49hbuF1vT+db7UI
-pV2mawYcKEmg3tIKJW9jR7IBAgMBAAGjggEuMIIBKjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQE
-AwIHgDBnBgNVHSAEYDBeMFwGDCsGAQQBlRIBAgMBATBMMEoGCCsGAQUFBwICMD4aPFRoaXMgY2Vy
-dGlmaWNhdGUgbWF5IGJlIHVzZWQgZm9yIGRlbW9uc3RyYXRpb24gcHVycG9zZXMgb25seTAvBgNV
-HREEKDAmgSRtYXgubXVzdGVybWFubkBtdXN0ZXJvcmdhbmlzYXRpb24uYXQwHQYDVR0OBBYEFOn2
-1xTCfievvs3qbq8HQyBcS8flMBsGByooAAoBAQEEEAwOTXVzdGVyYmVow7ZyZGUwEwYDVR0lBAww
-CgYIKwYBBQUHAwQwHwYDVR0jBBgwFoAU61Yc6emHer6/MfN1fyr+rOVA044wCQYFKw4DAh0FAAOB
-gQAtsLUhvKZvcNbAH6kR7Ou3zv6vfGL4kYXGS3S3DS06h756NJjwCFK5jcux4t080OdO2WD8aWTO
-KMIXEEc+BQqEaiQD3WoihX759m3f+nGNJXGX56UYMLH1ZytcHkvubmbFIyBgY5kfZRSUVlC+0pfF
-TgqtcJeRBVOyD2BFaLPCPjGCAbUwggGxAgEBMIGvMIGVMQswCQYDVQQGEwJBVDEmMCQGA1UEChMd
-R1JBWiBVTklWRVJTSVRZIE9GIFRFQ0hOT0xPR1kxRzBFBgNVBAsTPkluc2l0dXRlIGZvciBBcHBs
-aWVkIEluZm9ybWF0aW9uIFByb2Nlc3NpbmcgYW5kIENvbW11bmljYXRpb25zMRUwEwYDVQQDEwxJ
-QUlLIFRlc3QgQ0ECFQDp9tcUwn4nr77N6m6vB0QR414zTzAJBgUrDgMCGgUAoF0wGAYJKoZIhvcN
-AQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE5WjAjBgkqhkiG9w0B
-CQQxFgQUssrSHofb1X8aGSjkATtW+1U7uCowDQYJKoZIhvcNAQEBBQAEgYAtA8DMWjHpGXuJbWEy
-hLHVFJZj6bFNFFHxJNikVv1uhvQuesaVZ26Go9MfyughNNfcS5hYF0vy8PN00YJouYCNaywH+tEJ
-mHf++257bG/tlZIFmngSD8zoj8UjX/lBEgNGVEA9iVfUMn1oPdaRzhGX2tiA6Hczk1kUsA13iOZM
-MA==</CMSSignature><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.012.Res.xml b/spss.test/data/VC0/TestGeneratorVC0.012.Res.xml
deleted file mode 100644
index ae3c7444c..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.012.Res.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignerInfo><dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:X509SubjectName>CN=Max Mustermann,O=Musterorganisation,STREET=Mustergasse 1,L=Wien,ST=Wien,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1335699569126441074835341742398412708010421793615</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIDwTCCAy6gAwIBAgIVAOn21xTCfievvs3qbq8HRBHjXjNPMAkGBSsOAwIdBQAw
-gZUxCzAJBgNVBAYTAkFUMSYwJAYDVQQKEx1HUkFaIFVOSVZFUlNJVFkgT0YgVEVD
-SE5PTE9HWTFHMEUGA1UECxM+SW5zaXR1dGUgZm9yIEFwcGxpZWQgSW5mb3JtYXRp
-b24gUHJvY2Vzc2luZyBhbmQgQ29tbXVuaWNhdGlvbnMxFTATBgNVBAMTDElBSUsg
-VGVzdCBDQTAeFw0wMjExMTUwOTQwNTBaFw0wMzEyMzEyMjU5MzBaMHkxCzAJBgNV
-BAYTAkFUMQ0wCwYDVQQIEwRXaWVuMQ0wCwYDVQQHEwRXaWVuMRYwFAYDVQQJEw1N
-dXN0ZXJnYXNzZSAxMRswGQYDVQQKExJNdXN0ZXJvcmdhbmlzYXRpb24xFzAVBgNV
-BAMTDk1heCBNdXN0ZXJtYW5uMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDw
-Dxgoc53OFRWuZcGRkuZYYHxTeM7tLoH+9eFpqtokWHruFNn49JNWNdU2PMPeXezO
-6eYwz/214/EB/SvCx5ZRlLC7GikqUX0UyK/r36zq9Q5nOMFfSoG48hEIjzAUWnc4
-FIePYW7hdb0/nW+1CKVdpmsGHChJoN7SCiVvY0eyAQIDAQABo4IBLjCCASowDAYD
-VR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwZwYDVR0gBGAwXjBcBgwrBgEEAZUS
-AQIDAQEwTDBKBggrBgEFBQcCAjA+GjxUaGlzIGNlcnRpZmljYXRlIG1heSBiZSB1
-c2VkIGZvciBkZW1vbnN0cmF0aW9uIHB1cnBvc2VzIG9ubHkwLwYDVR0RBCgwJoEk
-bWF4Lm11c3Rlcm1hbm5AbXVzdGVyb3JnYW5pc2F0aW9uLmF0MB0GA1UdDgQWBBTp
-9tcUwn4nr77N6m6vB0MgXEvH5TAbBgcqKAAKAQEBBBAMDk11c3RlcmJlaMO2cmRl
-MBMGA1UdJQQMMAoGCCsGAQUFBwMEMB8GA1UdIwQYMBaAFOtWHOnph3q+vzHzdX8q
-/qzlQNOOMAkGBSsOAwIdBQADgYEALbC1Ibymb3DWwB+pEezrt87+r3xi+JGFxkt0
-tw0tOoe+ejSY8AhSuY3LseLdPNDnTtlg/GlkzijCFxBHPgUKhGokA91qIoV++fZt
-3/pxjSVxl+elGDCx9WcrXB5L7m5mxSMgYGOZH2UUlFZQvtKXxU4KrXCXkQVTsg9g
-RWizwj4=</dsig:X509Certificate><PublicAuthority><Code>Musterbehörde</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.051.ErrRes.xml b/spss.test/data/VC0/TestGeneratorVC0.051.ErrRes.xml
deleted file mode 100644
index 5b2b55035..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.051.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1100 \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.051.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.051.Req.xml
deleted file mode 100644
index 37b58bf56..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.051.Req.xml
+++ /dev/null
@@ -1,27 +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="0"><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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.052.ErrRes.xml b/spss.test/data/VC0/TestGeneratorVC0.052.ErrRes.xml
deleted file mode 100644
index 50ee053e9..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.052.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2249 \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.052.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.052.Req.xml
deleted file mode 100644
index 5c81cc9e6..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.052.Req.xml
+++ /dev/null
@@ -1,27 +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="10"><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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.054.ErrRes.xml b/spss.test/data/VC0/TestGeneratorVC0.054.ErrRes.xml
deleted file mode 100644
index 5b2b55035..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.054.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1100 \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.054.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.054.Req.xml
deleted file mode 100644
index 841bbb215..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.054.Req.xml
+++ /dev/null
@@ -1 +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>2003-04-04T09:30:47-05:00</DateTime><CMSSignature>this is no Base64 Data</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.055.ErrRes.xml b/spss.test/data/VC0/TestGeneratorVC0.055.ErrRes.xml
deleted file mode 100644
index 19261c267..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.055.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2248 \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.055.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.055.Req.xml
deleted file mode 100644
index 2ab6692ad..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.055.Req.xml
+++ /dev/null
@@ -1,27 +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>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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.056.ErrRes.xml b/spss.test/data/VC0/TestGeneratorVC0.056.ErrRes.xml
deleted file mode 100644
index 9fbf3f867..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.056.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2203 \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.056.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.056.Req.xml
deleted file mode 100644
index 6a320648c..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.056.Req.xml
+++ /dev/null
@@ -1,27 +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>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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>notvalidTrustProfileID</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.057.ErrRes.xml b/spss.test/data/VC0/TestGeneratorVC0.057.ErrRes.xml
deleted file mode 100644
index 19261c267..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.057.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2248 \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.057.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.057.Req.xml
deleted file mode 100644
index ab5792860..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.057.Req.xml
+++ /dev/null
@@ -1,27 +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>2003-04-04T09:30:47-05:00</DateTime><CMSSignature>MIIFxwYJKoZIhvcNAQcCoIIFuDCCBbQCAQExCzAJBgUrDgMCGgUAMCAGCSqGSIb3DQEHAaATBBFU
-aGlzIGlzIGEgbWVzc2FnZaCCA8UwggPBMIIDLqADAgECAhUA6fbXFMJ+J6++zepurwdEEeNeM08w
-CQYFKw4DAh0FADCBlTELMAkGA1UEBhMCQVQxJjAkBgNVBAoTHUdSQVogVU5JVkVSU0lUWSBPRiBU
-RUNITk9MT0dZMUcwRQYDVQQLEz5JbnNpdHV0ZSBmb3IgQXBwbGllZCBJbmZvcm1hdGlvbiBQcm9j
-ZXNzaW5nIGFuZCBDb21tdW5pY2F0aW9uczEVMBMGA1UEAxMMSUFJSyBUZXN0IENBMB4XDTAyMTEx
-NTA5NDA1MFoXDTAzMTIzMTIyNTkzMFoweTELMAkGA1UEBhMCQVQxDTALBgNVBAgTBFdpZW4xDTAL
-BgNVBAcTBFdpZW4xFjAUBgNVBAkTDU11c3Rlcmdhc3NlIDExGzAZBgNVBAoTEk11c3Rlcm9yZ2Fu
-aXNhdGlvbjEXMBUGA1UEAxMOTWF4IE11c3Rlcm1hbm4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAPAPGChznc4VFa5lwZGS5lhgfFN4zu0ugf714Wmq2iRYeu4U2fj0k1Y11TY8w95d7M7p5jDP
-/bXj8QH9K8LHllGUsLsaKSpRfRTIr+vfrOr1Dmc4wV9KgbjyEQiPMBRadzgUh49hbuF1vT+db7UI
-pV2mawYcKEmg3tIKJW9jR7IBAgMBAAGjggEuMIIBKjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQE
-AwIHgDBnBgNVHSAEYDBeMFwGDCsGAQQBlRIBAgMBATBMMEoGCCsGAQUFBwICMD4aPFRoaXMgY2Vy
-dGlmaWNhdGUgbWF5IGJlIHVzZWQgZm9yIGRlbW9uc3RyYXRpb24gcHVycG9zZXMgb25seTAvBgNV
-HREEKDAmgSRtYXgubXVzdGVybWFubkBtdXN0ZXJvcmdhbmlzYXRpb24uYXQwHQYDVR0OBBYEFOn2
-1xTCfievvs3qbq8HQyBcS8flMBsGByooAAoBAQEEEAwOTXVzdGVyYmVow7ZyZGUwEwYDVR0lBAww
-CgYIKwYBBQUHAwQwHwYDVR0jBBgwFoAU61Yc6emHer6/MfN1fyr+rOVA044wCQYFKw4DAh0FAAOB
-gQAtsLUhvKZvcNbAH6kR7Ou3zv6vfGL4kYXGS3S3DS06h756NJjwCFK5jcux4t080OdO2WD8aWTO
-KMIXEEc+BQqEaiQD3WoihX759m3f+nGNJXGX56UYMLH1ZytcHkvubmbFIyBgY5kfZRSUVlC+0pfF
-TgqtcJeRBVOyD2BFaLPCPjGCAbUwggGxAgEBMIGvMIGVMQswCQYDVQQGEwJBVDEmMCQGA1UEChMd
-R1JBWiBVTklWRVJTSVRZIE9GIFRFQ0hOT0xPR1kxRzBFBgNVBAsTPkluc2l0dXRlIGZvciBBcHBs
-aWVkIEluZm9ybWF0aW9uIFByb2Nlc3NpbmcgYW5kIENvbW11bmljYXRpb25zMRUwEwYDVQQDEwxJ
-QUlLIFRlc3QgQ0ECFQDp9tcUwn4nr77N6m6vB0QR414zTzAJBgUrDgMCGgUAoF0wGAYJKoZIhvcN
-AQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE5WjAjBgkqhkiG9w0B
-CQQxFgQUssrSHofb1X8aGSjkATtW+1U7uCowDQYJKoZIhvcNAQEBBQAEgYAtA8DMWjHpGXuJbWEy
-hLHVFJZj6bFNFFHxJNikVv1uhvQuesaVZ26Go9MfyughNNfcS5hYF0vy8PN00YJouYCNaywH+tEJ
-mHf++257bG/tlZIFmngSD8zoj8UjX/lBEgNGVEA9iVfUMn1oPdaRzhGX2tiA6Hczk1kUsA13iOZM
-MA==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.058.ErrRes.xml b/spss.test/data/VC0/TestGeneratorVC0.058.ErrRes.xml
deleted file mode 100644
index 5b2b55035..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.058.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1100 \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.058.Req.xml b/spss.test/data/VC0/TestGeneratorVC0.058.Req.xml
deleted file mode 100644
index facb651dc..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.058.Req.xml
+++ /dev/null
@@ -1,27 +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>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
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDMxMTEwMjMyNDE4WjAj
-BgkqhkiG9w0BCQQxFgQUWVob54034HfToUBDAErL5z6GFxowDQYJKoZIhvcNAQEBBQAEgYCROgBc
-2jZawG1rLwbBArvabdXBsb3YymN9nxYPCO6rCDPI8eHe51VqB42fkT+nCIrYguVI3y/fDjhwCi4O
-3tzsxoRdFJtsXIYTVJtKDusbdivZ/F068dMstQTDfNThiXhBY5QqY0BYpk5+YISclHsodebXfp6C
-VAV9K35NLifAQg==</CMSSignature><DataObject><MetaInfo><MimeType>text/plain</MimeType><Description>http://localhost:8080/moa-spss-testdata/resources/testDaten.txt</Description></MetaInfo><Content><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=()</Base64Content></Content></DataObject><TrustProfileID>TrustProfile1</TrustProfileID></VerifyCMSSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VC0/TestGeneratorVC0.Config.xml b/spss.test/data/VC0/TestGeneratorVC0.Config.xml
deleted file mode 100644
index 7d245303b..000000000
--- a/spss.test/data/VC0/TestGeneratorVC0.Config.xml
+++ /dev/null
@@ -1 +0,0 @@
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#"> <KeyGroup id="PKCS12RSAKey1"> <Key id="resources/test-ee2003_normal(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12RSAKeyExpired"> <Key id="sicher-demo(buergerkarte).p12"/> </KeyGroup> <KeyGroup id="PKCS12ECDSAKey1"> <Key id="ecc.p12"/> </KeyGroup> <KeyGroup id="HSMRSAKey1"> <Key id="???"/> </KeyGroup> <KeyGroup id="HSMECDSAKey1"> <Key id="???"/> </KeyGroup> <DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/> <SignatureAlgorithm name="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> <CreateSignatureEnvironmentProfile id="CreateSignatureEnvironmentProfile1" filename="file:/e:/cio/projekte/basismodule/wartung/projekt/spss.test/resources/csep.xml"/> <TrustProfile id="validTrustProfileID1" uri="file:/e:/cio/projekte/basismodule/wartung/projekt/spss.test/TrustProfile1/"/></MOAConfiguration> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.001.Req.xml b/spss.test/data/VX0/TestGeneratorVX.001.Req.xml
deleted file mode 100644
index cb67075b9..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.001.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 001-->
-<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-11-11T00:47:33+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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/spss.test/data/VX0/TestGeneratorVX.001.Res.xml b/spss.test/data/VX0/TestGeneratorVX.001.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.001.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.002.Req.xml b/spss.test/data/VX0/TestGeneratorVX.002.Req.xml
deleted file mode 100644
index 8750813e5..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.002.Req.xml
+++ /dev/null
@@ -1,52 +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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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/spss.test/data/VX0/TestGeneratorVX.002.Res.xml b/spss.test/data/VX0/TestGeneratorVX.002.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.002.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.003.Req.xml b/spss.test/data/VX0/TestGeneratorVX.003.Req.xml
deleted file mode 100644
index 5f022958b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.003.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 003-->
-<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-11-10T00:47:34+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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/spss.test/data/VX0/TestGeneratorVX.003.Res.xml b/spss.test/data/VX0/TestGeneratorVX.003.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.003.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.004.Req.xml b/spss.test/data/VX0/TestGeneratorVX.004.Req.xml
deleted file mode 100644
index 9a8e6bf41..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.004.Req.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 004-->
-<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-11-11T00:47:34+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.004.Res.xml b/spss.test/data/VX0/TestGeneratorVX.004.Res.xml
deleted file mode 100644
index ff18dfcb4..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.004.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.005.Req.xml b/spss.test/data/VX0/TestGeneratorVX.005.Req.xml
deleted file mode 100644
index 9ff063eba..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.005.Req.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 005-->
-<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-11-11T00:47:34+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment Reference="http://localhost:8080/moa-spss-testdata/resources/SignatureVX005.xml" >
- </VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.005.Res.xml b/spss.test/data/VX0/TestGeneratorVX.005.Res.xml
deleted file mode 100644
index 027d216ed..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.005.Res.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <XMLDSIGManifestCheck>
- <Code>1</Code>
- <Info><FailedReference>1</FailedReference><ReferringSigReference>1</ReferringSigReference> </Info>
- </XMLDSIGManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.006.Req.xml b/spss.test/data/VX0/TestGeneratorVX.006.Req.xml
deleted file mode 100644
index 4d2a6eb01..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.006.Req.xml
+++ /dev/null
@@ -1,58 +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-11-11T00:47:34+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment >
- <XMLContent xml:space="preserve">
-<daten:Document Id="myDocument" xmlns:daten="http://uri2.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://uri2.data.org http://MyServer.com/resources/something.xsd http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.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 URI="#myDocument"><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>56czmK0W7eH9KbfAZcLEpHeVk8I=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>dDWGv+8umr+bj6lPgJJEEEIIAVgXHMlrmwfBJScVFkr/is/yHWPIX8x6wv0ZtV5G
-7RyqE+toDkrHDpvDnRVhW6dZqkWcL0TrMktON6ItyRcm0ZXZQoJ506BIoa7Im49S
-pNrzixvuQ2t2FvViRQwmmTIFQB7s6eaUxgLIKYuccKw=</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>daten</daten:Document></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <SupplementProfile>
- <Content Reference="http://MyServer.com/resources/something.xsd">
- <XMLContent xml:space="preserve"><xsd:schema targetNamespace="http://uri2.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified"><xsd:element name="Document"><xsd:complexType mixed="true"><xsd:sequence minOccurs="0" maxOccurs="unbounded"><xsd:any namespace="##any" processContents="lax"/></xsd:sequence><xsd:attribute name="Id" type="xsd:ID" use="required"/></xsd:complexType></xsd:element></xsd:schema></XMLContent>
- </Content>
- </SupplementProfile>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.006.Res.xml b/spss.test/data/VX0/TestGeneratorVX.006.Res.xml
deleted file mode 100644
index d85292b1a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.006.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.007.Req.xml b/spss.test/data/VX0/TestGeneratorVX.007.Req.xml
deleted file mode 100644
index 68fe5282b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.007.Req.xml
+++ /dev/null
@@ -1,86 +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><Base64Content>PCFET0NUWVBFIERvY3VtZW50IFNZU1RFTSAiaHR0cDovL2xvY2FsaG9zdDo4MDgw
-L21vYS1zcHNzLXRlc3RkYXRhL3Jlc291cmNlcy9WWC4wMDdEVEQuZHRkIj4NCjxE
-b2N1bWVudCBJZD0ibXlEb2N1bWVudCIgeG1sbnM6eHNpPSJodHRwOi8vd3d3Lncz
-Lm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9u
-PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIGh0dHA6Ly93d3cu
-dzMub3JnL1RSL3htbGRzaWctY29yZS94bWxkc2lnLWNvcmUtc2NoZW1hLnhzZCI+
-PGRzaWc6U2lnbmF0dXJlIHhtbG5zOmRzaWc9Imh0dHA6Ly93d3cudzMub3JnLzIw
-MDAvMDkveG1sZHNpZyMiPjxkc2lnOlNpZ25lZEluZm8+PGRzaWc6Q2Fub25pY2Fs
-aXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnL1RSLzIw
-MDEvUkVDLXhtbC1jMTRuLTIwMDEwMzE1Ii8+PGRzaWc6U2lnbmF0dXJlTWV0aG9k
-IEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3Jz
-YS1zaGExIi8+PGRzaWc6UmVmZXJlbmNlIFVSST0iI215RG9jdW1lbnQiPjxkc2ln
-OlRyYW5zZm9ybXM+PGRzaWc6VHJhbnNmb3JtIEFsZ29yaXRobT0iaHR0cDovL3d3
-dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI2VudmVsb3BlZC1zaWduYXR1cmUiLz48
-L2RzaWc6VHJhbnNmb3Jtcz48ZHNpZzpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJo
-dHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjc2hhMSIvPjxkc2lnOkRp
-Z2VzdFZhbHVlPjgwcjJOUlFFYk5MMkJwamt0cmdFU2h4TW9EWT08L2RzaWc6RGln
-ZXN0VmFsdWU+PC9kc2lnOlJlZmVyZW5jZT48L2RzaWc6U2lnbmVkSW5mbz48ZHNp
-ZzpTaWduYXR1cmVWYWx1ZT5rYnhnNndObWg0S2dHaWNrZTMzUU5EeTNTeXNTTDZG
-ODh5K2ZPMFVLRlB0MGNOQmx5L2c2QjRac3lCR1lqNGZlDQpXbk10WHBOWTlDd0N5
-RVlTUkljMHhtcDVueHhUVVpxdHUreWpzWnQ0Vi9vUFdqNkNiMy9nQVhQRG1iVVRs
-QWFlDQp1cGdqQ1pIR3NPNzB1eTVlRWhZN1JSRFZ5K0VPTFFNeVpoQjVrNWhNbmVj
-PTwvZHNpZzpTaWduYXR1cmVWYWx1ZT48ZHNpZzpLZXlJbmZvPjxkc2lnOlg1MDlE
-YXRhPjxkc2lnOlg1MDlDZXJ0aWZpY2F0ZT5NSUlEYnpDQ0F0eWdBd0lCQWdJR0FQ
-TWtBNFpzTUFrR0JTc09Bd0lkQlFBd2dhd3hDekFKQmdOVkJBWVRBa0ZVDQpNU1l3
-SkFZRFZRUUtFeDFIVWtGYUlGVk9TVlpGVWxOSlZGa2dUMFlnVkVWRFNFNVBURTlI
-V1RGSE1FVUdBMVVFDQpDeE0rU1c1emFYUjFkR1VnWm05eUlFRndjR3hwWldRZ1NX
-NW1iM0p0WVhScGIyNGdVSEp2WTJWemMybHVaeUJoDQpibVFnUTI5dGJYVnVhV05o
-ZEdsdmJuTXhGVEFUQmdOVkJBc1RERWxCU1VzZ1ZHVnpkQ0JEUVRFVk1CTUdBMVVF
-DQpBeE1NU1VGSlN5QlVaWE4wSUVOQk1CNFhEVEF6TURJd016RTBNRGMwTlZvWERU
-QXpNVEl6TURJeU5Ua3pNRm93DQpnYXd4Q3pBSkJnTlZCQVlUQWtGVU1TWXdKQVlE
-VlFRS0V4MUhVa0ZhSUZWT1NWWkZVbE5KVkZrZ1QwWWdWRVZEDQpTRTVQVEU5SFdU
-RkhNRVVHQTFVRUN4TStTVzV6YVhSMWRHVWdabTl5SUVGd2NHeHBaV1FnU1c1bWIz
-SnRZWFJwDQpiMjRnVUhKdlkyVnpjMmx1WnlCaGJtUWdRMjl0YlhWdWFXTmhkR2x2
-Ym5NeEZUQVRCZ05WQkFzVERFbEJTVXNnDQpWR1Z6ZENCRFFURVZNQk1HQTFVRUF4
-TU1TVUZKU3lCVVpYTjBJRU5CTUlHZk1BMEdDU3FHU0liM0RRRUJBUVVBDQpBNEdO
-QURDQmlRS0JnUUNVV0tsNnV5Ui9pc3R5MkRMVmRCengwNzRxT2ZKK09QOEo2UFZp
-OUdYNTI3dTBUVFdUDQorTExMOGJnWUN3UE9GUVNycHFTbWIyd09keFd3WVFmaGF0
-S3Z6dlV3NFViL0Jmd0VzdGZYcy94ZjZ6NElGMktPDQptbVJNREkxejhTRTE3MDFT
-RlRVb1lkOVpCOEtVdHlwNmRGZDRjSXVqTzg0RE1FKzZSQVp4dHNHV0x3SURBUUFC
-DQpvNEdoTUlHZU1CSUdBMVVkRXdFQi93UUlNQVlCQWY4Q0FRQXdEZ1lEVlIwUEFR
-SC9CQVFEQWdIR01EZ0dBMVVkDQpId1F4TUM4d0xhQXJvQ21HSjJoMGRIQTZMeTkz
-ZDNjdWFXRnBheTVoZEM5MFpYTjBMV05oTDNSbGMzUlFRMEV1DQpZM0pzYkRBZEJn
-TlZIUTRFRmdRVVRDQ3dWZ0lNOTRnS2xvaWxGTFJSekRxMThyOHdId1lEVlIwakJC
-Z3dGb0FVDQpUQ0N3VmdJTTk0Z0tsb2lsRkxSUnpEcTE4cjh3Q1FZRkt3NERBaDBG
-QUFPQmdRQ0N4NlZQam1VZGVxR2N0UVRoDQpTZzJkRVlkbGFsL1g1azUyM25RNTRT
-c29YMnNoSVFLLzh6Sk9HelFkTWplYnVwSUsrdFBpWjdTSnpzQWFNVWk0DQpIZ3Fx
-M2oxRksrS3hMaXF0dDM1dHdvZlZZT3UxNVpqMFhJdThFTXp2RTA1eW50bFBqdEdi
-cDlsbDhkd012YWJQDQoraldoQ1hBbjZ3MmMyeGRwaEw4bm9rU05MQT09PC9kc2ln
-Olg1MDlDZXJ0aWZpY2F0ZT48ZHNpZzpYNTA5Q2VydGlmaWNhdGU+TUlJRDF6Q0NB
-MFNnQXdJQkFnSUdBUE1rZlRVN01Ba0dCU3NPQXdJZEJRQXdnYXd4Q3pBSkJnTlZC
-QVlUQWtGVQ0KTVNZd0pBWURWUVFLRXgxSFVrRmFJRlZPU1ZaRlVsTkpWRmtnVDBZ
-Z1ZFVkRTRTVQVEU5SFdURkhNRVVHQTFVRQ0KQ3hNK1NXNXphWFIxZEdVZ1ptOXlJ
-RUZ3Y0d4cFpXUWdTVzVtYjNKdFlYUnBiMjRnVUhKdlkyVnpjMmx1WnlCaA0KYm1R
-Z1EyOXRiWFZ1YVdOaGRHbHZibk14RlRBVEJnTlZCQXNUREVsQlNVc2dWR1Z6ZENC
-RFFURVZNQk1HQTFVRQ0KQXhNTVNVRkpTeUJVWlhOMElFTkJNQjRYRFRBek1ESXdN
-ekUyTWpBMU5Wb1hEVEF6TVRJek1ESXlOVGt6TUZvdw0KZ1pneEN6QUpCZ05WQkFZ
-VEFrRlVNU1l3SkFZRFZRUUtFeDFIVWtGYUlGVk9TVlpGVWxOSlZGa2dUMFlnVkVW
-RA0KU0U1UFRFOUhXVEZITUVVR0ExVUVDeE0rU1c1emFYUjFkR1VnWm05eUlFRndj
-R3hwWldRZ1NXNW1iM0p0WVhScA0KYjI0Z1VISnZZMlZ6YzJsdVp5QmhibVFnUTI5
-dGJYVnVhV05oZEdsdmJuTXhHREFXQmdOVkJBTVVEMGx6YjJ4aw0KWlNCQy9ISm5a
-WEpwYmpDQm56QU5CZ2txaGtpRzl3MEJBUUVGQUFPQmpRQXdnWWtDZ1lFQTUzbTBx
-bmc2Tzl6Vg0KSUF1SjIyUHM5MVgrcGRkaE1pQTlQMFF1c01leFErUUVrZmU0M25F
-RklUb1VaM3V1b0FRRmQrbjRNWE02RDY4dA0KWmN0R1U1TzRXNUFxL2JFakk0ZWZJ
-SFMwRVRoemdOQXltcW1UOVo5SUlFaHFtLzFqaFE0U1hUVzMzeTNYbjNseA0KMjZE
-aVRlQXBmdHVRQjM4OFlsVitScytyVHlGOWlSVUNBd0VBQWFPQ0FSd3dnZ0VZTUF3
-R0ExVWRFd0VCL3dRQw0KTUFBd0RnWURWUjBQQVFIL0JBUURBZ2JBTUJFR0NXQ0dT
-QUdHK0VJQkFRUUVBd0lGSURCbkJnTlZIU0FFWURCZQ0KTUZ3R0RDc0dBUVFCbFJJ
-QkFuc0JBVEJNTUVvR0NDc0dBUVVGQndJQ01ENGFQRlJvYVhNZ1kyVnlkR2xtYVdO
-aA0KZEdVZ2IyNXNlU0J0WVhrZ1ltVWdkWE5sWkNCbWIzSWdaR1Z0YjI1emRISmhk
-R2x2YmlCd2RYSndiM05sY3pBOA0KQmdOVkhSOEVOVEF6TURHZ0w2QXRoaXRvZEhS
-d09pOHZkM2QzTG1saGFXc3VZWFF2ZEdWemRFTkJMMmxoYVd0Zg0KZEdWemRGOXph
-V2N1WTNKc01CMEdBMVVkRGdRV0JCUW9PdW9JeFM4TTFvL0RUWmtKVXMwbG5ONUE3
-VEFmQmdOVg0KSFNNRUdEQVdnQlJNSUxCV0FnejNpQXFXaUtVVXRGSE1Pclh5dnpB
-SkJnVXJEZ01DSFFVQUE0R0JBQ1k4MW84bQ0KemI4WUN1VE1nZXBseVNtNW5Ba3hq
-c3YxVDVuL0h6ejFjTGZTREpaMEh5TlRWeC9HRHN6WStEeDI4TWRXKzZETA0Kbzlu
-V1BTRS80UCtrOUhYSmUvd0V5QXY0NE9yanZwekdHS2pxb2MzWDh2NHJ6TW82TUJS
-Tmx1dTBtM3kxcGt0VA0KVi9xNGFpV0QvbmJHWGRybi9Bb0tBdk9TQVEzUWU2WCtk
-VC8xPC9kc2lnOlg1MDlDZXJ0aWZpY2F0ZT48L2RzaWc6WDUwOURhdGE+PC9kc2ln
-OktleUluZm8+PC9kc2lnOlNpZ25hdHVyZT4NCmRhdGVuDQo8L0RvY3VtZW50Pg==</Base64Content></VerifySignatureEnvironment><VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation></VerifySignatureInfo> <SupplementProfile>
- <Content Reference="http://localhost:8080/moa-spss-testdata/resources/VX.007DTD.dtd">
- <Base64Content>PCFFTEVNRU5UIERvY3VtZW50ICgjUENEQVRBfEFOWSkqPg0KPCFBVFRMSVNUIERv
-Y3VtZW50IElkIElEICNSRVFVSVJFRD4NCg==</Base64Content>
- </Content>
- </SupplementProfile>
-<TrustProfileID>TrustProfile1</TrustProfileID></VerifyXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.007.Res.xml b/spss.test/data/VX0/TestGeneratorVX.007.Res.xml
deleted file mode 100644
index ff18dfcb4..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.007.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.008.Req.xml b/spss.test/data/VX0/TestGeneratorVX.008.Req.xml
deleted file mode 100644
index bb036ece9..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.008.Req.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><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 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>4lngV1x/OvR8iFWEBenH4fDihwA=</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>1j0DWguieuw2cGA06gFjoSNXr+w=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Yb6fsPNbKyYW+u7cU1EqF9n5QrwLXHqdGD4tJNT5+sA7kQR3Ztqz965vlBH+1pJEnGxehxXsesZboVvkJa/jhuI0goCTW9KkdGOP71B7o7/vlyBbxaYKpnVNtBU4/qtTxba7M0E32X+tm/x9O6foXIM0AoP3oQBZmjo9rEJ9kfk=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIFJTCCBA2gAwIBAgICGTcwDQYJKoZIhvcNAQEFBQAwgaExCzAJBgNVBAYTAkFUMUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIzAhBgNVBAsTGmEtc2lnbi1URVNULVByZW1pdW0tRW5jLTAxMSMwIQYDVQQDExphLXNpZ24tVEVTVC1QcmVtaXVtLUVuYy0wMTAeFw0wMzAyMTAxMzIwNThaFw0wNjAyMTAxMzIwNThaMGoxCzAJBgNVBAYTAkFUMRwwGgYDVQQDExNUZXN0cGVyc29uIE1PQTQgQlJaMQwwCgYDVQQEEwNCUloxGDAWBgNVBCoTD1Rlc3RwZXJzb24gTU9BNDEVMBMGA1UEBRMMNzkwMTg3NDYxNjMzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDS/UW1/tZeCh7HHQmj8auUTEc4edAgRDkUVKOm0tF3kE3WZlhGDZL0p84xsdIKyI+bwDCMATATkQwDo/Xxn9jJMi4/t80bNyRsHk9giA0wcvz9NgmEcDwKNqawGsR9gNeK8TyIC8AuDkj1EwtkAObMvtp/Z1phi47x3JxDDfGDpQIDAQABo4ICHzCCAhswEwYDVR0jBAwwCoAIS7OAw3GTPNgwJwYIKwYBBQUHAQMBAf8EGDAWMAgGBgQAjkYBATAKBggrBgEFBQcLATCBggYIKwYBBQUHAQEEdjB0MCkGCCsGAQUFBzABhh1odHRwOi8vd3d3LmEtdHJ1c3QuYXQ6ODIvb2NzcDBHBggrBgEFBQcwAoY7aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Etc2lnbi1URVNULVByZW1pdW0tU2lnLTAxYS5jcnQwgZQGA1UdIASBjDCBiTB9BgYqKAARAQQwczA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVRFU1QwOgYIKwYBBQUHAgIwLhosRGllc2VzIFplcnRpZmlrYXQgZGllbnQgbnVyIHp1IFRlc3R6d2Vja2VuICEwCAYGBACLMAEBMG8GA1UdHwRoMGYwZKBioGCGXmxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLVRFU1QtUHJlbWl1bS1FbmMtMDEsbz1BLVRydXN0LGM9QVQ/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdD8wEQYDVR0OBAoECE4DxL9ky4M+MA4GA1UdDwEB/wQEAwIGwDAgBgNVHREEGTAXgRV0ZXN0cGVyc29uNEBicnouZ3YuYXQwCQYDVR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEAioVvsZN+NnQxXMTGdjKveTBMRTYzHflkSC8lI9XXltP5+mjIuoB2Tn6voovA8dXz9jTsnQt8f8ye0CL2bSS9UVD1jv8So3bavquW+HlkZBAZvL39APNLPjUUnWn0QOnrQAJ6W47UwGAUgEw3KcBcJaEa4Xb/8kUj618xGzWl6X0mKsVpxkrf+5Cj+nmwDqChll08/90MmhSY4M5FrvmQ9GjAN5FHVsk0FPp02tKCRzoBJtzpB1DWKHlgiDHUAXy5eD0XI7PXebPNZ4InvY/jC/IH8PRLdJT249YQmUxZ4neTtFDvb8C1Qh6k725fh3hVxqX8ZwwWj9+iGQVk53K3CA==</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data"><sl10:InfoboxReadRequest xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#"><sl10:InfoboxIdentifier>IdentityLink</sl10:InfoboxIdentifier><sl10:BinaryFileParameters ContentIsXMLEntity="true"/></sl10:InfoboxReadRequest></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-03-04T12:32:54Z</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/xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment><VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation></VerifySignatureInfo><TrustProfileID>TrustProfile1</TrustProfileID></VerifyXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.008.Res.xml b/spss.test/data/VX0/TestGeneratorVX.008.Res.xml
deleted file mode 100644
index 2152cd3d5..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.008.Res.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" > <SignerInfo> <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> <dsig:X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</dsig:X509SubjectName> <dsig:X509IssuerSerial> <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> </dsig:X509IssuerSerial><dsig:X509Certificate>MIIFJTCCBA2gAwIBAgICGTcwDQYJKoZIhvcNAQEFBQAwgaExCzAJBgNVBAYTAkFUMUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIzAhBgNVBAsTGmEtc2lnbi1URVNULVByZW1pdW0tRW5jLTAxMSMwIQYDVQQDExphLXNpZ24tVEVTVC1QcmVtaXVtLUVuYy0wMTAeFw0wMzAyMTAxMzIwNThaFw0wNjAyMTAxMzIwNThaMGoxCzAJBgNVBAYTAkFUMRwwGgYDVQQDExNUZXN0cGVyc29uIE1PQTQgQlJaMQwwCgYDVQQEEwNCUloxGDAWBgNVBCoTD1Rlc3RwZXJzb24gTU9BNDEVMBMGA1UEBRMMNzkwMTg3NDYxNjMzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDS/UW1/tZeCh7HHQmj8auUTEc4edAgRDkUVKOm0tF3kE3WZlhGDZL0p84xsdIKyI+bwDCMATATkQwDo/Xxn9jJMi4/t80bNyRsHk9giA0wcvz9NgmEcDwKNqawGsR9gNeK8TyIC8AuDkj1EwtkAObMvtp/Z1phi47x3JxDDfGDpQIDAQABo4ICHzCCAhswEwYDVR0jBAwwCoAIS7OAw3GTPNgwJwYIKwYBBQUHAQMBAf8EGDAWMAgGBgQAjkYBATAKBggrBgEFBQcLATCBggYIKwYBBQUHAQEEdjB0MCkGCCsGAQUFBzABhh1odHRwOi8vd3d3LmEtdHJ1c3QuYXQ6ODIvb2NzcDBHBggrBgEFBQcwAoY7aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Etc2lnbi1URVNULVByZW1pdW0tU2lnLTAxYS5jcnQwgZQGA1UdIASBjDCBiTB9BgYqKAARAQQwczA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVRFU1QwOgYIKwYBBQUHAgIwLhosRGllc2VzIFplcnRpZmlrYXQgZGllbnQgbnVyIHp1IFRlc3R6d2Vja2VuICEwCAYGBACLMAEBMG8GA1UdHwRoMGYwZKBioGCGXmxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLVRFU1QtUHJlbWl1bS1FbmMtMDEsbz1BLVRydXN0LGM9QVQ/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdD8wEQYDVR0OBAoECE4DxL9ky4M+MA4GA1UdDwEB/wQEAwIGwDAgBgNVHREEGTAXgRV0ZXN0cGVyc29uNEBicnouZ3YuYXQwCQYDVR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEAioVvsZN+NnQxXMTGdjKveTBMRTYzHflkSC8lI9XXltP5+mjIuoB2Tn6voovA8dXz9jTsnQt8f8ye0CL2bSS9UVD1jv8So3bavquW+HlkZBAZvL39APNLPjUUnWn0QOnrQAJ6W47UwGAUgEw3KcBcJaEa4Xb/8kUj618xGzWl6X0mKsVpxkrf+5Cj+nmwDqChll08/90MmhSY4M5FrvmQ9GjAN5FHVsk0FPp02tKCRzoBJtzpB1DWKHlgiDHUAXy5eD0XI7PXebPNZ4InvY/jC/IH8PRLdJT249YQmUxZ4neTtFDvb8C1Qh6k725fh3hVxqX8ZwwWj9+iGQVk53K3CA==</dsig:X509Certificate> <sl11:QualifiedCertificate xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#"/> </dsig:X509Data> </SignerInfo> <SignatureCheck> <Code>0</Code> </SignatureCheck> <CertificateCheck> <Code>0</Code> </CertificateCheck></VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.009.Req.xml b/spss.test/data/VX0/TestGeneratorVX.009.Req.xml
deleted file mode 100644
index 201326a8a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.009.Req.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 009-->
-<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-11-11T00:47:35+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment >
- <XMLContent xml:space="preserve">
-<daten:Document Id="myDocument" xmlns:daten="http://uri2.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://uri2.data.org http://MyServer.com/resources/something.xsd http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.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 URI="#xpointer(id(myDocument))"><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>2jmj7l5rSw0yVb/vlWAYkK/YBwk=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>EdJ7kVfAG4f52O5jXZr8UiBaschtqrau5pmpmLvUSXNyO44dapKJRhAUhh1dYWQA
-62GKHrRMzYFIWKFAgslB/YHWgFxCsEZzrYp1yT+y40qMnemDO/wMhEPS1tpnhpLW
-c6GZjZzC8cErefi2SZZxeB1FWdN90iqvGd8hSBLz1rg=</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>daten</daten:Document></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <SupplementProfile>
- <Content Reference="http://MyServer.com/resources/something.xsd">
- <XMLContent xml:space="preserve"><xsd:schema targetNamespace="http://uri2.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified"><xsd:element name="Document"><xsd:complexType mixed="true"><xsd:sequence minOccurs="0" maxOccurs="unbounded"><xsd:any namespace="##any" processContents="lax"/></xsd:sequence><xsd:attribute name="Id" type="xsd:ID" use="required"/></xsd:complexType></xsd:element></xsd:schema></XMLContent>
- </Content>
- </SupplementProfile>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.009.Res.xml b/spss.test/data/VX0/TestGeneratorVX.009.Res.xml
deleted file mode 100644
index d85292b1a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.009.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.052.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.052.ErrRes.xml
deleted file mode 100644
index 5b2b55035..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.052.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1100 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.052.Req.xml b/spss.test/data/VX0/TestGeneratorVX.052.Req.xml
deleted file mode 100644
index b4e44d5d7..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.052.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 052-->
-<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-06-30T14:02:42+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:NoValidDSigSignedInfo><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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:NoValidDSigSignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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/spss.test/data/VX0/TestGeneratorVX.053.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.053.ErrRes.xml
deleted file mode 100644
index 483d07b5d..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.053.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2212 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.053.Req.xml b/spss.test/data/VX0/TestGeneratorVX.053.Req.xml
deleted file mode 100644
index acbc588db..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.053.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 053-->
-<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-06-30T14:02:42+01:00</DateTime>
- <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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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>//invalid XPath Expression</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.054.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.054.ErrRes.xml
deleted file mode 100644
index 483d07b5d..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.054.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2212 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.054.Req.xml b/spss.test/data/VX0/TestGeneratorVX.054.Req.xml
deleted file mode 100644
index b400bd52a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.054.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 054-->
-<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-06-30T14:02:42+01:00</DateTime>
- <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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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:NoValidElement</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.055.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.055.ErrRes.xml
deleted file mode 100644
index 9fbf3f867..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.055.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2203 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.055.Req.xml b/spss.test/data/VX0/TestGeneratorVX.055.Req.xml
deleted file mode 100644
index e91aec7bf..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.055.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 055-->
-<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-06-30T14:02:42+01:00</DateTime>
- <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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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>InvalidProfile</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.101.Req.xml b/spss.test/data/VX0/TestGeneratorVX.101.Req.xml
deleted file mode 100644
index 48650c983..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.101.Req.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 101-->
-<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-11-11T00:47:35+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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>
- <SupplementProfile>
- <MetaInfo>
- <MimeType>text/plain</MimeType> <Description>http://www.buergerkarte.at</Description> </MetaInfo> <Content Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt">
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content>
- </Content>
- </SupplementProfile>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.101.Res.xml b/spss.test/data/VX0/TestGeneratorVX.101.Res.xml
deleted file mode 100644
index d85292b1a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.101.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.102.Req.xml b/spss.test/data/VX0/TestGeneratorVX.102.Req.xml
deleted file mode 100644
index 2e4c793c7..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.102.Req.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 102-->
-<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-11-11T00:47:35+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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>
- <SupplementProfile>
- <MetaInfo>
- <MimeType>text/plain</MimeType> </MetaInfo> <Content Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt">
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content>
- </Content>
- </SupplementProfile>
-<ReturnHashInputData/> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.102.Res.xml b/spss.test/data/VX0/TestGeneratorVX.102.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.102.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.103.Req.xml b/spss.test/data/VX0/TestGeneratorVX.103.Req.xml
deleted file mode 100644
index c8ae73f96..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.103.Req.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 103-->
-<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-11-11T00:47:35+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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>
- <SupplementProfile>
- <Content Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt">
- <XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent>
- </Content>
- </SupplementProfile>
-<ReturnHashInputData/> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.103.Res.xml b/spss.test/data/VX0/TestGeneratorVX.103.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.103.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.104.Req.xml b/spss.test/data/VX0/TestGeneratorVX.104.Req.xml
deleted file mode 100644
index ff955286d..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.104.Req.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 104 - Supplement/Content/XMLContent instead of Supplement/Content/Base64Content-->
-<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-11-11T00:47:35+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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>
- <SupplementProfile>
- <Content Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt">
- <XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent>
- </Content>
- </SupplementProfile>
-<ReturnHashInputData/> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.104.Res.xml b/spss.test/data/VX0/TestGeneratorVX.104.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.104.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.105.Req.xml b/spss.test/data/VX0/TestGeneratorVX.105.Req.xml
deleted file mode 100644
index 3092d3245..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.105.Req.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 105 - 2 Supplement elements-->
-<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-11-11T00:47:35+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference><dsig:Reference URI="http://localhost:8080/moa-spss-testdata/resources/testXML.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Z9Rr4wyNUP2Pe0sBdLz447sJt8o=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>4iRKV9DwXTBtwfJUkkDaszoi7fMxASfl9z1znCRQcogBIv3jtu0azgS9IQUAg0yu
-3P0E0KP/jEGqlZ83gptd5WbIXuht4Tv8d4YW6h9V7zQCjfjDKicRH8HQdHWRzUHL
-qea2hmjvQhVCeAiFWggK3J6d2TpDINhKMc/27j0sBCY=</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>
- <SupplementProfile>
- <Content Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt">
- <XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent>
- </Content>
- </SupplementProfile>
- <SupplementProfile>
- <Content Reference="http://localhost:8080/moa-spss-testdata/resources/testXML.txt">
- <Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxIdWdvPg0K
-CVRlc3QNCjwvSHVnbz4=</Base64Content>
- </Content>
- </SupplementProfile>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.105.Res.xml b/spss.test/data/VX0/TestGeneratorVX.105.Res.xml
deleted file mode 100644
index f963026dd..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.105.Res.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<HashInputData><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content></HashInputData><HashInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxIdWdvPg0K
-CVRlc3QNCjwvSHVnbz4=</Base64Content></HashInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.106.Req.xml b/spss.test/data/VX0/TestGeneratorVX.106.Req.xml
deleted file mode 100644
index f565e79a5..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.106.Req.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 106 - 2 SupplementProfileID elements-->
-<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-11-11T00:47:36+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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>
-<SupplementProfileID>SupplementProfile2</SupplementProfileID><!-- Supplement Profile 2 enthaelt nicht die referenzierte URI --><SupplementProfileID>SupplementProfile1</SupplementProfileID><ReturnHashInputData/> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.106.Res.xml b/spss.test/data/VX0/TestGeneratorVX.106.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.106.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.151.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.151.ErrRes.xml
deleted file mode 100644
index 509145e76..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.151.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2264 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.151.Req.xml b/spss.test/data/VX0/TestGeneratorVX.151.Req.xml
deleted file mode 100644
index 426adc20e..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.151.Req.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 151 an URI referenced in dsig:Signature does not resolve and no SupplementProfile is available-->
-<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-06-30T14:02:42+01:00</DateTime>
- <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://no.uritoresolve.com"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.153.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.153.ErrRes.xml
deleted file mode 100644
index c57606715..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.153.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2267 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.153.Req.xml b/spss.test/data/VX0/TestGeneratorVX.153.Req.xml
deleted file mode 100644
index 5ae6efe51..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.153.Req.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 153 - invalid SupplementProfileID-->
-<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-06-30T14:02:43+01:00</DateTime>
- <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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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>
-<SupplementProfileID>NO VALID SUPPLEMENT PROFILE ID</SupplementProfileID> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.154.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.154.ErrRes.xml
deleted file mode 100644
index 5b2b55035..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.154.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1100 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.154.Req.xml b/spss.test/data/VX0/TestGeneratorVX.154.Req.xml
deleted file mode 100644
index 80cfd11ee..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.154.Req.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 154-->
-<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-06-30T14:02:43+01:00</DateTime>
- <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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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>
- <SupplementProfile>
- <MetaInfo>
- <MimeType>text/plain</MimeType> <Description>http://www.buergerkarte.at</Description> </MetaInfo> <Content Reference="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt">
- <Base64Content>AAAAAAAAAAAAAAAAAARGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>
- </Content>
- </SupplementProfile>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.201.Req.xml b/spss.test/data/VX0/TestGeneratorVX.201.Req.xml
deleted file mode 100644
index c442ae3ea..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.201.Req.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 201 a simple request w/ SignatureManifestCheckParams (but w/o Supplement)-->
-<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-06-30T14:02:29+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>znXa5lI9gbH3HQooxjQuRXO7M0V13EVPoOanz3P+Z+O7IQ/xAcwrVPWj59QpT1FL
-gDusafWjNhBYD7R+o3Gwsk+8cCqUcuthSZPKDJdDBTsOzkoipmY11B3/hBZFC3Tu
-ArPys8l0/ve9kIOjt4cOqmNv+9Q0mmRL28X4C0MawLg=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.201.Res.xml b/spss.test/data/VX0/TestGeneratorVX.201.Res.xml
deleted file mode 100644
index 0afa9f231..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.201.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>0</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.202.Req.xml b/spss.test/data/VX0/TestGeneratorVX.202.Req.xml
deleted file mode 100644
index 5c3fbdf98..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.202.Req.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 202 no SignatureManifestCheckParams/@ReturnReferenceInputData-->
-<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-06-30T14:02:30+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>znXa5lI9gbH3HQooxjQuRXO7M0V13EVPoOanz3P+Z+O7IQ/xAcwrVPWj59QpT1FL
-gDusafWjNhBYD7R+o3Gwsk+8cCqUcuthSZPKDJdDBTsOzkoipmY11B3/hBZFC3Tu
-ArPys8l0/ve9kIOjt4cOqmNv+9Q0mmRL28X4C0MawLg=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams><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" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.202.Res.xml b/spss.test/data/VX0/TestGeneratorVX.202.Res.xml
deleted file mode 100644
index 0afa9f231..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.202.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>0</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.203.Req.xml b/spss.test/data/VX0/TestGeneratorVX.203.Req.xml
deleted file mode 100644
index 746dd3951..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.203.Req.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 203 SignatureManifestCheckParams/@ReturnReferenceInputData = false-->
-<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-06-30T14:02:31+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>znXa5lI9gbH3HQooxjQuRXO7M0V13EVPoOanz3P+Z+O7IQ/xAcwrVPWj59QpT1FL
-gDusafWjNhBYD7R+o3Gwsk+8cCqUcuthSZPKDJdDBTsOzkoipmY11B3/hBZFC3Tu
-ArPys8l0/ve9kIOjt4cOqmNv+9Q0mmRL28X4C0MawLg=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="false"><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" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.203.Res.xml b/spss.test/data/VX0/TestGeneratorVX.203.Res.xml
deleted file mode 100644
index e9b9fbd86..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.203.Res.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>0</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.205.Req.xml b/spss.test/data/VX0/TestGeneratorVX.205.Req.xml
deleted file mode 100644
index e984d398f..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.205.Req.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 206 - 2 dsig:Transform elements ==> Canonisierung + Stylesheet-->
-<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-06-30T14:02:34+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>OytjSgIBrgFgwKJu/v0ACwO2x/PuO/gxjWrcI6hzNH6xvA5plofwYE0r9fJkaH64
-gdcVHzIlo168kg0Dnywk30qkCzKk1hsAfBtf/py8vlPR/QWsHux1xB4xiLzhxuF8
-goZ+KKcvz8Uhucy71qbcmFdCWmI55515ezbpERCq7bc=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.205.Res.xml b/spss.test/data/VX0/TestGeneratorVX.205.Res.xml
deleted file mode 100644
index 0afa9f231..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.205.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>0</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.206.Req.xml b/spss.test/data/VX0/TestGeneratorVX.206.Req.xml
deleted file mode 100644
index b342499a6..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.206.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 206 TransformParameter/Hash statt TransformParameter/Base64Content (Der Hash wird von CX1_book.xsl gebildet)-->
-<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-06-30T14:02:35+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>znXa5lI9gbH3HQooxjQuRXO7M0V13EVPoOanz3P+Z+O7IQ/xAcwrVPWj59QpT1FL
-gDusafWjNhBYD7R+o3Gwsk+8cCqUcuthSZPKDJdDBTsOzkoipmY11B3/hBZFC3Tu
-ArPys8l0/ve9kIOjt4cOqmNv+9Q0mmRL28X4C0MawLg=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Hash><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></Hash></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.206.Res.xml b/spss.test/data/VX0/TestGeneratorVX.206.Res.xml
deleted file mode 100644
index 0afa9f231..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.206.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>0</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.208.Req.xml b/spss.test/data/VX0/TestGeneratorVX.208.Req.xml
deleted file mode 100644
index f1cf1407f..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.208.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 208 - weder Base64Content noch Hash wird verwendet -->
-<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-06-30T14:02:36+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>znXa5lI9gbH3HQooxjQuRXO7M0V13EVPoOanz3P+Z+O7IQ/xAcwrVPWj59QpT1FL
-gDusafWjNhBYD7R+o3Gwsk+8cCqUcuthSZPKDJdDBTsOzkoipmY11B3/hBZFC3Tu
-ArPys8l0/ve9kIOjt4cOqmNv+9Q0mmRL28X4C0MawLg=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.208.Res.xml b/spss.test/data/VX0/TestGeneratorVX.208.Res.xml
deleted file mode 100644
index 0afa9f231..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.208.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>0</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.209.Req.xml b/spss.test/data/VX0/TestGeneratorVX.209.Req.xml
deleted file mode 100644
index 0313487de..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.209.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 209 0 TransformParameter ==> ganzes Element raus und direkt auf CX1_book.xsl verweisen (in der Transformations-Referenz)-->
-<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-06-30T14:02:36+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:output indent="no" method="html"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>qeKBMCrzXCqI4a5M0Fwsng/tBIslBtIJMefvH+soUHe2PKh6UDCrPixmIuXx2GbB
-DEomSF2AzeCLm9Z4tapxx0f0eJq1mJw8udzL+qANx4dgmOFwwGZ4L+TRC56VpHIR
-reUrL8YKhn7vE9aU0K3XW/xp2JMG0+CHPrWES5RDdis=</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 Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output indent="no" method="html"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.209.Res.xml b/spss.test/data/VX0/TestGeneratorVX.209.Res.xml
deleted file mode 100644
index 019319a92..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.209.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>2</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.210.Req.xml b/spss.test/data/VX0/TestGeneratorVX.210.Req.xml
deleted file mode 100644
index b58453e8d..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.210.Req.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 210 2 includes-->
-<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-06-30T14:02:37+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book0.xsl"/>
- <xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book1.xsl"/>
-</xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>kK81Gw6OGWZ0V9WRv1yw1Cfr3jo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>A+nlyca9189rpvNfOVcAXs054rY=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VYsDD4B3b9ch5AQ4RSiq+Jtt2WozSZhIFb5FmLZnD8za9DdJPb7zmPfy7Z3BcB4a
-RL/mYpSaKCJB/L9yTpGSvoEV0tCveJ1RZn+8AKmcWs9ofka8y8kXb3LP6QtCqxA/
-1x5P66Wcwd7WNMgxR0Jq3ppKPiCJPagVt+/SEhVR0cU=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book0.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IG9sarUVRiU1sOIxyZRQPDw4OW8=</dsig:DigestValue></dsig:Reference><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book1.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>keikH7Iv/jkJlGdGVk4jEaoWDzI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book0.xsl"/>
- <xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book1.xsl"/>
-</xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book0.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iLyI+PEhUTUw+PEJPRFk+
-PGgxPlVlYmVyc2NocmlmdDwvaDE+PHhzbDphcHBseS10ZW1wbGF0ZXMvPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book1.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SDE+QnVjaDogPHhzbDp2YWx1
-ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwveHNsOnRlbXBsYXRlPjwv
-eHNsOnN0eWxlc2hlZXQ+</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.210.Res.xml b/spss.test/data/VX0/TestGeneratorVX.210.Res.xml
deleted file mode 100644
index a175eca8a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.210.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book0.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IG9sarUVRiU1sOIxyZRQPDw4OW8=</dsig:DigestValue></dsig:Reference><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book1.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>keikH7Iv/jkJlGdGVk4jEaoWDzI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>0</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.211.Req.xml b/spss.test/data/VX0/TestGeneratorVX.211.Req.xml
deleted file mode 100644
index ad8871a22..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.211.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 211 2 VerifyTransformsInfoID ==> Statt TransformsInfoProfile , in ein IntoProfileID auf Datei mit orig.Daten des TransInfoProfile verweisen, das andere auf ein Transforms, das nur Canonisiserung enthaelt-->
-<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-06-30T14:02:37+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>znXa5lI9gbH3HQooxjQuRXO7M0V13EVPoOanz3P+Z+O7IQ/xAcwrVPWj59QpT1FL
-gDusafWjNhBYD7R+o3Gwsk+8cCqUcuthSZPKDJdDBTsOzkoipmY11B3/hBZFC3Tu
-ArPys8l0/ve9kIOjt4cOqmNv+9Q0mmRL28X4C0MawLg=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfileID>TransformsInfoProfile1</VerifyTransformsInfoProfileID><VerifyTransformsInfoProfileID>TransformsInfoProfile2</VerifyTransformsInfoProfileID></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.211.Res.xml b/spss.test/data/VX0/TestGeneratorVX.211.Res.xml
deleted file mode 100644
index 0afa9f231..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.211.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>0</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.212.Req.xml b/spss.test/data/VX0/TestGeneratorVX.212.Req.xml
deleted file mode 100644
index 396b6b944..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.212.Req.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 212 2 ReferenceInfo (for 2 dsig:Reference (pplus Manifest + SignedProperties) : etsi:DataObjectFormat 2mal, Reference 2mal, Manifest 1mal, ReferenceInfo 2mal)-->
-<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-06-30T14:02:38+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-2" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3oEcsv39iZNxiHenc45eX5CYENI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>H8yxgwiP3heWrNkvx7cSXrs0jEM1P1doihddEhG7nJVzpTEEVq2aYVUpnezarD8W
-YaKrFY+VyyxQezR7IupgpnoKMBwf5GO0bM4BFhp3T8Ykq8uw93z1MeYXLzbI1IEe
-iTRIvw7KH9cQPmg9dgCAp3+SEpSluCNRSjB3a1HNT0U=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat><etsi:DataObjectFormat ObjectReference="#reference-2"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo>
-<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" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.212.Res.xml b/spss.test/data/VX0/TestGeneratorVX.212.Res.xml
deleted file mode 100644
index ed6b91884..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.212.Res.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat><etsi:DataObjectFormat ObjectReference="#reference-2"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>0</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.213.Req.xml b/spss.test/data/VX0/TestGeneratorVX.213.Req.xml
deleted file mode 100644
index dce1a9a17..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.213.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 213 kein TransformParameter element obwohl in Transforms URIs referenziert werden-->
-<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-06-30T14:02:39+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xpointer(id('ETSIProperties'))/*/*"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>AsSNl5J8RuhnUlHMsM9yiFXppPM=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ai8VjchIvVKPVxTiQGcHNG6CS/nxAUjbdjpg+G477vNfCdk3zoi21eTGyBWDGLvE
-Ig8OPkkgUuZCq3mZMA/061rg08GbZPNfcDsMkotzasblF+ZLK9TC5v8vvxZ2P5dn
-8qsuooOmp0MaII/0on8c9g3M0sJG7MrEgdIfTc0FZac=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.213.Res.xml b/spss.test/data/VX0/TestGeneratorVX.213.Res.xml
deleted file mode 100644
index d2402e5ec..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.213.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Object Id="ETSIProperties" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>1</Code>
-<Info><FailedReference>1</FailedReference></Info> </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.214.Req.xml b/spss.test/data/VX0/TestGeneratorVX.214.Req.xml
deleted file mode 100644
index f3e9332f8..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.214.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 214 1 VerifyTransformsInfoID ==> Passt aber nicht zur Transformation (XSLT <==> Canonisiserung)-->
-<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-06-30T14:02:40+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xpointer(id('ETSIProperties'))/*/*"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>AsSNl5J8RuhnUlHMsM9yiFXppPM=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ai8VjchIvVKPVxTiQGcHNG6CS/nxAUjbdjpg+G477vNfCdk3zoi21eTGyBWDGLvE
-Ig8OPkkgUuZCq3mZMA/061rg08GbZPNfcDsMkotzasblF+ZLK9TC5v8vvxZ2P5dn
-8qsuooOmp0MaII/0on8c9g3M0sJG7MrEgdIfTc0FZac=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfileID>TransformsInfoProfile2</VerifyTransformsInfoProfileID></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.214.Res.xml b/spss.test/data/VX0/TestGeneratorVX.214.Res.xml
deleted file mode 100644
index d2402e5ec..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.214.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Object Id="ETSIProperties" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>1</Code>
-<Info><FailedReference>1</FailedReference></Info> </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.215.Req.xml b/spss.test/data/VX0/TestGeneratorVX.215.Req.xml
deleted file mode 100644
index 6b8d4d6da..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.215.Req.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 215 number of ReferenceInfo is different from number of dsig:Reference in the signature-->
-<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-06-30T14:02:40+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xpointer(id('ETSIProperties')/*/*)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3Zbb3C0LBzS5XgTp3a01s9UzZwI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>nOGGxTHiJjB/JhDGXqOUqwYgpmauvIWE8ewOPWaB62IP0CVoEdVDeu6zz0axJ2wj
-6s37syqpnuYyYIQI90M8JNskws+0tEFMk97fR8oXV+/mJSfxmbCM2UohlMbyCrVU
-xGPmM6hbn11+E1jZNMxeLorB/eOHBlhxaYw/SC/r1+s=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo>
-<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" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.215.Res.xml b/spss.test/data/VX0/TestGeneratorVX.215.Res.xml
deleted file mode 100644
index 4e78f37db..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.215.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>1</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.216.Req.xml b/spss.test/data/VX0/TestGeneratorVX.216.Req.xml
deleted file mode 100644
index 2ecd7441e..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.216.Req.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 216 number of References id bigger then number of ReferenceInfos-->
-<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-06-30T14:02:41+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-2" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xpointer(id('ETSIProperties')/*/*)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>3oEcsv39iZNxiHenc45eX5CYENI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>atNVyFxVaOfBZ5SDWFBlnYwJfht7CIbc0JuJkcQ4dhJO2sVCuvpGk7atbB3QPR5j
-A9R0babjaHrMekSxKPTndy1eUPNXk79qJ7BWJn6k5Psndn7GMy/3+yiobGN3+AZ4
-twdHFhMfYo87epB6EW/ssqN6JK/LlJAe2wGoBAjbLOE=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat><etsi:DataObjectFormat ObjectReference="#reference-2"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.216.Res.xml b/spss.test/data/VX0/TestGeneratorVX.216.Res.xml
deleted file mode 100644
index 9204f0f80..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.216.Res.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat><etsi:DataObjectFormat ObjectReference="#reference-2"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>1</Code>
- </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.217.Req.xml b/spss.test/data/VX0/TestGeneratorVX.217.Req.xml
deleted file mode 100644
index 9e8a6e38c..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.217.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 217 - TransformParameter/@URI resolves but Hash does not match - which hashing algorithm?-->
-<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-06-30T14:02:41+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xpointer(id('ETSIProperties'))/*/*"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>AsSNl5J8RuhnUlHMsM9yiFXppPM=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ai8VjchIvVKPVxTiQGcHNG6CS/nxAUjbdjpg+G477vNfCdk3zoi21eTGyBWDGLvE
-Ig8OPkkgUuZCq3mZMA/061rg08GbZPNfcDsMkotzasblF+ZLK9TC5v8vvxZ2P5dn
-8qsuooOmp0MaII/0on8c9g3M0sJG7MrEgdIfTc0FZac=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Hash><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>abcdvOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></Hash></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.217.Res.xml b/spss.test/data/VX0/TestGeneratorVX.217.Res.xml
deleted file mode 100644
index d2402e5ec..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.217.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<ReferenceInputData><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZGF0YTpib29r
-IHhtbG5zOmRhdGE9Imh0dHA6Ly91cmkuZGF0YS5vcmciIGRhdGE6aGFyZGJhY2s9
-InllcyI+PGRhdGE6dGl0bGU+R2VzdW5kaGVpdGxpY2hlIEF1c3dpcmt1bmdlbiBl
-bGVrdHJvbmlzY2hlciBTaWduYXR1cmVuPC9kYXRhOnRpdGxlPjxkYXRhOmZpcnN0
-LW5hbWU+RWxsaXBzZTwvZGF0YTpmaXJzdC1uYW1lPjxkYXRhOmxhc3QtbmFtZT5L
-dXJ2ZW5yZWljaDwvZGF0YTpsYXN0LW5hbWU+PGRhdGE6YmlydGgtZGF0ZT4xOTUx
-LTA0LTE2PC9kYXRhOmJpcnRoLWRhdGU+PGRhdGE6YmlydGgtbG9jYXRpb24+SGlu
-dGVybSBCZXJnPC9kYXRhOmJpcnRoLWxvY2F0aW9uPjxkYXRhOnJlZ2lzdGVyLW51
-bWJlcj42LTkzMC0yMTUxMi0xMjwvZGF0YTpyZWdpc3Rlci1udW1iZXI+PC9kYXRh
-OmJvb2s+</Base64Content></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Manifest Id="Manifest" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData><XMLContent xml:space="preserve"><dsig:Object Id="ETSIProperties" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></XMLContent></ReferenceInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <SignatureManifestCheck>
- <Code>1</Code>
-<Info><FailedReference>1</FailedReference></Info> </SignatureManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.251.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.251.ErrRes.xml
deleted file mode 100644
index 4b92a8c24..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.251.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2268 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.251.Req.xml b/spss.test/data/VX0/TestGeneratorVX.251.Req.xml
deleted file mode 100644
index fa9328a75..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.251.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 251 - VerifyTransformsInfoID: invalidID-->
-<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-06-30T14:02:43+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xpointer(id('ETSIProperties'))/*/*"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>AsSNl5J8RuhnUlHMsM9yiFXppPM=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ai8VjchIvVKPVxTiQGcHNG6CS/nxAUjbdjpg+G477vNfCdk3zoi21eTGyBWDGLvE
-Ig8OPkkgUuZCq3mZMA/061rg08GbZPNfcDsMkotzasblF+ZLK9TC5v8vvxZ2P5dn
-8qsuooOmp0MaII/0on8c9g3M0sJG7MrEgdIfTc0FZac=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfileID>InvalidTransformsProfile</VerifyTransformsInfoProfileID></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.253.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.253.ErrRes.xml
deleted file mode 100644
index 8e20b01e7..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.253.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2202 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.253.Req.xml b/spss.test/data/VX0/TestGeneratorVX.253.Req.xml
deleted file mode 100644
index 3c3676495..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.253.Req.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 253 mismatching dsig:Transform/@Algorithm and dsig:Transform content-->
-<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-06-30T14:02:44+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#xpointer(id('Manifest'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>IHRIqoydkyYxCeNEHDOn/TgM7K0=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xpointer(id('ETSIProperties'))/*/*"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>AsSNl5J8RuhnUlHMsM9yiFXppPM=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ai8VjchIvVKPVxTiQGcHNG6CS/nxAUjbdjpg+G477vNfCdk3zoi21eTGyBWDGLvE
-Ig8OPkkgUuZCq3mZMA/061rg08GbZPNfcDsMkotzasblF+ZLK9TC5v8vvxZ2P5dn
-8qsuooOmp0MaII/0on8c9g3M0sJG7MrEgdIfTc0FZac=</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="Manifest"><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>vOdhPFsohETLeLwPnqWQv6IVPuQ=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="ETSIProperties"><etsi:QualifyingProperties Target="#signature" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2003-03-01T00:01:01</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1"><etsi:MimeType>text/html</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
-
-<SignatureManifestCheckParams ReturnReferenceInputData="true"><ReferenceInfo><VerifyTransformsInfoProfile><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxl
-c2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFu
-c2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBp
-bmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxu
-czpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVj
-aDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9E
-WT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile></ReferenceInfo></SignatureManifestCheckParams> <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.301.Req.xml b/spss.test/data/VX0/TestGeneratorVX.301.Req.xml
deleted file mode 100644
index 3f7377943..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.301.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 301-->
-<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-11-11T00:47:36+01:00</DateTime>
- <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#WithComments"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>nfi816Qlw4EnxE+bwLQLXh3VN/L1EnMZfUQBfJu4qd0G3Rjhjm9JQ4kYSAJhj8Kz
-YwzXhPT9u9I4ystFWHwomqKNxCvXv2Rrc4hknEB4hljgWEH3iS63zVGc0jw2xkzs
-rusMghJ8XcFAdA9UpV4Q8clJ6CukcwNvT1/UqSNL0V0=</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/spss.test/data/VX0/TestGeneratorVX.301.Res.xml b/spss.test/data/VX0/TestGeneratorVX.301.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.301.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.302.Req.xml b/spss.test/data/VX0/TestGeneratorVX.302.Req.xml
deleted file mode 100644
index b65bd3af8..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.302.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 302-->
-<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-11-11T00:47:36+01:00</DateTime>
- <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/2001/10/xml-exc-c14n#"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Ht8IuwiSSusf6l9tWKUrZjK+GBiIToDKtQzplkpxKO4GSbp68T23v75Cx22j4t/l
-ZPHLfqCq18q07k6ttn/HWJ1pfOD2aKulYkEc3ZGEMULrZDnnSGaGWg0PZ8WHVanv
-NxiS14BaPOheH/YId9iscaJCUpGcwcqwULeYtVg1n04=</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/spss.test/data/VX0/TestGeneratorVX.302.Res.xml b/spss.test/data/VX0/TestGeneratorVX.302.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.302.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.303.Req.xml b/spss.test/data/VX0/TestGeneratorVX.303.Req.xml
deleted file mode 100644
index b9b19a3e1..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.303.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 303-->
-<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-11-11T00:47:36+01:00</DateTime>
- <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/2001/10/xml-exc-c14n#WithComments"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>vK330KVBSt/9CVMycwiOPefSLRE7gF+VpNvEJzQ9ck3tlerONixlyARlIhOi99KG
-GcdTaLxnut3yfJVzLn2Q6EYzRo65k/gLZk0Im/ok66zoQDygcc/NT9wjIccSSKUJ
-19qdnMdwjGENmjocA8+6AztVXgsPyXpEzjFFoK+iFOM=</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/spss.test/data/VX0/TestGeneratorVX.303.Res.xml b/spss.test/data/VX0/TestGeneratorVX.303.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.303.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.304.Req.xml b/spss.test/data/VX0/TestGeneratorVX.304.Req.xml
deleted file mode 100644
index 49b49c9e2..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.304.Req.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 304-->
-<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-11-11T00:47:36+01:00</DateTime>
- <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.buergerkarte.at/namespaces/ecdsa/200206030#ecdsa-sha1"/><dsig:Reference URI="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>KZKXkaGNqsksALCWzXl8uMObNXHJIeiyL1P0VEspJDqhGMd/5Qi4REhoZ/YTmych</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIICGDCCAdCgAwIBAgIDAQpMMAkGByqGSM49BAEwTTELMAkGA1UEBhMCQVQxDTAL
-BgNVBAoTBElBSUsxFTATBgNVBAsTDEphdmFTZWN1cml0eTEYMBYGA1UEAxMPSUFJ
-SyBFQ0RTQSBUZXN0MB4XDTAzMDIxMDA5NDgwN1oXDTA0MDIxMDA5NDgwN1owTTEL
-MAkGA1UEBhMCQVQxDTALBgNVBAoTBElBSUsxFTATBgNVBAsTDEphdmFTZWN1cml0
-eTEYMBYGA1UEAxMPSUFJSyBFQ0RTQSBUZXN0MIHrMIG0BgcqhkjOPQIBMIGoAgEB
-MB0GByqGSM49AQIwEgICAL8GCSqGSM49AQIDAgIBCTA0BBgoZlN7Z2dSY2po9WVU
-4SZAJ2tknvdSYmcEGC5F71cfAHhvZ7AIG5SVo9lUYvXeCqGF7AQxBDaz2viiMgb5
-xPKZ17IanDaRN/LISuGqDXZb5zQzs/leMyky5w6iRcokGOoO+YAY+wIYQAAAAAAA
-AAAAAAAABKIOkMOQZ8iTu7mlAgECAzIABFh+sRJVup8mJdsDqlk2w1Cer2qkFxJU
-7VeLKaB6z8+W/jN6fPrc2u8MYJCZlL7T0aMNMAswCQYDVR0TBAIwADAJBgcqhkjO
-PQQBAzcAMDQCGBjRkQdnZmCv4mLwj72JBSFW1b0DIYvXXAIYILVW1F8IHAldw56h
-C3FJH2VuOdON4tia</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="envelopedData">Dies sind Testdaten</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.304.Res.xml b/spss.test/data/VX0/TestGeneratorVX.304.Res.xml
deleted file mode 100644
index eef51e82d..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.304.Res.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-<dsig:X509SubjectName>CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509SubjectName> <dsig:X509IssuerSerial>
-<dsig:X509IssuerName>CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>68172</dsig:X509SerialNumber> </dsig:X509IssuerSerial>
-
-<dsig:X509Certificate >MIICGDCCAdCgAwIBAgIDAQpMMAkGByqGSM49BAEwTTELMAkGA1UEBhMCQVQxDTAL
-BgNVBAoTBElBSUsxFTATBgNVBAsTDEphdmFTZWN1cml0eTEYMBYGA1UEAxMPSUFJ
-SyBFQ0RTQSBUZXN0MB4XDTAzMDIxMDA5NDgwN1oXDTA0MDIxMDA5NDgwN1owTTEL
-MAkGA1UEBhMCQVQxDTALBgNVBAoTBElBSUsxFTATBgNVBAsTDEphdmFTZWN1cml0
-eTEYMBYGA1UEAxMPSUFJSyBFQ0RTQSBUZXN0MIHrMIG0BgcqhkjOPQIBMIGoAgEB
-MB0GByqGSM49AQIwEgICAL8GCSqGSM49AQIDAgIBCTA0BBgoZlN7Z2dSY2po9WVU
-4SZAJ2tknvdSYmcEGC5F71cfAHhvZ7AIG5SVo9lUYvXeCqGF7AQxBDaz2viiMgb5
-xPKZ17IanDaRN/LISuGqDXZb5zQzs/leMyky5w6iRcokGOoO+YAY+wIYQAAAAAAA
-AAAAAAAABKIOkMOQZ8iTu7mlAgECAzIABFh+sRJVup8mJdsDqlk2w1Cer2qkFxJU
-7VeLKaB6z8+W/jN6fPrc2u8MYJCZlL7T0aMNMAswCQYDVR0TBAIwADAJBgcqhkjO
-PQQBAzcAMDQCGBjRkQdnZmCv4mLwj72JBSFW1b0DIYvXXAIYILVW1F8IHAldw56h
-C3FJH2VuOdON4tia</dsig:X509Certificate> </dsig:X509Data>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.305.Req.xml b/spss.test/data/VX0/TestGeneratorVX.305.Req.xml
deleted file mode 100644
index ab42e6963..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.305.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 305-->
-<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-11-11T00:47:36+01:00</DateTime>
- <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="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>DiDUmnYefQ8E8Bom8F2aHyhj5kek2+SyC5kF7LaHAZeEiEtybjoYMlzsVCLa/TnK
-n1ev2jTej9Ngnq1nadGBsRVK+2DJVSowPihCp6A0lmpWYhec/NX1uW2fBLLvE+57
-WimvfRdaNCXfsd5YcuiurnZf9LyTsnUpL1FaHBYsPIM=</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 Id="envelopedData">Dies sind Testdaten</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.305.Res.xml b/spss.test/data/VX0/TestGeneratorVX.305.Res.xml
deleted file mode 100644
index 13fa022d1..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.305.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
-<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.307.Req.xml b/spss.test/data/VX0/TestGeneratorVX.307.Req.xml
deleted file mode 100644
index fb3a89328..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.307.Req.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 307-->
-<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-11-11T00:47:37+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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>
- <SupplementProfile>
- <Content Reference="e:/cio/projekte/basismodule/wartung/projekt/spss.test/resources/testSimple.txt">
- <XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent>
- </Content>
- </SupplementProfile>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.307.Res.xml b/spss.test/data/VX0/TestGeneratorVX.307.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.307.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.308.Req.xml b/spss.test/data/VX0/TestGeneratorVX.308.Req.xml
deleted file mode 100644
index a78a9e877..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.308.Req.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 308-->
-<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-11-11T00:47:37+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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>
- <SupplementProfile>
- <Content Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt">
- <XMLContent xml:space="preserve">VERAENDERTE DATEN und die Ursprungsdaten: Dies sind Testdaten</XMLContent>
- </Content>
- </SupplementProfile>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.308.Res.xml b/spss.test/data/VX0/TestGeneratorVX.308.Res.xml
deleted file mode 100644
index 0e2923716..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.308.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>1</Code><Info><FailedReference>1</FailedReference></Info>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.310.Req.xml b/spss.test/data/VX0/TestGeneratorVX.310.Req.xml
deleted file mode 100644
index fd387fe64..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.310.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 310-->
-<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-11-11T00:47:37+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txtbase64.enc"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>yZw6dc9F2qEtFHkfhmPv03/hsvOoQCiV6Oo4jLt0Z15K0mCkZwMmIm4Khbl1tS3y
-z0tp3VtOO1EhBCAuJiKBDB9cqCR/KCPwF7SccsxszL02TSMp7o8FPgS0Wfxf7E7c
-hW73FYoSDQv+mdpmiEX3RzK6isXdBsr/0hucLNmmx4Y=</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/spss.test/data/VX0/TestGeneratorVX.310.Res.xml b/spss.test/data/VX0/TestGeneratorVX.310.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.310.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.311.Req.xml b/spss.test/data/VX0/TestGeneratorVX.311.Req.xml
deleted file mode 100644
index fdccc3d25..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.311.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 311-->
-<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-11-11T00:47:37+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><dsig:XPath xmlns:data="http://uri.data.org">ancestor-or-self::text()/ancestor-or-self::data:first-name</dsig:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>hYDjF19Ot0YaX6w1nuhs1MVZ1VU=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Fd5tZfxUd+cGwSXqyZGlzV0XkL2/HnazGNb60hB6Usy3VLT6khzDeNJJ3ogDTLio
-nMsR3m32CIotYircyGcxCw8G7vC9wYmi0OtzZGf8Vsj1rygDogpQDIoqyPwLLnGw
-DRUWev0L3DzSZ54WPvaJNGzwGSxZGIOiM9FWGKS6MZs=</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/spss.test/data/VX0/TestGeneratorVX.311.Res.xml b/spss.test/data/VX0/TestGeneratorVX.311.Res.xml
deleted file mode 100644
index 2a69686e8..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.311.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RWxsaXBzZQ==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.312.Req.xml b/spss.test/data/VX0/TestGeneratorVX.312.Req.xml
deleted file mode 100644
index 73d10dc63..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.312.Req.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 312-->
-<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-11-11T00:47:37+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment >
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2"><xf2:XPath Filter="subtract" xmlns:data="http://uri.data.org" xmlns:xf2="http://www.w3.org/2002/06/xmldsig-filter2">/data:book/data:first-name</xf2:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Sx4DuAkpeSaD7yHkYaRmxiRN174=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>tEFJUmD3VH+sHSeMpkeb8Ktmus0d8p0RkrMITLNW16yIzAWP7OTP26cQR4OBEWGi
-O64f3nGMK5B1u3TkKLBm1AjUEm+c1qeF11kwJlhjMUF6ZuBb1OUbYFQeWXihjLaA
-JoJ+z00aV17TPzuMBlK0AySa6OJNZ8KmvdgGV4CUd2U=</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>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.312.Res.xml b/spss.test/data/VX0/TestGeneratorVX.312.Res.xml
deleted file mode 100644
index d85292b1a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.312.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.313.Req.xml b/spss.test/data/VX0/TestGeneratorVX.313.Req.xml
deleted file mode 100644
index 976c6bf24..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.313.Req.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 313-->
-<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-11-11T00:47:37+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment >
- <XMLContent xml:space="preserve"><data:Document Id="myDocument" xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://uri.data.org http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX.006Schema.xsd http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.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 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>52I8Zb2jLEgSZrR91P6IDAjXzks=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>2SnLG0gsjJAjLLm0mBKu6h4f6IfvPo513pjaUC+NK8Diw/5KGHxdKRiDRxR1x6X8
-Hwq2/BFfKpWeYmRe7lnG3BfEweJZ22LnEBcKdm4HFZ+17V0xlGkJeK7bTZxiBhiW
-6sSPKv2YefqOEKGcr+bHvuxacMGPH5+5sNrwEAySacA=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></data:Document></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.313.Res.xml b/spss.test/data/VX0/TestGeneratorVX.313.Res.xml
deleted file mode 100644
index 51953ce11..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.313.Res.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>PGRhdGE6RG9jdW1lbnQgeG1sbnM6ZGF0YT0iaHR0cDovL3VyaS5kYXRhLm9yZyIg
-eG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0
-YW5jZSIgSWQ9Im15RG9jdW1lbnQiIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDov
-L3VyaS5kYXRhLm9yZyBodHRwOi8vbW9hLXRlc3QuYnJ6LmludHJhLmd2LmF0L1Rl
-c3REYXRlbkdlbmVyYXRvci9yZXNvdXJjZXMvVlguMDA2U2NoZW1hLnhzZCBodHRw
-Oi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIGh0dHA6Ly93d3cudzMub3Jn
-L1RSL3htbGRzaWctY29yZS94bWxkc2lnLWNvcmUtc2NoZW1hLnhzZCI+PC9kYXRh
-OkRvY3VtZW50Pg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.314.Req.xml b/spss.test/data/VX0/TestGeneratorVX.314.Req.xml
deleted file mode 100644
index 56be10205..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.314.Req.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 314-->
-<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-11-11T00:47:37+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment >
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>0tXNPITF3dxGNngFwjsfXXEpgsOoco4NQCrVNE1bl8HkYbwKK3o9mc6dZktRL7Xd
-1Epa3C2qiBVD8WRVTQpdre9xU+CIno0Xrkxu2oMOSEX5fMfAyR31m99oZ1JbEwlh
-S+bOA8c4An7uuaEpo9hj/Hi5wxXYx1a9NG6cpTdWXM4=</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>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.314.Res.xml b/spss.test/data/VX0/TestGeneratorVX.314.Res.xml
deleted file mode 100644
index d85292b1a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.314.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.314_2.Req.xml b/spss.test/data/VX0/TestGeneratorVX.314_2.Req.xml
deleted file mode 100644
index dd4e2e67a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.314_2.Req.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 314_2-->
-<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-11-11T00:47:38+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment >
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://localhost:8080/moa-spss-testdata/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>0tXNPITF3dxGNngFwjsfXXEpgsOoco4NQCrVNE1bl8HkYbwKK3o9mc6dZktRL7Xd
-1Epa3C2qiBVD8WRVTQpdre9xU+CIno0Xrkxu2oMOSEX5fMfAyR31m99oZ1JbEwlh
-S+bOA8c4An7uuaEpo9hj/Hi5wxXYx1a9NG6cpTdWXM4=</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>
- <SupplementProfile>
- <Content Reference="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl">
- <XMLContent xml:space="preserve"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></XMLContent>
- </Content>
- </SupplementProfile>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.314_2.Res.xml b/spss.test/data/VX0/TestGeneratorVX.314_2.Res.xml
deleted file mode 100644
index d85292b1a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.314_2.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.315.Req.xml b/spss.test/data/VX0/TestGeneratorVX.315.Req.xml
deleted file mode 100644
index 849406b10..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.315.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 315-->
-<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-11-11T00:47:38+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/test_wo_canonicalisation.XML"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>noDYepFSHUtrjZJLcYTpfLv9pDU=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Tmqp2rugsYcPeXVvDCGbgLuALFRrtvKlRbfIWaIZmEDPND+iYCmA3iTYeXTyoKOq
-xRabRM+c44ZFpiNe5AWSwItRND0WEDDJLKLj0e3qWI5UNRBJOdtn+tbvH+LqOVc3
-v1DcPGJTJrWzNS82C9rO8wBNWMjP3Oq9VFuVDXbYfcY=</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/spss.test/data/VX0/TestGeneratorVX.315.Res.xml b/spss.test/data/VX0/TestGeneratorVX.315.Res.xml
deleted file mode 100644
index 567b77447..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.315.Res.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
-<Base64Content>PG4xOkVsZW0xIHhtbG5zOm4wPSJmb286YmFyIiB4bWxuczpuMT0iaHR0cDovL2V4
-YW1wbGUubmV0IiB4bWxuczpuMz0iZnRwOi8vZXhhbXBsZS5vcmciIGE9IlRlc3Rh
-IiBiPSJUZXN0YiIgeG1sOmxhbmc9ImVuIj4KCVRlc3QKICAgIDxuMzpFbGVtMj48
-L24zOkVsZW0yPgo8L24xOkVsZW0xPg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.316.Req.xml b/spss.test/data/VX0/TestGeneratorVX.316.Req.xml
deleted file mode 100644
index 8e937e2a9..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.316.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 316-->
-<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-11-11T00:47:38+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/test_wo_canonicalisation.XML"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>QA/O0pwheK8W+EYsGfWPq+0tcmc=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>g1H+4i7HStmjk/YM8gwDHGGjg24ymXNYarElrnTVrjxOcqmgb2seyeqSCmhGdMmp
-mUUwa9UgE/y51zv9ySMXX3Z5NXTtQ5982pYNK3IG8vcy4/ogGG+ipmkFWv1WTDoz
-yKtWReS6DuG5KuIFSaYGmuJvwQw2KWlqR/Ukfw79+XE=</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/spss.test/data/VX0/TestGeneratorVX.316.Res.xml b/spss.test/data/VX0/TestGeneratorVX.316.Res.xml
deleted file mode 100644
index ee4a7218f..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.316.Res.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
-<Base64Content>PCEtLTFzdCBDb21tZW50LS0+CjxuMTpFbGVtMSB4bWxuczpuMD0iZm9vOmJhciIg
-eG1sbnM6bjE9Imh0dHA6Ly9leGFtcGxlLm5ldCIgeG1sbnM6bjM9ImZ0cDovL2V4
-YW1wbGUub3JnIiBhPSJUZXN0YSIgYj0iVGVzdGIiIHhtbDpsYW5nPSJlbiI+CglU
-ZXN0PCEtLTJuZCBDb21tZW50LS0+CiAgICA8bjM6RWxlbTI+PC9uMzpFbGVtMj4K
-PC9uMTpFbGVtMT4=</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.317.Req.xml b/spss.test/data/VX0/TestGeneratorVX.317.Req.xml
deleted file mode 100644
index 4c57e28ad..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.317.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 317-->
-<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-11-11T00:47:38+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/test_wo_canonicalisation.XML"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>kzG6AYYX+4vA/hV5wGdEXmIoaY8=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>fKk2FLYQqDmEjimybPEZYZAUfrnLDTVN3dfwZrNMfv656pNoM5CHfSUWaCIytDz1
-CIQrJgkndJIZyzCbS6zCYL6M5ggoMJYi885+8wxnjwsxuHGtBzZ5HOP+lR7bphs+
-aOWzTMNFrX88yMTOmyZgnYghukbuyqNDnz69H0uVqHo=</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/spss.test/data/VX0/TestGeneratorVX.317.Res.xml b/spss.test/data/VX0/TestGeneratorVX.317.Res.xml
deleted file mode 100644
index 39a59b15d..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.317.Res.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
-<Base64Content>PG4xOkVsZW0xIHhtbG5zOm4xPSJodHRwOi8vZXhhbXBsZS5uZXQiIGE9IlRlc3Rh
-IiBiPSJUZXN0YiIgeG1sOmxhbmc9ImVuIj4KCVRlc3QKICAgIDxuMzpFbGVtMiB4
-bWxuczpuMz0iZnRwOi8vZXhhbXBsZS5vcmciPjwvbjM6RWxlbTI+CjwvbjE6RWxl
-bTE+</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.318.Req.xml b/spss.test/data/VX0/TestGeneratorVX.318.Req.xml
deleted file mode 100644
index 9fafde5d1..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.318.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 318-->
-<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-11-11T00:47:38+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/test_wo_canonicalisation.XML"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>9g4s3jILoN3mdH3/6AgvA1qDUAw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Q5F+MEJ6AGIwJEHcfXdPnjY8+eAerMeLCtc+XOvmLoCyav1iOZ/+FApe492ysh6X
-UP+47L9PGsixUgDYNBeHDgyBHJqtA4wdBpafwucMVXWoIWcmMLDDVAde1aqG6zrF
-k5cwAgl+my6y7kVXUNhrzEiG6FjRn+lIIXiXwJL2Jm0=</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/spss.test/data/VX0/TestGeneratorVX.318.Res.xml b/spss.test/data/VX0/TestGeneratorVX.318.Res.xml
deleted file mode 100644
index 6b45e6cec..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.318.Res.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
-<Base64Content>PCEtLTFzdCBDb21tZW50LS0+CjxuMTpFbGVtMSB4bWxuczpuMT0iaHR0cDovL2V4
-YW1wbGUubmV0IiBhPSJUZXN0YSIgYj0iVGVzdGIiIHhtbDpsYW5nPSJlbiI+CglU
-ZXN0PCEtLTJuZCBDb21tZW50LS0+CiAgICA8bjM6RWxlbTIgeG1sbnM6bjM9ImZ0
-cDovL2V4YW1wbGUub3JnIj48L24zOkVsZW0yPgo8L24xOkVsZW0xPg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.318_2.Req.xml b/spss.test/data/VX0/TestGeneratorVX.318_2.Req.xml
deleted file mode 100644
index 717eaecc3..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.318_2.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 318_2-->
-<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-11-11T00:47:38+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/test_wo_canonicalisation.XMLbase64.enc"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>kzG6AYYX+4vA/hV5wGdEXmIoaY8=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>qePkwtq8XOEES14aGffykQFoZZrGMIMDRiFio/wvGKIaBj+wZTPvmz2wTNRPpmMw
-x0pY89tUvM1t6kbSrKT4otJE8gSm8bADcNEOSrVJZc/0w31msUWHl/r5la4cg6yC
-maEmtUMEd6Db/YlUJb/7RLX1TBx7VDZmJtpNOhMkVkY=</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/spss.test/data/VX0/TestGeneratorVX.318_2.Res.xml b/spss.test/data/VX0/TestGeneratorVX.318_2.Res.xml
deleted file mode 100644
index 39a59b15d..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.318_2.Res.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
-<Base64Content>PG4xOkVsZW0xIHhtbG5zOm4xPSJodHRwOi8vZXhhbXBsZS5uZXQiIGE9IlRlc3Rh
-IiBiPSJUZXN0YiIgeG1sOmxhbmc9ImVuIj4KCVRlc3QKICAgIDxuMzpFbGVtMiB4
-bWxuczpuMz0iZnRwOi8vZXhhbXBsZS5vcmciPjwvbjM6RWxlbTI+CjwvbjE6RWxl
-bTE+</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.319.Req.xml b/spss.test/data/VX0/TestGeneratorVX.319.Req.xml
deleted file mode 100644
index 2232f661d..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.319.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 319-->
-<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-11-11T00:47:38+01:00</DateTime>
- <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="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference><dsig:Reference URI="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>CbVbswvEV7LFR6OfM4sx9WULZVpXznGEbWpHW5ZfvefqPIvYKV6N9bkeL6OpP9es
-yypfuimz3CaYsrNE80Tw27awj9ll1ZhJZBkoh0sAmVC7UitesIY7gFQIurl3CFFC
-nhPLT95a6aC8njsIR06RX16Htv37MVVxh4U8rNbucJg=</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 Id="envelopedData">Dies sind Testdaten</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.319.Res.xml b/spss.test/data/VX0/TestGeneratorVX.319.Res.xml
deleted file mode 100644
index eac5419c6..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.319.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
-<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content></HashInputData><HashInputData><Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.320.Req.xml b/spss.test/data/VX0/TestGeneratorVX.320.Req.xml
deleted file mode 100644
index 0dbdc8cf9..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.320.Req.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 320-->
-<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-11-11T00:47:38+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</dsig:SignatureValue><dsig:KeyInfo><dsig:RetrievalMethod Type="http://www.w3.org/2000/09/xmldsig#X509Data" URI="http://localhost:8080/moa-spss-testdata/resources/X509Data.xml"/></dsig:KeyInfo></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.320.Res.xml b/spss.test/data/VX0/TestGeneratorVX.320.Res.xml
deleted file mode 100644
index 0b5e9b4ee..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.320.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.320_2.Req.xml b/spss.test/data/VX0/TestGeneratorVX.320_2.Req.xml
deleted file mode 100644
index b597d736e..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.320_2.Req.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 320_2-->
-<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-11-11T00:47:39+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</dsig:SignatureValue><dsig:KeyInfo><dsig:RetrievalMethod Type="http://www.w3.org/2000/09/xmldsig#X509Data" URI="http://localhost:8080/moa-spss-testdata/resources/TEMPX509Data.xml"/></dsig:KeyInfo></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <SupplementProfile>
- <Content Reference="http://localhost:8080/moa-spss-testdata/resources/TEMPX509Data.xml">
- <XMLContent xml:space="preserve">
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Stephan Grill (Anecon) -->
-<dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <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>
-</XMLContent>
- </Content>
- </SupplementProfile>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.320_2.Res.xml b/spss.test/data/VX0/TestGeneratorVX.320_2.Res.xml
deleted file mode 100644
index 0b5e9b4ee..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.320_2.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.321.Req.xml b/spss.test/data/VX0/TestGeneratorVX.321.Req.xml
deleted file mode 100644
index 6c99f8819..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.321.Req.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 321-->
-<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-11-11T00:47:39+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</dsig:SignatureValue><dsig:KeyInfo><dsig:RetrievalMethod Type="http://www.w3.org/2000/09/xmldsig#rawX509Certificate" URI="http://localhost:8080/moa-spss-testdata/resources/test-ee2003_normal.der"/></dsig:KeyInfo></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.321.Res.xml b/spss.test/data/VX0/TestGeneratorVX.321.Res.xml
deleted file mode 100644
index 0b5e9b4ee..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.321.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.322.Req.xml b/spss.test/data/VX0/TestGeneratorVX.322.Req.xml
deleted file mode 100644
index 74fa6f506..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.322.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 322-->
-<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-11-11T00:47:39+01:00</DateTime>
- <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 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>xtKRiVK6LS6Zy4AKnpTCBG+g88k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>dw/kXd3Racja+0Rgtie1x0N2kFlZ/IougAs/nIrkFb+GRfjV1oo3ZZeRUunfkZXX
-3ZnszKpnzfLOTcczPrIxsFQ95QrUSa17BA+ff1yYBa4kurwak8aq9jd3jDcKf3EF
-KNFOALW0Ltw3/DdPi0cblkIX/TCCKH8XtVkqrSwqyZc=</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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.322.Res.xml b/spss.test/data/VX0/TestGeneratorVX.322.Res.xml
deleted file mode 100644
index 6200f4451..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.322.Res.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<HashInputData><Base64Content>PGRzaWc6TWFuaWZlc3QgeG1sbnM6ZHNpZz0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MC8wOS94bWxkc2lnIyIgSWQ9Im1hbmlmZXN0T2JqZWN0Ij48ZHNpZzpSZWZlcmVu
-Y2UgVVJJPSJodHRwOi8vbG9jYWxob3N0OjgwODAvbW9hLXNwc3MtdGVzdGRhdGEv
-cmVzb3VyY2VzL3Rlc3RTaW1wbGUudHh0Ij48ZHNpZzpEaWdlc3RNZXRob2QgQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjc2hhMSI+
-PC9kc2lnOkRpZ2VzdE1ldGhvZD48ZHNpZzpEaWdlc3RWYWx1ZT5PM1BPdGdaWHJH
-bXcrMmJ0WXJkdVN2cHRTZG89PC9kc2lnOkRpZ2VzdFZhbHVlPjwvZHNpZzpSZWZl
-cmVuY2U+PC9kc2lnOk1hbmlmZXN0Pg==</Base64Content></HashInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <XMLDSIGManifestCheck>
- <Code>0</Code>
- <Info> <ReferringSigReference>1</ReferringSigReference> </Info>
- </XMLDSIGManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.323.Req.xml b/spss.test/data/VX0/TestGeneratorVX.323.Req.xml
deleted file mode 100644
index 4eabd302c..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.323.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 323-->
-<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-11-11T00:47:39+01:00</DateTime>
- <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 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>xtKRiVK6LS6Zy4AKnpTCBG+g88k=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#xpointer(id('manifestObject2'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>hiDVMvq5dg1IgHyzdLTFxVVa2uc=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>IkQtRTGQhkqg4oPYYe2aLQyELfSFBEhmvtqJ7H8utU9J4RL7x6TTRhP5zQj1Tr/O
-iyUlVskXAkKGLOeOCrUQwvfrF9DkT3Lb7nGUmsD52LJszw9bNVcRYLygiOr42Km4
-nRQZIvxIJiXfHKo4JY6SvLlDFntGDjblsgNZW8BRDcE=</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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object><dsig:Manifest Id="manifestObject2"><dsig:Reference URI="http://localhost:8080/moa-spss-testdata/resources/testXML.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Z9Rr4wyNUP2Pe0sBdLz447sJt8o=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.323.Res.xml b/spss.test/data/VX0/TestGeneratorVX.323.Res.xml
deleted file mode 100644
index d38f762b9..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.323.Res.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<HashInputData><Base64Content>PGRzaWc6TWFuaWZlc3QgeG1sbnM6ZHNpZz0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MC8wOS94bWxkc2lnIyIgSWQ9Im1hbmlmZXN0T2JqZWN0Ij48ZHNpZzpSZWZlcmVu
-Y2UgVVJJPSJodHRwOi8vbG9jYWxob3N0OjgwODAvbW9hLXNwc3MtdGVzdGRhdGEv
-cmVzb3VyY2VzL3Rlc3RTaW1wbGUudHh0Ij48ZHNpZzpEaWdlc3RNZXRob2QgQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjc2hhMSI+
-PC9kc2lnOkRpZ2VzdE1ldGhvZD48ZHNpZzpEaWdlc3RWYWx1ZT5PM1BPdGdaWHJH
-bXcrMmJ0WXJkdVN2cHRTZG89PC9kc2lnOkRpZ2VzdFZhbHVlPjwvZHNpZzpSZWZl
-cmVuY2U+PC9kc2lnOk1hbmlmZXN0Pg==</Base64Content></HashInputData><HashInputData><Base64Content>PGRzaWc6TWFuaWZlc3QgeG1sbnM6ZHNpZz0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MC8wOS94bWxkc2lnIyIgSWQ9Im1hbmlmZXN0T2JqZWN0MiI+PGRzaWc6UmVmZXJl
-bmNlIFVSST0iaHR0cDovL2xvY2FsaG9zdDo4MDgwL21vYS1zcHNzLXRlc3RkYXRh
-L3Jlc291cmNlcy90ZXN0WE1MLnR4dCI+PGRzaWc6RGlnZXN0TWV0aG9kIEFsZ29y
-aXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8wOS94bWxkc2lnI3NoYTEiPjwv
-ZHNpZzpEaWdlc3RNZXRob2Q+PGRzaWc6RGlnZXN0VmFsdWU+WjlScjR3eU5VUDJQ
-ZTBzQmRMejQ0N3NKdDhvPTwvZHNpZzpEaWdlc3RWYWx1ZT48L2RzaWc6UmVmZXJl
-bmNlPjwvZHNpZzpNYW5pZmVzdD4=</Base64Content></HashInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <XMLDSIGManifestCheck>
- <Code>0</Code>
- <Info> <ReferringSigReference>1</ReferringSigReference> </Info>
- </XMLDSIGManifestCheck>
- <XMLDSIGManifestCheck>
- <Code>0</Code>
- <Info> <ReferringSigReference>2</ReferringSigReference> </Info>
- </XMLDSIGManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.324.Req.xml b/spss.test/data/VX0/TestGeneratorVX.324.Req.xml
deleted file mode 100644
index ee02136b7..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.324.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 324-->
-<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-11-11T00:47:39+01:00</DateTime>
- <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 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>6D2Nt8ZJb1XEXUEpZ8M3jUMAYqg=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>IOXCDvHayZAF6TR1ZzhR+sFoO4uUvYY2Xo7iUjlJs4MAUd6aoMZvyHxqacTh2KM3
-XN6UuyM0fq8leITg+gscQoS73FXhO5qMG/Mp+T92COBW6f8bZ85jSAYGVF1cPmdQ
-5UMuU8RPtxH5CxXoSFyQkzACbGTDnSc9JfoKV5BQXZ4=</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="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference><dsig:Reference URI="http://localhost:8080/moa-spss-testdata/resources/testXML.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Z9Rr4wyNUP2Pe0sBdLz447sJt8o=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.324.Res.xml b/spss.test/data/VX0/TestGeneratorVX.324.Res.xml
deleted file mode 100644
index db57bca47..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.324.Res.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<HashInputData><Base64Content>PGRzaWc6TWFuaWZlc3QgeG1sbnM6ZHNpZz0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MC8wOS94bWxkc2lnIyIgSWQ9Im1hbmlmZXN0T2JqZWN0Ij48ZHNpZzpSZWZlcmVu
-Y2UgVVJJPSJodHRwOi8vbG9jYWxob3N0OjgwODAvbW9hLXNwc3MtdGVzdGRhdGEv
-cmVzb3VyY2VzL3Rlc3RTaW1wbGUudHh0Ij48ZHNpZzpEaWdlc3RNZXRob2QgQWxn
-b3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjc2hhMSI+
-PC9kc2lnOkRpZ2VzdE1ldGhvZD48ZHNpZzpEaWdlc3RWYWx1ZT5PM1BPdGdaWHJH
-bXcrMmJ0WXJkdVN2cHRTZG89PC9kc2lnOkRpZ2VzdFZhbHVlPjwvZHNpZzpSZWZl
-cmVuY2U+PGRzaWc6UmVmZXJlbmNlIFVSST0iaHR0cDovL2xvY2FsaG9zdDo4MDgw
-L21vYS1zcHNzLXRlc3RkYXRhL3Jlc291cmNlcy90ZXN0WE1MLnR4dCI+PGRzaWc6
-RGlnZXN0TWV0aG9kIEFsZ29yaXRobT0iaHR0cDovL3d3dy53My5vcmcvMjAwMC8w
-OS94bWxkc2lnI3NoYTEiPjwvZHNpZzpEaWdlc3RNZXRob2Q+PGRzaWc6RGlnZXN0
-VmFsdWU+WjlScjR3eU5VUDJQZTBzQmRMejQ0N3NKdDhvPTwvZHNpZzpEaWdlc3RW
-YWx1ZT48L2RzaWc6UmVmZXJlbmNlPjwvZHNpZzpNYW5pZmVzdD4=</Base64Content></HashInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <XMLDSIGManifestCheck>
- <Code>0</Code>
- <Info> <ReferringSigReference>1</ReferringSigReference> </Info>
- </XMLDSIGManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.325.Req.xml b/spss.test/data/VX0/TestGeneratorVX.325.Req.xml
deleted file mode 100644
index 5da199f78..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.325.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 325-->
-<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-11-11T00:47:39+01:00</DateTime>
- <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 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></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.325.Res.xml b/spss.test/data/VX0/TestGeneratorVX.325.Res.xml
deleted file mode 100644
index 195ef28ab..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.325.Res.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
-<HashInputData><Base64Content>PGRzaWc6TWFuaWZlc3QgeG1sbnM6ZHNpZz0iaHR0cDovL3d3dy53My5vcmcvMjAw
-MC8wOS94bWxkc2lnIyIgSWQ9Im1hbmlmZXN0T2JqZWN0Ij48ZHNpZzpSZWZlcmVu
-Y2UgVVJJPSIjeHBvaW50ZXIoaWQoJ2VudmVsb3BlZERhdGEnKS9ub2RlKCkpIiB4
-bWxuczpkc2lnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIj48
-ZHNpZzpEaWdlc3RNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8y
-MDAwLzA5L3htbGRzaWcjc2hhMSIgeG1sbnM6ZHNpZz0iaHR0cDovL3d3dy53My5v
-cmcvMjAwMC8wOS94bWxkc2lnIyIvPjxkc2lnOkRpZ2VzdFZhbHVlPjJqbWo3bDVy
-U3cweVZiL3ZsV0FZa0svWUJ3az08L2RzaWc6RGlnZXN0VmFsdWU+PC9kc2lnOlJl
-ZmVyZW5jZT48L2RzaWc6TWFuaWZlc3Q+</Base64Content></HashInputData> <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <XMLDSIGManifestCheck>
- <Code>1</Code>
- <Info><FailedReference>1</FailedReference><ReferringSigReference>1</ReferringSigReference> </Info>
- </XMLDSIGManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.326.Req.xml b/spss.test/data/VX0/TestGeneratorVX.326.Req.xml
deleted file mode 100644
index 6c11b9767..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.326.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 326-->
-<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-11-11T00:47:39+01:00</DateTime>
- <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 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 veraenderte Daten und die Ursprungsdaten:
-Dies sind Testdaten</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.326.Res.xml b/spss.test/data/VX0/TestGeneratorVX.326.Res.xml
deleted file mode 100644
index d7c1e4c10..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.326.Res.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <XMLDSIGManifestCheck>
- <Code>1</Code>
- <Info><FailedReference>1</FailedReference><ReferringSigReference>1</ReferringSigReference> </Info>
- </XMLDSIGManifestCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.327.Req.xml b/spss.test/data/VX0/TestGeneratorVX.327.Req.xml
deleted file mode 100644
index 28dedbf5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.327.Req.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 327-->
-<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-11-11T00:47:39+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</dsig:SignatureValue><dsig:KeyInfo><dsig:RetrievalMethod Type="http://www.w3.org/2000/09/xmldsig#rawX509Certificate" URI="#xpointer(id('rawCertAsBase64')/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms></dsig:RetrievalMethod></dsig:KeyInfo><dsig:Object Id="rawCertAsBase64">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:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.327.Res.xml b/spss.test/data/VX0/TestGeneratorVX.327.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.327.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.351.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.351.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.351.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.351.Req.xml b/spss.test/data/VX0/TestGeneratorVX.351.Req.xml
deleted file mode 100644
index 701bed38a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.351.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 351-->
-<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-06-30T14:02:44+01:00</DateTime>
- <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/unknownCanonicalzationMethod"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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/spss.test/data/VX0/TestGeneratorVX.352.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.352.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.352.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.352.Req.xml b/spss.test/data/VX0/TestGeneratorVX.352.Req.xml
deleted file mode 100644
index f8ec8611d..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.352.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 352-->
-<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-06-30T14:02:44+01:00</DateTime>
- <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/TR/2001/unknownSignatureMethod"/><dsig:Reference URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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/spss.test/data/VX0/TestGeneratorVX.354.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.354.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.354.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.354.Req.xml b/spss.test/data/VX0/TestGeneratorVX.354.Req.xml
deleted file mode 100644
index 6877decf0..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.354.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 354-->
-<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-06-30T14:02:44+01:00</DateTime>
- <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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/TR/2001/unknownDigestMethod"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</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/spss.test/data/VX0/TestGeneratorVX.356.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.356.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.356.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.356.Req.xml b/spss.test/data/VX0/TestGeneratorVX.356.Req.xml
deleted file mode 100644
index c404d3a31..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.356.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 356-->
-<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-06-30T14:02:44+01:00</DateTime>
- <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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txtbase64.enc"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/2001/unknownTransformsMethod"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>rt+ij8pPm7w1QBsi7ZKfCLZSCXfWiSAIZ2OVKvIf5i6BDhQ5g+4Vdjl20+t8vBaU
-vdnIeaZqffOi5+ECdPTtpxO6zcUIZcsb6fR6UBHylopSJR+iA057ppd1lExRIbTM
-yyOqhrgnQHf2JHzQkKHH46nL72Y3A3j2joohCfFQsXo=</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/spss.test/data/VX0/TestGeneratorVX.357.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.357.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.357.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.357.Req.xml b/spss.test/data/VX0/TestGeneratorVX.357.Req.xml
deleted file mode 100644
index 639733007..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.357.Req.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 357 nicht zu Reference/Transforms/Transform/@Algorithm passender Inha-->
-<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-06-30T14:02:45+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent xml:space="preserve"><dsig:Signature Id="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-1" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/BookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>hadYFe2IqIFBJT2n3gH0ODmd3nrkGXNfxHs9rNTo9PL0scyxI2jwDfNxKCrVpnM/
-mHLQOXWKDSK9xQvoGOlCAMGZekDQNlMFvgOOclNjpx2Ka49WVTXWQQTLq83L7mbt
-6y+lgV4hQZeVPKQXgrX5mGPQyJGCTugklW0A7PSwkEc=</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>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.359.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.359.ErrRes.xml
deleted file mode 100644
index 93d1b43bd..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.359.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2243 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.359.Req.xml b/spss.test/data/VX0/TestGeneratorVX.359.Req.xml
deleted file mode 100644
index 8d1c7428a..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.359.Req.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 359-->
-<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-06-30T14:02:45+01:00</DateTime>
- <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="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bluTLafswdmsDkwdNk/j/HVd1eo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>nK7gJ9m6E9MMl0DuL2m/F/wyrFc2V5wTV2eYj3UAO1qbFhQzKtbz4dKrV+4HlaxT
-u/1IbP+ZWvmylwNnsT+WSGAPGw5/L9YNUVkxRi14Pal6nHgx0Cr5zN48hd278jcg
-7kNgVHFHqutWLPXPVuTrR8C96JdFINiFdnCKEALsk+A=</dsig:SignatureValue><dsig:Object Id="envelopedData">Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.360.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.360.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.360.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.360.Req.xml b/spss.test/data/VX0/TestGeneratorVX.360.Req.xml
deleted file mode 100644
index 7ef55d252..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.360.Req.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 360-->
-<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-06-30T14:02:45+01:00</DateTime>
- <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="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bluTLafswdmsDkwdNk/j/HVd1eo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>nK7gJ9m6E9MMl0DuL2m/F/wyrFc2V5wTV2eYj3UAO1qbFhQzKtbz4dKrV+4HlaxT
-u/1IbP+ZWvmylwNnsT+WSGAPGw5/L9YNUVkxRi14Pal6nHgx0Cr5zN48hd278jcg
-7kNgVHFHqutWLPXPVuTrR8C96JdFINiFdnCKEALsk+A=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509SubjectName>Some kind of Subject</dsig:X509SubjectName></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="envelopedData">Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.360_2.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.360_2.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.360_2.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.360_2.Req.xml b/spss.test/data/VX0/TestGeneratorVX.360_2.Req.xml
deleted file mode 100644
index 8456be252..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.360_2.Req.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 360_2-->
-<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-06-30T14:02:45+01:00</DateTime>
- <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="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bluTLafswdmsDkwdNk/j/HVd1eo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>nK7gJ9m6E9MMl0DuL2m/F/wyrFc2V5wTV2eYj3UAO1qbFhQzKtbz4dKrV+4HlaxT
-u/1IbP+ZWvmylwNnsT+WSGAPGw5/L9YNUVkxRi14Pal6nHgx0Cr5zN48hd278jcg
-7kNgVHFHqutWLPXPVuTrR8C96JdFINiFdnCKEALsk+A=</dsig:SignatureValue><dsig:KeyInfo><dsig:KeyName>Some kind of string as KeyName</dsig:KeyName></dsig:KeyInfo><dsig:Object Id="envelopedData">Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.362.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.362.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.362.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.362.Req.xml b/spss.test/data/VX0/TestGeneratorVX.362.Req.xml
deleted file mode 100644
index 6f7525203..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.362.Req.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 362-->
-<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-06-30T14:02:45+01:00</DateTime>
- <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="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bluTLafswdmsDkwdNk/j/HVd1eo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>nK7gJ9m6E9MMl0DuL2m/F/wyrFc2V5wTV2eYj3UAO1qbFhQzKtbz4dKrV+4HlaxT
-u/1IbP+ZWvmylwNnsT+WSGAPGw5/L9YNUVkxRi14Pal6nHgx0Cr5zN48hd278jcg
-7kNgVHFHqutWLPXPVuTrR8C96JdFINiFdnCKEALsk+A=</dsig:SignatureValue><dsig:KeyInfo> <dsig:X509Data>
- <dsig:X509Certificate>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</dsig:X509Certificate>
- </dsig:X509Data>
-</dsig:KeyInfo><dsig:Object Id="envelopedData">Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.363.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.363.ErrRes.xml
deleted file mode 100644
index 5b2b55035..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.363.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-1100 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.363.Req.xml b/spss.test/data/VX0/TestGeneratorVX.363.Req.xml
deleted file mode 100644
index 6d09ed714..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.363.Req.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 363-->
-<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-06-30T14:02:45+01:00</DateTime>
- <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="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bluTLafswdmsDkwdNk/j/HVd1eo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>nK7gJ9m6E9MMl0DuL2m/F/wyrFc2V5wTV2eYj3UAO1qbFhQzKtbz4dKrV+4HlaxT
-u/1IbP+ZWvmylwNnsT+WSGAPGw5/L9YNUVkxRi14Pal6nHgx0Cr5zN48hd278jcg
-7kNgVHFHqutWLPXPVuTrR8C96JdFINiFdnCKEALsk+A=</dsig:SignatureValue><dsig:KeyInfo> <dsig:X509Data>
- <dsig:X509Certificate>( no BASE64 data )</dsig:X509Certificate>
- </dsig:X509Data>
-</dsig:KeyInfo><dsig:Object Id="envelopedData">Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.364.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.364.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.364.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.364.Req.xml b/spss.test/data/VX0/TestGeneratorVX.364.Req.xml
deleted file mode 100644
index e0c594eae..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.364.Req.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 364-->
-<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-06-30T14:02:45+01:00</DateTime>
- <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="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bluTLafswdmsDkwdNk/j/HVd1eo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>nK7gJ9m6E9MMl0DuL2m/F/wyrFc2V5wTV2eYj3UAO1qbFhQzKtbz4dKrV+4HlaxT
-u/1IbP+ZWvmylwNnsT+WSGAPGw5/L9YNUVkxRi14Pal6nHgx0Cr5zN48hd278jcg
-7kNgVHFHqutWLPXPVuTrR8C96JdFINiFdnCKEALsk+A=</dsig:SignatureValue><dsig:KeyInfo><dsig:RetrievalMethod Type="http://www.w3.org/2000/09/noValidRetrievalMethodType" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/X509Data.xml"/></dsig:KeyInfo><dsig:Object Id="envelopedData">Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.365.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.365.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.365.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.365.Req.xml b/spss.test/data/VX0/TestGeneratorVX.365.Req.xml
deleted file mode 100644
index 5fa59d97e..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.365.Req.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 365-->
-<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-06-30T14:02:45+01:00</DateTime>
- <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="#xpointer(id('envelopedData')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bluTLafswdmsDkwdNk/j/HVd1eo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>nK7gJ9m6E9MMl0DuL2m/F/wyrFc2V5wTV2eYj3UAO1qbFhQzKtbz4dKrV+4HlaxT
-u/1IbP+ZWvmylwNnsT+WSGAPGw5/L9YNUVkxRi14Pal6nHgx0Cr5zN48hd278jcg
-7kNgVHFHqutWLPXPVuTrR8C96JdFINiFdnCKEALsk+A=</dsig:SignatureValue><dsig:KeyInfo><dsig:RetrievalMethod Type="http://www.w3.org/2000/09/xmldsig#X509Data" URI="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/test-ee2003_normal.der"/></dsig:KeyInfo><dsig:Object Id="envelopedData">Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.366.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.366.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.366.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.366.Req.xml b/spss.test/data/VX0/TestGeneratorVX.366.Req.xml
deleted file mode 100644
index 36d7a75b0..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.366.Req.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 366-->
-<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-06-30T14:02:46+01:00</DateTime>
- <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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</dsig:SignatureValue><dsig:KeyInfo><dsig:RetrievalMethod Type="http://www.w3.org/2000/09/xmldsig#rawX509Certificate" URI="#xpointer(id('rawCertAsBase64')/node())"><dsig:Transforms><dsig:Transform Algorithm="http://Invalid.URI.com"/></dsig:Transforms></dsig:RetrievalMethod></dsig:KeyInfo><dsig:Object Id="rawCertAsBase64">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:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.367.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.367.ErrRes.xml
deleted file mode 100644
index f5f4d9a5b..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.367.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2240 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.367.Req.xml b/spss.test/data/VX0/TestGeneratorVX.367.Req.xml
deleted file mode 100644
index 1ee5f74ff..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.367.Req.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 367-->
-<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-06-30T14:02:46+01:00</DateTime>
- <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://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e1wgvnq1Jf8uumQVxpGr2DfgaDwF1QyKNnUOUr70oawP+Ryo8fhdChT7/i1ZRn+K
-b7yTjqlEQyP67BBuPTcUefp9Ny4y19ciISHHF1WpQe7vhm1TTmm9/GCHKZbxGat5
-3Ag2IQLlR3C3NHyp+1FvCOAcbh3GcEPlkESI+2zzCPU=</dsig:SignatureValue><dsig:KeyInfo><dsig:RetrievalMethod Type="http://www.w3.org/2000/09/xmldsig#X509Data" URI="#xpointer(id('rawCertAsBase64')/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms></dsig:RetrievalMethod></dsig:KeyInfo><dsig:Object Id="rawCertAsBase64">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:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.369.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.369.ErrRes.xml
deleted file mode 100644
index a8964c48c..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.369.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2262 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.369.Req.xml b/spss.test/data/VX0/TestGeneratorVX.369.Req.xml
deleted file mode 100644
index af2870826..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.369.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 369-->
-<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-06-30T14:02:46+01:00</DateTime>
- <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 Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#xpointer(id('NoValidManifestObject'))"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>cdHj8fffTXYR2DJPRAh8E3DV7EY=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>CJJ08NzpzOqOkdgYTvh4sem1cEm+yjSjcTiRi2vtwKecczzAI/RPASDCjeyxxqiq
-27/K1nkNXGe+FEfaO4wb8uTBT+HVAMsrnlpeSjzgpBh+xVm3aOPP14WFmNGbi9H1
-WdCaLNbwdBrCPBi3bpAGqH6wpAhh+/I1cZHrBZrP/QI=</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="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/VX0/TestGeneratorVX.370.ErrRes.xml b/spss.test/data/VX0/TestGeneratorVX.370.ErrRes.xml
deleted file mode 100644
index a8964c48c..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.370.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-2262 \ No newline at end of file
diff --git a/spss.test/data/VX0/TestGeneratorVX.370.Req.xml b/spss.test/data/VX0/TestGeneratorVX.370.Req.xml
deleted file mode 100644
index 4794a8481..000000000
--- a/spss.test/data/VX0/TestGeneratorVX.370.Req.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 370-->
-<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-06-30T14:02:46+01:00</DateTime>
- <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 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>cdHj8fffTXYR2DJPRAh8E3DV7EY=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>CJJ08NzpzOqOkdgYTvh4sem1cEm+yjSjcTiRi2vtwKecczzAI/RPASDCjeyxxqiq
-27/K1nkNXGe+FEfaO4wb8uTBT+HVAMsrnlpeSjzgpBh+xVm3aOPP14WFmNGbi9H1
-WdCaLNbwdBrCPBi3bpAGqH6wpAhh+/I1cZHrBZrP/QI=</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="http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/testDaten.txt"><dsig:DigestMethod Algorithm="noValidDigestAlg"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.001.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.001.Req.xml
deleted file mode 100644
index 0075b4e69..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.001.Req.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Erstellung einer Signatur
- - Detached Signature
- - Content per LocRef (URL-Mapping)
--->
-
-<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="testDaten.txt">
- <LocRefContent>http://localhost:8080/moa-spss-testdata/resources/documents/testDaten.txt</LocRefContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.001.Res.xml b/spss.test/data/feature41/TestGeneratorFeature41.001.Res.xml
deleted file mode 100644
index 42243a174..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.001.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="testDaten.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>WVob54034HfToUBDAErL5z6GFxo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>oqqpIw2v+DyzBB2Btc9RE38O/p5Wp/y4m/j4TSwNl4FbZkAY2DbWk9Uac5TiwdCh
-h8ss8fQGIQSFiTdh2VY5zFe77rMOR/kQfuIiTvt+8uzxCo/a1iPpvr0joppih6kd
-OLgv2ZzD/DZeB2uF3BdNpkd1AEUSi4OnnLaQ+rW7hog=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.002.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.002.Req.xml
deleted file mode 100644
index b98cf5a9a..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.002.Req.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Erstellung einer Signatur
- - Enveloping Signature
- - Content per LocRef
--->
-
-<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="enveloping" ChildOfManifest="false">
- <DataObject>
- <LocRefContent>http://localhost:8080/moa-spss-testdata/resources/documents/testSimple.txt</LocRefContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.002.Res.xml b/spss.test/data/feature41/TestGeneratorFeature41.002.Res.xml
deleted file mode 100644
index f2373768c..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.002.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id('signed-data-1-1-1')/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>BZcl/8GN5YI1fRFkTmv3YVstrVtFS5XquQoylfkXya4KsNRrhW8Sd0go+JxfbbaQ
-FP671mer7rlj42zYxgAB1rfr0zogy9gkSf69GftRdHH1z5w79lGgzQga5PbY7d24
-AKt/oETiJcGFH0C3XVWxOIZdK9z4jMrMvkAoEVJ06G4=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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 Id="signed-data-1-1-1">RGllcyBzaW5kIFRlc3RkYXRlbg==</dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.003.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.003.Req.xml
deleted file mode 100644
index f3d566d96..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.003.Req.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Erstellung einer Signatur
- - Signaturumgebung per LocRef
--->
-
-<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="http://localhost:8080/moa-spss-testdata/resources/documents/testSimple.txt">
- <XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType></FinalDataMetaInfo>
- </CreateTransformsInfo></CreateTransformsInfoProfile>
- </DataObjectInfo>
- <CreateSignatureInfo xmlns:data="http://uri.data.org">
- <CreateSignatureEnvironment>
- <LocRefContent>http://localhost:8080/moa-spss-testdata/resources/testDocument.xml</LocRefContent>
- </CreateSignatureEnvironment>
- <CreateSignatureEnvironmentProfile>
- <CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation>
- </CreateSignatureEnvironmentProfile>
- </CreateSignatureInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.003.Res.xml b/spss.test/data/feature41/TestGeneratorFeature41.003.Res.xml
deleted file mode 100644
index 58662eabd..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.003.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><data:Document xmlns:data="http://uri.data.org"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/documents/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ENTKWRJqIf5z5OfmsQ1Txj/EhH0jiJBtb7eFghQTLKz4xHmzxieAtMS26K2nH+PH
-zSPBYiEWHj6ewQ8R0IXL7thHWEiAKahMTwZ4URKgwjn7uSVxbqR/YIaC/BFjMiUd
-1umPkeSB1hHnfZZpQLZd7sRpth0653R7g/Qmmor3r2k=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.004.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.004.Req.xml
deleted file mode 100644
index 19a67ddd6..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.004.Req.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Erstellung einer Signatur
- - Supplement zur CreateSignatureEnvironment per LocRef
--->
-
-<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"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <dsig:Transforms>
- <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
- </dsig:Transforms>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <CreateSignatureInfo xmlns:data="http://uri.data.org">
- <CreateSignatureEnvironment>
- <XMLContent xml:space="preserve">
- <data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" attr="document" xsi:schemaLocation="http://uri.data.org http://anywhere.org/testDocument.schema.xsd">Dies sind Testdaten</data:Document>
- </XMLContent>
- </CreateSignatureEnvironment>
- <CreateSignatureEnvironmentProfile>
- <CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation>
- <Supplement>
- <Content Reference="http://anywhere.org/testDocument.schema.xsd">
- <LocRefContent>http://localhost:8080/moa-spss-testdata/resources/schemas/testDocument.schema.xsd</LocRefContent>
- </Content>
- </Supplement>
- </CreateSignatureEnvironmentProfile>
- </CreateSignatureInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.004.Res.xml b/spss.test/data/feature41/TestGeneratorFeature41.004.Res.xml
deleted file mode 100644
index 555338faf..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.004.Res.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" ><SignatureEnvironment><data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" attr="document" xsi:schemaLocation="http://uri.data.org http://anywhere.org/testDocument.schema.xsd"><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#document"><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>cfkbUQ6pYpnOZg0nHpe4QJD2EtU=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Qcb3A9TDoayqprHRS65bCXZHqBQSfAVfWru0scRT+7J52ZgF+fXUv3jYVNNtSlpT
-a9IkY2z9NXIrYlRVH1U5AIvGECDircEpEDKwaMB1dmVvo1GXn5hos+BYBGGqp6n6
-xnZ4S8hD+4QiJPnFdsixGt4DlOMaD1+uWwpaW7SPC+I=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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>Dies sind Testdaten</data:Document></SignatureEnvironment> </CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.005.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.005.Req.xml
deleted file mode 100644
index 89f5387de..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.005.Req.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Erstellung einer Signatur
- - Supplement zu CreateTransformsInfo per LocRef
--->
-
-<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="http://localhost:8080/moa-spss-testdata/resources/documents/bookData.xml">
- <XMLContent xml:space="preserve">
- <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/TR/1999/REC-xslt-19991116">
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/stylesheets/book.notavailable.xsl"/></xsl:stylesheet>
- </dsig:Transform>
- </dsig:Transforms>
- <FinalDataMetaInfo>
- <MimeType>text/html</MimeType>
- <Description>http://www.description.com</Description>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- <Supplement>
- <Content Reference="http://localhost:8080/moa-spss-testdata/resources/stylesheets/book.notavailable.xsl">
- <LocRefContent>http://localhost:8080/moa-spss-testdata/resources/stylesheets/book.xsl</LocRefContent>
- </Content>
- </Supplement>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.005.Res.xml b/spss.test/data/feature41/TestGeneratorFeature41.005.Res.xml
deleted file mode 100644
index c8bc9088e..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.005.Res.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><CreateXMLSignatureResponse
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- ><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/moa-spss-testdata/resources/documents/bookData.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/stylesheets/book.notavailable.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>+GL+SPHHr39XrA/lY2YLkOAUfuo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>lBx1/ZwAQrBp+9iYDzJ8zwcg7jT3Y6L6dF3i9YvZ6SV+E63Hk6QwiR8sYb5QqX7a
-Gfnk34Zus8xWyIC6Z+E7mlDMd1TK/1jPj4Ut6Tvq6JemwncKUgcPAofdgRG7JP15
-DuaiaE1o36Y4N9Ri7wXDg6+Iwo7tgx1aMWwcdeza7Lk=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><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></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.006.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.006.Req.xml
deleted file mode 100644
index 09f93fa8d..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.006.Req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Pruefung einer Signature
- - Signaturumgebung per LocRef
--->
-
-<VerifyXMLSignatureRequest
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <DateTime>2003-11-11T00:47:33+01:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <LocRefContent>http://localhost:8080/moa-spss-testdata/resources/documents/simpleSignature.xml</LocRefContent></VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.006.Res.xml b/spss.test/data/feature41/TestGeneratorFeature41.006.Res.xml
deleted file mode 100644
index 53ba8d830..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.006.Res.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <HashInputData>
- <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content> </HashInputData>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.007.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.007.Req.xml
deleted file mode 100644
index bb745fd8e..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.007.Req.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Pruefung einer Signatur
- - Datenobjekt als Supplement per LocRef
--->
-
-<VerifyXMLSignatureRequest
- xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <DateTime>2003-11-11T00:47:35+01:00</DateTime>
- <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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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>
- <SupplementProfile>
- <MetaInfo>
- <MimeType>text/plain</MimeType>
- <Description>http://www.buergerkarte.at</Description>
- </MetaInfo>
- <Content Reference="http://localhost:8080/moa-spss-testdata/resources/testSimple.txt">
- <LocRefContent>http://localhost:8080/moa-spss-testdata/resources/documents/testSimple.txt</LocRefContent>
- </Content>
- </SupplementProfile>
- <TrustProfileID>TrustProfile1</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.007.Res.xml b/spss.test/data/feature41/TestGeneratorFeature41.007.Res.xml
deleted file mode 100644
index d85292b1a..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.007.Res.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" >
- <SignerInfo>
- <dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:X509SubjectName>CN=Isolde B\C3\BCrgerin,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509SubjectName>
- <dsig:X509IssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </dsig:X509IssuerSerial>
-
-<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>
- </SignerInfo>
- <SignatureCheck>
- <Code>0</Code>
- </SignatureCheck>
- <CertificateCheck>
- <Code>0</Code>
- </CertificateCheck>
-</VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.050.ErrRes.xml b/spss.test/data/feature41/TestGeneratorFeature41.050.ErrRes.xml
deleted file mode 100644
index c290966ea..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.050.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-3201 \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.050.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.050.Req.xml
deleted file mode 100644
index c5e21783a..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.050.Req.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Erstellung einer Signatur
- - Detached Signature
- - Content per LocRef (URL-Mapping) - nicht aufloesbar
--->
-
-<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="testdaten.txt">
- <LocRefContent>http://example.org/object.notavailable.txt</LocRefContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.051.ErrRes.xml b/spss.test/data/feature41/TestGeneratorFeature41.051.ErrRes.xml
deleted file mode 100644
index ba3f056ed..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.051.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-3203 \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.051.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.051.Req.xml
deleted file mode 100644
index 775869a68..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.051.Req.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Erstellung einer Signatur
- - Signaturumgebung per LocRef - nicht aufloesbar
--->
-
-<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="http://localhost:8080/moa-spss-testdata/resources/documents/testSimple.txt">
- <XMLContent xml:space="preserve">Dies sind Testdaten</XMLContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType></FinalDataMetaInfo>
- </CreateTransformsInfo></CreateTransformsInfoProfile>
- </DataObjectInfo>
- <CreateSignatureInfo xmlns:data="http://uri.data.org">
- <CreateSignatureEnvironment>
- <LocRefContent>http://example.org/signatureEnvironment.notavailable.xml</LocRefContent>
- </CreateSignatureEnvironment>
- <CreateSignatureEnvironmentProfile>
- <CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation>
- </CreateSignatureEnvironmentProfile>
- </CreateSignatureInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.052.ErrRes.xml b/spss.test/data/feature41/TestGeneratorFeature41.052.ErrRes.xml
deleted file mode 100644
index a04556cdc..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.052.ErrRes.xml
+++ /dev/null
@@ -1 +0,0 @@
-3202 \ No newline at end of file
diff --git a/spss.test/data/feature41/TestGeneratorFeature41.052.Req.xml b/spss.test/data/feature41/TestGeneratorFeature41.052.Req.xml
deleted file mode 100644
index a47f954c6..000000000
--- a/spss.test/data/feature41/TestGeneratorFeature41.052.Req.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Erstellung einer Signatur
- - Supplement zur CreateSignatureEnvironment per LocRef
--->
-
-<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"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <dsig:Transforms>
- <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
- </dsig:Transforms>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <CreateSignatureInfo xmlns:data="http://uri.data.org">
- <CreateSignatureEnvironment>
- <XMLContent xml:space="preserve">
- <data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" attr="document" xsi:schemaLocation="http://uri.data.org http://anywhere.org/testDocument.schema.xsd">Dies sind Testdaten</data:Document>
- </XMLContent>
- </CreateSignatureEnvironment>
- <CreateSignatureEnvironmentProfile>
- <CreateSignatureLocation Index="0">//data:Document</CreateSignatureLocation>
- <Supplement>
- <Content Reference="http://anywhere.org/testDocument.schema.xsd">
- <LocRefContent>http://example.org/testDocument.schema.notavailable.xsd</LocRefContent>
- </Content>
- </Supplement>
- </CreateSignatureEnvironmentProfile>
- </CreateSignatureInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.test/data/feature41/readme.txt b/spss.test/data/feature41/readme.txt
deleted file mode 100644
index d22612e6d..000000000
--- a/spss.test/data/feature41/readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Autor: Gregor Karlinger
-Datum: 2003-11-11
-
-* Zum Generieren der Testdaten wird die Ressource
- "resources/stylesheets/book.notavailable.xml" benötigt.
-
-* Bevor die Testfälle ablaufen sollen, ist diese Ressource
- vom Webserver zu entfernen. Sie darf nicht mehr zur Ver-
- fügung stehen. \ No newline at end of file
diff --git a/spss.test/lib/SignatureAlgorithmImplECDSA.jar b/spss.test/lib/SignatureAlgorithmImplECDSA.jar
deleted file mode 100644
index 6df580e13..000000000
--- a/spss.test/lib/SignatureAlgorithmImplECDSA.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/axis-1.0/axis.jar b/spss.test/lib/axis-1.0/axis.jar
deleted file mode 100644
index 7cf31027a..000000000
--- a/spss.test/lib/axis-1.0/axis.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/axis-1.0/jaxrpc.jar b/spss.test/lib/axis-1.0/jaxrpc.jar
deleted file mode 100644
index 4a2081643..000000000
--- a/spss.test/lib/axis-1.0/jaxrpc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/axis-1.0/saaj.jar b/spss.test/lib/axis-1.0/saaj.jar
deleted file mode 100644
index cf43f1fcd..000000000
--- a/spss.test/lib/axis-1.0/saaj.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/axis-1.0/wsdl4j.jar b/spss.test/lib/axis-1.0/wsdl4j.jar
deleted file mode 100644
index e90968e03..000000000
--- a/spss.test/lib/axis-1.0/wsdl4j.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/commons-discovery-0.2/commons-discovery.jar b/spss.test/lib/commons-discovery-0.2/commons-discovery.jar
deleted file mode 100644
index b88554847..000000000
--- a/spss.test/lib/commons-discovery-0.2/commons-discovery.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/iaik-moa-full.jar b/spss.test/lib/iaik-moa-20030703/iaik-moa-full.jar
deleted file mode 100644
index 30d5f4828..000000000
--- a/spss.test/lib/iaik-moa-20030703/iaik-moa-full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/iaikPkcs11Provider.jar b/spss.test/lib/iaik-moa-20030703/iaikPkcs11Provider.jar
deleted file mode 100644
index 52c32ff7e..000000000
--- a/spss.test/lib/iaik-moa-20030703/iaikPkcs11Provider.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/iaikPkcs11Wrapper.jar b/spss.test/lib/iaik-moa-20030703/iaikPkcs11Wrapper.jar
deleted file mode 100644
index 5d69f255c..000000000
--- a/spss.test/lib/iaik-moa-20030703/iaikPkcs11Wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/iaik_cms.jar b/spss.test/lib/iaik-moa-20030703/iaik_cms.jar
deleted file mode 100644
index 0f8be7bf0..000000000
--- a/spss.test/lib/iaik-moa-20030703/iaik_cms.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/iaik_ecc.jar b/spss.test/lib/iaik-moa-20030703/iaik_ecc.jar
deleted file mode 100644
index 8c528a215..000000000
--- a/spss.test/lib/iaik-moa-20030703/iaik_ecc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/iaik_jce_full.jar b/spss.test/lib/iaik-moa-20030703/iaik_jce_full.jar
deleted file mode 100644
index 8d0f093e6..000000000
--- a/spss.test/lib/iaik-moa-20030703/iaik_jce_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/ixsil.jar b/spss.test/lib/iaik-moa-20030703/ixsil.jar
deleted file mode 100644
index 606430367..000000000
--- a/spss.test/lib/iaik-moa-20030703/ixsil.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/signed/iaikPkcs11Provider_signed.jar b/spss.test/lib/iaik-moa-20030703/signed/iaikPkcs11Provider_signed.jar
deleted file mode 100644
index fd56f9911..000000000
--- a/spss.test/lib/iaik-moa-20030703/signed/iaikPkcs11Provider_signed.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/signed/iaik_ecc.jar b/spss.test/lib/iaik-moa-20030703/signed/iaik_ecc.jar
deleted file mode 100644
index 4279ff571..000000000
--- a/spss.test/lib/iaik-moa-20030703/signed/iaik_ecc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/signed/iaik_jce_full.jar b/spss.test/lib/iaik-moa-20030703/signed/iaik_jce_full.jar
deleted file mode 100644
index 13f0b90be..000000000
--- a/spss.test/lib/iaik-moa-20030703/signed/iaik_jce_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik-moa-20030703/win32/pkcs11wrapper.dll b/spss.test/lib/iaik-moa-20030703/win32/pkcs11wrapper.dll
deleted file mode 100644
index dcc61609e..000000000
--- a/spss.test/lib/iaik-moa-20030703/win32/pkcs11wrapper.dll
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/iaik_javax_crypto.jar b/spss.test/lib/iaik_javax_crypto.jar
deleted file mode 100644
index 04ce59443..000000000
--- a/spss.test/lib/iaik_javax_crypto.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jaxen-1.0/jaxen-core.jar b/spss.test/lib/jaxen-1.0/jaxen-core.jar
deleted file mode 100644
index e52bf679c..000000000
--- a/spss.test/lib/jaxen-1.0/jaxen-core.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jaxen-1.0/jaxen-dom.jar b/spss.test/lib/jaxen-1.0/jaxen-dom.jar
deleted file mode 100644
index 1a9926357..000000000
--- a/spss.test/lib/jaxen-1.0/jaxen-dom.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jaxen-1.0/saxpath.jar b/spss.test/lib/jaxen-1.0/saxpath.jar
deleted file mode 100644
index 2b43955ba..000000000
--- a/spss.test/lib/jaxen-1.0/saxpath.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jaxp-1.2_01/dom.jar b/spss.test/lib/jaxp-1.2_01/dom.jar
deleted file mode 100644
index f91f80a8b..000000000
--- a/spss.test/lib/jaxp-1.2_01/dom.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jaxp-1.2_01/jaxp-api.jar b/spss.test/lib/jaxp-1.2_01/jaxp-api.jar
deleted file mode 100644
index 7a3295ee6..000000000
--- a/spss.test/lib/jaxp-1.2_01/jaxp-api.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jaxp-1.2_01/sax.jar b/spss.test/lib/jaxp-1.2_01/sax.jar
deleted file mode 100644
index 9ffb844e5..000000000
--- a/spss.test/lib/jaxp-1.2_01/sax.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jce.jar b/spss.test/lib/jce.jar
deleted file mode 100644
index 0809ec1af..000000000
--- a/spss.test/lib/jce.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jprov.jar b/spss.test/lib/jprov.jar
deleted file mode 100644
index dc3563ec7..000000000
--- a/spss.test/lib/jprov.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jsse-1.0.3_01/jcert.jar b/spss.test/lib/jsse-1.0.3_01/jcert.jar
deleted file mode 100644
index d33134214..000000000
--- a/spss.test/lib/jsse-1.0.3_01/jcert.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jsse-1.0.3_01/jnet.jar b/spss.test/lib/jsse-1.0.3_01/jnet.jar
deleted file mode 100644
index e1d340093..000000000
--- a/spss.test/lib/jsse-1.0.3_01/jnet.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/jsse-1.0.3_01/jsse.jar b/spss.test/lib/jsse-1.0.3_01/jsse.jar
deleted file mode 100644
index 123188c5e..000000000
--- a/spss.test/lib/jsse-1.0.3_01/jsse.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/xalan-j-2.2/bsf.jar b/spss.test/lib/xalan-j-2.2/bsf.jar
deleted file mode 100644
index 19036c1bc..000000000
--- a/spss.test/lib/xalan-j-2.2/bsf.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/xalan-j-2.2/xalan.jar b/spss.test/lib/xalan-j-2.2/xalan.jar
deleted file mode 100644
index 8dd6dca25..000000000
--- a/spss.test/lib/xalan-j-2.2/xalan.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/xerces-j-2.0.2/xercesImpl.jar b/spss.test/lib/xerces-j-2.0.2/xercesImpl.jar
deleted file mode 100644
index f25d73cd7..000000000
--- a/spss.test/lib/xerces-j-2.0.2/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/lib/xerces-j-2.0.2/xmlParserAPIs.jar b/spss.test/lib/xerces-j-2.0.2/xmlParserAPIs.jar
deleted file mode 100644
index c1fa1d645..000000000
--- a/spss.test/lib/xerces-j-2.0.2/xmlParserAPIs.jar
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/100kb.txt b/spss.test/resources/100kb.txt
deleted file mode 100644
index 486169d0f..000000000
--- a/spss.test/resources/100kb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Some \ No newline at end of file
diff --git a/spss.test/resources/10kb.txt b/spss.test/resources/10kb.txt
deleted file mode 100644
index f944d657e..000000000
--- a/spss.test/resources/10kb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be \ No newline at end of file
diff --git a/spss.test/resources/1kb.txt b/spss.test/resources/1kb.txt
deleted file mode 100644
index 3c408baa2..000000000
--- a/spss.test/resources/1kb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to \ No newline at end of file
diff --git a/spss.test/resources/1mb.txt b/spss.test/resources/1mb.txt
deleted file mode 100644
index b3bb7dddc..000000000
--- a/spss.test/resources/1mb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to b \ No newline at end of file
diff --git a/spss.test/resources/20kb.txt b/spss.test/resources/20kb.txt
deleted file mode 100644
index 71f407d5a..000000000
--- a/spss.test/resources/20kb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Someth \ No newline at end of file
diff --git a/spss.test/resources/500kb.txt b/spss.test/resources/500kb.txt
deleted file mode 100644
index 02afda5fb..000000000
--- a/spss.test/resources/500kb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Sign \ No newline at end of file
diff --git a/spss.test/resources/50kb.txt b/spss.test/resources/50kb.txt
deleted file mode 100644
index 6c810121f..000000000
--- a/spss.test/resources/50kb.txt
+++ /dev/null
@@ -1 +0,0 @@
-Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) Something to be Signed :) So \ No newline at end of file
diff --git a/spss.test/resources/BookData.xml b/spss.test/resources/BookData.xml
deleted file mode 100644
index 0d18d79d3..000000000
--- a/spss.test/resources/BookData.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><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> \ No newline at end of file
diff --git a/spss.test/resources/BookData_wo_NS.xml b/spss.test/resources/BookData_wo_NS.xml
deleted file mode 100644
index d52f3890b..000000000
--- a/spss.test/resources/BookData_wo_NS.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><book hardback="yes"><title>Gesundheitliche <!--Comment -->Auswirkungen elektronischer Signaturen</title><first-name>Ellipse</first-name><last-name>Kurvenreich</last-name><birth-date>1951-04-16</birth-date><birth-location>Hinterm Berg</birth-location><register-number>6-930-21512-12</register-number></book> \ No newline at end of file
diff --git a/spss.test/resources/CSEP.xml b/spss.test/resources/CSEP.xml
deleted file mode 100644
index 708cdd328..000000000
--- a/spss.test/resources/CSEP.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><CreateSignatureEnvironmentProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><CreateSignatureLocation Index="0">/data:Document</CreateSignatureLocation></CreateSignatureEnvironmentProfile> \ No newline at end of file
diff --git a/spss.test/resources/CX1_book.xsl b/spss.test/resources/CX1_book.xsl
deleted file mode 100644
index b484b9583..000000000
--- a/spss.test/resources/CX1_book.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet> \ No newline at end of file
diff --git a/spss.test/resources/CX1_book_not_here.xsl b/spss.test/resources/CX1_book_not_here.xsl
deleted file mode 100644
index b484b9583..000000000
--- a/spss.test/resources/CX1_book_not_here.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet> \ No newline at end of file
diff --git a/spss.test/resources/CX1_bookprofile.xsl b/spss.test/resources/CX1_bookprofile.xsl
deleted file mode 100644
index ca41d793f..000000000
--- a/spss.test/resources/CX1_bookprofile.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><CreateTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><CreateTransformsInfo><dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile> \ No newline at end of file
diff --git a/spss.test/resources/CX1_bookref.xsl b/spss.test/resources/CX1_bookref.xsl
deleted file mode 100644
index 1b628fcd3..000000000
--- a/spss.test/resources/CX1_bookref.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book.xsl"/></xsl:stylesheet> \ No newline at end of file
diff --git a/spss.test/resources/CX1_bookref_not_here.xsl b/spss.test/resources/CX1_bookref_not_here.xsl
deleted file mode 100644
index 37ea9eaef..000000000
--- a/spss.test/resources/CX1_bookref_not_here.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book_not_here.xsl"/></xsl:stylesheet> \ No newline at end of file
diff --git a/spss.test/resources/DSA.1024.p12 b/spss.test/resources/DSA.1024.p12
deleted file mode 100644
index e180e607d..000000000
--- a/spss.test/resources/DSA.1024.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/DSA.512.p12 b/spss.test/resources/DSA.512.p12
deleted file mode 100644
index 8f7a201ac..000000000
--- a/spss.test/resources/DSA.512.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/HSMRSAKEY.cer b/spss.test/resources/HSMRSAKEY.cer
deleted file mode 100644
index 222fa8142..000000000
--- a/spss.test/resources/HSMRSAKEY.cer
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB6TCCAVICASowDQYJKoZIhvcNAQEFBQAwPTESMBAGA1UEAxMJSFNNUlNBS0VZ
-MQwwCgYDVQQKEwNCUloxDDAKBgNVBAsTA01PQTELMAkGA1UEBhMCQVQwHhcNMDMw
-MzA2MTYxMzIwWhcNMDQwMzA2MTYxMzIwWjA9MRIwEAYDVQQDEwlIU01SU0FLRVkx
-DDAKBgNVBAoTA0JSWjEMMAoGA1UECxMDTU9BMQswCQYDVQQGEwJBVDCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEAw+chYCv2l01xPWi3Y6Sss3PsB7qGgKBn28lC
-x2a/OjTnutCZ2pUWmcj5H4hR8zCiLvQ02wfzL0fbDKNgvLZtoQTxXVTi9LKOQ4ZT
-TpGrylJsBw1E/Lr0lfntAmukxBGKiRp6VUKt7mANeCSVI8U2GJ9ZCOALBLMbGy96
-hU1h180CAwD4KzANBgkqhkiG9w0BAQUFAAOBgQBCZfvgNdomKUx6qaCCkxWXU7An
-Yk7UyMPQdbMkL6g2gqpyOy4ubGBmu/fbGmWFmh36BmJqFQdKMsjPUqlbX/NzSNVX
-qV6sViyEi44eIRPX+eQbnxN14hH2+seKYUPmSxppyB+IJ1egvQGGFN24HrJImP6c
-5lhtkYVThTkMHDvGPg==
------END CERTIFICATE-----
diff --git a/spss.test/resources/IAIKRootMusterbehoerde.cer b/spss.test/resources/IAIKRootMusterbehoerde.cer
deleted file mode 100644
index 21dc972b9..000000000
--- a/spss.test/resources/IAIKRootMusterbehoerde.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/Max_Mustermann (max).p12 b/spss.test/resources/Max_Mustermann (max).p12
deleted file mode 100644
index b18a842e2..000000000
--- a/spss.test/resources/Max_Mustermann (max).p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/Max_Mustermann.cer b/spss.test/resources/Max_Mustermann.cer
deleted file mode 100644
index b5b39633d..000000000
--- a/spss.test/resources/Max_Mustermann.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/SignatureVX005.xml b/spss.test/resources/SignatureVX005.xml
deleted file mode 100644
index 0cbec2e6f..000000000
--- a/spss.test/resources/SignatureVX005.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 325-->
-<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
-2. Zeile Testdaten</dsig:Object></dsig:Signature> \ No newline at end of file
diff --git a/spss.test/resources/SignatureVX005Cert.xml b/spss.test/resources/SignatureVX005Cert.xml
deleted file mode 100644
index f6c5a8a4f..000000000
--- a/spss.test/resources/SignatureVX005Cert.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<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>
diff --git a/spss.test/resources/SignatureVX006Document.xml b/spss.test/resources/SignatureVX006Document.xml
deleted file mode 100644
index 0cbec2e6f..000000000
--- a/spss.test/resources/SignatureVX006Document.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Testnumber: 325-->
-<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
-2. Zeile Testdaten</dsig:Object></dsig:Signature> \ No newline at end of file
diff --git a/spss.test/resources/TEMPX509Data.xml b/spss.test/resources/TEMPX509Data.xml
deleted file mode 100644
index 5214a44e2..000000000
--- a/spss.test/resources/TEMPX509Data.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Stephan Grill (Anecon) -->
-<dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <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>
diff --git a/spss.test/resources/TestGeneratorVX.Config.xml b/spss.test/resources/TestGeneratorVX.Config.xml
deleted file mode 100644
index 974299c7c..000000000
--- a/spss.test/resources/TestGeneratorVX.Config.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#"><TrustProfile id="TrustProfile1" uri="file://SERVER_WORKING_DIRECTORY/TrustProfile1"/><SupplementProfile id="SupplementProfile1" uri="file://SERVER_WORKING_DIRECTORY/SupplementProfile1"/><SupplementProfile id="SupplementProfile2" uri="file://SERVER_WORKING_DIRECTORY/SupplementProfile2"/></MOAConfiguration> \ No newline at end of file
diff --git a/spss.test/resources/VC0.011.cms.ber.b64.txt b/spss.test/resources/VC0.011.cms.ber.b64.txt
deleted file mode 100644
index e6e0fbd48..000000000
--- a/spss.test/resources/VC0.011.cms.ber.b64.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-MIII2AIBATELMAkGBSsOAwIaBQAwggECBgkqhkiG9w0BBwGggfQEgfE8c2wxMDpJ
-bmZvYm94UmVhZFJlcXVlc3QgeG1sbnM6c2wxMD0naHR0cDovL3d3dy5idWVyZ2Vy
-a2FydGUuYXQvbmFtZXNwYWNlcy9zZWN1cml0eWxheWVyLzIwMDIwMjI1Iyc+PHNs
-MTA6SW5mb2JveElkZW50aWZpZXI+SWRlbnRpdHlMaW5rPC9zbDEwOkluZm9ib3hJ
-ZGVudGlmaWVyPjxzbDEwOkJpbmFyeUZpbGVQYXJhbWV0ZXJzIENvbnRlbnRJc1hN
-TEVudGl0eT0ndHJ1ZScvPjwvc2wxMDpJbmZvYm94UmVhZFJlcXVlc3Q+oIIFKTCC
-BSUwggQNoAMCAQICAhk3MA0GCSqGSIb3DQEBBQUAMIGhMQswCQYDVQQGEwJBVDFI
-MEYGA1UEChM/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBl
-bGVrdHIuIERhdGVudmVya2VociBHbWJIMSMwIQYDVQQLExphLXNpZ24tVEVTVC1Q
-cmVtaXVtLUVuYy0wMTEjMCEGA1UEAxMaYS1zaWduLVRFU1QtUHJlbWl1bS1FbmMt
-MDEwHhcNMDMwMjEwMTMyMDU4WhcNMDYwMjEwMTMyMDU4WjBqMQswCQYDVQQGEwJB
-VDEcMBoGA1UEAxMTVGVzdHBlcnNvbiBNT0E0IEJSWjEMMAoGA1UEBBMDQlJaMRgw
-FgYDVQQqEw9UZXN0cGVyc29uIE1PQTQxFTATBgNVBAUTDDc5MDE4NzQ2MTYzMzCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0v1Ftf7WXgoexx0Jo/GrlExHOHnQ
-IEQ5FFSjptLRd5BN1mZYRg2S9KfOMbHSCsiPm8AwjAEwE5EMA6P18Z/YyTIuP7fN
-GzckbB5PYIgNMHL8/TYJhHA8CjamsBrEfYDXivE8iAvALg5I9RMLZADmzL7af2da
-YYuO8dycQw3xg6UCAwEAAaOCAh8wggIbMBMGA1UdIwQMMAqACEuzgMNxkzzYMCcG
-CCsGAQUFBwEDAQH/BBgwFjAIBgYEAI5GAQEwCgYIKwYBBQUHCwEwgYIGCCsGAQUF
-BwEBBHYwdDApBggrBgEFBQcwAYYdaHR0cDovL3d3dy5hLXRydXN0LmF0OjgyL29j
-c3AwRwYIKwYBBQUHMAKGO2h0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNp
-Z24tVEVTVC1QcmVtaXVtLVNpZy0wMWEuY3J0MIGUBgNVHSAEgYwwgYkwfQYGKigA
-EQEEMHMwNQYIKwYBBQUHAgEWKWh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2Nw
-L2Etc2lnbi1URVNUMDoGCCsGAQUFBwICMC4aLERpZXNlcyBaZXJ0aWZpa2F0IGRp
-ZW50IG51ciB6dSBUZXN0endlY2tlbiAhMAgGBgQAizABATBvBgNVHR8EaDBmMGSg
-YqBghl5sZGFwOi8vbGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1URVNULVByZW1p
-dW0tRW5jLTAxLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxp
-c3Q/MBEGA1UdDgQKBAhOA8S/ZMuDPjAOBgNVHQ8BAf8EBAMCBsAwIAYDVR0RBBkw
-F4EVdGVzdHBlcnNvbjRAYnJ6Lmd2LmF0MAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEF
-BQADggEBAIqFb7GTfjZ0MVzExnYyr3kwTEU2Mx35ZEgvJSPV15bT+fpoyLqAdk5+
-r6KLwPHV8/Y07J0LfH/MntAi9m0kvVFQ9Y7/EqN22r6rlvh5ZGQQGby9/QDzSz41
-FJ1p9EDp60ACeluO1MBgFIBMNynAXCWhGuF2//JFI+tfMRs1pel9JirFacZK3/uQ
-o/p5sA6goZZdPP/dDJoUmODORa75kPRowDeRR1bJNBT6dNrSgkc6ASbc6QdQ1ih5
-YIgx1AF8uXg9FyOz13mzzWeCJ72P4wvyB/D0S3SU9uPWEJlMWeJ3k7RQ72/AtUIe
-pO9uX4d4Vcal/GcMFo/fohkFZOdytwgxggKRMIICjQIBATCBqDCBoTELMAkGA1UE
-BhMCQVQxSDBGBgNVBAoTP0EtVHJ1c3QgR2VzLiBmLiBTaWNoZXJoZWl0c3N5c3Rl
-bWUgaW0gZWxla3RyLiBEYXRlbnZlcmtlaHIgR21iSDEjMCEGA1UECxMaYS1zaWdu
-LVRFU1QtUHJlbWl1bS1FbmMtMDExIzAhBgNVBAMTGmEtc2lnbi1URVNULVByZW1p
-dW0tRW5jLTAxAgIZNzAJBgUrDgMCGgUAoIIBPjAjBgkqhkiG9w0BCQQxFgQU7Cdd
-FuGLuHFvEIPT80IThplXPXowNAYLKoZIhvcNAQkQAgQxJTAjDBZ0ZXh0L3htbDtj
-aGFyc2V0PVVURi04BgkqhkiG9w0BBwEwgeAGCyqGSIb3DQEJEAITMYHQMIHNMIHK
-MIHHBBQWuG7WjiYviBAd0lxTTFID+HgI4TCBrjCBp6SBpDCBoTELMAkGA1UEBhMC
-QVQxSDBGBgNVBAoTP0EtVHJ1c3QgR2VzLiBmLiBTaWNoZXJoZWl0c3N5c3RlbWUg
-aW0gZWxla3RyLiBEYXRlbnZlcmtlaHIgR21iSDEjMCEGA1UECxMaYS1zaWduLVRF
-U1QtUHJlbWl1bS1FbmMtMDExIzAhBgNVBAMTGmEtc2lnbi1URVNULVByZW1pdW0t
-RW5jLTAxAgIZNzANBgkqhkiG9w0BAQEFAASBgJCZ0BwFdXjChqrS8cHWJcqfe+up
-x4VVNV1YOJil/KWMuBCn3DHQsbBFJFrmGUUJGenBbre5L86brr43NwvndrtyyRrw
-vG4/QWmYIxowXKuRlqGDCOmTaC6ddrjyVxQ54yal+XhlrWfc6kcdb6NK6dt6X7wR
-
diff --git a/spss.test/resources/VX.006DTD.dtd b/spss.test/resources/VX.006DTD.dtd
deleted file mode 100644
index 87f31bb13..000000000
--- a/spss.test/resources/VX.006DTD.dtd
+++ /dev/null
@@ -1 +0,0 @@
-<!ELEMENT Document ANY><!ATTLIST Document Id ID #REQUIRED>
diff --git a/spss.test/resources/VX.006Schema.xsd b/spss.test/resources/VX.006Schema.xsd
deleted file mode 100644
index 4689999e8..000000000
--- a/spss.test/resources/VX.006Schema.xsd
+++ /dev/null
@@ -1 +0,0 @@
-<xsd:schema targetNamespace="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified"><xsd:element name="Document"><xsd:complexType mixed="true"><xsd:sequence minOccurs="0" maxOccurs="unbounded"><xsd:any namespace="##any" processContents="lax"/></xsd:sequence><xsd:attribute name="Id" type="xsd:ID" use="required"/></xsd:complexType></xsd:element></xsd:schema> \ No newline at end of file
diff --git a/spss.test/resources/VX.006xmlData.xml b/spss.test/resources/VX.006xmlData.xml
deleted file mode 100644
index 6bfa86556..000000000
--- a/spss.test/resources/VX.006xmlData.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data:Document xmlns:data="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://localhost:8080/moa-spss-testdata/resources/VX.006Schema.xsd">daten</data:Document>
diff --git a/spss.test/resources/VX.007DTD.dtd b/spss.test/resources/VX.007DTD.dtd
deleted file mode 100644
index e80a08a2a..000000000
--- a/spss.test/resources/VX.007DTD.dtd
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT Document (#PCDATA|ANY)*>
-<!ATTLIST Document Id ID #REQUIRED>
diff --git a/spss.test/resources/VX2_book0.xsl b/spss.test/resources/VX2_book0.xsl
deleted file mode 100644
index 7c570de73..000000000
--- a/spss.test/resources/VX2_book0.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="/"><HTML><BODY><h1>Ueberschrift</h1><xsl:apply-templates/></BODY></HTML></xsl:template></xsl:stylesheet> \ No newline at end of file
diff --git a/spss.test/resources/VX2_book1.xsl b/spss.test/resources/VX2_book1.xsl
deleted file mode 100644
index 23e03a51a..000000000
--- a/spss.test/resources/VX2_book1.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><H1>Buch: <xsl:value-of select="data:title"/></H1></xsl:template></xsl:stylesheet> \ No newline at end of file
diff --git a/spss.test/resources/VX2_bookref2includes.xsl b/spss.test/resources/VX2_bookref2includes.xsl
deleted file mode 100644
index 68add69db..000000000
--- a/spss.test/resources/VX2_bookref2includes.xsl
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:include href="http://localhost:8080/moa-spss-testdata/resources/VX2_book0.xsl"/>
- <xsl:include href="http://localhost:8080/moa-spss-testdata/resources/VX2_book1.xsl"/>
-</xsl:stylesheet>
diff --git a/spss.test/resources/X509Data.xml b/spss.test/resources/X509Data.xml
deleted file mode 100644
index 5214a44e2..000000000
--- a/spss.test/resources/X509Data.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Stephan Grill (Anecon) -->
-<dsig:X509Data xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <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>
diff --git a/spss.test/resources/algorithms.properties b/spss.test/resources/algorithms.properties
deleted file mode 100644
index 72c155c5f..000000000
--- a/spss.test/resources/algorithms.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-# IXSIL algorithm properties
-#
-# This file contains the properties which IXSIL uses to maintain the available algorithms.
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# Canonicalization algorithms
-#
-# The following properties (starting with "Canonicalization.") are associations between canonicalization
-# algorithm URIs and their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the canonicalization algorithm
-# with the identifying URI "http://www.w3.org/TR/2001/REC-xml-c14n-20010315", the name of the algorithm
-# property is "Canonicalization.http://www.w3.org/TR/2001/REC-xml-c14n-20010315", i.e. the identifying URI,
-# prepended by the canonicalization algorithm property identifier ("Canonicalization."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard impl. shipped with IXSIL, "iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXML".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Canonicalization.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315 = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXML
-Canonicalization.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXMLWithComments
-Canonicalization.http\://www.w3.org/2001/10/xml-exc-c14n# = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXML
-Canonicalization.http\://www.w3.org/2001/10/xml-exc-c14n#WithComments = iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXMLWithComments
-
-#----------------------------------------------------------------------------------------------------------
-# Signature algorithms
-#
-# The following properties (starting with "Signature.") are associations between signature algorithm URIs and
-# their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the signature algorithm
-# with the identifying URI "http://www.w3.org/2000/09/xmldsig#rsa-sha1", the name of the algorithm
-# property is "Signature.http://www.w3.org/2000/09/xmldsig#rsa-sha1", i.e. the identifying URI,
-# prepended by the signature algorithm property identifier ("Signature."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard implementation shipped with IXSIL, "iaik.ixsil.algorithms.SignatureAlgorithmImplRSA".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Signature.http\://www.w3.org/2000/09/xmldsig#rsa-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplRSA
-Signature.http\://www.w3.org/2000/09/xmldsig#dsa-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplDSA
-Signature.http\://www.w3.org/2000/09/xmldsig#hmac-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplHMAC
-Signature.http\://www.buergerkarte.at/namespaces/ecdsa/200206030#ecdsa-sha1 = iaik.ixsil.algorithms.SignatureAlgorithmImplECDSA
-
-
-#----------------------------------------------------------------------------------------------------------
-# Digest algorithms
-#
-# The following properties (starting with "Digest.") are associations between digest algorithm URIs and
-# their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the digest algorithm
-# with the identifying URI "http://www.w3.org/2000/09/xmldsig#sha1", the name of the algorithm
-# property is "Digest.http://www.w3.org/2000/09/xmldsig#sha1", i.e. the identifying URI,
-# prepended by the digest algorithm property identifier ("Digest."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard implementation shipped with IXSIL, "iaik.ixsil.algorithms.DigestAlgorithmImplSHA1".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Digest.http\://www.w3.org/2000/09/xmldsig#sha1 = iaik.ixsil.algorithms.DigestAlgorithmImplSHA1
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# Transform algorithms
-#
-# The following properties (starting with "Transform.") are associations between digest algorithm URIs and
-# their corresponding implementation classes.
-#
-# For instance, if you would like to specify the implementation class for the transform algorithm
-# with the identifying URI "http://www.w3.org/2000/09/xmldsig#base64", the name of the algorithm
-# property is "Transform.http://www.w3.org/2000/09/xmldsig#base64", i.e. the identifying URI,
-# prepended by the transform algorithm property identifier ("Transform."). The value of the
-# property is the fully qualified class name of the implementation for this algorithm, for instance the
-# standard implementation shipped with IXSIL, "iaik.ixsil.algorithms.TransformImplBase64Decode".
-#
-# PLEASE NOTE: The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-Transform.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315 = iaik.ixsil.algorithms.TransformImplCanonicalXML
-Transform.http\://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments = iaik.ixsil.algorithms.TransformImplCanonicalXMLWithComments
-Transform.http\://www.w3.org/2001/10/xml-exc-c14n# = iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXML
-Transform.http\://www.w3.org/2001/10/xml-exc-c14n#WithComments = iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXMLWithComments
-Transform.http\://www.w3.org/2000/09/xmldsig#base64 = iaik.ixsil.algorithms.TransformImplBase64Decode
-Transform.http\://www.w3.org/TR/1999/REC-xpath-19991116 = iaik.ixsil.algorithms.TransformImplXPath
-Transform.http\://www.w3.org/2000/09/xmldsig#enveloped-signature = iaik.ixsil.algorithms.TransformImplEnvelopedSignature
-Transform.http\://www.w3.org/TR/1999/REC-xslt-19991116 = iaik.ixsil.algorithms.TransformImplXSLT
-Transform.http\://www.w3.org/2002/06/xmldsig-filter2 = iaik.ixsil.algorithms.TransformImplXPath2
diff --git a/spss.test/resources/client.keystore b/spss.test/resources/client.keystore
deleted file mode 100644
index 4b489f259..000000000
--- a/spss.test/resources/client.keystore
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/cms.keystore b/spss.test/resources/cms.keystore
deleted file mode 100644
index c8dc364ba..000000000
--- a/spss.test/resources/cms.keystore
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/documents/bookData.xml b/spss.test/resources/documents/bookData.xml
deleted file mode 100644
index 81f9ba5d0..000000000
--- a/spss.test/resources/documents/bookData.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
diff --git a/spss.test/resources/documents/simpleSignature.xml b/spss.test/resources/documents/simpleSignature.xml
deleted file mode 100644
index 6f235d95c..000000000
--- a/spss.test/resources/documents/simpleSignature.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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://localhost:8080/moa-spss-testdata/resources/testSimple.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>O3POtgZXrGmw+2btYrduSvptSdo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Jl++3waHGFPf3UiFRyU8y1A95bEYnczE8lqin81AMWWFfmzFsghCKP77H/nyVnfW
-2PpmSX/qhu4Cwk9MIyWMLSFRm60xEtlo4hy4oMuCB2xXEFQOyyZhPSIRHW1TrxRW
-NF/Dn2vuP9xTuxzfefVNCCdPoh8OBmk4lSoayoylPM4=</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> \ No newline at end of file
diff --git a/spss.test/resources/documents/testDaten.txt b/spss.test/resources/documents/testDaten.txt
deleted file mode 100644
index 2602728cd..000000000
--- a/spss.test/resources/documents/testDaten.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus \ No newline at end of file
diff --git a/spss.test/resources/documents/testSimple.txt b/spss.test/resources/documents/testSimple.txt
deleted file mode 100644
index 76d2fc51a..000000000
--- a/spss.test/resources/documents/testSimple.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dies sind Testdaten \ No newline at end of file
diff --git a/spss.test/resources/ecc(ego).p12 b/spss.test/resources/ecc(ego).p12
deleted file mode 100644
index f84e793c5..000000000
--- a/spss.test/resources/ecc(ego).p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/ecc.p12 b/spss.test/resources/ecc.p12
deleted file mode 100644
index f84e793c5..000000000
--- a/spss.test/resources/ecc.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/ecdsa_root_cert.cer b/spss.test/resources/ecdsa_root_cert.cer
deleted file mode 100644
index dac166e9a..000000000
--- a/spss.test/resources/ecdsa_root_cert.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/envDoc.xml b/spss.test/resources/envDoc.xml
deleted file mode 100644
index e9119b952..000000000
--- a/spss.test/resources/envDoc.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by My Name (My Company) -->
-<env:Document xmlns:env="http://uri.env.org">Text</env:Document>
diff --git a/spss.test/resources/hsmc.cer b/spss.test/resources/hsmc.cer
deleted file mode 100644
index 160390f35..000000000
--- a/spss.test/resources/hsmc.cer
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB7zCCAVgCAQEwDQYJKoZIhvcNAQEFBQAwQDEVMBMGA1UEAxMMTU9BSFNNUlNB
-S0VZMQwwCgYDVQQKEwNCUloxDDAKBgNVBAsTA01PQTELMAkGA1UEBhMCQVQwHhcN
-MDMwNDA3MTQwNzM3WhcNMDQwNDA3MTQwNzM3WjBAMRUwEwYDVQQDEwxNT0FIU01S
-U0FLRVkxDDAKBgNVBAoTA0JSWjEMMAoGA1UECxMDTU9BMQswCQYDVQQGEwJBVDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuQJeLj5quuES22ZlXY2W5C/JF/7a
-WZM/EBj2hZff3i66IQYe3272E9p1utzIGvY3AfAlW0sKiOhZUpOnvFlAn+Bl86J2
-kE/mQMgVHd4fxb3onCNA+x/x5BdYVdx35il6iQy9xE0kpc01CMrUMMy0+GMcz4OR
-ziJf0WHsi9JL1nECAwCYrzANBgkqhkiG9w0BAQUFAAOBgQCDpmYSMnkjfJ4JXwwc
-Y6eqqiDBexZeVwNLjjJxwf5md4ZRiewwfY3aydcA8ffjcUh4/5XXdn5y2S2n8JEg
-N2EuHHC+k/CE2JJJylkikltE+nawdfa6MukhQ0sPKjyJ+Nr2nXOwX6O2bveaTw9J
-E2+9uU+Tuf4VG9HEHEL+IaU2tA==
------END CERTIFICATE-----
diff --git a/spss.test/resources/init.properties b/spss.test/resources/init.properties
deleted file mode 100644
index 9ddde365e..000000000
--- a/spss.test/resources/init.properties
+++ /dev/null
@@ -1,214 +0,0 @@
-# IXSIL init properties
-#
-# This file contains the basic initialization properties for IXSIL.
-
-#----------------------------------------------------------------------------------------------------------
-# Properties for localizing exeption messages
-
-# This property specifies the ISO language code, which is used to select the appropriate exception message
-# file. Please see the documentation for Java class "java.util.RessourceBundle" for further information.
-
-IXSILException.ISOLanguageCode = "en"
-
-
-
-# This property specifies the ISO country code, which is used to select the appropriate exception message
-# file. Please see the documentation for Java class "java.util.RessourceBundle" for further information.
-
-IXSILException.ISOCountryCode = "US"
-
-
-#----------------------------------------------------------------------------------------------------------
-# Other property files
-
-# This property contains a URI specifying the (virtual) location of the IXSIL init properties file (i. e.
-# this file). The URI MUST be absolute.
-#
-# The use of this property is optional. It is only needed by IXSIL, if the library will be initialized using
-# the method IXSILInit.init(Properties, Properties, Properties). In this case it is used by IXSIL as the
-# base URI for absolutizing other property URIs, such as "DOMUtils.SignatureSchema" (see below).
-#
-# PLEASE NOTE: Contrary to URIs under e.g. http or ftp scheme, URIs under file and jar scheme do not have an
-# authority component. This means that the part following the scheme identifier starts with "/"
-# (single slash character), and not with "//" (two slash characters).
-#
-# Example 1 (absolute URI under file scheme): "file:/c:/path1/path2/init.properties"
-# Example 2 (absolute URI under jar scheme): "jar:/file:/c:/path1/path2/archive.jar!/init.properties"
-# Example 3 (absolute URI under http scheme): "http://somewhere.org/path1/path2/init.properties"
-
-location.initProperties = file:/z:/private/IXSIL/currentDevelopment/src/init/properties/init.properties
-
-
-
-# This property contains a URI specifying the location of the IXSIL algorithm properties file. The URI can
-# be absolute or relative. If a relative URI is used, it will be absolutized using this init property file's
-# URI as the base.
-#
-# PLEASE NOTE: Contrary to URIs under e.g. http or ftp scheme, URIs under file and jar scheme do not have an
-# authority component. This means that the part following the scheme identifier starts with "/"
-# (single slash character), and not with "//" (two slash characters).
-#
-# Example 1 (absolute URI under file scheme): "file:/c:/path1/path2/algorithms.properties"
-# Example 2 (absolute URI under jar scheme): "jar:/file:/c:/path1/path2/archive.jar!/algorithms.properties"
-# Example 3 (absolute URI under http scheme): "http://somewhere.org/path1/path2/algorithms.properties"
-# Example 4 (relative URI): "../otherpath/algorithms.properties"
-# Example 5 (relative URI): "algorithms.properties"
-
-location.algorithmsProperties = algorithms.properties
-
-
-
-# This property contains a URI specifying the location of the IXSIL keyManager properties file. The URI can
-# be absolute or relative. If a relative URI is used, it will be absolutized using this init property file's
-# URI as the base.
-#
-# PLEASE NOTE: Contrary to URIs under e.g. http or ftp scheme, URIs under file and jar scheme do not have an
-# authority component. This means that the part following the scheme identifier starts with "/"
-# (single slash character), and not with "//" (two slash characters).
-#
-# Example 1 (absolute URI under file scheme): "file:/c:/path1/path2/keyManager.properties"
-# Example 2 (absolute URI under jar scheme): "jar:/file:/c:/path1/path2/archive.jar!/keyManager.properties"
-# Example 3 (absolute URI under http scheme): "http://somewhere.org/path1/path2/keyManager.properties"
-# Example 4 (relative URI): "../otherpath/keyManager.properties"
-# Example 5 (relative URI): "keyManager.properties"
-
-location.keyManagerProperties = keyManager.properties
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# AlgorithmFactory properties
-
-
-
-This property specifies the extension class for the abstract class
-iaik.ixsil.algorithms.AlgorithmFactory, which is instantiated at invokation of method
-iaik.ixsil.algorithms.AlgorithmFactory.createFactory().
-Please specifiy the fully qualified java class name for the class to be instantiated.
-
-AlgorithmFactory.ImplementingClass = iaik.ixsil.algorithms.AlgorithmFactoryDefaultImpl
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# VerifierKeyManager properties
-
-# This property specifies the implementation class for the interface
-# iaik.ixsil.keyinfo.VerifierKeyManager, which is instantiated by IXSIL in the verification use case, if the
-# signature algorithm does not know about the verification key, and if the XML signature bears a KeyInfo
-# element which contains hints that can be used to deduce the verification key.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-VerifierKeyManager.ImplementingClass = iaik.ixsil.keyinfo.KeyManagerImpl
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# XML namespace prefix properties
-
-# This property specifies the namespace prefix used for XML elements from the XML-Signature namespace.
-#
-# PLEASE NOTE: The prefix must not be empty.
-
-namespacePrefix.XMLSignature = dsig:
-
-
-
-# This property specifies the namespace prefix used for XML elements from the XML Schema instance namespace.
-#
-# PLEASE NOTE: The prefix must not be empty.
-
-namespacePrefix.XMLSchemaInstance = xsi:
-
-
-#----------------------------------------------------------------------------------------------------------
-# DOMUtils properties
-
-
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.DOMUtilsInterface, which contains a couple of DOM utility methods, which IXSIL relies
-# on. If you would like to employ a parser different from Apache Xerces, you must implement the
-# DOMUtilsInterface and specify your implementation class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-DOMUtils.ImplementingClass = iaik.ixsil.util.DOMUtilsImpl
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies, wheter WARNINGS generated by the Apache Xerces parser should lead to a parser exception
-# or not.
-
-DOMUtils.ErrorHandler.reportWarnings = true
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies, wheter ERRORS generated by the Apache Xerces parser should lead to a parser exception
-# or not.
-
-DOMUtils.ErrorHandler.reportErrors = true
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies, wheter FATAL ERRORS generated by the Apache Xerces parser should lead to a parser
-# exception or not.
-
-DOMUtils.ErrorHandler.reportFatalErrors = true
-
-
-
-# This property is used by the standard implementation class for the interface
-# iaik.ixsil.util.DOMUtilsInterface, namely iaik.ixsil.util.DOMUtilsImpl, which ships with IXSIL.
-# It specifies an URI for the location of the XML schema for an XML signature, which is used as the
-# reference grammar in method iaik.ixsil.util.DOMUtilsImpl.schemaValidateSignatureElement.
-# The URI can be absolute or relative. If the URI is relative, it will be absolutized using the URI for
-# this init property file as the base.
-
-DOMUtils.SignatureSchema = ../schemas/Signature.xsd
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# XPathUtils properties
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.XPathUtilsInterface, which contains a couple of XPath utility methods, which IXSIL relies
-# on. If you would like to employ a XPath engine different from Apache Xalan, you must implement the
-# XPathUtilsInterface and specify your implementation class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-XPathUtils.ImplementingClass = iaik.ixsil.util.XPathUtilsImpl
-
-
-
-#----------------------------------------------------------------------------------------------------------
-# CanonicalXMLSerializer properties
-
-
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.CanonicalXMLSerialierInterface. IXSIL relies on this interface to serialize XML according
-# to "Canonical XML" (see http://www.w3.org/TR/2001/REC-xml-c14n-20010315). If you would like to employ an
-# implemenation different from the standard implementation shipped with IXSIL, you must implement the
-# CanonicalXMLSerialierInterface and specify your implementation class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-CanonicalXMLSerializer.CanonicalXMLImplementingClass = iaik.ixsil.util.CanonicalXMLSerializerImpl
-
-
-
-# This property specifies the implementation class IXSIL should use for the interface
-# iaik.ixsil.util.ExclusiveCanonicalXMLSerialierInterface. IXSIL relies on this interface to serialize XML
-# according to "Exclusive XML Canonicalization" (see http://www.w3.org/TR/2001/WD-xml-exc-c14n-20011120).
-# If you would like to employ an implemenation different from the standard implementation shipped with
-# IXSIL, you must implement the ExclusiveCanonicalXMLSerialierInterface and specify your implementation
-# class using this property.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-CanonicalXMLSerializer.ExclusiveCanonicalXMLImplementingClass = iaik.ixsil.util.CanonicalXMLSerializerImpl
diff --git a/spss.test/resources/keyManager.properties b/spss.test/resources/keyManager.properties
deleted file mode 100644
index 24ece437a..000000000
--- a/spss.test/resources/keyManager.properties
+++ /dev/null
@@ -1,74 +0,0 @@
-# IXSIL algorithm properties
-#
-# This file contains the properties which IXSIL uses in context of key management.
-
-
-
-#----------------------------------------------------------------------------------------------------------
-#
-# The following properties are associations between the fully qualified XMLname of a "KeyInfo" subelement,
-# as used in an XML signature to specify hints how the verifier can obtain the verification key, and that
-# implementation class of the interface iaik.ixsil.keyinfo.KeyProviderInterface, which will manage
-# subelements of that type.
-#
-# These properties are only of interest, if you are using the standard key manager shipped with IXISL
-# (which is class iaik.ixsil.keyInfo.KeyManagerImpl).
-#
-# For instance, if you would like to specify the key provider implementation for "KeyValue" subelements,
-# the property name is the fully qualified XML name for the "KeyValue" element, namely
-# "http://www.w3.org/2000/09/xmldsig#:KeyValue". The value of the property is the fully qualified class
-# name of the key provider implementation class, for instance the standard implementation which ships with
-# IXSIL: "iaik.ixsil.keyinfo.KeyProviderImplKeyValue".
-#
-# PLEASE NOTE (I): A fully qualified name for an XML element consists of an URI indicating the namespace the
-# element belongs to (e.g. "http://www.w3.org/2000/09/xmldsig#") and the local name of the
-# element (e.g. "KeyValue"). Both components are seperated by a colon.
-#
-# PLEASE NOTE (II): The colon character (":") must be escaped by a leading backslash, if it appears in the
-# property name.
-
-http\://www.w3.org/2000/09/xmldsig#\:KeyValue = iaik.ixsil.keyinfo.KeyProviderImplKeyValue
-http\://www.w3.org/2000/09/xmldsig#\:X509Data = iaik.ixsil.keyinfo.x509.KeyProviderImplX509Data
-http\://www.w3.org/2000/09/xmldsig#\:RetrievalMethod = iaik.ixsil.keyinfo.retrieval.KeyProviderImplRetrievalMethod
-
-
-
-#----------------------------------------------------------------------------------------------------------
-#
-# The following properties specify the order in which the different types of "KeyInfo" subelements are used
-# by the key manager to deduce the verification key.
-#
-# These properties are only of interest, if you are using the standard key manager shipped with IXISL
-# (which is class iaik.ixsil.keyInfo.KeyManagerImpl).
-#
-# The properties are associations between a two digit number and the fully qualified XML name of a "KeyInfo"
-# subelement. The lower the number, the more important is the associated "KeyInfo" sublement. Consider an
-# example configuration:
-#
-# Subelement.01 = http://www.w3.org/2000/09/xmldsig#:KeyValue
-# Subelement.02 = http://www.w3.org/2000/09/xmldsig#:X509Data
-#
-# In this configuration, the key manager first tries to use "KeyValue" subelements to deduce the
-# verification key. Only if this does not succeed, the key manager uses "X509Data" subelements as a second
-# chance. Of course you can specify more than only two different subelement types.
-#
-# PLEASE NOTE: A fully qualified name for an XML element consists of an URI indicating the namespace the
-# element belongs to (e.g. "http://www.w3.org/2000/09/xmldsig#") and the local name of the
-# element (e.g. "KeyValue"). Both components are seperated by a colon.
-
-Subelement.01 = http://www.w3.org/2000/09/xmldsig#:KeyValue
-Subelement.02 = http://www.w3.org/2000/09/xmldsig#:X509Data
-Subelement.03 = http://www.w3.org/2000/09/xmldsig#:RetrievalMethod
-
-
-
-#----------------------------------------------------------------------------------------------------------
-#
-# The following property is used by standard implementation of the "X509Data" key provider, which ships
-# with IXSIL, namely "KeyProviderImplX509Data". It specifies the implementation class for the interface
-# iaik.ixsil.keyinfo.x509.X509TrustManagerInterface, which is to be instantiated as the backbone trust
-# manager for this key provider.
-# Please specifiy the fully qualified java class name for the class to be instantiated.
-
-KeyProviderImplX509Data.X509TrustManagerDefaultImplementingClass = iaik.ixsil.keyinfo.x509.X509TrustManagerDummyImpl
-
diff --git a/spss.test/resources/moahsm.cer b/spss.test/resources/moahsm.cer
deleted file mode 100644
index de5344831..000000000
--- a/spss.test/resources/moahsm.cer
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB7zCCAVgCAQEwDQYJKoZIhvcNAQEFBQAwQDEVMBMGA1UEAxMMTU9BSFNNUlNB
-S0VZMQwwCgYDVQQKEwNCUloxDDAKBgNVBAsTA01PQTELMAkGA1UEBhMCQVQwHhcN
-MDMwNDA3MTEwNjQwWhcNMDQwNDA3MTEwNjQwWjBAMRUwEwYDVQQDEwxNT0FIU01S
-U0FLRVkxDDAKBgNVBAoTA0JSWjEMMAoGA1UECxMDTU9BMQswCQYDVQQGEwJBVDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxPZDjDQYbVNdkccATQb7L9LhinBw
-v7rq0RxUfmuWQPOy3GPfitIBDbomx7I26Hr7111ZIA8HHuuLft50vLqOoDgW4CHw
-nlmzBfjstf7SpHRODzVJhe4EJCoZX7OcaENU+1ibUHjDabWUEHSSho/vWjkp5o3F
-Rg94K3Edxw3j9U0CAwDmKTANBgkqhkiG9w0BAQUFAAOBgQC4EV2TaeYygxD8xVBk
-kVQu210r4zzKcBIsFSJZTO99KVF4CBRt7aMHd7dz604/Ozxc9MoPb+r/8MAylgfi
-V1ifHtY6OVMzPYTRDBdskp8dhPVxdBzhW4OhVP6EnAEv4NcbAyxu0aZSU632j0WL
-ik7/EJQ/UeGKgaHgf4ZeaXEHZw==
------END CERTIFICATE-----
diff --git a/spss.test/resources/schemas/testDocument.schema.xsd b/spss.test/resources/schemas/testDocument.schema.xsd
deleted file mode 100644
index bb1e1b011..000000000
--- a/spss.test/resources/schemas/testDocument.schema.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Schema fuer testDocument.xml
--->
-<xsd:schema targetNamespace="http://uri.data.org" xmlns="http://uri.data.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" id="tollesSchema">
- <xsd:element name="Document">
- <xsd:complexType mixed="true">
- <xsd:sequence minOccurs="0" 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>
diff --git a/spss.test/resources/sicher-demo(buergerkarte).p12 b/spss.test/resources/sicher-demo(buergerkarte).p12
deleted file mode 100644
index efaeb9b98..000000000
--- a/spss.test/resources/sicher-demo(buergerkarte).p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/sicher-demo.der b/spss.test/resources/sicher-demo.der
deleted file mode 100644
index 46268923a..000000000
--- a/spss.test/resources/sicher-demo.der
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/sl2002mmdd.ecard.normal.p12 b/spss.test/resources/sl2002mmdd.ecard.normal.p12
deleted file mode 100644
index 36d9eb4d8..000000000
--- a/spss.test/resources/sl2002mmdd.ecard.normal.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/sl2002mmdd.ecard.sicher.p12 b/spss.test/resources/sl2002mmdd.ecard.sicher.p12
deleted file mode 100644
index 21ef7803c..000000000
--- a/spss.test/resources/sl2002mmdd.ecard.sicher.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/MOA-SPSS-Configuration.xml b/spss.test/resources/spss.configuration/MOA-SPSS-Configuration.xml
deleted file mode 100644
index 85efb9413..000000000
--- a/spss.test/resources/spss.configuration/MOA-SPSS-Configuration.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:moa-spss="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <CanonicalizationAlgorithm name="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
- <DigestMethodAlgorithm name="http://www.w3.org/2000/09/xmldsig#sha1"/>
- <GenericConfiguration name="autoAddCertificates" value="true"/>
- <GenericConfiguration name="useAuthorityInfoAccess" value="true"/>
- <GenericConfiguration name="maxRevocationAge" value="0"/>
- <GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="aValidPathName"/>
- <GenericConfiguration name="checkRevocation" value="false"/>
- <GenericConfiguration name="archiveRevocationInfo" value="false"/>
- <!-- <GenericConfiguration name="DataBaseArchiveParameter.JDBCUrl" value="jdbc:postgresql://10.16.46.108/moa?user=moa&amp;password=moatest"/> -->
- <GenericConfiguration name="test.SigningTime" value="2003-05-10T01:01:01+01:00"/>
- <!--
- <HardwareCryptoModule name="validPathToPKCS11Lib" slotID="validSlotID" userPIN="validPIN"/>
- <HardwareKeyModule name="validPathToPKCS11Lib" slotID="validSlotID" userPIN="validPIN"/>
- -->
-
- <!-- <HardwareKeyModule id="MOAHSM" name="cryptoki.dll" slotID="0" userPIN="1111"/> -->
-
- <SoftwareKeyModule id="SWKeyModule1" filename="keys/test-ee2003_normal(buergerkarte).p12" password="buergerkarte"/>
- <SoftwareKeyModule id="SWKeyModule2" filename="keys/normal-eeExpired.p12" password=""/>
- <SoftwareKeyModule id="SWKeyModule3" filename="keys/ecc(ego).p12" password="ego"/>
- <SoftwareKeyModule id="SWKeyModule4" filename="keys/DSA.512.p12" password="topSecret"/>
- <SoftwareKeyModule id="SWKeyModule5" filename="keys/test-ee2003_normal_verw_oid.p12" password="buergerkarte"/>
- <!-- <KeyGroup id="MOAHSMRSAKEY">
- <Key>
- <KeyModuleID>MOAHSM</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>C=AT,OU=MOA,O=BRZ,CN=MOAHSMRSAKEY</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup> -->
- <KeyGroup id="PKCS12RSAKey1">
- <!--PKCS12RSAKey1 maps to test-ee2003_normal(buergerkarte).p12-->
- <Key>
- <KeyModuleID>SWKeyModule1</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="PKCS12RSAKeyNotAllowed">
- <!--PKCS12RSAKey1 maps to test-ee2003_normal(buergerkarte).p12-->
- <Key>
- <KeyModuleID>SWKeyModule1</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="PKCS12RSAKeyExpired">
- <!--PKCS12RSAKey1 maps to sicher-demo(buergerkarte).p12-->
- <Key>
- <KeyModuleID>SWKeyModule2</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>10</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="PKCS12ECDSAKey1">
- <!--PKCS12ECDSAKey1 maps to ecc(ego).p12-->
- <Key>
- <KeyModuleID>SWKeyModule3</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>68172</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="DSAinPKCS12">
- <!--DSAinPKCS12 maps to DSA.512.p12-->
- <Key>
- <KeyModuleID>SWKeyModule4</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK DSA Test CA,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>761791</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="VKTRUE">
- <Key>
- <KeyModuleID>SWKeyModule5</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1050061309775</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup id="allKeys">
- <Key>
- <KeyModuleID>SWKeyModule1</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- <Key>
- <KeyModuleID>SWKeyModule2</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1044289238331</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- <Key>
- <KeyModuleID>SWKeyModule3</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>68172</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- <Key>
- <KeyModuleID>SWKeyModule4</KeyModuleID>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=IAIK DSA Test CA,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>761791</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroupMapping>
- <KeyGroup id="PKCS12RSAKey1"/>
- <KeyGroup id="PKCS12RSAKeyExpired"/>
- <KeyGroup id="PKCS12ECDSAKey1"/>
- <KeyGroup id="DSAinPKCS12"/>
- <KeyGroup id="VKTRUE"/>
- </KeyGroupMapping>
- <KeyGroupMapping>
- <X509IssuerSerial>
- <dsig:X509IssuerName>CN=TestUser,OU=MOA,O=BRZ,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>12345678</dsig:X509SerialNumber>
- </X509IssuerSerial>
- <KeyGroup id="allKeys"/>
- </KeyGroupMapping>
- <KeyGroupMapping>
- <X509IssuerSerial>
- <dsig:X509IssuerName>CN=TestUser,OU=MOA,O=BRZ,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>12345678</dsig:X509SerialNumber>
- </X509IssuerSerial>
- <KeyGroup id="PKCS12RSAKeyNotAllowed"/>
- </KeyGroupMapping>
- <KeyGroupMapping>
- <X509IssuerSerial>
- <dsig:X509IssuerName>CN=moa-client, OU=MOA, O=BRZ, C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1056980085</dsig:X509SerialNumber>
- </X509IssuerSerial>
- <KeyGroup id="PKCS12RSAKey1"/>
- </KeyGroupMapping>
-
- <ChainingModes systemDefaultMode="pkix">
- <TrustAnchor mode="chaining">
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </TrustAnchor>
- </ChainingModes>
- <CRLArchive duration="365"/>
- <CRLDistributionPoint>
- <CAIssuerDN>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</CAIssuerDN>
- <DistributionPoint uri="http://www.iaik.at/testCA/iaik_test_sig.crl"/>
- </CRLDistributionPoint>
- <CRLDistributionPoint>
- <CAIssuerDN>CN=IAIK Test CA,OU=IAIK Test CA,OU=Insitute for Applied Information Processing and Communications,O=GRAZ UNIVERSITY OF TECHNOLOGY,C=AT</CAIssuerDN>
- <DistributionPoint reasonCodes="keyCompromise affiliationChanged" uri="http://www.iaik.at/testCA/iaik_test_sig.crl"/>
- <DistributionPoint reasonCodes="certificateHold" uri="http://www.iaik.at/testCA/iaik_test_sig.crl"/>
- </CRLDistributionPoint>
- <CreateTransformsInfoProfile id="CreateTransformsInfoProfile1" filename="profiles/CX1_bookprofile.xsl"/>
- <CreateSignatureEnvironmentProfile id="CreateSignatureEnvironmentProfile1" filename="profiles/CSEP.xml"/>
- <VerifyTransformsInfoProfile id="TransformsInfoProfile1" filename="profiles/TransformsInfoProfile1.xml"/>
- <VerifyTransformsInfoProfile id="TransformsInfoProfile2" filename="profiles/TransformsInfoProfile2.xml"/>
- <VerifyTransformsInfoProfile id="TransformsInfoProfile1MOAID" filename="profiles/TransformsInfoProfile1MOAID.xml"/>
- <SupplementProfile id="SupplementProfile1" filename="profiles/SupplementProfile1.xml"/>
- <SupplementProfile id="SupplementProfile2" filename="profiles/SupplementProfile2.xml"/>
- <TrustProfile id="TrustProfile1" uri="profiles/TrustProfile1"/>
-</MOAConfiguration>
diff --git a/spss.test/resources/spss.configuration/keys/DSA.1024.p12 b/spss.test/resources/spss.configuration/keys/DSA.1024.p12
deleted file mode 100644
index e180e607d..000000000
--- a/spss.test/resources/spss.configuration/keys/DSA.1024.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/keys/DSA.512.p12 b/spss.test/resources/spss.configuration/keys/DSA.512.p12
deleted file mode 100644
index 8f7a201ac..000000000
--- a/spss.test/resources/spss.configuration/keys/DSA.512.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/keys/Max_Mustermann (max).p12 b/spss.test/resources/spss.configuration/keys/Max_Mustermann (max).p12
deleted file mode 100644
index b18a842e2..000000000
--- a/spss.test/resources/spss.configuration/keys/Max_Mustermann (max).p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/keys/ecc(ego).p12 b/spss.test/resources/spss.configuration/keys/ecc(ego).p12
deleted file mode 100644
index f84e793c5..000000000
--- a/spss.test/resources/spss.configuration/keys/ecc(ego).p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/keys/ecc.p12 b/spss.test/resources/spss.configuration/keys/ecc.p12
deleted file mode 100644
index f84e793c5..000000000
--- a/spss.test/resources/spss.configuration/keys/ecc.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/keys/sicher-demo(buergerkarte).p12 b/spss.test/resources/spss.configuration/keys/sicher-demo(buergerkarte).p12
deleted file mode 100644
index efaeb9b98..000000000
--- a/spss.test/resources/spss.configuration/keys/sicher-demo(buergerkarte).p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/keys/sl2002mmdd.ecard.normal.p12 b/spss.test/resources/spss.configuration/keys/sl2002mmdd.ecard.normal.p12
deleted file mode 100644
index 36d9eb4d8..000000000
--- a/spss.test/resources/spss.configuration/keys/sl2002mmdd.ecard.normal.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/keys/sl2002mmdd.ecard.sicher.p12 b/spss.test/resources/spss.configuration/keys/sl2002mmdd.ecard.sicher.p12
deleted file mode 100644
index 21ef7803c..000000000
--- a/spss.test/resources/spss.configuration/keys/sl2002mmdd.ecard.sicher.p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/keys/test-ee2003_normal(buergerkarte).p12 b/spss.test/resources/spss.configuration/keys/test-ee2003_normal(buergerkarte).p12
deleted file mode 100644
index efaeb9b98..000000000
--- a/spss.test/resources/spss.configuration/keys/test-ee2003_normal(buergerkarte).p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/profiles/CSEP.xml b/spss.test/resources/spss.configuration/profiles/CSEP.xml
deleted file mode 100644
index 326dbc6a0..000000000
--- a/spss.test/resources/spss.configuration/profiles/CSEP.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stephan G (Comp) -->
-<CreateSignatureEnvironmentProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <CreateSignatureLocation Index="0" xmlns:data="http://uri.data.org">//data:Document</CreateSignatureLocation>
-</CreateSignatureEnvironmentProfile>
diff --git a/spss.test/resources/spss.configuration/profiles/CX1_bookprofile.xsl b/spss.test/resources/spss.configuration/profiles/CX1_bookprofile.xsl
deleted file mode 100644
index ca41d793f..000000000
--- a/spss.test/resources/spss.configuration/profiles/CX1_bookprofile.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><CreateTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><CreateTransformsInfo><dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet></dsig:Transform></dsig:Transforms><FinalDataMetaInfo><MimeType>text/html</MimeType></FinalDataMetaInfo></CreateTransformsInfo></CreateTransformsInfoProfile> \ No newline at end of file
diff --git a/spss.test/resources/spss.configuration/profiles/SupplementProfile1.xml b/spss.test/resources/spss.configuration/profiles/SupplementProfile1.xml
deleted file mode 100644
index 02b1c6373..000000000
--- a/spss.test/resources/spss.configuration/profiles/SupplementProfile1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stephan G (Comp) -->
-<SupplementProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <Content Reference="file:/C:/Daten/MOAPhase2/TestDatenGenerator2/resources/testDaten.txt">
- <XMLContent>Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus</XMLContent>
- </Content>
-</SupplementProfile>
diff --git a/spss.test/resources/spss.configuration/profiles/SupplementProfile2.xml b/spss.test/resources/spss.configuration/profiles/SupplementProfile2.xml
deleted file mode 100644
index 7f84eb822..000000000
--- a/spss.test/resources/spss.configuration/profiles/SupplementProfile2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- edited with XMLSPY v5 rel. 3 U (http://www.xmlspy.com) by Stephan G (Comp) -->
-<SupplementProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <Content Reference="file:/C:/Daten/MOAPhase2/TestDatenGenerator2/resources/testXML.txt">
- <Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxIdWdvPg0K
-CVRlc3QNCjwvSHVnbz4=</Base64Content>
- </Content>
-</SupplementProfile>
diff --git a/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile1.xml b/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile1.xml
deleted file mode 100644
index c0b7d596f..000000000
--- a/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/CX1_book.xsl"/></xsl:stylesheet></dsig:Transform></dsig:Transforms><TransformParameter URI="http://localhost:8080/moa-spss-testdata/resources/CX1_book.xsl"><Base64Content>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHNsOnN0eWxlc2hlZXQgeG1sbnM6eHNsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L1hTTC9UcmFuc2Zvcm0iIHZlcnNpb249IjEuMCI+PHhzbDpvdXRwdXQgbWV0aG9kPSJodG1sIiBpbmRlbnQ9Im5vIi8+PHhzbDp0ZW1wbGF0ZSBtYXRjaD0iZGF0YTpib29rIiB4bWxuczpkYXRhPSJodHRwOi8vdXJpLmRhdGEub3JnIj48SFRNTD48Qk9EWT48SDE+QnVjaDogPHhzbDp2YWx1ZS1vZiBzZWxlY3Q9ImRhdGE6dGl0bGUiLz48L0gxPjwvQk9EWT48L0hUTUw+PC94c2w6dGVtcGxhdGU+PC94c2w6c3R5bGVzaGVldD4=</Base64Content></TransformParameter></VerifyTransformsInfoProfile> \ No newline at end of file
diff --git a/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile1MOAID.xml b/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile1MOAID.xml
deleted file mode 100644
index f973ac7e9..000000000
--- a/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile1MOAID.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-<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&#228;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></VerifyTransformsInfoProfile>
diff --git a/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile2.xml b/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile2.xml
deleted file mode 100644
index 12d6bc28b..000000000
--- a/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
- xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <dsig:Transforms>
- <dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
- </dsig:Transforms>
-</VerifyTransformsInfoProfile>
diff --git a/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile2MOAID.xml b/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile2MOAID.xml
deleted file mode 100644
index dc4a97716..000000000
--- a/spss.test/resources/spss.configuration/profiles/TransformsInfoProfile2MOAID.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Jack (-none-) -->
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><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></VerifyTransformsInfoProfile>
diff --git a/spss.test/resources/spss.configuration/profiles/TrustProfile1/IAIKRoot.cer b/spss.test/resources/spss.configuration/profiles/TrustProfile1/IAIKRoot.cer
deleted file mode 100644
index c0c60558a..000000000
--- a/spss.test/resources/spss.configuration/profiles/TrustProfile1/IAIKRoot.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/profiles/TrustProfile1/IAIKRootMusterbehörde.cer b/spss.test/resources/spss.configuration/profiles/TrustProfile1/IAIKRootMusterbehörde.cer
deleted file mode 100644
index 21dc972b9..000000000
--- a/spss.test/resources/spss.configuration/profiles/TrustProfile1/IAIKRootMusterbehörde.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/profiles/TrustProfile1/Max_Mustermann.cer b/spss.test/resources/spss.configuration/profiles/TrustProfile1/Max_Mustermann.cer
deleted file mode 100644
index b5b39633d..000000000
--- a/spss.test/resources/spss.configuration/profiles/TrustProfile1/Max_Mustermann.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/profiles/TrustProfile1/a-sign-TEST-Premium-Enc-01.cer b/spss.test/resources/spss.configuration/profiles/TrustProfile1/a-sign-TEST-Premium-Enc-01.cer
deleted file mode 100644
index fc5bd433b..000000000
--- a/spss.test/resources/spss.configuration/profiles/TrustProfile1/a-sign-TEST-Premium-Enc-01.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/profiles/TrustProfile1/a-sign-TEST-nQual-01.cer b/spss.test/resources/spss.configuration/profiles/TrustProfile1/a-sign-TEST-nQual-01.cer
deleted file mode 100644
index 84518a6a8..000000000
--- a/spss.test/resources/spss.configuration/profiles/TrustProfile1/a-sign-TEST-nQual-01.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/profiles/TrustProfile1/ecdsa_root_cert.cer b/spss.test/resources/spss.configuration/profiles/TrustProfile1/ecdsa_root_cert.cer
deleted file mode 100644
index dac166e9a..000000000
--- a/spss.test/resources/spss.configuration/profiles/TrustProfile1/ecdsa_root_cert.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/spss.configuration/profiles/TrustProfile1/test-ee2003_normal.der b/spss.test/resources/spss.configuration/profiles/TrustProfile1/test-ee2003_normal.der
deleted file mode 100644
index 46268923a..000000000
--- a/spss.test/resources/spss.configuration/profiles/TrustProfile1/test-ee2003_normal.der
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/stylesheets/book.notavailable.xsl b/spss.test/resources/stylesheets/book.notavailable.xsl
deleted file mode 100644
index b484b9583..000000000
--- a/spss.test/resources/stylesheets/book.notavailable.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:output method="html" indent="no"/><xsl:template match="data:book" xmlns:data="http://uri.data.org"><HTML><BODY><H1>Buch: <xsl:value-of select="data:title"/></H1></BODY></HTML></xsl:template></xsl:stylesheet> \ No newline at end of file
diff --git a/spss.test/resources/stylesheets/book.xsl b/spss.test/resources/stylesheets/book.xsl
deleted file mode 100644
index e475b0d56..000000000
--- a/spss.test/resources/stylesheets/book.xsl
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:output method="html" indent="no"/>
- <xsl:template match="data:book" xmlns:data="http://uri.data.org">
- <HTML>
- <BODY>
- <H1>Buch: <xsl:value-of select="data:title"/>
- </H1>
- </BODY>
- </HTML>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.test/resources/stylesheets/ref.book.notavailable.xsl b/spss.test/resources/stylesheets/ref.book.notavailable.xsl
deleted file mode 100644
index 72c9a738b..000000000
--- a/spss.test/resources/stylesheets/ref.book.notavailable.xsl
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"><xsl:include href="http://localhost:8080/moa-spss-testdata/resources/stylesheets/book.notavailable.xsl"/></xsl:stylesheet> \ No newline at end of file
diff --git a/spss.test/resources/sven.cer b/spss.test/resources/sven.cer
deleted file mode 100644
index 5a4e25c58..000000000
--- a/spss.test/resources/sven.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/sven.keystore b/spss.test/resources/sven.keystore
deleted file mode 100644
index 1459a7bc4..000000000
--- a/spss.test/resources/sven.keystore
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/sven_tomcat-client.cer b/spss.test/resources/sven_tomcat-client.cer
deleted file mode 100644
index e69de29bb..000000000
--- a/spss.test/resources/sven_tomcat-client.cer
+++ /dev/null
diff --git a/spss.test/resources/test-ee2003_normal(buergerkarte).p12 b/spss.test/resources/test-ee2003_normal(buergerkarte).p12
deleted file mode 100644
index efaeb9b98..000000000
--- a/spss.test/resources/test-ee2003_normal(buergerkarte).p12
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/test-ee2003_normal.der b/spss.test/resources/test-ee2003_normal.der
deleted file mode 100644
index 46268923a..000000000
--- a/spss.test/resources/test-ee2003_normal.der
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/test-ee2003_normal.derbase64.enc b/spss.test/resources/test-ee2003_normal.derbase64.enc
deleted file mode 100644
index 8e5524084..000000000
--- a/spss.test/resources/test-ee2003_normal.derbase64.enc
+++ /dev/null
@@ -1,21 +0,0 @@
-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 \ No newline at end of file
diff --git a/spss.test/resources/test-ee2003_normal_extract.cer b/spss.test/resources/test-ee2003_normal_extract.cer
deleted file mode 100644
index 1cdc15c6e..000000000
--- a/spss.test/resources/test-ee2003_normal_extract.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/testBase64.txt b/spss.test/resources/testBase64.txt
deleted file mode 100644
index 8c19b15ac..000000000
--- a/spss.test/resources/testBase64.txt
+++ /dev/null
@@ -1 +0,0 @@
-RGllcyBzaW5kIFRlc3RkYXRlbg== \ No newline at end of file
diff --git a/spss.test/resources/testDaten.txt b/spss.test/resources/testDaten.txt
deleted file mode 100644
index 2602728cd..000000000
--- a/spss.test/resources/testDaten.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Dies sind Testdaten
-2. Zeile
-3. Zeile
-aus \ No newline at end of file
diff --git a/spss.test/resources/testDaten.txtbase64.enc b/spss.test/resources/testDaten.txtbase64.enc
deleted file mode 100644
index d95a88a82..000000000
--- a/spss.test/resources/testDaten.txtbase64.enc
+++ /dev/null
@@ -1 +0,0 @@
-RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM= \ No newline at end of file
diff --git a/spss.test/resources/testDocument.xml b/spss.test/resources/testDocument.xml
deleted file mode 100644
index 35b12a626..000000000
--- a/spss.test/resources/testDocument.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<data:Document xmlns:data="http://uri.data.org">Dies sind Testdaten</data:Document>
diff --git a/spss.test/resources/testDocument.xmlbase64.enc b/spss.test/resources/testDocument.xmlbase64.enc
deleted file mode 100644
index 6b787d695..000000000
--- a/spss.test/resources/testDocument.xmlbase64.enc
+++ /dev/null
@@ -1,3 +0,0 @@
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NPGRhdGE6RG9j
-dW1lbnQgeG1sbnM6ZGF0YT0iaHR0cDovL3VyaS5kYXRhLm9yZyI+RGllcyBzaW5k
-IFRlc3RkYXRlbjwvZGF0YTpEb2N1bWVudD4N \ No newline at end of file
diff --git a/spss.test/resources/testSimple.txt b/spss.test/resources/testSimple.txt
deleted file mode 100644
index 76d2fc51a..000000000
--- a/spss.test/resources/testSimple.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dies sind Testdaten \ No newline at end of file
diff --git a/spss.test/resources/testSimple.txtbase64.enc b/spss.test/resources/testSimple.txtbase64.enc
deleted file mode 100644
index 8c19b15ac..000000000
--- a/spss.test/resources/testSimple.txtbase64.enc
+++ /dev/null
@@ -1 +0,0 @@
-RGllcyBzaW5kIFRlc3RkYXRlbg== \ No newline at end of file
diff --git a/spss.test/resources/testUTF8.txt b/spss.test/resources/testUTF8.txt
deleted file mode 100644
index 0468fc597..000000000
--- a/spss.test/resources/testUTF8.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dies sind Testdaten mit Umlauten :) öäüÖÄÜ \ No newline at end of file
diff --git a/spss.test/resources/testXML.txt b/spss.test/resources/testXML.txt
deleted file mode 100644
index 8d4d6371b..000000000
--- a/spss.test/resources/testXML.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Hugo>
- Test
-</Hugo> \ No newline at end of file
diff --git a/spss.test/resources/testXML.txtbase64.enc b/spss.test/resources/testXML.txtbase64.enc
deleted file mode 100644
index 344a8b5f4..000000000
--- a/spss.test/resources/testXML.txtbase64.enc
+++ /dev/null
@@ -1,2 +0,0 @@
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxIdWdvPg0K
-CVRlc3QNCjwvSHVnbz4= \ No newline at end of file
diff --git a/spss.test/resources/test_w_canonicalisation.XML b/spss.test/resources/test_w_canonicalisation.XML
deleted file mode 100644
index 103c81656..000000000
--- a/spss.test/resources/test_w_canonicalisation.XML
+++ /dev/null
@@ -1,3 +0,0 @@
-<Hugo a="Testa" b="Testb">
- Test
-</Hugo> \ No newline at end of file
diff --git a/spss.test/resources/test_wo_canonicalisation.XML b/spss.test/resources/test_wo_canonicalisation.XML
deleted file mode 100644
index bab75c60a..000000000
--- a/spss.test/resources/test_wo_canonicalisation.XML
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--1st Comment-->
-<n1:Elem1 b="Testb" a="Testa" xmlns:n0="foo:bar"
- xmlns:n3="ftp://example.org"
- xmlns:n1="http://example.net"
- xml:lang="en">
- Test<!--2nd Comment-->
- <n3:Elem2></n3:Elem2>
-</n1:Elem1> \ No newline at end of file
diff --git a/spss.test/resources/test_wo_canonicalisation.XMLbase64.enc b/spss.test/resources/test_wo_canonicalisation.XMLbase64.enc
deleted file mode 100644
index 3092f03a3..000000000
--- a/spss.test/resources/test_wo_canonicalisation.XMLbase64.enc
+++ /dev/null
@@ -1,7 +0,0 @@
-PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0xc3Qg
-Q29tbWVudC0tPg0KPG4xOkVsZW0xIGI9IlRlc3RiIiBhPSJUZXN0YSIgeG1sbnM6
-bjA9ImZvbzpiYXIiDQogICAgICAgICAgICAgeG1sbnM6bjM9ImZ0cDovL2V4YW1w
-bGUub3JnIg0KICAgICAgICAgICAgIHhtbG5zOm4xPSJodHRwOi8vZXhhbXBsZS5u
-ZXQiICAgICAgICAgICAgIA0KICAgICAgICAgICAgIHhtbDpsYW5nPSJlbiI+DQoJ
-VGVzdDwhLS0ybmQgQ29tbWVudC0tPg0KICAgIDxuMzpFbGVtMj48L24zOkVsZW0y
-Pg0KPC9uMTpFbGVtMT4= \ No newline at end of file
diff --git a/spss.test/resources/tests.cer.b64 b/spss.test/resources/tests.cer.b64
deleted file mode 100644
index bfeaef211..000000000
--- a/spss.test/resources/tests.cer.b64
+++ /dev/null
@@ -1,27 +0,0 @@
-MIIFATCCA+mgAwIBAgIhAhwR8xTUcaXE7HgcD8c+QYmLc0zRndEVZObhTgPrAgFz
-MA0GCSqGSIb3DQEBBQUAMDYxITAfBgNVBAsTGEJ1bmRlc3JlY2hlbnplbnRydW0g
-R21iSDERMA8GA1UEChMIQlJaLVRSRUUwHhcNMDIwOTI0MDkxNzAwWhcNMzYwMjAz
-MjM1OTAwWjAsMREwDwYDVQQKEwhCUlotVFJFRTEXMBUGA1UEAxMOeW9kYS5icnou
-Z3YuYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDzt+VkHC6ORpSS
-spmCRF1lMMcO1XOx44AynG8nD63U18SYM/enmlZO7D6KbtGvOooemqtcAmXq9V0U
-VZa/vSlLxPieW5CmATAAPitohHuDyWbe9Sya1jbdRuxPDiFMlqdDcdfprvixHCe0
-URA+bmf6Jq1DydurZeQ2BLotNEiL8A4Fdw9GhLEpE62uCKYV6MkPp3a/JCoper8M
-MttEsr4J6sY1W+6dkNswKJxhj7Ybmj3MN950eeuJVqIKEoBlYYhtcZlo/u1t8+xb
-MsyUxb8F/ZyExa7tPOd11XDNQUP304E7I8JIpdB6TmugdnUNPGmJqSTV9cJ56hLm
-8AqvoO3JAgMBAAGjggICMIIB/jAfBgNVHSMEGDAWgBR5hSIJwO/mDBSDlc4rL8Kn
-BlTc+TALBgNVHQ8EBAMCBaAwggHMBgtghkgBhvg3AQkEAQSCAbswggG3BAIBAAEB
-/xMdTm92ZWxsIFNlY3VyaXR5IEF0dHJpYnV0ZSh0bSkWQ2h0dHA6Ly9kZXZlbG9w
-ZXIubm92ZWxsLmNvbS9yZXBvc2l0b3J5L2F0dHJpYnV0ZXMvY2VydGF0dHJzX3Yx
-MC5odG0wggFIoBoBAQAwCDAGAgEBAgFGMAgwBgIBAQIBCgIBaaEaAQEAMAgwBgIB
-AQIBRjAIMAYCAQECAQoCAWmiBgIBFwEB/6OCAQSgWAIBAgICAP8CAQADDQCAAAAA
-AAAAAAAAAAADCQCAAAAAAAAAADAYMBACAQACCH//////////AQEAAgQG8N9IMBgw
-EAIBAAIIf/////////8BAQACBAbw30ihWAIBAgICAP8CAQADDQBAAAAAAAAAAAAA
-AAADCQBAAAAAAAAAADAYMBACAQACCH//////////AQEAAgQR8xTUMBgwEAIBAAII
-f/////////8BAQACBBHzFNSiTjBMAgECAgEAAgIA/wMNAIAAAAAAAAAAAAAAAAMJ
-AIAAAAAAAAAAMBIwEAIBAAIIf/////////8BAQAwEjAQAgEAAgh//////////wEB
-ADANBgkqhkiG9w0BAQUFAAOCAQEAB0U7LjxW6s/bAUR/XTVZTTS8inUZDb6OhmZJ
-MRT3rO0pz2ay1T/ijLnQcWn//7fqrAktHr05qOYEjzCmSAFQg5dqqdwAwf60VjmL
-jlZNIosumvhYY18HWkJet7tt0lNeFJKNwxr+ed2maESM333o4jytKzpYrYlo5JWD
-erF/4qPs4yfZcXD3MYCJGDHZ182Wjo7EqmvVJXrXaxPZf3cO5LGkc563+b2uiugn
-zHTmat79OvyDt6TxF0DHYQEapeMNnL/tZq2DtR+jfnk0FMrVwO9bmUXj9Bh2j240
-XZsRZZrQnRFtSFDjwplbQ1mc0H9uClANhWDqbXtO0qEjQPjTrA== \ No newline at end of file
diff --git a/spss.test/resources/tollesDTD.dtd b/spss.test/resources/tollesDTD.dtd
deleted file mode 100644
index d31c4ffe5..000000000
--- a/spss.test/resources/tollesDTD.dtd
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT Document ()+>
-<!ATTLIST Document
- attr CDATA #IMPLIED "wert"
->
diff --git a/spss.test/resources/tollesDTD.dtdbase64.enc b/spss.test/resources/tollesDTD.dtdbase64.enc
deleted file mode 100644
index 1c37db9d6..000000000
--- a/spss.test/resources/tollesDTD.dtdbase64.enc
+++ /dev/null
@@ -1,2 +0,0 @@
-PCFFTEVNRU5UIERvY3VtZW50ICgpKz4NCjwhQVRUTElTVCBEb2N1bWVudA0KCWF0
-dHIgQ0RBVEEgI0lNUExJRUQgIndlcnQiDQo+DQo= \ No newline at end of file
diff --git a/spss.test/resources/tomcat-client.cer b/spss.test/resources/tomcat-client.cer
deleted file mode 100644
index 70263fa8a..000000000
--- a/spss.test/resources/tomcat-client.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/resources/tomcat-server.cer b/spss.test/resources/tomcat-server.cer
deleted file mode 100644
index 062984f23..000000000
--- a/spss.test/resources/tomcat-server.cer
+++ /dev/null
Binary files differ
diff --git a/spss.test/src/ExportECDSA.java b/spss.test/src/ExportECDSA.java
deleted file mode 100644
index d47a0841b..000000000
--- a/spss.test/src/ExportECDSA.java
+++ /dev/null
@@ -1,249 +0,0 @@
-import iaik.asn1.structures.Name;
-import iaik.pkcs.pkcs11.provider.IAIKPkcs11;
-import iaik.pkcs.pkcs12.CertificateBag;
-import iaik.pkcs.pkcs12.KeyBag;
-import iaik.pkcs.pkcs12.PKCS12;
-import iaik.security.provider.IAIK;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.security.Key;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Properties;
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class ExportECDSA {
-
- public static void main(String[] args) throws Exception {
- iaik.security.provider.IAIK.addAsJDK14Provider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
-
- PKCS12 input = new PKCS12(new FileInputStream("C:\\eclipse\\workspace\\spss.server\\data\\deploy\\conf\\moa-spss\\keys\\ecc(ego).p12"));
- input.decrypt("ego".toCharArray());
- KeyBag newkb = input.getKeyBag();
- System.out.println("KeyNew:"+newkb.getFriendlyName());
- System.out.println(newkb.getPrivateKey());
- CertificateBag newcbs[] = input.getCertificateBags();
- System.out.println(newcbs.length);
- System.out.println("CertNew:"+newcbs[0].getFriendlyName());
- System.out.println(newcbs[0]);
- System.out.println(newcbs[0].getCertificate().getSerialNumber().toString());
- System.out.println(((Name)newcbs[0].getCertificate().getSubjectDN()).getRFC2253String());
- }
-
- public static void main2(String[] args) throws Exception {
-
-
-
- /* Export P12 Cert in .Cer File *
- PKCS12 pkcs12 = new PKCS12(new FileInputStream("resources/ecc(ego).p12"));
- pkcs12.decrypt("ego".toCharArray());
- X509Certificate[] ret = CertificateBag.getCertificates(pkcs12.getCertificateBags());
-
- byte []cert = ret[0].getEncoded();
- FileOutputStream fos = new FileOutputStream("cert1.cer");
- fos.write(cert);
- fos.close();
- */
-
- Properties config = new Properties();
- config.put("PKCS11_NATIVE_MODULE","cryptoki.dll");
- config.put("SLOT_ID","0");
-
- IAIK iaik = new IAIK();
- Security.addProvider(iaik);
- IAIKPkcs11 pkcs11Provider_ = new IAIKPkcs11(config);
- Security.addProvider(pkcs11Provider_);
-
- KeyStore tokenKeyStore = pkcs11Provider_.getTokenManager().getKeyStore();
- tokenKeyStore.load(null,"0000".toCharArray());
-
- byte [] keyid = {0x01,0x02,0x03,0x04};
-
- PrivateKey k = (PrivateKey)tokenKeyStore.getKey("MOAHSMRSAKEY_cert",null);
- KeyBag kb = new KeyBag(k,"MOAHSMRSAKEY_pri",keyid);
- System.out.println("Key:"+k);
-
- java.security.cert.Certificate[] ret = tokenKeyStore.getCertificateChain("MOAHSMRSAKEY_cert");
-
- System.out.println(ret.getClass().getName());
-
- CertificateBag cb = new CertificateBag((iaik.x509.X509Certificate)ret[0],"MOAHSMRSAKEY_cert",keyid);
- CertificateBag chain[] = new CertificateBag[1];
- chain[0] = cb;
- System.out.println("Cert:"+cb);
- FileOutputStream fos = new FileOutputStream("hsm.p12");
-
- PKCS12 pkcs12 = new PKCS12(kb,chain);
- System.out.println("Encrypting...");
- pkcs12.encrypt("moa".toCharArray());
- System.out.println("Write...");
- pkcs12.writeTo(fos);
- fos.close();
-
-
- PKCS12 input = new PKCS12(new FileInputStream("hsm.p12"));
- input.decrypt("moa".toCharArray());
- KeyBag newkb = input.getKeyBag();
- System.out.println("KeyNew:"+newkb.getFriendlyName());
- System.out.println(newkb.getPrivateKey());
- CertificateBag newcbs[] = input.getCertificateBags();
- System.out.println("CertNew:"+newcbs[0].getFriendlyName());
- System.out.println(newcbs[0]);
-
- }
-
- public static void test(String[] args) throws Exception {
- iaik.security.provider.IAIK.addAsJDK14Provider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
-
- Properties config = new Properties();
- config.put("PKCS11_NATIVE_MODULE","cryptoki.dll");
- config.put("SLOT_ID","0");
-
- IAIK iaik = new IAIK();
- Security.addProvider(iaik);
- IAIKPkcs11 pkcs11Provider_ = new IAIKPkcs11(config);
- Security.addProvider(pkcs11Provider_);
-
- KeyStore tokenKeyStore = pkcs11Provider_.getTokenManager().getKeyStore();
- tokenKeyStore.load(null,"0000".toCharArray());
-
- FileInputStream inputStream = new FileInputStream("MOA.Serversignatur.TestECDSA.der");
- CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509", "IAIK");
- Collection certificateCollection = certificateFactory.generateCertificates(inputStream);
- X509Certificate[] certificateChain =
- (X509Certificate[]) certificateCollection.toArray(new X509Certificate[certificateCollection.size()]);
-
- System.out.println("Number of Cert:"+certificateCollection.size());
-
- tokenKeyStore.setCertificateEntry("ECDSA_cert",certificateChain[0]);
-
- System.out.println("DONE");
-
- Enumeration enum2 = tokenKeyStore.aliases();
-
- while (enum2.hasMoreElements()) {
- String alias = enum2.nextElement().toString();
-
- if (tokenKeyStore.isKeyEntry(alias)) {
- System.out.println("________________________________________________________________________________");
- System.out.println("Key entry with alias: " + alias);
- Key key = tokenKeyStore.getKey(alias, null);
- System.out.println(key);
- java.security.cert.Certificate[] certificateChain2 = tokenKeyStore.getCertificateChain(alias);
- if (certificateChain2 != null) {
- System.out.println("Certificate chain of length: " + certificateChain2.length);
- for (int i = 0; i < certificateChain2.length; i++) {
- System.out.println("--------------------------------------------------------------------------------");
- System.out.println(certificateChain2[i]);
- }
- } else {
- System.out.println("Certificate chain is null!");
- }
- System.out.println("________________________________________________________________________________");
- } else if (tokenKeyStore.isCertificateEntry(alias)) {
- System.out.println("________________________________________________________________________________");
- System.out.println("Certificate entry with alias: " + alias);
- java.security.cert.Certificate certificate = tokenKeyStore.getCertificate(alias);
- System.out.println(certificate);
- System.out.println("________________________________________________________________________________");
- } else {
- System.out.println("________________________________________________________________________________");
- System.out.println("ERROR! Unknown entry type with alias: " + alias);
- System.out.println("________________________________________________________________________________");
- }
- }
-
- //tokenKeyStore.setCertificateEntry()
-
- /*IAIKPKCS11PublicKey key = (IAIKPKCS11PublicKey)tokenKeyStore.getKey("ECDSA_pub",null);
-
- ECDSAPublicKey pkcs11EcDsaPublicKey = (ECDSAPublicKey)key.getKeyObject();
-
- ByteArrayAttribute ecdsaParamsAttribute = (ByteArrayAttribute) pkcs11EcDsaPublicKey.getEcdsaParams();
- ByteArrayAttribute ecPointAttribute = (ByteArrayAttribute) pkcs11EcDsaPublicKey.getEcPoint();
-
- if (!ecdsaParamsAttribute.isPresent()) {
- throw new IAIKPkcs11Exception("The PKCS#11 ECDSA key object does not possess a ECDSA parameters attribute.");
- }
- if (!ecPointAttribute.isPresent()) {
- throw new IAIKPkcs11Exception("The PKCS#11 ECDSA key object does not possess a EC point attribute.");
- }
-
- byte[] x509encodedPublicKey;
- try {
- byte[] encodedParameters = ecdsaParamsAttribute.getByteArrayValue();
- byte[] encodedPublicKeyValue = ecPointAttribute.getByteArrayValue();
-
- ECDSAKeyFactory fact = new ECDSAKeyFactory();
-
- // encoding the algorithm ID with the parameters
- ObjectID OBJECT_ID_EC_KEY = new ObjectID("1.2.840.10045.2.1");
- AlgorithmID EC_ALGORITHM_ID = new AlgorithmID(OBJECT_ID_EC_KEY);
-
-
- ASN1 parametersASN1 = new ASN1(encodedParameters);
-
- EC_ALGORITHM_ID.setParameter(parametersASN1.toASN1Object());
-
- // encoding the X.509 subject public key info structure
- SEQUENCE publicKeyInfo = new SEQUENCE();
-
- publicKeyInfo.addComponent(EC_ALGORITHM_ID.toASN1Object());
- publicKeyInfo.addComponent(new BIT_STRING(encodedPublicKeyValue));
-
- x509encodedPublicKey = DerCoder.encode(publicKeyInfo);
-
- } catch (CodingException ex) {
- ex.printStackTrace();
- throw new InvalidKeySpecException("Error during encoding of ECDSA public key: " + ex.toString());
- }
-
- int size = 0;
-
- X509EncodedKeySpec keySpec = new X509EncodedKeySpec(x509encodedPublicKey);
- byte [] enc = keySpec.getEncoded();
- size = enc.length;
-
- BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream("ecdsakey.key"));
- bos.write(enc);
- bos.flush();
- bos.close();
-
- byte [] data = new byte[size];
-
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream("ecdsakey.key"));
- bis.read(data);
- bis.close();
-
-
- ASN1Object asn1 = DerCoder.decode(data);
- System.out.println("Objectcount:"+asn1.countComponents());
- ASN1Object asnobject1 = asn1.getComponentAt(0);
- System.out.println(asnobject1);
-
- ASN1Object asnobject1_1 = asnobject1.getComponentAt(0);
- System.out.println(asnobject1_1);
-
- ASN1Object asnobject1_2 = asnobject1.getComponentAt(1);
- System.out.println(asnobject1_2);
-
- ASN1Object asnobject2 = asn1.getComponentAt(1);
- System.out.println(asnobject2);*/
-
- }
-}
diff --git a/spss.test/src/at/gv/egovernment/moa/spss/client/call/MOACaller.java b/spss.test/src/at/gv/egovernment/moa/spss/client/call/MOACaller.java
deleted file mode 100644
index 13a06b2fb..000000000
--- a/spss.test/src/at/gv/egovernment/moa/spss/client/call/MOACaller.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.gv.egovernment.moa.spss.client.call;
-
-import java.rmi.RemoteException;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceException;
-import javax.xml.rpc.ServiceFactory;
-
-import org.apache.axis.message.SOAPBodyElement;
-import org.w3c.dom.Element;
-
-/**
- * @author Patrick Peck
- * @version $Id$
- */
-public class MOACaller {
-
- protected Element doCall(QName serviceName, Element request, String endPoint)
- throws RemoteException, ServiceException, Exception {
- Service service = ServiceFactory.newInstance().createService(serviceName);
- Call call = service.createCall();
- SOAPBodyElement body =
- new SOAPBodyElement(request);
- SOAPBodyElement[] params = new SOAPBodyElement[] {body};
- Vector responses;
- SOAPBodyElement response;
-
- call.setTargetEndpointAddress(endPoint);
- responses = (Vector) call.invoke(params);
- response = (SOAPBodyElement) responses.get(0);
-
- return response.getAsDOM();
- }
-
-}
diff --git a/spss.test/src/at/gv/egovernment/moa/spss/client/call/SignatureCreationCaller.java b/spss.test/src/at/gv/egovernment/moa/spss/client/call/SignatureCreationCaller.java
deleted file mode 100644
index 0ca4a23c0..000000000
--- a/spss.test/src/at/gv/egovernment/moa/spss/client/call/SignatureCreationCaller.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package at.gv.egovernment.moa.spss.client.call;
-
-import java.rmi.RemoteException;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ServiceException;
-
-import org.w3c.dom.Element;
-
-/**
- * @author Patrick Peck
- * @version $Id$
- */
-public class SignatureCreationCaller extends MOACaller {
-
- private static final QName SERVICE_QNAME = new QName("SignatureCreation");
-
- public Element createXMLSignature(Element request, String endPoint)
- throws ServiceException, RemoteException, Exception {
- return doCall(SERVICE_QNAME, request, endPoint);
- }
-
-}
diff --git a/spss.test/src/at/gv/egovernment/moa/spss/client/call/SignatureVerificationCaller.java b/spss.test/src/at/gv/egovernment/moa/spss/client/call/SignatureVerificationCaller.java
deleted file mode 100644
index 612a1d345..000000000
--- a/spss.test/src/at/gv/egovernment/moa/spss/client/call/SignatureVerificationCaller.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.gv.egovernment.moa.spss.client.call;
-
-import java.rmi.RemoteException;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ServiceException;
-
-import org.w3c.dom.Element;
-
-/**
- * @author Patrick Peck
- * @version $Id$
- */
-public class SignatureVerificationCaller extends MOACaller {
-
- private static final QName SERVICE_QNAME = new QName("SignatureVerification");
-
- public Element verifyCMSSignature(Element request, String endPoint)
- throws ServiceException, RemoteException, Exception {
- return doCall(SERVICE_QNAME, request, endPoint);
- }
-
- public Element verifyXMLSignature(Element request, String endPoint)
- throws ServiceException, RemoteException, Exception {
- return doCall(SERVICE_QNAME, request, endPoint);
- }
-
-}
diff --git a/spss.test/src/testclient/LasttestClient.java b/spss.test/src/testclient/LasttestClient.java
deleted file mode 100644
index 339b6609d..000000000
--- a/spss.test/src/testclient/LasttestClient.java
+++ /dev/null
@@ -1,389 +0,0 @@
-package testclient;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.RandomAccessFile;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Date;
-
-
-/**
- * @author Sven
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class LasttestClient {
-
-
- public int max_thread_count = 300;
- public int thread_counter = 0;
- public int error_count = 0;
- public int turns = 0;
-
- public long max = 0;
- public long min = Long.MAX_VALUE;
-
- public PrintStream Log = null;
-
- public boolean stop = false;
-
- private String readFile(String filename) throws Exception
- {
- RandomAccessFile raf = new RandomAccessFile(filename, "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("file too big to fit in byte array.");
-
- byte[] result = new byte[(int) raf.length()];
-
- raf.read(result);
-
- return new String(result);
-
- }
-
-
-
- public String buildRequest(String filename) throws Exception
- {
- String data = readFile(filename);
- int index = data.indexOf(">");
-
- String xml_head = data.substring(0,index+1);
- data = data.substring(index+1);
- //Log.println("Data2:\n"+data);
-
- data =
- xml_head +
- "<soap:Envelope "+
- "xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\" "+
- "soap:encodingStyle=\"http://www.w3.org/2001/12/soap-encoding\"> "+
- "<soap:Body> "+
- data +
- "</soap:Body>"+
- "</soap:Envelope>";
-
- if(data.indexOf("10.16.46.109")!=-1)
- data = replaceString(data,"10.16.46.109","127.0.0.1");
-
- System.out.println("Request:"+data);
-
- return data;
-
- }
-
- public String buildEndpoint(String request,String server)
- {
- String ep = null;
- if(request.indexOf("<Create")!=-1) ep = server + "moa-spss/services/SignatureCreation";
- else ep = server + "moa-spss/services/SignatureVerification";
- return ep;
- }
-
- public void startTest(String filename,String server,int req_per_second,int turns) throws Exception
- {
- this.turns = turns;
- String request = buildRequest(filename);
- String ep = buildEndpoint(request,server);
-
- boolean result = doTestRequest(request,ep);
-
- if(result)
- {
- System.out.println("TestRequest OK. Lasttest wird gestartet.");
- Dispatcher dp = new Dispatcher(this,request,ep,req_per_second,turns);
- dp.start();
- while(!stop)
- {
- System.out.println("Checking Stop Condition ...(Running "+thread_counter+", Min "+(min)+", Max "+(max)+", "+new Date(System.currentTimeMillis())+")");
- Thread.sleep(3000);
- }
- System.out.println("Fehler:"+error_count+" (Running "+thread_counter+", Min "+(min)+", Max "+(max)+", "+new Date(System.currentTimeMillis())+")");
- }
- else
- {
- System.out.println("TestRequest lieferte einen Fehler. Lasttest wird nicht gestartet.");
- }
- }
-
- public boolean doTestRequest(String request,String endpoint) throws Exception
- {
- HttpURLConnection urlc = (HttpURLConnection)(new URL(endpoint)).openConnection();
- urlc.setDoInput(true);
- urlc.setDoOutput(true);
- urlc.setRequestProperty("SOAPAction","");
- BufferedWriter ow = new BufferedWriter(new OutputStreamWriter(urlc.getOutputStream()));
- ow.write(request);
- ow.flush();
-
- int code = 0;
- try {
- code = urlc.getResponseCode();
- }
- catch(IOException ioe)
- {
- ow.close();
- urlc.disconnect();
- return false;
- }
- BufferedReader iw = new BufferedReader(new InputStreamReader(urlc.getInputStream()));
- while(iw.readLine()!=null) {}
- ow.close();
-
- if(code==500)
- {
- return false;
- }
- else
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(urlc.getInputStream()));
- StringBuffer response = new StringBuffer();
- String line = null;
- while((line = br.readLine()) != null)
- {
- response.append(line);
- }
-
- iw.close();
- urlc.disconnect();
-
- String resp = response.toString();
-
- int pos = resp.indexOf("ErrorCode>");
- if(pos==-1)
- {
- return true;
- }
- else
- {
- return false;
- }
- }
-
- }
-
- private String replaceString(
- String input,
- String oldPart,
- String newPart)
- throws Exception {
- String erg = null;
-
- //First Part
- erg = input.substring(0, input.indexOf(oldPart));
- //Insert new Part
- erg += newPart;
-
- //insert REST
- erg
- += input.substring(
- input.indexOf(oldPart) + oldPart.length(),
- input.length());
-
- return erg;
- }
-
- public static void main(String[] args) throws Exception
- {
- int sek = 0;
- int turns = 0;
-
- if(args.length!=4)
- {
- System.out.println("Parameteranzahl falsch. Bitte verwenden Sie die Syntax <Requestdatei><ServerURL><Request_pro_Sekunde(Zahl)><Anzahl_der_Durchläufe(Zahl oder INF)>");
- return;
- }
-
- try {
- sek = Integer.parseInt(args[2]);
- if(args[3].equals("INF"))
- {
- turns = 0;
- }
- else
- turns = Integer.parseInt(args[3]);
- }
- catch(NumberFormatException e)
- {
- System.out.println("Einer der Parameter (Requestanzahl oder Testanzahl) ist keine Zahl !");
- return;
- }
-
- System.out.println("Starte Lastest mit folgenden Parametern ...");
- System.out.println("Requestdatei: "+args[0]);
- System.out.println("ServerURL: "+args[1]);
- System.out.println("Requests pro Sekunde: "+sek);
- System.out.println("Durchläufe: "+(turns==0?"INF":turns+""));
-
-
- LasttestClient lc = new LasttestClient();
- //lc.startTest("data/CX0/TestGeneratorCX0.001.Req.xml","http://161.106.2.255:8080/",10,1000);
- lc.startTest(args[0],args[1],sek,turns);
- }
-}
-
-class Dispatcher extends Thread
-{
- private String request = null;
- private String endpoint = null;
- private LasttestClient parent = null;
- private int max;
- private int turns;
- public Dispatcher(LasttestClient parent,String request,String endpoint,int max,int turns)
- {
- this.request = request;
- this.endpoint = endpoint;
- this.parent = parent;
- this.max = max;
- this.turns = turns;
- }
-
- public void run()
- {
- this.setPriority(Thread.NORM_PRIORITY+1);
- System.out.println("Dispatcher wird gestartet...");
- TestThread[] old_reqs = buildRequests();
- for(int turn_counter=0;turns==0?true:(turn_counter<turns);turn_counter++)
- {
- System.out.println("Durchlauf "+turn_counter);
- if(turns==0) turn_counter--;
- TestThread[] reqs = buildRequests();
- for(int counter=0;counter<max;counter++)
- {
- old_reqs[counter].start();
- }
- old_reqs = reqs;
- try {
- Thread.sleep(1000);
- }
- catch(Exception e) { e.printStackTrace(); }
- }
- parent.stop = true;
- }
-
- public TestThread[] buildRequests()
- {
- TestThread[] ret = new TestThread[max];
- for(int counter=0;counter<max;counter++)
- {
- ret[counter] = new TestThread(parent,request,endpoint);
- }
- return ret;
- }
-}
-
-class TestThread extends Thread
-{
- private String request = null;
- private String endpoint = null;
- private LasttestClient parent = null;
- public TestThread(LasttestClient parent,String request,String endpoint)
- {
- this.request = request;
- this.endpoint = endpoint;
- this.parent = parent;
-
- }
-
-
- /**
- * @see java.lang.Runnable#run()
- */
- public void run() {
- parent.thread_counter++;
-
- try {
- if(!doRequest())
- {
- parent.error_count++;
- }
- }
- catch(Exception e)
- {
- e.printStackTrace();
- parent.error_count++;
- }
- parent.thread_counter--;
- }
-
- public boolean doRequest() throws Exception
- {
- long start = System.currentTimeMillis();
- HttpURLConnection urlc = (HttpURLConnection)(new URL(endpoint)).openConnection();
- urlc.setDoInput(true);
- urlc.setDoOutput(true);
- urlc.setAllowUserInteraction(false);
- urlc.setUseCaches(false);
- HttpURLConnection.setFollowRedirects(false);
- urlc.setRequestProperty("SOAPAction","");
-
-
- BufferedWriter ow = new BufferedWriter(new OutputStreamWriter(urlc.getOutputStream()));
- ow.write(request);
- ow.flush();
-
- int code = 0;
- /*try {
- code = urlc.getResponseCode();
- }
- catch(IOException ioe)
- {
- ow.close();
- urlc.disconnect();
- return false;
- }*/
- ow.close();
- BufferedReader iw = new BufferedReader(new InputStreamReader(urlc.getInputStream()));
- while(iw.readLine()!=null) {}
-
- if(code==500)
- {
- return false;
- }
- else
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(urlc.getInputStream()));
- StringBuffer response = new StringBuffer();
- String line = null;
- while((line = br.readLine()) != null)
- {
- response.append(line);
- }
-
- iw.close();
- urlc.disconnect();
- long end = System.currentTimeMillis();
-
- String resp = response.toString();
-
- int pos = resp.indexOf("ErrorCode>");
- if(pos==-1)
- {
- long diff = end-start;
- if(parent.max<diff)
- {
- parent.max=diff;
- }
- if(parent.min>diff)
- {
- parent.min=diff;
- }
- return true;
-
- }
- else
- {
- return false;
- }
- }
-
- }
-
-} \ No newline at end of file
diff --git a/spss.test/src/testclient/TestClient.java b/spss.test/src/testclient/TestClient.java
deleted file mode 100644
index aac30499f..000000000
--- a/spss.test/src/testclient/TestClient.java
+++ /dev/null
@@ -1,1665 +0,0 @@
-package testclient;
-
-import iaik.ixsil.algorithms.Transform;
-import iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXML;
-import iaik.ixsil.init.IXSILInit;
-import iaik.ixsil.util.URI;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.RandomAccessFile;
-import java.io.UTFDataFormatException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.security.KeyStore;
-import java.security.Principal;
-import java.security.Security;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.SAXParseException;
-
-import at.gv.egovernment.moa.spss.client.call.SignatureCreationCaller;
-import at.gv.egovernment.moa.spss.client.call.SignatureVerificationCaller;
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-import com.sun.net.ssl.internal.ssl.Provider;
-
-/**
- * @author Sven
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestClient
-{
-
- // stats
- private int pos_ok = 0;
- private int pos_nok = 0;
- private int pos_exc = 0;
- private int neg_ok = 0;
- private int neg_nok = 0;
- private int neg_exc = 0;
- private long max_request = 0;
- private long min_request = 99999;
- private long all_request = 0;
- private int count_all_request = 0;
- private int count_tests = 0;
-
- private TreeMap suits = new TreeMap();
- private PrintStream Log = null;
- private static File directory = null;
- private static String directorystring = null;
- private static Provider ssl_provider = null;
- private static boolean ssl_connection = false;
- private static String defaultserver = "http://localhost:8080/";
- private static String defaultdirectory = "data/feature41/";
- private static String server;
-
- private static boolean ignoreSignatureValue = false;
-
- // end points
- private static String VERIFICATION_ENDPOINT = "moa-spss/services/SignatureVerification";
- private static String CREATION_ENDPOINT = "moa-spss/services/SignatureCreation";
- private static String SSL_VERIFICATION_ENDPOINT = null;
- private static String SSL_CREATION_ENDPOINT = null;
-
- private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd hh:mm:ss.SSS");
-
- // super cool stuff
- private static ArrayList testtimes = new ArrayList();
- private static ArrayList testnames = new ArrayList();
- private static ArrayList testvalues = new ArrayList();
- private static ArrayList testerrors = new ArrayList();
- private static int ELEMS_MAX = 40;
- private static String ELEMS_ICON = "O";
- private static String ELEMS_ICON_BAD = "X";
-
- private static final boolean debug = true;
-
- public static void main(String[] args)
- {
- long start = System.currentTimeMillis();
- long end = 0;
- System.out.println("Lade IXSIL ...");
- try
- {
- IXSILInit.init(new URI("init/properties/init.properties"));
- }
- catch (Exception e)
- {
- e.printStackTrace();
- System.exit(1);
- }
-
- System.out.println("Starte TestClient @ " + sdf.format(new Date(start)) + "...");
-
- if (args.length == 0)
- {
- directory = new File(defaultdirectory);
- server = defaultserver;
- System.out.println("DefaultPfad wird benutzt (" + directory.getPath() + ")");
- System.out.println("DefaultServer wird benutzt (" + server + ")");
- }
- else if (args.length == 1)
- {
- System.out.println("Pfad " + args[0] + " wird benutzt ");
- directory = new File(args[0]);
- server = defaultserver;
- System.out.println("DefaultServer wird benutzt (" + server + ")");
- }
- else if (args.length == 2)
- {
- System.out.println("Pfad " + args[0] + " wird benutzt ");
- directory = new File(args[0]);
- System.out.println("Server " + args[1] + " wird benutzt ");
- server = args[1];
- }
-
- VERIFICATION_ENDPOINT = server + VERIFICATION_ENDPOINT;
- CREATION_ENDPOINT = server + CREATION_ENDPOINT;
- TestClient tc = new TestClient();
- tc.run();
- end = System.currentTimeMillis();
- System.out.println("Ende TestClient @ " + sdf.format(new Date(end)) + "...");
- System.out.println("Durchlaufzeit: " + ((end - start) / 1000) + " sekunden");
-
- }
-
- public void run()
- {
- ssl_provider = new Provider();
- Security.addProvider(ssl_provider);
- Log = System.out;
- try
- {
- prepareFiles();
- runSuits();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
- Log.println("----- Auswertung:");
- Log.println("----- Positiv Tests:" + (pos_ok + pos_nok + pos_exc));
- Log.println("----- OK:" + (pos_ok));
- Log.println("----- nicht OK:" + (pos_nok));
- Log.println("----- Exception aufgetreten:" + (pos_exc));
- Log.println("----- Negativ Test:" + (neg_ok + neg_nok + neg_exc));
- Log.println("----- OK:" + (neg_ok));
- Log.println("----- nicht OK:" + (neg_nok));
- Log.println("----- Exception aufgetreten:" + (neg_exc));
- Log.println("----- schnellste Anfrage:" + min_request + " ms");
- Log.println("----- langsamste Anfrage:" + max_request + " ms");
- if (count_all_request > 2)
- Log.println(
- "----- durchschnittliche Anfrage:"
- + ((all_request - max_request - min_request) / (count_all_request - 2))
- + " ms");
- else if (count_all_request == 0)
- Log.println("----- keine gültigen Messungen für Durchschnittsermittlung");
- else
- Log.println("----- durchschnittliche Anfrage:" + ((all_request) / (count_all_request)) + " ms");
- }
-
- private void prepareFiles() throws Exception
- {
-
- if (!directory.isDirectory())
- {
- throw new Exception("Das angegebene Verzeichnis ist kein Verzeichnis. Bitte Pfad überprüfen.");
- }
-
- directorystring = directory.getAbsolutePath();
-
- String[] list = directory.list();
- for (int counter = 0; counter < list.length; counter++)
- {
-
- if (list[counter].endsWith("Req.xml")
- || list[counter].endsWith("Res.xml")
- || list[counter].endsWith("Config.xml"))
- {
- String suitename = list[counter].substring(0, list[counter].indexOf("."));
-
- if (!suits.containsKey(suitename))
- suits.put(suitename, null);
-
- ArrayList al = (ArrayList) suits.get(suitename);
- if (al == null)
- {
- al = new ArrayList();
- suits.put(suitename, al);
- }
- al.add(list[counter]);
- }
- }
-
- }
-
- private void runSuits()
- {
- Iterator i = suits.keySet().iterator();
- while (i.hasNext())
- {
- String suitename = (String) i.next();
- Log.println("Suite:" + suitename);
- ArrayList al = (ArrayList) suits.get(suitename);
- testtimes.clear();
- testnames.clear();
- testvalues.clear();
- testerrors.clear();
- runTests(al, suitename);
- printGraph(testnames, testtimes, testvalues, testerrors, suitename);
- }
- }
-
- private void runTests(ArrayList testlist, String suitename)
- {
- TreeMap tests = new TreeMap();
- String config = null;
-
- int size = testlist.size();
- for (int counter = 0; counter < size; counter++)
- {
- String filename = (String) testlist.get(counter);
- StringTokenizer st = new StringTokenizer(filename, ".");
- String prefix = st.nextToken();
- String number = st.nextToken();
-
- if (number.equals("Config"))
- {
- config = filename;
- continue;
- }
-
- ArrayList testfiles = null;
- if (!tests.containsKey(number))
- {
- testfiles = new ArrayList();
- tests.put(number, testfiles);
- }
- else
- {
- testfiles = (ArrayList) tests.get(number);
- }
- testfiles.add(filename);
- }
-
- Iterator i = tests.keySet().iterator();
- while (i.hasNext())
- {
- String number = (String) i.next();
- runTest((ArrayList) tests.get(number), null, number, suitename);
- }
- }
-
- private void runTest(ArrayList files, String config, String number, String suitename)
- {
- String request = null;
- String response = null;
- String errorresponse = null;
-
- //Log.println("Test:"+number+" Mit Config:"+config);
- int size = files.size();
- for (int counter = 0; counter < size; counter++)
- {
- String filename = (String) files.get(counter);
- //Log.println("File:"+filename);
- if (filename.endsWith("ErrRes.xml"))
- errorresponse = filename;
- else if (filename.endsWith("Res.xml"))
- response = filename;
- else if (filename.endsWith("Req.xml"))
- request = filename;
- else
- Log.println("Nicht relevant:" + filename);
- }
-
- if (request != null)
- {
- for (int counter = 0; counter < 1; counter++)
- {
- if (response != null && errorresponse != null)
- Log.println(
- "Test " + number + " nicht gültig ! Sowohl Response als auch ErrorResponse vorhanden !");
- else if (response != null)
- runPosTest(request, response, config, number, suitename);
- else if (errorresponse != null)
- runNegTest(request, errorresponse, config, number, suitename);
- }
- }
- else
- {
- Log.println("Test " + number + " nicht gültig ! Kein Request vorhanden !");
- }
- }
-
- private void runPosTest(String request, String response, String config, String number, String suitename)
- {
- long start = System.currentTimeMillis();
- long end = 0;
- Log.println("\n----- Starte Test <" + number + "> (positiv) -----");
- Log.println("----- Request: " + request);
- Log.println("----- Response: " + response);
- try
- {
- long start_req = 0;
- long end_req = 0;
-
- Log.println("----- Lade Request:" + directorystring + "/" + request);
- FileInputStream fis = new FileInputStream(directorystring + "/" + request);
- Document root_doc = DOMUtils.parseDocument(fis, false, Constants.ALL_SCHEMA_LOCATIONS, null);
- Element root = root_doc.getDocumentElement();
- if (debug)
- Log.println(DOMUtils.serializeNode(root));
-
- Log.println("----- Lade Response:" + directorystring + "/" + response);
- FileInputStream fis2 = new FileInputStream(directorystring + "/" + response);
- Document root_response_doc = DOMUtils.parseDocument(fis2, true, Constants.ALL_SCHEMA_LOCATIONS, null);
- Element root_response = root_response_doc.getDocumentElement();
-
- //can_root_response.normalize();
-
- if (request.endsWith("CX3.001.Req.xml"))
- {
- printKeyStoreInformation("./resources/client.keystore", "changeit");
- System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
- System.setProperty("javax.net.ssl.keyStore", "./resources/client.keystore");
- System.setProperty("javax.net.ssl.keyStorePassword", "changeit");
- System.setProperty("javax.net.ssl.trustStore", "./resources/client.keystore");
- System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
-
- ssl_connection = true;
- }
- else
- ssl_connection = false;
-
- if (request.endsWith("CX0.005.Req.xml")) // ECDSA
- ignoreSignatureValue = true;
- else
- ignoreSignatureValue = false;
-
- boolean compare = false;
-
- Transform can = new TransformImplExclusiveCanonicalXML();
- can.setInput(XPathUtils.selectNodeList(root_response, XPathUtils.ALL_NODES_XPATH), null);
-
- InputStream is = (InputStream) can.transform();
- Document can_root_response_doc =
- DOMUtils.parseDocument(is, true, Constants.ALL_SCHEMA_LOCATIONS, null);
- Element can_root_response = root_response_doc.getDocumentElement();
-
- if (checkNode(root, "VerifyCMSSignatureRequest"))
- {
- Log.println("----- Anfrage wird gesendet ...");
- SignatureVerificationCaller svc = new SignatureVerificationCaller();
- start_req = System.currentTimeMillis();
- Element root_serverresponse = svc.verifyCMSSignature(root, VERIFICATION_ENDPOINT);
- end_req = System.currentTimeMillis();
-
- Transform can2 = new TransformImplExclusiveCanonicalXML();
- can2.setInput(XPathUtils.selectNodeList(root_serverresponse, XPathUtils.ALL_NODES_XPATH), null);
- InputStream is2 = (InputStream) can2.transform();
-
- Document can_root_serverresponse_doc =
- DOMUtils.parseDocument(is2, true, Constants.ALL_SCHEMA_LOCATIONS, null);
- Element can_root_serverresponse = can_root_serverresponse_doc.getDocumentElement();
- if (debug)
- Log.println("----- Antwort sollte so aussehen ...\n" + DOMUtils.serializeNode(can_root_response));
- if (debug)
- Log.println("----- Antwort vom Server ...\n" + DOMUtils.serializeNode(can_root_serverresponse));
-
- Log.println("----- Antwort validieren ...\n");
- DOMUtils.validateElement(can_root_serverresponse, Constants.ALL_SCHEMA_LOCATIONS, null);
- Log.println("----- Antwort vergleichen ...\n");
-
- String error = findErrorNode(can_root_serverresponse);
- if (error != null)
- {
- compare = false;
- Log.println("----- ServerError: " + error);
- testerrors.add(error);
- }
- else
- {
- compare = compareElements(can_root_response, can_root_serverresponse);
- testerrors.add(null);
- }
-
- }
- else if (checkNode(root, "VerifyXMLSignatureRequest"))
- {
- Log.println("----- Anfrage wird gesendet ...");
- SignatureVerificationCaller svc = new SignatureVerificationCaller();
- start_req = System.currentTimeMillis();
- Element root_serverresponse = svc.verifyXMLSignature(root, VERIFICATION_ENDPOINT);
- end_req = System.currentTimeMillis();
-
- Transform can2 = new TransformImplExclusiveCanonicalXML();
- can2.setInput(XPathUtils.selectNodeList(root_serverresponse, XPathUtils.ALL_NODES_XPATH), null);
- InputStream is2 = (InputStream) can2.transform();
-
- Document can_root_serverresponse_doc =
- DOMUtils.parseDocument(is2, false, Constants.ALL_SCHEMA_LOCATIONS, null);
- Element can_root_serverresponse = can_root_serverresponse_doc.getDocumentElement();
-
- if (debug)
- Log.println("----- Antwort sollte so aussehen ...\n" + DOMUtils.serializeNode(can_root_response));
- if (debug)
- Log.println("----- Antwort vom Server ...\n" + DOMUtils.serializeNode(can_root_serverresponse));
-
- Log.println("----- Antwort validieren ...\n");
- DOMUtils.validateElement(can_root_serverresponse, Constants.ALL_SCHEMA_LOCATIONS, null);
- Log.println("----- Antwort vergleichen ...\n");
- String error = findErrorNode(can_root_serverresponse);
- if (error != null)
- {
- compare = false;
- Log.println("----- ServerError: " + error);
- testerrors.add(error);
- }
- else
- {
- compare = compareElements(can_root_response, can_root_serverresponse);
- testerrors.add(null);
- }
- }
- else if (checkNode(root, "CreateXMLSignatureRequest"))
- {
- Log.println("----- Anfrage wird gesendet ...");
- SignatureCreationCaller scc = new SignatureCreationCaller();
- start_req = System.currentTimeMillis();
- Element root_serverresponse = scc.createXMLSignature(root, CREATION_ENDPOINT);
- end_req = System.currentTimeMillis();
-
- Transform can2 = new TransformImplExclusiveCanonicalXML();
- can2.setInput(XPathUtils.selectNodeList(root_serverresponse, XPathUtils.ALL_NODES_XPATH), null);
- InputStream is2 = (InputStream) can2.transform();
-
- Document can_root_serverresponse_doc =
- DOMUtils.parseDocument(is2, false, Constants.ALL_SCHEMA_LOCATIONS, null);
- Element can_root_serverresponse = can_root_serverresponse_doc.getDocumentElement();
-
- if (debug)
- Log.println("----- Antwort sollte so aussehen ...\n" + DOMUtils.serializeNode(can_root_response));
- //Log.println("----- Antwort vom Server (von Can)...\n"+DOMUtils.serializeNode(root_serverresponse));
- if (debug)
- Log.println("----- Antwort vom Server ...\n" + DOMUtils.serializeNode(can_root_serverresponse));
-
- Log.println("----- Antwort validieren ...\n");
- DOMUtils.validateElement(can_root_serverresponse, Constants.ALL_SCHEMA_LOCATIONS, null);
- Log.println("----- Antwort vergleichen ...\n");
-
- String error = findErrorNode(can_root_serverresponse);
- if (error != null)
- {
- compare = false;
- Log.println("----- ServerError: " + error);
- testerrors.add(error);
- }
- else
- {
- compare = compareElements(can_root_response, can_root_serverresponse);
- testerrors.add(null);
- }
-
- }
- else
- {
- throw new Exception("Responsetyp nicht bekannt");
- }
-
- if (compare)
- {
- pos_ok++;
- testvalues.add(" OK");
- Log.println("----- Keine Fehler aufgetreten");
- }
- else
- {
- pos_nok++;
- testvalues.add("NOK");
- Log.println("----- Response war nicht ok !");
- }
-
- Date start_date = new Date(start_req);
- Date end_date = new Date(end_req);
- long diff = end_req - start_req;
- Log.println("----- Requeststart: " + sdf.format(start_date));
- Log.println("----- Requestende: " + sdf.format(end_date));
- Log.println("----- Requestdauer: " + diff + " ms");
- if (diff > max_request)
- max_request = diff;
- if (diff < min_request)
- min_request = diff;
- all_request += diff;
- count_all_request++;
-
- // :)
- testtimes.add(new Long(diff));
- testnames.add(number);
- }
- catch (Exception e)
- {
- testtimes.add(new Long(-1L));
- testnames.add(number);
- testvalues.add("EXC");
- testerrors.add(e.getMessage());
- pos_exc++;
- Log.println("----- Exception:\n");
- e.printStackTrace(Log);
- }
- end = System.currentTimeMillis();
- Log.println("----- Durchlaufzeit: " + ((end - start) / 1000) + " sekunden");
- Log.println("----- Ende Test <" + number + "> -----\n");
- }
-
- private void runNegTest(
- String request,
- String errorresponse,
- String config,
- String number,
- String suitename)
- {
- long start = System.currentTimeMillis();
- long end = 0;
- Log.println("\n----- Starte Test <" + number + "> (negativ) -----");
- Log.println("----- Config: " + config);
- Log.println("----- Request: " + request);
- Log.println("----- ErrorResponse: " + errorresponse);
- int error_no = 0;
- try
- {
-
- FileInputStream fis = null;
- Document root_doc = null;
- Element root = null;
- long start_req = 0;
- long end_req = 0;
-
- try
- {
- error_no = Integer.parseInt(readFile(directorystring + "/" + errorresponse));
- }
- catch (NumberFormatException nfe)
- {
- throw new Exception(
- "Fehler beim Lesen der Datei "
- + directorystring
- + "/"
- + errorresponse
- + ". Die Fehlernummer konnte nicht ermittelt werden");
- }
-
- try
- {
- Log.println("----- Lade Request: " + directorystring + "/" + request);
- fis = new FileInputStream(directorystring + "/" + request);
- root_doc = DOMUtils.parseDocument(fis, false, Constants.ALL_SCHEMA_LOCATIONS, null);
- root = root_doc.getDocumentElement();
- }
- catch (SAXParseException saxpe)
- {
- Log.println("Fehler beim Lesen der Requestdatei !");
- throw saxpe;
- }
-
- try
- {
- if (request.endsWith("CX4.051.Req.xml"))
- {
- printKeyStoreInformation("./resources/sven.keystore", "example");
- System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
- System.setProperty("javax.net.ssl.keyStore", "./resources/sven.keystore");
- System.setProperty("javax.net.ssl.keyStorePassword", "example");
- System.setProperty("javax.net.ssl.trustStore", "./resources/sven.keystore");
- System.setProperty("javax.net.ssl.trustStorePassword", "example");
-
- ssl_connection = true;
- }
- else if (request.endsWith("CX3.052.Req.xml"))
- {
- printKeyStoreInformation("./resources/client.keystore", "changeit");
- System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
- System.setProperty("javax.net.ssl.keyStore", "./resources/client.keystore");
- System.setProperty("javax.net.ssl.keyStorePassword", "changeit");
- System.setProperty("javax.net.ssl.trustStore", "./resources/client.keystore");
- System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
-
- ssl_connection = true;
- }
- else
- ssl_connection = false;
-
- Element root_serverresponse = null;
-
- if (checkNode(root, "VerifyCMSSignatureRequest"))
- {
- SignatureVerificationCaller svc = new SignatureVerificationCaller();
- start_req = System.currentTimeMillis();
- root_serverresponse = svc.verifyCMSSignature(root, VERIFICATION_ENDPOINT);
- end_req = System.currentTimeMillis();
- Log.println(DOMUtils.serializeNode(root_serverresponse));
- }
- else if (checkNode(root, "VerifyXMLSignatureRequest"))
- {
- SignatureVerificationCaller svc = new SignatureVerificationCaller();
- start_req = System.currentTimeMillis();
- root_serverresponse = svc.verifyXMLSignature(root, VERIFICATION_ENDPOINT);
- end_req = System.currentTimeMillis();
- Log.println(DOMUtils.serializeNode(root_serverresponse));
- }
- else if (checkNode(root, "CreateXMLSignatureRequest"))
- {
- SignatureCreationCaller svc = new SignatureCreationCaller();
- start_req = System.currentTimeMillis();
- root_serverresponse = svc.createXMLSignature(root, CREATION_ENDPOINT);
- end_req = System.currentTimeMillis();
- Log.println(DOMUtils.serializeNode(root_serverresponse));
- }
-
- Transform can2 = new TransformImplExclusiveCanonicalXML();
- can2.setInput(XPathUtils.selectNodeList(root_serverresponse, XPathUtils.ALL_NODES_XPATH), null);
- InputStream is2 = (InputStream) can2.transform();
-
- Document can_root_serverresponse_doc =
- DOMUtils.parseDocument(is2, false, Constants.ALL_SCHEMA_LOCATIONS, null);
- Element can_root_serverresponse = can_root_serverresponse_doc.getDocumentElement();
-
- int errno = getErrorNumber(can_root_serverresponse);
-
- if (errno == -1)
- {
- Log.println("Kein Fehler aufgetreten oder Fehlernummer konnte nicht ermittelt werden.");
- neg_nok++;
- testvalues.add("NOK");
- testerrors.add("Kein Fehler aufgetreten oder Fehlernummer konnte nicht ermittelt werden.");
- }
- else
- {
- Log.println("----- Fehlercode vom Server:" + errno);
- Log.println("----- Fehlercode vom Test:" + error_no);
- if (errno == error_no)
- {
- Log.println("Test erfolgreich !");
- testvalues.add(" OK");
- testerrors.add(null);
- neg_ok++;
- }
- else
- {
- Log.println("Test nicht erfolgreich !");
- neg_nok++;
- testvalues.add("NOK");
- testerrors.add("Fehlercodes nicht gleich: Server " + errno + " Client " + error_no);
- }
- }
-
- }
- catch (org.apache.axis.AxisFault af)
- {
- end_req = System.currentTimeMillis();
- /*
- * Sample Fault:
- AxisFault
- faultCode: {http://xml.apache.org/axis/}Server.userException
- faultString: at.gv.egovernment.moa.spss.server.MOAApplicationException: Fehler beim Validieren der Anfrage
- faultActor: null
- faultDetail:
- ErrorResponse:
- <ns2:ErrorCode>1100</ns2:ErrorCode>
- <ns2:Info>Fehler beim Validieren der Anfrage</ns2:Info>
- */
- Element base = af.getFaultDetails()[0];
- System.out.println(DOMUtils.serializeNode(base));
-
- int error_no_server = getErrorNumber(base);
- if (error_no_server == -1)
- {
- Log.println("Kein Fehler aufgetreten oder Fehlernummer konnte nicht ermittelt werden.");
- neg_nok++;
- testvalues.add("NOK");
- testerrors.add("Kein Fehler aufgetreten oder Fehlernummer konnte nicht ermittelt werden.");
- }
- else
- {
- Log.println("----- Fehlercode vom Server:" + error_no_server);
- Log.println("----- Fehlercode vom Test:" + error_no);
- if (error_no_server == error_no)
- {
- Log.println("Test erfolgreich !");
- testvalues.add(" OK");
- testerrors.add(null);
- neg_ok++;
- }
- else
- {
- Log.println("Test nicht erfolgreich !");
- neg_nok++;
- testvalues.add("NOK");
- testerrors.add("Fehlercodes nicht gleich: Server " + error_no_server + " Client " + error_no);
- }
- }
- }
- long diff = end_req - start_req;
- Log.println("----- Requestdauer: " + diff + " ms");
- if (diff > max_request)
- max_request = diff;
- if (diff < min_request)
- min_request = diff;
- all_request += diff;
- count_all_request++;
- testtimes.add(new Long(diff));
- testnames.add(number);
-
- }
- catch (UTFDataFormatException e)
- {
- method2(request, error_no, number);
- }
- catch (SAXParseException e)
- {
- method2(request, error_no, number);
- }
- catch (Exception e)
- {
- neg_exc++;
- testtimes.add(new Long(-1L));
- testnames.add(number);
- testvalues.add("EXC");
- testerrors.add(e.getMessage());
- Log.println("----- Exception:\n");
- e.printStackTrace(Log);
- }
- end = System.currentTimeMillis();
- Log.println("----- Durchlaufzeit: " + ((end - start) / 1000) + " sekunden");
- Log.println("----- Ende Test <" + number + "> -----\n");
- }
-
- private void method2(String request, int error_no, String number)
- {
- try
- {
- Log.println("----- Methode 2\n");
- String data = readFile(directorystring + "/" + request);
- //Log.println("Data:\n"+data);
- int index = data.indexOf(">");
- if (index != -1)
- {
- String xml_head = data.substring(0, index);
- data = data.substring(index + 1);
- //Log.println("Data2:\n"+data);
-
- data =
- xml_head
- + "<soap:Envelope "
- + "xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\" "
- + "soap:encodingStyle=\"http://www.w3.org/2001/12/soap-encoding\"> "
- + "<soap:Body> "
- + data
- + "</soap:Body>"
- + "</soap:Envelope>";
- //Log.println("Data3:\n"+data);
-
- String ep = null;
- if (data.indexOf("<Create") != -1)
- ep = server + "moa-spss/services/SignatureCreation";
- else
- ep = server + "moa-spss/services/SignatureVerification";
-
- HttpURLConnection urlc = (HttpURLConnection) (new URL(ep)).openConnection();
- urlc.setDoInput(true);
- urlc.setDoOutput(true);
- urlc.setRequestProperty("SOAPAction", "");
- BufferedWriter ow = new BufferedWriter(new OutputStreamWriter(urlc.getOutputStream()));
- ow.write(data);
- ow.flush();
- int code = 0;
- try
- {
- code = urlc.getResponseCode();
- }
- catch (IOException ioe)
- {
- code = 500;
- }
-
- if (code == 500)
- {
- BufferedReader err_br = new BufferedReader(new InputStreamReader(urlc.getErrorStream()));
- StringBuffer err_response = new StringBuffer();
- String err_line = null;
- while ((err_line = err_br.readLine()) != null)
- {
- err_response.append(err_line);
- }
-
- Log.println("ErrResponse:\n" + err_response);
-
- if (error_no == 0)
- {
- Log.println("Test erfolgreich !");
- testvalues.add(" OK");
- testtimes.add(new Long(-1));
- testnames.add(number);
- testerrors.add(null);
- neg_ok++;
- }
- else
- {
- Log.println("Test nicht erfolgreich !");
- neg_nok++;
- testvalues.add("NOK");
- testtimes.add(new Long(-1));
- testnames.add(number);
- testerrors.add("Test nicht erfolgreich !");
- }
-
- }
- else
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(urlc.getInputStream()));
- StringBuffer response = new StringBuffer();
- String line = null;
- while ((line = br.readLine()) != null)
- {
- response.append(line);
- }
- String resp = response.toString();
- Log.println("Response:\n" + response);
-
- int pos = resp.indexOf("ErrorCode>");
- if (pos == -1)
- {
- Log.println("Test nicht erfolgreich !");
- neg_nok++;
- testvalues.add("NOK");
- testtimes.add(new Long(-1));
- testnames.add(number);
- testerrors.add("Test nicht erfolgreich !");
- }
- else
- {
- resp = resp.substring(pos + "ErrorCode>".length());
- pos = resp.indexOf("<");
- if (pos == -1)
- {
- Log.println("Test nicht erfolgreich !");
- neg_nok++;
- testvalues.add("NOK");
- testtimes.add(new Long(-1));
- testnames.add(number);
- testerrors.add("Test nicht erfolgreich !");
- }
- else
- {
- resp = resp.substring(0, pos);
-
- int err_resp = -1;
- try
- {
- err_resp = Integer.parseInt(resp);
- }
- catch (NumberFormatException nfe)
- {
- }
- //Log.println("ResponseCode:\n"+resp);
-
- Log.println("----- Fehlercode vom Server:" + err_resp);
- Log.println("----- Fehlercode vom Test:" + error_no);
-
- if (err_resp == error_no)
- {
- Log.println("Test erfolgreich !");
- neg_ok++;
- testvalues.add(" OK");
- testtimes.add(new Long(-1));
- testnames.add(number);
- testerrors.add(null);
- }
- else
- {
- Log.println("Test nicht erfolgreich !");
- neg_ok++;
- testvalues.add("NOK");
- testtimes.add(new Long(-1));
- testnames.add(number);
- testerrors.add("Fehlercodes nicht gleich: Server " + err_resp + " Client " + error_no);
- }
- }
- }
- }
- }
- }
- catch (Exception ee)
- {
- ee.printStackTrace();
- }
- }
-
- private boolean compareElements(Element root1, Element root2)
- {
- //Log.println("----- Compare Elements:"+root1.getNodeName()+" "+root2.getNodeName());
- filterTree(root1);
- filterTree(root2);
- return compareNodes(root1, root2, 0, "root/", false);
- }
-
- private boolean compareNodes(Node n1, Node n2, int level, String path, boolean attribute)
- {
- /*try {
- Log.println(DOMUtils.serializeNode(n1));
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }*/
- boolean equal = false;
- //Log.println("----- Compare Node "+level+":"+n1+" "+n2);
- //Log.println("----- Compare Node "+level+":"+n1.getNodeName()+" "+n2.getNodeName());
- //Log.println("----- Checking:"+path+getPathString(n1));
- NodeList nl1 = n1.getChildNodes();
- NodeList nl2 = n2.getChildNodes();
-
- int size1 = nl1.getLength();
- int size2 = nl2.getLength();
-
- if (debug)
- display_one(n1);
- if (debug)
- display_one(n2);
-
- if (debug)
- if (n1.getNodeName().equals("Base64Content") && n2.getNodeName().equals("Base64Content"))
- {
- try
- {
- Log.println(
- "CONT:"
- + new String(Base64Utils.decode(strip(n1.getChildNodes().item(0).getNodeValue()), false)));
- Log.println(
- "CONT:"
- + new String(Base64Utils.decode(strip(n2.getChildNodes().item(0).getNodeValue()), false)));
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- if (size1 != size2)
- {
- Log.println(
- "----- Anzahl der Kinder nicht gleich:"
- + path
- + getPathString(n1)
- + "("
- + size1
- + ") / "
- + getPathString(n2)
- + "("
- + size2
- + ")");
- return false;
- }
-
- equal = compareNodeExact(n1, n2, level, path + getPathString(n1) + "/");
- if (!equal)
- {
- Log.println("----- Knoten sind nicht identisch:" + path + getPathString(n1));
- return false;
- }
-
- if (n1.hasAttributes() || n2.hasAttributes())
- {
- equal = compareNodeAttriubtes(n1, n2, level + 1, path + getPathString(n1) + "/(a)");
- if (!equal)
- {
- Log.println("----- Attribute stimmen nicht überein:" + path + getPathString(n1));
- return false;
- }
- }
- if (size1 == 0)
- {
- return true;
- }
-
- for (int counter = 0; counter < size1; counter++)
- {
- boolean found = false;
- Node comp_n1 = nl1.item(counter);
-
- //if(comp_n1==null) return false;
-
- Node comp_n2 = null;
- size2 = nl2.getLength();
- for (int counter2 = 0; counter2 < size2; counter2++)
- {
- comp_n2 = nl2.item(counter2);
-
- /*equal = compareNodeExact(comp_n1,comp_n2,level+1);
- if(equal) return false;*/
- //Log.println("COMP_N1:"+comp_n1);
- //Log.println("COMP_N2:"+comp_n2);
- equal = compareNodes(comp_n1, comp_n2, level + 1, path + getPathString(comp_n1) + "/", false);
- if (equal)
- {
- n2.removeChild(comp_n2);
- counter2 = size2;
- nl2 = n2.getChildNodes();
- size2 = nl2.getLength();
- }
-
- }
-
- if (!equal)
- {
- Log.println("----- Keine Übereinstimmung gefunden:" + path + getPathString(comp_n1));
- return false;
- }
- }
- return true;
- }
-
- private boolean compareNodeExact(Node n1, Node n2, int level, String path)
- {
- if (n1.getNodeType() == Node.TEXT_NODE)
- {
- Text textnode = (Text) n1;
- /*Log.println("----- *****"+textnode.getNodeName());
- Log.println("----- *****"+textnode.getParentNode().getNodeName());
- Log.println("----- *****"+textnode.getNodeValue());*/
- }
-
- //Log.println("----- Checking:"+path);
- String n1_name = n1.getNodeName();
- String n2_name = n2.getNodeName();
- /*Log.println("----- !!!!!"+n1.getNodeName());
- Log.println("----- !!!!!"+n1.getNodeValue());
- Log.println("----- !!!!!"+n1.getLocalName());
- Log.println("----- !!!!!"+n1.getPrefix());
- Log.println("----- !!!!!"+n1.getNextSibling());
- Log.println("----- !!!!!"+n1.getPreviousSibling());*/
-
- //Log.println("----- Compare Node "+level+":"+n1_name+" "+n2_name);
- if (!((n1_name == null && n2_name == null)
- || (n1_name != null && n2_name != null && n1_name.equals(n2_name))))
- {
- Log.println("----- Name stimmt nicht überein:" + path);
- return false;
- }
-
- //Log.println("----- Compare Node "+level+":"+n1.getNodeType()+" "+n2.getNodeType());
- if (n1.getNodeType() != n2.getNodeType())
- {
- Log.println("----- Knotentyp stimmt nicht überein:" + path);
- return false;
- }
-
- String n1_ns = n1.getPrefix();
- String n2_ns = n2.getPrefix();
- //Log.println("----- Compare Node "+level+":"+n1_ns+" "+n2_ns);
- if (!((n1_ns == null && n2_ns == null) || (n1_ns != null && n2_ns != null && n1_ns.equals(n2_ns))))
- {
- Log.println("----- NameSpace stimmt nicht überein:" + path);
- return false;
- }
-
- String n1_value = n1.getNodeValue();
- String n2_value = n2.getNodeValue();
-
- boolean special = false;
- special = specialValues(n1_value, n2_value, path);
- if (special)
- return true;
-
- //Log.println("----- Compare Node "+level+":"+n1_value+" "+n2_value);
- if (!((n1_value == null && n2_value == null)
- || (n1_value != null && n2_value != null && n1_value.equals(n2_value))))
- {
- Log.println("----- Wert stimmt nicht überein:" + path);
- Log.println("----- Value1:\n" + n1_value);
- Log.println("----- Value2:\n" + n2_value);
- return false;
- }
-
- return true;
- }
-
- private boolean compareNodeAttriubtesWithoutSize(Node n1, Node n2, int level, String path)
- {
- return true;
- }
-
- private boolean compareNodeAttriubtes(Node n1, Node n2, int level, String path)
- {
- //Log.println("----- Compare NodeAttributes "+level+":"+n1.getNodeName()+" "+n2.getNodeName());
- Element n1elem = (Element) n1;
- Element n2elem = (Element) n2;
-
- NamedNodeMap nnm1 = n1.getAttributes();
- NamedNodeMap nnm2 = n2.getAttributes();
-
- int size1 = 0;
- int size2 = 0;
-
- boolean specialattrs = specialAttributesSize(path);
-
- if (!specialattrs)
- {
-
- if (nnm1 == null && nnm2 == null)
- return true;
- if (nnm1 == null || nnm2 == null)
- {
- Log.println("----- Anzahl der Attribute nicht gleich:" + path + ":" + getPathString(n1));
- return false;
- }
- size1 = nnm1.getLength();
- size2 = nnm2.getLength();
-
- if (size1 != size2)
- {
- Log.println("----- Anzahl der Attribute nicht gleich:" + path + ":" + getPathString(n1));
- return false;
- }
-
- }
- else
- {
- return compareNodeAttriubtesWithoutSize(n1, n2, level, path);
- }
-
- for (int counter = 0; counter < size1; counter++)
- {
- Node attribute_node1 = nnm1.item(counter);
- Node attribute_node2 = nnm2.item(counter);
-
- String attr1_name = attribute_node1.getNodeName();
- String attr2_name = attribute_node2.getNodeName();
-
- //Log.println("----- Checking:"+path+">"+attr1_name);
-
- String value1 = n1elem.getAttribute(attr1_name);
- String value2 = n2elem.getAttribute(attr2_name);
-
- boolean special = false;
-
- special = specialAttributes(value1, value2);
- if (special)
- {
- return special;
- }
-
- if (!value1.equals(value2))
- {
- Log.println("----- Keine Übereinstimmung gefunden:" + path + getPathString(n1));
- return false;
- }
- //Log.println("----- Compare NodeAttributes > "+level+":"+attribute_node1+" "+attribute_node2);
-
- /*boolean equal = compareNodes(attribute_node1,attribute_node2,level+1,path+attribute_node1.getNodeName()+"/",true);
- if(!equal)
- {
- //Log.println("----- no match for:"+attribute_node1.getNodeName());
- return false;
- }*/
-
- }
-
- return true;
- }
-
- private boolean checkNode(Node base, String name)
- {
- if (base.getNodeName().equals(name))
- {
- return true;
- }
-
- NodeList children = base.getChildNodes();
- int size = children.getLength();
- for (int counter = 0; counter < size; counter++)
- {
- boolean found = checkNode(children.item(counter), name);
- if (found)
- return true;
- }
- return false;
- }
-
- private void display_one(Node base)
- {
- int att_size = 0;
- if (base.getAttributes() != null)
- {
- att_size = base.getAttributes().getLength();
- }
- if (base.getNodeName().equals("#text"))
- Log.println(
- base.getNodeName()
- + base.getChildNodes().getLength()
- + ":"
- + att_size
- + " ("
- + base.getNodeValue()
- + ")");
- else
- Log.println(base.getNodeName() + base.getChildNodes().getLength() + ":" + att_size);
- }
-
- private void display(Node base)
- {
- display(base, 1);
- }
-
- private void display(Node base, int level)
- {
- String spacer = "";
- for (int counter = 0; counter < level; counter++)
- {
- spacer += " ";
- }
-
- int att_size = 0;
- if (base.getAttributes() != null)
- {
- att_size = base.getAttributes().getLength();
- }
- if (base.getNodeName().equals("#text"))
- Log.println(
- spacer
- + base.getNodeName()
- + base.getChildNodes().getLength()
- + ":"
- + att_size
- + " ("
- + base.getNodeValue()
- + ")");
- else
- Log.println(spacer + base.getNodeName() + base.getChildNodes().getLength() + ":" + att_size);
-
- NodeList children = base.getChildNodes();
- int size = children.getLength();
- for (int counter = 0; counter < size; counter++)
- {
- display(children.item(counter), level + 1);
- }
- }
-
- private void filterTree(Node base)
- {
- ArrayList removeList = new ArrayList();
-
- NodeList children = base.getChildNodes();
- int size = children.getLength();
- for (int counter = 0; counter < size; counter++)
- {
- Node child1 = children.item(counter);
- if (child1.getNodeType() == Node.TEXT_NODE && child1.getNodeValue().trim().equals(""))
- {
- removeList.add(child1);
- }
- }
-
- size = removeList.size();
- for (int counter = 0; counter < size; counter++)
- {
- base.removeChild((Node) removeList.get(counter));
- }
-
- children = base.getChildNodes();
- size = children.getLength();
- for (int counter = 0; counter < size; counter++)
- {
- filterTree(children.item(counter));
- }
-
- }
-
- private String readFile(String filename) throws Exception
- {
- RandomAccessFile raf = new RandomAccessFile(filename, "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("file too big to fit in byte array.");
-
- byte[] result = new byte[(int) raf.length()];
-
- raf.read(result);
-
- return new String(result);
-
- }
-
- private String getPathString(Node n)
- {
- if (n.getNodeType() == Node.TEXT_NODE)
- {
- return n.getParentNode().getNodeName() + "(text)";
- }
- else
- {
- return n.getNodeName();
- }
-
- }
-
- private String replaceString(String input, String oldPart, String newPart) throws Exception
- {
- String erg = null;
-
- //First Part
- erg = input.substring(0, input.indexOf(oldPart));
- //Insert new Part
- erg += newPart;
-
- //insert REST
- erg += input.substring(input.indexOf(oldPart) + oldPart.length(), input.length());
-
- return erg;
- }
-
- private String replaceStringWithCheck(String input, String oldPart, String newPart) throws Exception
- {
- String erg = null;
-
- if (input.indexOf(oldPart) == -1)
- return input;
-
- return replaceString(input, oldPart, newPart);
- }
-
- private void printKeyStoreInformation(String keystore, String pw) throws Exception
- {
- KeyStore ks = KeyStore.getInstance("JKS", "SUN");
- ks.load(new FileInputStream(keystore), pw.toCharArray());
- Enumeration enum = ks.aliases();
- while (enum.hasMoreElements())
- {
- String certname = (String) enum.nextElement();
- Log.println("Cert:" + certname);
- sun.security.x509.X509CertImpl c = (sun.security.x509.X509CertImpl) ks.getCertificate(certname);
- Principal p = c.getIssuerDN();
- Log.println(" Issuer:" + p.getName());
- p = c.getSubjectDN();
- Log.println(" Subject:" + p.getName());
- Log.println(" Serial:" + c.getSerialNumber());
- }
- }
-
- private void printGraph(
- ArrayList names,
- ArrayList times,
- ArrayList values,
- ArrayList errors,
- String suitename)
- {
- long max = getMax(times, names);
- //Log.println("MAX:"+max);
- if (max == -1)
- {
- Log.println("Kein Graph möglich !");
- return;
- }
- Log.println("names:" + names.size());
- Log.println("times:" + times.size());
- Log.println("values:" + values.size());
- Log.println("errors:" + errors.size());
- Log.println("# | Status | Suite:" + suitename);
- int size = times.size();
- for (int counter = 0; counter < size; counter++)
- {
- String output = "";
- long value = ((Long) times.get(counter)).longValue();
- if (value != -1)
- {
- output = names.get(counter) + " | " + values.get(counter) + " | " + getElement(value, max);
-
- }
- else
- {
- output = names.get(counter) + " | " + values.get(counter) + " | " + ELEMS_ICON_BAD;
- }
-
- if (errors.get(counter) != null)
- {
- output += buildSpacer(70 - output.length()) + errors.get(counter);
- }
- Log.println(output);
- }
-
- }
-
- private String getElement(long value, long max)
- {
- boolean plus = false;
- int elems = (int) (((((double) value) / ((double) max)) * (ELEMS_MAX / 2)));
- if (elems > ELEMS_MAX)
- {
- elems = ELEMS_MAX;
- plus = true;
- }
- StringBuffer sb = new StringBuffer();
- for (int counter = 0; counter < elems; counter++)
- {
- sb.append(ELEMS_ICON);
- }
- for (int counter = 0; counter < (ELEMS_MAX - elems); counter++)
- {
- sb.append(" ");
- }
- if (plus)
- sb.append("> ");
- else
- sb.append(" ");
-
- sb.append(value + " ms");
-
- return sb.toString();
- }
-
- private long getMax(ArrayList times, ArrayList names)
- {
- int count = 0;
- double sum = 0;
- int size = times.size();
- for (int counter = 0; counter < size; counter++)
- {
- //Log.println(times.get(counter)+":"+names.get(counter));
- long value = ((Long) times.get(counter)).longValue();
- if (value != -1)
- {
- sum += value;
- count++;
- }
- }
-
- if (count == 0)
- return -1;
-
- return ((long) (sum / count));
- }
-
- private boolean specialAttributes(String value1, String value2)
- {
- //if(value1.startsWith("reference-") && value2.startsWith("reference-")) return true;
- if (value1.startsWith("signature-") && value2.startsWith("signature-"))
- return true;
-
- return false;
- }
-
- private boolean specialAttributesSize(String path)
- {
- if (path.endsWith("/xsl:template/(a)"))
- return true;
- return false;
- }
-
- private boolean specialValues(String value1, String value2, String path)
- {
-
- //Log.println(path);
- if (ignoreSignatureValue)
- {
- if (path.endsWith("/dsig:SignatureValue(text)/"))
- {
- return true;
- }
- }
- else
- {
- if (path.endsWith("/dsig:SignatureValue(text)/"))
- {
- String stripped_1 = strip(value1);
- String stripped_2 = strip(value2);
- return stripped_1.equals(stripped_2);
- }
- }
-
- if (path.endsWith("/dsig:X509Certificate(text)/"))
- {
- String stripped_1 = strip(value1);
- String stripped_2 = strip(value2);
- return stripped_1.equals(stripped_2);
- }
-
- if (path.endsWith("/dsig:Object(text)/"))
- {
- String stripped_1 = strip(value1);
- String stripped_2 = strip(value2);
- return stripped_1.equals(stripped_2);
- }
-
- if (path.endsWith("/Base64Content(text)/"))
- {
- String stripped_1 = strip(value1);
- String stripped_2 = strip(value2);
- return stripped_1.equals(stripped_2);
- }
-
- if (path.endsWith("/FailedReference(text)/"))
- {
- try
- {
- int stripped_1 = Integer.parseInt(value1);
- int stripped_2 = Integer.parseInt(value2);
- return stripped_1 == stripped_2;
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
- return false;
- }
-
- private String strip(String input)
- {
- String output = replaceStringAll(input, " ", "");
- output = replaceStringAll(output, "\n", "");
- output = replaceStringAll(output, "\r", "");
- return output;
- }
-
- public static String replaceStringAll(String input, String oldPart, String newPart)
- {
-
- String erg = null;
-
- int pos = input.indexOf(oldPart);
- if (pos == -1)
- return input;
-
- while (true)
- {
-
- //First Part
- pos = input.indexOf(oldPart);
- if (pos == -1)
- break;
- erg = input.substring(0, pos);
-
- //Insert new Part
- erg += newPart;
-
- //insert REST
- erg += input.substring(input.indexOf(oldPart) + oldPart.length(), input.length());
-
- input = erg;
- }
- return erg;
- }
-
- private int getErrorNumber(Element root)
- {
- ArrayList result = new ArrayList();
- findNode(root, "ErrorCode", result);
- if (result.size() != 1)
- return -1;
- Node n = (Node) result.get(0);
- String text = (String) n.getChildNodes().item(0).getNodeValue();
- try
- {
- int error = Integer.parseInt(text);
- return error;
- }
- catch (NumberFormatException nfe)
- {
- Log.println(text + " ist keine gültige Fehlernummer");
- return -1;
- }
- }
-
- private void findNode(Node base, String name, ArrayList foundNodes)
- {
- findNode(base, name, foundNodes, -1);
- }
-
- private void findNode(Node base, String name, ArrayList foundNodes, int max_level)
- {
- findNode(base, name, foundNodes, max_level, 0);
- }
-
- private void findNode(Node base, String name, ArrayList foundNodes, int max_level, int level)
- {
- if (max_level != -1 && max_level <= level)
- return;
- //System.out.println("FINDNODE "+name);
- //System.out.println("CHECKING "+base.getNodeName());
- if (base.getNodeName().endsWith(name))
- {
- //System.out.println("ADD BASE !"+name);
- foundNodes.add(base);
- }
-
- NodeList children = base.getChildNodes();
- int size = children.getLength();
- for (int counter = 0; counter < size; counter++)
- {
- findNode(children.item(counter), name, foundNodes, max_level, level + 1);
- }
- }
-
- private String findErrorNode(Node n)
- {
- ArrayList al = new ArrayList();
- findNode(n, "ErrorResponse", al);
- if (al.size() != 0)
- {
- al.clear();
- findNode(n, "ErrorCode", al);
- String code = ((Node) al.get(0)).getChildNodes().item(0).getNodeValue();
- al.clear();
- findNode(n, "Info", al);
- String msg = ((Node) al.get(0)).getChildNodes().item(0).getNodeValue();
-
- return "ErrorCode: " + code + " / ErrorMsg: " + msg;
- }
- else
- return null;
- }
-
- private String buildSpacer(int length)
- {
- if (length <= 0)
- return "";
- else
- {
- StringBuffer output = new StringBuffer();
- for (int counter = 0; counter < length; counter++)
- {
- output.append(" ");
- }
- return output.toString();
- }
- }
-
-} \ No newline at end of file
diff --git a/spss.test/src/testgenerator/CMSKeyStore.java b/spss.test/src/testgenerator/CMSKeyStore.java
deleted file mode 100644
index a85da893b..000000000
--- a/spss.test/src/testgenerator/CMSKeyStore.java
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (C) 1997-2002 IAIK
-// email: jce-info@iaik.tu-graz.ac.at
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE.
-//
-// $Header$
-//
-// $Header$
-//
-
-package testgenerator;
-
-import iaik.utils.Util;
-import iaik.x509.X509Certificate;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-
-public class CMSKeyStore implements CMSKeyStoreConstants {
-
- static Object[][] certificates = new Object[3][7];
- static PrivateKey[][] keys = new PrivateKey[3][7];
- static X509Certificate[] ca_certificates = new X509Certificate[2];
- static PrivateKey[] ca_keys = new PrivateKey[2];
-
- public final static int RSA = 0;
- public final static int DSA = 1;
- public final static int ESDH = 2;
-
- public final static int SZ_512_SIGN = 0;
- public final static int SZ_1024_SIGN = 1;
- public final static int SZ_2048_SIGN = 2;
- public final static int SZ_512_CRYPT = 3;
- public final static int SZ_1024_CRYPT = 4;
- public final static int SZ_1024_CRYPT_ = 5;
- public final static int SZ_2048_CRYPT = 6;
-
- static KeyStore key_store;
-
- static {
- System.out.println("initializing KeyStore...");
- loadKeyStore();
- initKeyStore();
- }
-
- private static void loadKeyStore() {
- // try to locate the KeyStore
- // first check the current working directory
- System.out.println("User.dir:"+System.getProperty("user.dir"));
- File ks = new File(System.getProperty("user.dir"), KS_FILENAME);
- if (!ks.exists()) {
- System.out.println("Can not find the KeyStore in directory:");
- System.out.println(ks.getAbsolutePath());
- System.exit(1);
- }
-
- // now try to create and load the KeyStore
- try {
- key_store = KeyStore.getInstance("IAIKKeyStore");
- key_store.load(new FileInputStream(ks), KS_PASSWORD);
- } catch (Exception ex) {
- System.out.println("Unable to load KeyStore!");
- ex.printStackTrace();
- System.exit(1);
- }
- }
-
- private static void initKeyStore() {
-
- try {
- ca_certificates[RSA] = Util.convertCertificateChain(key_store.getCertificateChain(CA_RSA))[0];
- ca_keys[RSA] = (PrivateKey)key_store.getKey(CA_RSA, KS_PASSWORD);
-
- // RSA for signing
- certificates[RSA][SZ_512_SIGN] = Util.convertCertificateChain(key_store.getCertificateChain(RSA_512_SIGN));
- keys[RSA][SZ_512_SIGN] = (PrivateKey)key_store.getKey(RSA_512_SIGN, KS_PASSWORD);
- certificates[RSA][SZ_1024_SIGN] = Util.convertCertificateChain(key_store.getCertificateChain(RSA_1024_SIGN));
- keys[RSA][SZ_1024_SIGN] = (PrivateKey)key_store.getKey(RSA_1024_SIGN, KS_PASSWORD);
- certificates[RSA][SZ_2048_SIGN] = Util.convertCertificateChain(key_store.getCertificateChain(RSA_2048_SIGN));
- keys[RSA][SZ_2048_SIGN] = (PrivateKey)key_store.getKey(RSA_2048_SIGN, KS_PASSWORD);
- // RSA for encrypting
- certificates[RSA][SZ_512_CRYPT] = Util.convertCertificateChain(key_store.getCertificateChain(RSA_512_CRYPT));
- keys[RSA][SZ_512_CRYPT] = (PrivateKey)key_store.getKey(RSA_512_CRYPT, KS_PASSWORD);
- certificates[RSA][SZ_1024_CRYPT] = Util.convertCertificateChain(key_store.getCertificateChain(RSA_1024_CRYPT));
- keys[RSA][SZ_1024_CRYPT] = (PrivateKey)key_store.getKey(RSA_1024_CRYPT, KS_PASSWORD);
- certificates[RSA][SZ_1024_CRYPT_] = Util.convertCertificateChain(key_store.getCertificateChain(RSA_1024_CRYPT_));
- keys[RSA][SZ_1024_CRYPT_] = (PrivateKey)key_store.getKey(RSA_1024_CRYPT_, KS_PASSWORD);
- certificates[RSA][SZ_2048_CRYPT] = Util.convertCertificateChain(key_store.getCertificateChain(RSA_2048_CRYPT));
- keys[RSA][SZ_2048_CRYPT] = (PrivateKey)key_store.getKey(RSA_2048_CRYPT, KS_PASSWORD);
- } catch (Exception ex) {
- System.out.println("Unable to get RSA certificates from KeyStore.");
- ex.printStackTrace();
- }
-
- try {
- ca_certificates[DSA] = Util.convertCertificateChain(key_store.getCertificateChain(CA_DSA))[0];
- ca_keys[DSA] = (PrivateKey)key_store.getKey(CA_DSA, KS_PASSWORD);
-
- certificates[DSA][SZ_512_SIGN] = Util.convertCertificateChain(key_store.getCertificateChain(DSA_512));
- keys[DSA][SZ_512_SIGN] = (PrivateKey)key_store.getKey(DSA_512, KS_PASSWORD);
- certificates[DSA][SZ_1024_SIGN] = Util.convertCertificateChain(key_store.getCertificateChain(DSA_1024));
- keys[DSA][SZ_1024_SIGN] = (PrivateKey)key_store.getKey(DSA_1024, KS_PASSWORD);
-
- } catch (Exception ex) {
- System.out.println("Unable to get DSA certificate from KeyStore.");
- ex.printStackTrace();
- }
-
- /*try {
- certificates[ESDH][SZ_512_CRYPT] = Util.convertCertificateChain(key_store.getCertificateChain(ESDH_512));
- keys[ESDH][SZ_512_CRYPT] = (PrivateKey)key_store.getKey(ESDH_512, KS_PASSWORD);
- certificates[ESDH][SZ_1024_CRYPT] = Util.convertCertificateChain(key_store.getCertificateChain(ESDH_1024));
- keys[ESDH][SZ_1024_CRYPT] = (PrivateKey)key_store.getKey(ESDH_1024, KS_PASSWORD);
- certificates[ESDH][SZ_1024_CRYPT_] = Util.convertCertificateChain(key_store.getCertificateChain(ESDH_1024_));
- keys[ESDH][SZ_1024_CRYPT_] = (PrivateKey)key_store.getKey(ESDH_1024_, KS_PASSWORD);
- certificates[ESDH][SZ_2048_CRYPT] = Util.convertCertificateChain(key_store.getCertificateChain(ESDH_2048));
- keys[ESDH][SZ_2048_CRYPT] = (PrivateKey)key_store.getKey(ESDH_2048, KS_PASSWORD);
- } catch (Exception ex) {
- System.out.println("Unable to get Diffie-Hellman certificate from KeyStore.");
- ex.printStackTrace();
- }*/
- }
-
- /**
- * Returns the private key of a CA certificate.
- *
- * @param type {@link #RSA RSA} or {@link #DSA DSA} or {@link #ESDH ESDH}
- */
- public static PrivateKey getPrivateKey(int type, int size) {
- try {
- return keys[type][size];
- } catch (ArrayIndexOutOfBoundsException ex) {
- throw new RuntimeException("Wrong type or size!");
- }
- }
-
- /**
- * Returns a demo user certificate.
- *
- * @param type {@link #RSA RSA} or {@link #DSA DSA} or {@link #ESDH ESDH}
- */
- public static X509Certificate[] getCertificateChain(int type, int size) {
- try {
- return (X509Certificate[])certificates[type][size];
- } catch (ArrayIndexOutOfBoundsException ex) {
- throw new RuntimeException("Wrong type or size!");
- }
- }
-
- /**
- * Returns the private key of a CA certificate.
- *
- * @param type {@link #RSA RSA} or {@link #DSA DSA}
- */
- public static PrivateKey getCaPrivateKey(int type) {
- try {
- return ca_keys[type];
- } catch (ArrayIndexOutOfBoundsException ex) {
- throw new RuntimeException("Wrong type or size!");
- }
- }
-
- /**
- * Returns a demo CA certificate.
- *
- * @param type {@link #RSA RSA} or {@link #DSA DSA}
- */
- public static X509Certificate getCaCertificate(int type) {
- try {
- return ca_certificates[type];
- } catch (ArrayIndexOutOfBoundsException ex) {
- throw new RuntimeException("Wrong type or size!");
- }
- }
-}
diff --git a/spss.test/src/testgenerator/CMSKeyStoreConstants.java b/spss.test/src/testgenerator/CMSKeyStoreConstants.java
deleted file mode 100644
index 6e4892d64..000000000
--- a/spss.test/src/testgenerator/CMSKeyStoreConstants.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 1997-2002 IAIK
-// email: jce-info@iaik.tu-graz.ac.at
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE.
-//
-// $Header$
-//
-
-package testgenerator;
-
-public interface CMSKeyStoreConstants {
- public final static String CA_RSA = "CA.RSA";
- public final static String CA_DSA = "CA.DSA";
- public final static String RSA_512_SIGN = "RSA_SIGN.512";
- public final static String RSA_512_CRYPT = "RSA_CRYPT.512";
- public final static String RSA_1024_SIGN = "RSA_SIGN.1024";
- public final static String RSA_1024_CRYPT = "RSA_CRYPT.1024";
- public final static String RSA_1024_CRYPT_ = "RSA_CRYPT_.1024";
- public final static String RSA_2048_SIGN = "RSA_SIGN.2048";
- public final static String RSA_2048_CRYPT = "RSA_CRYPT.2048";
- public final static String DSA_512 = "DSA.512";
- public final static String DSA_1024 = "DSA.1024";
- public final static String ESDH_512 = "ESDH.512";
- public final static String ESDH_1024 = "ESDH.1024";
- public final static String ESDH_1024_ = "ESDH_.1024";
- public final static String ESDH_2048 = "ESDH.2048";
- public final static String KS_FILENAME = "resources/cms.keystore";
- public final static char[] KS_PASSWORD = "topSecret".toCharArray();
-}
- \ No newline at end of file
diff --git a/spss.test/src/testgenerator/CreatePKCSSignature.java b/spss.test/src/testgenerator/CreatePKCSSignature.java
deleted file mode 100644
index 896daf6d1..000000000
--- a/spss.test/src/testgenerator/CreatePKCSSignature.java
+++ /dev/null
@@ -1,874 +0,0 @@
-package testgenerator;
-
-import iaik.ixsil.algorithms.CanonicalizationAlgorithm;
-import iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXML;
-import iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXMLWithComments;
-import iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXML;
-import iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXMLWithComments;
-import iaik.ixsil.algorithms.DigestAlgorithmImplSHA1;
-import iaik.ixsil.algorithms.SignatureAlgorithmImplECDSA;
-import iaik.ixsil.algorithms.SignatureAlgorithmImplRSA;
-import iaik.ixsil.algorithms.Transform;
-import iaik.ixsil.core.Position;
-import iaik.ixsil.core.Signer;
-import iaik.ixsil.core.SignerManifest;
-import iaik.ixsil.core.SignerReference;
-import iaik.ixsil.core.SignerSignature;
-import iaik.ixsil.core.SignerSignedInfo;
-import iaik.ixsil.core.URIResolverParameters;
-import iaik.ixsil.init.IXSILConstants;
-import iaik.ixsil.keyinfo.KeyManagerImpl;
-import iaik.ixsil.keyinfo.retrieval.KeyProviderImplRetrievalMethod;
-import iaik.ixsil.keyinfo.retrieval.RetrievalMethod;
-import iaik.ixsil.keyinfo.x509.KeyProviderImplX509Data;
-import iaik.ixsil.keyinfo.x509.X509Data;
-import iaik.ixsil.util.URI;
-import iaik.pkcs.pkcs12.PKCS12;
-import iaik.security.ecc.interfaces.ECDSAPrivateKey;
-import iaik.utils.Base64OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xml.serialize.DOMWriterImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-
-/**
- * @author Stevie (Admin)
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class CreatePKCSSignature extends TestCases{
-
- private static final int canAlgCanXML = 1;
- private static final int canAlgCanXMLwithCom = 2;
- private static final int canAlgExcXML = 3;
- private static final int canAlgExcXMLwithCom = 4;
-
- private Document doc;
- public Signer signer;
- private SignerSignature signature;
- private SignerSignedInfo signedInfo;
- private PKCS12 pkcs12;
- private String x509CertString;
- public CreatePKCSSignature() throws Exception {
- iaik.security.provider.IAIK.addAsProvider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
- }
-
- // Schritt 1
-
- public void init() throws Exception{
- pkcs12 = decryptPKCS12(
- configuration_.getProperty("PKCS12file"),
- configuration_.getProperty("PKCS12password"));
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- signature = signer.getSignature();
- signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg =
- new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey(pkcs12);
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- }
- public void init(String iD) throws Exception{
- pkcs12 = decryptPKCS12(
- configuration_.getProperty("PKCS12file"),
- configuration_.getProperty("PKCS12password"));
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- signature = signer.getSignature();
- signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg =
- new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey(pkcs12);
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
- signature.setId(iD);
- }
-
- public void init(Document doc, Position position) throws Exception{
- pkcs12 = decryptPKCS12(
- configuration_.getProperty("PKCS12file"),
- configuration_.getProperty("PKCS12password"));
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- signer = new Signer(doc, baseURI, position);
-
- // Configure signed information
-
- // Get interface for signed information
- signature = signer.getSignature();
- signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg =
- new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey(pkcs12);
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- }
-
- public void init(Document doc, Position position,String iD) throws Exception{
- pkcs12 = decryptPKCS12(
- configuration_.getProperty("PKCS12file"),
- configuration_.getProperty("PKCS12password"));
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- signer = new Signer(doc, baseURI, position);
-
- // Configure signed information
-
- // Get interface for signed information
- signature = signer.getSignature();
- signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg =
- new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey(pkcs12);
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
- signature.setId(iD);
-
- }
-
-
- public void initECDSA() throws Exception{
- pkcs12 = decryptPKCS12(
- configuration_.getProperty("ECDSPKCS12file"),
- configuration_.getProperty("ECDSPKCS12password"));
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- signature = signer.getSignature();
- signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set signature algorithm
- SignatureAlgorithmImplECDSA signatureAlg = new SignatureAlgorithmImplECDSA();
-
- ECDSAPrivateKey privateKey = (ECDSAPrivateKey)pkcs12.getKeyBag().getPrivateKey();
-
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- SignerSignature signature = signer.getSignature();
- SignerSignedInfo signedInfo = signature.getSignerSignedInfo();
-
- }
-
- // Schritt 2
-
- public void setCanoncialization(int CanonicalizationMethodNumber) throws Exception
- {
- // Set canonicalization algorithm
- CanonicalizationAlgorithm calg = null;
-
- switch (CanonicalizationMethodNumber)
- {
- case canAlgCanXML :
- calg = new CanonicalizationAlgorithmImplCanonicalXML(); break;
- case canAlgCanXMLwithCom :
- calg = new CanonicalizationAlgorithmImplCanonicalXMLWithComments(); break;
- case canAlgExcXML :
- calg = new CanonicalizationAlgorithmImplExclusiveCanonicalXML(); break;
- case canAlgExcXMLwithCom :
- calg = new CanonicalizationAlgorithmImplExclusiveCanonicalXMLWithComments(); break;
- }
-
- signedInfo.setCanonicalizationAlgorithm(calg);
-
- }
- /**
- * Method createReference.
- * @param booelan env: if set, the data-string will be enveloped, else an uri pointing to data will be created
- * @param data
- * @throws Exception
- */
- // Schritt 3.1
-
- public void createEnvelopedDataObject(String iD, String data) throws Exception
- {
- iaik.ixsil.core.Object object = null;
- object = signature.createObject(data);
- object.setId(iD);
- signature.addObject(object);
- }
-
- public void createEnvelopedDataObject(String iD, Element doc) throws Exception
- {
- iaik.ixsil.core.Object object = null;
- object = signature.createObject(doc);
- object.setId(iD);
- signature.addObject(object);
- }
-
- public void createReference(URI uri, URI type) throws Exception
- {
- SignerReference reference = signedInfo.createReference();
-
- reference.setURI(uri);
- reference.setType(type);
- DigestAlgorithmImplSHA1 digestAlg =
- new DigestAlgorithmImplSHA1();
-
- reference.setDigestAlgorithm(digestAlg);
- signedInfo.addReference(reference);
-
- }
-
- public void createReference(boolean env, String data, String iD) throws Exception
- {
- SignerReference reference = signedInfo.createReference();
-
- if (env) {
- iaik.ixsil.core.Object object = null;
- object = signature.createObject(data);
- object.setId("envelopedData");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg =
- new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(
- new URI("#xpointer(id('envelopedData')/node())"));
- } else {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data);
-
- reference.setURI(refURI);
- if (iD!=null)
- reference.setId(iD);
- DigestAlgorithmImplSHA1 digestAlg =
- new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
-
- signedInfo.addReference(reference);
-
- }
- public void createReference(boolean env, String data) throws Exception
- {
- createReference(env,data,null);
- }
-
- public void createETSIObjects(String data) throws Exception
- {
- SignerReference reference = signedInfo.createReference();
-
- URI refURI = null;
- refURI = new URI(data);
-
- reference.setURI(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-signed-1-1')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"));
- reference.setType(new URI("http://uri.etsi.org/01903/v1.1.1#SignedProperties"));
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- signedInfo.addReference(reference);
-
- iaik.ixsil.core.Object object = null;
- object = signature.createObject(getElement("TEST"));
- object.setId("etsi-signed-1-1");
- signature.addObject(object);
- }
-
- public Element getElement(String data) throws Exception
- {
- String etsinamespace = "http://uri.etsi.org/01903/v1.1.1#";
-
- getX509Content();
-
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- //dbf.setNamespaceAware(true);
- //dbf.setValidating(true);
-
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-
-
- Element qualprop = doc.createElementNS(etsinamespace,"etsi:QualifyingProperties");
- qualprop.setAttributeNS(null,"Target","#signature-1-1");
- qualprop.setAttributeNS(IXSILConstants.NAMESPACE_URI_NAMESPACES_,"xmlns:etsi",etsinamespace);
- //qualprop.setPrefix("etsi");*/
- //qualprop.setAttributeNodeNS(doc.createAttributeNS(etsinamespace,"etsi"));
- Element signprop = doc.createElementNS(etsinamespace,"etsi:SignedProperties");
- Element signsigprop = doc.createElementNS(etsinamespace,"etsi:SignedSignatureProperties");
- Element signdataobjectprop = doc.createElementNS(etsinamespace,"etsi:SignedDataObjectProperties");
- Element signdate = doc.createElementNS(etsinamespace,"etsi:SigningTime");
- Text datevalue = doc.createTextNode("2003-05-10T00:01:01");
- Element signcert = doc.createElementNS(etsinamespace,"etsi:SigningCertificate");
- Element cert = doc.createElementNS(etsinamespace,"etsi:Cert");
- Element signpolyident = doc.createElementNS(etsinamespace,"etsi:SignaturePolicyIdentifier");
- Element signpolyimp = doc.createElementNS(etsinamespace,"etsi:SignaturePolicyImplied");
- Element certdig = doc.createElementNS(etsinamespace,"etsi:CertDigest");
- Element digmeth = doc.createElementNS(etsinamespace,"etsi:DigestMethod");
- digmeth.setAttribute("Algorithm","http://www.w3.org/2000/09/xmldsig#sha1");
- Element digvalue = doc.createElementNS(etsinamespace,"etsi:DigestValue");
-
- ByteArrayOutputStream fos = new ByteArrayOutputStream();
- Base64OutputStream base64os = new Base64OutputStream(fos);
- base64os.write(this.X509hash.getBytes());
- base64os.flush();
-
- Text dig_value = doc.createTextNode(fos.toString());
- Element is = doc.createElementNS(etsinamespace,"etsi:IssuerSerial");
- Element i = doc.createElement("dsig:X509IssuerName");
- Text i_value = doc.createTextNode(this.X509name);
- Element s = doc.createElement("dsig:X509SerialNumber");
- Text s_value = doc.createTextNode(this.X509number.toString());
- Element dataobjformat = doc.createElementNS(etsinamespace,"etsi:DataObjectFormat");
- dataobjformat.setAttribute("ObjectReference","#reference-1-1");
- Element mimetype = doc.createElementNS(etsinamespace,"etsi:MimeType");
- //mimetype.setNodeValue("text/plain");
- Text mimevalue = doc.createTextNode("text/html");
-
- qualprop.appendChild(signprop);
- signprop.appendChild(signsigprop);
- signsigprop.appendChild(signdate);
- signdate.appendChild(datevalue);
- signsigprop.appendChild(signcert);
- signcert.appendChild(cert);
- cert.appendChild(certdig);
- certdig.appendChild(digmeth);
- certdig.appendChild(digvalue);
- digvalue.appendChild(dig_value);
- cert.appendChild(is);
- is.appendChild(i);
- i.appendChild(i_value);
- is.appendChild(s);
- s.appendChild(s_value);
- signsigprop.appendChild(signpolyident);
- signpolyident.appendChild(signpolyimp);
- signprop.appendChild(signdataobjectprop);
- signdataobjectprop.appendChild(dataobjformat);
- dataobjformat.appendChild(mimetype);
- mimetype.appendChild(mimevalue);
-
-
-
- return qualprop;
- }
-
-
-
- public void createReferenceEnvElement(Element data) throws Exception
- {
- SignerReference reference = signedInfo.createReference();
-
- iaik.ixsil.core.Object object = null;
- object = signature.createObject(data);
- object.setId("envelopedData");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg =
- new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(
- new URI("#xpointer(Data/node())"));
-
-
- signedInfo.addReference(reference);
-
- }
- public void createReferenceWithTransforms(URI uriToData, Transform[] transforms) throws Exception
- {
- createReferenceWithTransforms(uriToData, transforms,null);
- }
-
- public void createReferenceWithTransforms(URI uriToData, Transform[] transforms, String iD) throws Exception
- {
- SignerReference reference = signedInfo.createReference();
-
- // Create and configure reference
- URI refURI = null;
- //String baseDir = configuration_.getProperty("baseDir");
- refURI = uriToData;
-
- reference.setURI(refURI);
- if (iD!=null)
- reference.setId(iD);
-
- DigestAlgorithmImplSHA1 digestAlg =
- new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- for (int trNr=0; trNr < transforms.length; trNr++)
- {
- reference.insertTransformAt(transforms[trNr],trNr);
- //transforms[trNr].transform();
- }
-
- signedInfo.addReference(reference);
-
-
- }
- public Element createReferenceWithManifest(
- URI uriToData1, String iD1) throws Exception
- {
- return createReferencesWithManifest(uriToData1,iD1,null);
- }
-
- public Element createReferenceWithManifest(
- URI uriToData1, String iD1, String type) throws Exception
- {
- /*
- public void createReferenceWithManifest(
- URI uriToData1, String iD1,
- URI uriToData2, String iD2
- ) throws Exception
- */
- SignerReference reference = signedInfo.createReference();
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- manifestRef.setDigestAlgorithm(digestAlg);
-
- manifestRef.setURI(uriToData1);
- manifest.addReference(manifestRef);
-
- manifest.setId(iD1);
- iaik.ixsil.core.Object manifestObject =
- signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = signedInfo.createReference();
- reference.setURI(new URI("#xpointer(id('"+iD1+"'))"));
- if (type==null)
- reference.setType(
- new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- else
- reference.setType(new URI(type));
-
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);
- return manifest.toElement();
- }
-
- public Element createReferencesWithManifest(
- URI uriToData1, String iD1,
- URI uriToData2
- ) throws Exception
- {
- /*
- public void createReferenceWithManifest(
- URI uriToData1, String iD1,
- URI uriToData2, String iD2
- ) throws Exception
- */
- SignerReference reference = signedInfo.createReference();
-
- SignerManifest manifest = signer.createManifest();
-
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
-
- SignerReference manifestRef = manifest.createReference();
- manifestRef.setDigestAlgorithm(digestAlg);
- manifestRef.setURI(uriToData1);
- manifest.addReference(manifestRef);
-
- if (uriToData2!=null)
- {
- SignerReference manifestRef2 = manifest.createReference();
- manifestRef2.setDigestAlgorithm(digestAlg);
- manifestRef2.setURI(uriToData2);
- manifest.addReference(manifestRef2);
- }
- manifest.setId(iD1);
- iaik.ixsil.core.Object manifestObject =
- signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = signedInfo.createReference();
- reference.setURI(new URI("#xpointer(id('"+iD1+"'))"));
- reference.setType(
- new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);
- /*
- if (iD2!=null)
- {
- SignerReference reference2 = signedInfo.createReference();
- SignerManifest manifest2 = signer.createManifest();
- SignerReference manifestRef2 = manifest.createReference();
-
-
- manifestRef2.setDigestAlgorithm(digestAlg);
-
- manifestRef2.setURI(uriToData2);
-
- manifest2.addReference(manifestRef2);
- manifest2.setId(iD2);
- iaik.ixsil.core.Object manifestObject2 =
- signature.createObject(manifest2);
- signature.addObject(manifestObject2);
- manifest2.computeDigestValues();
-
- reference2 = signedInfo.createReference();
- reference2.setURI(new URI("#xpointer(id('"+iD1+"'))"));
- reference2.setType(
- new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference2.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference2);
-
- }
- */
- return manifest.toElement();
- }
-
-public Element createReferencesWithManifest(
- URI uriToData1, String iD1,
- URI uriToData2, String type
- ) throws Exception
- {
- SignerReference reference = signedInfo.createReference();
-
- SignerManifest manifest = signer.createManifest();
-
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
-
- SignerReference manifestRef = manifest.createReference();
- manifestRef.setDigestAlgorithm(digestAlg);
- manifestRef.setURI(uriToData1);
- manifest.addReference(manifestRef);
-
- SignerReference manifestRef2 = manifest.createReference();
- manifestRef2.setDigestAlgorithm(digestAlg);
- manifestRef2.setURI(uriToData2);
- manifest.addReference(manifestRef2);
-
- manifest.setId(iD1);
- iaik.ixsil.core.Object manifestObject =
- signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = signedInfo.createReference();
- reference.setURI(new URI("#xpointer(id('"+iD1+"'))"));
- reference.setType(new URI(type));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);
- return manifest.toElement();
- }
-
-
- public void setKeyInformation() throws Exception
- {
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
-
- X509Certificate[] certs = getCertificates(pkcs12);
- X509Data x509Data = new X509Data();
-
- for (int i = 0; i < certs.length; i++) {
- x509Data.insertHintAt(certs[i], i);
- }
-
- KeyProviderImplX509Data x509DataKeyProvider =
- new KeyProviderImplX509Data(signer.toDocument());
-
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- Element e = (Element)keyManager.getKeyInfo();
- NodeList nl = e.getChildNodes();
- x509CertString = ((new DOMWriterImpl(true)).writeToString(nl.item(0).getChildNodes().item(1)));
- if(x509CertString==null)
- x509CertString = ((new DOMWriterImpl(true)).writeToString(nl.item(0).getChildNodes().item(0)));
-
- signer.getSignature().setKeyManager(keyManager);
-
-
-
- }
- public void setKeyInformation(String retrievalMethod) throws Exception
- { // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- KeyProviderImplRetrievalMethod x509RetrievalMethod =
- new KeyProviderImplRetrievalMethod(signer.toDocument());
-
- URI fileURI = null;
-
- if (retrievalMethod == "XML")
- fileURI =
- new URI(
- "file:"
- + configuration_.getProperty("baseDir")
- + configuration_.getProperty("RetrievalURIXML"));
- else
- fileURI =
- new URI(
- "file:"
- + configuration_.getProperty("baseDir")
- + configuration_.getProperty("RetrievalURIRaw"));
-
- RetrievalMethod retMet =
- new RetrievalMethod(
- signer.toDocument(),
- new URIResolverParameters(fileURI));
-
- retMet.setURI(fileURI);
-
- if (retrievalMethod == "XML")
- retMet.setType(
- new URI(configuration_.getProperty("RetrievalTypeXML")));
- else
- retMet.setType(
- new URI(configuration_.getProperty("RetrievalTypeRaw")));
-
- x509RetrievalMethod.insertRetrievalMethodAt(retMet, 0);
- keyManager.addKeyProvider(x509RetrievalMethod);
- Element e = (Element)keyManager.getKeyInfo();
- NodeList nl = e.getChildNodes();
- x509CertString = ((new DOMWriterImpl(true)).writeToString(nl.item(0).getChildNodes().item(0)));
-
-
- signer.getSignature().setKeyManager(keyManager);
- }
-
- public void setKeyInformation(int pos) throws Exception
- {
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
-
- X509Certificate[] certs = getCertificates(pkcs12);
- X509Data x509Data = new X509Data();
-
- x509Data.insertHintAt(certs[pos], 0);
-
-
- KeyProviderImplX509Data x509DataKeyProvider =
- new KeyProviderImplX509Data(signer.toDocument());
-
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- signer.getSignature().setKeyManager(keyManager);
-
- Element e = (Element)keyManager.getKeyInfo();
- NodeList nl = e.getChildNodes();
- x509CertString = ((new DOMWriterImpl(true)).writeToString(nl.item(0).getChildNodes().item(0)));
-
- //((Element)signer.getSignature().getSignatureDOMElement().getChildNodes().item(0)).setAttributeNS(IXSILConstants.NAMESPACE_URI_NAMESPACES_,"xmlns:data","http://uri.data.org");
-
- //display(signer.getSignature().getSignatureDOMElement());
- }
-
- private void display(Node base)
- {
- display(base,1);
- }
-
- private void display(Node base,int level)
- {
- String spacer = "";
- for(int counter=0;counter<level;counter++)
- {
- spacer+=" ";
- }
-
- int att_size=0;
- if(base.getAttributes()!=null)
- {
- att_size=base.getAttributes().getLength();
- }
- if(base.getNodeName().equals("#text"))
- System.out.println(spacer+base.getNodeName()+base.getChildNodes().getLength()+":"+att_size+" ("+base.getNodeValue()+")");
- else
- System.out.println(spacer+base.getNodeName()+base.getChildNodes().getLength()+":"+att_size);
-
- NamedNodeMap nnm = base.getAttributes();
- if(nnm!=null)
- {
- int size = nnm.getLength();
- for(int counter=0;counter<size;counter++)
- {
- display(nnm.item(counter),level+3);
- }
- }
-
- NodeList children = base.getChildNodes();
- int size = children.getLength();
- for(int counter=0;counter<size;counter++)
- {
- display(children.item(counter),level+1);
- }
- }
-
- public void setKeyInformation(boolean xpointer, URI fileURI, URI typeURI, Transform[] transforms) throws Exception
- { // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- KeyProviderImplRetrievalMethod x509RetrievalMethod =
- new KeyProviderImplRetrievalMethod(signer.toDocument());
-
- RetrievalMethod retMet = null;
-
- if (xpointer)
- {
- retMet = new RetrievalMethod(signer.toDocument(),null);
- }
- else
- {
- retMet = new RetrievalMethod(signer.toDocument(),new URIResolverParameters(fileURI));
- }
-
-
-
- retMet.setURI(fileURI);
-
-
- retMet.setType(typeURI);
-
- if (transforms!=null)
- {for (int trNr=0; trNr < transforms.length; trNr++)
- retMet.insertTransformAt(transforms[trNr],trNr);
- }
-
-
- x509RetrievalMethod.insertRetrievalMethodAt(retMet, 0);
- keyManager.addKeyProvider(x509RetrievalMethod);
-
- Element e = (Element)keyManager.getKeyInfo();
- NodeList nl = e.getChildNodes();
- x509CertString = ((new DOMWriterImpl(true)).writeToString(nl.item(0).getChildNodes().item(0)));
-
-
- signer.getSignature().setKeyManager(keyManager);
-
-
- }
-
-/* public Document createPKCS12Sig(
- String TestNumber,
- int CanonicalizationMethodNumber,
- String data,
- boolean env,
- boolean mani,
- String data2,
- boolean env2,
- String retrievalMethod)
- throws Exception {
-
-
-
- if (data2 != null) {
- reference = signedInfo.createReference();
- if (env2) {
- iaik.ixsil.core.Object object = null;
- object = signature.createObject(data2);
- object.setId("envelopedData2");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg =
- new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(
- new URI("#xpointer(id('envelopedData2')/node())"));
- } else {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data2);
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg =
- new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- signedInfo.addReference(reference);
- }
-
- // Add reference to signature
-
-
-
- // Compute signature value
- signer.getSignature().sign();
-
- return signer.toDocument();
- }
-*/
- public Document returnSig() throws Exception {
- //signature.getObjects();
-
- signer.getSignature().sign();
-
- //((Element)signer.getSignature().getSignatureDOMElement().getChildNodes().item(0)).removeAttribute("xmlns:data");
- //display(((Element)signer.getSignature().getSignatureDOMElement().getChildNodes().item(0)));
- //.removeAttributeNS(IXSILConstants.NAMESPACE_URI_NAMESPACES_,"xmlns:data");
-
- return signer.toDocument();
-
- }
- public String getX509CertString() throws Exception{
- TestCases tc = new TestCases();
-
- if(x509CertString==null) return null;
- String result = TestCases.replaceString(x509CertString,"<?xml version=\"1.0\"?>","");
- if(x509CertString.indexOf("xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"")!=-1)
- result = TestCases.replaceString(result,"xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"","");
-
- return result;
- }
-}
diff --git a/spss.test/src/testgenerator/DataGenerator.java b/spss.test/src/testgenerator/DataGenerator.java
deleted file mode 100644
index d0743612e..000000000
--- a/spss.test/src/testgenerator/DataGenerator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package testgenerator;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DataGenerator {
-
- public static final String text_to_be_signed="Something to be Signed :) ";
-
- public static void main(String[] args) throws Exception {
- generateData("1kb.txt",1000);
- generateData("10kb.txt",10000);
- generateData("20kb.txt",20000);
- generateData("50kb.txt",50000);
- generateData("100kb.txt",100000);
- generateData("500kb.txt",500000);
- generateData("1mb.txt",1000000);
- generateData("10mb.txt",10000000);
- }
-
- public static void generateData(String filename,int size) throws Exception
- {
- StringBuffer sb = new StringBuffer(size);
- int max = size-text_to_be_signed.length();
- while(sb.length()<(max))
- {
- sb.append(text_to_be_signed);
- }
-
- sb.append(text_to_be_signed.substring(0,(size-sb.length())));
-
- BufferedWriter bw = new BufferedWriter(new FileWriter(filename));
- bw.write(sb.toString());
- bw.flush();
- bw.close();
- }
-}
diff --git a/spss.test/src/testgenerator/EtsiProperties.java b/spss.test/src/testgenerator/EtsiProperties.java
deleted file mode 100644
index c306ddeb6..000000000
--- a/spss.test/src/testgenerator/EtsiProperties.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package testgenerator;
-
-import iaik.ixsil.init.IXSILConstants;
-
-import iaik.utils.Base64OutputStream;
-
-import java.io.ByteArrayOutputStream;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-/**
- * @author knirschs
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class EtsiProperties extends TestCases {
-
- /**
- * Constructor for EtsiProperties.
- *
- */
- private Element qualprop;
- private Element signdataobjectprop;
- private static String etsinamespace = "http://uri.etsi.org/01903/v1.1.1#";
- private Document doc;
-
- public EtsiProperties() throws Exception{
-
- getX509Content();
-
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- //dbf.setNamespaceAware(true);
- //dbf.setValidating(true);
-
- doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-
-
- qualprop = doc.createElementNS(etsinamespace,"etsi:QualifyingProperties");
- qualprop.setAttributeNS(null,"Target","#signature");
- qualprop.setAttributeNS(IXSILConstants.NAMESPACE_URI_NAMESPACES_,"xmlns:etsi",etsinamespace);
- //qualprop.setPrefix("etsi");*/
- //qualprop.setAttributeNodeNS(doc.createAttributeNS(etsinamespace,"etsi"));
- Element signprop = doc.createElementNS(etsinamespace,"etsi:SignedProperties");
- Element signsigprop = doc.createElementNS(etsinamespace,"etsi:SignedSignatureProperties");
- signdataobjectprop = doc.createElementNS(etsinamespace,"etsi:SignedDataObjectProperties");
- Element signdate = doc.createElementNS(etsinamespace,"etsi:SigningTime");
- Text datevalue = doc.createTextNode("2003-03-01T00:01:01");
- Element signcert = doc.createElementNS(etsinamespace,"etsi:SigningCertificate");
- Element cert = doc.createElementNS(etsinamespace,"etsi:Cert");
- Element signpolyident = doc.createElementNS(etsinamespace,"etsi:SignaturePolicyIdentifier");
- Element signpolyimp = doc.createElementNS(etsinamespace,"etsi:SignaturePolicyImplied");
- Element certdig = doc.createElementNS(etsinamespace,"etsi:CertDigest");
- Element digmeth = doc.createElementNS(etsinamespace,"etsi:DigestMethod");
- digmeth.setAttribute("Algorithm","http://www.w3.org/2000/09/xmldsig#sha1");
- Element digvalue = doc.createElementNS(etsinamespace,"etsi:DigestValue");
-
- ByteArrayOutputStream fos = new ByteArrayOutputStream();
- Base64OutputStream base64os = new Base64OutputStream(fos);
- base64os.write(this.X509hash.getBytes());
- base64os.flush();
-
- Text dig_value = doc.createTextNode(fos.toString());
- Element is = doc.createElementNS(etsinamespace,"etsi:IssuerSerial");
- Element i = doc.createElement("dsig:X509IssuerName");
- Text i_value = doc.createTextNode(this.X509name);
- Element s = doc.createElement("dsig:X509SerialNumber");
- Text s_value = doc.createTextNode(this.X509number.toString());
-
-
- qualprop.appendChild(signprop);
- signprop.appendChild(signsigprop);
- signsigprop.appendChild(signdate);
- signdate.appendChild(datevalue);
- signsigprop.appendChild(signcert);
- signcert.appendChild(cert);
- cert.appendChild(certdig);
- certdig.appendChild(digmeth);
- certdig.appendChild(digvalue);
- digvalue.appendChild(dig_value);
- cert.appendChild(is);
- is.appendChild(i);
- i.appendChild(i_value);
- is.appendChild(s);
- s.appendChild(s_value);
- signsigprop.appendChild(signpolyident);
- signpolyident.appendChild(signpolyimp);
- signprop.appendChild(signdataobjectprop);
-
-
- }
- public Element getQualProp()
- {
- return qualprop;
- }
- public void addDataObjectFormat(String reference) throws Exception
- {
- Element dataobjformat = doc.createElementNS(etsinamespace,"etsi:DataObjectFormat");
- dataobjformat.setAttribute("ObjectReference",reference);
- Element mimetype = doc.createElementNS(etsinamespace,"etsi:MimeType");
- //mimetype.setNodeValue("text/plain");
- Text mimevalue = doc.createTextNode("text/html");
- signdataobjectprop.appendChild(dataobjformat);
- dataobjformat.appendChild(mimetype);
- mimetype.appendChild(mimevalue);
- }
-
-}
diff --git a/spss.test/src/testgenerator/LauchAll.java b/spss.test/src/testgenerator/LauchAll.java
deleted file mode 100644
index 70965ae09..000000000
--- a/spss.test/src/testgenerator/LauchAll.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package testgenerator;
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class LauchAll {
-
- public static void main(String[] args) {
- try {
- TestGeneratorCX0.main(null);
- TestGeneratorCX1.main(null);
- TestGeneratorCX2.main(null);
- TestGeneratorVC0.main(null);
- TestGeneratorVX.main(null);
- TestGeneratorVX2.main(null);
- TestGeneratorVXErrors.main(null);
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }
- }
-}
diff --git a/spss.test/src/testgenerator/LaunchVX.java b/spss.test/src/testgenerator/LaunchVX.java
deleted file mode 100644
index 3c4191411..000000000
--- a/spss.test/src/testgenerator/LaunchVX.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package testgenerator;
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class LaunchVX {
-
- public static void main(String[] args) {
- try {
- TestGeneratorVX.main(null);
- TestGeneratorVX2.main(null);
- TestGeneratorVXErrors.main(null);
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }
- }
-}
diff --git a/spss.test/src/testgenerator/Pass.java b/spss.test/src/testgenerator/Pass.java
deleted file mode 100644
index b6fef9575..000000000
--- a/spss.test/src/testgenerator/Pass.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package testgenerator;
-
-import iaik.apps.util.passphrase.PassphrasePrompt;
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class Pass implements PassphrasePrompt
-{
- public Pass() {};
- public void setCancelAllowed(boolean b) {};
- public void setMessage(Object o) {};
- public boolean isCancelAllowed() { return false; }
- public char[] promptPassphrase() { return "1111".toCharArray(); };
- public void setProtectedResourceInfo(Object o) {};
-
-}
diff --git a/spss.test/src/testgenerator/SetupCMSKeyStore.java b/spss.test/src/testgenerator/SetupCMSKeyStore.java
deleted file mode 100644
index 441e64236..000000000
--- a/spss.test/src/testgenerator/SetupCMSKeyStore.java
+++ /dev/null
@@ -1,671 +0,0 @@
-// Copyright (C) 1997-2002 IAIK
-// email: jce-info@iaik.tu-graz.ac.at
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE.
-//
-// $Header$
-//
-
-package testgenerator;
-
-import iaik.asn1.CodingException;
-import iaik.asn1.ObjectID;
-import iaik.asn1.structures.AlgorithmID;
-import iaik.asn1.structures.GeneralName;
-import iaik.asn1.structures.GeneralNames;
-import iaik.asn1.structures.Name;
-import iaik.asn1.structures.PolicyInformation;
-import iaik.asn1.structures.PolicyQualifierInfo;
-import iaik.security.provider.IAIK;
-import iaik.x509.SimpleChainVerifier;
-import iaik.x509.X509Certificate;
-import iaik.x509.X509ExtensionException;
-import iaik.x509.extensions.AuthorityKeyIdentifier;
-import iaik.x509.extensions.BasicConstraints;
-import iaik.x509.extensions.CertificatePolicies;
-import iaik.x509.extensions.KeyUsage;
-import iaik.x509.extensions.SubjectAltName;
-import iaik.x509.extensions.SubjectKeyIdentifier;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.cert.CertificateException;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.Random;
-
-/**
- * Creates a default KeyStore in the current working directory.
- * These keys are used by many demos included in IAIK-JCE.
- * The aliases and the password for accessing the keys and
- * certificates can be found in {@link demo.keystore.CMSKeyStoreConstants CMSKeyStoreConstants}.
- *
- * @see CMSKeyStoreConstants
- */
-public class SetupCMSKeyStore implements CMSKeyStoreConstants {
-
- // the keylength of the CA certificate shall be 1024
- private final static int CA_KEYLENGTH = 1024;
-
- // the key store to create
- KeyStore key_store;
- // the file where the key store shall be saved
- String keystore_file;
- // takes the existing keys from the KeyStore and only creates new certificates
- boolean create_only_certificates = true;
-
- // the private keys
- KeyPair ca_rsa = null;
- // RSA for signing
- KeyPair rsa512_sign = null;
- KeyPair rsa1024_sign = null;
- KeyPair rsa2048_sign = null;
- // RSA for encrypting
- KeyPair rsa512_crypt = null;
- KeyPair rsa1024_crypt = null;
- KeyPair rsa1024_crypt_ = null;
- KeyPair rsa2048_crypt = null;
-
- KeyPair ca_dsa = null;
- KeyPair dsa512 = null;
- KeyPair dsa1024 = null;
- KeyPair esdh512 = null;
- KeyPair esdh1024 = null;
- KeyPair esdh1024_ = null;
- KeyPair esdh2048 = null;
-
- // create RSA keys and certificates
- boolean create_rsa = true;
- // create DSA keys and certificates
- boolean create_dsa = true;
- // create ESDH keys and certificates
- boolean create_esdh = true;
-
- /**
- * Generate a KeyPair using the specified algorithm with the given size.
- *
- * @param algorithm the algorithm to use
- * @param bits the length of the key (modulus) in bits
- * @return the KeyPair
- */
- public static KeyPair generateKeyPair(String algorithm, int bits)
- throws NoSuchAlgorithmException {
-
- KeyPairGenerator generator = null;
-
- try {
- generator = KeyPairGenerator.getInstance(algorithm, "IAIK");
-
- } catch (NoSuchProviderException ex) {
- throw new NoSuchAlgorithmException("Provider IAIK not found!");
- }
-
- generator.initialize(bits);
- KeyPair kp = generator.generateKeyPair();
-
- return kp;
- }
-
- /**
- * Creates a certificate from the given values.
- *
- * @param subject the subject of the certificate
- * @param publicKey the public key to include
- * @param issuer the issuer of the certificate
- * @param privateKey the private key for signing the certificate
- * @param algorithm the signature algorithm to use
- */
- public static X509Certificate createCertificate(Name subject, PublicKey publicKey,
- Name issuer, PrivateKey privateKey, AlgorithmID algorithm, byte[] keyID, boolean forSigning) {
-
- // create a new certificate
- X509Certificate cert = new X509Certificate();
-
- try {
- // set the values
- cert.setSerialNumber(new BigInteger(20, new Random()));
- cert.setSubjectDN(subject);
- cert.setPublicKey(publicKey);
- cert.setIssuerDN(issuer);
-
- GregorianCalendar date = new GregorianCalendar();
- date.add(Calendar.DATE, -1);
- // not before now
- cert.setValidNotBefore(date.getTime());
-
- if (issuer.equals(subject)) {
- date.add(Calendar.MONTH, 12);
- BasicConstraints basicConstraints = new BasicConstraints(true);
- cert.addExtension(basicConstraints);
- KeyUsage keyUsage = new KeyUsage(KeyUsage.keyCertSign | KeyUsage.cRLSign);
- cert.addExtension(keyUsage);
- } else {
- date.add(Calendar.MONTH, 11);
- KeyUsage keyUsage = null;
- if (forSigning) {
- keyUsage = new KeyUsage(KeyUsage.digitalSignature |
- KeyUsage.nonRepudiation);
- } else {
- keyUsage = new KeyUsage(KeyUsage.keyEncipherment |
- KeyUsage.dataEncipherment);
- }
- cert.addExtension(keyUsage);
- AuthorityKeyIdentifier authID = new AuthorityKeyIdentifier();
- authID.setKeyIdentifier(keyID);
- cert.addExtension(authID);
- GeneralNames generalNames = new GeneralNames();
- generalNames.addName(new GeneralName(GeneralName.rfc822Name, "smimetest@iaik.at"));
- generalNames.addName(new GeneralName(GeneralName.rfc822Name, "smimetest@iaik.tu-graz.ac.at"));
- SubjectAltName subjectAltName = new SubjectAltName(generalNames);
- cert.addExtension(subjectAltName);
- }
- String explicitText = "This certificate only may be used for test purposes";
- PolicyQualifierInfo policyQualifier = new PolicyQualifierInfo(null, null, explicitText);
- PolicyInformation[] policyInformations =
- { new PolicyInformation(new ObjectID("1.3.6.1.4.1.2706.17.0.11.1.1"),
- new PolicyQualifierInfo[] { policyQualifier }) };
- CertificatePolicies certPolicies = new CertificatePolicies(policyInformations);
-
- SubjectKeyIdentifier subjectKeyID = new SubjectKeyIdentifier(cert.getPublicKey());
- cert.addExtension(subjectKeyID);
-
- cert.addExtension(certPolicies);
- cert.setValidNotAfter(date.getTime());
- // and sign the certificate
- cert.sign(algorithm ,privateKey);
- } catch (CertificateException ex) {
- throw new RuntimeException("Error creating the certificate: "+ex.getMessage());
- } catch (InvalidKeyException ex) {
- throw new RuntimeException("Error creating the certificate: "+ex.getMessage());
- } catch (NoSuchAlgorithmException ex) {
- throw new RuntimeException("Error creating the certificate: "+ex.getMessage());
- } catch (X509ExtensionException ex) {
- throw new RuntimeException("Error adding extension: "+ex.getMessage());
- } catch (CodingException ex) {
- throw new RuntimeException("Error adding SubjectKeyIdentifier extension: "+ex.getMessage());
- }
-/*
- System.out.println(cert.toString(true));
- iaik.utils.Util.waitKey();
-*/
-
- return cert;
- }
-
- /**
- * Load or create a KeyStore and initialize it.
- */
- private void initializeKeyStore() {
-
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- String line;
-
- try {
- // default directory is the current user dir
- String keystore_dir = System.getProperty("user.dir");
- File ks = new File(keystore_dir, KS_FILENAME);
-
- // KeyStore does already exist
- if (ks.exists()) {
- keystore_file = ks.getAbsolutePath();
- if (create_only_certificates) {
- System.out.println("Create only new certificates from already existing keys!");
- }
- else {
- System.out.println("Existing KeyStore will be deleted!");
- }
- System.out.println("KeyStore: "+keystore_file);
- }
- else {
- // there is no KeyStore -> create also new keys
- create_only_certificates = false;
-
- while (true) {
- System.out.print("Create new KeyStore in directory: "+keystore_dir+" [y]");
- line = reader.readLine();
- if (line.length() == 0 || line.equals("y")) {
- ks = new File(keystore_dir, KS_FILENAME);
- keystore_file = ks.getAbsolutePath();
- System.out.println("KeyStore will be saved to: "+keystore_file);
- break;
- }
- System.out.print("Enter directory: ");
- keystore_dir = reader.readLine();
- }
- }
-
- // get a new KeyStore onject
- key_store = KeyStore.getInstance("IAIKKeyStore");
-
- if (create_only_certificates) {
- // take private keys from existing KeyStore
- key_store.load(new FileInputStream(ks), KS_PASSWORD);
- }
- else {
- // create a new KeyStore
- key_store.load(null, null);
- }
-
- } catch (Exception ex) {
- System.out.println("Error creating new IAIK KeyStore!");
- throw new RuntimeException("Error creating new KeyStore: "+ex.getMessage());
- }
- }
-
- /**
- * Save the KeyStore to disk.
- */
- private void saveKeyStore() {
- try {
- // write the KeyStore to disk
- FileOutputStream os = new FileOutputStream(keystore_file);
- key_store.store(os, KS_PASSWORD);
- os.close();
- } catch (Exception ex) {
- System.out.println("Error saving KeyStore!");
- ex.printStackTrace();
- }
- }
-
- /**
- * Add the private key and the certificate chain to the key store.
- */
- public void addToKeyStore(KeyPair keyPair, X509Certificate[] chain, String alias) throws KeyStoreException {
- key_store.setKeyEntry(alias, keyPair.getPrivate(), KS_PASSWORD, chain);
- }
-
- /**
- * Returns a KeyPair form the KeyStore.
- */
- private KeyPair getKeyPair(String type) throws Exception {
- PrivateKey privKey = (PrivateKey)key_store.getKey(type, KS_PASSWORD);
- PublicKey pubKey = key_store.getCertificateChain(type)[0].getPublicKey();
- return new KeyPair(pubKey, privKey);
- }
-
- /**
- * Get all private keys from the KeyStore.
- */
- private void getPrivateKeys() {
- // RSA
- try {
- ca_rsa = getKeyPair(CA_RSA);
- // for signing
- rsa512_sign = getKeyPair(RSA_512_SIGN);
- rsa1024_sign = getKeyPair(RSA_1024_SIGN);
- rsa2048_sign = getKeyPair(RSA_2048_SIGN);
- // for encrypting
- rsa512_crypt = getKeyPair(RSA_512_CRYPT);
- rsa1024_crypt = getKeyPair(RSA_1024_CRYPT);
- rsa1024_crypt_ = getKeyPair(RSA_1024_CRYPT_);
- rsa2048_crypt = getKeyPair(RSA_2048_CRYPT);
- } catch (Exception ex) {
- System.out.println("Unable to get RSA keys from KeyStore.");
- ex.printStackTrace();
- create_rsa = false;
- }
- // DSA
- try {
- ca_dsa = getKeyPair(CA_DSA);
- dsa512 = getKeyPair(DSA_512);
- dsa1024 = getKeyPair(DSA_1024);
- } catch (Exception ex) {
- System.out.println("Unable to get DSA keys from KeyStore.");
- ex.printStackTrace();
- create_dsa = false;
- }
- // ESDH
- try {
- esdh512 = getKeyPair(ESDH_512);
- esdh1024 = getKeyPair(ESDH_1024);
- esdh1024_ = getKeyPair(ESDH_1024_);
- esdh2048 = getKeyPair(ESDH_2048);
- } catch (Exception ex) {
- System.out.println("Unable to get ESDH keys from KeyStore.");
- ex.printStackTrace();
- create_esdh = false;
- }
- }
-
- /**
- * Gernerate new prviate keys.
- */
- private void generatePrivateKeys() {
- try {
- // first create the KeyPairs
- if (create_rsa) {
- try {
- System.out.println("generate RSA KeyPair for CA certificate ["+CA_KEYLENGTH+" bits]...");
- ca_rsa = generateKeyPair("RSA", CA_KEYLENGTH);
- System.out.println("Generate RSA signing keys...");
- System.out.println("generate RSA KeyPair for a test certificate [512 bits]...");
- rsa512_sign = generateKeyPair("RSA", 512);
- System.out.println("generate RSA KeyPair for a test certificate [1024 bits]...");
- rsa1024_sign = generateKeyPair("RSA", 1024);
- System.out.println("generate RSA KeyPair for a test certificate [2048 bits]...");
- rsa2048_sign = generateKeyPair("RSA", 2048);
- System.out.println("Generate RSA encryption keys...");
- System.out.println("generate RSA KeyPair for a test certificate [512 bits]...");
- rsa512_crypt = generateKeyPair("RSA", 512);
- System.out.println("generate RSA KeyPair for a test certificate [1024 bits]...");
- rsa1024_crypt = generateKeyPair("RSA", 1024);
- System.out.println("generate second RSA KeyPair for a test certificate [1024 bits]...");
- rsa1024_crypt_ = generateKeyPair("RSA", 1024);
- System.out.println("generate RSA KeyPair for a test certificate [2048 bits]...");
- rsa2048_crypt = generateKeyPair("RSA", 2048);
- } catch (NoSuchAlgorithmException ex) {
- create_rsa = false;
- System.out.println("No implementation for RSA! RSA certificates are not created!\n");
- }
- }
- if (create_dsa) {
- try {
- System.out.println("generate DSA KeyPair for CA certificate ["+CA_KEYLENGTH+" bits]...");
- ca_dsa = generateKeyPair("DSA", CA_KEYLENGTH);
- System.out.println("generate DSA KeyPair for a test certificate [512 bits]...");
- dsa512 = generateKeyPair("DSA", 512);
- System.out.println("generate DSA KeyPair for a test certificate [1024 bits]...");
- dsa1024 = generateKeyPair("DSA", 1024);
- } catch (NoSuchAlgorithmException ex) {
- create_dsa = false;
- System.out.println("No implementation for DSA! DSA certificates are not created!\n");
- }
- }
-
- if (create_esdh) {
- try {
- System.out.println("generate ESDH KeyPair for a test certificate [512 bits]...");
- esdh512 = generateKeyPair("ESDH", 512);
- System.out.println("generate ESDH KeyPair for a test certificate [1024 bits]...");
- esdh1024 = generateKeyPair("ESDH", 1024);
- System.out.println("generate ESDH KeyPair for a test certificate [1024 bits]...");
- esdh1024_ = generateKeyPair("ESDH", 1024);
- System.out.println("generate ESDH KeyPair for a test certificate [2048 bits]...");
- esdh2048 = generateKeyPair("ESDH", 2048);
- } catch (NoSuchAlgorithmException ex) {
- create_esdh = false;
- System.out.println("No implementation for ESDH! ESDH certificates are not created!\n");
- }
- }
- } catch (Exception ex) {
- System.out.println("Exception: "+ex);
- }
- }
-
- public void generateCertificates() {
-
- try {
-
- // Now create the certificates
- Name issuer = new Name();
- issuer.addRDN(ObjectID.country, "AT");
- issuer.addRDN(ObjectID.organization ,"IAIK");
- issuer.addRDN(ObjectID.organizationalUnit ,"JavaSecurity");
-
- Name subject = new Name();
- subject.addRDN(ObjectID.country, "AT");
- subject.addRDN(ObjectID.organization ,"IAIK");
- subject.addRDN(ObjectID.organizationalUnit ,"JavaSecurity");
-
- //
- // create self signed CA certs
- //
- X509Certificate caRSA = null;
- X509Certificate caDSA = null;
- X509Certificate[] chain = new X509Certificate[1];
- // for verifying the created certificates
- SimpleChainVerifier verifier = new SimpleChainVerifier();
-
- if (create_rsa) {
- issuer.addRDN(ObjectID.commonName ,"IAIK RSA Test CA");
- System.out.println("create self signed RSA CA certificate...");
- caRSA = createCertificate(issuer, ca_rsa.getPublic(),
- issuer, ca_rsa.getPrivate(), AlgorithmID.sha1WithRSAEncryption, null, true);
- // verify the self signed certificate
- caRSA.verify();
- // set the CA cert as trusted root
- verifier.addTrustedCertificate(caRSA);
- chain[0] = caRSA;
- addToKeyStore(ca_rsa, chain, CA_RSA);
- issuer.removeRDN(ObjectID.commonName);
- }
-
- if (create_dsa) {
- issuer.addRDN(ObjectID.commonName ,"IAIK DSA Test CA");
- System.out.println("create self signed DSA CA certificate...");
- caDSA = createCertificate(issuer, ca_dsa.getPublic(),
- issuer, ca_dsa.getPrivate(), AlgorithmID.dsaWithSHA, null, true);
- // verify the self signed certificate
- caDSA.verify();
- // set the CA cert as trusted root
- verifier.addTrustedCertificate(caDSA);
- chain[0] = caDSA;
- addToKeyStore(ca_dsa, chain, CA_DSA);
- issuer.removeRDN(ObjectID.commonName);
- }
-
- //
- // create certificates
- //
- chain = new X509Certificate[2];
-
- // create a RSA certificate
- if (create_rsa) {
- issuer.addRDN(ObjectID.commonName ,"IAIK RSA Test CA");
- SubjectKeyIdentifier subjectKeyID = (SubjectKeyIdentifier)caRSA.getExtension(SubjectKeyIdentifier.oid);
- // 512
- // for signing
- System.out.println("Create RSA demo certificates to be used for signing...");
-
- // 512
- subject.addRDN(ObjectID.commonName, "RSA 512 bit Demo Signing Certificate");
- System.out.println("create 512 bit RSA demo certificate...");
- chain[0] = createCertificate(subject, rsa512_sign.getPublic(),
- issuer, ca_rsa.getPrivate(), AlgorithmID.sha1WithRSAEncryption, subjectKeyID.get(), true);
- chain[1] = caRSA;
- // and verify the chain
- verifier.verifyChain(chain);
- addToKeyStore(rsa512_sign, chain, RSA_512_SIGN);
- subject.removeRDN(ObjectID.commonName);
-
- // 1024
-
- subject.addRDN(ObjectID.commonName ,"RSA 1024 bit Demo Signing Certificate");
- System.out.println("create 1024 bit RSA demo certificate...");
- chain[0] = createCertificate(subject, rsa1024_sign.getPublic(),
- issuer, ca_rsa.getPrivate(), AlgorithmID.sha1WithRSAEncryption, subjectKeyID.get(), true);
- chain[1] = caRSA;
- verifier.verifyChain(chain);
- addToKeyStore(rsa1024_sign, chain, RSA_1024_SIGN);
- subject.removeRDN(ObjectID.commonName);
-
- // 2048
-
- subject.addRDN(ObjectID.commonName ,"RSA 2048 bit Demo Signing Certificate");
- System.out.println("create 2048 bit RSA demo certificate...");
- chain[0] = createCertificate(subject, rsa2048_sign.getPublic(),
- issuer, ca_rsa.getPrivate(), AlgorithmID.sha1WithRSAEncryption, subjectKeyID.get(), true);
- chain[1] = caRSA;
- verifier.verifyChain(chain);
-
- addToKeyStore(rsa2048_sign, chain, RSA_2048_SIGN);
- subject.removeRDN(ObjectID.commonName);
-
- // for encrypting
- System.out.println("Create RSA demo certificates to be used for encryption...");
- // 512
- subject.addRDN(ObjectID.commonName, "RSA 512 bit Demo Encryption Certificate");
- System.out.println("create 512 bit RSA demo certificate...");
- chain[0] = createCertificate(subject, rsa512_crypt.getPublic(),
- issuer, ca_rsa.getPrivate(), AlgorithmID.sha1WithRSAEncryption, subjectKeyID.get(), false);
- chain[1] = caRSA;
- // and verify the chain
- verifier.verifyChain(chain);
- addToKeyStore(rsa512_crypt, chain, RSA_512_CRYPT);
- subject.removeRDN(ObjectID.commonName);
-
- // 1024
-
- subject.addRDN(ObjectID.commonName ,"RSA 1024 bit Demo Encryption Certificate");
- System.out.println("create 1024 bit RSA demo certificate...");
- chain[0] = createCertificate(subject, rsa1024_crypt.getPublic(),
- issuer, ca_rsa.getPrivate(), AlgorithmID.sha1WithRSAEncryption, subjectKeyID.get(), false);
- chain[1] = caRSA;
- verifier.verifyChain(chain);
- addToKeyStore(rsa1024_crypt, chain, RSA_1024_CRYPT);
-
- System.out.println("create second 1024 bit RSA demo Encryption certificate...");
- chain[0] = createCertificate(subject, rsa1024_crypt_.getPublic(),
- issuer, ca_rsa.getPrivate(), AlgorithmID.sha1WithRSAEncryption, subjectKeyID.get(), false);
- chain[1] = caRSA;
- verifier.verifyChain(chain);
- addToKeyStore(rsa1024_crypt_, chain, RSA_1024_CRYPT_);
- subject.removeRDN(ObjectID.commonName);
-
- // 2048
-
- subject.addRDN(ObjectID.commonName ,"RSA 2048 bit Demo Encryption Certificate");
- System.out.println("create 2048 bit RSA demo certificate...");
- chain[0] = createCertificate(subject, rsa2048_crypt.getPublic(),
- issuer, ca_rsa.getPrivate(), AlgorithmID.sha1WithRSAEncryption, subjectKeyID.get(), false);
- chain[1] = caRSA;
- verifier.verifyChain(chain);
- addToKeyStore(rsa2048_crypt, chain, RSA_2048_CRYPT);
- subject.removeRDN(ObjectID.commonName);
- issuer.removeRDN(ObjectID.commonName);
- }
-
- // create a DSA test certificate
- if (create_dsa) {
- issuer.addRDN(ObjectID.commonName ,"IAIK DSA Test CA");
- // 512
- subject.addRDN(ObjectID.commonName ,"DSA 512 bit Demo Certificate");
- System.out.println("create 512 bit DSA demo certificate...");
- SubjectKeyIdentifier subjectKeyID = (SubjectKeyIdentifier)caDSA.getExtension(SubjectKeyIdentifier.oid);
- chain[0] = createCertificate(subject, dsa512.getPublic(),
- issuer, ca_dsa.getPrivate(), AlgorithmID.dsaWithSHA, subjectKeyID.get(), true);
- subject.removeRDN(ObjectID.commonName);
- chain[1] = caDSA;
- verifier.verifyChain(chain);
-
- addToKeyStore(dsa512, chain, DSA_512);
- // 1024
- subject.addRDN(ObjectID.commonName ,"DSA 1024 bit Demo Certificate");
- System.out.println("create 1024 bit DSA demo certificate...");
- chain[0] = createCertificate(subject, dsa1024.getPublic(),
- issuer, ca_dsa.getPrivate(), AlgorithmID.dsaWithSHA, subjectKeyID.get(), true);
- subject.removeRDN(ObjectID.commonName);
- chain[1] = caDSA;
- verifier.verifyChain(chain);
- addToKeyStore(dsa1024, chain, DSA_1024);
- issuer.removeRDN(ObjectID.commonName);
- }
-
- // create a ESDH test certificate
- if (create_esdh) {
- issuer.addRDN(ObjectID.commonName ,"IAIK DSA Test CA");
- // 512
- subject.addRDN(ObjectID.commonName ,"ESDH 512 bit Demo Certificate");
- System.out.println("create 512 bit ESDH demo certificate...");
- SubjectKeyIdentifier subjectKeyID = (SubjectKeyIdentifier)caDSA.getExtension(SubjectKeyIdentifier.oid);
- chain[0] = createCertificate(subject, esdh512.getPublic(),
- issuer, ca_dsa.getPrivate(), AlgorithmID.dsaWithSHA, subjectKeyID.get(), false);
- subject.removeRDN(ObjectID.commonName);
- chain[1] = caDSA;
- verifier.verifyChain(chain);
- addToKeyStore(esdh512, chain, ESDH_512);
- // 1024
- subject.addRDN(ObjectID.commonName ,"ESDH 1024 bit Demo Certificate 1");
- System.out.println("create 1024 bit ESDH demo certificate...");
- chain[0] = createCertificate(subject, esdh1024.getPublic(),
- issuer, ca_dsa.getPrivate(), AlgorithmID.dsaWithSHA, subjectKeyID.get(), false);
- subject.removeRDN(ObjectID.commonName);
- chain[1] = caDSA;
- verifier.verifyChain(chain);
- addToKeyStore(esdh1024, chain, ESDH_1024);
- // 1024
- subject.addRDN(ObjectID.commonName ,"ESDH 1024 bit Demo Certificate 2");
- System.out.println("create second 1024 bit ESDH demo certificate...");
- chain[0] = createCertificate(subject, esdh1024_.getPublic(),
- issuer, ca_dsa.getPrivate(), AlgorithmID.dsaWithSHA, subjectKeyID.get(), false);
- subject.removeRDN(ObjectID.commonName);
- chain[1] = caDSA;
- verifier.verifyChain(chain);
- addToKeyStore(esdh1024_, chain, ESDH_1024_);
- // 2048
- subject.addRDN(ObjectID.commonName ,"ESDH 2048 bit Demo Certificate");
- System.out.println("create 2048 bit ESDH demo certificate...");
- chain[0] = createCertificate(subject, esdh2048.getPublic(),
- issuer, ca_dsa.getPrivate(), AlgorithmID.dsaWithSHA, subjectKeyID.get(), false);
- subject.removeRDN(ObjectID.commonName);
- chain[1] = caDSA;
- verifier.verifyChain(chain);
- addToKeyStore(esdh2048, chain, ESDH_2048);
- issuer.removeRDN(ObjectID.commonName);
- }
-
- System.out.println("\nCertificates created!");
-
- } catch (Exception ex) {
- System.out.println("Exception: "+ex);
- }
- }
-
- public static void start() {
- SetupCMSKeyStore suks = new SetupCMSKeyStore();
- suks.initializeKeyStore();
- if (suks.create_only_certificates) {
- suks.getPrivateKeys();
- }
- else {
- suks.generatePrivateKeys();
- }
- suks.generateCertificates();
- suks.saveKeyStore();
- }
-
- /**
- * Creates the test certificates.
- */
- public static void main(String arg[]) throws IOException {
-
- IAIK.addAsProvider(true);
- start();
- System.in.read();
- }
-} \ No newline at end of file
diff --git a/spss.test/src/testgenerator/SignatureManifestCheckParams.java b/spss.test/src/testgenerator/SignatureManifestCheckParams.java
deleted file mode 100644
index b1505418d..000000000
--- a/spss.test/src/testgenerator/SignatureManifestCheckParams.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package testgenerator;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xml.serialize.DOMWriterImpl;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * @author knirschs
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class SignatureManifestCheckParams {
-/* So solls mal aussehen :-)
-
- <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>validBase64Data</Base64Content>
- </TransformParameter>
- </VerifyTransformsInfoProfile>
- <VerifyTransformsInfoProfileID>validID</VerifyTransformsInfoProfileID>
- </ReferenceInfo>
- </SignatureManifestCheckParams>
-*/
- private Document document;
- private Element refInfo;
- private Element verifyTrans;
- private Element transPara;
- private Element dsigTrans;
-
- public SignatureManifestCheckParams(String returnReferenceInputData) throws Exception{
-
- // Find the implementation
- DocumentBuilderFactory factory
- = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- DOMImplementation impl = builder.getDOMImplementation();
-
- // Create the document
- document = impl.createDocument(null, "SignatureManifestCheckParams", null);
-
- //document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); // Create from whole cloth
- Element root = document.getDocumentElement();
- if (returnReferenceInputData!=null)
- root.setAttribute("ReturnReferenceInputData",returnReferenceInputData);
-
- refInfo = (Element) document.createElement("ReferenceInfo");
- root.appendChild(refInfo);
-
- verifyTrans = (Element) document.createElement("VerifyTransformsInfoProfile");
-
-
- }
-
- public void addTransPara(String URI)
- {
- transPara = document.createElement("TransformParameter");
- transPara.setAttribute("URI",URI);
- verifyTrans.appendChild(transPara);
-
- }
-
-
- /**
- * Method addDsigTransform: To add an dsig:Tranform element with a special algorithm
- * @param algName
- */
- public void addDsigTransform(String algName, Element el)
- {
- if (dsigTrans==null)
- {
- dsigTrans = (Element) document.createElementNS("http://www.w3.org/2000/09/xmldsig#","Transforms");
- dsigTrans.setPrefix("dsig");
- verifyTrans.appendChild(dsigTrans);
-
- refInfo.appendChild(verifyTrans);
- }
-
-
- Element trans = document.createElementNS("http://www.w3.org/2000/09/xmldsig#","Transform");
- trans.setPrefix("dsig");
- trans.setAttribute("Algorithm",algName);
- if (el!=null) trans.appendChild(el);
- dsigTrans.appendChild(trans);
- }
-
- public void addDisgTransform(Element transformElement)
- {
- if (dsigTrans==null)
- {
- dsigTrans = (Element) document.createElementNS("http://www.w3.org/2000/09/xmldsig#","Transforms");
- dsigTrans.setPrefix("dsig");
- verifyTrans.appendChild(dsigTrans);
-
- refInfo.appendChild(verifyTrans);
- }
-
- dsigTrans.appendChild(transformElement);
- }
-
- /**
- * Method addTransformsProfileID.
- * @param id
- */
- public void addTransformsProfileID(String id)
- {
- Element profID = (Element) document.createElement("VerifyTransformsInfoProfileID");
- profID.appendChild(document.createTextNode(id));
- refInfo.appendChild(profID);
- }
-
- public void addTransParaElement(String elemName, String content)
- {
- if (elemName!="Hash") {
-
- Element eleName = document.createElement(elemName);
- eleName.appendChild(document.createTextNode(content));
- transPara.appendChild(eleName);
-
- } else {
-
- Element eleName = document.createElement(elemName);
- Element digMethod = document.createElementNS("http://www.w3.org/2000/09/xmldsig#","DigestMethod");
- digMethod.setPrefix("dsig");
- digMethod.setAttribute("Algorithm","http://www.w3.org/2000/09/xmldsig#sha1");
- eleName.appendChild(digMethod);
- Element hash = document.createElementNS("http://www.w3.org/2000/09/xmldsig#","DigestValue");
- hash.setPrefix("dsig");
- hash.appendChild(document.createTextNode(content));
- eleName.appendChild(hash);
-
- transPara.appendChild(eleName);
-
-
- }
-
- }
-
-public String returnDoc() throws Exception
- {
- String result =(new DOMWriterImpl(true)).writeToString(document.getDocumentElement());
-
- TestCases tc = new TestCases();
-
- result = TestCases.replaceString(result,"<?xml version=\"1.0\"?>","");
- try {
- result = TestCases.replaceString(result," xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"","");
- result = TestCases.replaceString(result," xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"","");
- result = TestCases.replaceString(result," xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"","");
- } catch (Exception e) {
- }
-
-
- return result;
- }
-
- public Document getDoc() throws Exception
- {
- return document;
- }
-}
diff --git a/spss.test/src/testgenerator/Supplement.java b/spss.test/src/testgenerator/Supplement.java
deleted file mode 100644
index 41edd4118..000000000
--- a/spss.test/src/testgenerator/Supplement.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package testgenerator;
-
-/**
- * @author Stevie (Admin)
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class Supplement {
-
- private String supplement;
- /**
- * Constructor for Supplement.
- */
- public Supplement() {
- supplement = " <SupplementProfile>\n";
-
- }
-
- public void addMetaInfo(String mimeType, String description)
- {
- supplement += " <MetaInfo>\n" +
- " <MimeType>" + mimeType + "</MimeType>";
- if (!(description==null))
- {
- supplement+= " <Description>" + description + "</Description>";
- }
-
- supplement+= " </MetaInfo>";
- }
-
- public void addBase64Content(String fileName, String data)
- {
- supplement+= " <Content Reference=\"" + fileName + "\">\n"+
- " <Base64Content>"+data+"</Base64Content>\n" +
- " </Content>\n";
-
- }
-
- public void addXMLContent(String fileName, String data)
- {
- supplement+= " <Content Reference=\"" + fileName + "\">\n"+
- " <XMLContent xml:space=\"preserve\">"+data+"</XMLContent>\n" +
- " </Content>\n";
-
- }
-
-
- public void closeSupplement()
- {
- supplement+= " </SupplementProfile>\n";
- }
-
- public String getSupplement()
- {
- return supplement;
- }
-
-
-}
diff --git a/spss.test/src/testgenerator/TestCMS.java b/spss.test/src/testgenerator/TestCMS.java
deleted file mode 100644
index e4d022383..000000000
--- a/spss.test/src/testgenerator/TestCMS.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package testgenerator;
-
-import iaik.asn1.CodingException;
-import iaik.asn1.ObjectID;
-import iaik.asn1.structures.AlgorithmID;
-import iaik.asn1.structures.Attribute;
-import iaik.asn1.structures.ChoiceOfTime;
-import iaik.cms.CMSException;
-import iaik.cms.ContentInfoStream;
-import iaik.cms.SignedDataStream;
-import iaik.cms.SignerInfo;
-import iaik.utils.StreamCopier;
-import iaik.x509.X509Certificate;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyStore;
-import java.security.Provider;
-import java.security.Security;
-import java.security.SignatureException;
-
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestCMS {
-
- public static void main(String[] args)
- {
- try {
- iaik.security.provider.IAIK.addAsProvider(true);
-
- Provider [] list = Security.getProviders();
- for(int counter=0;counter<list.length;counter++)
- {
- System.out.println(list[counter].getName());
- }
-
- KeyStore.getInstance("IAIKKeyStore");
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }
- }
-
- public static String getSignedDataStream(byte[] signedData, byte[] message,boolean two_users) throws CMSException, IOException {
-
- // we are testing the stream interface
- ByteArrayInputStream is = new ByteArrayInputStream(signedData);
- // create the ContentInfo object
- ContentInfoStream cis = new ContentInfoStream(is);
- System.out.println("This ContentInfo holds content of type " + cis.getContentType().getName());
- SignedDataStream signed_data = null;
-
- if (message == null) {
- // implicitly signed; get the content
- signed_data = (SignedDataStream)cis.getContent();
- }
- else {
- // explicitly signed; set the data stream for digesting the message
- AlgorithmID[] algIDs = { AlgorithmID.sha1, AlgorithmID.md5 };
- signed_data = new SignedDataStream(new ByteArrayInputStream(message), algIDs);
-
- }
-
- // get an InputStream for reading the signed content
- InputStream data = signed_data.getInputStream();
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- StreamCopier sc = new StreamCopier(data, os);
- sc.copyStream();
-
-
- if (message != null) {
- // if explicitly signed read now the DER encoded object
- // an explicit S/MIME signed message also consits of message|signature
- signed_data.decode(cis.getContentInputStream());
- }
-
- System.out.println("SignedData contains the following signer information:");
- SignerInfo[] signer_infos = signed_data.getSignerInfos();
-
- for (int i=0; i<signer_infos.length; i++) {
- try {
- // verify the signed data using the SignerInfo at index i
- X509Certificate signer_cert = signed_data.verify(i);
- // if the signature is OK the certificate of the signer is returned
- System.out.println("Signature OK from signer: "+signer_cert.getSubjectDN());
- Attribute signingTime = signer_infos[i].getSignedAttribute(ObjectID.signingTime);
- if (signingTime != null) {
- ChoiceOfTime cot = new ChoiceOfTime(signingTime.getValue()[0]);
- System.out.println("This message has been signed at " + cot.getDate());
- }
- Attribute contentType = signer_infos[i].getSignedAttribute(ObjectID.contentType);
- if (contentType != null) {
- System.out.println("The content has CMS content type " + contentType.getValue()[0]);
- }
-
- } catch (SignatureException ex) {
- // if the signature is not OK a SignatureException is thrown
- System.out.println("Signature ERROR from signer: "+signed_data.getCertificate((signer_infos[i].getSignerIdentifier())).getSubjectDN());
- ex.printStackTrace();
- } catch (CodingException ex) {
- System.out.println("Attribute decoding error: " + ex.getMessage());
- ex.printStackTrace();
- }
- }
-
- return os.toString();
- }
-
-}
diff --git a/spss.test/src/testgenerator/TestCases.java b/spss.test/src/testgenerator/TestCases.java
deleted file mode 100644
index db61af297..000000000
--- a/spss.test/src/testgenerator/TestCases.java
+++ /dev/null
@@ -1,611 +0,0 @@
-package testgenerator;
-import iaik.ixsil.init.IXSILInit;
-import iaik.ixsil.util.DOMUtilsImpl;
-import iaik.ixsil.util.URI;
-
-import iaik.asn1.ASN1Object;
-import iaik.asn1.ObjectID;
-import iaik.asn1.structures.AlgorithmID;
-import iaik.asn1.structures.Attribute;
-import iaik.asn1.structures.ChoiceOfTime;
-import iaik.asn1.structures.Name;
-import iaik.cms.CMSException;
-import iaik.cms.ContentInfo;
-import iaik.cms.IssuerAndSerialNumber;
-import iaik.cms.SignedData;
-import iaik.cms.SignerInfo;
-import iaik.pkcs.pkcs12.CertificateBag;
-import iaik.pkcs.pkcs12.KeyBag;
-import iaik.pkcs.pkcs12.PKCS12;
-import iaik.security.ecc.interfaces.ECDSAPrivateKey;
-import iaik.security.provider.IAIK;
-import iaik.utils.Base64OutputStream;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayWriter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.math.BigInteger;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Properties;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Base class for all tutorial units.
- * Provides some basic functionality, such as properties and signature
- * serialization.
- */
-public class TestCases
-{
- public String Node2String(Node outputNode)
- throws
- TransformerFactoryConfigurationError,
- TransformerConfigurationException,
- TransformerException {
- CharArrayWriter caw = new CharArrayWriter();
- TransformerFactory transformerFactory =
- TransformerFactory.newInstance();
- Transformer transformer = transformerFactory.newTransformer();
- transformer.setOutputProperty(OutputKeys.METHOD, "xml");
- transformer.setOutputProperty(OutputKeys.ENCODING, "utf-8");
- transformer.transform(new DOMSource(outputNode), new StreamResult(caw));
-
- String erg = caw.toString();
- return erg;
- }
-
- public void findNode(Node base,String name,ArrayList foundNodes)
- {
- findNode(base,name,foundNodes,-1);
- }
-
-
- public void findNode(Node base,String name,ArrayList foundNodes, int max_level)
- {
- findNode(base,name,foundNodes,max_level,0);
- }
-
-
- public void findNode(Node base,String name,ArrayList foundNodes, int max_level, int level)
- {
- if(max_level!=-1 && max_level<=level) return;
- //System.out.println("FINDNODE "+name);
- //System.out.println("CHECKING "+base.getNodeName());
- if(base.getNodeName().equals(name))
- {
- //System.out.println("ADD BASE !"+name);
- foundNodes.add(base);
- }
-
- NodeList children = base.getChildNodes();
- int size = children.getLength();
- for(int counter=0;counter<size;counter++)
- {
- findNode(children.item(counter),name,foundNodes,max_level,level+1);
- }
- }
-
- Properties configuration_;
- boolean[] variations_;
-
- /* ==================================================================================================== */
-
- public TestCases() throws Exception
- {
- // Set some basic configuration properties
- configuration_ = new Properties();
-
- String baseDir = "e:/cio/projekte/basismodule/wartung/projekt/spss.test/";
- String webBaseDir = "http://localhost:8080/moa-spss-testdata/";
-
- configuration_.setProperty("baseDir", baseDir);
- configuration_.setProperty("webbaseDir", webBaseDir);
-
- configuration_.setProperty("PKCS12file", (baseDir + "/resources/test-ee2003_normal(buergerkarte).p12"));
- configuration_.setProperty("PKCS12password", "buergerkarte");
-
- configuration_.setProperty("ECDSPKCS12file", baseDir + "/resources/ecc(ego).p12");
- configuration_.setProperty("ECDSPKCS12password", "ego");
-
- configuration_.setProperty("IXSILInitPropertiesURI", "file:/" + baseDir + "resources/init.properties");
-
- configuration_.setProperty("CERT", baseDir + "resources/test-ee2003_normal_extract.cer");
-
- // Initialize IXSIL
- IXSILInit.init(new URI(configuration_.getProperty("IXSILInitPropertiesURI")));
-
- // Switch on debug information
- IXSILInit.setPrintDebugLog(true);
-
- // Add IAIK JCE provider
- IAIK.addAsProvider();
- }
-
- public String X509name = null;
- public BigInteger X509number = null;
- public String X509hash = null;
- public String X509sub = null;
- public iaik.x509.X509Certificate user1_sign = null;
-
- public void getX509Content() throws Exception
- {
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(configuration_.getProperty("CERT")));
- iaik.x509.X509Certificate cert = new iaik.x509.X509Certificate(bis);
- X509name = ((Name)(cert.getIssuerDN())).getRFC2253String();
- X509number = cert.getSerialNumber();
- X509hash = new String(cert.getFingerprintSHA());
- X509sub = ((Name)(cert.getSubjectDN())).getRFC2253String();
- }
-
- /* ==================================================================================================== */
-
- public void serialize2File(Document signature, String fileName) throws Exception
- {
- FileOutputStream signatureFIS = new FileOutputStream(fileName);
- DOMUtilsImpl.serializeDocument(signature, signatureFIS);
- }
-
- /* ==================================================================================================== */
-
- public static HashMap pkcs12cache = new HashMap();
-
- public PKCS12 decryptPKCS12( String pkcs12file, String password ) throws Exception
- {
- if(pkcs12cache.containsKey(pkcs12file)) return (PKCS12) pkcs12cache.get(pkcs12file);
- PKCS12 pkcs12 = new PKCS12(new FileInputStream(pkcs12file));
-
-// if (!pkcs12.verify(password.toCharArray())) {
-// System.out.println("could not verify pkcs12 " + pkcs12.toString() + " with password " + password);
-// } else {
-// System.out.println("verified pkcs12 " + pkcs12.toString() + " with password " + password);
-// }
-
- pkcs12.decrypt(password.toCharArray());
- System.out.println("decrypted pkcs12 " + pkcs12.toString() + " with password " + password);
- pkcs12cache.put(pkcs12file,pkcs12);
- return pkcs12;
- }
-
- /* ==================================================================================================== */
-
- public static HashMap privkeycache = new HashMap();
-
- public RSAPrivateKey getPrivateKey( PKCS12 pkcs12 ) throws Exception
- {
- if(privkeycache.containsKey(pkcs12)) return (RSAPrivateKey)privkeycache.get(pkcs12);
- KeyBag[] keyBags = pkcs12.getKeyBags();
- System.out.println("PKCS12.getKeyBags(): " + keyBags.length + " KeyBags found");
- privkeycache.put(pkcs12,keyBags[0].getPrivateKey());
- return (RSAPrivateKey) keyBags[0].getPrivateKey();
- }
-
- public static HashMap ecdsaprivkeycache = new HashMap();
-
- public ECDSAPrivateKey getPrivateKeyECDS( PKCS12 pkcs12 ) throws Exception
- {
- if(ecdsaprivkeycache.containsKey(pkcs12)) return (ECDSAPrivateKey)ecdsaprivkeycache.get(pkcs12);
- KeyBag[] keyBags = pkcs12.getKeyBags();
- System.out.println("PKCS12.getKeyBags(): " + keyBags.length + " KeyBags found");
- ecdsaprivkeycache.put(pkcs12,keyBags[0].getPrivateKey());
- return (ECDSAPrivateKey) keyBags[0].getPrivateKey();
- }
-
- /* ==================================================================================================== */
-
- public static HashMap x509cache = new HashMap();
-
- public X509Certificate[] getCertificates( PKCS12 pkcs12 ) throws Exception
- {
- if(x509cache.containsKey(pkcs12)) return (X509Certificate[])x509cache.get(pkcs12);
- X509Certificate[] ret = CertificateBag.getCertificates(pkcs12.getCertificateBags());
- x509cache.put(pkcs12,ret);
- return ret;
- }
-
- /* ==================================================================================================== */
- /* ==================Created and or changed Methods by Stefan Knirsch================================== */
- /* ==================================================================================================== */
-
- public String vxReqFile(String testNumber)
- {
- return configuration_.getProperty("baseDir") +
- "/data/VX0/"+
- configuration_.getProperty("TestClass") +
- "." +
- testNumber +
- ".Req.xml";
- }
-
- public String vxResFile(String testNumber)
- {
- return configuration_.getProperty("baseDir") +
- "/data/VX0/"+
- configuration_.getProperty("TestClass") +
- "." +
- testNumber +
- ".Res.xml";
- }
-
- public String vxReqFileL(String testNumber,String filename)
- {
- return configuration_.getProperty("baseDir") +
- "/data/LVX"+filename+"/"+
- configuration_.getProperty("TestClass") +
- "." +
- testNumber +
- ".Req.xml";
- }
-
- public String vxResFileL(String testNumber,String filename)
- {
- return configuration_.getProperty("baseDir") +
- "/data/LVX"+filename+"/"+
- configuration_.getProperty("TestClass") +
- "." +
- testNumber +
- ".Res.xml";
- }
-
- public void createVXConfig() throws Exception {
-
- String file =
- configuration_.getProperty("baseDir")
- + "resources/"
- + configuration_.getProperty("TestClass")
- + ".Config.xml";
- String config =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
- "<MOAConfiguration xmlns=\"http://reference.e-government.gv.at/namespace/moaconfig/20021122#\">"
- + "<TrustProfile id=\"TrustProfile1\" uri=\"file://SERVER_WORKING_DIRECTORY/TrustProfile1\"/>"
- + "<SupplementProfile id=\"SupplementProfile1\" uri=\"file://SERVER_WORKING_DIRECTORY/SupplementProfile1\"/>"
- + "<SupplementProfile id=\"SupplementProfile2\" uri=\"file://SERVER_WORKING_DIRECTORY/SupplementProfile2\"/>"
- + "</MOAConfiguration>";
-
- FileOutputStream fos = new FileOutputStream(file);
- fos.write(config.getBytes());
- }
-
- /**
- * Method replaceString.
- * @param input: String to be changed
- * @param oldPart: subString in input to be changed
- * @param newPart: new subString instead of the oldPart
- * @return String
- * @throws Exception
- */
- public static String replaceString(
- String input,
- String oldPart,
- String newPart)
- throws Exception {
- String erg = null;
-
- //First Part
- erg = input.substring(0, input.indexOf(oldPart));
- //Insert new Part
- erg += newPart;
-
- //insert REST
- erg
- += input.substring(
- input.indexOf(oldPart) + oldPart.length(),
- input.length());
-
- return erg;
- }
-
- public static String replaceStringAll(
- String input,
- String oldPart,
- String newPart)
- throws Exception {
-
- String erg = input;
-
- while(true)
- {
-
- //First Part
- int pos = input.indexOf(oldPart);
- if(pos==-1) break;
- erg = input.substring(0, pos);
-
- //Insert new Part
- erg += newPart;
-
- //insert REST
- erg
- += input.substring(
- input.indexOf(oldPart) + oldPart.length(),
- input.length());
-
- input = erg;
- }
- return erg;
- }
-
- /**
- * Method readFile.
- * @param filename
- * @return String
- * @throws Exception
- */
-
- public String readFile(String filename) throws Exception {
-
- /*StringBuffer data = new StringBuffer();
- String line = null;
- BufferedReader br = new BufferedReader(new FileReader(filename));
- while ((line = br.readLine()) != null) {
- data.append(line);
- data.append("\n");
- }
- */
- RandomAccessFile raf = new RandomAccessFile(filename, "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("file too big to fit in byte array.");
-
- byte[] result = new byte[(int) raf.length()];
-
- raf.read(result);
-
- return new String(result);
-
- }
- /**
- * Method readBinaryFileAsBase64.
- * @param filename
- * @return Stringrepresentation as Base64 of the inputfile and saves that file
- * @throws Exception
- */
- public String readBinaryFileAsBase64_new(String filename) throws Exception {
-
- RandomAccessFile raf = new RandomAccessFile(filename, "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("file too big to fit in byte array.");
- byte[] result = new byte[(int) raf.length()];
- //READ the original binary Data
- raf.read(result);
-
- //Convert the data to bas64 and store it in a new file
-
- ByteArrayOutputStream fos = new ByteArrayOutputStream();
- Base64OutputStream base64os = new Base64OutputStream(fos);
- base64os.write(result);
- base64os.flush();
-
- return fos.toString();
-
- }
- public String readBinaryFileAsBase64(String filename) throws Exception {
-
- RandomAccessFile raf = new RandomAccessFile(filename, "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("file too big to fit in byte array.");
- byte[] result = new byte[(int) raf.length()];
- //READ the original binary Data
- raf.read(result);
-
- //Convert the data to bas64 and store it in a new file
- FileOutputStream fos = new FileOutputStream(filename + "base64.enc");
- Base64OutputStream base64os = new Base64OutputStream(fos);
- base64os.write(result);
- base64os.flush();
- base64os.close();
-
- //read the converted data und return it
- raf = new RandomAccessFile(filename + "base64.enc", "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("Converted base64 file too big to fit in byte array.");
- result = new byte[(int) raf.length()];
- //READ the original binary Data
- raf.read(result);
-
- return new String(result);
-
- }
-
- /**
- * Method writeFile.
- * @param filename
- * @param data
- * @throws Exception
- */
- public void writeFile(String filename, String data) throws Exception {
- BufferedWriter bw = new BufferedWriter(new FileWriter(filename));
- bw.write(data);
- bw.close();
- }
-
- /**
- * Method writeFileBinary
- * @param filename
- * @param data
- * @throws Exception
- */
- public void writeFileBinary(String filename, byte[] data) throws Exception {
- BufferedOutputStream bw = new BufferedOutputStream(new FileOutputStream(filename));
- bw.write(data);
- bw.close();
- }
- /**
- * Method getDate.
- * @param changeHours to change the time into the past or future
- * @return String
- */
-
- public String getDate(long changeHours) {
-
- //Use the XML-Format for the Time
- SimpleDateFormat formatter =
- new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'+01:00");
- //get the current Time
- Date currentTime = new Date();
- //add or substract a few hours
- currentTime.setTime(
- (currentTime.getTime() + changeHours * 1000 * 60 * 60));
-
- return formatter.format(currentTime);
- }
-
- public ASN1Object createSignedCMSData(byte[] message, int mode,boolean two_users) throws Exception {
-
- System.out.println("Create a new message signed by user 1:");
-
- // create a new SignedData object which includes the data
- SignedData signed_data = new SignedData(message, mode);
- // SignedData shall include the certificate chain for verifying
-
- PKCS12 pkcs12 = decryptPKCS12(
- configuration_.getProperty("PKCS12file"),
- configuration_.getProperty("PKCS12password"));
-
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(configuration_.getProperty("CERT")));
- iaik.x509.X509Certificate cert = new iaik.x509.X509Certificate(bis);
- user1_sign = cert;
- X509name = ((Name)(cert.getIssuerDN())).getRFC2253String();
- X509number = cert.getSerialNumber();
- X509hash = new String(cert.getFingerprintSHA());
- X509sub = ((Name)cert.getSubjectDN()).getRFC2253String();
-
- iaik.x509.X509Certificate[] certarray = new iaik.x509.X509Certificate[1];
- certarray[0] = cert;
-
- signed_data.setCertificates(certarray);
-
-
- RSAPrivateKey privateKey = getPrivateKey( pkcs12 );
-
- // cert at index 0 is the user certificate
- IssuerAndSerialNumber issuer = new IssuerAndSerialNumber((Name)cert.getIssuerDN(),X509number);
-
- // create a new SignerInfo
- SignerInfo signer_info = new SignerInfo(issuer, AlgorithmID.sha1, privateKey);
- // create some authenticated attributes
- // the message digest attribute is automatically added
- Attribute[] attributes = new Attribute[2];
- // content type is data
- attributes[0] = new Attribute(ObjectID.contentType, new ASN1Object[] {ObjectID.cms_data});
- // signing time is now
- attributes[1] = new Attribute(ObjectID.signingTime, new ASN1Object[] {new ChoiceOfTime().toASN1Object()});
- // set the attributes
- signer_info.setSignedAttributes(attributes);
- // finish the creation of SignerInfo by calling method addSigner
- try {
- signed_data.addSignerInfo(signer_info);
-
- if(two_users)
- {
- // another SignerInfo without authenticated attributes and MD5 as hash algorithm
- signer_info = new SignerInfo(new IssuerAndSerialNumber((Name)cert.getIssuerDN(),X509number),
- AlgorithmID.md5, privateKey);
- // the message digest itself is protected
- signed_data.addSignerInfo(signer_info);
- }
-
- } catch (NoSuchAlgorithmException ex) {
- ex.printStackTrace();
- throw new CMSException("No implementation for signature algorithm: "+ex.getMessage());
- }
-
- ContentInfo ci = new ContentInfo(signed_data);
- return ci.toASN1Object();
- }
-
- public ASN1Object createSignedCMSData(byte[] message, int mode,boolean two_users,String pkcs12file,String pkcs12password,String certname) throws Exception {
-
- System.out.println("Create a new message signed by user 1:");
-
- // create a new SignedData object which includes the data
- SignedData signed_data = new SignedData(message, mode);
- // SignedData shall include the certificate chain for verifying
-
- PKCS12 pkcs12 = decryptPKCS12(
- configuration_.getProperty(pkcs12file),
- configuration_.getProperty(pkcs12password));
-
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(configuration_.getProperty(certname)));
- iaik.x509.X509Certificate cert = new iaik.x509.X509Certificate(bis);
- X509name = ((Name)(cert.getIssuerDN())).getRFC2253String();
- X509number = cert.getSerialNumber();
- X509hash = new String(cert.getFingerprintSHA());
- X509sub = ((Name)cert.getSubjectDN()).getRFC2253String();
-
- iaik.x509.X509Certificate[] certarray = new iaik.x509.X509Certificate[1];
- certarray[0] = cert;
-
- signed_data.setCertificates(certarray);
-
-
- RSAPrivateKey privateKey = getPrivateKey( pkcs12 );
-
- // cert at index 0 is the user certificate
- IssuerAndSerialNumber issuer = new IssuerAndSerialNumber((Name)cert.getIssuerDN(),X509number);
-
- // create a new SignerInfo
- SignerInfo signer_info = new SignerInfo(issuer, AlgorithmID.sha1, privateKey);
- // create some authenticated attributes
- // the message digest attribute is automatically added
- Attribute[] attributes = new Attribute[2];
- // content type is data
- attributes[0] = new Attribute(ObjectID.contentType, new ASN1Object[] {ObjectID.cms_data});
- // signing time is now
- attributes[1] = new Attribute(ObjectID.signingTime, new ASN1Object[] {new ChoiceOfTime().toASN1Object()});
- // set the attributes
- signer_info.setSignedAttributes(attributes);
- // finish the creation of SignerInfo by calling method addSigner
- try {
- signed_data.addSignerInfo(signer_info);
-
- if(two_users)
- {
- // another SignerInfo without authenticated attributes and MD5 as hash algorithm
- signer_info = new SignerInfo(new IssuerAndSerialNumber((Name)cert.getIssuerDN(),X509number),
- AlgorithmID.md5, privateKey);
- // the message digest itself is protected
- signed_data.addSignerInfo(signer_info);
- }
-
- } catch (NoSuchAlgorithmException ex) {
- throw new CMSException("No implementation for signature algorithm: "+ex.getMessage());
- }
-
- ContentInfo ci = new ContentInfo(signed_data);
- return ci.toASN1Object();
- }
-
-public String cutXML(String input)
- {
- int pos = input.indexOf(">");
- if(pos!=-1)
- return input.substring(pos+1);
- else
- return input;
- }
-
-
-}
diff --git a/spss.test/src/testgenerator/TestGeneratorCX0.java b/spss.test/src/testgenerator/TestGeneratorCX0.java
deleted file mode 100644
index 31778c6a2..000000000
--- a/spss.test/src/testgenerator/TestGeneratorCX0.java
+++ /dev/null
@@ -1,2940 +0,0 @@
-
-package testgenerator;
-import iaik.apps.util.passphrase.PassphrasePrompt;
-import iaik.asn1.structures.Name;
-import iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXML;
-import iaik.ixsil.algorithms.DigestAlgorithmImplSHA1;
-import iaik.ixsil.algorithms.SignatureAlgorithmImplECDSA;
-import iaik.ixsil.algorithms.SignatureAlgorithmImplRSA;
-import iaik.ixsil.algorithms.TransformImplBase64Decode;
-import iaik.ixsil.core.Signer;
-import iaik.ixsil.core.SignerManifest;
-import iaik.ixsil.core.SignerReference;
-import iaik.ixsil.core.SignerSignature;
-import iaik.ixsil.core.SignerSignedInfo;
-import iaik.ixsil.init.IXSILConstants;
-import iaik.ixsil.init.IXSILInit;
-import iaik.ixsil.keyinfo.KeyManagerImpl;
-import iaik.ixsil.keyinfo.x509.KeyProviderImplX509Data;
-import iaik.ixsil.keyinfo.x509.X509Data;
-import iaik.ixsil.util.URI;
-import iaik.pkcs.pkcs11.objects.Certificate;
-import iaik.pkcs.pkcs11.objects.PrivateKey;
-import iaik.pkcs.pkcs11.objects.PublicKey;
-import iaik.pkcs.pkcs11.provider.IAIKPkcs11;
-import iaik.pkcs.pkcs11.provider.keys.IAIKPKCS11RsaPrivateKey;
-import iaik.pkcs.pkcs11.provider.keys.IAIKPKCS11RsaPublicKey;
-import iaik.pkcs.pkcs12.CertificateBag;
-import iaik.pkcs.pkcs12.PKCS12;
-import iaik.security.ecc.interfaces.ECDSAPrivateKey;
-import iaik.security.provider.IAIK;
-import iaik.utils.Base64OutputStream;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.net.URL;
-import java.security.Key;
-import java.security.KeyStore;
-import java.security.Security;
-import java.security.Signature;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Properties;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xerces.dom.DocumentFragmentImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-import sun.misc.BASE64Encoder;
-
-/**
- * @author stephan
- */
-public class TestGeneratorCX0 extends TestCases {
-
- String datadirectory = "data/CX0/";
- String datadirectory_3 = "data/CX3/";
- String datadirectory_4 = "data/CX4/";
- String datadirectory_l = "data/LCX";
-
- public String defaultblock = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\">\n"+
- " <!-- Hint -->\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- public static void main(String[] args) throws Exception {
- TestGeneratorCX0 testcase = new TestGeneratorCX0();
-
- testcase.createConfig();
- testcase.create001();
- testcase.create002();
- testcase.create003();
- //testcase.create004();
- testcase.create005();
- //testcase.create006();
- testcase.create007();
- testcase.create008();
- testcase.create009();
- testcase.create010();
- testcase.create011();
- testcase.create012();
- testcase.create013();
- testcase.create014();
- testcase.create015();
- testcase.create016();
- testcase.create017();
- testcase.create018();
- testcase.create019();
-
- testcase.create051();
- testcase.create052();
- testcase.create053();
- testcase.create054();
- testcase.create055();
- testcase.create056();
- testcase.create057();
- testcase.create058();
- testcase.create059();
- testcase.create060();
- //testcase.create061();
- testcase.create062();
- //testcase.create063();
- testcase.create064();
- testcase.create065();
-
- //testcase.createL00();*/
-
- }
-
- /* ==================================================================================================== */
-
- public TestGeneratorCX0() throws Exception {
-
- super();
-
- // Set config properties
- configuration_.setProperty("TestClass", "TestGeneratorCX0");
-// configuration_.setProperty("privateKeyFile", baseDir + "additionalFiles/keys/RSAPrivateKey.der");
-// configuration_.setProperty("publicKeyFile", baseDir + "additionalFiles/keys/RSAPublicKey.der");
-// configuration_.setProperty("signatureFile", baseDir + "additionalFiles/signatures/Signature.unit1.xml");
-
- iaik.security.provider.IAIK.addAsProvider();
- iaik.security.provider.IAIK.addAsJDK14Provider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
- //iaik.security.ecc.provider.ECCProvider.addAsProvider();
- }
-
- /* ==================================================================================================== */
-
- public Document createECDSPKCS12Sig(String tn,String fileref) throws Exception
- {
- String TestNumber = tn;
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- // String res = "emtpy";
- // FileOutputStream resFOS = new FileOutputStream(resFile);
- // resFOS.write(res.getBytes());
-
- PKCS12 pkcs12 = decryptPKCS12(
- configuration_.getProperty("ECDSPKCS12file"),
- configuration_.getProperty("ECDSPKCS12password" ) );
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- Signer signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- SignerSignedInfo signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set canonicalization algorithm
- CanonicalizationAlgorithmImplCanonicalXML c14nAlg =
- new CanonicalizationAlgorithmImplCanonicalXML();
- signedInfo.setCanonicalizationAlgorithm(c14nAlg);
-
- CertificateBag cb[] = pkcs12.getCertificateBags();
- System.out.println("LEN:"+cb.length);
- iaik.x509.X509Certificate cert[] = cb[0].getCertificates(cb);
- System.out.println("LEN2:"+cert.length);
- System.out.println("CERT:"+(((Name)(cert[0].getIssuerDN())).getRFC2253String()));
-
-
- // Set signature algorithm
- /* TODO: Change to ECDS Impl */
- SignatureAlgorithmImplECDSA signatureAlg = new SignatureAlgorithmImplECDSA();
- ECDSAPrivateKey privateKey = getPrivateKeyECDS( pkcs12 );
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(fileref);
-
- SignerReference reference = signedInfo.createReference();
- reference.setURI(refURI);
- reference.setId("reference-1-1");
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- // Add reference to signature
- signedInfo.addReference(reference);
-
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- X509Certificate[] certs = getCertificates(pkcs12);
- X509Data x509Data = new X509Data();
- for (int i = 0; i < certs.length; i++)
- {
- x509Data.insertHintAt(certs[i], i);
- }
-
- KeyProviderImplX509Data x509DataKeyProvider = new KeyProviderImplX509Data(signer.toDocument());
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- signer.getSignature().setKeyManager(keyManager);
- signer.getSignature().setId("signature-1-1");
- // Compute signature value
- signer.getSignature().sign();
- Document doc = signer.toDocument();
- System.out.println(doc.getDocumentElement().getNodeName());
-
- return doc;
- }
-
- public Document createPKCS12Sig(String tn,String fileref) throws Exception
- {
- return createPKCS12Sig(tn,fileref,false,false,null,false);
- }
-
- public Document createPKCS12Sig(String tn,String fileref,String id1,String id2) throws Exception
- {
- return createPKCS12Sig(tn,fileref,false,false,null,false,id1,id2);
- }
-
- public Document createPKCS12SigWithEnveloping(String TestNumber,String data) throws Exception
- {
- return createPKCS12Sig(TestNumber,data,true,false,null,false);
- }
-
- public Document createPKCS12Sig(String TestNumber,String data,boolean env,boolean mani) throws Exception
- {
- return createPKCS12Sig(TestNumber,data,env,mani,null,false);
- }
-
- public Document createPKCS12Sig(String TestNumber,String data,boolean env,boolean mani,String data2,boolean env2) throws Exception
- {
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- PKCS12 pkcs12 = decryptPKCS12(
- configuration_.getProperty("PKCS12file"),
- configuration_.getProperty("PKCS12password" ) );
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- Signer signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- SignerSignature signature = signer.getSignature();
- SignerSignedInfo signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set canonicalization algorithm
- CanonicalizationAlgorithmImplCanonicalXML c14nAlg =
- new CanonicalizationAlgorithmImplCanonicalXML();
- signedInfo.setCanonicalizationAlgorithm(c14nAlg);
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg = new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey( pkcs12 );
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- if(!mani)
- {
- SignerReference reference = signedInfo.createReference();
- if(env)
- {
- iaik.ixsil.core.Object object = null;
- //object = signature.createObject(data);
- if(data.startsWith("<xml"))
- {
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(data.getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if(data.startsWith("<Testdaten"))
- {
-
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(("<?xml version=\"1.0\" encoding=\"utf-8\"?>"+data).getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if(data.startsWith("b64:"))
- {
- data = data.substring(4);
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.newDocument();
- Element root = doc.createElement("root");
- doc.appendChild(root);
- //String encoded = Base64Utils.encode(data.getBytes());
- String encoded = Base64Utils.encode(data.getBytes());
- /*encoded = replaceStringAll(encoded,"\n","");
- encoded = replaceStringAll(encoded,"\r","");*/
- Text textnode = doc.createTextNode(encoded);
-
- System.out.println("Encoded:"+encoded);
- //root.appendChild(textnode);
-
- DocumentFragment df = doc.createDocumentFragment();
-
- df.appendChild(textnode);
-
- object = signature.createObject(df);
-
- TransformImplBase64Decode trans = new TransformImplBase64Decode();
- InputStream s = new ByteArrayInputStream(encoded.getBytes());
- trans.setInput(s,null);
-
- reference.insertTransformAt(trans,0);
- }
- else
- {
- object = signature.createObject(data);
- }
-
- object.setId("signed-data-1-1-1");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(new URI("#xpointer(id('signed-data-1-1-1')/node())"));
-
-
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data);
-
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- reference.setId("reference-1-1");
- signedInfo.addReference(reference);
- }
-
- if(data2!=null)
- {
- SignerReference reference = signedInfo.createReference();
- reference = signedInfo.createReference();
- if(env2)
- {
- iaik.ixsil.core.Object object = null;
- if(data2.startsWith("<xml"))
- {
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(data.getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if(data2.startsWith("<Testdaten"))
- {
-
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(("<?xml version=\"1.0\" encoding=\"utf-8\"?>"+data).getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else
- object = signature.createObject(data2);
-
- if(!env)
- object.setId("signed-data-1-2-1");
- else
- object.setId("signed-data-1-2-1");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- if(!env)
- reference.setURI(new URI("#xpointer(id('signed-data-1-2-1')/node())"));
- else
- reference.setURI(new URI("#xpointer(id('signed-data-1-2-1')/node())"));
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data2);
-
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- reference.setId("reference-1-2");
- signedInfo.addReference(reference);
- }
-
- // Add reference to signature
-
-
-
- if(mani)
- {
-
- /*iaik.ixsil.core.Object object = null;
- if(env)
- object = signature.createObject(readFile(data));
- else
- object = signature.createObject(data);
-
- object.setId("envelopedData");
- signature.addObject(object);*/
- SignerReference reference = signedInfo.createReference();
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- manifestRef.setDigestAlgorithm(digestAlg);
-
- manifestRef.setURI(new URI(data));
- manifestRef.setId("reference-1-1");
-
- manifest.addReference(manifestRef);
- manifest.setId("dsig-manifest-1-1");
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = signedInfo.createReference();
- reference.setURI(
- new URI("#dsig-manifest-1-1"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);
-
-
- /*Element envelopedDataElem =
- signer.toDocument().createElement("EnvelopedDataElement");
-
- if(env)
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(readFile(data)));
- }
- else
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(data));
- }
-
- iaik.ixsil.core.Object object = signature.createObject(envelopedDataElem);
- signature.addObject(object);
-
- // Create Manifest with a single reference pointing to the enveloped data
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
- manifestRef.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[1]/descendant::node())"));
- manifestRef.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
- manifest.addReference(manifestRef);
-
- // Add Manifest to signature structure (use an Object) and compute digest values for manifest reference
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- // Create and configure reference to manifest
- reference = signedInfo.createReference();
- reference.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[2]/dsig:Manifest)"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);*/
- }
-
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- X509Certificate[] certs = getCertificates(pkcs12);
- X509Data x509Data = new X509Data();
- x509Data.insertHintAt(certs[1], 0);
- /*for (int i = 0; i < certs.length; i++)
- {
-
- }*/
-
- KeyProviderImplX509Data x509DataKeyProvider = new KeyProviderImplX509Data(signer.toDocument());
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- signer.getSignature().setKeyManager(keyManager);
- signer.getSignature().setId("signature-1-1");
- // Compute signature value
- signer.getSignature().sign();
-
- return signer.toDocument();
- }
-
- public Document createPKCS12Sig(String TestNumber,String data,boolean env,boolean mani,String data2,boolean env2,String id1,String id2) throws Exception
- {
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- PKCS12 pkcs12 = decryptPKCS12(
- configuration_.getProperty("PKCS12file"),
- configuration_.getProperty("PKCS12password" ) );
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- Signer signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- SignerSignature signature = signer.getSignature();
- SignerSignedInfo signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set canonicalization algorithm
- CanonicalizationAlgorithmImplCanonicalXML c14nAlg =
- new CanonicalizationAlgorithmImplCanonicalXML();
- signedInfo.setCanonicalizationAlgorithm(c14nAlg);
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg = new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey( pkcs12 );
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- if(!mani)
- {
- SignerReference reference = signedInfo.createReference();
- if(env)
- {
- iaik.ixsil.core.Object object = null;
- //object = signature.createObject(data);
- if(data.startsWith("<xml"))
- {
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(data.getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if(data.startsWith("<Testdaten"))
- {
-
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(("<?xml version=\"1.0\" encoding=\"utf-8\"?>"+data).getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if(data.startsWith("b64:"))
- {
- data = data.substring(4);
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.newDocument();
- Element root = doc.createElement("root");
- doc.appendChild(root);
- //String encoded = Base64Utils.encode(data.getBytes());
- String encoded = Base64Utils.encode(data.getBytes());
- /*encoded = replaceStringAll(encoded,"\n","");
- encoded = replaceStringAll(encoded,"\r","");*/
- Text textnode = doc.createTextNode(encoded);
-
- System.out.println("Encoded:"+encoded);
- //root.appendChild(textnode);
-
- DocumentFragment df = doc.createDocumentFragment();
-
- df.appendChild(textnode);
-
- object = signature.createObject(df);
-
- TransformImplBase64Decode trans = new TransformImplBase64Decode();
- InputStream s = new ByteArrayInputStream(encoded.getBytes());
- trans.setInput(s,null);
-
- reference.insertTransformAt(trans,0);
- }
- else
- {
- object = signature.createObject(data);
- }
-
- object.setId("signed-data-1-1-1");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(new URI("#xpointer(id('signed-data-1-1-1')/node())"));
-
-
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data);
-
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- reference.setId("reference-2-1");
- signedInfo.addReference(reference);
- }
-
- if(data2!=null)
- {
- SignerReference reference = signedInfo.createReference();
- reference = signedInfo.createReference();
- if(env2)
- {
- iaik.ixsil.core.Object object = null;
- if(data2.startsWith("<xml"))
- {
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(data.getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if(data2.startsWith("<Testdaten"))
- {
-
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(("<?xml version=\"1.0\" encoding=\"utf-8\"?>"+data).getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else
- object = signature.createObject(data2);
-
- if(!env)
- object.setId("signed-data-1-2-1");
- else
- object.setId("signed-data-1-2-1");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- if(!env)
- reference.setURI(new URI("#xpointer(id('signed-data-1-2-1')/node())"));
- else
- reference.setURI(new URI("#xpointer(id('signed-data-1-2-1')/node())"));
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data2);
-
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- reference.setId("reference-1-2");
- signedInfo.addReference(reference);
- }
-
- // Add reference to signature
-
-
-
- if(mani)
- {
-
- /*iaik.ixsil.core.Object object = null;
- if(env)
- object = signature.createObject(readFile(data));
- else
- object = signature.createObject(data);
-
- object.setId("envelopedData");
- signature.addObject(object);*/
- SignerReference reference = signedInfo.createReference();
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- manifestRef.setDigestAlgorithm(digestAlg);
-
- manifestRef.setURI(new URI(data));
- manifestRef.setId("reference-1-1");
-
- manifest.addReference(manifestRef);
- manifest.setId("dsig-manifest-1-1");
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = signedInfo.createReference();
- reference.setURI(
- new URI("#dsig-manifest-1-1"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);
-
-
- /*Element envelopedDataElem =
- signer.toDocument().createElement("EnvelopedDataElement");
-
- if(env)
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(readFile(data)));
- }
- else
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(data));
- }
-
- iaik.ixsil.core.Object object = signature.createObject(envelopedDataElem);
- signature.addObject(object);
-
- // Create Manifest with a single reference pointing to the enveloped data
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
- manifestRef.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[1]/descendant::node())"));
- manifestRef.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
- manifest.addReference(manifestRef);
-
- // Add Manifest to signature structure (use an Object) and compute digest values for manifest reference
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- // Create and configure reference to manifest
- reference = signedInfo.createReference();
- reference.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[2]/dsig:Manifest)"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);*/
- }
-
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- X509Certificate[] certs = getCertificates(pkcs12);
- X509Data x509Data = new X509Data();
- x509Data.insertHintAt(certs[1], 0);
- /*for (int i = 0; i < certs.length; i++)
- {
-
- }*/
-
- KeyProviderImplX509Data x509DataKeyProvider = new KeyProviderImplX509Data(signer.toDocument());
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- signer.getSignature().setKeyManager(keyManager);
- signer.getSignature().setId("signature-2-1");
- // Compute signature value
- signer.getSignature().sign();
-
- return signer.toDocument();
- }
-
- public Document createHSMSig(String TestNumber,String data,boolean env,boolean mani,String data2,boolean env2) throws Exception
- {
- String keyId = null;
- String certId = null;
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- Signer signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- SignerSignature signature = signer.getSignature();
- SignerSignedInfo signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set canonicalization algorithm
- CanonicalizationAlgorithmImplCanonicalXML c14nAlg =
- new CanonicalizationAlgorithmImplCanonicalXML();
- signedInfo.setCanonicalizationAlgorithm(c14nAlg);
-
- Properties config = new Properties();
- config.put("PKCS11_NATIVE_MODULE","cryptoki.dll");
- config.put("SLOT_ID","0");
- config.put("DEFAULT_PROMPT_DIALOG","testgenerator.Pass");
-
- Security.addProvider(new IAIK());
- IAIKPkcs11 pkcs11Provider_ = new IAIKPkcs11(config);
- Security.addProvider(pkcs11Provider_);
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg = new SignatureAlgorithmImplRSA();
- signatureAlg.setJCEProviderName(pkcs11Provider_.getName());
-
- // HSM Action start
-
- // load the keystore of the PKCS#11 provider given via input stream
- KeyStore tokenKeyStore = pkcs11Provider_.getTokenManager().getKeyStore();
- tokenKeyStore.load(null,"1111".toCharArray());
-
- Enumeration enum = tokenKeyStore.aliases();
-
- String ali = null;
- while(enum.hasMoreElements())
- {
- //enum.nextElement();
- ali = (String)enum.nextElement();
- //ali = (String)enum.nextElement();
- System.out.println("Alias:"+ali);
- if(tokenKeyStore.containsAlias(ali)) System.out.println("ALIAS vorhanden");
- if(tokenKeyStore.isKeyEntry(ali)) System.out.println("KEYENTRY vorhanden");
- }
-
- Enumeration enum2 = tokenKeyStore.aliases();
-
- while (enum2.hasMoreElements()) {
- String alias = enum2.nextElement().toString();
-
- if (tokenKeyStore.isKeyEntry(alias)) {
- System.out.println("________________________________________________________________________________");
- System.out.println("Key entry with alias: " + alias);
- Key key = tokenKeyStore.getKey(alias, null);
- System.out.println(key);
- java.security.cert.Certificate[] certificateChain2 = tokenKeyStore.getCertificateChain(alias);
- if (certificateChain2 != null) {
- System.out.println("Certificate chain of length: " + certificateChain2.length);
- for (int i = 0; i < certificateChain2.length; i++) {
- System.out.println("--------------------------------------------------------------------------------");
- System.out.println(certificateChain2[i]);
- }
- } else {
- System.out.println("Certificate chain is null!");
- }
- System.out.println("________________________________________________________________________________");
- } else if (tokenKeyStore.isCertificateEntry(alias)) {
- System.out.println("________________________________________________________________________________");
- System.out.println("Certificate entry with alias: " + alias);
- java.security.cert.Certificate certificate = tokenKeyStore.getCertificate(alias);
- System.out.println(certificate);
- System.out.println("________________________________________________________________________________");
- } else {
- System.out.println("________________________________________________________________________________");
- System.out.println("ERROR! Unknown entry type with alias: " + alias);
- System.out.println("________________________________________________________________________________");
- }
- }
-
-
- IAIKPKCS11RsaPrivateKey privateKey = (IAIKPKCS11RsaPrivateKey)tokenKeyStore.getKey("MOAHSMRSAKEY_cert", null);
- keyId = new String(privateKey.getKeyID());
-
- System.out.println(new String(privateKey.getKeyID()));
- //System.out.println("got:"+signatureKey+" : "+signatureKey.getClass().getName());
-
- Signature signatureEngine = Signature.getInstance("ExternalSHA1WithRSA", pkcs11Provider_.getName());
- signatureEngine.initSign(privateKey);
- /*signatureEngine.update("This is some data to be signed.".getBytes());
- byte[] bytesig = signatureEngine.sign();
- System.out.println("SIG:"+new String(bytesig));
-
- System.out.println("KEY:\n"+privateKey);*/
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- SignerReference reference = signedInfo.createReference();
-
- if(!mani)
- {
- if(env)
- {
- iaik.ixsil.core.Object object = null;
- object = signature.createObject(data);
- object.setId("signed-data-0-1");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(new URI("#xpointer(id('signed-data-0-1')/node())"));
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data);
-
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- reference.setId("reference-1-1");
- signedInfo.addReference(reference);
- }
-
- if(data2!=null)
- {
- reference = signedInfo.createReference();
- if(env2)
- {
- iaik.ixsil.core.Object object = null;
- object = signature.createObject(data2);
- object.setId("signed-data-0-2");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(new URI("#xpointer(id('signed-data-0-2')/node())"));
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data2);
-
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- signedInfo.addReference(reference);
- }
-
- // Add reference to signature
-
-
-
- if(mani)
- {
-
- /*iaik.ixsil.core.Object object = null;
- if(env)
- object = signature.createObject(readFile(data));
- else
- object = signature.createObject(data);
-
- object.setId("envelopedData");
- signature.addObject(object);*/
-
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- manifestRef.setDigestAlgorithm(digestAlg);
-
- manifestRef.setURI(new URI(data));
-
- manifest.addReference(manifestRef);
- manifest.setId("manifest-1");
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = signedInfo.createReference();
- reference.setURI(
- new URI("#xpointer(id('manifest-1'))"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);
-
-
- /*Element envelopedDataElem =
- signer.toDocument().createElement("EnvelopedDataElement");
-
- if(env)
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(readFile(data)));
- }
- else
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(data));
- }
-
- iaik.ixsil.core.Object object = signature.createObject(envelopedDataElem);
- signature.addObject(object);
-
- // Create Manifest with a single reference pointing to the enveloped data
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
- manifestRef.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[1]/descendant::node())"));
- manifestRef.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
- manifest.addReference(manifestRef);
-
- // Add Manifest to signature structure (use an Object) and compute digest values for manifest reference
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- // Create and configure reference to manifest
- reference = signedInfo.createReference();
- reference.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[2]/dsig:Manifest)"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);*/
- }
-
- enum2 = tokenKeyStore.aliases();
-
- while(enum2.hasMoreElements())
- {
- System.out.println(enum2.nextElement());
- }
-
- enum2 = tokenKeyStore.aliases();
-
- while (enum2.hasMoreElements()) {
- String alias = enum2.nextElement().toString();
-
- if (tokenKeyStore.isKeyEntry(alias)) {
- System.out.println("________________________________________________________________________________");
- System.out.println("Key entry with alias: " + alias);
- Key key = tokenKeyStore.getKey(alias, null);
- System.out.println(key);
- java.security.cert.Certificate[] certificateChain2 = tokenKeyStore.getCertificateChain(alias);
- if (certificateChain2 != null) {
- System.out.println("Certificate chain of length: " + certificateChain2.length);
- for (int i = 0; i < certificateChain2.length; i++) {
- System.out.println("--------------------------------------------------------------------------------");
- System.out.println(certificateChain2[i]);
- }
- } else {
- System.out.println("Certificate chain is null!");
- }
- System.out.println("________________________________________________________________________________");
- } else if (tokenKeyStore.isCertificateEntry(alias)) {
- System.out.println("________________________________________________________________________________");
- System.out.println("Certificate entry with alias: " + alias);
- java.security.cert.Certificate certificate = tokenKeyStore.getCertificate(alias);
- System.out.println(certificate);
- System.out.println("________________________________________________________________________________");
- } else {
- System.out.println("________________________________________________________________________________");
- System.out.println("ERROR! Unknown entry type with alias: " + alias);
- System.out.println("________________________________________________________________________________");
- }
- }
-
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- //DOMUtils.serializeNode(keyManager.getKeyInfo());
-
- java.security.cert.Certificate[] certificateChain = tokenKeyStore.getCertificateChain("MOAHSMRSAKEY_cert");
-
- System.out.println("CERTLEN:"+certificateChain.length);
-
- X509Data x509Data = new X509Data();
- for (int i = 0; i < certificateChain.length; i++)
- {
- System.out.println("CERT:"+((Name)(((X509Certificate)certificateChain[i]).getIssuerDN())).getRFC2253String());
- x509Data.insertHintAt((X509Certificate)certificateChain[i], i);
- }
-
- KeyProviderImplX509Data x509DataKeyProvider = new KeyProviderImplX509Data(signer.toDocument());
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- signer.getSignature().setKeyManager(keyManager);
- signer.getSignature().setId("signature-1-1");
-
- // Compute signature value
- signer.getSignature().sign();
-
- return signer.toDocument();
- }
-
- public Document createPKCS12SigSL(String TestNumber,String data) throws Exception
- {
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- PKCS12 pkcs12 = decryptPKCS12(
- configuration_.getProperty("PKCS12file"),
- configuration_.getProperty("PKCS12password" ) );
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- Signer signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- SignerSignature signature = signer.getSignature();
- SignerSignedInfo signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set canonicalization algorithm
- CanonicalizationAlgorithmImplCanonicalXML c14nAlg =
- new CanonicalizationAlgorithmImplCanonicalXML();
- signedInfo.setCanonicalizationAlgorithm(c14nAlg);
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg = new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey( pkcs12 );
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- SignerReference reference = signedInfo.createReference();
-
- // env
- /*iaik.ixsil.core.Object object = null;
- object = signature.createObject(data);
- object.setId("envelopedData");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(new URI("#xpointer(id('envelopedData')/node())"));*/
-
- // detached
- // Create and configure reference
- URI refURI = null;
- refURI = new URI(data);
-
- reference.setURI(refURI);
- reference.setId("reference-1-1");
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- signedInfo.addReference(reference);
-
- reference = signedInfo.createReference();
-
- refURI = null;
- refURI = new URI(data);
-
- //reference.setURI(new URI("#xpointer(id('ETSIProperties'))/*/*"));
- reference.setURI(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-signed-1-1')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"));
- reference.setType(new URI("http://uri.etsi.org/01903/v1.1.1#SignedProperties"));
- digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- signedInfo.addReference(reference);
-
- /*iaik.ixsil.core.Object object = null;
- object = signature.createObject(data);
- object.setId("SLManifestObject");
-
- signature.addObject(object);*/
-
-
- /*SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
-
- digestAlg = new DigestAlgorithmImplSHA1();
- manifestRef.setDigestAlgorithm(digestAlg);
-
- manifestRef.setURI(new URI(data));
-
- manifest.addReference(manifestRef);
- manifest.setId("SLManifestObject");
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = manifest.createReference();
- reference.setType(new URI("http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest"));
- reference.setURI(new URI("#SLManifestObject"));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);*/
-
- iaik.ixsil.core.Object object = null;
- object = signature.createObject(getElement("TEST"));
- object.setId("etsi-signed-1-1");
- signature.addObject(object);
-
-
-
- /*if(mani)
- {
-
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- manifestRef.setDigestAlgorithm(digestAlg);
-
- manifestRef.setURI(new URI(data));
-
- manifest.addReference(manifestRef);
- manifest.setId("manifestObject");
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = signedInfo.createReference();
- reference.setURI(
- new URI("#xpointer(id('manifestObject'))"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);
-
- }*/
-
- signature.setId("signature-1-1");
-
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- X509Certificate[] certs = getCertificates(pkcs12);
- X509Data x509Data = new X509Data();
- x509Data.insertHintAt(certs[1], 0);
-
- KeyProviderImplX509Data x509DataKeyProvider = new KeyProviderImplX509Data(signer.toDocument());
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- signer.getSignature().setKeyManager(keyManager);
-
- // Compute signature value
- signer.getSignature().sign();
-
- return signer.toDocument();
- }
-
- public Element getElement(String data) throws Exception
- {
- String etsinamespace = "http://uri.etsi.org/01903/v1.1.1#";
-
- getX509Content();
-
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- //dbf.setNamespaceAware(true);
- //dbf.setValidating(true);
-
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-
-
- Element qualprop = doc.createElementNS(etsinamespace,"etsi:QualifyingProperties");
- qualprop.setAttributeNS(null,"Target","#signature-1-1");
- qualprop.setAttributeNS(IXSILConstants.NAMESPACE_URI_NAMESPACES_,"xmlns:etsi",etsinamespace);
- //qualprop.setPrefix("etsi");*/
- //qualprop.setAttributeNodeNS(doc.createAttributeNS(etsinamespace,"etsi"));
- Element signprop = doc.createElementNS(etsinamespace,"etsi:SignedProperties");
- Element signsigprop = doc.createElementNS(etsinamespace,"etsi:SignedSignatureProperties");
- Element signdataobjectprop = doc.createElementNS(etsinamespace,"etsi:SignedDataObjectProperties");
- Element signdate = doc.createElementNS(etsinamespace,"etsi:SigningTime");
- Text datevalue = doc.createTextNode("2003-05-10T00:01:01");
- Element signcert = doc.createElementNS(etsinamespace,"etsi:SigningCertificate");
- Element cert = doc.createElementNS(etsinamespace,"etsi:Cert");
- Element signpolyident = doc.createElementNS(etsinamespace,"etsi:SignaturePolicyIdentifier");
- Element signpolyimp = doc.createElementNS(etsinamespace,"etsi:SignaturePolicyImplied");
- Element certdig = doc.createElementNS(etsinamespace,"etsi:CertDigest");
- Element digmeth = doc.createElementNS(etsinamespace,"etsi:DigestMethod");
- digmeth.setAttribute("Algorithm","http://www.w3.org/2000/09/xmldsig#sha1");
- Element digvalue = doc.createElementNS(etsinamespace,"etsi:DigestValue");
-
- ByteArrayOutputStream fos = new ByteArrayOutputStream();
- Base64OutputStream base64os = new Base64OutputStream(fos);
- base64os.write(this.X509hash.getBytes());
- base64os.flush();
-
- Text dig_value = doc.createTextNode(fos.toString());
- Element is = doc.createElementNS(etsinamespace,"etsi:IssuerSerial");
- Element i = doc.createElement("dsig:X509IssuerName");
- Text i_value = doc.createTextNode(this.X509name);
- Element s = doc.createElement("dsig:X509SerialNumber");
- Text s_value = doc.createTextNode(this.X509number.toString());
- Element dataobjformat = doc.createElementNS(etsinamespace,"etsi:DataObjectFormat");
- dataobjformat.setAttribute("ObjectReference","#reference-1-1");
- Element mimetype = doc.createElementNS(etsinamespace,"etsi:MimeType");
- //mimetype.setNodeValue("text/plain");
- Text mimevalue = doc.createTextNode("text/plain");
-
- qualprop.appendChild(signprop);
- signprop.appendChild(signsigprop);
- signsigprop.appendChild(signdate);
- signdate.appendChild(datevalue);
- signsigprop.appendChild(signcert);
- signcert.appendChild(cert);
- cert.appendChild(certdig);
- certdig.appendChild(digmeth);
- certdig.appendChild(digvalue);
- digvalue.appendChild(dig_value);
- cert.appendChild(is);
- is.appendChild(i);
- i.appendChild(i_value);
- is.appendChild(s);
- s.appendChild(s_value);
- signsigprop.appendChild(signpolyident);
- signpolyident.appendChild(signpolyimp);
- signprop.appendChild(signdataobjectprop);
- signdataobjectprop.appendChild(dataobjformat);
- dataobjformat.appendChild(mimetype);
- mimetype.appendChild(mimevalue);
-
-
-
- return qualprop;
- }
-
-
- public void createConfig() throws Exception {
-
- String file = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- ".Config.xml";
- String config =
-
-"<MOAConfiguration xmlns=\"http://reference.e-government.gv.at/namespace/moaconfig/20021122#\">"+
-" <KeyGroup id=\"PKCS12RSAKey1\"> <Key id=\"resources/test-ee2003_normal(buergerkarte).p12\"/> </KeyGroup>"+
-" <KeyGroup id=\"PKCS12RSAKeyExpired\"> <Key id=\"sicher-demo(buergerkarte).p12\"/> </KeyGroup>"+
-" <KeyGroup id=\"PKCS12ECDSAKey1\"> <Key id=\"ecc.p12\"/> </KeyGroup> "+
-" <KeyGroup id=\"DSAinPKCS12\"> <Key id=\"DSA.512.p12\"/> </KeyGroup> "+
-" <KeyGroup id=\"HSMRSAKey1\"> <Key id=\"???\"/> </KeyGroup>"+
-" <KeyGroup id=\"HSMECDSAKey1\"> <Key id=\"???\"/> </KeyGroup>"+
-" <DigestMethodAlgorithm name=\"http://www.w3.org/2000/09/xmldsig#sha1\"/>"+
-" <SignatureAlgorithm name=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/>"+
-" <CanonicalizationAlgorithm name=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>"+
-"</MOAConfiguration>";
-
-
- /*"<MOAConfiguration>\n"+
- " <KeyGroup id=\"PKCS12RSAKey1\"/> <!-- mapped auf \"test(1234).p12\" -->\n"+
- "</MOAConfiguration>\n"+
- "<!-- CanonicalizationMethod = http://www.w3.org/TR/2001/REC-xml-c14n-20010315 -->" +
- "<!-- SignatureMethod = http://www.w3.org/2000/09/xmldsig#rsa-sha1 -->";*/
-
- FileOutputStream fos = new FileOutputStream(file);
- fos.write(config.getBytes());
- fos.flush();
- fos.close();
-
- String file_3 = configuration_.getProperty("baseDir") + datadirectory_3 +
- "TestGeneratorCX3" +
- ".Config.xml";
-
- fos = new FileOutputStream(file_3);
- fos.write(config.getBytes());
- fos.flush();
- fos.close();
-
- String file_4 = configuration_.getProperty("baseDir") + datadirectory_4 +
- "TestGeneratorCX4" +
- ".Config.xml";
-
- fos = new FileOutputStream(file_4);
- fos.write(config.getBytes());
- fos.flush();
- fos.close();
-
- }
-
- public void createL00() throws Exception {
- createL001("1kb");
- createL001("10kb");
- createL001("20kb");
- createL001("50kb");
- createL001("100kb");
- createL001("500kb");
- createL001("1mb");
- createL001("10mb");
- }
-
- public void createL001(String filename) throws Exception {
- String TestNumber = "001";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory_l+filename+"/" +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/"+filename+".txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory_l+filename+"/" +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/"+filename+".txt");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
- }
-
- /* ==================================================================================================== */
-
- public void create001() throws Exception {
-
- String TestNumber = "001";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
-
- // CX3 wird gleich mit generiert
-
- String reqFile_3 = configuration_.getProperty("baseDir") + datadirectory_3 +
- "TestGeneratorCX3" +
- ".";
- String reqFile_4 = configuration_.getProperty("baseDir") + datadirectory_4 +
- "TestGeneratorCX4" +
- ".";
-
- writeFile(reqFile_3+"001" + ".Req.xml",req);
- writeFile(reqFile_4+"051" + ".Req.xml",req);
-
- req = replaceString(req,"PKCS12RSAKey1","PKCS12RSAKeyNotAllowed");
-
- writeFile(reqFile_3+"052" + ".Req.xml",req);
-
- String resFile_3 = configuration_.getProperty("baseDir") + datadirectory_3 +
- "TestGeneratorCX3" +
- "." ;
- String resFile_4 = configuration_.getProperty("baseDir") + datadirectory_4 +
- "TestGeneratorCX4" +
- "." ;
-
- writeFile(resFile_3+ "001" + ".Res.xml",erg);
- writeFile(resFile_4+ "051" + ".ErrRes.xml","0000");
- writeFile(resFile_3+ "052" + ".ErrRes.xml","2231");
-
- }
-
- public void writeFile(String filename,String data) throws Exception
- {
- BufferedWriter bw = new BufferedWriter(new FileWriter(filename));
- bw.write(data);
- bw.close();
- }
-
-
- public void create002() throws Exception {
-
- String TestNumber = "002";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create003() throws Exception {
-
- String TestNumber = "003";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" ?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create004() throws Exception {
-
- /*Properties config = new Properties();
- config.put("PKCS11_NATIVE_MODULE","cryptoki.dll");
- config.put("SLOT_ID","0");
-
- Security.addProvider(new IAIK());
- IAIKPkcs11 pkcs11Provider_ = new IAIKPkcs11(config);
- Security.addProvider(pkcs11Provider_);
-
- // load the keystore of the PKCS#11 provider given via input stream
- KeyStore tokenKeyStore = pkcs11Provider_.getTokenManager().getKeyStore();
-
- Object signatureKey = tokenKeyStore.getKey("HSMRSAKEY", null);
- //System.out.println("got:"+signatureKey+" : "+signatureKey.getClass().getName());
- if(signatureKey instanceof IAIKPKCS11RsaPrivateKey)
- {
- System.out.println("GOT PRIVATE KEY:"+(IAIKPKCS11RsaPrivateKey)signatureKey);
- java.security.cert.Certificate[] certificateChain = tokenKeyStore.getCertificateChain("HSMRSAKEY");
- X509Certificate signerCertificate = (X509Certificate) certificateChain[0];
-
- }
- if(signatureKey instanceof IAIKPKCS11RsaPublicKey)
- {
- System.out.println("GOT PUBLIC KEY:"+(IAIKPKCS11RsaPublicKey)signatureKey);
- }*/
-
- String TestNumber = "004";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" ?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>MOAHSMRSAKEY</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createHSMSig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt",false,false,null,false);
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create005() throws Exception {
-
- String TestNumber = "005";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" ?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12ECDSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createECDSPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
-
- public void create006() throws Exception {
-
- String TestNumber = "006";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
-
- writeFile(reqFile,"");
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- writeFile(resFile,"0000");
- }
-
- public void create007() throws Exception {
-
- String TestNumber = "007";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt\">\n"+
- " <XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create008() throws Exception {
-
- String TestNumber = "008";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt\">\n"+
- " <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
-
- /* ==================================================================================================== */
-
- public void create009() throws Exception {
-
- // based on create000()
-
- String TestNumber = "009";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"enveloping\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12SigWithEnveloping(TestNumber,"b64:Dies sind Testdaten");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create010() throws Exception {
-
- // based on create000()
-
- String TestNumber = "010";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"enveloping\" ChildOfManifest=\"false\">\n"+
- " <DataObject>\n"+
- " <XMLContent xml:space=\"preserve\"><Testdaten>Dies sind Testdaten</Testdaten></XMLContent>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12SigWithEnveloping(TestNumber,"<Testdaten>Dies sind Testdaten</Testdaten>");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create011() throws Exception {
-
- // based on create000()
-
- String TestNumber = "011";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"enveloping\" ChildOfManifest=\"false\">\n"+
- " <DataObject>\n"+
- " <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12SigWithEnveloping(TestNumber,"b64:Dies sind Testdaten");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create012() throws Exception {
-
- // based on create000()
-
- String TestNumber = "012";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" >\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt\">\n"+
- " <XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
-
- public void create013() throws Exception {
-
- // based on create000()
-
- String TestNumber = "013";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"true\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\" />\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt",false,true);
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create014() throws Exception {
-
- // based on create000()
-
- String TestNumber = "014";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"true\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testUTF8.txt\" />\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12SigSL(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testUTF8.txt");
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create015() throws Exception {
-
- // based on create000()
-
- String TestNumber = "015";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " <DataObjectInfo Structure=\"detached\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt",false,false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt",false);
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create016() throws Exception {
-
- // based on create000()
-
- String TestNumber = "016";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"enveloping\">\n"+
- " <DataObject>\n"+
- " <XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " <DataObjectInfo Structure=\"enveloping\">\n"+
- " <DataObject>\n"+
- " <XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,"Dies sind Testdaten",true,false,"Dies sind Testdaten",true);
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create017() throws Exception {
-
- // based on create000()
-
- String TestNumber = "017";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " <DataObjectInfo Structure=\"enveloping\">\n"+
- " <DataObject>\n"+
- " <XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt",false,false,"Dies sind Testdaten",true);
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
-
- }
-
- public void create018() throws Exception {
-
- // based on create000()
-
- String TestNumber = "018";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- Document signatureDoc2 = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt","id","id");
-
- String erg = makeOutputFile(signatureDoc,signatureDoc2);
-
- writeFile(resFile,erg);
-
- }
-
- public void create019() throws Exception {
-
- String TestNumber = "019";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"enveloping\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testXML.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/xml</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Res.xml";
-
- Document signatureDoc = createPKCS12SigWithEnveloping(TestNumber,"b64:"+readFile(configuration_.getProperty("baseDir")+"resources/testXML.txt"));
-
- String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,erg);
- }
-
- public void create064() throws Exception {
-
- // based on create000()
-
- String TestNumber = "064";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"enveloping\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"testDatenFalsch.txt\">\n"+
- " <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- //Document signatureDoc = createPKCS12SigWithEnveloping(TestNumber,"Dies sind Testdaten");
-
- //String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,"1110");
-
- }
-
-
- public void create051() throws Exception {
-
- String TestNumber = "051";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"/>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " <SuperExtraElementThatShouldNotBeValidWithTheSchema/>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"1100");
-
- }
-
- public void create052() throws Exception {
-
- String TestNumber = "052";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"version=\"1.0\"","");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"0000");
-
- }
-
- public void create053() throws Exception {
-
- String TestNumber = "053";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"version=\"1.0\"","version=\"5.0alpha3\"");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"0000");
-
- }
-
- public void create054() throws Exception {
-
- String TestNumber = "054";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"ISO-8859-1","SuperSvenEncoding:)");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"0000");
-
- }
-
- public void create055() throws Exception {
-
- String TestNumber = "055";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"","xmlns=\"http://www.w3.org/2000/09/svens_schema#\"");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"1100");
-
- }
-
- public void create056() throws Exception {
-
- String TestNumber = "056";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"PKCS12RSAKey1","wrong_value_KeyIdentifier");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"2231");
-
- }
-
- public void create057() throws Exception {
-
- String TestNumber = "057";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"PKCS12RSAKey1","PKCS12RSAKeyExpired");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"2220");
-
- }
-
- public void create058() throws Exception {
-
- String TestNumber = "058";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"PKCS12RSAKey1","DSAinPKCS12");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"2220");
-
- }
-
- public void create059() throws Exception {
-
- String TestNumber = "059";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt",configuration_.getProperty("webbaseDir")+"not_here.txt");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"2208");
-
- }
-
- /*
-
- public String defaultblock = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\">\n"+
- " <!-- Hint -->\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- */
-
- public void create060() throws Exception {
-
- String TestNumber = "060";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"","");
- /*req = this.replaceString(req,"<CreateTransformsInfoProfile>","");
- req = this.replaceString(req,"<CreateTransformsInfo>","");
- req = this.replaceString(req,"<FinalDataMetaInfo>","");
- req = this.replaceString(req,"<MimeType>text/plain</MimeType>","");
- req = this.replaceString(req,"</FinalDataMetaInfo>","");
- req = this.replaceString(req,"</CreateTransformsInfo>","");
- req = this.replaceString(req,"</CreateTransformsInfoProfile>","");*/
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"1102");
-
- }
-
- public void create061() throws Exception {
-
- String TestNumber = "061";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"","");
- req = this.replaceString(req,"<!-- Hint -->","<XMLContent xml:space=\"preserve\"><DieserTagIstNichtZu></XMLContent>");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"0000");
-
- }
-
- public void create062() throws Exception {
-
- String TestNumber = "062";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDaten.txt\"","");
- req = this.replaceString(req,"<!-- Hint -->","<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg=</Base64Content>");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"1100");
-
- }
-
- public void create063() throws Exception {
-
- String TestNumber = "063";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req = this.replaceString(defaultblock,"<MimeType>text/plain</MimeType>","<MimeType>something/some thing/something</MimeType>");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- writeFile(resFile,"1100");
-
- }
-
- public void create065() throws Exception {
-
- String TestNumber = "065";
- String reqFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".Req.xml";
- String req =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<CreateXMLSignatureRequest\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" >\n"+
- " <KeyIdentifier>PKCS12RSAKey1</KeyIdentifier>\n"+
- " <SingleSignatureInfo SecurityLayerConformity=\"false\">\n"+
- " <DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">\n"+
- " <DataObject>\n"+
- " <XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>\n"+
- " </DataObject>\n"+
- " <CreateTransformsInfoProfile>\n"+
- " <CreateTransformsInfo>\n"+
- " <FinalDataMetaInfo>\n"+
- " <MimeType>text/plain</MimeType>\n"+
- " </FinalDataMetaInfo>\n"+
- " </CreateTransformsInfo>\n"+
- " </CreateTransformsInfoProfile>\n"+
- " </DataObjectInfo>\n"+
- " </SingleSignatureInfo>\n"+
- "</CreateXMLSignatureRequest>";
-
- writeFile(reqFile,req);
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- String resFile = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- "." + TestNumber + ".ErrRes.xml";
-
- //Document signatureDoc = createPKCS12Sig(TestNumber,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
-
- //String erg = makeOutputFile(signatureDoc);
-
- writeFile(resFile,"1102");
-
- }
-
-
-
-
- public String makeOutputFile(Document signatureDoc) throws Exception
- {
- ArrayList foundNodes = new ArrayList();
- findNode(signatureDoc.getDocumentElement(),"dsig:Signature",foundNodes);
-
- Node outputNode = null;
-
- if(foundNodes.size()>0)
- {
- outputNode = (Node)foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"+
- "<CreateXMLSignatureResponse\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " >"+
- //" xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\">\n"+
- "<SignatureEnvironment>" +
- erg + "</SignatureEnvironment></CreateXMLSignatureResponse>";
-
- return erg;
- }
-
- public String makeOutputFile(Document signatureDoc,Document signatureDoc2) throws Exception
- {
- ArrayList foundNodes = new ArrayList();
- findNode(signatureDoc.getDocumentElement(),"dsig:Signature",foundNodes);
-
- Node outputNode = null;
-
- if(foundNodes.size()>0)
- {
- outputNode = (Node)foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- foundNodes.clear();
- findNode(signatureDoc2.getDocumentElement(),"dsig:Signature",foundNodes);
-
- outputNode = null;
-
- if(foundNodes.size()>0)
- {
- outputNode = (Node)foundNodes.get(0);
- }
-
- String erg2 = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- pos = erg2.indexOf("<dsig");
- erg2 = erg2.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"+
- "<CreateXMLSignatureResponse\n" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"+
- " >"+
- "<SignatureEnvironment>" +
- erg +"</SignatureEnvironment><SignatureEnvironment>"+erg2+"</SignatureEnvironment> </CreateXMLSignatureResponse>";
-
- //erg = replaceString(erg,"Id=\"signature-1-1\"","Id=\"signature-2-1\"");
- //erg = replaceString(erg,"Id=\"reference-1-1\"","Id=\"reference-2-1\"");
-
-
- return erg;
- }
-
- public String readFile(String filename) throws Exception
- {
- /*StringBuffer data = new StringBuffer();
- String line = null;
- BufferedReader br = new BufferedReader(new FileReader(filename));
- while((line = br.readLine())!=null)
- {
- data.append(line);
- data.append("\n");
- }
- return data.toString();*/
-
- RandomAccessFile raf = new RandomAccessFile(filename, "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("file too big to fit in byte array.");
-
- byte[] result = new byte[(int) raf.length()];
-
- raf.read(result);
-
- return new String(result);
-
- }
-
-}
-
diff --git a/spss.test/src/testgenerator/TestGeneratorCX1.java b/spss.test/src/testgenerator/TestGeneratorCX1.java
deleted file mode 100644
index 44670742b..000000000
--- a/spss.test/src/testgenerator/TestGeneratorCX1.java
+++ /dev/null
@@ -1,1054 +0,0 @@
-package testgenerator;
-
-import iaik.ixsil.algorithms.Transform;
-import iaik.ixsil.algorithms.TransformImplBase64Decode;
-import iaik.ixsil.algorithms.TransformImplCanonicalXML;
-import iaik.ixsil.algorithms.TransformImplCanonicalXMLWithComments;
-import iaik.ixsil.algorithms.TransformImplEnvelopedSignature;
-import iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXML;
-import iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXMLWithComments;
-import iaik.ixsil.algorithms.TransformImplXPath;
-import iaik.ixsil.algorithms.TransformImplXPath2;
-import iaik.ixsil.algorithms.TransformImplXSLT;
-import iaik.ixsil.core.Position;
-import iaik.ixsil.util.URI;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestGeneratorCX1 extends TestCases {
-
- String datadirectory = "data/CX1/";
-
- String base64content = "RGllcyBzaW5kIFRlc3RkYXRlbg==";
-
- String defaultblock =
- "<?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=\""+configuration_.getProperty("webbaseDir")+"resources/BookData.xml"+"\">"+
- "<XMLContent xml:space=\"preserve\">"+
- "<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>"+
- "<!-- insert transform -->"+
- "</dsig:Transforms>"+
- "<FinalDataMetaInfo>"+
- "<MimeType>text/html</MimeType>"+
- "<Description>http://www.description.com</Description>"+
- "</FinalDataMetaInfo>"+
- "</CreateTransformsInfo>"+
- "<!-- insert supp -->"+
- "</CreateTransformsInfoProfile>"+
- "</DataObjectInfo>"+
- "<!-- insert data2 -->"+
- "</SingleSignatureInfo>"+
- "</CreateXMLSignatureRequest>";
-
- private static final int canAlgCanXML = 1;
- private static final int canAlgCanXMLwithCom = 2;
- private static final int canAlgExcXML = 3;
- private static final int canAlgExcXMLwithCom = 4;
-
-
- public String fileprefix = null;
- public String filesuffix = null;
-
- public TestGeneratorCX1() throws Exception {
-
- super();
-
- // Set config properties
- configuration_.setProperty("TestClass", "TestGeneratorCX1");
-// configuration_.setProperty("privateKeyFile", baseDir + "additionalFiles/keys/RSAPrivateKey.der");
-// configuration_.setProperty("publicKeyFile", baseDir + "additionalFiles/keys/RSAPublicKey.der");
-// configuration_.setProperty("signatureFile", baseDir + "additionalFiles/signatures/Signature.unit1.xml");
-
- iaik.security.provider.IAIK.addAsProvider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
- }
-
- public static void main(String[] args) throws Exception {
- TestGeneratorCX1 testcase = new TestGeneratorCX1();
-
- testcase.createConfig();
- testcase.create001();
- testcase.create002();
- testcase.create003();
- testcase.create004();
- testcase.create005();
- testcase.create006();
- testcase.create007();
- testcase.create008();
- testcase.create009();
- testcase.create010();
- testcase.create011();
- testcase.create012();
- testcase.create013();
- testcase.create014();
-
- testcase.create051();
- testcase.create052();
- testcase.create053();
- testcase.create054();
- testcase.create055();
-
- }
-
- public void createConfig() throws Exception {
-
- String file = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- ".Config.xml";
- String config =
-
- "<MOAConfiguration xmlns=\"http://reference.e-government.gv.at/namespace/moaconfig/20021122#\">"+
- " <KeyGroup id=\"PKCS12RSAKey1\"> <Key id=\"resources/test-ee2003_normal(buergerkarte).p12\"/> </KeyGroup>"+
- " <KeyGroup id=\"PKCS12RSAKeyExpired\"> <Key id=\"sicher-demo(buergerkarte).p12\"/> </KeyGroup>"+
-
- " <KeyGroup id=\"PKCS12ECDSAKey1\"> <Key id=\"ecc.p12\"/> </KeyGroup> "+
- " <KeyGroup id=\"HSMRSAKey1\"> <Key id=\"???\"/> </KeyGroup>"+
- " <KeyGroup id=\"HSMECDSAKey1\"> <Key id=\"???\"/> </KeyGroup>"+
- " <DigestMethodAlgorithm name=\"http://www.w3.org/2000/09/xmldsig#sha1\"/>"+
- " <SignatureAlgorithm name=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/>"+
- " <CanonicalizationAlgorithm name=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>"+
- " <CreateTransformsInfoProfile id=\"CreateTransformsInfoProfile1\" filename=\""+"file:/"+configuration_.getProperty("webbaseDir")+"CX1_bookprofile.xsl\"/>"+
- "</MOAConfiguration>";
-
-
- /*"<MOAConfiguration>"+
- " <KeyGroup id=\"PKCS12RSAKey1\"/> <!-- mapped auf \"test(1234).p12\" -->"+
- "</MOAConfiguration>"+
- "<!-- CanonicalizationMethod = http://www.w3.org/TR/2001/REC-xml-c14n-20010315 -->" +
- "<!-- SignatureMethod = http://www.w3.org/2000/09/xmldsig#rsa-sha1 -->";*/
-
- FileOutputStream fos = new FileOutputStream(file);
- fos.write(config.getBytes());
- fos.flush();
- fos.close();
-
- fileprefix = configuration_.getProperty("baseDir")+ datadirectory + configuration_.getProperty("TestClass") + ".";
- filesuffix = ".xml";
- }
-
- public void create001() throws Exception {
-
- String TestNumber = "001";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xslt-19991116\">"+
- "<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\"><xsl:output method=\"html\" indent=\"no\"/><xsl:template match=\"data:book\" xmlns:data=\"http://uri.data.org\"><HTML><BODY><H1>Buch: <xsl:value-of select=\"data:title\"/></H1></BODY></HTML></xsl:template></xsl:stylesheet>"+
- "</dsig:Transform>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- trans.setInput(s,null);
- trans.setStyleSheet(s,null);
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
-
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create002() throws Exception {
-
- String TestNumber = "002";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xslt-19991116\">"+
- "<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- "<xsl:output method=\"html\" indent=\"no\"/>"+
- "<xsl:template match=\"data:book\" xmlns:data=\"http://uri.data.org\">"+
- "<HTML>"+
- "<BODY>"+
- "<H1>Buch: <xsl:value-of select=\"data:title\"/>"+
- "</H1>"+
- "</BODY>"+
- "</HTML>"+
- "</xsl:template>"+
- "</xsl:stylesheet>"+
- "</dsig:Transform>");
-
- req = replaceString(req,"SecurityLayerConformity=\"false\"","SecurityLayerConformity=\"true\"");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- trans.setInput(s,null);
- trans.setStyleSheet(s,null);
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- //cpkcs.createReferenceWithManifest(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),"manifestObject");
- cpkcs.createETSIObjects("file:/"+configuration_.getProperty("webbaseDir")+"resources/BookData.xml");
- cpkcs.setKeyInformation(1);
-
- cpkcs.signer.getSignature().setId("signature-1-1");
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create003() throws Exception {
-
- String TestNumber = "003";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xpath-19991116\">"+
- "<dsig:XPath xmlns:data=\"http://uri.data.org\">//data:book/data:first-name</dsig:XPath>"+
- "</dsig:Transform>");
-
- req = replaceString(req,"<MimeType>text/html</MimeType>","<MimeType>text/plain</MimeType>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplXPath trans = new TransformImplXPath();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/BookData.xml");
- trans.setInput(s,null);
- trans.addNSDeclaration("data",new URI("http://uri.data.org"));
- trans.setXPath("//data:book/data:first-name");
- //trans.setXPath("ancestor-or-self::data:first-name");
-
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- output = replaceString(output,"<dsig:XPath xmlns:data=\"http://uri.data.org\">","<dsig:XPath>"); // workaround
-
- writeFile(resFile, output);
-
- }
-
- public void create004() throws Exception {
-
- String TestNumber = "004";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\">"+
- "<xf2:XPath Filter=\"subtract\" xmlns:xf2=\"http://www.w3.org/2002/06/xmldsig-filter2\" xmlns:data=\"http://uri.data.org\">//data:book/data:first-name</xf2:XPath>"+
- "</dsig:Transform>");
-
- req = replaceString(req,"<MimeType>text/html</MimeType>","<MimeType>text/xml</MimeType>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplXPath2 trans = new TransformImplXPath2();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/BookData.xml");
- trans.setInput(s,null);
- //trans.addNSDeclaration("data",new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"));
- //trans.setXPath("/data:book/data:first-name/node()");
- HashMap temp = new HashMap();
- temp.put("data",new URI("http://uri.data.org"));
- trans.addXPathFilter("//data:book/data:first-name",TransformImplXPath2.FILTER_MODE_SUBTRACT_,temp);
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- output = replaceString(output,"<xf2:XPath Filter=\"subtract\" xmlns:data=\"http://uri.data.org\"","<xf2:XPath Filter=\"subtract\" ");
-
- writeFile(resFile, output);
-
- }
-
- public void create005() throws Exception {
-
- String TestNumber = "005";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>");
-
- req = replaceString(req,"<MimeType>text/html</MimeType>","<MimeType>text/xml</MimeType>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplCanonicalXML trans = new TransformImplCanonicalXML();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- trans.setInput(s,null);
- /*trans.addNSDeclaration("data",new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"));
- trans.setXPath("/data:book/data:first-name/node()");
- trans.*/
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create006() throws Exception {
-
- String TestNumber = "006";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments\"/>");
-
- req = replaceString(req,"<MimeType>text/html</MimeType>","<MimeType>text/xml</MimeType>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplCanonicalXMLWithComments trans = new TransformImplCanonicalXMLWithComments();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- trans.setInput(s,null);
- /*trans.addNSDeclaration("data",new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"));
- trans.setXPath("/data:book/data:first-name/node()");
- trans.*/
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create007() throws Exception {
-
- String TestNumber = "007";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/2001/10/xml-exc-c14n#\"><ec:InclusiveNamespaces PrefixList=\"dsig\" xmlns:ec=\"http://www.w3.org/2001/10/xml-exc-c14n#\"/></dsig:Transform>");
-
- req = replaceString(req,"<MimeType>text/html</MimeType>","<MimeType>text/xml</MimeType>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplExclusiveCanonicalXML trans = new TransformImplExclusiveCanonicalXML();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- trans.setInput(s,null);
- trans.setInclusiveNamespacePrefixes("dsig");
- /*trans.addNSDeclaration("data",new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"));
- trans.setXPath("/data:book/data:first-name/node()");
- trans.*/
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create008() throws Exception {
-
- String TestNumber = "008";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/2001/10/xml-exc-c14n#WithComments\"><ec:InclusiveNamespaces PrefixList=\"dsig\" xmlns:ec=\"http://www.w3.org/2001/10/xml-exc-c14n#\"/></dsig:Transform>");
-
- req = replaceString(req,"<MimeType>text/html</MimeType>","<MimeType>text/xml</MimeType>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplExclusiveCanonicalXMLWithComments trans = new TransformImplExclusiveCanonicalXMLWithComments();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- trans.setInput(s,null);
- trans.setInclusiveNamespacePrefixes("dsig");
- /*trans.addNSDeclaration("data",new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"));
- trans.setXPath("/data:book/data:first-name/node()");
- trans.*/
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create009() throws Exception {
-
- String TestNumber = "009";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/>");
-
- req = replaceString(req,"<XMLContent xml:space=\"preserve\">"+
- "<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>","");
-
- req = replaceString(req,
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/BookData.xml"+"\">",
- "<DataObject Reference=\"\">");
-
- //req = replaceString(req,"Structure=\"detached\"","Structure=\"enveloping\"");
-
-
- req = replaceString(req,"<!-- insert data2 -->",
- "<CreateSignatureInfo><CreateSignatureEnvironment><XMLContent xml:space=\"preserve\"><env:Document xmlns:env=\"http://uri.env.org\">Text</env:Document></XMLContent></CreateSignatureEnvironment><CreateSignatureEnvironmentProfile><CreateSignatureLocation xmlns:env=\"http://uri.env.org\" Index=\"1\">//env:Document</CreateSignatureLocation></CreateSignatureEnvironmentProfile></CreateSignatureInfo>");
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- InputStream bis = new ByteArrayInputStream(("<env:Document xmlns:env=\"http://uri.env.org\">Text</env:Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
- Document reqDoc = builder.parse(bis);
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- String xPath_Pos = "/node()";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "env xmlns:env=\"http://uri.env.org\"";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
-
- /*trans.addNSDeclaration("data",new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"));
- trans.setXPath("/data:book/data:first-name/node()");
- trans.*/
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(""),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- output = replaceString(output,"<dsig:Signature","<env:Document xmlns:env=\"http://uri.env.org\">Text<dsig:Signature");
- output = replaceString(output,"</dsig:Signature>","</dsig:Signature></env:Document>");
-
-
-
- writeFile(resFile, output);
-
- }
-
- public void create010() throws Exception {
-
- String TestNumber = "010";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>"+
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xslt-19991116\">"+
- "<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- "<xsl:output method=\"html\" indent=\"no\"/>"+
- "<xsl:template match=\"data:book\" xmlns:data=\"http://uri.data.org\">"+
- "<HTML>"+
- "<BODY>"+
- "<H1>Buch: <xsl:value-of select=\"data:title\"/>"+
- "</H1>"+
- "</BODY>"+
- "</HTML>"+
- "</xsl:template>"+
- "</xsl:stylesheet>"+
- "</dsig:Transform>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[2];
- TransformImplCanonicalXML trans = new TransformImplCanonicalXML();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- trans.setInput(s,null);
- /*trans.addNSDeclaration("data",new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"));
- trans.setXPath("/data:book/data:first-name/node()");
- trans.*/
- tr[0] = trans;
-
- TransformImplXSLT tr2 = new TransformImplXSLT();
- InputStream s2 = new FileInputStream(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- tr2.setInput(s2,null);
- tr2.setStyleSheet(s2,null);
- tr[1] = tr2;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create011() throws Exception {
-
- String TestNumber = "011";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xslt-19991116\">"+
- "<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- "<xsl:include href=\""+configuration_.getProperty("webbaseDir")+"resources/CX1_book_not_here.xsl"+"\"/>"+
- "</xsl:stylesheet>"+
- "</dsig:Transform>");
-
- req = replaceString(req,"<!-- insert supp -->",
- "<Supplement>"+
- "<Content Reference=\""+configuration_.getProperty("webbaseDir")+"resources/CX1_book_not_here.xsl"+"\">"+
- "<Base64Content>"+
- Base64Utils.encode(("<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- "<xsl:output method=\"html\" indent=\"no\"/>"+
- "<xsl:template match=\"data:book\" xmlns:data=\"http://uri.data.org\">"+
- "<HTML>"+
- "<BODY>"+
- "<H1>Buch: <xsl:value-of select=\"data:title\"/>"+
- "</H1>"+
- "</BODY>"+
- "</HTML>"+
- "</xsl:template>"+
- "</xsl:stylesheet>").getBytes())+
- "</Base64Content>"+
- "</Content>"+
- "</Supplement>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- URL u = new URL(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref_not_here.xsl");
- URLConnection hu = u.openConnection();
- //trans.setInput(s,null);
- trans.setStyleSheet(hu.getInputStream(),new URI(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref_not_here.xsl"));
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- //cpkcs.createReferenceWithManifest(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),"manifestObject");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
- }
-
- public void create012() throws Exception {
-
- String TestNumber = "012";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xslt-19991116\">"+
- "<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- "<xsl:include href=\""+configuration_.getProperty("webbaseDir")+"resources/CX1_book_not_here.xsl"+"\"/>"+
- "</xsl:stylesheet>"+
- "</dsig:Transform>");
-
- req = replaceString(req,"<!-- insert data2 -->",
- "<DataObjectInfo Structure=\"detached\" ChildOfManifest=\"false\">"+
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/BookData.xml"+"\">"+
- "<XMLContent xml:space=\"preserve\">"+
- "<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/TR/1999/REC-xslt-19991116\">"+
- "<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- "<xsl:include href=\""+configuration_.getProperty("webbaseDir")+"resources/CX1_book_not_here.xsl\"/>"+
- "</xsl:stylesheet>"+
- "</dsig:Transform>"+
- "</dsig:Transforms>"+
- "<FinalDataMetaInfo>"+
- "<MimeType>text/html</MimeType>"+
- "</FinalDataMetaInfo>"+
- "</CreateTransformsInfo>"+
- "<Supplement>"+
- "<Content Reference=\""+configuration_.getProperty("webbaseDir")+"resources/CX1_book_not_here.xsl"+"\">"+
- "<Base64Content>"+
- Base64Utils.encode(("<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- "<xsl:output method=\"html\" indent=\"no\"/>"+
- "<xsl:template match=\"data:book\" xmlns:data=\"http://uri.data.org\">"+
- "<HTML>"+
- "<BODY>"+
- "<H1>Buch: <xsl:value-of select=\"data:title\"/>"+
- "</H1>"+
- "</BODY>"+
- "</HTML>"+
- "</xsl:template>"+
- "</xsl:stylesheet>").getBytes())+
- "</Base64Content>"+
- "</Content>"+
- "</Supplement>"+
- "</CreateTransformsInfoProfile>"+
- "</DataObjectInfo>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- URL u = new URL(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref_not_here.xsl");
- URLConnection hu = u.openConnection();
- //trans.setInput(s,null);
- trans.setStyleSheet(hu.getInputStream(),new URI(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref_not_here.xsl"));
-
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-2");
- //cpkcs.createReferenceWithManifest(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),"manifestObject");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create013() throws Exception {
-
- String TestNumber = "013";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,
- "<CreateTransformsInfoProfile>"+
- "<CreateTransformsInfo>"+
- "<dsig:Transforms>"+
- "<!-- insert transform -->"+
- "</dsig:Transforms>"+
- "<FinalDataMetaInfo>"+
- "<MimeType>text/html</MimeType>"+
- "<Description>http://www.description.com</Description>"+
- "</FinalDataMetaInfo>"+
- "</CreateTransformsInfo>"+
- "<!-- insert supp -->"+
- "</CreateTransformsInfoProfile>",
- "<CreateTransformsInfoProfileID>CreateTransformsInfoProfile1</CreateTransformsInfoProfileID>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- trans.setInput(s,null);
- trans.setStyleSheet(s,null);
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1-1");
- //cpkcs.createReferenceWithManifest(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),"manifestObject");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create014() throws Exception {
-
- String TestNumber = "014";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#base64\"/>");
-
- req = replaceString(req,
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/BookData.xml"+"\">",
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testBase64.txt"+"\">");
-
- req = replaceString(req,
- "<XMLContent xml:space=\"preserve\">"+
- "<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>",
- /*"<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg==</Base64Content>"*/"");
-
- req = replaceString(req,"<MimeType>text/html</MimeType>","<MimeType>text/plain</MimeType>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplBase64Decode trans = new TransformImplBase64Decode();
- InputStream s = new FileInputStream(configuration_.getProperty("baseDir")+"resources/testBase64.txt");
- trans.setInput(s,null);
- /*trans.addNSDeclaration("data",new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"));
- trans.setXPath("/data:book/data:first-name/node()");
- trans.*/
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/testBase64.txt"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc);
-
- writeFile(resFile, output);
-
- }
-
- public void create051() throws Exception {
-
- String TestNumber = "051";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xpath-19991116\">"+
- "<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- "<xsl:output method=\"html\" indent=\"no\"/>"+
- "<xsl:template match=\"data:book\" xmlns:data=\"http://uri.data.org\">"+
- "<HTML>"+
- "<BODY>"+
- "<H1>Buch: <xsl:value-of select=\"data:title\"/>"+
- "</H1>"+
- "</BODY>"+
- "</HTML>"+
- "</xsl:template>"+
- "</xsl:stylesheet>"+
- "</dsig:Transform>");
-
- req = replaceString(req,"SecurityLayerConformity=\"false\"","SecurityLayerConformity=\"true\"");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2202");
- }
-
- public void create052() throws Exception {
-
- String TestNumber = "052";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xslt-19991116\">"+
- "<XPath>/data:book/data:first-name/node()</XPath>"+
- "</dsig:Transform>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2215");
-
-
- }
-
- public void create053() throws Exception {
-
- String TestNumber = "053";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- " <dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xslt-19991116\">"+
- " <xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- " <xsl:include href=\"file:/transform.xsl\"/>"+
- " </xsl:stylesheet>"+
- " </dsig:Transform>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2220");
-
- }
-
- public void create054() throws Exception {
-
- String TestNumber = "054";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,
- "<CreateTransformsInfoProfile>"+
- "<CreateTransformsInfo>"+
- "<dsig:Transforms>"+
- "<!-- insert transform -->"+
- "</dsig:Transforms>"+
- "<FinalDataMetaInfo>"+
- "<MimeType>text/html</MimeType>"+
- "<Description>http://www.description.com</Description>"+
- "</FinalDataMetaInfo>"+
- "</CreateTransformsInfo>"+
- "<!-- insert supp -->"+
- "</CreateTransformsInfoProfile>",
- "<CreateTransformsInfoProfileID>CreateTransformsInfoProfileNonValid</CreateTransformsInfoProfileID>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2234");
-
- }
-
- public void create055() throws Exception {
-
- String TestNumber = "055";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert transform -->",
- "<dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\">"+
- "<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">"+
- "<xsl:output method=\"html\" indent=\"no\"/>"+
- "<xsl:template match=\"data:book\" xmlns:data=\"http://uri.data.org\">"+
- "<HTML>"+
- "<BODY>"+
- "<H1>Buch: <xsl:value-of select=\"data:title\"/>"+
- "</H1>"+
- "</BODY>"+
- "</HTML>"+
- "</xsl:template>"+
- "</xsl:stylesheet>"+
- "</dsig:Transform>");
-
- req = replaceString(req,"SecurityLayerConformity=\"false\"","SecurityLayerConformity=\"true\"");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2216");
- }
-
- public void writeFile(String filename,String data) throws Exception
- {
- BufferedWriter bw = new BufferedWriter(new FileWriter(filename));
- bw.write(data);
- bw.close();
- }
-
- public String makeOutputFile(Document signatureDoc) throws Exception
- {
- ArrayList foundNodes = new ArrayList();
- findNode(signatureDoc.getDocumentElement(),"dsig:Signature",foundNodes);
-
- Node outputNode = null;
-
- if(foundNodes.size()>0)
- {
- outputNode = (Node)foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"+
- "<CreateXMLSignatureResponse" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\""+
- ">"+
- //" xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\">"+
- "<SignatureEnvironment>" +
- erg + "</SignatureEnvironment> </CreateXMLSignatureResponse>";
-
- return erg;
- }
-}
diff --git a/spss.test/src/testgenerator/TestGeneratorCX2.java b/spss.test/src/testgenerator/TestGeneratorCX2.java
deleted file mode 100644
index ed5c5194a..000000000
--- a/spss.test/src/testgenerator/TestGeneratorCX2.java
+++ /dev/null
@@ -1,1050 +0,0 @@
-package testgenerator;
-
-import iaik.ixsil.algorithms.Transform;
-import iaik.ixsil.algorithms.TransformImplEnvelopedSignature;
-import iaik.ixsil.core.Position;
-import iaik.ixsil.util.URI;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.EntityResolverChain;
-import at.gv.egovernment.moa.util.MOAEntityResolver;
-import at.gv.egovernment.moa.util.MOAErrorHandler;
-import at.gv.egovernment.moa.util.StreamEntityResolver;
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestGeneratorCX2 extends TestCases {
-
- String datadirectory = "data/CX2/";
-
- String defaultblock =
- "<?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=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"+"\">"+
- "<XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>"+
- "</DataObject>"+
- "<CreateTransformsInfoProfile>"+
- "<CreateTransformsInfo>"+
- "<FinalDataMetaInfo>"+
- "<MimeType>text/plain</MimeType>"+
- "</FinalDataMetaInfo>"+
- "</CreateTransformsInfo>"+
- "</CreateTransformsInfoProfile>"+
- "</DataObjectInfo>"+
- "<CreateSignatureInfo xmlns:data=\"http://uri.data.org\">"+
- "<!-- insert create -->"+
- "<CreateSignatureEnvironmentProfile>"+
- "<CreateSignatureLocation Index=\"0\">//data:Document</CreateSignatureLocation>"+
- "<!-- insert supp -->"+
- "</CreateSignatureEnvironmentProfile>"+
- "</CreateSignatureInfo>"+
- "</SingleSignatureInfo>"+
- "</CreateXMLSignatureRequest>";
-
- public String fileprefix = null;
- public String filesuffix = null;
-
- private static final int canAlgCanXML = 1;
- private static final int canAlgCanXMLwithCom = 2;
- private static final int canAlgExcXML = 3;
- private static final int canAlgExcXMLwithCom = 4;
-
- public TestGeneratorCX2() throws Exception {
-
- super();
-
- // Set config properties
- configuration_.setProperty("TestClass", "TestGeneratorCX2");
-// configuration_.setProperty("privateKeyFile", baseDir + "additionalFiles/keys/RSAPrivateKey.der");
-// configuration_.setProperty("publicKeyFile", baseDir + "additionalFiles/keys/RSAPublicKey.der");
-// configuration_.setProperty("signatureFile", baseDir + "additionalFiles/signatures/Signature.unit1.xml");
-
- iaik.security.provider.IAIK.addAsProvider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
- }
-
- public static void main(String[] args) throws Exception {
- TestGeneratorCX2 testcase = new TestGeneratorCX2();
-
- testcase.createConfig();
- testcase.create001();
- testcase.create002();
- testcase.create003();
- testcase.create004();
- testcase.create005();
- testcase.create006();
- testcase.create007();
- testcase.create008();
- testcase.create009();
-
- testcase.create051();
- testcase.create052();
- testcase.create053();
- testcase.create054();
- testcase.create055();
- testcase.create056();
- testcase.create057();
-
- }
-
- public void createConfig() throws Exception {
-
- String file = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- ".Config.xml";
- String config =
-
- "<MOAConfiguration xmlns=\"http://reference.e-government.gv.at/namespace/moaconfig/20021122#\">"+
- " <KeyGroup id=\"PKCS12RSAKey1\"> <Key id=\"resources/test-ee2003_normal(buergerkarte).p12\"/> </KeyGroup>"+
- " <KeyGroup id=\"PKCS12RSAKeyExpired\"> <Key id=\"sicher-demo(buergerkarte).p12\"/> </KeyGroup>"+
- " <KeyGroup id=\"PKCS12ECDSAKey1\"> <Key id=\"ecc.p12\"/> </KeyGroup> "+
- " <KeyGroup id=\"HSMRSAKey1\"> <Key id=\"???\"/> </KeyGroup>"+
- " <KeyGroup id=\"HSMECDSAKey1\"> <Key id=\"???\"/> </KeyGroup>"+
- " <DigestMethodAlgorithm name=\"http://www.w3.org/2000/09/xmldsig#sha1\"/>"+
- " <SignatureAlgorithm name=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/>"+
- " <CanonicalizationAlgorithm name=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>"+
- " <CreateSignatureEnvironmentProfile id=\"CreateSignatureEnvironmentProfile1\" filename=\""+"file:/"+configuration_.getProperty("webbaseDir")+"resources/CSEP.xml\"/>"+
- "</MOAConfiguration>";
-
- FileOutputStream fos = new FileOutputStream(file);
- fos.write(config.getBytes());
- fos.flush();
- fos.close();
-
- fileprefix = configuration_.getProperty("baseDir")+ datadirectory + configuration_.getProperty("TestClass") + ".";
- filesuffix = ".xml";
- }
-
- public void create001() throws Exception {
-
- String TestNumber = "001";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\">"+
- "<data:Document xmlns:data=\"http://uri.data.org\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>"+
- //readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+
- "</XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- writeFile(reqFile,req);
-
- InputStream bis = new ByteArrayInputStream(("<data:Document xmlns:data=\"http://uri.data.org\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
- Document reqDoc = builder.parse(bis);
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- String xPath_Pos = "/node()";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt","reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<data:Document xmlns:data=\"http://uri.data.org\">",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>");
-
- writeFile(resFile, output);
-
- }
-
- public void create002() throws Exception {
-
- String TestNumber = "002";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testDocument.xml"+"\"/>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- InputStream bis = new ByteArrayInputStream(("<data:Document xmlns:data=\"http://uri.data.org\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
- Document reqDoc = builder.parse(bis);
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- String xPath_Pos = "/node()";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt","reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<data:Document xmlns:data=\"http://uri.data.org\">",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>");
-
- writeFile(resFile, output);
-
- }
-
- public void create003() throws Exception {
-
- String TestNumber = "003";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<Base64Content>"+readBinaryFileAsBase64(configuration_.getProperty("baseDir")+"resources/testDocument.xml")+"</Base64Content>"+
- "</CreateSignatureEnvironment>");
-
- //req = replaceString(req,"Index=\"0\">//data:Document","Index=\"0\">//Hugo");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- InputStream bis = new ByteArrayInputStream(("<data:Document xmlns:data=\"http://uri.data.org\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
- Document reqDoc = builder.parse(bis);
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- String xPath_Pos = "/node()";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt","reference-1-1");
- cpkcs.setKeyInformation(1);
-
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<data:Document xmlns:data=\"http://uri.data.org\">",cutXML(readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt"))+"</data:Document>");
-
- writeFile(resFile, output);
-
- }
-
- public void create004() throws Exception {
-
- String TestNumber = "004";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\">"+
- "<data:Document xmlns:data=\"http://uri.data.org\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>"+
- "</XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- InputStream bis = new ByteArrayInputStream(("<data:Document xmlns:data=\"http://uri.data.org\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
- Document reqDoc = builder.parse(bis);
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- String xPath_Pos = "/node()";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt","reference-1-1");
- cpkcs.setKeyInformation(1);
-
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<data:Document xmlns:data=\"http://uri.data.org\">",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>");
-
- writeFile(resFile, output);
- }
-
- public void create005() throws Exception {
-
- String TestNumber = "005";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\">"+
- "<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://tollesSchema.org/test.xsd\">Dies sind Testdaten</data:Document>"+
- "</XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- req = replaceString(req,"<!-- insert supp -->",
- "<Supplement>"+
- "<Content Reference=\"http://tollesSchema.org/test.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\" id=\"tollesSchema\">"+
- "<xsd:element name=\"Document\">"+
- "<xsd:complexType mixed=\"true\">"+
- "<xsd:sequence maxOccurs=\"unbounded\" minOccurs=\"0\">"+
- "<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>");
-
- req = replaceString(req,"<FinalDataMetaInfo>",
- "<dsig:Transforms><dsig:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/></dsig:Transforms>"+
- "<FinalDataMetaInfo>");
-
-
-
- //req = replaceString(req,"Index=\"0\">//data:Document","Index=\"0\">//data:Document");
- System.out.println("!!!");
- System.out.println(req);
-
- req = replaceString(req,
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"+"\">"+
- "<XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>"+
- "</DataObject>",
- "<DataObject Reference=\"#document\">"+
- "</DataObject>"
- );
-
- System.out.println(req);
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- //InputStream bis = new ByteArrayInputStream(("<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>").getBytes());
- InputStream bis = new ByteArrayInputStream(("<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://tollesSchema.org/test.xsd\">Dies sind Testdaten</data:Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setValidating(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- Map m = new HashMap();
- m.put("http://tollesSchema.org/test.xsd",new ByteArrayInputStream((
- "<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\" id=\"tollesSchema\">"+
- "<xsd:element name=\"Document\">"+
- "<xsd:complexType mixed=\"true\">"+
- "<xsd:sequence maxOccurs=\"unbounded\" minOccurs=\"0\">"+
- "<xsd:any namespace=\"##any\" processContents=\"lax\"/>"+
- "</xsd:sequence>"+
- "<xsd:attribute name=\"attr\" type=\"xsd:ID\" use=\"required\"/>"+
- "</xsd:complexType>"+
- "</xsd:element></xsd:schema>").getBytes()));
-
- EntityResolverChain chain = new EntityResolverChain();
- chain.addEntityResolver(new StreamEntityResolver(m));
- chain.addEntityResolver(new MOAEntityResolver());
- builder.setEntityResolver(chain);
-
- //Dokument Parsen
- Document reqDoc = DOMUtils.parseDocument(bis,true,Constants.ALL_SCHEMA_LOCATIONS, null,chain,new MOAErrorHandler());
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- //String xPath_Pos = "/node()";
- String xPath_Pos = "//data:Document";
- //XPAth-Prefixe deklarieren
- //String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- String xPath_Prefix = "data http://uri.data.org";
-
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt","reference-1-1");
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
- tr[0] = trans;
- //Enveloped Transformation
- cpkcs.createReferenceWithTransforms(new URI("#document"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://tollesSchema.org/test.xsd\">",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>");
-
- writeFile(resFile, output);
-
- }
-
- public void create006() throws Exception {
-
- String TestNumber = "006";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\">"+
- "<data:Document xmlns:data=\"http://uri.data.org\">Dies sind Testdaten</data:Document>"+
- "</XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- req = replaceString(req,
- "<CreateSignatureEnvironmentProfile>"+
- "<CreateSignatureLocation Index=\"0\">//data:Document</CreateSignatureLocation>"+
- "<!-- insert supp -->"+
- "</CreateSignatureEnvironmentProfile>",
- "<CreateSignatureEnvironmentProfileID>CreateSignatureEnvironmentProfile1</CreateSignatureEnvironmentProfileID>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- InputStream bis = new ByteArrayInputStream(("<data:Document xmlns:data=\"http://uri.data.org\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
-
-
- Document reqDoc = builder.parse(bis);
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- String xPath_Pos = "/node()";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt","reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<data:Document xmlns:data=\"http://uri.data.org\">",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>");
-
- writeFile(resFile, output);
-
- }
-
- public void create007() throws Exception {
-
- String TestNumber = "007";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<Base64Content>"+
- ""+Base64Utils.encode(("<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Document SYSTEM \"http://dtd.org/tollesDTD.dtd\"><Document attr=\"document\">Dies sind Testdaten</Document>").getBytes())+""+
- "</Base64Content>"+
- "</CreateSignatureEnvironment>");
-
- req = replaceString(req,
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"+"\">"+
- "<XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>"+
- "</DataObject>",
- "<DataObject Reference=\"#document\">"+
- "</DataObject>"
- );
-
- req = replaceString(req,"<!-- insert supp -->",
- "<Supplement>"+
- "<Content Reference=\"http://dtd.org/tollesDTD.dtd\">"+
- "<Base64Content>"+
- ""+Base64Utils.encode(("<?xml version=\"1.0\" encoding=\"UTF-8\"?><!ELEMENT Document (#PCDATA | ANY)*><!ATTLIST Document attr ID #REQUIRED>").getBytes())+""+
- "</Base64Content>"+
- "</Content>"+
- "</Supplement>");
-
- req = replaceString(req," xmlns:data=\"http://uri.data.org\"","");
- req = replaceString(req,"//data:Document","//Document");
-
-
- req = replaceString(req,"<FinalDataMetaInfo>",
- "<dsig:Transforms><dsig:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/></dsig:Transforms>"+
- "<FinalDataMetaInfo>");
-
- //req = replaceString(req,"Index=\"0\">//data:Document","Index=\"0\">//Hugo");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- InputStream bis = new ByteArrayInputStream(("<!DOCTYPE Document SYSTEM \"http://dtd.org/tollesDTD.dtd\"><Document attr=\"document\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setValidating(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
- Map m = new HashMap();
- m.put("http://dtd.org/tollesDTD.dtd",new ByteArrayInputStream((
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!ELEMENT Document (#PCDATA | ANY)*><!ATTLIST Document attr ID #REQUIRED>").getBytes()));
-
- EntityResolverChain chain = new EntityResolverChain();
- chain.addEntityResolver(new StreamEntityResolver(m));
- chain.addEntityResolver(new MOAEntityResolver());
- builder.setEntityResolver(chain);
-
- Document reqDoc = DOMUtils.parseDocument(bis,true,Constants.ALL_SCHEMA_LOCATIONS, null,chain,new MOAErrorHandler());
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- String xPath_Pos = "/Document";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt","reference-1-1");
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
- tr[0] = trans;
- //Enveloped Transformation
- cpkcs.createReferenceWithTransforms(new URI("#document"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<Document attr=\"document\" xmlns=\"\">",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</Document>");
-
- writeFile(resFile, output);
-
- }
-
- public void create008() throws Exception {
-
- String TestNumber = "008";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\">"+
- "<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://tollesSchema.org/test.xsd\">Dies sind Testdaten</data:Document>"+
- "</XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- req = replaceString(req,"<!-- insert supp -->",
- "<Supplement>"+
- "<Content Reference=\"http://tollesSchema.org/test.xsd\">"+
- "<Base64Content>"+
-
- Base64Utils.encode(("<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\" id=\"tollesSchema\">"+
- "<xsd:element name=\"Document\">"+
- "<xsd:complexType mixed=\"true\">"+
- "<xsd:sequence maxOccurs=\"unbounded\" minOccurs=\"0\">"+
- "<xsd:any namespace=\"##any\" processContents=\"lax\"/>"+
- "</xsd:sequence>"+
- "<xsd:attribute name=\"attr\" type=\"xsd:ID\" use=\"required\"/>"+
- "</xsd:complexType>"+
- "</xsd:element>"+
- "</xsd:schema>").getBytes())+
-
- "</Base64Content>"+
- "</Content>"+
- "</Supplement>");
-
- req = replaceString(req,"<FinalDataMetaInfo>",
- "<dsig:Transforms><dsig:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/></dsig:Transforms>"+
- "<FinalDataMetaInfo>");
-
-
- //req = replaceString(req,"Index=\"0\">//data:Document","Index=\"0\">//data:Document");
- System.out.println("!!!");
- System.out.println(req);
-
- req = replaceString(req,
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"+"\">"+
- "<XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>"+
- "</DataObject>",
- "<DataObject Reference=\"#document\">"+
- "</DataObject>"
- );
-
- System.out.println(req);
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- InputStream bis = new ByteArrayInputStream(("<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://tollesSchema.org/test.xsd\">Dies sind Testdaten</data:Document>").getBytes());
- //Document-Builder holen
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setValidating(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- Map m = new HashMap();
- m.put("http://tollesSchema.org/test.xsd",new ByteArrayInputStream((
- "<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\" id=\"tollesSchema\">"+
- "<xsd:element name=\"Document\">"+
- "<xsd:complexType mixed=\"true\">"+
- "<xsd:sequence maxOccurs=\"unbounded\" minOccurs=\"0\">"+
- "<xsd:any namespace=\"##any\" processContents=\"lax\"/>"+
- "</xsd:sequence>"+
- "<xsd:attribute name=\"attr\" type=\"xsd:ID\" use=\"required\"/>"+
- "</xsd:complexType>"+
- "</xsd:element>"+
- "</xsd:schema>").getBytes()));
-
- EntityResolverChain chain = new EntityResolverChain();
- chain.addEntityResolver(new StreamEntityResolver(m));
- chain.addEntityResolver(new MOAEntityResolver());
- builder.setEntityResolver(chain);
-
- //Dokument Parsen
- Document reqDoc = DOMUtils.parseDocument(bis,true,Constants.ALL_SCHEMA_LOCATIONS, null,chain,new MOAErrorHandler());
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- String xPath_Pos = "//data:Document";
- //XPAth-Prefixe deklarieren
- //String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- String xPath_Prefix = "data http://uri.data.org";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt","reference-1-1");
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
- tr[0] = trans;
- //Enveloped Transformation
- cpkcs.createReferenceWithTransforms(new URI("#document"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<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/test.xsd\">",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>");
-
- writeFile(resFile, output);
-
- }
-
- public void create009() throws Exception {
-
- String TestNumber = "009";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\">"+
- "<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://tollesSchema.org/test.xsd\">Dies sind Testdaten</data:Document>"+
- "</XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- req = replaceString(req,"<!-- insert supp -->",
- "<Supplement>"+
- "<Content Reference=\"http://tollesSchema.org/test.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\" id=\"tollesSchema\">"+
- "<xsd:element name=\"Document\">"+
- "<xsd:complexType mixed=\"true\">"+
- "<xsd:sequence maxOccurs=\"unbounded\" minOccurs=\"0\">"+
- "<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>");
-
- req = replaceString(req,"<FinalDataMetaInfo>",
- "<dsig:Transforms><dsig:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/></dsig:Transforms>"+
- "<FinalDataMetaInfo>");
-
-
-
- //req = replaceString(req,"Index=\"0\">//data:Document","Index=\"0\">//data:Document");
- System.out.println("!!!");
- System.out.println(req);
-
- req = replaceString(req,
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"+"\">"+
- "<XMLContent xml:space=\"preserve\">Dies sind Testdaten</XMLContent>"+
- "</DataObject>",
- "<DataObject Reference=\"#xpointer(id(document))\">"+
- "</DataObject>"
- );
-
- System.out.println(req);
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- //InputStream bis = new ByteArrayInputStream(("<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>").getBytes());
- InputStream bis = new ByteArrayInputStream(("<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://tollesSchema.org/test.xsd\">Dies sind Testdaten</data:Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setValidating(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- Map m = new HashMap();
- m.put("http://tollesSchema.org/test.xsd",new ByteArrayInputStream((
- "<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\" id=\"tollesSchema\">"+
- "<xsd:element name=\"Document\">"+
- "<xsd:complexType mixed=\"true\">"+
- "<xsd:sequence maxOccurs=\"unbounded\" minOccurs=\"0\">"+
- "<xsd:any namespace=\"##any\" processContents=\"lax\"/>"+
- "</xsd:sequence>"+
- "<xsd:attribute name=\"attr\" type=\"xsd:ID\" use=\"required\"/>"+
- "</xsd:complexType>"+
- "</xsd:element></xsd:schema>").getBytes()));
-
- EntityResolverChain chain = new EntityResolverChain();
- chain.addEntityResolver(new StreamEntityResolver(m));
- chain.addEntityResolver(new MOAEntityResolver());
- builder.setEntityResolver(chain);
-
- //Dokument Parsen
- Document reqDoc = DOMUtils.parseDocument(bis,true,Constants.ALL_SCHEMA_LOCATIONS, null,chain,new MOAErrorHandler());
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- //String xPath_Pos = "/node()";
- String xPath_Pos = "//data:Document";
- //XPAth-Prefixe deklarieren
- //String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- String xPath_Prefix = "data http://uri.data.org";
-
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos,"signature-1-1");
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt","reference-1-1");
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
- tr[0] = trans;
- //Enveloped Transformation
- cpkcs.createReferenceWithTransforms(new URI("#xpointer(id(document))"),tr,"reference-1-1");
- cpkcs.setKeyInformation(1);
-
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://tollesSchema.org/test.xsd\">",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</data:Document>");
-
- writeFile(resFile, output);
-
- }
-
- public void create051() throws Exception {
-
- String TestNumber = "051";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<CreateSignatureInfo xmlns:data=\"http://uri.data.org\">","<CreateSignatureInfo>");
-
- req = replaceString(req,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\">"+
- "<data:Document xmlns:data=\"http://uri.data.org\">daten</data:Document><Text>toller Text</Text>"+
- "</XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- req = replaceString(req,"<CreateSignatureLocation Index=\"0\">","<CreateSignatureLocation Index=\"0\" xmlns:data=\"http://uri.data.org\">");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"1109");
-
- }
-
- public void create052() throws Exception {
-
- String TestNumber = "052";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<Base64Content>PFRhZzE+PC9UYWcxPjxUYWcyPjwvVGFnMj4NCg0K</Base64Content><!-- Inhalt: <Tag1></Tag1><Tag2></Tag2> -->"+
- "</CreateSignatureEnvironment>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2218");
-
- }
-
- public void create053() throws Exception {
-
- String TestNumber = "053";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment/>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"1110");
-
- }
-
- public void create054() throws Exception {
-
- String TestNumber = "054";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\"><data:Document xmlns:data=\"http://uri.data.org\">Dies sind Testdaten</data:Document></XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- req = replaceString(req,
- "<CreateTransformsInfo>"+
- "<FinalDataMetaInfo>"+
- "<MimeType>text/plain</MimeType>"+
- "</FinalDataMetaInfo>"+
- "</CreateTransformsInfo>",
- "<CreateTransformsInfo>"+
- "<dsig:Transforms>"+
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xpath-19991116\">"+
- "<dsig:XPath>/data:book/data:first-name/node()</dsig:XPath>"+
- "</dsig:Transform>"+
- "</dsig:Transforms>"+
- "<FinalDataMetaInfo>"+
- "<MimeType>text/xml</MimeType>"+
- "</FinalDataMetaInfo>"+
- "</CreateTransformsInfo>");
-
- req = replaceString(req,
- "<CreateSignatureLocation Index=\"0\">//data:Document</CreateSignatureLocation>",
- "<CreateSignatureLocation Index=\"0\">//data:Document1</CreateSignatureLocation>");
-
- req = replaceString(req,
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"+"\">"+
- "<XMLContent xml:space=\"preserve\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</XMLContent>"+
- "</DataObject>",
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/BookData.xml"+"\"/>");
-
- //req = replaceString(req,"/data:Document","/data:nonExistingElement");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2212");
-
- }
-
- public void create056() throws Exception {
-
- String TestNumber = "056";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\">"+
- "<data:Document>andereDaten als in "+configuration_.getProperty("webbaseDir")+"resources/CSEP.xml</data:Document>"+
- "</XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- req = replaceString(req,
- "<CreateSignatureEnvironmentProfile>"+
- "<CreateSignatureLocation Index=\"0\">//data:Document</CreateSignatureLocation>"+
- "<!-- insert supp -->"+
- "</CreateSignatureEnvironmentProfile>",
- "<CreateSignatureEnvironmentProfileID>wrongCreateSignatureEnvironmentProfile</CreateSignatureEnvironmentProfileID>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2236");
-
- }
-
- public void create057() throws Exception {
-
- String TestNumber = "057";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment>"+
- "<XMLContent xml:space=\"preserve\"><data:Document xmlns:data=\"http://uri.data.org\">Dies sind Testdaten</data:Document></XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- req = replaceString(req,
- "<CreateTransformsInfo>"+
- "<FinalDataMetaInfo>"+
- "<MimeType>text/plain</MimeType>"+
- "</FinalDataMetaInfo>"+
- "</CreateTransformsInfo>",
- "<CreateTransformsInfo>"+
- "<dsig:Transforms>"+
- "<dsig:Transform Algorithm=\"http://www.w3.org/TR/1999/REC-xpath-19991116\">"+
- "<dsig:XPath>/data:book/data:first-name/node()</dsig:XPath>"+
- "</dsig:Transform>"+
- "</dsig:Transforms>"+
- "<FinalDataMetaInfo>"+
- "<MimeType>text/xml</MimeType>"+
- "</FinalDataMetaInfo>"+
- "</CreateTransformsInfo>");
-
- req = replaceString(req,
- "<CreateSignatureLocation Index=\"0\">//data:Document</CreateSignatureLocation>",
- "<CreateSignatureLocation Index=\"0\">]]'_'[[//data:Document</CreateSignatureLocation>");
-
- req = replaceString(req,
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"+"\">"+
- "<XMLContent xml:space=\"preserve\">"+readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")+"</XMLContent>"+
- "</DataObject>",
- "<DataObject Reference=\""+configuration_.getProperty("webbaseDir")+"resources/BookData.xml"+"\"/>");
-
- //req = replaceString(req,"/data:Document","/data:nonExistingElement");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2212");
-
- }
-
- public void create055() throws Exception {
-
- String TestNumber = "055";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert create -->",
- "<CreateSignatureEnvironment Reference=\""+configuration_.getProperty("webbaseDir")+"resources/CSEP.xml\">"+
- "<XMLContent xml:space=\"preserve\">"+
- "<data:Document>andereDaten als in "+configuration_.getProperty("webbaseDir")+"resources/CSEP.xml</data:Document>"+
- "</XMLContent>"+
- "</CreateSignatureEnvironment>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"1110");
-
- }
-
-
- public void writeFile(String filename,String data) throws Exception
- {
- BufferedWriter bw = new BufferedWriter(new FileWriter(filename));
- bw.write(data);
- bw.close();
- }
-
- public String makeOutputFile(Document signatureDoc,String prefix,String suffix) throws Exception
- {
- ArrayList foundNodes = new ArrayList();
- findNode(signatureDoc.getDocumentElement(),"dsig:Signature",foundNodes);
-
- Node outputNode = null;
-
- if(foundNodes.size()>0)
- {
- outputNode = (Node)foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"+
- "<CreateXMLSignatureResponse" +
- " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\""+
- " >"+
- //" xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\">"+
- "<SignatureEnvironment>" +prefix+
- erg +suffix+ "</SignatureEnvironment> </CreateXMLSignatureResponse>";
-
- return erg;
- }
-
- public String makeOutputFile(Document signatureDoc) throws Exception
- {
- return this.makeOutputFile(signatureDoc,"","");
- }
-}
diff --git a/spss.test/src/testgenerator/TestGeneratorFeature41.java b/spss.test/src/testgenerator/TestGeneratorFeature41.java
deleted file mode 100644
index 7ecb28449..000000000
--- a/spss.test/src/testgenerator/TestGeneratorFeature41.java
+++ /dev/null
@@ -1,1167 +0,0 @@
-package testgenerator;
-
-import iaik.ixsil.algorithms.CanonicalizationAlgorithmImplCanonicalXML;
-import iaik.ixsil.algorithms.DigestAlgorithmImplSHA1;
-import iaik.ixsil.algorithms.SignatureAlgorithmImplRSA;
-import iaik.ixsil.algorithms.Transform;
-import iaik.ixsil.algorithms.TransformImplBase64Decode;
-import iaik.ixsil.algorithms.TransformImplEnvelopedSignature;
-import iaik.ixsil.algorithms.TransformImplXSLT;
-import iaik.ixsil.core.Position;
-import iaik.ixsil.core.Signer;
-import iaik.ixsil.core.SignerManifest;
-import iaik.ixsil.core.SignerReference;
-import iaik.ixsil.core.SignerSignature;
-import iaik.ixsil.core.SignerSignedInfo;
-import iaik.ixsil.init.IXSILConstants;
-import iaik.ixsil.keyinfo.KeyManagerImpl;
-import iaik.ixsil.keyinfo.x509.KeyProviderImplX509Data;
-import iaik.ixsil.keyinfo.x509.X509Data;
-import iaik.ixsil.util.URI;
-
-import iaik.pkcs.pkcs12.PKCS12;
-import iaik.utils.Base64OutputStream;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.EntityResolverChain;
-import at.gv.egovernment.moa.util.MOAEntityResolver;
-import at.gv.egovernment.moa.util.MOAErrorHandler;
-import at.gv.egovernment.moa.util.StreamEntityResolver;
-
-/**
- * @author Gregor Karlinger
- */
-public class TestGeneratorFeature41 extends TestCases
-{
-
- String datadirectory = "data/feature41/";
-
- public static void main(String[] args) throws Exception
- {
- TestGeneratorFeature41 testcase = new TestGeneratorFeature41();
-
- testcase.create001();
- testcase.create002();
- testcase.create003();
- testcase.create004();
- testcase.create005();
- }
-
- /* ==================================================================================================== */
-
- public TestGeneratorFeature41() throws Exception
- {
-
- super();
-
- // Set config properties
- configuration_.setProperty("TestClass", "TestGeneratorFeature41");
-
- iaik.security.provider.IAIK.addAsJDK14Provider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public Document createPKCS12Sig(
- String TestNumber,
- String data,
- boolean env,
- boolean mani,
- String data2,
- boolean env2)
- throws Exception
- {
- String resFile =
- configuration_.getProperty("baseDir")
- + datadirectory
- + configuration_.getProperty("TestClass")
- + "."
- + TestNumber
- + ".Res.xml";
-
- PKCS12 pkcs12 =
- decryptPKCS12(configuration_.getProperty("PKCS12file"), configuration_.getProperty("PKCS12password"));
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- Signer signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- SignerSignature signature = signer.getSignature();
- SignerSignedInfo signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set canonicalization algorithm
- CanonicalizationAlgorithmImplCanonicalXML c14nAlg = new CanonicalizationAlgorithmImplCanonicalXML();
- signedInfo.setCanonicalizationAlgorithm(c14nAlg);
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg = new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey(pkcs12);
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- if (!mani)
- {
- SignerReference reference = signedInfo.createReference();
- if (env)
- {
- iaik.ixsil.core.Object object = null;
- //object = signature.createObject(data);
- if (data.startsWith("<xml"))
- {
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(data.getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if (data.startsWith("<Testdaten"))
- {
-
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc =
- db.parse(
- new ByteArrayInputStream(("<?xml version=\"1.0\" encoding=\"utf-8\"?>" + data).getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if (data.startsWith("b64:"))
- {
- data = data.substring(4);
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.newDocument();
- Element root = doc.createElement("root");
- doc.appendChild(root);
- //String encoded = Base64Utils.encode(data.getBytes());
- String encoded = Base64Utils.encode(data.getBytes());
- /*encoded = replaceStringAll(encoded,"\n","");
- encoded = replaceStringAll(encoded,"\r","");*/
- Text textnode = doc.createTextNode(encoded);
-
- System.out.println("Encoded:" + encoded);
- //root.appendChild(textnode);
-
- DocumentFragment df = doc.createDocumentFragment();
-
- df.appendChild(textnode);
-
- object = signature.createObject(df);
-
- TransformImplBase64Decode trans = new TransformImplBase64Decode();
- InputStream s = new ByteArrayInputStream(encoded.getBytes());
- trans.setInput(s, null);
-
- reference.insertTransformAt(trans, 0);
- }
- else
- {
- object = signature.createObject(data);
- }
-
- object.setId("signed-data-1-1-1");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(new URI("#xpointer(id('signed-data-1-1-1')/node())"));
-
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data);
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- reference.setId("reference-1-1");
- signedInfo.addReference(reference);
- }
-
- if (data2 != null)
- {
- SignerReference reference = signedInfo.createReference();
- reference = signedInfo.createReference();
- if (env2)
- {
- iaik.ixsil.core.Object object = null;
- if (data2.startsWith("<xml"))
- {
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(data.getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if (data2.startsWith("<Testdaten"))
- {
-
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc =
- db.parse(
- new ByteArrayInputStream(("<?xml version=\"1.0\" encoding=\"utf-8\"?>" + data).getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else
- object = signature.createObject(data2);
-
- if (!env)
- object.setId("signed-data-1-2-1");
- else
- object.setId("signed-data-1-2-1");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- if (!env)
- reference.setURI(new URI("#xpointer(id('signed-data-1-2-1')/node())"));
- else
- reference.setURI(new URI("#xpointer(id('signed-data-1-2-1')/node())"));
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data2);
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- reference.setId("reference-1-2");
- signedInfo.addReference(reference);
- }
-
- // Add reference to signature
-
- if (mani)
- {
-
- /*iaik.ixsil.core.Object object = null;
- if(env)
- object = signature.createObject(readFile(data));
- else
- object = signature.createObject(data);
-
- object.setId("envelopedData");
- signature.addObject(object);*/
- SignerReference reference = signedInfo.createReference();
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- manifestRef.setDigestAlgorithm(digestAlg);
-
- manifestRef.setURI(new URI(data));
- manifestRef.setId("reference-1-1");
-
- manifest.addReference(manifestRef);
- manifest.setId("dsig-manifest-1-1");
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = signedInfo.createReference();
- reference.setURI(new URI("#dsig-manifest-1-1"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);
-
- /*Element envelopedDataElem =
- signer.toDocument().createElement("EnvelopedDataElement");
-
- if(env)
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(readFile(data)));
- }
- else
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(data));
- }
-
- iaik.ixsil.core.Object object = signature.createObject(envelopedDataElem);
- signature.addObject(object);
-
- // Create Manifest with a single reference pointing to the enveloped data
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
- manifestRef.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[1]/descendant::node())"));
- manifestRef.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
- manifest.addReference(manifestRef);
-
- // Add Manifest to signature structure (use an Object) and compute digest values for manifest reference
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- // Create and configure reference to manifest
- reference = signedInfo.createReference();
- reference.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[2]/dsig:Manifest)"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);*/
- }
-
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- X509Certificate[] certs = getCertificates(pkcs12);
- X509Data x509Data = new X509Data();
- x509Data.insertHintAt(certs[1], 0);
- /*for (int i = 0; i < certs.length; i++)
- {
-
- }*/
-
- KeyProviderImplX509Data x509DataKeyProvider = new KeyProviderImplX509Data(signer.toDocument());
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- signer.getSignature().setKeyManager(keyManager);
- signer.getSignature().setId("signature-1-1");
- // Compute signature value
- signer.getSignature().sign();
-
- return signer.toDocument();
- }
-
- public Document createPKCS12Sig(
- String TestNumber,
- String data,
- boolean env,
- boolean mani,
- String data2,
- boolean env2,
- String id1,
- String id2)
- throws Exception
- {
- String resFile =
- configuration_.getProperty("baseDir")
- + datadirectory
- + configuration_.getProperty("TestClass")
- + "."
- + TestNumber
- + ".Res.xml";
-
- PKCS12 pkcs12 =
- decryptPKCS12(configuration_.getProperty("PKCS12file"), configuration_.getProperty("PKCS12password"));
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- Signer signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- SignerSignature signature = signer.getSignature();
- SignerSignedInfo signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set canonicalization algorithm
- CanonicalizationAlgorithmImplCanonicalXML c14nAlg = new CanonicalizationAlgorithmImplCanonicalXML();
- signedInfo.setCanonicalizationAlgorithm(c14nAlg);
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg = new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey(pkcs12);
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- if (!mani)
- {
- SignerReference reference = signedInfo.createReference();
- if (env)
- {
- iaik.ixsil.core.Object object = null;
- //object = signature.createObject(data);
- if (data.startsWith("<xml"))
- {
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(data.getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if (data.startsWith("<Testdaten"))
- {
-
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc =
- db.parse(
- new ByteArrayInputStream(("<?xml version=\"1.0\" encoding=\"utf-8\"?>" + data).getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if (data.startsWith("b64:"))
- {
- data = data.substring(4);
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.newDocument();
- Element root = doc.createElement("root");
- doc.appendChild(root);
- //String encoded = Base64Utils.encode(data.getBytes());
- String encoded = Base64Utils.encode(data.getBytes());
- /*encoded = replaceStringAll(encoded,"\n","");
- encoded = replaceStringAll(encoded,"\r","");*/
- Text textnode = doc.createTextNode(encoded);
-
- System.out.println("Encoded:" + encoded);
- //root.appendChild(textnode);
-
- DocumentFragment df = doc.createDocumentFragment();
-
- df.appendChild(textnode);
-
- object = signature.createObject(df);
-
- TransformImplBase64Decode trans = new TransformImplBase64Decode();
- InputStream s = new ByteArrayInputStream(encoded.getBytes());
- trans.setInput(s, null);
-
- reference.insertTransformAt(trans, 0);
- }
- else
- {
- object = signature.createObject(data);
- }
-
- object.setId("signed-data-1-1-1");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- reference.setURI(new URI("#xpointer(id('signed-data-1-1-1')/node())"));
-
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data);
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- reference.setId("reference-2-1");
- signedInfo.addReference(reference);
- }
-
- if (data2 != null)
- {
- SignerReference reference = signedInfo.createReference();
- reference = signedInfo.createReference();
- if (env2)
- {
- iaik.ixsil.core.Object object = null;
- if (data2.startsWith("<xml"))
- {
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(new ByteArrayInputStream(data.getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else if (data2.startsWith("<Testdaten"))
- {
-
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc =
- db.parse(
- new ByteArrayInputStream(("<?xml version=\"1.0\" encoding=\"utf-8\"?>" + data).getBytes()));
-
- object = signature.createObject(doc.getDocumentElement());
- }
- else
- object = signature.createObject(data2);
-
- if (!env)
- object.setId("signed-data-1-2-1");
- else
- object.setId("signed-data-1-2-1");
- signature.addObject(object);
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
-
- if (!env)
- reference.setURI(new URI("#xpointer(id('signed-data-1-2-1')/node())"));
- else
- reference.setURI(new URI("#xpointer(id('signed-data-1-2-1')/node())"));
- }
- else
- {
- // Create and configure reference
- URI refURI = null;
- String baseDir = configuration_.getProperty("baseDir");
- refURI = new URI(data2);
-
- reference.setURI(refURI);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- }
- reference.setId("reference-1-2");
- signedInfo.addReference(reference);
- }
-
- // Add reference to signature
-
- if (mani)
- {
-
- /*iaik.ixsil.core.Object object = null;
- if(env)
- object = signature.createObject(readFile(data));
- else
- object = signature.createObject(data);
-
- object.setId("envelopedData");
- signature.addObject(object);*/
- SignerReference reference = signedInfo.createReference();
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
-
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- manifestRef.setDigestAlgorithm(digestAlg);
-
- manifestRef.setURI(new URI(data));
- manifestRef.setId("reference-1-1");
-
- manifest.addReference(manifestRef);
- manifest.setId("dsig-manifest-1-1");
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- reference = signedInfo.createReference();
- reference.setURI(new URI("#dsig-manifest-1-1"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);
-
- /*Element envelopedDataElem =
- signer.toDocument().createElement("EnvelopedDataElement");
-
- if(env)
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(readFile(data)));
- }
- else
- {
- envelopedDataElem.appendChild(
- signer.toDocument().createTextNode(data));
- }
-
- iaik.ixsil.core.Object object = signature.createObject(envelopedDataElem);
- signature.addObject(object);
-
- // Create Manifest with a single reference pointing to the enveloped data
- SignerManifest manifest = signer.createManifest();
- SignerReference manifestRef = manifest.createReference();
- manifestRef.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[1]/descendant::node())"));
- manifestRef.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
- manifest.addReference(manifestRef);
-
- // Add Manifest to signature structure (use an Object) and compute digest values for manifest reference
- iaik.ixsil.core.Object manifestObject = signature.createObject(manifest);
- signature.addObject(manifestObject);
- manifest.computeDigestValues();
-
- // Create and configure reference to manifest
- reference = signedInfo.createReference();
- reference.setURI(
- new URI(
- null,
- null,
- null,
- null,
- "xmlns(dsig="
- + IXSILConstants.NAMESPACE_URI_XMLSIGNATURE_ELEM_
- + ") "
- + "xpointer(here()/ancestor::dsig:Signature[1]/dsig:Object[2]/dsig:Manifest)"));
- reference.setType(new URI(IXSILConstants.REFERENCETYPE_ATTR_VALUE_MANIFEST_));
- reference.setDigestAlgorithm(new DigestAlgorithmImplSHA1());
-
- // Add reference to signature
- signedInfo.addReference(reference);*/
- }
-
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- X509Certificate[] certs = getCertificates(pkcs12);
- X509Data x509Data = new X509Data();
- x509Data.insertHintAt(certs[1], 0);
- /*for (int i = 0; i < certs.length; i++)
- {
-
- }*/
-
- KeyProviderImplX509Data x509DataKeyProvider = new KeyProviderImplX509Data(signer.toDocument());
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- signer.getSignature().setKeyManager(keyManager);
- signer.getSignature().setId("signature-2-1");
- // Compute signature value
- signer.getSignature().sign();
-
- return signer.toDocument();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public Element getElement(String data) throws Exception
- {
- String etsinamespace = "http://uri.etsi.org/01903/v1.1.1#";
-
- getX509Content();
-
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- //dbf.setNamespaceAware(true);
- //dbf.setValidating(true);
-
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-
- Element qualprop = doc.createElementNS(etsinamespace, "etsi:QualifyingProperties");
- qualprop.setAttributeNS(null, "Target", "#signature-1-1");
- qualprop.setAttributeNS(IXSILConstants.NAMESPACE_URI_NAMESPACES_, "xmlns:etsi", etsinamespace);
- //qualprop.setPrefix("etsi");*/
- //qualprop.setAttributeNodeNS(doc.createAttributeNS(etsinamespace,"etsi"));
- Element signprop = doc.createElementNS(etsinamespace, "etsi:SignedProperties");
- Element signsigprop = doc.createElementNS(etsinamespace, "etsi:SignedSignatureProperties");
- Element signdataobjectprop = doc.createElementNS(etsinamespace, "etsi:SignedDataObjectProperties");
- Element signdate = doc.createElementNS(etsinamespace, "etsi:SigningTime");
- Text datevalue = doc.createTextNode("2003-05-10T00:01:01");
- Element signcert = doc.createElementNS(etsinamespace, "etsi:SigningCertificate");
- Element cert = doc.createElementNS(etsinamespace, "etsi:Cert");
- Element signpolyident = doc.createElementNS(etsinamespace, "etsi:SignaturePolicyIdentifier");
- Element signpolyimp = doc.createElementNS(etsinamespace, "etsi:SignaturePolicyImplied");
- Element certdig = doc.createElementNS(etsinamespace, "etsi:CertDigest");
- Element digmeth = doc.createElementNS(etsinamespace, "etsi:DigestMethod");
- digmeth.setAttribute("Algorithm", "http://www.w3.org/2000/09/xmldsig#sha1");
- Element digvalue = doc.createElementNS(etsinamespace, "etsi:DigestValue");
-
- ByteArrayOutputStream fos = new ByteArrayOutputStream();
- Base64OutputStream base64os = new Base64OutputStream(fos);
- base64os.write(this.X509hash.getBytes());
- base64os.flush();
-
- Text dig_value = doc.createTextNode(fos.toString());
- Element is = doc.createElementNS(etsinamespace, "etsi:IssuerSerial");
- Element i = doc.createElement("dsig:X509IssuerName");
- Text i_value = doc.createTextNode(this.X509name);
- Element s = doc.createElement("dsig:X509SerialNumber");
- Text s_value = doc.createTextNode(this.X509number.toString());
- Element dataobjformat = doc.createElementNS(etsinamespace, "etsi:DataObjectFormat");
- dataobjformat.setAttribute("ObjectReference", "#reference-1-1");
- Element mimetype = doc.createElementNS(etsinamespace, "etsi:MimeType");
- //mimetype.setNodeValue("text/plain");
- Text mimevalue = doc.createTextNode("text/plain");
-
- qualprop.appendChild(signprop);
- signprop.appendChild(signsigprop);
- signsigprop.appendChild(signdate);
- signdate.appendChild(datevalue);
- signsigprop.appendChild(signcert);
- signcert.appendChild(cert);
- cert.appendChild(certdig);
- certdig.appendChild(digmeth);
- certdig.appendChild(digvalue);
- digvalue.appendChild(dig_value);
- cert.appendChild(is);
- is.appendChild(i);
- i.appendChild(i_value);
- is.appendChild(s);
- s.appendChild(s_value);
- signsigprop.appendChild(signpolyident);
- signpolyident.appendChild(signpolyimp);
- signprop.appendChild(signdataobjectprop);
- signdataobjectprop.appendChild(dataobjformat);
- dataobjformat.appendChild(mimetype);
- mimetype.appendChild(mimevalue);
-
- return qualprop;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void create001() throws Exception
- {
-
- String testNumber = "001";
-
- String resFile =
- configuration_.getProperty("baseDir")
- + datadirectory
- + configuration_.getProperty("TestClass")
- + "."
- + testNumber
- + ".Res.xml";
-
- PKCS12 pkcs12 =
- decryptPKCS12(configuration_.getProperty("PKCS12file"), configuration_.getProperty("PKCS12password"));
-
- // Create signature generator
- URI baseURI = new URI(IXSILConstants.DUMMY_ABSURI_);
- Signer signer = new Signer(baseURI);
-
- // Configure signed information
-
- // Get interface for signed information
- SignerSignature signature = signer.getSignature();
- SignerSignedInfo signedInfo = signer.getSignature().getSignerSignedInfo();
-
- // Set canonicalization algorithm
- CanonicalizationAlgorithmImplCanonicalXML c14nAlg = new CanonicalizationAlgorithmImplCanonicalXML();
- signedInfo.setCanonicalizationAlgorithm(c14nAlg);
-
- // Set signature algorithm
- SignatureAlgorithmImplRSA signatureAlg = new SignatureAlgorithmImplRSA();
- RSAPrivateKey privateKey = getPrivateKey(pkcs12);
- signatureAlg.setSignerKey(privateKey);
- signedInfo.setSignatureAlgorithm(signatureAlg);
-
- // Create and configure reference
- String baseDir = configuration_.getProperty("baseDir");
- InputStream dataIS = new FileInputStream(baseDir + "resources/documents/testDaten.txt");
-
- SignerReference reference = signedInfo.createReference();
- reference.setURI(new URI("testDaten.txt"));
- reference.setExplicitData(dataIS, SignerReference.EXPLICITDATATYPE_RAW_);
- DigestAlgorithmImplSHA1 digestAlg = new DigestAlgorithmImplSHA1();
- reference.setDigestAlgorithm(digestAlg);
- reference.setId("reference-1-1");
- signedInfo.addReference(reference);
-
- // Create key information
- KeyManagerImpl keyManager = new KeyManagerImpl(signer.toDocument());
-
- X509Certificate[] certs = getCertificates(pkcs12);
- X509Data x509Data = new X509Data();
- x509Data.insertHintAt(certs[1], 0);
- KeyProviderImplX509Data x509DataKeyProvider = new KeyProviderImplX509Data(signer.toDocument());
- x509DataKeyProvider.insertX509DataAt(x509Data, 0);
-
- // X509Data key information (certificate chain)
- keyManager.addKeyProvider(x509DataKeyProvider);
-
- signer.getSignature().setKeyManager(keyManager);
- signer.getSignature().setId("signature-1-1");
- // Compute signature value
- signer.getSignature().sign();
-
- String erg = makeOutputFile(signer.toDocument());
- writeFile(resFile, erg);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void create002() throws Exception
- {
-
- String testNumber = "002";
-
- String resFile =
- configuration_.getProperty("baseDir")
- + datadirectory
- + configuration_.getProperty("TestClass")
- + "."
- + testNumber
- + ".Res.xml";
-
- Document signatureDoc = createPKCS12Sig(testNumber, "b64:Dies sind Testdaten", true, false, null, false);
- String erg = makeOutputFile(signatureDoc);
- writeFile(resFile, erg);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void create003() throws Exception
- {
-
- String testNumber = "003";
-
- String resFile =
- configuration_.getProperty("baseDir")
- + datadirectory
- + configuration_.getProperty("TestClass")
- + "."
- + testNumber
- + ".Res.xml";
-
- InputStream bis =
- new ByteArrayInputStream(
- ("<data:Document xmlns:data=\"http://uri.data.org\">"
- + readFile(configuration_.getProperty("baseDir") + "resources/documents/testSimple.txt")
- + "</data:Document>")
- .getBytes());
-
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
- Document reqDoc = builder.parse(bis);
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- String xPath_Pos = "/node()";
- //XPAth-Präfixe deklarieren
- String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- Position pos = new Position(xPath_Pos, xPath_Prefix, 0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc, pos, "signature-1-1");
- cpkcs.setCanoncialization(1);
- cpkcs.createReference(
- false,
- configuration_.getProperty("webbaseDir") + "resources/documents/testSimple.txt",
- "reference-1-1");
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output =
- makeOutputFile(
- doc,
- "<data:Document xmlns:data=\"http://uri.data.org\">",
- cutXML(readFile(configuration_.getProperty("baseDir") + "resources/documents/testSimple.txt"))
- + "</data:Document>");
-
- writeFile(resFile, output);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void create004() throws Exception
- {
-
- String testNumber = "004";
-
- String resFile =
- configuration_.getProperty("baseDir")
- + datadirectory
- + configuration_.getProperty("TestClass")
- + "."
- + testNumber
- + ".Res.xml";
-
- InputStream bis =
- new ByteArrayInputStream(
- ("<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://anywhere.org/testDocument.schema.xsd\">Dies sind Testdaten</data:Document>")
- .getBytes());
-
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setValidating(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- Map m = new HashMap();
- m.put(
- "http://anywhere.org/testDocument.schema.xsd",
- new ByteArrayInputStream(
- ("<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\" id=\"tollesSchema\">"
- + "<xsd:element name=\"Document\">"
- + "<xsd:complexType mixed=\"true\">"
- + "<xsd:sequence maxOccurs=\"unbounded\" minOccurs=\"0\">"
- + "<xsd:any namespace=\"##any\" processContents=\"lax\"/>"
- + "</xsd:sequence>"
- + "<xsd:attribute name=\"attr\" type=\"xsd:ID\" use=\"required\"/>"
- + "</xsd:complexType>"
- + "</xsd:element></xsd:schema>")
- .getBytes()));
-
- EntityResolverChain chain = new EntityResolverChain();
- chain.addEntityResolver(new StreamEntityResolver(m));
- chain.addEntityResolver(new MOAEntityResolver());
- builder.setEntityResolver(chain);
-
- //Dokument Parsen
- Document reqDoc =
- DOMUtils.parseDocument(bis, true, Constants.ALL_SCHEMA_LOCATIONS, null, chain, new MOAErrorHandler());
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
-
- //Position für die Signatur angeben
- String xPath_Pos = "//data:Document";
-
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "data http://uri.data.org";
-
- Position pos = new Position(xPath_Pos, xPath_Prefix, 0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc, pos, "signature-1-1");
- cpkcs.setCanoncialization(1);
-
- //Enveloped Transformation
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI("#document"), tr, "reference-1-1");
-
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
-
- String output =
- makeOutputFile(
- doc,
- "<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" attr=\"document\" xsi:schemaLocation=\"http://uri.data.org http://anywhere.org/testDocument.schema.xsd\">",
- readFile(configuration_.getProperty("baseDir") + "resources/documents/testSimple.txt")
- + "</data:Document>");
-
- writeFile(resFile, output);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void create005() throws Exception
- {
-
- String testNumber = "005";
- String resFile =
- configuration_.getProperty("baseDir")
- + datadirectory
- + configuration_.getProperty("TestClass")
- + "."
- + testNumber
- + ".Res.xml";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature-1-1");
- cpkcs.setCanoncialization(1);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- URL u = new URL(configuration_.getProperty("webbaseDir") + "resources/stylesheets/ref.book.notavailable.xsl");
- URLConnection hu = u.openConnection();
-
- trans.setStyleSheet(
- hu.getInputStream(),
- new URI(configuration_.getProperty("webbaseDir") + "resources/stylesheets/ref.book.notavailable.xsl"));
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(
- new URI(configuration_.getProperty("webbaseDir") + "resources/documents/bookData.xml"),
- tr,
- "reference-1-1");
-
- cpkcs.setKeyInformation(1);
-
- Document doc = cpkcs.returnSig();
- String output = makeOutputFile(doc);
- writeFile(resFile, output);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void writeFile(String filename, String data) throws Exception
- {
- BufferedWriter bw = new BufferedWriter(new FileWriter(filename));
- bw.write(data);
- bw.close();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private String makeOutputFile(Document signatureDoc) throws Exception
- {
- ArrayList foundNodes = new ArrayList();
- findNode(signatureDoc.getDocumentElement(), "dsig:Signature", foundNodes);
-
- Node outputNode = null;
-
- if (foundNodes.size() > 0)
- {
- outputNode = (Node) foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg =
- "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
- + "<CreateXMLSignatureResponse\n"
- + " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"
- + " >"
- +
- //" xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\">\n"+
- "<SignatureEnvironment>" + erg + "</SignatureEnvironment></CreateXMLSignatureResponse>";
-
- return erg;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private String makeOutputFile(Document signatureDoc, Document signatureDoc2) throws Exception
- {
- ArrayList foundNodes = new ArrayList();
- findNode(signatureDoc.getDocumentElement(), "dsig:Signature", foundNodes);
-
- Node outputNode = null;
-
- if (foundNodes.size() > 0)
- {
- outputNode = (Node) foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- foundNodes.clear();
- findNode(signatureDoc2.getDocumentElement(), "dsig:Signature", foundNodes);
-
- outputNode = null;
-
- if (foundNodes.size() > 0)
- {
- outputNode = (Node) foundNodes.get(0);
- }
-
- String erg2 = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- pos = erg2.indexOf("<dsig");
- erg2 = erg2.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg =
- "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
- + "<CreateXMLSignatureResponse\n"
- + " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"
- + " >"
- + "<SignatureEnvironment>"
- + erg
- + "</SignatureEnvironment><SignatureEnvironment>"
- + erg2
- + "</SignatureEnvironment> </CreateXMLSignatureResponse>";
-
- //erg = replaceString(erg,"Id=\"signature-1-1\"","Id=\"signature-2-1\"");
- //erg = replaceString(erg,"Id=\"reference-1-1\"","Id=\"reference-2-1\"");
-
- return erg;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String makeOutputFile(Document signatureDoc, String prefix, String suffix) throws Exception
- {
- ArrayList foundNodes = new ArrayList();
- findNode(signatureDoc.getDocumentElement(), "dsig:Signature", foundNodes);
-
- Node outputNode = null;
-
- if (foundNodes.size() > 0)
- {
- outputNode = (Node) foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg =
- "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
- + "<CreateXMLSignatureResponse"
- + " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\""
- + " >"
- +
- //" xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\">"+
- "<SignatureEnvironment>"
- + prefix
- + erg
- + suffix
- + "</SignatureEnvironment> </CreateXMLSignatureResponse>";
-
- return erg;
- }
-
-}
diff --git a/spss.test/src/testgenerator/TestGeneratorVC0.java b/spss.test/src/testgenerator/TestGeneratorVC0.java
deleted file mode 100644
index f54689875..000000000
--- a/spss.test/src/testgenerator/TestGeneratorVC0.java
+++ /dev/null
@@ -1,1057 +0,0 @@
-package testgenerator;
-
-import iaik.asn1.ASN1Object;
-import iaik.asn1.CodingException;
-import iaik.asn1.DerCoder;
-import iaik.asn1.ObjectID;
-import iaik.asn1.structures.AlgorithmID;
-import iaik.asn1.structures.Attribute;
-import iaik.asn1.structures.ChoiceOfTime;
-import iaik.asn1.structures.Name;
-import iaik.cms.CMSException;
-import iaik.cms.ContentInfoStream;
-import iaik.cms.SignedDataStream;
-import iaik.cms.SignerInfo;
-import iaik.security.random.SecRandom;
-import iaik.utils.StreamCopier;
-import iaik.x509.X509Certificate;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.SignatureException;
-
-import sun.misc.BASE64Encoder;
-
-
-/**
- * @author Administrator
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestGeneratorVC0 extends TestCases {
-
- String datadirectory = "data/VC0/";
- String datadirectory_l = "data/LVC";
-
- public String defaultblock =
- "<?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>2003-04-04T09:30:47-05:00</DateTime>"+
- "<CMSSignature><!-- insert data --></CMSSignature>"+
- "<DataObject>"+
- "<MetaInfo>"+
- "<MimeType>text/plain</MimeType>"+
- "<Description>anyURI</Description>"+
- "</MetaInfo>"+
- "<Content>"+
- "<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>"+
- "</Content>"+
- "</DataObject>"+
- "<TrustProfileID>TrustProfile1</TrustProfileID>"+
- "</VerifyCMSSignatureRequest>";
-
- public String defaultresponse =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+
- "<VerifyCMSSignatureResponse xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\" >"+
- "<SignerInfo>"+
- "<dsig:X509Data xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">"+
- "<dsig:X509SubjectName><!-- subn --></dsig:X509SubjectName>"+
- "<dsig:X509IssuerSerial>"+
- "<dsig:X509IssuerName><!-- in --></dsig:X509IssuerName>"+
- "<dsig:X509SerialNumber><!-- sn --></dsig:X509SerialNumber>"+
- "</dsig:X509IssuerSerial>"+
- "<dsig:X509Certificate><!-- cert --></dsig:X509Certificate>"+
- "<!-- cert2 -->"+
- "</dsig:X509Data>"+
- "</SignerInfo>"+
- "<SignatureCheck>"+
- "<Code><!-- sc_code --></Code>"+
- "</SignatureCheck>"+
- "<CertificateCheck>"+
- "<Code><!-- cc_code --></Code>"+
- "</CertificateCheck>"+
- "</VerifyCMSSignatureResponse>";
-
- public String defaultresponse2 =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+
- "<VerifyCMSSignatureResponse xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\" >"+
- "<SignerInfo>"+
- "<dsig:X509Data xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">"+
- "<dsig:X509SubjectName><!-- subn --></dsig:X509SubjectName>"+
- "<dsig:X509IssuerSerial>"+
- "<dsig:X509IssuerName><!-- in --></dsig:X509IssuerName>"+
- "<dsig:X509SerialNumber><!-- sn --></dsig:X509SerialNumber>"+
- "</dsig:X509IssuerSerial>"+
- "<dsig:X509Certificate><!-- cert --></dsig:X509Certificate>"+
- "</dsig:X509Data>"+
- "</SignerInfo>"+
- "<SignatureCheck>"+
- "<Code><!-- sc_code --></Code>"+
- "</SignatureCheck>"+
- "<CertificateCheck>"+
- "<Code><!-- cc_code --></Code>"+
- "</CertificateCheck>"+
- "<SignerInfo>"+
- "<dsig:X509Data xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">"+
- "<dsig:X509SubjectName><!-- subn --></dsig:X509SubjectName>"+
- "<dsig:X509IssuerSerial>"+
- "<dsig:X509IssuerName><!-- in --></dsig:X509IssuerName>"+
- "<dsig:X509SerialNumber><!-- sn --></dsig:X509SerialNumber>"+
- "</dsig:X509IssuerSerial>"+
- "<dsig:X509Certificate><!-- cert --></dsig:X509Certificate>"+
- "</dsig:X509Data>"+
- "</SignerInfo>"+
- "<SignatureCheck>"+
- "<Code><!-- sc_code --></Code>"+
- "</SignatureCheck>"+
- "<CertificateCheck>"+
- "<Code><!-- cc_code --></Code>"+
- "</CertificateCheck>"+
- "</VerifyCMSSignatureResponse>";
-
- /*
- <!-- in -->
- <!-- sn -->
- <!-- subn -->
- <!-- sc_code -->
- <!-- cc_code -->
- */
-
- public String b64_der_data = null;
- public String b64_der_data_two = null;
- public String b64_der_data_exp = null;
- public String b64_der_data_exp_two = null;
- public String b64_der_data_max = null;
-
- public String b64_der_data_1kb = null;
- public String b64_der_data_10kb = null;
- public String b64_der_data_100kb = null;
- public String b64_der_data_1mb = null;
- public String b64_der_data_10mb = null;
-
- public String cert_file_data = null;
- public String cert_max_file_data = null;
- public String cert_root_file_data = null;
-
-
- public String fileprefix = null;
- public String filesuffix = null;
-
- // signing certificate of user 2
- X509Certificate user2_sign;
- // signing private key of user 2
- PrivateKey user2_sign_pk;
-
- // encryption certificate of user 2
- X509Certificate user2_crypt;
- // encryption private key of user 2
- PrivateKey user2_crypt_pk;
- // a certificate chain containing the user certs + CA
-
- X509Certificate[] certificates;
- // secure random number generator
- SecureRandom random;
-
- public TestGeneratorVC0() throws Exception
- {
- super();
- // Set config properties
- configuration_.setProperty("TestClass", "TestGeneratorVC0");
-
-
- configuration_.setProperty(
- "PKCS12file_maxmustermann",
- (configuration_.getProperty("baseDir") + "/resources/Max_Mustermann (max).p12"));
-
- configuration_.setProperty("PKCS12password_maxmustermann", "max");
-
- configuration_.setProperty(
- "CERT_maxmustermann",
- (configuration_.getProperty("baseDir") + "resources/Max_Mustermann.cer"));
-
- configuration_.setProperty(
- "CERT_ROOT",
- (configuration_.getProperty("baseDir") + "resources/IAIKRootMusterbehoerde.cer"));
-
- Provider [] list = Security.getProviders();
- for(int counter=0;counter<list.length;counter++)
- {
- System.out.println(list[counter].getName());
- }
-
- iaik.security.provider.IAIK.addAsProvider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
-
- X509Certificate[] certs = CMSKeyStore.getCertificateChain(CMSKeyStore.RSA, CMSKeyStore.SZ_1024_SIGN);
- user2_sign = CMSKeyStore.getCertificateChain(CMSKeyStore.RSA, CMSKeyStore.SZ_2048_SIGN)[0];
- user2_sign_pk = CMSKeyStore.getPrivateKey(CMSKeyStore.RSA, CMSKeyStore.SZ_2048_SIGN);
- certificates = new X509Certificate[certs.length+1];
- System.arraycopy(certs, 0, certificates, 0, certs.length);
- certificates[certs.length] = user2_sign;
-
- // encryption certs
- user2_crypt = CMSKeyStore.getCertificateChain(CMSKeyStore.RSA, CMSKeyStore.SZ_2048_CRYPT)[0];
- user2_crypt_pk = CMSKeyStore.getPrivateKey(CMSKeyStore.RSA, CMSKeyStore.SZ_2048_CRYPT);
-
- random = SecRandom.getDefault();
-
- byte[] received_message = null;
- ASN1Object obj = null;
-
- String m = readFile(configuration_.getProperty("baseDir")+"resources/testDaten.txt");
- //String m = "This is a message";
- System.out.println("*"+m+"*");
- byte[] message = m.getBytes();
-
- System.out.println("Implicit SignedData demo [create]:");
- obj = createSignedCMSData(message, SignedDataStream.IMPLICIT,false);
- byte[] sig = DerCoder.encode(obj);
- writeFileBinary("testimpl.ber",sig);
- b64_der_data = (new BASE64Encoder()).encode(sig);
-
- obj = createSignedCMSData(message, SignedDataStream.IMPLICIT,true);
- sig = DerCoder.encode(obj);
- writeFileBinary("testimpl2.ber",sig);
- b64_der_data_two = (new BASE64Encoder()).encode(sig);
-
- obj = createSignedCMSData(message, SignedDataStream.EXPLICIT,false);
- sig = DerCoder.encode(obj);
- writeFileBinary("testexp.ber",sig);
- b64_der_data_exp = (new BASE64Encoder()).encode(sig);
-
- String output = getSignedDataStream(sig,message,false);
- System.out.println("Output:"+output);
-
- obj = createSignedCMSData(message, SignedDataStream.EXPLICIT,true);
- sig = DerCoder.encode(obj);
- writeFileBinary("testexp2.ber",sig);
- b64_der_data_exp_two = (new BASE64Encoder()).encode(sig);
-
- cert_file_data = readBinaryFileAsBase64_new(configuration_.getProperty("CERT"));
- cert_max_file_data = readBinaryFileAsBase64_new(configuration_.getProperty("CERT_maxmustermann"));
- cert_root_file_data = readBinaryFileAsBase64_new(configuration_.getProperty("CERT_ROOT"));
-
- // transmit data
- /*System.out.println("Implicit SignedData demo [parse]:");
- received_message = getSignedData(obj, null,true);
- System.out.print("Signed content: ");
- System.out.println(new String(received_message));*/
-
- //readBinaryFileAsBase64(configuration_.getProperty("baseDir")+"resources/testDaten.txt");
- }
-
- public String getCMSData(String filename) throws Exception
- {
- ASN1Object obj = null;
- obj = createSignedCMSData(readFile(configuration_.getProperty("baseDir") + "resources/"+filename+".txt").getBytes(), SignedDataStream.EXPLICIT,true);
- byte[] sig = DerCoder.encode(obj);
- //writeFileBinary("testexp2.ber",sig);
- return (new BASE64Encoder()).encode(sig);
- }
-
- public String getSignedDataStream(byte[] signedData, byte[] message,boolean two_users) throws CMSException, IOException {
-
- // we are testing the stream interface
- ByteArrayInputStream is = new ByteArrayInputStream(signedData);
- // create the ContentInfo object
- ContentInfoStream cis = new ContentInfoStream(is);
- System.out.println("This ContentInfo holds content of type " + cis.getContentType().getName());
- SignedDataStream signed_data = null;
-
- if (message == null) {
- // implicitly signed; get the content
- signed_data = (SignedDataStream)cis.getContent();
- }
- else {
- // explicitly signed; set the data stream for digesting the message
- AlgorithmID[] algIDs = { AlgorithmID.sha1, AlgorithmID.md5 };
- signed_data = new SignedDataStream(new ByteArrayInputStream(message), algIDs);
-
- }
-
- // get an InputStream for reading the signed content
- InputStream data = signed_data.getInputStream();
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- StreamCopier sc = new StreamCopier(data, os);
- sc.copyStream();
-
-
- if (message != null) {
- // if explicitly signed read now the DER encoded object
- // an explicit S/MIME signed message also consits of message|signature
- signed_data.decode(cis.getContentInputStream());
- }
-
- System.out.println("SignedData contains the following signer information:");
- SignerInfo[] signer_infos = signed_data.getSignerInfos();
-
- for (int i=0; i<signer_infos.length; i++) {
- try {
- // verify the signed data using the SignerInfo at index i
- X509Certificate signer_cert = signed_data.verify(i);
- // if the signature is OK the certificate of the signer is returned
- System.out.println("Signature OK from signer: "+signer_cert.getSubjectDN());
- Attribute signingTime = signer_infos[i].getSignedAttribute(ObjectID.signingTime);
- if (signingTime != null) {
- ChoiceOfTime cot = new ChoiceOfTime(signingTime.getValue()[0]);
- System.out.println("This message has been signed at " + cot.getDate());
- }
- Attribute contentType = signer_infos[i].getSignedAttribute(ObjectID.contentType);
- if (contentType != null) {
- System.out.println("The content has CMS content type " + contentType.getValue()[0]);
- }
-
- } catch (SignatureException ex) {
- // if the signature is not OK a SignatureException is thrown
- System.out.println("Signature ERROR from signer: "+signed_data.getCertificate((signer_infos[i].getSignerIdentifier())).getSubjectDN());
- } catch (CodingException ex) {
- System.out.println("Attribute decoding error: " + ex.getMessage());
- }
- }
- // now check alternative signature verification
- System.out.println("Now check the signature assuming that no certs have been included:");
- try {
- SignerInfo signer_info = signed_data.verify(user1_sign);
- // if the signature is OK the certificate of the signer is returned
- System.out.println("Signature OK from signer: "+signed_data.getCertificate(signer_info.getSignerIdentifier()).getSubjectDN());
-
- } catch (SignatureException ex) {
- // if the signature is not OK a SignatureException is thrown
- System.out.println("Signature ERROR from signer: "+user1_sign.getSubjectDN());
- }
-
- if(two_users)
- try {
- SignerInfo signer_info = signed_data.verify(user2_sign);
- // if the signature is OK the certificate of the signer is returned
- System.out.println("Signature OK from signer: "+signed_data.getCertificate(signer_info.getSignerIdentifier()).getSubjectDN());
-
- } catch (SignatureException ex) {
- // if the signature is not OK a SignatureException is thrown
- System.out.println("Signature ERROR from signer: "+user2_sign.getSubjectDN());
- }
-
-
- return os.toString();
- }
-
- public void createConfig() throws Exception {
-
- String file = configuration_.getProperty("baseDir") + datadirectory +
- configuration_.getProperty("TestClass") +
- ".Config.xml";
- String config =
-
- "<MOAConfiguration xmlns=\"http://reference.e-government.gv.at/namespace/moaconfig/20021122#\">"+
- " <KeyGroup id=\"PKCS12RSAKey1\"> <Key id=\"resources/test-ee2003_normal(buergerkarte).p12\"/> </KeyGroup>"+
- " <KeyGroup id=\"PKCS12RSAKeyExpired\"> <Key id=\"sicher-demo(buergerkarte).p12\"/> </KeyGroup>"+
- " <KeyGroup id=\"PKCS12ECDSAKey1\"> <Key id=\"ecc.p12\"/> </KeyGroup> "+
- " <KeyGroup id=\"HSMRSAKey1\"> <Key id=\"???\"/> </KeyGroup>"+
- " <KeyGroup id=\"HSMECDSAKey1\"> <Key id=\"???\"/> </KeyGroup>"+
- " <DigestMethodAlgorithm name=\"http://www.w3.org/2000/09/xmldsig#sha1\"/>"+
- " <SignatureAlgorithm name=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/>"+
- " <CanonicalizationAlgorithm name=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>"+
- " <CreateSignatureEnvironmentProfile id=\"CreateSignatureEnvironmentProfile1\" filename=\""+"file:/"+configuration_.getProperty("baseDir")+"resources/csep.xml\"/>"+
- " <TrustProfile id=\"validTrustProfileID1\" uri=\""+"file:/"+configuration_.getProperty("baseDir")+"TrustProfile1/\"/>"+
- "</MOAConfiguration>";
-
- FileOutputStream fos = new FileOutputStream(file);
- fos.write(config.getBytes());
- fos.flush();
- fos.close();
-
- fileprefix = configuration_.getProperty("baseDir")+ datadirectory + configuration_.getProperty("TestClass") + ".";
- filesuffix = ".xml";
-
- }
-
- public static void main(String[] args) throws Exception {
- TestGeneratorVC0 testcase = new TestGeneratorVC0();
-
- testcase.createConfig();
- testcase.create001();
- testcase.create002();
- testcase.create003();
- testcase.create004();
- testcase.create005();
- testcase.create006();
- testcase.create007();
- testcase.create008();
- testcase.create009();
- testcase.create010();
- //testcase.create011();
- testcase.create012();
-
- testcase.create051();
- testcase.create052();
- //testcase.create053();
- testcase.create054();
- testcase.create055();
- testcase.create056();
- testcase.create057();
- testcase.create058();
-
- //testcase.createL00();
-
- }
-
- public void createL00() throws Exception {
- createL001("1kb");
- createL001("10kb");
- createL001("20kb");
- createL001("50kb");
- createL001("100kb");
- createL001("500kb");
- createL001("1mb");
- createL001("10mb");
- }
-
- public void createL001(String filename) throws Exception
- {
- String TestNumber = "001";
-
- String reqFile = configuration_.getProperty("baseDir")+ datadirectory_l+filename+"/" + configuration_.getProperty("TestClass") + "." + TestNumber + ".Req.xml";
-
- String req = replaceString(defaultblock,"<!-- insert data -->",getCMSData(filename));
- req = replaceString(req,"<Content>","<Content Reference=\"anyURI\">");
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/"+filename+".txt");
- req = replaceString(req,
- "<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>",
- "");
-
- writeFile(reqFile,req);
-
- String resFile = configuration_.getProperty("baseDir")+ datadirectory_l+filename+"/" + configuration_.getProperty("TestClass") + "." + TestNumber + ".Res.xml";
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- //res = replaceString(res,"<dsig:X509Certificate><!-- cert --></dsig:X509Certificate>","");
-
-
- writeFile(resFile,res);
-
-
- }
-
- public void create001() throws Exception
- {
- String TestNumber = "001";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- /*CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,"file:/"+configuration_.getProperty("baseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<data:Document xmlns:data=\"uri.data.org\">",readFile(configuration_.getProperty("baseDir")+"resources/testDaten.txt")+"</data:Document>");
-
- writeFile(resFile, output);*/
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- //res = replaceString(res,"<dsig:X509Certificate><!-- cert --></dsig:X509Certificate>","");
-
-
- writeFile(resFile,res);
-
-
- }
-
- public void create002() throws Exception
- {
- String TestNumber = "002";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp_two);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "Signatories=\"1\"",
- "Signatories=\"1 2\"");
-
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceStringAll(defaultresponse2,"<!-- in -->",this.X509name);
- res = replaceStringAll(res,"<!-- sn -->",this.X509number.toString());
- res = replaceStringAll(res,"<!-- subn -->",this.X509sub);
- res = replaceStringAll(res,"<!-- sc_code -->","0");
- res = replaceStringAll(res,"<!-- cc_code -->","0");
- res = replaceStringAll(res,"<!-- cert -->",cert_file_data);
- //res = replaceString(res,"<!-- cert2 -->","");
- writeFile(resFile,res);
- }
-
- public void create003() throws Exception
- {
- String TestNumber = "003";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "Signatories=\"1\"",
- "Signatories=\"all\"");
-
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- writeFile(resFile,res);
- }
-
- public void create004() throws Exception
- {
- String TestNumber = "004";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<DateTime>2003-04-04T09:30:47-05:00</DateTime>",
- "");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- writeFile(resFile,res);
- }
-
- public void create005() throws Exception
- {
- String TestNumber = "005";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<DateTime>2003-04-04T09:30:47-05:00</DateTime>",
- "<DateTime>2003-04-04T09:30:47-05:00</DateTime>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- writeFile(resFile,res);
- }
-
- public void create006() throws Exception
- {
- String TestNumber = "006";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<DataObject>"+
- "<MetaInfo>"+
- "<MimeType>text/plain</MimeType>"+
- "<Description>"+configuration_.getProperty("webbaseDir") + "resources/testDaten.txt</Description>"+
- "</MetaInfo>"+
- "<Content>"+
- "<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>"+
- "</Content>"+
- "</DataObject>",
- "");
-
- //req = replaceString(defaultblock,
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- writeFile(resFile,res);
- }
-
- public void create007() throws Exception
- {
- String TestNumber = "007";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<MetaInfo>"+
- "<MimeType>text/plain</MimeType>"+
- "<Description>"+configuration_.getProperty("webbaseDir") + "resources/testDaten.txt</Description>"+
- "</MetaInfo>",
- "");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- writeFile(resFile,res);
- }
-
- public void create008() throws Exception
- {
- String TestNumber = "008";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- writeFile(resFile,res);
- }
-
- public void create009() throws Exception
- {
- String TestNumber = "009";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceString(req,"<Content>","<Content Reference=\"anyURI\">");
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>",
- "");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- writeFile(resFile,res);
- }
-
- public void create011() throws Exception
- {
- String TestNumber = "011";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",readFile(configuration_.getProperty("baseDir") + "resources/VC0.011.cms.ber.b64.txt"));
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<DataObject>"+
- "<MetaInfo>"+
- "<MimeType>text/plain</MimeType>"+
- "<Description>"+configuration_.getProperty("webbaseDir") + "resources/testDaten.txt</Description>"+
- "</MetaInfo>"+
- "<Content>"+
- "<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>"+
- "</Content>"+
- "</DataObject>",
- "");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceString(defaultresponse,"<!-- in -->","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");
- res = replaceString(res,"<!-- sn -->","6455");
- res = replaceString(res,"<!-- subn -->","Seriennummer=790187461633,G=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT");
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- res = replaceString(res,
- "</dsig:X509Data>",
- "<sl11:QualifiedCertificate xmlns:sl11=\"http://www.buergerkarte.at/namespaces/securitylayer/20020831#\"/>"+
- "</dsig:X509Data>");
-
-
- writeFile(resFile,res);
- }
-
- public void create012() throws Exception
- {
- String TestNumber = "012";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(configuration_.getProperty("CERT_maxmustermann")));
- iaik.x509.X509Certificate cert = new iaik.x509.X509Certificate(bis);
- X509name = ((Name)(cert.getIssuerDN())).getRFC2253String();
- X509number = cert.getSerialNumber();
- X509hash = new String(cert.getFingerprintSHA());
- X509sub = ((Name)(cert.getSubjectDN())).getRFC2253String();
-
- String m = "This is a message";
- System.out.println("*"+m+"*");
- byte[] message = m.getBytes();
-
- ASN1Object obj = null;
- obj = createSignedCMSData(message, SignedDataStream.IMPLICIT,false,"PKCS12file_maxmustermann","PKCS12password_maxmustermann","CERT_maxmustermann");
- byte[] sig = DerCoder.encode(obj);
- writeFileBinary("testimplmax.ber",sig);
- b64_der_data_max = (new BASE64Encoder()).encode(sig);
-
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_max);
-
- req = replaceString(req,
- "<DataObject>"+
- "<MetaInfo>"+
- "<MimeType>text/plain</MimeType>"+
- "<Description>anyURI</Description>"+
- "</MetaInfo>"+
- "<Content>"+
- "<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>"+
- "</Content>"+
- "</DataObject>",
- "");
-
- //req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- /*CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,"file:/"+configuration_.getProperty("baseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- Document doc = cpkcs.returnSig();
-
- String output = makeOutputFile(doc,"<data:Document xmlns:data=\"uri.data.org\">",readFile(configuration_.getProperty("baseDir")+"resources/testDaten.txt")+"</data:Document>");
-
- writeFile(resFile, output);*/
-
-
- String res = replaceString(defaultresponse,"<!-- in -->",X509name);
- res = replaceString(res,"<!-- sn -->",X509number.toString());
- res = replaceString(res,"<!-- subn -->",X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_max_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
- res = replaceString(res,
- "</dsig:X509Data>",
- "<PublicAuthority>"+
- "<Code>Musterbehörde</Code>"+
- //"<Code>Musterbehörde</Code>"+
- "</PublicAuthority>"+
- "</dsig:X509Data>");
-
-
- writeFile(resFile,res);
-
-
- }
-
- public void create051() throws Exception
- {
- String TestNumber = "051";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "Signatories=\"1\"",
- "Signatories=\"0\"");
-
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"1100");
- }
-
- public void create052() throws Exception
- {
- String TestNumber = "052";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "Signatories=\"1\"",
- "Signatories=\"10\"");
-
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2249");
- }
-
- public void create053() throws Exception
- {
- String TestNumber = "053";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<DateTime>2003-04-04T09:30:47-05:00</DateTime>",
- "<DateTime>"+getDate(1*34*24)+"</DateTime>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"0000");
- }
-
- public void create054() throws Exception
- {
- String TestNumber = "054";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,
- "<CMSSignature><!-- insert data --></CMSSignature>",
- "<CMSSignature>this is no Base64 Data</CMSSignature>");
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"1100");
-
- }
-
- public void create055() throws Exception
- {
- String TestNumber = "055";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<DataObject>"+
- "<MetaInfo>"+
- "<MimeType>text/plain</MimeType>"+
- "<Description>"+configuration_.getProperty("webbaseDir") + "resources/testDaten.txt</Description>"+
- "</MetaInfo>"+
- "<Content>"+
- "<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>"+
- "</Content>"+
- "</DataObject>",
- "");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2248");
-
- }
-
-
-
- public void create010() throws Exception
- {
- String TestNumber = "010";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceString(req,"<Content>","<Content Reference=\"anyURI\">");
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>",
- "");
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".Res"+filesuffix;
-
- String res = replaceString(defaultresponse,"<!-- in -->",this.X509name);
- res = replaceString(res,"<!-- sn -->",this.X509number.toString());
- res = replaceString(res,"<!-- subn -->",this.X509sub);
- res = replaceString(res,"<!-- sc_code -->","0");
- res = replaceString(res,"<!-- cc_code -->","0");
- res = replaceString(res,"<!-- cert -->",cert_file_data);
- res = replaceString(res,"<!-- cert2 -->","");
-
- writeFile(resFile,res);
-
- }
-
- public void create056() throws Exception
- {
- String TestNumber = "056";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
- req = replaceString(req,
- "<TrustProfileID>TrustProfile1</TrustProfileID>",
- "<TrustProfileID>notvalidTrustProfileID</TrustProfileID>");
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2203");
-
- }
-
-
- public void create057() throws Exception
- {
- String TestNumber = "057";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
-
- configuration_.setProperty(
- "PKCS12file_maxmustermann",
- (configuration_.getProperty("baseDir") + "/resources/Max_Mustermann (max).p12"));
-
- configuration_.setProperty("PKCS12password_maxmustermann", "max");
-
- configuration_.setProperty(
- "CERT_maxmustermann",
- (configuration_.getProperty("baseDir") + "resources/Max_Mustermann.cer"));
-
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(configuration_.getProperty("CERT_maxmustermann")));
- iaik.x509.X509Certificate cert = new iaik.x509.X509Certificate(bis);
- X509name = ((Name)(cert.getIssuerDN())).getRFC2253String();
- X509number = cert.getSerialNumber();
- X509hash = new String(cert.getFingerprintSHA());
- X509sub = ((Name)(cert.getSubjectDN())).getRFC2253String();
-
- String m = "This is a message";
- System.out.println("*"+m+"*");
- byte[] message = m.getBytes();
-
- ASN1Object obj = null;
- obj = createSignedCMSData(message, SignedDataStream.IMPLICIT,false,"PKCS12file_maxmustermann","PKCS12password_maxmustermann","CERT_maxmustermann");
- byte[] sig = DerCoder.encode(obj);
- writeFileBinary("testimplmax.ber",sig);
- b64_der_data_max = (new BASE64Encoder()).encode(sig);
-
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_max);
-
- /*req = replaceString(req,
- " <DataObject>"+
- " <MetaInfo>"+
- " <MimeType>text/plain</MimeType>"+
- " <Description>anyURI</Description>"+
- " </MetaInfo>"+
- " <Content Reference=\"anyURI\">"+
- " <Base64Content>RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=</Base64Content>"+
- " </Content>"+
- " </DataObject>",
- "");*/
-
- //req = replaceString(req,"Reference=\"anyURI\"","");
-
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
-
-
-
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"2248");
-
-
- }
-
- public void create058() throws Exception
- {
- String TestNumber = "058";
- String reqFile = fileprefix + TestNumber + ".Req"+filesuffix;
-
- String req = replaceString(defaultblock,"<!-- insert data -->",b64_der_data_exp);
- req = replaceStringAll(req,"anyURI",configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
-
- req = replaceString(req,"RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=","RGllcyBzaW5kIFRlc3RkYXRlbg0KMi4gWmVpbGUNCjMuIFplaWxlDQphdXM=()");
- writeFile(reqFile,req);
-
- String resFile = fileprefix + TestNumber + ".ErrRes"+filesuffix;
-
- writeFile(resFile,"1100");
-
- }
-
-
-
-
-
-
-
-}
diff --git a/spss.test/src/testgenerator/TestGeneratorVX.java b/spss.test/src/testgenerator/TestGeneratorVX.java
deleted file mode 100644
index 20ff44a22..000000000
--- a/spss.test/src/testgenerator/TestGeneratorVX.java
+++ /dev/null
@@ -1,2793 +0,0 @@
-package testgenerator;
-import iaik.ixsil.algorithms.Transform;
-import iaik.ixsil.algorithms.TransformImplBase64Decode;
-import iaik.ixsil.algorithms.TransformImplCanonicalXML;
-import iaik.ixsil.algorithms.TransformImplCanonicalXMLWithComments;
-import iaik.ixsil.algorithms.TransformImplEnvelopedSignature;
-import iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXML;
-import iaik.ixsil.algorithms.TransformImplExclusiveCanonicalXMLWithComments;
-import iaik.ixsil.algorithms.TransformImplXPath;
-import iaik.ixsil.algorithms.TransformImplXPath2;
-import iaik.ixsil.algorithms.TransformImplXSLT;
-import iaik.ixsil.core.Position;
-import iaik.ixsil.util.URI;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xml.serialize.DOMWriterImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.EntityResolverChain;
-import at.gv.egovernment.moa.util.MOAEntityResolver;
-import at.gv.egovernment.moa.util.MOAErrorHandler;
-import at.gv.egovernment.moa.util.StreamEntityResolver;
-
-/**
- * @author stephan
- */
-public class TestGeneratorVX extends TestCases {
-
- private static final int canAlgCanXML = 1;
- private static final int canAlgCanXMLwithCom = 2;
- private static final int canAlgExcXML = 3;
- private static final int canAlgExcXMLwithCom = 4;
- private static VXResponseBean vxBean = null;
-
- public static void main(String[] args) throws Exception {
-
- vxBean = new VXResponseBean();
-
- TestGeneratorVX testcase = new TestGeneratorVX();
- testcase.createVXConfig();
-
- testcase.create001();
- testcase.create002();
- testcase.create003();
- testcase.create004();
- testcase.create005();
- testcase.create006();
- testcase.create007();
- testcase.create009();
- testcase.create008();
-
- testcase.create101();
- testcase.create102();
- testcase.create103();
- testcase.create104();
- testcase.create105();
- testcase.create106();
-
- testcase.create301();
- testcase.create302();
- testcase.create303();
- testcase.create304();
- testcase.create305();
-
- testcase.create307();
- testcase.create308();
-
- testcase.create310();
- testcase.create311();
- testcase.create312();
- testcase.create313();
- testcase.create314();
- testcase.create314_2();
- testcase.create315();
- testcase.create316();
- testcase.create317();
- testcase.create318();
- testcase.create318_2();
- testcase.create319();
- testcase.create320();
- testcase.create320_2();
- testcase.create321();
- testcase.create322();
- testcase.create323();
- testcase.create324();
- testcase.create325();
- testcase.create326();
- testcase.create327();
-
- //testcase.createL00();
-
- }
-
- /* ==================================================================================================== */
-
- public TestGeneratorVX() throws Exception {
-
- super();
-
- // Set config properties
- configuration_.setProperty("TestClass", "TestGeneratorVX");
-
- // configuration_.setProperty("privateKeyFile", baseDir + "additionalFiles/keys/RSAPrivateKey.der");
- // configuration_.setProperty("publicKeyFile", baseDir + "additionalFiles/keys/RSAPublicKey.der");
- // configuration_.setProperty("signatureFile", baseDir + "additionalFiles/signatures/Signature.unit1.xml");
-
- iaik.security.provider.IAIK.addAsProvider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
- }
-
- /* ==================================================================================================== */
-
- public void testEcc() throws Exception
- {
- Date d = new Date();
- long start = d.getTime();
- long initEcc = 0;
- long timeEcc = 0;
- long initRSA = 0;
- long timeRSA = 0;
-
-
- TestGeneratorVX testcase = new TestGeneratorVX();
- testcase.ecccreate319();
- initEcc = (new Date()).getTime() - start;
- testcase.ecccreate320();
- testcase.ecccreate321();
- testcase.ecccreate322();
- testcase.ecccreate323();
- testcase.ecccreate324();
-
- timeEcc = (new Date()).getTime() - start;
-
- start = (new Date()).getTime();
-
- testcase = new TestGeneratorVX();
- testcase.create319();
- initRSA = (new Date()).getTime() - start;
- testcase.create320();
- testcase.create321();
- testcase.create322();
- testcase.create323();
- testcase.create324();
- timeRSA =(new Date()).getTime() - start;
-
- System.out.println("=========================================================");
- System.out.println("=========================================================");
-
- System.out.println("Init ECC (inkl. 1st Test): "+ (initEcc)+ "ms" );
- System.out.println("ECC-Tests gesamt: "+ (timeEcc)+ "ms" );
- System.out.println("ECC-Tests 2-5: "+ (timeEcc-initEcc)+ "ms" );
- System.out.println("=========================================================");
- System.out.println("Init RSA (inkl. 1st Test): "+ (initRSA)+ "ms" );
- System.out.println("RSA-Tests gesamt: "+ (timeRSA)+ "ms" );
- System.out.println("RSA-Tests 2-5: "+ (timeRSA-initRSA)+ "ms" );
- System.out.println("=========================================================");
- }
-
-public void ecccreate319() throws Exception {
- String testNumber = "ecc319";
-
-
- // Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); // Create from whole cloth
-//
- // Element root = (Element) document.createElement("Data");
- // root.appendChild(document.createTextNode(readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")) );
-// Element root2 = (Element) document.createElement("Element2");
- // root2.appendChild(document.createTextNode("Some other text") );
-
- // root.appendChild(root2);
-
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //cpkcs.init();
- long start = (new Date()).getTime();
- cpkcs.initECDSA();
- System.out.println("Init-Dauer für " +testNumber + ":" + ((new Date()).getTime()-start));
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,"Dies sind Testdaten");
- //cpkcs.createReferenceEnvElement(root);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- start = (new Date()).getTime();
- Document sign = cpkcs.returnSig();
- System.out.println("Sign-Dauer für " +testNumber + ":" + ((new Date()).getTime()-start));
-
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
- /**
- * Method create320:
- * The element KeyInfo does NOT contain the X509-certificate but
- * an URI pointing to an external xml-encoded X509-file
- * @throws Exception
- */
- public void ecccreate320() throws Exception {
- String testNumber = "ecc320";
-
- //RetrievalMethdos instead of the integratede Keys
-
- //URI fileURI = new URI(configuration_.getProperty("baseDir") + "resources/test-ee2003_normal.der");
- URI fileURI = new URI("file:/"+configuration_.getProperty("baseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
- //URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#rawX509Certificate");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
-// cpkcs.init();
-
- cpkcs.initECDSA();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- long start = (new Date()).getTime();
- Document sign = cpkcs.returnSig();
- System.out.println("Sign-Dauer für " +testNumber + ":" + ((new Date()).getTime()-start));
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
-
- public void ecccreate321() throws Exception {
- String testNumber = "ecc321";
-
- //RetrievalMethdos instead of the integratede Keys
-
- URI fileURI = new URI("file:/"+configuration_.getProperty("baseDir") + "resources/test-ee2003_normal.der");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#rawX509Certificate");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- // cpkcs.init();
- cpkcs.initECDSA();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- long start = (new Date()).getTime();
- Document sign = cpkcs.returnSig();
- System.out.println("Sign-Dauer für " +testNumber + ":" + ((new Date()).getTime()-start));
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
-
- /**
- * Method create322.
- * The reference in the signature points with an xpointer
- * to the ID of an embedded valid manifest dsig:object
- * @throws Exception
- */
- public void ecccreate322() throws Exception {
- String testNumber = "ecc322";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- // cpkcs.init();
- cpkcs.initECDSA();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI fileURI1 = new URI(configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.createReferenceWithManifest(fileURI1,"manifestObject");
-
- cpkcs.setKeyInformation();
- long start = (new Date()).getTime();
- Document sign = cpkcs.returnSig();
- System.out.println("Sign-Dauer für " +testNumber + ":" + ((new Date()).getTime()-start));
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
-
- }
- /**
- * Method create323:
- * There are two references in the signature pointing
- * with xpointer to two embedded valid manifest dsig:objects
- * @throws Exception
- */
- public void ecccreate323() throws Exception {
- String testNumber = "ecc323";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- // cpkcs.init();
- cpkcs.initECDSA();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI fileURI1 = new URI(configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- URI fileURI2 = new URI(configuration_.getProperty("webbaseDir") + "resources/testXML.txt");
- cpkcs.createReferenceWithManifest(fileURI1,"manifestObject");
-
- //HINWEIS: Durch das 2malige Aufrufen wird ein WEITERES dsig:Object ELEMENT erzeugt... darf das so sein...???
-
- cpkcs.createReferenceWithManifest(fileURI2,"manifestObject2");
- cpkcs.setKeyInformation();
- long start = (new Date()).getTime();
- Document sign = cpkcs.returnSig();
- System.out.println("Sign-Dauer für " +testNumber + ":" + ((new Date()).getTime()-start));
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
-
- }
- public void ecccreate324() throws Exception {
- String testNumber = "ecc324";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- // cpkcs.init();
- cpkcs.initECDSA();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI fileURI1 = new URI(configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- URI fileURI2 = new URI(configuration_.getProperty("webbaseDir") + "resources/testXML.txt");
- cpkcs.createReferencesWithManifest(fileURI1,"manifestObject",fileURI2);
-
- //HINWEIS: Durch das 2malige Aufrufen wird ein WEITERES dsig:Object ELEMENT erzeugt... darf das so sein...???
- cpkcs.setKeyInformation();
- long start = (new Date()).getTime();
- Document sign = cpkcs.returnSig();
- System.out.println("Sign-Dauer für " +testNumber + ":" + ((new Date()).getTime()-start));
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
-
- }
-
- public void createL00() throws Exception {
- createL001("1kb");
- createL001("10kb");
- createL001("20kb");
- createL001("50kb");
- createL001("100kb");
- createL001("500kb");
- createL001("1mb");
- createL001("10mb");
- }
-
- public void createL001(String filename) throws Exception {
-
- String testNumber = "001";
-
- //Create a Request with number 001, the current Time (+0 hours)
- // and with the Date and ReturnHashInputDate Elements present
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/"+filename+".txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(false,false,null));
-
- writeFile(vxReqFileL(testNumber,filename),request);
-
-
-
- writeFile(vxResFileL(testNumber,filename), createResponseL(cpkcs.getX509CertString(), testNumber,"0",filename));
- }
-
- /**
- * Method create001.
- * @throws Exception
- */
- /* ===================================================================================================================== */
- /* ===================================================================================================================== */
- /* ===================================================================================================================== */
-
- public void create001() throws Exception {
-
- String testNumber = "001";
-
- //Create a Request with number 001, the current Time (+0 hours)
- // and with the Date and ReturnHashInputDate Elements present
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
-
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
- /**
- * Method create002.
- * @throws Exception
- */
- public void create002() throws Exception {
- String testNumber = "002";
- //Create a Request with number 002, the current Time (+0 hours)
- // and without the Date and with ReturnHashInputDate Elements present
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,false,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
- /**
- * Method create003.
- * @throws Exception
- */
- public void create003() throws Exception {
- String testNumber = "003";
- //Create a Request with number 003, the Time one Day in the past (-24 hours)
- // and with the Date and with ReturnHashInputDate Elements present
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,-24),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
- /**
- * Method create004.
- * @throws Exception
- */
- public void create004() throws Exception {
- String testNumber = "004";
- //Create a Request with number 004, the current Time (+0 hours)
- // and with the Date and without ReturnHashInputDate Elements present
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(false,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
-
- writeFile(vxResFile(testNumber), createResponseWithoutHashInputData(cpkcs.getX509CertString(), testNumber,"0"));
- }
- public void create005() throws Exception {
- String testNumber = "005";
-
- String request =
- createRequestStart(testNumber,true,0, "Reference=\"" + configuration_.getProperty("webbaseDir") + "resources/SignatureVX005.xml\" ")+
- createRequestEnd(false,false,null);
-
- request = replaceString(request,"<XMLContent xml:space=\"preserve\">","");
- request = replaceString(request,"</XMLContent>","");
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(readFileCR(configuration_.getProperty("webbaseDir") + "resources/SignatureVX005Cert.xml")) +
- vxBean.createSignatureCheck("0")+
- vxBean.createXMLDSIGManifestCheck("1","1","1")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
- /**
- * Method create051.
- * @throws Exception
- */
-
-public void create006() throws Exception {
-
- String testNumber = "006";
- // ERST MAL DAS DOKUMENT ALS STRING AUFBAUEN
- Supplement supp = new Supplement();
- supp.addXMLContent("http://MyServer.com/resources/something.xsd",
- "<xsd:schema targetNamespace=\"http://uri2.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" elementFormDefault=\"qualified\" attributeFormDefault=\"unqualified\"><xsd:element name=\"Document\"><xsd:complexType mixed=\"true\"><xsd:sequence minOccurs=\"0\" maxOccurs=\"unbounded\"><xsd:any namespace=\"##any\" processContents=\"lax\"/></xsd:sequence><xsd:attribute name=\"Id\" type=\"xsd:ID\" use=\"required\"/></xsd:complexType></xsd:element></xsd:schema>");
- supp.closeSupplement();
-
- String requestEnd = createSignatureInfoEnd()+
- supp.getSupplement() + createRequestShortEnd(false);
-
- String requestStart = createRequestStart(testNumber,true,0);
-
-
- String reqDocString =
- "<daten:Document Id=\"myDocument\" " +
- "xmlns:daten=\"http://uri2.data.org\" "+
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "+
- "xsi:schemaLocation=\"http://uri2.data.org http://MyServer.com/resources/something.xsd http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd\" >"
- + "daten</daten:Document>" ;
-
- InputStream bis = new ByteArrayInputStream(reqDocString.getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setValidating(true);
- //factory.setValidating(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- Map m = new HashMap();
- m.put("http://MyServer.com/resources/something.xsd",new ByteArrayInputStream(("<xsd:schema targetNamespace=\"http://uri2.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" elementFormDefault=\"qualified\" attributeFormDefault=\"unqualified\"><xsd:element name=\"Document\"><xsd:complexType mixed=\"true\"><xsd:sequence minOccurs=\"0\" maxOccurs=\"unbounded\"><xsd:any namespace=\"##any\" processContents=\"lax\"/></xsd:sequence><xsd:attribute name=\"Id\" type=\"xsd:ID\" use=\"required\"/></xsd:complexType></xsd:element></xsd:schema>").getBytes()));
-
- EntityResolverChain chain = new EntityResolverChain();
- chain.addEntityResolver(new StreamEntityResolver(m));
- chain.addEntityResolver(new MOAEntityResolver());
- builder.setEntityResolver(chain);
-
-
- //Dokument Parsen
- System.out.println(reqDocString);
- //Document reqDoc = builder.parse(bis);
- Document reqDoc = DOMUtils.parseDocument(bis,true,Constants.ALL_SCHEMA_LOCATIONS, null,chain,new MOAErrorHandler());
- //Position für die Signatur angeben
- //String xPath_Pos = "/moa:VerifyXMLSignatureRequest/moa:VerifySignatureInfo/moa:VerifySignatureEnvironment/moa:XMLContent
- String xPath_Pos = "//daten:Document";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "daten http://uri2.data.org";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- System.out.println("REQDOC:"+DOMUtils.serializeNode(reqDoc));
- cpkcs.init(reqDoc,pos);
- cpkcs.setCanoncialization(canAlgCanXML);
-
- cpkcs.setKeyInformation();
- /*cpkcs.createEnvelopedDataObject("envelopedData",readFileCR(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"));
- cpkcs.createReferenceWithManifest(new URI("#xpointer(id('envelopedData')/node())"),"manifestObject");*/
-
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
- tr[0] = trans;
- //Enveloped Transformation
- cpkcs.createReferenceWithTransforms(new URI("#myDocument"),tr);
-//Signieren
-
- cpkcs.returnSig();
- //Serialisieren
- String request = requestStart + replaceString(Node2String(reqDoc.getDocumentElement()),"<?xml version=\"1.0\" encoding=\"utf-8\"?>","") + requestEnd;
-
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- vxBean.createSignatureCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
- public void create007() throws Exception {
-
- String testNumber = "007";
-
- String dtdLocation = configuration_.getProperty("webbaseDir") + "resources/VX.007DTD.dtd";
-
- // ERST MAL DAS DOKUMENT ALS STRING AUFBAUEN
- Supplement supp = new Supplement();
- supp.addBase64Content(dtdLocation,
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/VX.007DTD.dtd"));
- supp.closeSupplement();
-
- String requestEnd = createSignatureInfoEnd()+
- createRequestShortEnd(false);
-
- //String reqDocString = createRequestStart(testNumber,true,0,"","<!DOCTYPE data:Document SYSTEM \"http://MyServer.com/resources/VX.006DTD.dtd\">") +
- String reqDocString = /*createRequestStart(testNumber,true,0) +*/
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Document SYSTEM \"" + dtdLocation + "\"><Document Id=\"myDocument\" " +
-
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "+
- "xsi:schemaLocation=\"http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd\" >"
- + "\ndaten\n</Document>" /*+ requestEnd*/;
-
- InputStream bis = new ByteArrayInputStream(reqDocString.getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setValidating(false);
-
- System.out.println(reqDocString);
-
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
- Document reqDoc = builder.parse(bis);
- //Position für die Signatur angeben
- String xPath_Pos = "/Document";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "";//"data http://uri2.data.org";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos);
- cpkcs.setCanoncialization(canAlgCanXML);
-
- cpkcs.setKeyInformation();
- /*cpkcs.createEnvelopedDataObject("envelopedData",readFileCR(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"));
- cpkcs.createReferenceWithManifest(new URI("#xpointer(id('envelopedData')/node())"),"manifestObject");*/
-
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
- tr[0] = trans;
- //Enveloped Transformation
- cpkcs.createReferenceWithTransforms(new URI("#myDocument"),tr);
-//Signieren
- cpkcs.returnSig();
- //Serialisieren
- String request = Node2String(reqDoc.getDocumentElement());
-
- int i_pos = request.indexOf("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
- request = request.substring("<?xml version=\"1.0\" encoding=\"utf-8\"?>".length());
-
- request = "<!DOCTYPE Document SYSTEM \"" + dtdLocation + "\">"+request;
-
- System.out.println("DOC:"+request);
-
- request ="<?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><Base64Content>"+Base64Utils.encode(request.getBytes())+"</Base64Content></VerifySignatureEnvironment><VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation></VerifySignatureInfo>"+supp.getSupplement()+"<TrustProfileID>TrustProfile1</TrustProfileID></VerifyXMLSignatureRequest>";
-
-
-
-
- /*int i_pos = request.indexOf("<VerifyXMLSignatureRequest");
- request = request.substring(0,i_pos)+"<!DOCTYPE data:Document SYSTEM \"http://MyServer.com/resources/VX.006DTD.dtd\">\n" +request.substring(i_pos);*/
-
- /*i_pos = request.indexOf("<TrustProfile");
- request = request.substring(0,i_pos)+supp.getSupplement() +request.substring(i_pos);*/
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponseWithoutHashInputData(cpkcs.getX509CertString(), testNumber,"0",false));
- }
-
-
- public void create008() throws Exception {
-
- String testNumber = "008";
-
- String request =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+
- "<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 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>4lngV1x/OvR8iFWEBenH4fDihwA=</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>1j0DWguieuw2cGA06gFjoSNXr+w=</dsig:DigestValue>"+
- "</dsig:Reference>"+
- "</dsig:SignedInfo>"+
- "<dsig:SignatureValue>Yb6fsPNbKyYW+u7cU1EqF9n5QrwLXHqdGD4tJNT5+sA7kQR3Ztqz965vlBH+1pJE"+
- "nGxehxXsesZboVvkJa/jhuI0goCTW9KkdGOP71B7o7/vlyBbxaYKpnVNtBU4/qtT"+
- "xba7M0E32X+tm/x9O6foXIM0AoP3oQBZmjo9rEJ9kfk=</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:X509Certificate>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/IAIKRootMusterbehoerde.cer")+
- "</dsig:X509Certificate>"+*/
- "</dsig:X509Data>"+
- "</dsig:KeyInfo>"+
- "<dsig:Object Id=\"signed-data\">"+
- "<sl10:InfoboxReadRequest xmlns:sl10=\"http://www.buergerkarte.at/namespaces/securitylayer/20020225#\">"+
- "<sl10:InfoboxIdentifier>IdentityLink</sl10:InfoboxIdentifier>"+
- "<sl10:BinaryFileParameters ContentIsXMLEntity=\"true\"/>"+
- "</sl10:InfoboxReadRequest>"+
- "</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-03-04T12:32:54Z</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/xml</etsi:MimeType>"+
- "</etsi:DataObjectFormat>"+
- "</etsi:SignedDataObjectProperties>"+
- "</etsi:SignedProperties>"+
- "</etsi:QualifyingProperties>"+
- "</dsig:Object>"+
- "</dsig:Signature>"+
- "</XMLContent>"+
- "</VerifySignatureEnvironment>"+
- "<VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>"+
- "</VerifySignatureInfo>"+
- "<TrustProfileID>TrustProfile1</TrustProfileID>"+
- "</VerifyXMLSignatureRequest>";
-
- String response =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+
- "<VerifyXMLSignatureResponse xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\" >"+
- " <SignerInfo>"+
- " <dsig:X509Data xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">"+
- " <dsig:X509SubjectName>serialNumber=790187461633,givenName=Testperson MOA4,SN=BRZ,CN=Testperson MOA4 BRZ,C=AT</dsig:X509SubjectName>"+
- " <dsig:X509IssuerSerial>"+
- " <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>"+
- " </dsig:X509IssuerSerial>"+
- "<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>"+
- " <sl11:QualifiedCertificate xmlns:sl11=\"http://www.buergerkarte.at/namespaces/securitylayer/20020831#\"/>"+
- " </dsig:X509Data>"+
- " </SignerInfo>"+
- " <SignatureCheck>"+
- " <Code>0</Code>"+
- " </SignatureCheck>"+
- " <CertificateCheck>"+
- " <Code>0</Code>"+
- " </CertificateCheck>"+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber),response);
- }
-
- public void create009() throws Exception {
-
- String testNumber = "009";
- // ERST MAL DAS DOKUMENT ALS STRING AUFBAUEN
- Supplement supp = new Supplement();
- supp.addXMLContent("http://MyServer.com/resources/something.xsd",
- "<xsd:schema targetNamespace=\"http://uri2.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" elementFormDefault=\"qualified\" attributeFormDefault=\"unqualified\"><xsd:element name=\"Document\"><xsd:complexType mixed=\"true\"><xsd:sequence minOccurs=\"0\" maxOccurs=\"unbounded\"><xsd:any namespace=\"##any\" processContents=\"lax\"/></xsd:sequence><xsd:attribute name=\"Id\" type=\"xsd:ID\" use=\"required\"/></xsd:complexType></xsd:element></xsd:schema>");
- supp.closeSupplement();
-
- String requestEnd = createSignatureInfoEnd()+
- supp.getSupplement() + createRequestShortEnd(false);
-
- String requestStart = createRequestStart(testNumber,true,0);
-
-
- String reqDocString =
- "<daten:Document Id=\"myDocument\" " +
- "xmlns:daten=\"http://uri2.data.org\" "+
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "+
- "xsi:schemaLocation=\"http://uri2.data.org http://MyServer.com/resources/something.xsd http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd\" >"
- + "daten</daten:Document>" ;
-
- InputStream bis = new ByteArrayInputStream(reqDocString.getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setValidating(true);
- //factory.setValidating(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- Map m = new HashMap();
- m.put("http://MyServer.com/resources/something.xsd",new ByteArrayInputStream(("<xsd:schema targetNamespace=\"http://uri2.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" elementFormDefault=\"qualified\" attributeFormDefault=\"unqualified\"><xsd:element name=\"Document\"><xsd:complexType mixed=\"true\"><xsd:sequence minOccurs=\"0\" maxOccurs=\"unbounded\"><xsd:any namespace=\"##any\" processContents=\"lax\"/></xsd:sequence><xsd:attribute name=\"Id\" type=\"xsd:ID\" use=\"required\"/></xsd:complexType></xsd:element></xsd:schema>").getBytes()));
-
- EntityResolverChain chain = new EntityResolverChain();
- chain.addEntityResolver(new StreamEntityResolver(m));
- chain.addEntityResolver(new MOAEntityResolver());
- builder.setEntityResolver(chain);
-
-
- //Dokument Parsen
- System.out.println(reqDocString);
- //Document reqDoc = builder.parse(bis);
- Document reqDoc = DOMUtils.parseDocument(bis,true,Constants.ALL_SCHEMA_LOCATIONS, null,chain,new MOAErrorHandler());
- //Position für die Signatur angeben
- //String xPath_Pos = "/moa:VerifyXMLSignatureRequest/moa:VerifySignatureInfo/moa:VerifySignatureEnvironment/moa:XMLContent
- String xPath_Pos = "//daten:Document";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "daten http://uri2.data.org";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- System.out.println("REQDOC:"+DOMUtils.serializeNode(reqDoc));
- cpkcs.init(reqDoc,pos);
- cpkcs.setCanoncialization(canAlgCanXML);
-
- cpkcs.setKeyInformation();
- /*cpkcs.createEnvelopedDataObject("envelopedData",readFileCR(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"));
- cpkcs.createReferenceWithManifest(new URI("#xpointer(id('envelopedData')/node())"),"manifestObject");*/
-
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
- tr[0] = trans;
- //Enveloped Transformation
- cpkcs.createReferenceWithTransforms(new URI("#xpointer(id(myDocument))"),tr);
-//Signieren
-
- cpkcs.returnSig();
- //Serialisieren
- String request = requestStart + replaceString(Node2String(reqDoc.getDocumentElement()),"<?xml version=\"1.0\" encoding=\"utf-8\"?>","") + requestEnd;
-
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- vxBean.createSignatureCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
- public void create101() throws Exception {
-
- String testNumber = "101";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- supp.addMetaInfo("text/plain","http://www.buergerkarte.at");
- supp.addBase64Content(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt",
- readBinaryFileAsBase64(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
- supp.closeSupplement();
- //supp.addProfileID("Some ID");
-
- String requestEnd = createSignatureInfoEnd()+
- supp.getSupplement() + createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- vxBean.createSignatureCheck("0")+
- /*vxBean.createXMLDSIGManifestCheck("0","","1")+ */
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
- public void create102() throws Exception {
-
- String testNumber = "102";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- supp.addMetaInfo("text/plain",null);
- supp.addBase64Content(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt",
- readBinaryFileAsBase64(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
- supp.closeSupplement();
- //supp.addProfileID("Some ID");
-
- String requestEnd = createSignatureInfoEnd()+
- supp.getSupplement() + "<ReturnHashInputData/>"+createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- writeFile(vxReqFile(testNumber),request);
-
-
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
- public void create103() throws Exception {
-
- String testNumber = "103";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- //supp.addMetaInfo("text/plain",null);
- supp.addXMLContent(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
- //supp.addBase64Content(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt",
- // readBinaryFileAsBase64(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"));
- supp.closeSupplement();
- //supp.addProfileID("Some ID");
-
- String requestEnd = createSignatureInfoEnd()+
- supp.getSupplement() + "<ReturnHashInputData/>"+createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- writeFile(vxReqFile(testNumber),request);
-
-
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-public void create104() throws Exception {
-
- String testNumber = "104";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- supp.addXMLContent(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt", readFileCR(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
- supp.closeSupplement();
-
- String requestEnd =
- createSignatureInfoEnd()+
- supp.getSupplement()+"<ReturnHashInputData/>"+
- createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber+" - Supplement/Content/XMLContent instead of Supplement/Content/Base64Content",true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
- public void create105() throws Exception {
-
- String testNumber = "105";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testXML.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- supp.addXMLContent(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt", readFileCR(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
- supp.closeSupplement();
-
- Supplement supp2 = new Supplement();
- supp2.addBase64Content(configuration_.getProperty("webbaseDir")+"resources/testXML.txt", readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/testXML.txt"));
- supp2.closeSupplement();
-
- String requestEnd =
- createSignatureInfoEnd()+
- supp.getSupplement()+
- supp2.getSupplement() +
- createRequestShortEnd(true);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber + " - 2 Supplement elements",true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<HashInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/testSimple.txt") +
- "</Base64Content></HashInputData>"+
- "<HashInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/testXML.txt") +
- "</Base64Content></HashInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), response);
- }
-
-public void create106() throws Exception {
-
- String testNumber = "106";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- String requestEnd =
- createSignatureInfoEnd()+
- "<SupplementProfileID>SupplementProfile2</SupplementProfileID>" +
- "<!-- Supplement Profile 2 enthaelt nicht die referenzierte URI -->" +
- "<SupplementProfileID>SupplementProfile1</SupplementProfileID><ReturnHashInputData/>" +
- createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber +" - 2 SupplementProfileID elements" ,true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
-
- public void create301() throws Exception {
-
- String testNumber = "301";
-
- //Testcast with another canoicalization algorithm
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXMLwithCom);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
- /**
- * Method create302.
- * @throws Exception
- */
- public void create302() throws Exception {
-
- String testNumber = "302";
-
- //Testcast with another canoicalization algorithm
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
-
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgExcXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0"));
- }
- /**
- * Method create303.
- * @throws Exception
- */
- public void create303() throws Exception {
-
- String testNumber = "303";
-
- //Testcast with another canoicalization algorithm
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
-
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgExcXMLwithCom);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0"));
- }
-
- public void create304() throws Exception {
-
- String testNumber = "304";
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.initECDSA();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- //cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- //cpkcs.createEnvelopedDataObject("envelopedData",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
-
- cpkcs.createReference(true,readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt"),"envelopedData");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0","<dsig:X509IssuerName>CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509IssuerName>","<dsig:X509SubjectName>CN=IAIK ECDSA Test,OU=JavaSecurity,O=IAIK,C=AT</dsig:X509SubjectName>","<dsig:X509SerialNumber>68172</dsig:X509SerialNumber>"));
- }
- /**
- * Method create305.
- * @throws Exception
- */
- public void create305() throws Exception {
-
- String testNumber = "305";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
-
- String refData = "Dies sind Testdaten";
-
- cpkcs.createReference(true,refData);
-
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0",refData));
- }
-
- /**
- * Method create307.
- * @throws Exception
- */
- public void create307() throws Exception {
-
- String testNumber = "307";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- supp.addXMLContent(configuration_.getProperty("baseDir")+"resources/testSimple.txt", readFileCR(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
- supp.closeSupplement();
-
- String requestEnd = createSignatureInfoEnd()+
- supp.getSupplement() +
- createRequestShortEnd(true);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0"));
- }
-
- /**
- * Method create308.
- * @throws Exception
- */
- public void create308() throws Exception {
-
- String testNumber = "308";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- supp.addXMLContent(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt", readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
- supp.closeSupplement();
-
-
- String requestEnd = createSignatureInfoEnd()+ supp.getSupplement() +
- createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- //request = replaceString(request,"<XMLContent xml:space=\"preserve\">","<XMLContent xml:space=\"preserve\">VERAENDERTE DATEN und die Ursprungsdaten: ");
- request = replaceString(request,"Dies sind Testdaten","VERAENDERTE DATEN und die Ursprungsdaten: Dies sind Testdaten");
- //request = replaceString(request,Base64Utils.encode("Dies sind Testdaten".getBytes()),Base64Utils.encode("VERAENDERTE DATEN und die Ursprungsdaten: Dies sind Testdaten".getBytes()));
- //request = replaceString(request,"<ReturnHashInputData/>","");
- /*request = replaceString(request,"Reference=\""+configuration_.getProperty("baseDir")+"resources/testSimple.txt\"","Reference=\"\"");
- request = replaceString(request,"URI=\""+configuration_.getProperty("webbaseDir")+"resources/testSimple.txt\"","URI=\"\"");*/
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponse(cpkcs.getX509CertString(),testNumber,"1",1);
-
- writeFile(vxResFile(testNumber), response);
- }
- public void create310() throws Exception {
-
- String testNumber = "310";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- //Erzeugen der Base64-Daten
- //String tmp = readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/testSimple.txt");
-
- URI target = new URI(configuration_.getProperty("webbaseDir") + "resources/testSimple.txtbase64.enc");
-
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplBase64Decode();
- InputStream s = getHttpInputStream(target.toString());
- tr[0].setInput(s,null);
-
- cpkcs.createReferenceWithTransforms(target,tr);
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
-
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0"));
- }
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------311 scheint die XPAth - Transformation nicht richtig auszuführen-
-// (Siehe Output in der Konsole.....)
-
- public void create311() throws Exception {
-
- String testNumber = "311";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- Transform[] tr = new Transform[1];
- TransformImplXPath trans = new TransformImplXPath();
-// TransformImplXSLT trans = new TransformImplXSLT();
-
-
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/BookData.xml");
-// InputStream s2 = new FileInputStream(configuration_.getProperty("baseDir")+"resources/transform.xsl");
- trans.setInput(s,null);
-// trans.setStyleSheet(s2,null);
-
- trans.addNSDeclaration("data",new URI("http://uri.data.org")); //new URI("file:/"+configuration_.getProperty("baseDir")+"resources/BookData.xml"));
- // trans.setXPath("ancestor-or-self::data:first-name");
- trans.setXPath("ancestor-or-self::text()/ancestor-or-self::data:first-name");
-
- tr[0] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir") + "resources/BookData.xml"),tr);
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0",1,"text:Ellipse"));
- }
-
-public void create312() throws Exception
- { String testNumber = "312";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXPath2 trans = new TransformImplXPath2();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_book.xsl");
- trans.setInput(s,null);
-
- HashMap temp = new HashMap();
- temp.put("data",new URI("http://uri.data.org"));
- trans.addXPathFilter("/data:book/data:first-name",TransformImplXPath2.FILTER_MODE_SUBTRACT_,temp);
- tr[0] = trans;
- //System.out.println(getTransformsResult(tr));
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir") + "resources/BookData.xml"),tr,"reference-1");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart("312",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- vxBean.createSignatureCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
-public void create313() throws Exception
- { String testNumber = "313";
-
- // ERST MAL DAS DOKUMENT ALS STRING AUFBAUEN
-
- String requestEnd = createRequestEnd(true,false,null);
-
- String reqDocString = createRequestStart(testNumber,true,0) +
- "<data:Document " +
- "xmlns:data=\"http://uri.data.org\" "+
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" Id=\"myDocument\" "+
- "xsi:schemaLocation=\"http://uri.data.org http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX.006Schema.xsd http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd\" >"
- + "</data:Document>" + requestEnd;
-
-
- InputStream bis = new ByteArrayInputStream(("<data:Document " +
- "xmlns:data=\"http://uri.data.org\" "+
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" Id=\"myDocument\" "+
- "xsi:schemaLocation=\"http://uri.data.org http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX.006Schema.xsd http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd\" >"
- + "</data:Document>").getBytes());
- //Document-Builder holen
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
- //Dokument Parsen
- Document reqDoc = builder.parse(bis);
-
- System.out.println(DOMUtils.serializeNode(reqDoc.getDocumentElement()));
- //Position für die Signatur angeben
- //String xPath_Pos = "/moa:VerifyXMLSignatureRequest/moa:VerifySignatureInfo/moa:VerifySignatureEnvironment/moa:XMLContent/data:Document";
- String xPath_Pos = "/node()";
- //XPAth-Prefixe deklarieren
- String xPath_Prefix = "data xmlns:data=\"http://uri.data.org\"";
- Position pos = new Position(xPath_Pos, xPath_Prefix,0);
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- //Signer erzeugen, der das obige Doc als Basis nimmt, und die Signatur an der besagten stelle einfügt
- cpkcs.init(reqDoc,pos);
- cpkcs.setCanoncialization(canAlgCanXML);
-
- cpkcs.setKeyInformation(1);
- //cpkcs.createEnvelopedDataObject("envelopedData",readFileCR(configuration_.getProperty("webbaseDir")+"resources/testSimple.txt"));
- //cpkcs.createReferenceWithManifest(new URI("#xpointer(id('envelopedData')/node())"),"manifestObject");
-
- Transform[] tr = new Transform[1];
- TransformImplEnvelopedSignature trans = new TransformImplEnvelopedSignature();
- tr[0] = trans;
- //Enveloped Transformation
- cpkcs.createReferenceWithTransforms(new URI(""),tr);
-//Signieren
- cpkcs.returnSig();
- //Serialisieren
- String request = Node2String(reqDoc.getDocumentElement());
-
- writeFile(vxReqFile(testNumber),createRequestStart(testNumber,true,0).trim() +cutXML(request).trim()+requestEnd.trim());
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0",1,"text:"+"<data:Document xmlns:data=\"http://uri.data.org\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" Id=\"myDocument\" xsi:schemaLocation=\"http://uri.data.org http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX.006Schema.xsd http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd\"></data:Document>"));
-
- }
-
-
- public void create314() throws Exception
- { String testNumber = "314";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir") + "resources/BookData.xml"),tr,"reference-1");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart("314",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- vxBean.createSignatureCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
-public void create314_2() throws Exception
- { String testNumber = "314_2";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir") + "resources/BookData.xml"),tr,"reference-1");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- String suppContent = readFileCR(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl");
- suppContent = replaceString(suppContent, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>","");
- supp.addXMLContent("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl", suppContent );
- supp.closeSupplement();
-
- String request =
- makeOutputFile(
- createRequestStart("314_2",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() +
- supp.getSupplement()
- + createRequestShortEnd(false));
-
-/* request = replaceString(request, "http://moa-test.brz.intra.gv.at", "http://MyServer.com");
- request = replaceString(request, "http://moa-test.brz.intra.gv.at", "http://MyServer.com");
- request = replaceString(request, "http://moa-test.brz.intra.gv.at", "http://MyServer.com");
- //Hinweis: ich nehmen an, die URI in DSIG:REFERENCE sollte schon stimmen....
- request = replaceString(request, "http://MyServer.com", "http://moa-test.brz.intra.gv.at"); */
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- vxBean.createSignatureCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
- writeFile(vxResFile(testNumber), response);
- }
-
-
- public void create315() throws Exception {
-
- String testNumber = "315";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- URI target = new URI(configuration_.getProperty("webbaseDir") + "resources/test_wo_canonicalisation.XML");
-
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplCanonicalXML();
- InputStream s = getHttpInputStream(target.toString());
- tr[0].setInput(s,null);
-
- String erg = getTransformsResult(tr);
-
- cpkcs.createReferenceWithTransforms(target,tr);
- //cpkcs.createReference(false, "file:/"+ configuration_.getProperty("baseDir")+"resources/test_wo_canonicalisation.XML");
- //cpkcs.createReference(false, "file:/"+ configuration_.getProperty("baseDir")+"resources/test_w_canonicalisation.XML");
-// cpkcs.createReferenceWithManifest(new URI("file:/"+ configuration_.getProperty("baseDir")+"resources/test_w_canonicalisation.XML"),"canonicalizedData");
-
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
-
-
- writeFile(vxReqFile(testNumber),request);
-
-
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0",erg));
- }
-
- public void create316() throws Exception {
-
- String testNumber = "316";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
-
- URI target = new URI(configuration_.getProperty("webbaseDir") + "resources/test_wo_canonicalisation.XML");
-
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplCanonicalXMLWithComments();
- InputStream s = getHttpInputStream(target.toString());
- tr[0].setInput(s,null);
-
- String erg = getTransformsResult(tr);
-
- cpkcs.createReferenceWithTransforms(target,tr);
-
- cpkcs.setKeyInformation();
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0",erg));
- }
- public void create317() throws Exception {
-
- String testNumber = "317";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
-
- URI target = new URI(configuration_.getProperty("webbaseDir") + "resources/test_wo_canonicalisation.XML");
-
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplExclusiveCanonicalXML();
- InputStream s = getHttpInputStream(target.toString());
- tr[0].setInput(s,null);
- String erg = getTransformsResult(tr);
- cpkcs.createReferenceWithTransforms(target,tr);
-
- cpkcs.setKeyInformation();
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0",erg));
- }
- public void create318() throws Exception {
-
- String testNumber = "318";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI target = new URI(configuration_.getProperty("webbaseDir") + "resources/test_wo_canonicalisation.XML");
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplExclusiveCanonicalXMLWithComments();
- InputStream s = getHttpInputStream(target.toString());
- tr[0].setInput(s,null);
-
- String erg = getTransformsResult(tr);
- cpkcs.createReferenceWithTransforms(target,tr);
-
- cpkcs.setKeyInformation();
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0",erg));
- }
-
- public void create318_2() throws Exception {
-
- String testNumber = "318_2";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
-
- //Create a base64-encoded version of the xml file
-
- //String tmp = readBinaryFileAsBase64(configuration_.getProperty("baseDir")+"resources/test_wo_canonicalisation.XML");
-
- URI target = new URI(configuration_.getProperty("webbaseDir") + "resources/test_wo_canonicalisation.XMLbase64.enc");
-
- Transform[] tr = new Transform[3];
- tr[0] = new TransformImplBase64Decode();
- InputStream s = getHttpInputStream(target.toString());
- tr[0].setInput(s,null);
- tr[1] = new TransformImplCanonicalXMLWithComments();
- tr[1].setInput(s,null);
-
- tr[2] = new TransformImplExclusiveCanonicalXML();
- tr[2].setInput(s,null);
- String erg = getTransformsResult(tr);
- cpkcs.createReferenceWithTransforms(target,tr);
-
- cpkcs.setKeyInformation();
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0",erg));
- }
-
- /**
- * Method create319:
- * SignedInfo/Reference appears two times:
- * the first reference points to an enveloped dsig:Object,
- * the seconde reference points to an external File
- * @throws Exception
- */
- public void create319() throws Exception {
- String testNumber = "319";
-
-
- // Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); // Create from whole cloth
-
-// Element root = (Element) document.createElement("Data");
- // root.appendChild(document.createTextNode(readFileCR(configuration_.getProperty("baseDir")+"resources/test-ee2003_normal.derbase64.enc.bak")) );
- //root.appendChild(document.createTextNode("Hallo\nHallo\nHallo"));
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
-
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,"Dies sind Testdaten");
- //cpkcs.createReferenceEnvElement(root);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation();
-
- Document sign = cpkcs.returnSig();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- /*String erg = "Dies sind Testdaten" +
- "</XMLContent>\n" +
- " </HashInputData>\n" +
- " <HashInputData>\n" +
- "<XMLContent xml:space=\"preserve\">" +
- readFileCR(configuration_.getProperty("baseDir")+"resources/testSimple.txt"); */
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(),testNumber,"0","Dies sind Testdaten",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt")));
- }
-
- /**
- * Method create320:
- * The element KeyInfo does NOT contain the X509-certificate but
- * an URI pointing to an external xml-encoded X509-file
- * @throws Exception
- */
- public void create320() throws Exception {
- String testNumber = "320";
-
- //RetrievalMethdos instead of the integratede Keys
-
- //URI fileURI = new URI(configuration_.getProperty("baseDir") + "resources/test-ee2003_normal.der");
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
- //URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#rawX509Certificate");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- Document sign = cpkcs.returnSig();
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), createResponse(readFileCR(configuration_.getProperty("webbaseDir") + "resources/SignatureVX005Cert.xml"),testNumber,"0"));
- }
-
-public void create320_2() throws Exception {
- String testNumber = "320_2";
-
- //RetrievalMethdos instead of the integratede Keys
-
- //URI fileURI = new URI(configuration_.getProperty("baseDir") + "resources/test-ee2003_normal.der");
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/TEMPX509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
- //URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#rawX509Certificate");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
-// Supplement supp = new Supplement();
-
-// supp.addXMLContent(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml",readFileCR(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml"));
-// supp.closeSupplement();
- Document sign = cpkcs.returnSig();
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,true,configuration_.getProperty("webbaseDir") + "resources/TEMPX509Data.xml"));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), createResponse(readFileCR(configuration_.getProperty("webbaseDir") + "resources/SignatureVX005Cert.xml"),testNumber,"0"));
- }
-
-
- /**
- * Method create321.
- * The element KeyInfo does NOT contain the X509-certificate but
- * an URI pointing to an external raw X509-file
- * @throws Exception
- */
- public void create321() throws Exception {
- String testNumber = "321";
-
- //RetrievalMethdos instead of the integratede Keys
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/test-ee2003_normal.der");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#rawX509Certificate");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
- Document sign = cpkcs.returnSig(); String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResFile(testNumber), createResponse(readFileCR(configuration_.getProperty("webbaseDir") + "resources/SignatureVX005Cert.xml"),testNumber,"0"));
- }
-
-
- /**
- * Method create322.
- * The reference in the signature points with an xpointer
- * to the ID of an embedded valid manifest dsig:object
- * @throws Exception
- */
-public void create322() throws Exception {
- String testNumber = "322";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI fileURI1 = new URI(configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- Element elem = cpkcs.createReferenceWithManifest(fileURI1,"manifestObject");
-
- cpkcs.setKeyInformation();
- Document sign = cpkcs.returnSig(); String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<HashInputData><Base64Content>"+
- Base64Utils.encode(stripNLCR(convertManifestToString(elem)).getBytes()) +
- "</Base64Content></HashInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createXMLDSIGManifestCheck("0","","1")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
- /**
- * Method create323:
- * There are two references in the signature pointing
- * with xpointer to two embedded valid manifest dsig:objects
- * @throws Exception
- */
- public void create323() throws Exception {
- String testNumber = "323";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI fileURI1 = new URI(configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- URI fileURI2 = new URI(configuration_.getProperty("webbaseDir") + "resources/testXML.txt");
- Element man1 = cpkcs.createReferenceWithManifest(fileURI1,"manifestObject");
-
- //HINWEIS: Durch das 2malige Aufrufen wird ein WEITERES dsig:Object ELEMENT erzeugt... darf das so sein...???
-
- Element man2 = cpkcs.createReferenceWithManifest(fileURI2,"manifestObject2");
- cpkcs.setKeyInformation();
- Document sign = cpkcs.returnSig();
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<HashInputData><Base64Content>"+
- Base64Utils.encode(stripNLCR(convertManifestToString(man1)).getBytes()) +
- "</Base64Content></HashInputData>"+
- "<HashInputData><Base64Content>"+
- Base64Utils.encode(stripNLCR(convertManifestToString(man2)).getBytes()) +
- "</Base64Content></HashInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createXMLDSIGManifestCheck("0","","1")+
- vxBean.createXMLDSIGManifestCheck("0","","2")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
-
- }
- public void create324() throws Exception {
- String testNumber = "324";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI fileURI1 = new URI(configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
- URI fileURI2 = new URI(configuration_.getProperty("webbaseDir") + "resources/testXML.txt");
- Element man = cpkcs.createReferencesWithManifest(fileURI1,"manifestObject",fileURI2);
-
- //HINWEIS: Durch das 2malige Aufrufen wird ein WEITERES dsig:Object ELEMENT erzeugt... darf das so sein...???
- cpkcs.setKeyInformation();
- Document sign = cpkcs.returnSig();
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- sign,
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<HashInputData><Base64Content>"+
- Base64Utils.encode(stripNLCR(convertManifestToString(man)).getBytes()) +
- "</Base64Content></HashInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createXMLDSIGManifestCheck("0","","1")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
-
- }
-
- /**
- * Method create325.
- * @throws Exception
- */
- public void create325() throws Exception {
- String testNumber = "325";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Element mani = cpkcs.createReferenceWithManifest(new URI("#xpointer(id('envelopedData')/node())"),"manifestObject");
- cpkcs.createEnvelopedDataObject("envelopedData",readFile(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
-
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<HashInputData><Base64Content>"+
- Base64Utils.encode(stripNLCR(convertManifestToString(mani)).getBytes()) +
- "</Base64Content></HashInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createXMLDSIGManifestCheck("1","1","1")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
- public void create326() throws Exception {
- String testNumber = "326";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Element mani = cpkcs.createReferenceWithManifest(new URI("#xpointer(id('envelopedData')/node())"),"manifestObject");
- cpkcs.createEnvelopedDataObject("envelopedData",readFileCR(configuration_.getProperty("baseDir")+"resources/testSimple.txt"));
-
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(false,false,null));
-
- request = replaceString(request,"<dsig:Object Id=\"envelopedData\">","<dsig:Object Id=\"envelopedData\">Dies sind veraenderte Daten und die Ursprungsdaten: \n");
-
- writeFile(vxReqFile(testNumber),request);
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- vxBean.createSignatureCheck("0")+
- vxBean.createXMLDSIGManifestCheck("1","1","1")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
-
- writeFile(vxResFile(testNumber), response);
- }
-
- /**
- * Method create327: The certificate comes as raw data and is converted to a dsig:object with
- * base64-data, the KeyInfo has a retrievalMethod pointing to that object and transforming the
- * data back to raw-data for using that to create the signature
- * @throws Exception
- */
- public void create327() throws Exception {
-
- String testNumber = "327";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/test-ee2003_normal.der");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#rawX509Certificate");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testSimple.txt");
-
- //DER-encoded RAW-Zertifikat zu Binary64 konvertieren
-
- //String tmp = readBinaryFileAsBase64(fileURI.getPath()); : Funktioniert nicht mehr wegen http-addi
-
- //dsig:Object mit den Binary64-Daten erzeugen (==> CRs weglassen!!!!!)
- cpkcs.createEnvelopedDataObject("rawCertAsBase64",readFileCR(fileURI.toString()+"base64.enc"));
-
- //Neue Transformation erzeugen, um die Base64-Daten zurückzuwandeln
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplBase64Decode();
- InputStream s = getHttpInputStream(fileURI.toString() + "base64.enc");
- tr[0].setInput(s,null);
-
- //Neues KeyInfo-Objekt erzeugen, wobei nicht die Zertifikate sondern
- //nur eine RetrievalMethod angegeben wird, die auf das oben erzeugte Base64-dsig:Object verweist
- cpkcs.setKeyInformation(true, new URI("#xpointer(id('rawCertAsBase64')/node())") , typeURI, tr);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
-
- cpkcs.setKeyInformation(1);
-
- writeFile(vxResFile(testNumber), createResponse(cpkcs.getX509CertString(), testNumber,"0"));
- }
-
- /**
- * Method makeOutputFile.
- * @param start
- * @param signatureDoc
- * @param end
- * @return String
- * @throws Exception
- */
- public String makeOutputFile(
- String start,
- Document signatureDoc,
- String end)
- throws Exception {
- ArrayList foundNodes = new ArrayList();
- findNode(
- signatureDoc.getDocumentElement(),
- "dsig:Signature",
- foundNodes);
-
- Node outputNode = null;
-
- if (foundNodes.size() > 0) {
- outputNode = (Node) foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg = start + erg + end;
-
- return erg;
- }
-
- /**
- * Method createRequestStart.
- * @param testNumber
- * @param useDate
- * @param changeHours
- * @return String
- */
- private String createRequestStart(String testNumber, boolean useDate, int changeHours)
-{
- return createRequestStart(testNumber, useDate,changeHours,"");
-
-}
-
- private String createRequestStart(String testNumber, boolean useDate, int changeHours, String attribut)
- {
- return createRequestStart(testNumber, useDate,changeHours,attribut,"");
- }
- private String createRequestStart(String testNumber, boolean useDate, int changeHours, String attribut,String dtd)
- {String reqStart = null;
- System.out.println("======================================================");
- System.out.println("================== TEST-NUMBER "+ testNumber + " ===================");
- System.out.println("======================================================");
-
- reqStart =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + "<!-- Testnumber: "
- + testNumber
- + "-->\n";
-
- if(dtd!=null && !dtd.trim().equals(""))
- reqStart += dtd;
-
- reqStart+= "<VerifyXMLSignatureRequest\n"
- + " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"
- + " xmlns:xml=\"http://www.w3.org/XML/1998/namespace\""
- + " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">\n";
-
- if (useDate) {
- reqStart += " <DateTime>"
- + getDate(changeHours)
- + "</DateTime>\n";
- }
-
- reqStart += " <VerifySignatureInfo>\n"
- + " <VerifySignatureEnvironment "+attribut+">\n"
- + " <XMLContent xml:space=\"preserve\">" ;
- return reqStart;
- }
-
- /**
- * Method getTransformsResult:the input transforms array will
- * be calculated to return a string-representation of the result
- * @param tr
- * @return String
- * @throws Exception
- */
- private String getTransformsResult(Transform[] tr) throws Exception
- {
- Transform[] myTransforms = tr;
- String result = "";
- for (int t=0; t<tr.length-1; t++)
- {
- myTransforms[t+1].setInput((InputStream)myTransforms[t].transform(),null);
- }
- ByteArrayInputStream is = (ByteArrayInputStream)myTransforms[tr.length-1].transform();
- byte[] b = new byte[1];
- is.read(b);
- while (is.available() > 0)
- {
- result += new String(b);
- is.read(b);
- }
- result += new String(b);
-
- return result;
- }
-
-
- /**
- * Method createRequestEnd.
- * @param useReturnHashInputData
- * @param useSupplement
- * @param supplementReference
- * @return String
- * @throws Exception
- */
- private String createRequestEnd(
- boolean useReturnHashInputData,
- boolean useSupplement,
- String supplementReference)
- throws Exception {
-
- String reqEnd = null;
-
-/* reqEnd =
- "</VerifySignatureEnvironment>\n"
- + " <VerifySignatureLocation>#xpointer(/VerifyXMLSignatureRequest/VerifySignatureInfo/VerifySignatureEnvironment/dsig:Signature)</VerifySignatureLocation>\n"
- + " </VerifySignatureInfo>\n";
-*/
- reqEnd ="</XMLContent>"+
- "</VerifySignatureEnvironment>\n"
- + " <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>\n"
- + " </VerifySignatureInfo>\n";
-
-
-
- if (useSupplement)
- {
- reqEnd += " <SupplementProfile>\n" +
- " <Content Reference=\"" + supplementReference.toString() + "\">\n" +
- " <XMLContent xml:space=\"preserve\">"+readFileCR(supplementReference.toString())+"</XMLContent>\n" +
- " </Content>\n" +
- " </SupplementProfile>\n";
- }
-
- if (useReturnHashInputData) {
- reqEnd += " <ReturnHashInputData/>\n";
- }
- reqEnd += " <TrustProfileID>TrustProfile1</TrustProfileID>\n"
- + "</VerifyXMLSignatureRequest>\n";
- return reqEnd;
-
- }
-
- private String createSignatureInfoEnd()
- throws Exception {
-
- return "</XMLContent>"+"</VerifySignatureEnvironment>\n"
- + " <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>\n"
- + " </VerifySignatureInfo>\n";
-
- }
-
- private String createRequestShortEnd(boolean useReturnHashInputData)
- throws Exception {
-
- String reqEnd = "";
-
- if (useReturnHashInputData)
- reqEnd = " <ReturnHashInputData/>\n";
-
- reqEnd += " <TrustProfileID>TrustProfile1</TrustProfileID>\n"
- + "</VerifyXMLSignatureRequest>\n";
- return reqEnd;
-
- }
- /**
- * Method createResponse.
- * @param testNumber
- * @param signatureCheckCode
- * @return String
- * @throws Exception
- */
- private String createResponse(String x509cert, String testNumber, String signatureCheckCode) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal_extract.cer");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n" + " ";
- /*res += "<XMLContent xml:space=\"preserve\">"+readFileCR(
- configuration_.getProperty("baseDir")
- + "resources/testSimple.txt")+
- "</XMLContent>";*/
- res += "<Base64Content>"+readBinaryFileAsBase64_new((configuration_.getProperty("baseDir")+ "resources/testSimple.txt"))+"</Base64Content>";
-
- res += vxBean.getFooterSignatureCheck(signatureCheckCode, "0");
-
- return res;
- }
-
- private String createResponseL(String x509cert, String testNumber, String signatureCheckCode,String filename) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal_extract.cer");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
-
- res += replaceString(vxBean.getFooterSignatureCheck(signatureCheckCode, "0"),"</HashInputData>","");
-
- return res;
- }
-
- private String createResponse(String x509cert, String testNumber, String signatureCheckCode,int code) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal_extract.cer");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <SignatureCheck>\n" +
- " <Code>1</Code><Info><FailedReference>1</FailedReference></Info>\n" +
- " </SignatureCheck>\n" +
- " <CertificateCheck>\n" +
- " <Code>0</Code>\n" +
- " </CertificateCheck>\n" +
- "</VerifyXMLSignatureResponse>";;
-
- return res;
- }
-
-
- /**
- * Method createResponse.
- * @param testNumber
- * @param signatureCheckCode
- * @return String
- * @throws Exception
- */
- private String createResponse(String x509cert, String testNumber, String signatureCheckCode,int code,String filename) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal_extract.cer");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n" + " ";
- /*res += "<XMLContent xml:space=\"preserve\">"+readFileCR(
- configuration_.getProperty("baseDir")
- + "resources/testSimple.txt")+
- "</XMLContent>";*/
- if(filename.startsWith("text:"))
- res += "<Base64Content>"+Base64Utils.encode(filename.substring(5).getBytes())+"</Base64Content>";
- else
- res += "<Base64Content>"+readBinaryFileAsBase64_new((configuration_.getProperty("baseDir")+ filename))+"</Base64Content>";
-
- res += vxBean.getFooterSignatureCheck(signatureCheckCode, "0");
-
- return res;
- }
-
-/**
- * Method createResponse.
- * @param testNumber
- * @param signatureCheckCode
- * @return String
- * @throws Exception
- */
- private String createResponse(String x509cert, String testNumber, String signatureCheckCode,String iss,String subject,String serial) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal_extract.cer");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += subject;
- res += " <dsig:X509IssuerSerial>\n";
- res += iss;
- res += serial;
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n" + " ";
- /*res += "<XMLContent xml:space=\"preserve\">"+readFileCR(
- configuration_.getProperty("baseDir")
- + "resources/testSimple.txt")+
- "</XMLContent>";*/
- res += "<Base64Content>"+readBinaryFileAsBase64_new((configuration_.getProperty("baseDir")+ "resources/testSimple.txt"))+"</Base64Content>";
-
- res += vxBean.getFooterSignatureCheck(signatureCheckCode, "0");
-
- return res;
- }
-
-
- private String createResponse(String x509cert, String testNumber, String signatureCheckCode, String hashData) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n";
- /* " <XMLContent xml:space=\"preserve\">"+
- hashData +
- "</XMLContent>\n";*/
- res += "<Base64Content>"+Base64Utils.encode(hashData.getBytes())+"</Base64Content>";
- System.out.println(res);
- res += vxBean.getFooterSignatureCheck(signatureCheckCode, "0");
- System.out.println(res);
-
- return res;
- }
-
- private String createResponse(String x509cert, String testNumber, String signatureCheckCode, String hashData,String hashData2) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n";
- /* " <XMLContent xml:space=\"preserve\">"+
- hashData +
- "</XMLContent>\n";*/
- res += "<Base64Content>"+Base64Utils.encode(hashData.getBytes())+"</Base64Content>";
- res += "</HashInputData><HashInputData>";
- res += "<Base64Content>"+Base64Utils.encode(hashData2.getBytes())+"</Base64Content>";
- res += vxBean.getFooterSignatureCheck(signatureCheckCode, "0");
-
- return res;
- }
-
- private String createResponseWithoutHashInputData(String x509cert, String testNumber, String signatureCheckCode,boolean dsig) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n"
- + " <SignatureCheck>\n" +
- " <Code>" + signatureCheckCode + "</Code>\n" +
- " </SignatureCheck>\n";
-
- if(dsig) res+=vxBean.createXMLDSIGManifestCheck("0","","1");
- res+= " <CertificateCheck>\n" +
- " <Code>0</Code>\n" +
- " </CertificateCheck>\n" +
- "</VerifyXMLSignatureResponse>";
-
- return res;
- }
-
- private String createResponseWithoutHashInputData(String x509cert, String testNumber, String signatureCheckCode) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n"
- + " <SignatureCheck>\n" +
- " <Code>" + signatureCheckCode + "</Code>\n" +
- " </SignatureCheck>\n" +
- " <CertificateCheck>\n" +
- " <Code>0</Code>\n" +
- " </CertificateCheck>\n" +
- "</VerifyXMLSignatureResponse>";
-
- return res;
- }
-
- private String createResponsePart(String x509cert) throws Exception {
-
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n";
-
- res +=x509cert;
-
- res += " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- /*res += " <HashInputData>\n" + " <XMLContent>";
- res += readFile(
- configuration_.getProperty("baseDir")
- + "resources/testSimple.txt");
- */
- //res += vxBean.getFooterXMLDSIGManifestCheck(xmlDSIGManifestCheckCode,"0");
-
- return res;
- }
-
- public String readFileCR(String filename) throws Exception {
-
- /*StringBuffer data = new StringBuffer();
- String line = null;
- BufferedReader br = new BufferedReader(new FileReader(filename));
- while ((line = br.readLine()) != null) {
- data.append(line);
- data.append("\n");
- }
- */
- String response="";
- byte[] result;
-
- if (filename.substring(0,4).toLowerCase().equals("http"))
- {
-
- URL targetUrl = new URL(filename);
- HttpURLConnection h = (HttpURLConnection)targetUrl.openConnection();
- InputStream is = h.getInputStream();
-
- int size = 0;
-
- result = new byte[h.getContentLength()];
- for (int i = 0; i < result.length; i++) {
- byte[] b = new byte[1];
- is.read(b);
- result[i]=b[0];
- }
- is.close();
- }
- else
- {
- RandomAccessFile raf = new RandomAccessFile(filename, "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("file too big to fit in byte array.");
-
- result = new byte[(int) raf.length()];
- raf.read(result);
- raf.close();
-
- }
-
- byte[] temp = new byte[result.length];
- int s = 0;
- for (int t=0; t<result.length; t++)
- {
- temp[s] = result[t];
- s++;
- if (temp[s-1]==10)
- {
- if (temp[s-2]==13)
- {
- temp[s-2]=10;
- s--;
- }
- }
- }
- byte[] res = new byte[s];
- result = null;
-
- System.arraycopy(temp,0,res,0,s);
-
-
- response = new String(res);
-
- try {
- response = replaceString(response,"<?xml version=\"1.0\" encoding=\"utf-8\"?>","");
- }
- catch (Exception e) {}
-
- return response;
- }
-
-private InputStream getHttpInputStream(String url) throws Exception
- {
- URL targetUrl = new URL(url);
- HttpURLConnection h = (HttpURLConnection)targetUrl.openConnection();
- return h.getInputStream();
- }
-
-private String convertManifestToString(Element e) throws Exception
- {
- String result =(new DOMWriterImpl(true)).writeToString(e);
- result = replaceString(result,"<?xml version=\"1.0\"?>","");
- result = replaceStringAll(result,"&apos;","'");
- result = replaceStringAll(result,"#sha1\"/><dsig:","#sha1\"></dsig:DigestMethod><dsig:");
-
- //result = replaceString(result," xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"","");
- return result;
- }
-
- private String stripNLCR(String input)
- {
- String output = replaceStringAll(input,"\n","");
- output = replaceStringAll(output,"\r","");
- return output;
- }
-
- public static String replaceStringAll(
- String input,
- String oldPart,
- String newPart)
- {
-
- String erg = null;
-
- int pos = input.indexOf(oldPart);
- if(pos==-1) return input;
-
- while(true)
- {
-
- //First Part
- pos = input.indexOf(oldPart);
- if(pos==-1) break;
- erg = input.substring(0, pos);
-
- //Insert new Part
- erg += newPart;
-
- //insert REST
- erg
- += input.substring(
- input.indexOf(oldPart) + oldPart.length(),
- input.length());
-
- input = erg;
- }
- return erg;
- }
-
-
-}
-
diff --git a/spss.test/src/testgenerator/TestGeneratorVX2.java b/spss.test/src/testgenerator/TestGeneratorVX2.java
deleted file mode 100644
index 96612da9e..000000000
--- a/spss.test/src/testgenerator/TestGeneratorVX2.java
+++ /dev/null
@@ -1,1600 +0,0 @@
-package testgenerator;
-import iaik.ixsil.algorithms.DigestAlgorithmImplSHA1;
-import iaik.ixsil.algorithms.Transform;
-import iaik.ixsil.algorithms.TransformImplCanonicalXML;
-import iaik.ixsil.algorithms.TransformImplXSLT;
-import iaik.ixsil.util.URI;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * @author stephan
- */
-public class TestGeneratorVX2 extends TestCases {
-
- private static final int canAlgCanXML = 1;
- private static final int canAlgCanXMLwithCom = 2;
- private static final int canAlgExcXML = 3;
- private static final int canAlgExcXMLwithCom = 4;
- private static VXResponseBean vxBean = null;
- private static String etsiPropertyName = "ETSIProperties";
- private static URI etsiURI;
-
- public static void main(String[] args) throws Exception {
-
- vxBean = new VXResponseBean();
-
- TestGeneratorVX2 testcase = new TestGeneratorVX2();
-
- etsiURI = new URI("http://uri.etsi.org/01903/v1.1.1#SignedProperties");
-
- testcase.create201();
- testcase.create202();
- testcase.create203();
- testcase.create205();
- testcase.create206();
- testcase.create208();
- testcase.create209();
- testcase.create210();
- testcase.create211();
- testcase.create212();
- testcase.create213();
- testcase.create214();
- testcase.create215();
- testcase.create216();
- testcase.create217();
- }
-
- /* ==================================================================================================== */
-
- public TestGeneratorVX2() throws Exception {
-
- super();
-
- // Set config properties
- configuration_.setProperty("TestClass", "TestGeneratorVX");
-
- // configuration_.setProperty("privateKeyFile", baseDir + "additionalFiles/keys/RSAPrivateKey.der");
- // configuration_.setProperty("publicKeyFile", baseDir + "additionalFiles/keys/RSAPublicKey.der");
- // configuration_.setProperty("signatureFile", baseDir + "additionalFiles/signatures/Signature.unit1.xml");
-
- iaik.security.provider.IAIK.addAsProvider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
- }
-
- /* ==================================================================================================== */
-
-
- /**
- * Method create001.
- * @throws Exception
- */
- /* ===================================================================================================================== */
- /* ===================================================================================================================== */
- /* ===================================================================================================================== */
-
-
-public void create201() throws Exception
- { String testNumber = "201";
-
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName,
- ets.getQualProp());
-
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename + ""));
-
- String request =
- makeOutputFile(
- createRequestStart("201 a simple request w/ SignatureManifestCheckParams (but w/o Supplement)",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- //
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
- public void create202() throws Exception
- { String testNumber = "202";
-
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),
- etsiURI);
-
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams(null);
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename));
-
- String request =
- makeOutputFile(
- createRequestStart("202 no SignatureManifestCheckParams/@ReturnReferenceInputData" ,true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-public void create203() throws Exception
- { String testNumber = "203";
-
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),
- etsiURI);
-
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("false");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename));
-
- String request =
- makeOutputFile(
- createRequestStart("203 SignatureManifestCheckParams/@ReturnReferenceInputData = false",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- String response = createResponsePart(cpkcs.getX509CertString()) +
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
-
-
-
- public void create205() throws Exception
- { String testNumber = "205";
-
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[2];
- TransformImplCanonicalXML trans0 = new TransformImplCanonicalXML();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans0.setInput(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans0;
-
- TransformImplXSLT trans = new TransformImplXSLT();
- s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[1] = trans;
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),
- etsiURI);
-
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename ));
-
- String request =
- makeOutputFile(
- createRequestStart("206 - 2 dsig:Transform elements ==> Canonisierung + Stylesheet",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
-public void create206() throws Exception
- { String testNumber = "206";
-
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Hash",getBase64Hash(configuration_.getProperty("baseDir")+"resources/" + filename));
-
- String request =
- makeOutputFile(
- createRequestStart("206 TransformParameter/Hash statt TransformParameter/Base64Content (Der Hash wird von " + filename + " gebildet)",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
-public void create208() throws Exception
- { String testNumber = "208";
-
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),
- etsiURI);
-
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl");
-
- String request =
- makeOutputFile(
- createRequestStart("208 - weder Base64Content noch Hash wird verwendet ",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
-
-public void create209() throws Exception
- { String testNumber = "209";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_book.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
-// cpkcs.createReferenceWithManifest(
-// new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
-// "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),
- etsiURI);
-
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
-
- String request =
- makeOutputFile(
- createRequestStart("209 0 TransformParameter ==> ganzes Element raus und direkt auf CX1_book.xsl verweisen (in der Transformations-Referenz)",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- /*int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");*/
-
- int pos_1 = request.indexOf("<etsi:SignedProperties");
- int pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("2")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-public void create210() throws Exception
- { String testNumber = "210";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/VX2_bookref2includes.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_bookref2includes.xsl"));
- trans.setInput(s,null);
- tr[0] = trans;
-
- //System.out.println(getTransformsResult(tr));
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferencesWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book0.xsl"),
- "Manifest",new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book1.xsl"), "http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName,
- ets.getQualProp());
-
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book0.xsl");
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/VX2_book0.xsl"));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/VX2_book1.xsl");
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/VX2_book1.xsl"));
-
-
- String request =
- makeOutputFile(
- createRequestStart("210 2 includes",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
-public void create211() throws Exception
- { String testNumber = "211";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName,
- ets.getQualProp());
-
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- /*for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_book.xsl");
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/CX1_book.xsl"));*/
-
- smcp.addTransformsProfileID("TransformsInfoProfile1");
- smcp.addTransformsProfileID("TransformsInfoProfile2");
-
- String request =
- makeOutputFile(
- createRequestStart("211 2 VerifyTransformsInfoID ==> Statt TransformsInfoProfile , in ein IntoProfileID auf Datei mit orig.Daten des TransInfoProfile verweisen, das andere auf ein Transforms, das nur Canonisiserung enthaelt",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
- public void create212() throws Exception
- { String testNumber = "212";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-2");
-
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- ets.addDataObjectFormat("#reference-2");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
- //2. DataObject Format
- cpkcs.createReference(new URI("#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('ETSIProperties')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"),etsiURI);
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename ));
-
- SignatureManifestCheckParams smcp2 = new SignatureManifestCheckParams(null);
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp2.addDisgTransform(tr[trNr].toElement(smcp2.getDoc()));
- smcp2.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp2.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename ));
-
- String signManiDoc = replaceString(smcp.returnDoc(),"</SignatureManifestCheckParams>","") +
- replaceString(smcp2.returnDoc(),"<SignatureManifestCheckParams>","");
-
- String request =
- makeOutputFile(
- createRequestStart("212 2 ReferenceInfo (for 2 dsig:Reference (pplus Manifest + SignedProperties) : etsi:DataObjectFormat 2mal, Reference 2mal, Manifest 1mal, ReferenceInfo 2mal)",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + signManiDoc
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("0")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
-
- public void create213() throws Exception
- {
- String testNumber = "213";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName,
- ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "'))/*/*"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
-
- String request =
- makeOutputFile(
- createRequestStart("213 kein TransformParameter element obwohl in Transforms URIs referenziert werden",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- /*pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");*/
-
- pos_1 = request.indexOf("<dsig:Object Id=\"ETSIProperties\">");
- pos_2 = request.substring(pos_1).indexOf("</dsig:Object>");
-
- String etsi = request.substring(pos_1,pos_1+pos_2+"</dsig:Object>".length());
- etsi = replaceString(etsi,"<dsig:Object Id=\"ETSIProperties\">","<dsig:Object Id=\"ETSIProperties\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">");
-
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("1","<Info><FailedReference>1</FailedReference></Info>")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
- public void create214() throws Exception
- {
- String testNumber = "214";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName,
- ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "'))/*/*"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
-
- smcp.addTransformsProfileID("TransformsInfoProfile2");
-
- String request =
- makeOutputFile(
- createRequestStart("214 1 VerifyTransformsInfoID ==> Passt aber nicht zur Transformation (XSLT <==> Canonisiserung)",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<dsig:Object Id=\"ETSIProperties\">");
- pos_2 = request.substring(pos_1).indexOf("</dsig:Object>");
-
- String etsi = request.substring(pos_1,pos_1+pos_2+"</dsig:Object>".length());
- etsi = replaceString(etsi,"<dsig:Object Id=\"ETSIProperties\">","<dsig:Object Id=\"ETSIProperties\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("1","<Info><FailedReference>1</FailedReference></Info>")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
- public void create215() throws Exception
- { String testNumber = "215";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- //Reference 1
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
-
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- //ets.addDataObjectFormat("#reference-2");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "')/*/*)"),etsiURI);
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename));
-
- SignatureManifestCheckParams smcp2 = new SignatureManifestCheckParams(null);
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp2.addDisgTransform(tr[trNr].toElement(smcp2.getDoc()));
- smcp2.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp2.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename));
-
- String signManiDoc = replaceString(smcp.returnDoc(),"</SignatureManifestCheckParams>","") +
- replaceString(smcp2.returnDoc(),"<SignatureManifestCheckParams>","");
-
- String request =
- makeOutputFile(
- createRequestStart("215 number of ReferenceInfo is different from number of dsig:Reference in the signature",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + signManiDoc
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- //writeFile(vxResErrFile(testNumber),"2271");
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("1")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
- public void create216() throws Exception
- {
- String testNumber = "216";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- //Reference 1
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-2");
-
-
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- ets.addDataObjectFormat("#reference-2");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "')/*/*)"),etsiURI);
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename));
-
- String request =
- makeOutputFile(
- createRequestStart("216 number of References id bigger then number of ReferenceInfos",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- //writeFile(vxResErrFile(testNumber),"2271");
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<etsi:SignedProperties");
- pos_2 = request.indexOf("</etsi:SignedProperties>");
-
- String etsi = request.substring(pos_1,pos_2+"</etsi:SignedProperties>".length());
- //etsi = replaceStringAll(etsi,"etsi:","ns1:");
- etsi = replaceString(etsi,"<etsi:SignedProperties","<etsi:SignedProperties xmlns:etsi=\"http://uri.etsi.org/01903/v1.1.1#\"");
- etsi = replaceString(etsi,"<dsig:X509IssuerName","<dsig:X509IssuerName xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
- etsi = replaceString(etsi,"<dsig:X509SerialNumber","<dsig:X509SerialNumber xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("1")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
- public void create217() throws Exception
- { String testNumber = "217";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName, ets.getQualProp());
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "'))/*/*"), etsiURI);
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Hash",getBase64Hash(configuration_.getProperty("baseDir")+"resources/" + filename));
-
- String request =
- makeOutputFile(
- createRequestStart("217 - TransformParameter/@URI resolves but Hash does not match - which hashing algorithm?",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- request = replaceString(request,"<Hash><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><dsig:DigestValue>",
- "<Hash><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><dsig:DigestValue>abcd");
-
- writeFile(vxReqFile(testNumber),request);
- //writeFile(vxResErrFile(testNumber),"2205");
-
- int pos_1 = request.indexOf("<dsig:Manifest");
- int pos_2 = request.indexOf("</dsig:Manifest>");
-
- String manifest = request.substring(pos_1,pos_2+"</dsig:Manifest>".length());
- manifest = replaceString(manifest,"<dsig:Manifest Id=\"Manifest\"","<dsig:Manifest Id=\"Manifest\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\"");
-
- pos_1 = request.indexOf("<dsig:Object Id=\"ETSIProperties\">");
- pos_2 = request.substring(pos_1).indexOf("</dsig:Object>");
-
- String etsi = request.substring(pos_1,pos_1+pos_2+"</dsig:Object>".length());
- etsi = replaceString(etsi,"<dsig:Object Id=\"ETSIProperties\">","<dsig:Object Id=\"ETSIProperties\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">");
-
- String response = createResponsePart(cpkcs.getX509CertString()) +
- "<ReferenceInputData><Base64Content>"+
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/BookData.xml")+
- "</Base64Content></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+manifest+"</XMLContent></ReferenceInputData>"+
- "<ReferenceInputData><XMLContent xml:space=\"preserve\">"+etsi+"</XMLContent></ReferenceInputData>"+
- vxBean.createSignatureCheck("0")+
- vxBean.createSignatureManifestCheck("1","<Info><FailedReference>1</FailedReference></Info>")+
- vxBean.createCertificateCheck("0")+
- "</VerifyXMLSignatureResponse>";
-
- writeFile(vxResFile(testNumber), response);
- }
-
-
- /**
- * Method makeOutputFile.
- * @param start
- * @param signatureDoc
- * @param end
- * @return String
- * @throws Exception
- */
- public String makeOutputFile(
- String start,
- Document signatureDoc,
- String end)
- throws Exception {
- ArrayList foundNodes = new ArrayList();
- findNode(
- signatureDoc.getDocumentElement(),
- "dsig:Signature",
- foundNodes);
-
- Node outputNode = null;
-
- if (foundNodes.size() > 0) {
- outputNode = (Node) foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg = start + erg + end;
-
- return erg;
- }
-
- /**
- * Method createRequestStart.
- * @param testNumber
- * @param useDate
- * @param changeHours
- * @return String
- */
- private String createRequestStart(String testNumber, boolean useDate, int changeHours)
- {String reqStart = null;
- System.out.println("======================================================");
- System.out.println("================== TEST-NUMBER "+ testNumber + " ===================");
- System.out.println("======================================================");
-
- reqStart =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + "<!-- Testnumber: "
- + testNumber
- + "-->\n"
- + "<VerifyXMLSignatureRequest\n"
- + " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"
- + " xmlns:xml=\"http://www.w3.org/XML/1998/namespace\""
- + " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">\n";
-
- if (useDate) {
- reqStart += " <DateTime>"
- + getDate(changeHours)
- + "</DateTime>\n";
- }
-
- reqStart += " <VerifySignatureInfo>\n"
- + " <VerifySignatureEnvironment>\n"
- + " <XMLContent xml:space=\"preserve\">" ;
- return reqStart;
- }
-
- /**
- * Method getTransformsResult:the input transforms array will
- * be calculated to return a string-representation of the result
- * @param tr
- * @return String
- * @throws Exception
- */
- private String getTransformsResult(Transform[] tr) throws Exception
- {
- Transform[] myTransforms = tr;
- String result = "";
- for (int t=0; t<tr.length-1; t++)
- {
- myTransforms[t+1].setInput((InputStream)myTransforms[t].transform(),null);
- }
-
- ByteArrayInputStream is = (ByteArrayInputStream)myTransforms[tr.length-1].transform();
-
-
- byte[] b = new byte[1];
- is.read(b);
- while (is.available() > 0)
- {
- result += new String(b);
- is.read(b);
- }
- result += new String(b);
-
- return result;
- }
-
- private String getBase64Hash(String filename) throws Exception
- {
- DigestAlgorithmImplSHA1 dig = new DigestAlgorithmImplSHA1();
-
- dig.setInput(new FileInputStream(filename));
-
- InputStream erg = dig.digest();
- String result = "";
-
- int size = erg.available();
-
- byte[] b = new byte[size];
- erg.read(b);
-
- return Base64Utils.encode(b);
- }
-
- /**
- * Method createRequestEnd.
- * @param useReturnHashInputData
- * @param useSupplement
- * @param supplementReference
- * @return String
- * @throws Exception
- */
- private String createRequestEnd(
- boolean useReturnHashInputData,
- boolean useSupplement,
- String supplementReference)
- throws Exception {
-
- String reqEnd = null;
-
-/* reqEnd =
- "</VerifySignatureEnvironment>\n"
- + " <VerifySignatureLocation>#xpointer(/VerifyXMLSignatureRequest/VerifySignatureInfo/VerifySignatureEnvironment/dsig:Signature)</VerifySignatureLocation>\n"
- + " </VerifySignatureInfo>\n";
-*/
- reqEnd ="</XMLContent>"+
- "</VerifySignatureEnvironment>\n"
- + " <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>\n"
- + " </VerifySignatureInfo>\n";
-
-
-
- if (useSupplement)
- {
- reqEnd += " <Supplement>\n" +
- " <Content Reference=\"file:/" + supplementReference.toString() + "\">\n" +
- " <XMLContent>"+readFile(supplementReference.toString())+"</XMLContent>\n" +
- " </Content>\n" +
- " </Supplement>\n";
- }
-
- if (useReturnHashInputData) {
- reqEnd += " <ReturnHashInputData/>\n";
- }
- reqEnd += " <TrustProfileID>TrustProfile1</TrustProfileID>\n"
- + "</VerifyXMLSignatureRequest>\n";
- return reqEnd;
-
- }
-
- private String createSignatureInfoEnd()
- throws Exception {
-
- return "</XMLContent>"+"</VerifySignatureEnvironment>\n"
- + " <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>\n"
- + " </VerifySignatureInfo>\n";
-
- }
-
- private String createRequestShortEnd(boolean useReturnHashInputData)
- throws Exception {
-
- String reqEnd = "";
-
- if (useReturnHashInputData)
- reqEnd = " <ReturnHashInputData/>\n";
-
- reqEnd += " <TrustProfileID>TrustProfile1</TrustProfileID>\n"
- + "</VerifyXMLSignatureRequest>\n";
- return reqEnd;
-
- }
- /**
- * Method createResponse.
- * @param testNumber
- * @param signatureCheckCode
- * @return String
- * @throws Exception
- */
- private String createResponse(String testNumber, String signatureCheckCode) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n" + " <XMLContent xml:space=\"preserve\">";
- res += readFile(
- configuration_.getProperty("webbaseDir")
- + "resources/testDaten.txt")+
- "</XMLContent>";
-
- res += vxBean.getFooterSignatureCheck(signatureCheckCode, "0");
-
- return res;
- }
-
- private String createResponse(String testNumber, String signatureCheckCode, String hashData) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n" +
- " <XMLContent xml:space=\"preserve\">"+
- hashData +
- "</XMLContent>\n";
- res += vxBean.getFooterSignatureCheck(signatureCheckCode, "0");
-
- return res;
- }
-
-
- private String createResponseWithoutHashInputData(String testNumber, String signatureCheckCode) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n"
- + " <SignatureCheck>\n" +
- " <Code>" + signatureCheckCode + "</Code>\n" +
- " </SignatureCheck>\n" +
- " <CertificateCheck>\n" +
- " <Code>0</Code>\n" +
- " </CertificateCheck>\n" +
- "</VerifyXMLSignatureResponse>";
-
- return res;
- }
-/* private String createResponseXMLDsigCheck(String testNumber, String xmlDSIGManifestCheckCode) throws Exception {
-
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n" + " <XMLContent>";
- res += readFile(
- configuration_.getProperty("webbaseDir")
- + "resources/testDaten.txt");
-
- res += vxBean.getFooterXMLDSIGManifestCheck(xmlDSIGManifestCheckCode,"0");
-
- return res;
- }*/
-
- private String createResponsePart(String x509cert) throws Exception {
-
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + x509cert
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- /*res += " <HashInputData>\n" + " <XMLContent>";
- res += readFile(
- configuration_.getProperty("webbaseDir")
- + "resources/testDaten.txt");
- */
- //res += vxBean.getFooterXMLDSIGManifestCheck(xmlDSIGManifestCheckCode,"0");
-
- return res;
- }
-
- public String readFileCR(String filename) throws Exception {
-
- /*StringBuffer data = new StringBuffer();
- String line = null;
- BufferedReader br = new BufferedReader(new FileReader(filename));
- while ((line = br.readLine()) != null) {
- data.append(line);
- data.append("\n");
- }
- */
- String response="";
- byte[] result;
-
- if (filename.substring(0,4).toLowerCase().equals("http"))
- {
-
- URL targetUrl = new URL(filename);
- HttpURLConnection h = (HttpURLConnection)targetUrl.openConnection();
- InputStream is = h.getInputStream();
-
- int size = 0;
-
- result = new byte[h.getContentLength()];
- for (int i = 0; i < result.length; i++) {
- byte[] b = new byte[1];
- is.read(b);
- result[i]=b[0];
- }
- is.close();
- }
- else
- {
- RandomAccessFile raf = new RandomAccessFile(filename, "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("file too big to fit in byte array.");
-
- result = new byte[(int) raf.length()];
- raf.read(result);
- raf.close();
-
- }
-
- byte[] temp = new byte[result.length];
- int s = 0;
- for (int t=0; t<result.length; t++)
- {
- temp[s] = result[t];
- s++;
- if (temp[s-1]==10)
- {
- if (temp[s-2]==13)
- {
- temp[s-2]=10;
- s--;
- }
- }
- }
- byte[] res = new byte[s];
- result = null;
-
- System.arraycopy(temp,0,res,0,s);
-
-
- response = new String(res);
-
- try {
- response = replaceString(response,"<?xml version=\"1.0\" encoding=\"utf-8\"?>","");
- }
- catch (Exception e) {}
-
- return response;
- }
-
-private InputStream getHttpInputStream(String url) throws Exception
- {
-
- return ((HttpURLConnection)new URL(url).openConnection()).getInputStream();
- }
-
-
-
-}
diff --git a/spss.test/src/testgenerator/TestGeneratorVXErrors.java b/spss.test/src/testgenerator/TestGeneratorVXErrors.java
deleted file mode 100644
index 3c9db0dad..000000000
--- a/spss.test/src/testgenerator/TestGeneratorVXErrors.java
+++ /dev/null
@@ -1,1775 +0,0 @@
-package testgenerator;
-import iaik.ixsil.algorithms.DigestAlgorithmImplSHA1;
-import iaik.ixsil.algorithms.Transform;
-import iaik.ixsil.algorithms.TransformImplBase64Decode;
-import iaik.ixsil.algorithms.TransformImplXSLT;
-import iaik.ixsil.util.URI;
-import iaik.utils.Base64OutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * @author stephan
- */
-public class TestGeneratorVXErrors extends TestCases {
-
- private static final int canAlgCanXML = 1;
- private static final int canAlgCanXMLwithCom = 2;
- private static final int canAlgExcXML = 3;
- private static final int canAlgExcXMLwithCom = 4;
- private static VXResponseBean vxBean = null;
- private static String etsiPropertyName = "ETSIProperties";
- private static URI etsiURI;
-
-
- public static void main(String[] args) throws Exception {
-
- etsiURI = new URI("http://uri.etsi.org/01903/v1.1.1#SignedProperties");
-
- vxBean = new VXResponseBean();
-
- TestGeneratorVXErrors testcase = new TestGeneratorVXErrors();
- testcase.createVXConfig();
-
-
- //testcase.create051();
- testcase.create052();
- testcase.create053();
- testcase.create054();
- testcase.create055();
-
- testcase.create151();
- //testcase.create152();
- testcase.create153();
- testcase.create154();
-//N.A.: testcase.create155();
-
- testcase.create251();
- //testcase.create252();
- //testcase.create252_2();
- testcase.create253();
- //testcase.create254();
- //testcase.create255();
- //testcase.create256();
-
- testcase.create351();
- testcase.create352();
- //testcase.create353();
- testcase.create354();
- //testcase.create355();
- testcase.create356();
- testcase.create357();
- //testcase.create358();
- testcase.create359();
- testcase.create360();
- testcase.create360_2();
- //testcase.create361();
- testcase.create362();
- testcase.create363();
- testcase.create364();
- testcase.create365();
- testcase.create366();
- testcase.create367();
- //testcase.create368();
- testcase.create369();
- testcase.create370();
-
-
- }
-
- /* ==================================================================================================== */
-
- public TestGeneratorVXErrors() throws Exception {
-
- super();
-
- // Set config properties
- configuration_.setProperty("TestClass", "TestGeneratorVX");
-
- // configuration_.setProperty("privateKeyFile", baseDir + "additionalFiles/keys/RSAPrivateKey.der");
- // configuration_.setProperty("publicKeyFile", baseDir + "additionalFiles/keys/RSAPublicKey.der");
- // configuration_.setProperty("signatureFile", baseDir + "additionalFiles/signatures/Signature.unit1.xml");
-
- iaik.security.provider.IAIK.addAsProvider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
- }
-
- /* ==================================================================================================== */
-
- public void create051() throws Exception {
- String testNumber = "051";
- //Create a Request with number 051, Time in the future (+24 hours)
- // and with the Date and ReturnHashInputDate Elements present
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,24),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"0000");
-
- }
- /**
- * Method create052.
- * @throws Exception
- */
- public void create052() throws Exception {
- String testNumber = "052";
- //Create a Request with number 052, with current Time (+0 hours)
- // and with the Date and ReturnHashInputDate Elements present
-
- // BUT there is in invalid Element to crash validation against XMLDsig
- // </dsig:SignedInfo> is replaces by </dsig:NoValidDSigSignedInfo>
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request =
- replaceString(
- request,
- "<dsig:SignedInfo>",
- "<dsig:NoValidDSigSignedInfo>");
- request =
- replaceString(
- request,
- "</dsig:SignedInfo>",
- "</dsig:NoValidDSigSignedInfo>");
-
- writeFile(vxReqFile(testNumber), request);
- writeFile(vxResErrFile(testNumber),"1100");
- }
-
- /**
- * Method create053.
- * @throws Exception
- */
- public void create053() throws Exception {
- String testNumber = "053";
- //Create a Request with number 053, with current Time (+0 hours)
- // and with the Date and ReturnHashInputDate Elements present
-
- // BUT with an invalid XPath expression
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request =
- replaceString(
- request,
- "<VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>",
- "<VerifySignatureLocation>//invalid XPath Expression</VerifySignatureLocation>");
-
- writeFile(vxReqFile(testNumber), request);
- writeFile(vxResErrFile(testNumber),"2212");
- }
- /**
- * Method create054.
- * @throws Exception
- */
- public void create054() throws Exception {
- String testNumber = "054";
-
- //Create a Request with number 053, with current Time (+0 hours)
- // and with the Date and ReturnHashInputDate Elements present
-
- // BUT with an valid XPath expression not referencing a valid element
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request =
- replaceString(request, "//dsig:Signature", "//dsig:NoValidElement");
- writeFile(vxReqFile(testNumber), request);
- writeFile(vxResErrFile(testNumber),"2212");
- }
- public void create055() throws Exception {
-
- String testNumber = "055";
-
- //Create a Request with number 001, the current Time (+0 hours)
- // and with the Date and ReturnHashInputDate Elements present
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request =
- replaceString(request,
- "TrustProfile1", "InvalidProfile");
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2203");
-
-
- // writeFile(vxResFile(testNumber), createResponse(testNumber,"0"));
- }
- public void create151() throws Exception {
-
- String testNumber = "151";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
-
- String requestEnd = createSignatureInfoEnd()+
- createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber + " an URI referenced in dsig:Signature does not resolve and no SupplementProfile is available",true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- request = replaceString(request, configuration_.getProperty("webbaseDir")+"resources/testDaten.txt","http://no.uritoresolve.com" );
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2264");
-
- }
- public void create152() throws Exception {
-
- String testNumber = "152";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- supp.addMetaInfo("text/plain","http://www.buergerkarte.at");
- supp.addBase64Content(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt",
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/testDaten.txt"));
- supp.closeSupplement();
- //supp.addProfileID("Some ID");
-
- String requestEnd = createSignatureInfoEnd()+
- supp.getSupplement() + createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber + "- MimeType",true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- request = replaceString(request, "text/plain","no valid MIME-Type" );
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"1100");
- }
-
- public void create153() throws Exception {
-
- String testNumber = "153";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- String requestEnd =
- createSignatureInfoEnd()+
- "<SupplementProfileID>NO VALID SUPPLEMENT PROFILE ID</SupplementProfileID>" +
- createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber + " - invalid SupplementProfileID",true,0),
- cpkcs.returnSig(),
- requestEnd);
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2267");
- }
-
- public void create154() throws Exception {
-
- String testNumber = "154";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- supp.addMetaInfo("text/plain","http://www.buergerkarte.at");
- supp.addBase64Content(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt",
- readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/testDaten.txt"));
- supp.closeSupplement();
- //supp.addProfileID("Some ID");
-
- String requestEnd = createSignatureInfoEnd()+
- supp.getSupplement() + createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- requestEnd);
- request = replaceString(request,"<Base64Content>","<Base64Content>AAAAAAAAAAAAAAAAAA");
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"1100");
- }
-
-public void create155() throws Exception {
- String testNumber = "155";
-/* CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
-
- Supplement supp = new Supplement();
- supp.addXMLContent(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt", readFileCR(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt"));
- supp.closeSupplement();
-
- String requestEnd =
- createSignatureInfoEnd()+
- supp.getSupplement()+
- createRequestShortEnd(false);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber+" - Supplement/Content/XMLContent does not match to the signature",true,0),
- cpkcs.returnSig(),
- requestEnd);
-*/
-// request = replaceString(request,"<XMLContent>","<XMLContent><OPEN_ELEMENT>");
-
- writeFile(vxReqFile(testNumber),"N.A.");
- writeFile(vxResErrFile(testNumber),"0000");
- }
-
-
-
-public void create251() throws Exception
- { String testNumber = "251";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName,
- ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "'))/*/*"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
-
- smcp.addTransformsProfileID("InvalidTransformsProfile");
-
- String request =
- makeOutputFile(
- createRequestStart("251 - VerifyTransformsInfoID: invalidID",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2268");
- }
-
-
- public void create252() throws Exception
- { String testNumber = "252";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- //Reference 1
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
-
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- //ets.addDataObjectFormat("#reference-2");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "')/*/*)"),etsiURI);
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename));
-
- SignatureManifestCheckParams smcp2 = new SignatureManifestCheckParams(null);
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp2.addDisgTransform(tr[trNr].toElement(smcp2.getDoc()));
- smcp2.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp2.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename));
-
- String signManiDoc = replaceString(smcp.returnDoc(),"</SignatureManifestCheckParams>","") +
- replaceString(smcp2.returnDoc(),"<SignatureManifestCheckParams>","");
-
- String request =
- makeOutputFile(
- createRequestStart("252 number of ReferenceInfo is different from number of dsig:Reference in the signature",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + signManiDoc
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2271");
- }
-
-public void create252_2() throws Exception
- { String testNumber = "252_2";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- //Reference 1
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
-
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-2");
-
-
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- ets.addDataObjectFormat("#reference-2");
- cpkcs.createEnvelopedDataObject(
- etsiPropertyName,ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "')/*/*)"),etsiURI);
- cpkcs.setKeyInformation();
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename));
-
- String request =
- makeOutputFile(
- createRequestStart("252_2 number of References id bigger then number of ReferenceInfos",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2271");
- }
-
-public void create253() throws Exception
- { String testNumber = "253";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName,
- ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "'))/*/*"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Base64Content",readBinaryFileAsBase64_new(configuration_.getProperty("baseDir")+"resources/"+ filename));
-
- String request =
- makeOutputFile(
- createRequestStart("253 mismatching dsig:Transform/@Algorithm and dsig:Transform content",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- request = replaceString(request,
- "http://www.w3.org/TR/1999/REC-xslt-19991116","MismatchingTransformAlgorithm");
- request = replaceString(request,
- "http://www.w3.org/TR/1999/REC-xslt-19991116","http://www.w3.org/TR/1999/REC-xpath-19991116");
- request = replaceString(request,"MismatchingTransformAlgorithm",
- "http://www.w3.org/TR/1999/REC-xslt-19991116");
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2202");
- }
-public void create254() throws Exception
- { String testNumber = "254";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName, ets.getQualProp());
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "'))/*/*"), etsiURI);
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
- smcp.addTransPara("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/"+ filename);
- smcp.addTransParaElement("Hash",getBase64Hash(configuration_.getProperty("webbaseDir")+"resources/" + filename));
-
- String request =
- makeOutputFile(
- createRequestStart("254 - TransformParameter/@URI resolves but Hash does not match - which hashing algorithm?",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- request = replaceString(request,"<Hash><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><dsig:DigestValue>",
- "<Hash><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><dsig:DigestValue>abcd");
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2205");
- }
-
-public void create255() throws Exception
- { String testNumber = "255";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName,
- ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "'))/*/*"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
- for (int trNr=0; trNr < tr.length; trNr++)
- smcp.addDisgTransform(tr[trNr].toElement(smcp.getDoc()));
-
- String request =
- makeOutputFile(
- createRequestStart("255 kein TransformParameter element obwohl in Transforms URIs referenziert werden",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2204");
- }
-
-public void create256() throws Exception
- { String testNumber = "256";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
- cpkcs.createReferenceWithManifest(
- new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/" + filename),
- "Manifest","http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest");
-
- EtsiProperties ets = new EtsiProperties();
- ets.addDataObjectFormat("#reference-1");
- cpkcs.createEnvelopedDataObject(etsiPropertyName,
- ets.getQualProp());
-
- cpkcs.createReference(new URI("#xpointer(id('" + etsiPropertyName + "'))/*/*"),
- etsiURI);
-
- cpkcs.setKeyInformation();
-
- SignatureManifestCheckParams smcp = new SignatureManifestCheckParams("true");
-
- smcp.addTransformsProfileID("TransformsInfoProfile2");
-
- String request =
- makeOutputFile(
- createRequestStart("256 1 VerifyTransformsInfoID ==> Passt aber nicht zur Transformation (XSLT <==> Canonisiserung)",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd() + smcp.returnDoc()
- + createRequestShortEnd(false));
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2204");
- }
-
-public void create351() throws Exception {
-
- String testNumber = "351";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
- String request =
- makeOutputFile( createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
- request = replaceString( request,
- "http://www.w3.org/TR/2001/REC-xml-c14n-20010315",
- "http://www.w3.org/TR/2001/unknownCanonicalzationMethod");
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2240");
- }
-
-
-public void create352() throws Exception {
-
- String testNumber = "352";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
- String request =
- makeOutputFile( createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
- request = replaceString( request,
- "http://www.w3.org/2000/09/xmldsig#rsa-sha1",
- "http://www.w3.org/TR/2001/unknownSignatureMethod");
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2240");
- }
-public void create353()throws Exception {
-
- String testNumber = "353";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,"#xpointer(id('envelopedData'))");
- cpkcs.createEnvelopedDataObject("envelopedData",readFileCR(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt"));
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request =
- replaceString(
- request,
- "#xpointer(id('envelopedData'))",
- "#xpointer(id('unknownURITarget'))");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2264");
- }
- public void create354() throws Exception {
-
- String testNumber = "354";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.setKeyInformation();
- String request =
- makeOutputFile( createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
- request = replaceString( request,
- "http://www.w3.org/2000/09/xmldsig#sha1",
- "http://www.w3.org/TR/2001/unknownDigestMethod");
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2240");
- }
- public void create355() throws Exception {
-
- String testNumber = "355";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,readFileCR(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt"));
- cpkcs.setKeyInformation();
- String request =
- makeOutputFile( createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
- request = replaceString( request,
- "<dsig:DigestValue>",
- "<dsig:DigestValue>WrongData and the original:");
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"0000");
- }
- public void create356() throws Exception {
-
- String testNumber = "356";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- //Erzeugen der Base64-Daten
-// String tmp = readBinaryFileAsBase64(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
-
- URI target = new URI(configuration_.getProperty("webbaseDir")+"resources/testDaten.txtbase64.enc");
-
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplBase64Decode();
- InputStream s = getHttpInputStream(target.toString());
- tr[0].setInput(s,null);
-
- cpkcs.createReferenceWithTransforms(target,tr);
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
- request = replaceString( request,
- "http://www.w3.org/2000/09/xmldsig#base64",
- "http://www.w3.org/TR/2001/unknownTransformsMethod");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
- public void create357() throws Exception {
-
- String testNumber = "357";
-
- String filepath = configuration_.getProperty("webbaseDir")+"resources/";
- String filename = "CX1_book.xsl";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init("signature");
- cpkcs.setCanoncialization(canAlgCanXML);
-
- Transform[] tr = new Transform[1];
- TransformImplXSLT trans = new TransformImplXSLT();
- InputStream s = getHttpInputStream(configuration_.getProperty("webbaseDir")+"resources/CX1_bookref.xsl");
- trans.setStyleSheet(s,new URI("http://moa-test.brz.intra.gv.at/TestDatenGenerator/resources/CX1_bookref.xsl"));
- tr[0] = trans;
- cpkcs.createReferenceWithTransforms(new URI(configuration_.getProperty("webbaseDir")+"resources/BookData.xml"),tr,"reference-1");
-
- cpkcs.setKeyInformation();
-
-
- String request =
- makeOutputFile(
- createRequestStart("357 nicht zu Reference/Transforms/Transform/@Algorithm passender Inha",true,0),
- cpkcs.returnSig(),
- createSignatureInfoEnd()
- + createRequestShortEnd(false));
-
- request = replaceString(request, "http://www.w3.org/TR/1999/REC-xslt-19991116",
- "http://www.w3.org/TR/1999/REC-xpath-19991116");
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
-
- public void create358() throws Exception {
-
- String testNumber = "358";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- //cpkcs.createReference(true,"Dies sind testdaten");
-
- URI target = new URI(configuration_.getProperty("webbaseDir")+"resources/testDaten.txtBase64.enc");
-
- // cpkcs.createEnvelopedDataObject("envelopedData",readBinaryFileAsBase64(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt"));
-
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplBase64Decode();
- InputStream s = getHttpInputStream(target.toString());
- tr[0].setInput(s,null);
-
- cpkcs.createReferenceWithTransforms(target,tr);
- //cpkcs.createReference(false, "file:/"+ configuration_.getProperty("webbaseDir")+"resources/test_wo_canonicalisation.XML");
- //cpkcs.createReference(false, "file:/"+ configuration_.getProperty("webbaseDir")+"resources/test_w_canonicalisation.XML");
-// cpkcs.createReferenceWithManifest(new URI("file:/"+ configuration_.getProperty("webbaseDir")+"resources/test_w_canonicalisation.XML"),"canonicalizedData");
-
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request,
- "<dsig:SignatureValue>","<dsig:SignatureValue>abcd");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
-
- public void create359() throws Exception {
-
- String testNumber = "359";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,readFileCR(configuration_.getProperty("webbaseDir") + "resources/testDaten.txt"));
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request,"<dsig:KeyInfo>","");
- request = replaceString(request,"<dsig:RetrievalMethod Type=\"http://www.w3.org/2000/09/xmldsig#X509Data\" URI=\""+configuration_.getProperty("webbaseDir") + "resources/X509Data.xml\"/>","");
- request = replaceString(request,"</dsig:KeyInfo>","");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2243");
- }
- public void create360() throws Exception {
-
- String testNumber = "360";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,readFileCR(configuration_.getProperty("webbaseDir") + "resources/testDaten.txt"));
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request,"<dsig:RetrievalMethod Type=\"http://www.w3.org/2000/09/xmldsig#X509Data\" URI=\""+configuration_.getProperty("webbaseDir") + "resources/X509Data.xml\"/>",
- "<dsig:X509Data><dsig:X509SubjectName>Some kind of Subject</dsig:X509SubjectName></dsig:X509Data>");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
-
- public void create360_2() throws Exception {
-
- String testNumber = "360_2";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,readFileCR(configuration_.getProperty("webbaseDir") + "resources/testDaten.txt"));
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request,"<dsig:RetrievalMethod Type=\"http://www.w3.org/2000/09/xmldsig#X509Data\" URI=\""+configuration_.getProperty("webbaseDir") + "resources/X509Data.xml\"/>",
- "<dsig:KeyName>Some kind of string as KeyName</dsig:KeyName>");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
-
- public void create361() throws Exception {
-
- String testNumber = "361";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,readFileCR(configuration_.getProperty("webbaseDir") + "resources/testDaten.txt"));
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request,"<dsig:RetrievalMethod Type=\"http://www.w3.org/2000/09/xmldsig#X509Data\" URI=\""+configuration_.getProperty("webbaseDir") + "resources/X509Data.xml\"/>",
- " <dsig:X509Data>\n"+
- " <dsig:X509Certificate>"+
- readFileCR(configuration_.getProperty("webbaseDir") + "resources/tests.cer.b64") +
- "</dsig:X509Certificate>\n"+
- " </dsig:X509Data>\n");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2243");
- }
-
- public void create362() throws Exception {
-
- String testNumber = "362";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,readFileCR(configuration_.getProperty("webbaseDir") + "resources/testDaten.txt"));
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request,"<dsig:RetrievalMethod Type=\"http://www.w3.org/2000/09/xmldsig#X509Data\" URI=\""+configuration_.getProperty("webbaseDir") + "resources/X509Data.xml\"/>",
- " <dsig:X509Data>\n"+
- " <dsig:X509Certificate>"+
- readFileCR(configuration_.getProperty("webbaseDir")+"resources/testDaten.txtbase64.enc") +
- "</dsig:X509Certificate>\n"+
- " </dsig:X509Data>\n");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
- public void create363() throws Exception {
-
- String testNumber = "363";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,readFileCR(configuration_.getProperty("webbaseDir") + "resources/testDaten.txt"));
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request,"<dsig:RetrievalMethod Type=\"http://www.w3.org/2000/09/xmldsig#X509Data\" URI=\""+configuration_.getProperty("webbaseDir") + "resources/X509Data.xml\"/>",
- " <dsig:X509Data>\n"+
- " <dsig:X509Certificate>"+
- "( no BASE64 data )" +
- "</dsig:X509Certificate>\n"+
- " </dsig:X509Data>\n");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"1100");
- }
-
- public void create364() throws Exception {
-
- String testNumber = "364";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,readFileCR(configuration_.getProperty("webbaseDir") + "resources/testDaten.txt"));
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request,
- "http://www.w3.org/2000/09/xmldsig#X509Data",
- "http://www.w3.org/2000/09/noValidRetrievalMethodType");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
- public void create365() throws Exception {
-
- String testNumber = "365";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/X509Data.xml");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#X509Data");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- cpkcs.createReference(true,readFileCR(configuration_.getProperty("webbaseDir") + "resources/testDaten.txt"));
- cpkcs.setKeyInformation(false, fileURI, typeURI, null);
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request,
- configuration_.getProperty("webbaseDir") + "resources/X509Data.xml",
- configuration_.getProperty("webbaseDir") + "resources/test-ee2003_normal.der");
-
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
-
- public void create366() throws Exception {
-
- String testNumber = "366";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/test-ee2003_normal.der");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#rawX509Certificate");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
-
- //DER-encoded RAW-Zertifikat zu Binary64 konvertieren
- // String tmp = readBinaryFileAsBase64(fileURI.getPath());
- //dsig:Object mit den Binary64-Daten erzeugen (==> CRs weglassen!!!!!)
- cpkcs.createEnvelopedDataObject("rawCertAsBase64",readFileCR(fileURI.toString()+"base64.enc"));
-
- //Neue Transformation erzeugen, um die Base64-Daten zurückzuwandeln
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplBase64Decode();
- InputStream s = getHttpInputStream(fileURI.toString()+ "base64.enc");
- tr[0].setInput(s,null);
-
- //Neues KeyInfo-Objekt erzeugen, wobei nicht die Zertifikate sondern
- //nur eine RetrievalMethod angegeben wird, die auf das oben erzeugte Base64-dsig:Object verweist
- cpkcs.setKeyInformation(true, new URI("#xpointer(id('rawCertAsBase64')/node())") , typeURI, tr);
-
- String request = makeOutputFile( createRequestStart(testNumber,true,0), cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request, "http://www.w3.org/2000/09/xmldsig#base64",
- "http://Invalid.URI.com");
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
- public void create367() throws Exception {
-
- String testNumber = "367";
-
- URI fileURI = new URI(configuration_.getProperty("webbaseDir") + "resources/test-ee2003_normal.der");
- URI typeURI = new URI("http://www.w3.org/2000/09/xmldsig#rawX509Certificate");
-
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
-
- cpkcs.createReference(false,configuration_.getProperty("webbaseDir") + "resources/testDaten.txt");
-
- //DER-encoded RAW-Zertifikat zu Binary64 konvertieren
- // String tmp = readBinaryFileAsBase64(fileURI.getPath());
- //dsig:Object mit den Binary64-Daten erzeugen (==> CRs weglassen!!!!!)
- cpkcs.createEnvelopedDataObject("rawCertAsBase64",readFileCR(fileURI.toString()+"base64.enc"));
-
- //Neue Transformation erzeugen, um die Base64-Daten zurückzuwandeln
- Transform[] tr = new Transform[1];
- tr[0] = new TransformImplBase64Decode();
- InputStream s = getHttpInputStream(fileURI.toString()+ "base64.enc");
- tr[0].setInput(s,null);
-
- //Neues KeyInfo-Objekt erzeugen, wobei nicht die Zertifikate sondern
- //nur eine RetrievalMethod angegeben wird, die auf das oben erzeugte Base64-dsig:Object verweist
- cpkcs.setKeyInformation(true, new URI("#xpointer(id('rawCertAsBase64')/node())") , typeURI, tr);
-
- String request = makeOutputFile( createRequestStart(testNumber,true,0), cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request, "http://www.w3.org/2000/09/xmldsig#rawX509Certificate",
- "http://www.w3.org/2000/09/xmldsig#X509Data");
- writeFile(vxReqFile(testNumber),request);
-
- writeFile(vxResErrFile(testNumber),"2240");
- }
-
- public void create368() throws Exception {
- String testNumber = "368";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI fileURI1 = new URI(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.createReferenceWithManifest(fileURI1,"manifestObject");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request, "http://www.w3.org/2000/09/xmldsig#Manifest",
- "http://No.valid_manifest_URI.com");
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2240");
- }
-
- public void create369() throws Exception {
- String testNumber = "369";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI fileURI1 = new URI(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.createReferenceWithManifest(fileURI1,"manifestObject");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- request = replaceString(request, "#xpointer(id('manifestObject'))",
- "#xpointer(id('NoValidManifestObject'))");
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2262");
- }
- public void create370() throws Exception {
- String testNumber = "370";
-
- CreatePKCSSignature cpkcs = new CreatePKCSSignature();
- cpkcs.init();
- cpkcs.setCanoncialization(canAlgCanXML);
- URI fileURI1 = new URI(configuration_.getProperty("webbaseDir")+"resources/testDaten.txt");
- cpkcs.createReferenceWithManifest(fileURI1,"manifestObject");
- cpkcs.setKeyInformation();
-
- String request =
- makeOutputFile(
- createRequestStart(testNumber,true,0),
- cpkcs.returnSig(),
- createRequestEnd(true,false,null));
-
- //Hier wird der DigestAlg vom Reference-Objekt im SignedInfo verändert
- request = replaceString(request,
- "http://www.w3.org/2000/09/xmldsig#sha1",
- "noValidDigestAlg");
- //Hier wird der DigestAlg vom Reference-Objekt im Manifset verändert
- request = replaceString(request,
- "http://www.w3.org/2000/09/xmldsig#sha1",
- "noValidDigestAlg");
- //Hier wird der DigestAlg vom Reference-Objekt im SignedInfo zurück geändert
- request = replaceString(request,
- "noValidDigestAlg",
- "http://www.w3.org/2000/09/xmldsig#sha1");
-
-
- writeFile(vxReqFile(testNumber),request);
- writeFile(vxResErrFile(testNumber),"2262"); }
-
-
- /**
- * Method makeOutputFile.
- * @param start
- * @param signatureDoc
- * @param end
- * @return String
- * @throws Exception
- */
- public String makeOutputFile(
- String start,
- Document signatureDoc,
- String end)
- throws Exception {
- ArrayList foundNodes = new ArrayList();
- findNode(
- signatureDoc.getDocumentElement(),
- "dsig:Signature",
- foundNodes);
-
- Node outputNode = null;
-
- if (foundNodes.size() > 0) {
- outputNode = (Node) foundNodes.get(0);
- }
-
- String erg = Node2String(outputNode);
-
- // remove the <?xml ?> Prologue
- int pos = erg.indexOf("<dsig");
- erg = erg.substring(pos);
-
- // insert the dsig:signature element in a MOA Response Message
- erg = start + erg + end;
-
- return erg;
- }
-
- /**
- * Method createRequestStart.
- * @param testNumber
- * @param useDate
- * @param changeHours
- * @return String
- */
- private String createRequestStart(String testNumber, boolean useDate, int changeHours)
- {String reqStart = null;
- System.out.println("======================================================");
- System.out.println("================== TEST-NUMBER "+ testNumber + " ===================");
- System.out.println("======================================================");
-
- reqStart =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + "<!-- Testnumber: "
- + testNumber
- + "-->\n"
- + "<VerifyXMLSignatureRequest\n"
- + " xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\"\n"
- + " xmlns:xml=\"http://www.w3.org/XML/1998/namespace\""
- + " xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">\n";
-
- if (useDate) {
- reqStart += " <DateTime>"
- + getDate(changeHours)
- + "</DateTime>\n";
- }
-
- reqStart += " <VerifySignatureInfo>\n"
- + " <VerifySignatureEnvironment>\n"
- + " <XMLContent xml:space=\"preserve\">" ;
- return reqStart;
- }
-
- /**
- * Method getTransformsResult:the input transforms array will
- * be calculated to return a string-representation of the result
- * @param tr
- * @return String
- * @throws Exception
- */
- private String getTransformsResult(Transform[] tr) throws Exception
- {
- Transform[] myTransforms = tr;
- String result = "";
- for (int t=0; t<tr.length-1; t++)
- {
- myTransforms[t+1].setInput((InputStream)myTransforms[t].transform(),null);
- }
-
- ByteArrayInputStream is = (ByteArrayInputStream)myTransforms[tr.length-1].transform();
-
-
- byte[] b = new byte[1];
- is.read(b);
- while (is.available() > 0)
- {
- result += new String(b);
- is.read(b);
- }
- result += new String(b);
-
- return result;
- }
-
-
- /**
- * Method createRequestEnd.
- * @param useReturnHashInputData
- * @param useSupplement
- * @param supplementReference
- * @return String
- * @throws Exception
- */
- private String createRequestEnd(
- boolean useReturnHashInputData,
- boolean useSupplement,
- String supplementReference)
- throws Exception {
-
- String reqEnd = null;
-
-/* reqEnd =
- "</VerifySignatureEnvironment>\n"
- + " <VerifySignatureLocation>#xpointer(/VerifyXMLSignatureRequest/VerifySignatureInfo/VerifySignatureEnvironment/dsig:Signature)</VerifySignatureLocation>\n"
- + " </VerifySignatureInfo>\n";
-*/
- reqEnd ="</XMLContent>"+
- "</VerifySignatureEnvironment>\n"
- + " <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>\n"
- + " </VerifySignatureInfo>\n";
-
-
-
- if (useSupplement)
- {
- reqEnd += " <Supplement>\n" +
- " <Content Reference=\"file:/" + supplementReference.toString() + "\">\n" +
- " <XMLContent>"+readFileCR(supplementReference.toString())+"</XMLContent>\n" +
- " </Content>\n" +
- " </Supplement>\n";
- }
-
- if (useReturnHashInputData) {
- reqEnd += " <ReturnHashInputData/>\n";
- }
- reqEnd += " <TrustProfileID>TrustProfile1</TrustProfileID>\n"
- + "</VerifyXMLSignatureRequest>\n";
- return reqEnd;
-
- }
-
- private String createSignatureInfoEnd()
- throws Exception {
-
- return "</XMLContent>"+"</VerifySignatureEnvironment>\n"
- + " <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>\n"
- + " </VerifySignatureInfo>\n";
-
- }
-
- private String createRequestShortEnd(boolean useReturnHashInputData)
- throws Exception {
-
- String reqEnd = "";
-
- if (useReturnHashInputData)
- reqEnd = " <ReturnHashInputData/>\n";
-
- reqEnd += " <TrustProfileID>TrustProfile1</TrustProfileID>\n"
- + "</VerifyXMLSignatureRequest>\n";
- return reqEnd;
-
- }
- /**
- * Method createResponse.
- * @param testNumber
- * @param signatureCheckCode
- * @return String
- * @throws Exception
- */
- private String createResponse(String testNumber, String signatureCheckCode) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n" + " <XMLContent xml:space=\"preserve\">";
- res += readFileCR(
- configuration_.getProperty("webbaseDir")
- + "resources/testDaten.txt")+
- "</XMLContent>";
-
- res += vxBean.getFooterSignatureCheck(signatureCheckCode, "0");
-
- return res;
- }
-
- private String createResponse(String testNumber, String signatureCheckCode, String hashData) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n" +
- " <XMLContent xml:space=\"preserve\">"+
- hashData +
- "</XMLContent>\n";
- res += vxBean.getFooterSignatureCheck(signatureCheckCode, "0");
-
- return res;
- }
-
-
- private String createResponseWithoutHashInputData(String testNumber, String signatureCheckCode) throws Exception {
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n"
- + " <SignatureCheck>\n" +
- " <Code>" + signatureCheckCode + "</Code>\n" +
- " </SignatureCheck>\n" +
- " <CertificateCheck>\n" +
- " <Code>0</Code>\n" +
- " </CertificateCheck>\n" +
- "</VerifyXMLSignatureResponse>";
-
- return res;
- }
-/* private String createResponseXMLDsigCheck(String testNumber, String xmlDSIGManifestCheckCode) throws Exception {
-
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- res += " <HashInputData>\n" + " <XMLContent>";
- res += readFile(
- configuration_.getProperty("webbaseDir")
- + "resources/testDaten.txt");
-
- res += vxBean.getFooterXMLDSIGManifestCheck(xmlDSIGManifestCheckCode,"0");
-
- return res;
- }*/
-
- private String createResponsePart() throws Exception {
-
- //
- vxBean.init(configuration_.getProperty("webbaseDir")+ "resources/" + "test-ee2003_normal.der");
-
- String res = null;
-
- res = vxBean.getHeader();
- res += vxBean.getSubjectDN();
- res += " <dsig:X509IssuerSerial>\n";
- res += vxBean.getIssuerDN();
- res += vxBean.getSerialNumber();
- res += " </dsig:X509IssuerSerial>\n"
- + " </dsig:X509Data>\n"
- + " </SignerInfo>\n";
- return res;
- }
-
- public String readFileCR(String filename) throws Exception {
-
- /*StringBuffer data = new StringBuffer();
- String line = null;
- BufferedReader br = new BufferedReader(new FileReader(filename));
- while ((line = br.readLine()) != null) {
- data.append(line);
- data.append("\n");
- }
- */
- String response="";
- byte[] result;
-
- if (filename.substring(0,4).toLowerCase().equals("http"))
- {
-
- URL targetUrl = new URL(filename);
- HttpURLConnection h = (HttpURLConnection)targetUrl.openConnection();
- InputStream is = h.getInputStream();
-
- int size = 0;
-
- result = new byte[h.getContentLength()];
- for (int i = 0; i < result.length; i++) {
- byte[] b = new byte[1];
- is.read(b);
- result[i]=b[0];
- }
- is.close();
- }
- else
- {
- RandomAccessFile raf = new RandomAccessFile(filename, "r");
- if (raf.length() > Integer.MAX_VALUE)
- throw new IOException("file too big to fit in byte array.");
-
- result = new byte[(int) raf.length()];
- raf.read(result);
- raf.close();
-
- }
-
- byte[] temp = new byte[result.length];
- int s = 0;
- for (int t=0; t<result.length; t++)
- {
- temp[s] = result[t];
- s++;
- if (temp[s-1]==10)
- {
- if (temp[s-2]==13)
- {
- temp[s-2]=10;
- s--;
- }
- }
- }
- byte[] res = new byte[s];
- result = null;
-
- System.arraycopy(temp,0,res,0,s);
-
-
- response = new String(res);
-
- try {
- response = replaceString(response,"<?xml version=\"1.0\" encoding=\"utf-8\"?>","");
- }
- catch (Exception e) {}
-
- return response;
- }
-
-private InputStream getHttpInputStream(String url) throws Exception
- {
- URL targetUrl = new URL(url);
- HttpURLConnection h = (HttpURLConnection)targetUrl.openConnection();
- return h.getInputStream();
- }
-
-public String vxResErrFile(String testNumber)
- {
- return configuration_.getProperty("baseDir") +
- "/data/VX0/"+
- configuration_.getProperty("TestClass") +
- "." +
- testNumber +
- ".ErrRes.xml";
- }
-private String getBase64Hash(String filename) throws Exception
- {
- DigestAlgorithmImplSHA1 dig = new DigestAlgorithmImplSHA1();
- InputStream s = getHttpInputStream(filename);
-
- dig.setInput(s);
-
- InputStream erg = dig.digest();
- String result = "";
-
- byte[] b = new byte[1];
- erg.read(b);
- while (erg.available() > 0)
- {
- result += new String(b);
- erg.read(b);
- }
- result += new String(b);
-
- ByteArrayOutputStream fos = new ByteArrayOutputStream();
- Base64OutputStream base64os = new Base64OutputStream(fos);
- base64os.write(result.getBytes());
- base64os.flush();
-
- return fos.toString();
- }
-}
diff --git a/spss.test/src/testgenerator/TestPKCS12.java b/spss.test/src/testgenerator/TestPKCS12.java
deleted file mode 100644
index 97aa8acd0..000000000
--- a/spss.test/src/testgenerator/TestPKCS12.java
+++ /dev/null
@@ -1,107 +0,0 @@
-
-package testgenerator;
-import iaik.pkcs.pkcs12.CertificateBag;
-import iaik.pkcs.pkcs12.KeyBag;
-import iaik.pkcs.pkcs12.PKCS12;
-import iaik.security.ecc.ecdsa.ECPrivateKey;
-import iaik.security.ecc.ecdsa.ECPublicKey;
-import iaik.security.ecc.math.ecgroup.ECPoint;
-
-import java.io.FileInputStream;
-
-
-/**
- * @author stephan
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestPKCS12 {
-
-/*
- public static void main(String[] args) throws Exception {
-
-// String file = "C:/Daten/MOAPhase2/additionalFiles/keys/TestUser.p12";
-// String password = "testuser";
-// String file = "C:\\Certs\\grill(1234).p12";
-// String password = "1234";
-
- // SL eCard Demo P12 Files
- String file = "C:\\Daten\\MOAPhase2\\Keys\\sl2002mmdd.ecard.sicher(ego).p12";
- String password = "ego";
-// String file = "C:\\Daten\\MOAPhase2\\Keys\\sl2002mmdd.ecard.normal(ego).p12";
-// String password = "ego";
-
- // SL Personalausweis Demo P12 Files
-// String file = "C:\\Daten\\MOAPhase2\\Keys\\sicher-demo(buergerkarte).p12";
-// String password = "buergerkarte";
-// String file = "C:\\Daten\\MOAPhase2\\Keys\\normal().p12";
-// String password = "";
-
- IAIK.addAsJDK14Provider();
-
- FileInputStream pkcs12FIS = new FileInputStream(file);
- PKCS12 pkcs12 = new PKCS12(pkcs12FIS);
- if (!pkcs12.verify(password.toCharArray()))
- {
- System.out.println("could not PKCS12.verify file " + file + " with password " + password);
- } else
- {
- System.out.println("could PKCS12.verify file " + file + " with password " + password);
- }
-
- pkcs12.decrypt(password.toCharArray());
- System.out.println("could PKCS12.decrypt file " + file + " with password " + password);
-
- KeyBag[] keyBags = pkcs12.getKeyBags();
- System.out.println("PKCS12.getKeyBags(): " + keyBags.length + " KeyBags found");
-
- RSAPrivateKey privKey = (RSAPrivateKey) keyBags[0].getPrivateKey();
- System.out.println("getFriendlyName(): " + keyBags[0].getFriendlyName() );
-
- X509Certificate[] certBag = CertificateBag.getCertificates(pkcs12.getCertificateBags());
- System.out.println("PKCS12.getCertificates(): " + certBag.length + " certificates found");
-
- System.out.println("certBag[0]: " + certBag[0]);
-
- }
-*/
-
- public static void main(String[] args) throws Exception {
- // von Wolfgang Bauer
- iaik.security.provider.IAIK.addAsProvider();
- iaik.security.ecc.provider.ECCProvider.addAsProvider();
-
- final String FILENAME = "sl2002mmdd.ecard.sicher.p12";
- final char[] PASSWORD = "ego".toCharArray();
-// public final static String FILENAME = "sl2002mmdd.ecard.sicher.p12";
-// public final static char[] PASSWORD = "ego".toCharArray();
-
- System.out.println("Checking");
- FileInputStream fis = new FileInputStream(FILENAME);
- PKCS12 p12 = new PKCS12(fis);
- p12.decrypt(PASSWORD);
- CertificateBag[] cb = p12.getCertificateBags();
-
- KeyBag kb = p12.getKeyBag();
- ECPrivateKey pk = (ECPrivateKey) kb.getPrivateKey();
-
- ECPoint p = pk.getParameter().getG();
- p.multiply(pk.getS());
-
- ECPoint p2 = ((ECPublicKey)cb[0].getCertificate().getPublicKey()).getW();
- if (p.equals(p2) ) {
- System.out.println("Check OK");
- } else {
- System.out.println("Nix wars");
- }
- cb[0].getCertificate().verify();
-
- }
-
-
-
-}
-
diff --git a/spss.test/src/testgenerator/VXResponseBean.java b/spss.test/src/testgenerator/VXResponseBean.java
deleted file mode 100644
index bbdf02bbc..000000000
--- a/spss.test/src/testgenerator/VXResponseBean.java
+++ /dev/null
@@ -1,180 +0,0 @@
-
-package testgenerator;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import iaik.asn1.structures.Name;
-import iaik.x509.X509Certificate;
-
-/**
- * @author KNIRSCHS
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class VXResponseBean {
-
- private X509Certificate cert = null;
-
- /**
- * Constructor for VXResponseBean.
- */
- public String getHeader() {
-
- String result =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<VerifyXMLSignatureResponse xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\" >\n" +
- " <SignerInfo>\n" +
- " <dsig:X509Data xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">\n";
-
- return result;
- }
-
- public void init(String Filename) throws Exception {
- if (cert == null) {
- InputStream cfile = getHttpInputStream(Filename);
- cert = new iaik.x509.X509Certificate(cfile);
- }
- }
- public String getCert() throws Exception {
- return " <dsig:X509Certificate>"
- + (cert)
- + "</dsig:X509Certificate>\n";
-
- }
-
-
- public String getSubjectDN() throws Exception {
- return " <dsig:X509SubjectName>"
- + ((Name) cert.getSubjectDN()).getRFC2253String()
- + "</dsig:X509SubjectName>\n";
- }
- public String getIssuerDN() throws Exception {
-
- return " <dsig:X509IssuerName>" +
- ((Name)cert.getIssuerDN()).getRFC2253String() +
- "</dsig:X509IssuerName>\n";
- }
-
- public String getSerialNumber() throws Exception {
-
- return " <dsig:X509SerialNumber>" +
- cert.getSerialNumber() +
- "</dsig:X509SerialNumber>\n";
- }
-
- public String getFooterSignatureCheck(String signatureCheckCode, String certificateCheckCode)
- {
- String res = null;
- res = " </HashInputData>\n" +
- " <SignatureCheck>\n" +
- " <Code>" + signatureCheckCode + "</Code>\n" +
- " </SignatureCheck>\n" +
- " <CertificateCheck>\n" +
- " <Code>"+certificateCheckCode+"</Code>\n" +
- " </CertificateCheck>\n" +
- "</VerifyXMLSignatureResponse>";
-
- return res;
-
- }
- public String getFooterXMLDSIGManifestCheck(String xmlDSIGManifestCheckCode , String certificateCheckCode)
- {
- String res = null;
-/* res = "</XMLContent>\n" +
- " </HashInputData>\n" +
- " <XMLDSIGManifestCheck>\n" +
- " <Code>" + xmlDSIGManifestCheckCode + "</Code>\n" +
- " </XMLDSIGManifestCheck>\n" +
- " <CertificateCheck>\n" +
- " <Code>"+certificateCheckCode+"</Code>\n" +
- " </CertificateCheck>\n" +
- "</VerifyXMLSignatureResponse>";
-*/
- res = " <XMLDSIGManifestCheck>\n" +
- " <Code>" + xmlDSIGManifestCheckCode + "</Code>\n" +
- " </XMLDSIGManifestCheck>\n" +
- " <CertificateCheck>\n" +
- " <Code>"+certificateCheckCode+"</Code>\n" +
- " </CertificateCheck>\n" +
- "</VerifyXMLSignatureResponse>";
-
- return res;
-
- }
-public String createXMLDSIGManifestCheck(String xmlDSIGManifestCheckCode, String failedReference, String referringSigRefData)
- {
-
- if(failedReference != null && !failedReference.trim().equals(""))
- {
- String res = null;
- res = " <XMLDSIGManifestCheck>\n" +
- " <Code>" + xmlDSIGManifestCheckCode + "</Code>\n" +
- " <Info><FailedReference>" + failedReference +
- "</FailedReference><ReferringSigReference>" + referringSigRefData + "</ReferringSigReference>" +
- " </Info>\n" +
- " </XMLDSIGManifestCheck>\n";
-
- return res;
- }
- else
- {
- String res = null;
- res = " <XMLDSIGManifestCheck>\n" +
- " <Code>" + xmlDSIGManifestCheckCode + "</Code>\n" +
- " <Info>" + failedReference +
- " <ReferringSigReference>" + referringSigRefData + "</ReferringSigReference>" +
- " </Info>\n" +
- " </XMLDSIGManifestCheck>\n";
-
- return res;
- }
-
- }
-
-public String createSignatureCheck(String signatureCheckCode)
- {
- String res = null;
- res = " <SignatureCheck>\n" +
- " <Code>" + signatureCheckCode + "</Code>\n" +
- " </SignatureCheck>\n";
- return res;
-
- }
-public String createSignatureManifestCheck(String signatureCheckCode)
- {
- String res = null;
- res = " <SignatureManifestCheck>\n" +
- " <Code>" + signatureCheckCode + "</Code>\n" +
- " </SignatureManifestCheck>\n";
- return res;
-
- }
-
-public String createSignatureManifestCheck(String signatureCheckCode,String info)
- {
- String res = null;
- res = " <SignatureManifestCheck>\n" +
- " <Code>" + signatureCheckCode + "</Code>\n" + info +
- " </SignatureManifestCheck>\n";
- return res;
-
- }
-public String createCertificateCheck(String certificateCheckCode)
- {
- String res = null;
- res = " <CertificateCheck>\n" +
- " <Code>"+certificateCheckCode+"</Code>\n" +
- " </CertificateCheck>\n";
- return res;
- }
-private InputStream getHttpInputStream(String url) throws Exception
- {
-
- return ((HttpURLConnection)new URL(url).openConnection()).getInputStream();
- }
-
-}