aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author(no author) <(no author)@d688527b-c9ab-4aba-bd8d-4036d912da1d>2006-12-18 14:17:02 +0000
committer(no author) <(no author)@d688527b-c9ab-4aba-bd8d-4036d912da1d>2006-12-18 14:17:02 +0000
commitab3d4fc97d673afce126e62be160c2feb4e6e588 (patch)
treebb6202ed8dea76fa5f6276571d1a02e0bea2e6ad
parentc59da16e64580457234159180ced333bbc54fa63 (diff)
downloadmoa-id-spss-tags/Build_ID-1_3_3.tar.gz
moa-id-spss-tags/Build_ID-1_3_3.tar.bz2
moa-id-spss-tags/Build_ID-1_3_3.zip
This commit was manufactured by cvs2svn to create tagtags/Build_ID-1_3_3
'Build_ID-1_3_3'. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/tags/Build_ID-1_3_3@757 d688527b-c9ab-4aba-bd8d-4036d912da1d
-rw-r--r--build/.checkstyle2
-rw-r--r--build/.project17
-rw-r--r--build/README.txt80
-rw-r--r--build/scripts/.cvsignore1
-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/res/resources/schemas/Core-1.2.xsd4
-rw-r--r--common/res/resources/schemas/PersonData_20_en_moaWID.xsd2479
-rw-r--r--id.oa/.classpath6
-rw-r--r--id.oa/.cvsignore1
-rw-r--r--id.oa/.project23
-rw-r--r--id.oa/build.xml32
-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.jsp60
-rw-r--r--id.oa/html/stateful_login.jsp29
-rw-r--r--id.oa/web.xml9
-rw-r--r--id.templates/.project23
-rw-r--r--id.templates/build.xml32
-rw-r--r--id.templates/html/SampleBKUSelectionTemplate.html52
-rw-r--r--id.templates/html/SampleLogo.gifbin24664 -> 0 bytes
-rw-r--r--id.templates/html/SampleTemplate.html59
-rw-r--r--id.templates/html/css/display.css52
-rw-r--r--id.templates/html/css/main.css74
-rw-r--r--id.templates/html/valid-html401.gifbin2328 -> 0 bytes
-rw-r--r--id.templates/web.xml9
-rw-r--r--spss.handbook/.classpath37
-rw-r--r--spss.handbook/.cvsignore1
-rw-r--r--spss.handbook/.project17
-rw-r--r--spss.handbook/clients/api/lib/commons-discovery-0.2/commons-discovery.jarbin71442 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging-api.jarbin26202 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging.jarbin38015 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_Pkcs11Provider.jarbin300017 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_Pkcs11Wrapper.jarbin257497 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_cms.jarbin285185 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_ecc.jarbin85648 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_ixsil.jarbin197591 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_jce_full.jarbin807293 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_moa_full.jarbin699477 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_Pkcs11Provider.jarbin315242 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_ecc.jarbin92898 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_jce_full.jarbin815008 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/iaik-moa-20060316/win32/pkcs11wrapper.dllbin94208 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/jaxen-1.0/jaxen-core.jarbin160967 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/jaxen-1.0/jaxen-dom.jarbin13707 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/jaxen-1.0/saxpath.jarbin23563 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/jaxp-1.2_01/dom.jarbin26710 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/jaxp-1.2_01/jaxp-api.jarbin27052 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/jaxp-1.2_01/sax.jarbin26206 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/log4j-1.2.7/log4j-1.2.7.jarbin350677 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/postgres-jdbc2-7.3/pg73jdbc2.jarbin163980 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/lib/xalan-j-2.5.1/xalan.jarbin2907319 -> 0 bytes
-rw-r--r--spss.handbook/clients/api/signatures/SimpleSignature.xml23
-rw-r--r--spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.java130
-rw-r--r--spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.java147
-rw-r--r--spss.handbook/clients/common/referencedData/Text.b641
-rw-r--r--spss.handbook/clients/common/referencedData/Text.txt1
-rw-r--r--spss.handbook/clients/common/referencedData/WEB-INF/web.xml10
-rw-r--r--spss.handbook/clients/common/referencedData/XMLDocument.Para.xsl19
-rw-r--r--spss.handbook/clients/common/referencedData/XMLDocument.signed.xml27
-rw-r--r--spss.handbook/clients/common/referencedData/XMLDocument.withResolvableSchemaHint.xml6
-rw-r--r--spss.handbook/clients/common/referencedData/XMLDocument.withSchemaHint.xml6
-rw-r--r--spss.handbook/clients/common/referencedData/XMLDocument.xml6
-rw-r--r--spss.handbook/clients/common/referencedData/XMLDocument.xsd15
-rw-r--r--spss.handbook/clients/common/referencedData/XMLDocument.xsl18
-rw-r--r--spss.handbook/clients/common/referencedData/XMLDocumentRef.xsl4
-rw-r--r--spss.handbook/clients/common/referencedData/referencedData.warbin5601 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/conf/http.properties74
-rw-r--r--spss.handbook/clients/webservice/lib/axis-1_1/axis-ant.jarbin385010 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/axis-1_1/axis.jarbin1235721 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/axis-1_1/commons-discovery.jarbin71442 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/axis-1_1/commons-logging-api.jarbin26202 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/axis-1_1/commons-logging.jarbin38015 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/axis-1_1/jaxrpc.jarbin35759 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/axis-1_1/log4j-1.2.8.jarbin352668 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/axis-1_1/saaj.jarbin18501 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/axis-1_1/wsdl4j.jarbin113853 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jcert.jarbin11321 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jnet.jarbin5830 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jsse.jarbin512635 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xercesImpl.jarbin895924 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xmlParserAPIs.jarbin123705 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml31
-rw-r--r--spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml137
-rw-r--r--spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml23
-rw-r--r--spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml19
-rw-r--r--spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml29
-rw-r--r--spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml40
-rw-r--r--spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml39
-rw-r--r--spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml52
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml29
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml44
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml29
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml39
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml28
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml10
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml24
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml50
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml23
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml30
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml23
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.response.xml23
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml62
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml23
-rw-r--r--spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml31
-rw-r--r--spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml27
-rw-r--r--spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml25
-rw-r--r--spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml29
-rw-r--r--spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml30
-rw-r--r--spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml23
-rw-r--r--spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml18
-rw-r--r--spss.handbook/clients/webservice/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt8
-rw-r--r--spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1.derbin882 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12bin3926 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystorebin943 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2.derbin882 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12bin3926 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystorebin943 -> 0 bytes
-rw-r--r--spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.java204
-rw-r--r--spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.java122
-rw-r--r--spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java125
-rw-r--r--spss.handbook/conf/moa-spss/certstore/032F2123890A879585CE96674CA4C37B55986729/E1201A308CC10323C27D9084B048996E44B8F710bin806 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/04462EF01783744F9F4CDE3705FD86D488697C9F/D44EED7580C7792242D73E267A89C7DB25E4BD08bin1314 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/083E1A0528C48475951A6610360D813E2713DCC7/7E691392F741B7E4B4AA9A76D75851BDE18BE5A7bin864 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/0889EBEC55D9E34E782E6D3C250840EB932EEA2F/9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726bin1383 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/0F843FB1E0C626540BE638B79A2987E2611CE630bin1018 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/69F21C82DC9A7A940ACEC414593E59C9E61E522Fbin990 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/FC72939DC06EDDF8C51549ECF00AC92BF2B39F35bin1087 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/0FE419AB943E7E5C6A7190CC6BBE8E3F914C658A/FB356CEF4406D1F135E3FC59026B338D3F518F9Abin886 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D/E7340D1FB627D8917A9C0D23F21515C441BF1214bin1292 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/125E4AC6B38C1E0BF34BF7D927CBB947E35141E8/2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7Dbin820 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/1607988A938D3D339F40AFB567384BC5B7540935/9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2bin1151 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/1A283D1183DB82A548427B4F19E99E7A8EA728D7/49969819654C230ECDF779ABB9629A211FCC43D6bin1353 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/1BF3C1D2767F5C333AD5531531FEE3A712935B73/D0AF386E182F00983637F97C0A5F4708F9F641A7bin1157 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/20DD04B052D2D364E5FF851A3FD314F0FD91253E/6814C7316CEA7191C9CB3BE58199B4A957210D9Cbin704 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/22973CFC20EA68162A0B2E837D45FB8266ACDBCF/C529469053D9F95810A8F7F2DB9A6596A7655732bin913 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/238ACC1D03DA5A2E7E580D760FB3EE218FDC5A97/D3C063F219ED073E34AD5D750B327629FFD59AF2bin979 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/1C43C0BA36CC8DE659180B2FAC9A6F54430D5941bin991 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/AC36A78C66FEC87CC0FD2C32B49214C65676E0C5bin919 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/C92238A7178A6C61F8BACA22D6CF7E50772BA9F0bin1018 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/DFAE695342AC81A521025904406884399822B233bin987 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/2962CDAADFA0BF8EE53B80870C53E551A43EA72A/12B06E039F1A36D8238AFC508009E1ADF88BF66Fbin1253 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/2C976220B378E08DF5E68CBC54C05CE41224FD29/0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38bin704 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/2F5DA022AAFF668F34C35A80049D690F3CFE3040/D62327E6B19B7968A8BE6588DEAB0BC0DB684D8Dbin914 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/31B5BA02D476873C5220CDCFA0C095C4A31DEFDF/88D6151358A5E3C81D7AE1A536121DC03011BC03bin1205 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/3314CE3E42175EACC28D57C35F192430BBADAC1A/B1D0BC027906A3B7E7518C93ACB26D978233ED27bin1171 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/337F895A0435AA7E2629C5282B5A0DBBE19EE1C7/75F792DE2CF544007F470F1B924961C2BD2EF517bin802 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/3A095C38EB5D5824FE61BE43F9CDF6515DC94805/65698A39E03FF00FD552D4AD99FB290C2B9D4BEAbin1018 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8Fbin861 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AEbin865 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733bin864 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6bin860 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/3B76D7A5CE7EC6022D7990CFEA534C908717DF54/C0C699EFE6E837CB5E4CFC3A61077617A22C1A9Ebin1298 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/3C627C9D89A5BFB5E4E385982DF33B7E7F6E8D2D/C5AC86EC5B771BEBDF8B6E040F109A1186E229B9bin1234 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/3C7CE93947421CB66603DC7DBAB0F04C4788382F/23E594945195F2414803B4D564D2A3A3F5D88B8Cbin791 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/4224231A54F64581FBA2AB6ED82ADE467F144BDC/65EF37033859C2F709A64086D3A5BD1B8F1A85A4bin1045 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/45E2F3F807C6EAB9EDC1B3250F7558CA12A063DE/3A77E9B577661D99F9BBA5A352B29C7FF58A3D26bin914 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/47ED4C584F9DCD54A6C2925252C5603ADAC93F49/84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923Ebin1747 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/487F4DEE9E63DADEB4CAAB07E0E166ACC9F584B6/9891BBEA9FDA665EEEC31C403A00A5CA5628D0FAbin1391 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/52B42552A440A54C21A39D46D7F176AF28BEB5AA/51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4bin1130 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/550E9627E9094A2D1BB6385821334D02122BCF26/B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0Fbin1188 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830bin1141 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/58090A698038FEDAD56B4B976F23C29950D1D5A5/6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25Bbin1159 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/59484253C7D4C5BEAB7D2BABFAC13DDD1CA53FCC/341EA32E448659125A67DD04177FD17468FCFCB1bin1366 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CDbin825 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/6144BFC0CBE85C63DEFB6F208D80385B89F68046/D031945D982820B92FADBC7F71F6D1D9DFFDA2C9bin1213 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2Bbin901 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/6F86F897C45679B45F03C67D44B6447EFF43B758/53CB69CF933C2D28FB9DF91F2852A99EC3352EA0bin1546 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/728C819D737EE42627F96F839C33BB6E68E85F68/00845B74CA13FE0A9056E6C0B5126FECF73B0D8Cbin740 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/474BC41135FB88BF58B5A8D976A1D5583378D85Ebin1133 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01bin1171 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/76011AE57123CC4E476C094C48C461DC37A0DEDD/FDC348410699803DE7D8276813BC2232EA99A878bin835 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/7A9DC855647136050A8D75D6571AC64739F36C6C/BF648929E7DAABD8D97B3202F48D6C4A19C78F6Cbin990 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/88D9F0C0EBB72C58516EC96AEED397FA86B40E39/6DCD5118D1542E6C205C580775C5420B7509506Bbin1076 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/3B8484BF1370941BF03F206B5C4958DA4E1559BBbin1065 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/C0EF3E7A54B4C501295F77974B1995E36B25C92Bbin1066 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/8FDB1CB752D82C88C89F9E9DA7AD2F54C6FA6F3B/842B3870A64001CDD90978D0E554DAF94D9ABDFEbin947 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/679A4F81FC705DDEC419778DD2EBD875F4C242C6bin975 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/91C4DD783D6D38F0325FE74930BF61F656364EA9/53A6B611F8CEE0315BCCE5D59898931ED390E400bin761 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/45B43346251FDF9E95DCB7F36928785D46D63913bin1136 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/E33619C88426E4FE956041E6751ADDEC9C10F0BCbin1136 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/975729FFAF7EB667BCF68E9B886EA876E44F46D0/35202B14F69409EAA51CD8AB547AC0CD5E993F3Fbin1053 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6bin1030 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/9D4CB7E3DBF24AE596972D59C375DD6384BB5E8Bbin932 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/A562C4B99E2847251CB4A1F05DA1FF43E7296F0Bbin999 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8Cbin997 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9F0E0FBB25F66FF88C8E033EFF358923C84A2926bin930 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/C87D1855227D995C332C4C9072A2E2053F2CC623bin1028 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/42AD1897A4643D2AA634D980F16349E6694F3B1Bbin1237 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/FE7891B6ED7B178F528A28B21478299F865889BDbin1333 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/A15B5DBE14A19CF859F48E2DA2A29A4C3DB4D680/3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02Bbin1201 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/8784ED81F5A22779EB0B081945FD151992557FBEbin1159 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/20CAECDCA766243AAD6FA1327618FC81BA65DC0Fbin1057 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/96D5D179016A5A6546973BA63733617EE1F1540Dbin1058 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7Abin1110 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/E619D25B380B7B13FDA33E8A58CD82D8A88E0515bin1111 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92bin1110 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/AAB27F0E98B28AF253454415F6490CB5F43A4B49/A9D28607928FA8615E2615CC9D71B535C5D0D419bin734 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/AC1B67D7D5A300767C0944ACE8458DD49960F1BD/4D523730501ADB80A76B0B473A4D21C7D86F8374bin1167 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/B310CEED301C503EDB15720F94D5D7E76BF423DA/AA94FD422AEB8F5B6E8508314CE0DC68BCD53305bin1339 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/B3EB7B59ECFF1E25E16C64BB24993D1B20DCFC28/07A6DEED70213CCF598F278789680DA4C04A0331bin1266 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/BAA9ADD095E87E0B490B6DD933AA2F450C6B9492/7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2bin920 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/BE47A5DA41A35F740D98305DA8FF4096B71492BE/D1474E7D99512D05B98DD37B3FE86496A03D088Dbin922 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/BED4C70D83B5042F4254459064FDEACD43DD1EDF/7BE0C8E441786C69A3CB35BDBEF235F8B5310E04bin700 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/C15FFFE6EFAD484909C9EFC6CD5C20435E326685/DDBAE68B1FF60FFBB2854C78727B76C95EC83BBEbin823 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/C2A7CAE9E68EB7945828D193CB22CDD246BC7F95/6955D95F6B0799F7D96F4FC28E6E6C64758C1240bin1224 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/C52E4A04A22D98C70E19F1969AD71C838E4371B3/F96FE4F59166EFA9000B21A16EF22CF14468890Cbin944 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/C7E1D3604D2A960201D70F29B8A80EDA11475EEB/C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3EDbin406 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/C976280EC7FECF169577E31D8CA0BB00967904B1/7666A8BD2C2513DE489C06D08D566F177ECE84AAbin1260 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/CABD2EA6CA438084840DCCAE875F341E2D3A2C43/02A0E6456442E35198532ACFFB6FEE3B606D9FA3bin1366 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/8AB0A3519AFA7F3C04074522678BAA1CB3DC734Fbin930 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/DF47B3040E7632614464BD2EC4ECD1B8030F53E3bin933 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/E117479B4A41D7F3223FCAE50560B0D57B22217Dbin997 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/D4D40BD33958CD9169A7AB6304AA2BBAD22DC595/07976A2A16EC182670161B46886B05E1FEAC16B1bin1209 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/D708C897515970D33EF7CD0C2474449D3AB6AA83/52ED0FAFBD38A868C678174D7EB03D266ADB221Cbin994 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/DD29E76659D18371B78E61E7DF4D4B8FEDCAF8E7/8BA5C0847597612C7E16970EAE55EF58D32E9CF3bin1202 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/27337257493B86B9BFF78D569F938D692A430EAEbin1218 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/4832F0A28C3724A92F6CB3314F747D0E74FC7344bin1217 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/E6A4C843059A6043B4DC967F9EF892B695990777/B4B77C83465979E3679E3A33F972F48EE3730A18bin924 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/EA7E6D37E678C1BCA5060F97DAF09F559DFD04B7/3AAD23B00CA10E54E6368DF7952E3F4B5108B65Cbin606 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/EEE6351C5C6EBD8644AB88E7648D44FA07C72A80/14E59C02A6877B0EBD2C4203886BA25959C1D267bin1020 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/F1B84756A1EAB09C171B2783DD163B42A9BD0BBB/ED5608CE67EA5CB79AC024CEA7445F9BCBE48703bin1067 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/F3DA7C495789E656FA27E611CCAFA05F232ADEA0/F3AE9FEA4DECEE5330770A2520BD86909929E7BEbin758 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/F48B57F89BACD8687EBB12223A5B8E5EF3774583/CAF84A42305615AC2C582F6412BDA3E36DAC3D25bin786 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/F613568C1D7A1300B32609998288211959DBDFB0/D7EDAF7381F7FC93B4C28FA372190D7A59CFA696bin660 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/certstore/F7D331850EC13D22284909E0FC3493A65FFA7F30/EC988340526163D5B7AC80481B2AC76828EDDC6Cbin1157 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.derbin1020 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden[pwd=allekunden].p12bin3716 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.derbin920 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1[pwd=kunde1].p12bin3932 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.derbin1200 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2[pwd=kunde2].p12bin3908 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/log4j.properties37
-rw-r--r--spss.handbook/conf/moa-spss/sp.minimum.config.xml44
-rw-r--r--spss.handbook/conf/moa-spss/spss.config.xml149
-rw-r--r--spss.handbook/conf/moa-spss/ss.minimum.config.xml34
-rw-r--r--spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server.derbin877 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server[pwd=server].p12bin3808 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystorebin5200 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystorebin1003 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cerbin864 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20041201-20141201.SerNoe242.cerbin865 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cerbin979 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cerbin860 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cerbin864 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cerbin861 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.TrustSignTest-Enc-01.20011206-20041206.SerNo0450[CertifiedKeypair].cerbin1018 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20021120-20051120.SerNo16f8[CertifiedKeypair].cerbin1136 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20030903-20060903.SerNo4848[CertifiedKeypair].cerbin1136 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.derbin1747 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Stabsstelle.TestCA-Verschluesselung-Buerger.20040518-20100101.SerNo0004[CertifiedKeypair].der22
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cerbin1076 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cerbin1141 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cerbin864 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20041201-20141201.SerNoe242.cerbin865 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cerbin979 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cerbin860 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cerbin864 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cerbin861 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.derbin1747 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646.cerbin1076 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cerbin1141 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cerbin1205 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Test_Signaturdient_Personenbindung.20030822-20060822.SerNo0002.cerbin825 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/A-Trust_OCSP_Responder_03.20051205-20081205.SerNo01b588.derbin1201 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/MOA-Test-CA-Signaturdienste.cerbin835 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-01.cerbin1065 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-01a.cerbin1066 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-02.cerbin1167 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cerbin1205 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink/A-Trust_OCSP_Responder_03.20051205-20081205.SerNo01b588.derbin1201 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-01.cerbin1065 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-01a.cerbin1066 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-02.cerbin1167 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-01.20041201-20141201.SerNoE243.cerbin1111 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-02.20041203-20141203.SerNoE248.cerbin975 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cerbin901 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cerbin901 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cerbin1110 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cerbin1110 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.TrustSignTest-Sig-01.20011206-20041206.SerNo0588[SecureSignatureKeypair].cerbin1151 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20021120-20051120.SerNo16f9[SecureSignatureKeypair].cerbin1171 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20030903-20060903.SerNo484a[SecureSignatureKeypair].cerbin1133 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.derbin1747 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Stabsstelle.TestCA_Signatur_Buerger.20040518-20100101.SerNo0003[CertifiedKeypair].derbin914 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cerbin1076 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cerbin1141 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-01.20041201-20141201.SerNoE243[SecureSignatureKeypair].cerbin1111 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-02.20041203-20141203.SerNoE248[SecureSignatureKeypair].cerbin975 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cerbin901 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cerbin901 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cerbin1110 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cerbin1110 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-01.20041201-20141201.SerNoE243.cerbin1111 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-02.20041203-20141203.SerNoE248.cerbin975 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cerbin901 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cerbin901 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cerbin1110 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cerbin1110 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.derbin1747 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cerbin1076 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cerbin1141 -> 0 bytes
-rw-r--r--spss.handbook/conf/moa-spss/trustProfiles/test/signaturdienst.derbin914 -> 0 bytes
-rw-r--r--spss.handbook/handbook.html6
-rw-r--r--spss.handbook/handbook/common/LogoBKA.pngbin8062 -> 0 bytes
-rw-r--r--spss.handbook/handbook/common/LogoMoa4c.3148x3545.jpgbin1584855 -> 0 bytes
-rw-r--r--spss.handbook/handbook/common/LogoMoa4c.jpgbin45624 -> 0 bytes
-rw-r--r--spss.handbook/handbook/common/LogoMoaBw.jpgbin41375 -> 0 bytes
-rw-r--r--spss.handbook/handbook/common/MOA.css300
-rw-r--r--spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd254
-rw-r--r--spss.handbook/handbook/config/config.html1014
-rw-r--r--spss.handbook/handbook/faq/faq.html126
-rw-r--r--spss.handbook/handbook/index.html34
-rw-r--r--spss.handbook/handbook/install/install.html486
-rw-r--r--spss.handbook/handbook/intro/intro.html44
-rw-r--r--spss.handbook/handbook/spec/MOA-SPSS-1.3.pdfbin146062 -> 0 bytes
-rw-r--r--spss.handbook/handbook/spec/MOA-SPSS-1.3.wsdl105
-rw-r--r--spss.handbook/handbook/spec/MOA-SPSS-1.3.xsd469
-rw-r--r--spss.handbook/handbook/usage/usage.html1236
-rw-r--r--spss.iaiklibsupdate/.cvsignore1
-rw-r--r--spss.iaiklibsupdate/.project11
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/INSTALL2
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/KEYS310
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/LICENSE203
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/LICENSE.dom71
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/LICENSE.sax20
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/LICENSE.xerces56
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/NOTICE15
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/README70
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/TODO9
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/ant299
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/ant.bat126
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/ant.cmd92
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/antRun26
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/antRun.bat47
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/antRun.pl65
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/antenv.cmd99
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/complete-ant-cmd.pl113
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/envset.cmd130
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/lcp.bat30
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/runant.pl152
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/runant.py100
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/bin/runrc.cmd59
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/lib/README14
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/lib/ant-launcher.jarbin9180 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/lib/ant.jarbin1034049 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/lib/xercesImpl.jarbin1010675 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/ant.1-6-5/lib/xml-apis.jarbin124724 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/build.bat18
-rw-r--r--spss.iaiklibsupdate/build.xml37
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/iaik_Pkcs11Provider.jarbin300522 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/iaik_Pkcs11Wrapper.jarbin257497 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/iaik_cms.jarbin285634 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/iaik_ecc.jarbin85649 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/iaik_ixsil.jarbin197953 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/iaik_jce_full.jarbin709944 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/iaik_moa_full.jarbin699231 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_Pkcs11Provider_signed.jarbin315751 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_ecc_signed.jarbin92897 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_jce_full_signed.jarbin713929 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.eval/win32/pkcs11wrapper.dllbin94208 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/iaik_Pkcs11Provider.jarbin300017 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/iaik_Pkcs11Wrapper.jarbin257497 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/iaik_cms.jarbin285185 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/iaik_ecc.jarbin85648 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/iaik_ixsil.jarbin197591 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/iaik_jce_full.jarbin807293 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/iaik_moa_full.jarbin699477 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_Pkcs11Provider.jarbin315242 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_ecc.jarbin92898 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_jce_full.jarbin815008 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/iaiklibs.prod/win32/pkcs11wrapper.dllbin94208 -> 0 bytes
-rw-r--r--spss.iaiklibsupdate/readme.eval.txt166
-rw-r--r--spss.iaiklibsupdate/readme.prod.txt159
-rw-r--r--spss.iaiklibsupdate/setEnvironment.bat25
-rw-r--r--spss.iaiklibsupdate/update.eval.bat39
-rw-r--r--spss.iaiklibsupdate/update.prod.bat39
-rw-r--r--spss.iaiklibsupdate/update.xml84
-rw-r--r--spss.server/.checkstyle8
-rw-r--r--spss.server/.cvsignore4
-rw-r--r--spss.server/.project19
-rw-r--r--spss.server/.tomcatplugin8
-rw-r--r--spss.server/build.xml460
-rw-r--r--spss.server/data/deploy/tomcat/server.mod_jk.xml166
-rw-r--r--spss.server/data/deploy/tomcat/server.xml169
-rw-r--r--spss.server/data/deploy/tomcat/unix/moa-env.sh12
-rw-r--r--spss.server/data/deploy/tomcat/uriworkermap.properties4
-rw-r--r--spss.server/data/deploy/tomcat/win32/startTomcat.bat27
-rw-r--r--spss.server/data/deploy/tomcat/win32/stopTomcat.bat13
-rw-r--r--spss.server/data/deploy/tomcat/workers.properties6
-rw-r--r--spss.server/data/deploy/tools/certtool.bat25
-rw-r--r--spss.server/data/deploy/tools/certtool.sh20
-rw-r--r--spss.server/data/deploy/tools/configtool.bat25
-rw-r--r--spss.server/data/deploy/tools/configtool.sh20
-rw-r--r--spss.server/history.txt241
-rw-r--r--spss.server/lib/axis-1.0/axis.jarbin1101593 -> 0 bytes
-rw-r--r--spss.server/lib/axis-1.0/jaxrpc.jarbin35635 -> 0 bytes
-rw-r--r--spss.server/lib/axis-1.0/saaj.jarbin18463 -> 0 bytes
-rw-r--r--spss.server/lib/axis-1.0/wsdl4j.jarbin109356 -> 0 bytes
-rw-r--r--spss.server/lib/commons-discovery-0.2/commons-discovery.jarbin71442 -> 0 bytes
-rw-r--r--spss.server/lib/commons-logging-1.0.4/commons-logging-api.jarbin26202 -> 0 bytes
-rw-r--r--spss.server/lib/commons-logging-1.0.4/commons-logging.jarbin38015 -> 0 bytes
-rw-r--r--spss.server/lib/iDoclet-1.0/iDoclet.jarbin103752 -> 0 bytes
-rw-r--r--spss.server/lib/jaxen-1.0/jaxen-core.jarbin160967 -> 0 bytes
-rw-r--r--spss.server/lib/jaxen-1.0/jaxen-dom.jarbin13707 -> 0 bytes
-rw-r--r--spss.server/lib/jaxen-1.0/saxpath.jarbin23563 -> 0 bytes
-rw-r--r--spss.server/lib/jaxp-1.2_01/dom.jarbin26710 -> 0 bytes
-rw-r--r--spss.server/lib/jaxp-1.2_01/jaxp-api.jarbin27052 -> 0 bytes
-rw-r--r--spss.server/lib/jaxp-1.2_01/sax.jarbin26206 -> 0 bytes
-rw-r--r--spss.server/lib/jsse-1.0.3_03/jcert.jarbin11489 -> 0 bytes
-rw-r--r--spss.server/lib/jsse-1.0.3_03/jnet.jarbin5994 -> 0 bytes
-rw-r--r--spss.server/lib/jsse-1.0.3_03/jsse.jarbin514467 -> 0 bytes
-rw-r--r--spss.server/lib/junit-3.8.1/junit.jarbin121070 -> 0 bytes
-rw-r--r--spss.server/lib/log4j-1.2.7/log4j-1.2.7.jarbin350677 -> 0 bytes
-rw-r--r--spss.server/lib/postgres-jdbc2-7.3/pg73jdbc2.jarbin163980 -> 0 bytes
-rw-r--r--spss.server/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zipbin31362 -> 0 bytes
-rw-r--r--spss.server/lib/xalan-j-2.5.1/xalan.jarbin2907319 -> 0 bytes
-rw-r--r--spss.server/lib/xerces-j-2.4.0/xercesImpl.jarbin895924 -> 0 bytes
-rw-r--r--spss.server/lib/xerces-j-2.4.0/xmlParserAPIs.jarbin123705 -> 0 bytes
-rw-r--r--spss.server/licenses/Apache-2.0.txt202
-rw-r--r--spss.server/licenses/IAIK-License.txt13
-rw-r--r--spss.server/licenses/Jaxen.txt40
-rw-r--r--spss.server/licenses/PostgreSQL-JDBC.txt26
-rw-r--r--spss.server/manifest.template6
-rw-r--r--spss.server/readme.inst.txt56
-rw-r--r--spss.server/readme.src.txt77
-rw-r--r--spss.server/readme.update.txt137
-rw-r--r--spss.server/res/resources/properties/spss_messages_de.properties147
-rw-r--r--spss.server/res/resources/security/cacertsbin7365 -> 0 bytes
-rw-r--r--spss.server/res/resources/tools/ConfigurationMapper.xsl343
-rw-r--r--spss.server/res/resources/wsdl/MOA-SPSS-1.3.wsdl105
-rw-r--r--spss.server/res/resources/wsdl/MOA-SPSS-1.3.xsd469
-rw-r--r--spss.server/res/test/resources/config/log4j.properties10
-rw-r--r--spss.server/res/test/resources/config/moa.sp.noopts-config.xml32
-rw-r--r--spss.server/res/test/resources/config/moa.spss.complete-config.xml185
-rw-r--r--spss.server/res/test/resources/config/moa.ss.noopts-config.xml31
-rw-r--r--spss.server/res/test/resources/config/profiles/csep/CSEP_1.xml4
-rw-r--r--spss.server/res/test/resources/config/profiles/ctip/CTIP_1.xml8
-rw-r--r--spss.server/res/test/resources/config/profiles/ctip/CTIP_2.xml8
-rw-r--r--spss.server/res/test/resources/config/profiles/sp/SP_1.xml4
-rw-r--r--spss.server/res/test/resources/config/profiles/vtip/VTIP_1.xml2
-rw-r--r--spss.server/res/test/resources/config/swk/SWK1_FileName.txt0
-rw-r--r--spss.server/res/test/resources/config/swk/SWK2_FileName.txt0
-rw-r--r--spss.server/server-config.wsdd52
-rw-r--r--spss.server/spec/MOA-SPSS-1.3.docbin559616 -> 0 bytes
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/MOAApplicationException.java41
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/MOAException.java164
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/MOARuntimeException.java163
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/MOASystemException.java40
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/Configurator.java60
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java1012
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/SignatureCreationService.java57
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java69
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContent.java28
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentExcplicit.java19
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentReference.java17
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSDataObject.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java52
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponse.java21
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java32
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/Base64Transform.java13
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java17
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/CheckResult.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java47
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentBinary.java21
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java17
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentReference.java11
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentXML.java19
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/ElementSelector.java28
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/EnvelopedSignatureTransform.java15
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java27
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/InputData.java47
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java37
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/SignerInfo.java43
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/Transform.java16
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/X509IssuerSerial.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter.java38
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter2Transform.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathTransform.java30
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/common/XSLTTransform.java23
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/Base64TransformImpl.java22
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentExplicitImpl.java40
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentReferenceImpl.java38
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java46
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CanonicalizationTransformImpl.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CheckResultImpl.java52
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java40
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentImpl.java28
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java44
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentReferenceImpl.java24
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentXMLImpl.java40
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java66
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileIDImpl.java39
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureInfoImpl.java50
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureLocationImpl.java31
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoImpl.java51
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileExplicitImpl.java62
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileIDImpl.java38
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java53
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureResponseImpl.java37
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/DataObjectInfoImpl.java79
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ElementSelectorImpl.java47
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/EnvelopedSignatureTransformImpl.java22
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ErrorResponseImpl.java52
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ExclusiveCanonicalizationTransformImpl.java48
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataBinaryImpl.java99
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataXMLImpl.java99
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultImpl.java44
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultInfoImpl.java32
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java75
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferenceInfoImpl.java38
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultImpl.java46
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultInfoImpl.java46
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java568
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureEnvironmentResponseImpl.java41
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureManifestCheckParamsImpl.java52
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignerInfoImpl.java81
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/SingleSignatureInfoImpl.java49
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileExplicitImpl.java39
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileIDImpl.java37
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformImpl.java26
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterBinaryImpl.java42
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterImpl.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterURIImpl.java24
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformPatameterHashImpl.java54
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java93
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java62
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSinatureResponseImpl.java37
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureInfoImpl.java47
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureLocationImpl.java15
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java36
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileExplicitImpl.java61
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileIDImpl.java38
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java113
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java141
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/X509IssuerSerialImpl.java45
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/XMLDataObjectAssociationImpl.java45
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilter2TransformImpl.java43
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilterImpl.java64
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathTransformImpl.java59
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/impl/XSLTransformImpl.java37
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java288
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java119
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java285
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java157
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java206
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java246
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java169
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java101
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java275
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java310
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfile.java30
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileExplicit.java30
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileID.java20
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureInfo.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureLocation.java23
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfo.java27
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfile.java28
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileExplicit.java26
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileID.java18
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureRequest.java26
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponse.java20
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponseElement.java29
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/DataObjectInfo.java48
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/ErrorResponse.java24
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SignatureEnvironmentResponse.java20
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SingleSignatureInfo.java32
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResult.java24
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResultInfo.java19
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferenceInfo.java19
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResult.java23
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResultInfo.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SignatureManifestCheckParams.java26
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfile.java28
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileExplicit.java19
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileID.java18
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameter.java40
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterBinary.java21
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterHash.java26
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterURI.java12
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureInfo.java27
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureLocation.java13
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfile.java28
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileExplicit.java25
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileID.java18
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java55
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java60
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/overview.htm155
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java165
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java34
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java1239
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java689
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/DistributionPoint.java38
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareCryptoModule.java60
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareKeyModule.java59
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/IssuerAndSerial.java115
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroup.java69
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroupEntry.java106
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyModule.java41
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/OCSPDistributionPoint.java33
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/SoftwareKeyModule.java48
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/config/TrustProfile.java58
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java37
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractKeyModuleConfigurationImpl.java36
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractObservableConfiguration.java48
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java97
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java67
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java50
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImpl.java121
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java33
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DirectoryCertStoreParametersImpl.java81
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareCryptoModuleConfigurationImpl.java51
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareKeyModuleConfigurationImpl.java55
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java173
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java34
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java80
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java53
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java75
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ValidationConfigurationImpl.java56
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java116
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/pathvalidation/ValidationProfileImpl.java107
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/revocation/RevocationProfileImpl.java64
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java135
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/Base64TransformationImpl.java43
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteArrayDataObjectImpl.java54
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteStreamDataObjectImpl.java49
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/CanonicalizationImpl.java43
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/DataObjectImpl.java87
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/EnvelopedSignatureTransformationImpl.java42
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java76
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/SigningTimeImpl.java34
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/TransformationImpl.java43
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLDataObjectImpl.java46
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLNodeListDataObjectImpl.java47
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLSignatureImpl.java43
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2FilterImpl.java116
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2TransformationImpl.java82
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPathTransformationImpl.java98
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java168
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/DataObjectTreatmentImpl.java150
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java279
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureInsertionLocationImpl.java45
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlverify/XMLSignatureVerificationProfileImpl.java131
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java42
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java122
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java221
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java61
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CreateXMLSignatureResponseBuilder.java71
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java892
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ExternalURIResolver.java127
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java267
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java63
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ProfileMapper.java249
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java51
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureCreationServiceImpl.java45
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureVerificationServiceImpl.java72
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/TransformationFactory.java258
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java86
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java437
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java545
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java455
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java675
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationProfileFactory.java144
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLog.java126
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java42
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java54
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/logging/TransactionId.java38
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java253
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java120
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java78
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java72
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java97
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java140
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/tools/CertTool.java242
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java59
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java90
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContextManager.java62
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionIDGenerator.java51
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/util/IdGenerator.java61
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/util/MessageProvider.java65
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/AllTests.java40
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/SPSSTestCase.java82
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java24
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java71
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java113
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java61
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java81
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/config/AllTests.java20
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java377
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java225
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java166
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java149
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java36
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java25
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java63
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java180
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java201
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java63
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java61
-rw-r--r--spss.server/src/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java50
-rw-r--r--spss.server/web.xml55
-rw-r--r--spss.slinterface/.classpath20
-rw-r--r--spss.slinterface/.project28
-rw-r--r--spss.slinterface/WEB-INF/web.xml99
-rw-r--r--spss.slinterface/build.xml201
-rw-r--r--spss.slinterface/conf/log4j/log4j.properties25
-rw-r--r--spss.slinterface/conf/moa-sl/moa-sl.properties59
-rw-r--r--spss.slinterface/conf/moa-spss/spss.config.fragment7
-rw-r--r--spss.slinterface/conf/moa-spss/trustprofiles/moa-sl-test/isolde.buergerin.derbin987 -> 0 bytes
-rw-r--r--spss.slinterface/conf/tomcat/server.xml147
-rw-r--r--spss.slinterface/conf/tomcat/unix/moa-env.sh16
-rw-r--r--spss.slinterface/conf/tomcat/win32/starttomcat.bat45
-rw-r--r--spss.slinterface/conf/tomcat/win32/stoptomcat.bat24
-rw-r--r--spss.slinterface/handbook/common/LogoBKA.pngbin8062 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/common/LogoMoa4c.jpgbin45624 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/common/LogoMoaBw.jpgbin41375 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/common/MOA.css300
-rw-r--r--spss.slinterface/handbook/constraints.txt6
-rw-r--r--spss.slinterface/handbook/index.html41
-rw-r--r--spss.slinterface/handbook/operation/images/testapp.screen1.pngbin38150 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/operation/images/testapp.screen2.pngbin44749 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/operation/images/testapp.screen3.pngbin16625 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/operation/images/testapp.screen4.pngbin40110 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/operation/operation.html1351
-rw-r--r--spss.slinterface/handbook/system/images/Zusammenspiel.VSDbin138240 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/system/images/Zusammenspiel.mit.pngbin48649 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/system/images/Zusammenspiel.ohne.pngbin36106 -> 0 bytes
-rw-r--r--spss.slinterface/handbook/system/system.html512
-rw-r--r--spss.slinterface/lib/axis-1.0/axis-ant.jarbin385010 -> 0 bytes
-rw-r--r--spss.slinterface/lib/axis-1.0/axis.jarbin1235721 -> 0 bytes
-rw-r--r--spss.slinterface/lib/axis-1.0/jaxrpc.jarbin35759 -> 0 bytes
-rw-r--r--spss.slinterface/lib/axis-1.0/saaj.jarbin18501 -> 0 bytes
-rw-r--r--spss.slinterface/lib/axis-1.0/wsdl4j.jarbin113853 -> 0 bytes
-rw-r--r--spss.slinterface/lib/commons-discovery-0.2/commons-discovery.jarbin71442 -> 0 bytes
-rw-r--r--spss.slinterface/lib/commons-fileupload-1.0/commons-fileupload-1.0.jarbin22379 -> 0 bytes
-rw-r--r--spss.slinterface/lib/commons-logging-1.0.4/commons-logging.jarbin31605 -> 0 bytes
-rw-r--r--spss.slinterface/lib/log4j-1.2.7/log4j-1.2.7.jarbin350677 -> 0 bytes
-rw-r--r--spss.slinterface/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zipbin31362 -> 0 bytes
-rw-r--r--spss.slinterface/lib/xalan-2.5.1/xalan.jarbin2907319 -> 0 bytes
-rw-r--r--spss.slinterface/lib/xerces-2.6.2/xercesImpl.jarbin1010806 -> 0 bytes
-rw-r--r--spss.slinterface/lib/xerces-2.6.2/xmlParserAPIs.jarbin124724 -> 0 bytes
-rw-r--r--spss.slinterface/pages/images/LogoMoa4c.pngbin8222 -> 0 bytes
-rw-r--r--spss.slinterface/pages/resultOverview.jsp270
-rw-r--r--spss.slinterface/pages/test/bildspeicher/bild2.jpgbin634 -> 0 bytes
-rw-r--r--spss.slinterface/pages/test/dataURL.jsp44
-rw-r--r--spss.slinterface/pages/test/forms/verify.default.jsp99
-rw-r--r--spss.slinterface/pages/test/forms/verify.slxhtml.jsp99
-rw-r--r--spss.slinterface/pages/test/stylesheet.xsl29
-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.3.xsd469
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd388
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd253
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd173
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-attribs-1.xsd47
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkphras-1.xsd161
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkpres-1.xsd42
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkstruct-1.xsd57
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-charent-1.xsd41
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-copyright-1.xsd26
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-datatypes-1.xsd147
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-framework-1.xsd80
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-image-1.xsd49
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlphras-1.xsd226
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstruct-1.xsd53
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstyle-1.xsd27
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-list-1.xsd128
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-notations-1.xsd99
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-struct-1.xsd103
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-style-1.xsd51
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-table-1.xsd323
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-text-1.xsd70
-rw-r--r--spss.slinterface/res/resources/schemas/slxhtml-1.0/xml.xsd81
-rw-r--r--spss.slinterface/res/resources/schemas/xml.xsd81
-rw-r--r--spss.slinterface/res/resources/schemas/xmldsig-core-schema.xsd322
-rw-r--r--spss.slinterface/res/resources/stylesheets/moa2sl.xsl96
-rw-r--r--spss.slinterface/res/resources/stylesheets/sl2moa.xsl218
-rw-r--r--spss.slinterface/res/resources/test/simpleVerReq.moa.xml29
-rw-r--r--spss.slinterface/res/resources/test/simpleVerReq.sl11.xml100
-rw-r--r--spss.slinterface/res/resources/test/simpleVerReq.sl12.locref.moa.xml1
-rw-r--r--spss.slinterface/res/resources/test/simpleVerReq.sl12.locref.xml20
-rw-r--r--spss.slinterface/res/resources/test/simpleVerReq.xml100
-rw-r--r--spss.slinterface/res/resources/test/test.xml2
-rw-r--r--spss.slinterface/res/resources/test/test.xsl14
-rw-r--r--spss.slinterface/res/resources/test/verifyresponse.moa.sl.xml25
-rw-r--r--spss.slinterface/res/resources/test/verifyresponse.moa.xml46
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/Constants.java90
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/DOMUtils.java169
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/URLRewriter.java157
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/Utils.java51
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/XPathUtils.java162
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/ChecksInfoBean.java165
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/DataInfoBean.java541
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/HashInputDataInfo.java55
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/InitPropertiesBean.java36
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/SignerInfoBean.java127
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/RequestWrapper.java57
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/ResponseWrapper.java44
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/SL2MOAFilter.java381
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletInputStream.java55
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletOutputStream.java50
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/listeners/ContextListener.java214
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/listeners/XMLParserErrorHandler.java65
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/moainvoker/MOAInvoker.java92
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/HashInputDataServlet.java93
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/MOAServlet.java113
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/ReturnServlet.java129
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/SLRequest.java19
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java93
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/QName.java51
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/SL2MOA.java93
-rw-r--r--spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/Utils.java129
-rw-r--r--spss.slinterface/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLBean.java46
-rw-r--r--spss.slinterface/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLServlet.java83
-rw-r--r--spss.slinterface/src/test/at/gv/egovernment/moa/spss/slinterface/RewriteServlet.java73
-rw-r--r--spss.slinterface/test/moa-wartung-la9/106_2006.img1is.gifbin88 -> 0 bytes
-rw-r--r--spss.slinterface/test/moa-wartung-la9/106_2006.img2is.gifbin88 -> 0 bytes
-rw-r--r--spss.slinterface/test/moa-wartung-la9/106_2006.img3is.gifbin88 -> 0 bytes
-rw-r--r--spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__106_2006.iso8859.xml79
-rw-r--r--spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__106_2006.utf8.xml79
-rw-r--r--spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__204_2006.iso8859.xml43
-rw-r--r--spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__204_2006.utf8.xml43
-rw-r--r--spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__341_2004.iso8859.xml550
-rw-r--r--spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__341_2004.utf8.xml550
-rw-r--r--spss.slinterface/test/moa-wartung-la9/moa-wartung-la9.zipbin129537 -> 0 bytes
-rw-r--r--spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__106_2006.xml29
-rw-r--r--spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__204_2006.xml29
-rw-r--r--spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__341_2004.xml29
-rw-r--r--spss.slinterface/test/moa-wartung-la9/stylesheet.1.8.6.xsl3182
-rw-r--r--spss.slinterface/test/moa-wartung-la9/stylesheet.1.9.0.xsl1897
-rw-r--r--spss.slinterface/test/moa-wartung-la9/stylesheet.1.9.1.xsl1954
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyRequest.106_2006.iso8859.xml34
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyRequest.106_2006.utf8.xml34
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyRequest.204_2006.iso8859.xml19
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyRequest.204_2006.utf8.xml19
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyRequest.341_2004.iso8859.xml19
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyRequest.341_2004.utf8.xml19
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyResponse.106_2006.iso8859.xml558
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyResponse.106_2006.utf8.xml558
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyResponse.204_2006.iso8859.xml485
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyResponse.204_2006.utf8.xml485
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyResponse.341_2004.iso8859.xml1166
-rw-r--r--spss.slinterface/test/moa-wartung-la9/verifyResponse.341_2004.utf8.xml1166
-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
1421 files changed, 1252 insertions, 100512 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/.cvsignore b/build/scripts/.cvsignore
deleted file mode 100644
index f86ac9b86..000000000
--- a/build/scripts/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-setjdk13.bat
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/res/resources/schemas/Core-1.2.xsd b/common/res/resources/schemas/Core-1.2.xsd
index 864fee6d5..769079e66 100644
--- a/common/res/resources/schemas/Core-1.2.xsd
+++ b/common/res/resources/schemas/Core-1.2.xsd
@@ -816,7 +816,7 @@
</xsd:complexType>
<xsd:complexType name="AnyMixedChildrenType" mixed="true">
<xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:any namespace="##any" processContents="skip"/>
+ <xsd:any namespace="##any" processContents="lax"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="XMLContentType" mixed="true">
@@ -878,4 +878,4 @@
<xsd:element name="Content" type="Base64XMLLocRefReqRefContentType"/>
</xsd:sequence>
</xsd:complexType>
-</xsd:schema>
+</xsd:schema> \ No newline at end of file
diff --git a/common/res/resources/schemas/PersonData_20_en_moaWID.xsd b/common/res/resources/schemas/PersonData_20_en_moaWID.xsd
index cf8f796db..4c9a7fdc6 100644
--- a/common/res/resources/schemas/PersonData_20_en_moaWID.xsd
+++ b/common/res/resources/schemas/PersonData_20_en_moaWID.xsd
@@ -1,1229 +1,1250 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Larissa Naber (Bundeskanzleramt) -->
-<!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Peter Reichstädter (CIO) -->
-<!--Generisches Schema zum Speichern und Austauschen von Personendaten
- (c) 2001-2002 Chief Information Office Austria, Stabsstelle IKT-Strategie des Bundes, BMÖLS
- Kontakt: Peter Reichstädter (peter.reichstaedter@cio.gv.at), Arno Hollosi (arno.hollosi@cio.gv.at)
- Die freie Verwendung dieses Schemas in Applikationen (behördenintern, kommerziell, privat) ist erlaubt und erwünscht.
--->
-<?xml-stylesheet type="text/xsl" href="getelementnames.xslt"?>
-<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
- <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
- <xs:annotation>
- <xs:documentation>This version of person deploys only global elements. All types derived from abstract types have been replaced by substitution groups</xs:documentation>
- </xs:annotation>
- <!-- ### signed structure of a person ### -->
- <xs:element name="AbstractPersonData" type="AbstractPersonType">
- <xs:annotation>
- <xs:documentation>dummy abstract Peson Data element needed for bi-lingual schema (substitution groups)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PersonData" type="PersonDataType" substitutionGroup="AbstractPersonData">
- <xs:annotation>
- <xs:documentation>element of signed person datastructure type</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CompactPersonData">
- <xs:annotation>
- <xs:documentation>element of signed person datastructure type</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:choice>
- <xs:element ref="CompactPhysicalPerson"/>
- <xs:element ref="CompactCorporateBody"/>
- </xs:choice>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="InternetAddress"/>
- <xs:element ref="TelephoneAddress"/>
- <xs:element ref="CompactPostalAddress"/>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <!-- ### base type for person data ### -->
- <xs:element name="Person" type="AbstractPersonType">
- <xs:annotation>
- <xs:documentation>element of person type, essential abstract, subsitute PhysicalPerson or CorporateBody instead or use with xsi:type="..."</xs:documentation>
- </xs:annotation>
- </xs:element>
- <!-- ### physical person and corporate body ### -->
- <xs:element name="PhysicalPerson" type="PhysicalPersonType" substitutionGroup="Person">
- <xs:annotation>
- <xs:documentation>element of physical person type, dreived from Person (abstract)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CompactPhysicalPerson" type="CompactPhysicalPersonType" substitutionGroup="Person">
- <xs:annotation>
- <xs:documentation>element of physical person type, dreived from Person (abstract)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CorporateBody" type="CorporateBodyType" substitutionGroup="Person">
- <xs:annotation>
- <xs:documentation>element of corporate body type, derived from Person</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CompactCorporateBody" type="CompactCorporateBodyType" substitutionGroup="Person">
- <xs:annotation>
- <xs:documentation>element of corporate body type, derived from Person</xs:documentation>
- </xs:annotation>
- </xs:element>
- <!--### complex child elements of person, also available as standalone ###-->
- <xs:element name="Name" type="PersonNameType">
- <xs:annotation>
- <xs:documentation>data related to the person's name</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CompactName" type="CompactPersonNameType">
- <xs:annotation>
- <xs:documentation>data related to the person's name</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AlternativeName">
- <xs:annotation>
- <xs:documentation>Former name, Artist name, changes of Given name ..., compare AlternativName</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent>
- <xs:extension base="PersonNameType">
- <xs:attribute name="Type" type="AlternativeNameTypeType"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="relatedPerson">
- <xs:annotation>
- <xs:documentation>relatives (parents, ...), compare Verwandter</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="TypeOfRelation" type="RelationType" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>type of the relationship, compare Verwandschftsgrad</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element ref="PhysicalPerson"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <!-- ### adress data for various types of communications ### -->
- <xs:element name="Address" type="AbstractAddressType">
- <xs:annotation>
- <xs:documentation>element of address type, essentially abstract. Use InternetAddress, TelephoneAddress, PostalAddress, TypedPostalAddress instead, or use Address with xsi:type Attribute</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PostalAddress" type="PostalAddressType" substitutionGroup="Address">
- <xs:annotation>
- <xs:documentation>Postal or ZMR Address, compare PostAdresse</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CompactPostalAddress" type="CompactPostalAddressType" substitutionGroup="Address">
- <xs:annotation>
- <xs:documentation>Postal or ZMR Address, compare PostAdresse</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TypedPostalAddress" type="TypedPostalAddressType" substitutionGroup="Address">
- <xs:annotation>
- <xs:documentation>Typed Postal or ZMR Address, compare TypisiertePostAdresse</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="InternetAddress" type="InternetAddressType" substitutionGroup="Address">
- <xs:annotation>
- <xs:documentation>InternetAdress such as e-mail or website, compare InternetAdresse</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TelephoneAddress" type="TelephoneAddressType" substitutionGroup="Address">
- <xs:annotation>
- <xs:documentation>Typed TelephoneAddress, compare TelefonAdresse</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="BankConnection" type="BankConnectionType">
- <xs:annotation>
- <xs:documentation>National or international bank connection, compare Bankverbindung</xs:documentation>
- </xs:annotation>
- </xs:element>
- <!-- ### Identification elements ###-->
- <xs:element name="AbstractSimpleIdentification" type="AbstractSimpleIdentificationType">
- <xs:annotation>
- <xs:documentation>possibility to include common austrian primary keys in human readable way, english translation not available</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ZMRzahl" substitutionGroup="AbstractSimpleIdentification">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="AbstractSimpleIdentificationType">
- <xs:attribute name="Identifier" type="xs:string" fixed="ZMR"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Stammzahl" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>
- <xs:element name="Firmenbuchnummer" substitutionGroup="AbstractSimpleIdentification">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="AbstractSimpleIdentificationType">
- <xs:attribute name="Identifier" type="xs:string" fixed="FN"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="ERJPZahl" substitutionGroup="AbstractSimpleIdentification">
- <xs:annotation>
- <xs:documentation>Ergänzungsregister für nicht-natürliche Personen (CorporateBody)</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="AbstractSimpleIdentificationType">
- <xs:attribute name="Identifier" type="xs:string" fixed="ERJ"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Vereinsnummer" substitutionGroup="AbstractSimpleIdentification">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="AbstractSimpleIdentificationType">
- <xs:attribute name="Identifier" type="xs:string" fixed="VR"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Sozialversicherungsnummer" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>
- <xs:element name="Steuernummer" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>
- <xs:element name="Matrikelnummer" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>
- <!-- ### additional telecom elements - not used internally - german translation not available ###-->
- <xs:element name="Telephone" type="TelcomNumberType"/>
- <xs:element name="Mobile" type="MobileTelcomNumberType"/>
- <xs:element name="Fax" type="TelcomNumberType"/>
- <xs:element name="Pager" type="TelcomNumberType"/>
- <xs:element name="TTYTDD" type="TelcomNumberType">
- <xs:annotation>
- <xs:documentation>teletyper or telephone for the hearing impaired</xs:documentation>
- </xs:annotation>
- </xs:element>
- <!--### elements of simple type ####-->
- <xs:element name="MaritalStatus" type="MaritalStatusType">
- <xs:annotation>
- <xs:documentation>status of a person in the cycle of life, compare Familienstand</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Sex" type="SexType">
- <xs:annotation>
- <xs:documentation>gender, comapre Geschlecht</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DateOfBirth" type="DateOfBirthType">
- <xs:annotation>
- <xs:documentation>date of birth, compare Geburtsdatum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DateOfDeath" type="DateOfDeathType">
- <xs:annotation>
- <xs:documentation>date of death, compare Sterbedatum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PlaceOfBirth" type="xs:token">
- <xs:annotation>
- <xs:documentation>place of birth, compare Geburtsort</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CountryOfBirth" type="xs:token">
- <xs:annotation>
- <xs:documentation>country of birth, compare Geburtsland</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="StateOfBirth" type="xs:token">
- <xs:annotation>
- <xs:documentation>state of birth, comapre Geburtsbundesland</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Nationality" type="NationalityType">
- <xs:annotation>
- <xs:documentation>nationality of Person, compare Staatsangehoerigkeit. attention! New Fomrat is complex, string value accepted for compatibility only</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Confession" type="xs:token">
- <xs:annotation>
- <xs:documentation>confession (religion) of Person - xs:token? gibt es wirklich keine Staaten mit Leerzeichen im Namen?</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Occupation" type="xs:string">
- <xs:annotation>
- <xs:documentation>occupation, compare Beruf</xs:documentation>
- </xs:annotation>
- </xs:element>
- <!--### complex telephone types ###-->
- <xs:element name="InternationalCountryCode" type="xs:string">
- <xs:annotation>
- <xs:documentation>compare InternationalerLaendercode</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="NationalNumber" type="xs:string">
- <xs:annotation>
- <xs:documentation>compare NationalNummer</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AreaCityCode" type="xs:string">
- <xs:annotation>
- <xs:documentation>compare Vorwahl</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SubscriberNumber" type="xs:string">
- <xs:annotation>
- <xs:documentation>compare Anschlussnummer</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="FormattedNumber" type="xs:string">
- <xs:annotation>
- <xs:documentation>Complete number, ready formated - e.g. +43 1 5131345 4664 compare FormatierteNummer</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Extension" type="xs:string">
- <xs:annotation>
- <xs:documentation>compare Klappe</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Identification" type ="IdentificationType">
- <xs:annotation>
- <xs:documentation>unique identifier</xs:documentation>
- </xs:annotation>
- </xs:element>
- <!--### complex types ###-->
- <xs:complexType name="PersonDataType">
- <xs:annotation>
- <xs:documentation>signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractPersonType">
- <xs:sequence>
- <xs:element ref="Person"/>
- <xs:element ref="Address" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>one or more electronic signatures applied on fields above</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AdditionalData" minOccurs="0">
- <xs:annotation>
- <xs:documentation>container for your Information needs. Contained Elements must reside in a different Namespace</xs:documentation>
- </xs:annotation>
- <xs:complexType mixed="true">
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:any namespace="##any" processContents="lax">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="CompactPersonDataType">
- <xs:annotation>
- <xs:documentation>signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractPersonType">
- <xs:sequence>
- <xs:element ref="Person"/>
- <xs:element ref="Address" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>one or more electronic signatures applied on fields above</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AdditionalData" minOccurs="0">
- <xs:annotation>
- <xs:documentation>container for your Information needs. Contained Elements must reside in a different Namespace</xs:documentation>
- </xs:annotation>
- <xs:complexType mixed="true">
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:any namespace="##any" processContents="lax">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="AbstractSimpleIdentificationType">
- <xs:simpleContent>
- <xs:extension base="xs:string"/>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="IdentificationType">
- <xs:annotation>
- <xs:documentation>unique identifier</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="Value">
- <xs:annotation>
- <xs:documentation>actual value of the identifier.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="Id" type="xs:ID" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Type" type="xs:anyURI">
- <xs:annotation>
- <xs:documentation>type of value (eg 'ZMR', 'SV-Nummer', 'Martrikelnummer', database identification, ...)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Authority" type="xs:anyURI" minOccurs="0">
- <xs:annotation>
- <xs:documentation>authority, which is reponsible for generation of the identifier (eg university in case of 'MatrikelNummer')</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- <xs:attribute name="Id" type="xs:ID" use="optional"/>
- <xs:anyAttribute namespace="##other"/>
- </xs:complexType>
- <xs:complexType name="AbstractPersonType">
- <xs:annotation>
- <xs:documentation>main structure of person data</xs:documentation>
- </xs:annotation>
- <xs:choice minOccurs="0">
- <xs:element ref="Identification" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>unique identification entities</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element ref="AbstractSimpleIdentification" minOccurs="0" maxOccurs="unbounded"/>
- </xs:choice>
- <xs:attribute name="Id" type="xs:ID" use="optional"/>
- <xs:anyAttribute namespace="##other"/>
- </xs:complexType>
- <xs:complexType name="PhysicalPersonType">
- <xs:annotation>
- <xs:documentation>physical person, compare NatuerlichePersonTyp</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractPersonType">
- <xs:sequence minOccurs="0">
- <xs:element ref="Name" minOccurs="0"/>
- <xs:element ref="AlternativeName" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="MaritalStatus" minOccurs="0"/>
- <xs:element ref="Sex" minOccurs="0"/>
- <xs:element ref="DateOfBirth" minOccurs="0"/>
- <xs:element ref="PlaceOfBirth" minOccurs="0"/>
- <xs:element ref="StateOfBirth" minOccurs="0"/>
- <xs:element ref="CountryOfBirth" minOccurs="0"/>
- <xs:element ref="DateOfDeath" minOccurs="0"/>
- <xs:element ref="Nationality" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="Confession" minOccurs="0"/>
- <xs:element ref="Occupation" minOccurs="0"/>
- <xs:element ref="relatedPerson" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="BankConnection" minOccurs="0" maxOccurs="unbounded"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="CompactPhysicalPersonType">
- <xs:annotation>
- <xs:documentation>physical person, compare NatuerlichePersonTyp</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractPersonType">
- <xs:sequence minOccurs="0">
- <xs:element ref="CompactName"/>
- <xs:element ref="MaritalStatus" minOccurs="0"/>
- <xs:element ref="Sex" minOccurs="0"/>
- <xs:element ref="DateOfBirth" minOccurs="0"/>
- <xs:element ref="PlaceOfBirth" minOccurs="0"/>
- <xs:element ref="Nationality" minOccurs="0" maxOccurs="unbounded"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="CorporateBodyType">
- <xs:annotation>
- <xs:documentation>juridical person, organisation, compare NichtNatuerlichePersonTyp</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractPersonType">
- <xs:sequence minOccurs="0">
- <xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>URI pointing to a predefined Class of CorporateBodies, compare Typ</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="FullName" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>name of corporate body (whole name), compare VollerName</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AlternativeName" type="xs:token" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>alternative names of corporate body (abbreviations, short name, synonyms, ...), comapre AlternativName</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LegalForm" type="xs:anyURI" minOccurs="0">
- <xs:annotation>
- <xs:documentation>type of company (eg AG, OHG, ...), URI pointing to predefined LegalForm, compare Rechtsform</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Organization" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>part of an organisation, see also X.500 ou (eg departement, section, branch, ...) , compare Organisation</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element ref="BankConnection" minOccurs="0" maxOccurs="unbounded"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="CompactCorporateBodyType">
- <xs:annotation>
- <xs:documentation>juridical person, organisation, compare NichtNatuerlichePersonTyp</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractPersonType">
- <xs:sequence minOccurs="0">
- <xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>URI pointing to a predefined Class of CorporateBodies, compare Typ</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="FullName" type="xs:token">
- <xs:annotation>
- <xs:documentation>name of corporate body (whole name), compare VollerName</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LegalForm" type="xs:anyURI" minOccurs="0">
- <xs:annotation>
- <xs:documentation>type of company (eg AG, OHG, ...), URI pointing to predefined LegalForm, compare Rechtsform</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Organization" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>part of an organisation, see also X.500 ou (eg departement, section, branch, ...) , compare Organisation</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="PersonNameType">
- <xs:annotation>
- <xs:documentation>container for parts of a name, comapre PersonenNameTyp</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="FormattedName" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Complete Name (including Affixes) of the Person, especially useful for names from different cultural environments</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="type" default="presentation">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="presentation"/>
- <xs:enumeration value="legal"/>
- <xs:enumeration value="sortOrder"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="LegalName" type="xs:string" minOccurs="0"/>
- <xs:element name="GivenName" type="xs:string" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Every given name should be contained inside a GivenName Tag. If that is not possible due to dabase contraints, ... putting several given names inside one GivenName Element is acceptable</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PreferredGivenName" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>A Person in possesion of more than one GivenName frequently preferrs the use of a Name other than the first GivenName</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MiddleName" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>MiddleNames are not commonly found in central Europe. The field is mainly for compatibility reasons</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="FamilyName" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Every family name should be contained inside a FamilyName Tag. If that is not possible due to dabase contraints, ... putting several family names inside one FamilyName Element is acceptable</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="primary" default="undefined">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- <xs:enumeration value="undefined"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="prefix" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Affix" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Inlcudes all Information that is not exactly a name: academic or aristocratic titles, ... the new position attribute can contain a suffx or prefix value</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="type" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="academicGrade"/>
- <xs:enumeration value="aristocraticPrefix"/>
- <xs:enumeration value="aristocraticTitle"/>
- <xs:enumeration value="familyNamePrefix"/>
- <xs:enumeration value="familyNameSuffix"/>
- <xs:enumeration value="formOfAddress"/>
- <xs:enumeration value="generation"/>
- <xs:enumeration value="qualification"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="position" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="prefix"/>
- <xs:enumeration value="suffix"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="CompactPersonNameType">
- <xs:annotation>
- <xs:documentation>container for parts of a name, comapre PersonenNameTyp</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="GivenName" type="xs:string" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Every given name should be contained inside a GivenName Tag. If that is not possible due to dabase contraints, ... putting several given names inside one GivenName Element is acceptable</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="FamilyName" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Every family name should be contained inside a FamilyName Tag. If that is not possible due to dabase contraints, ... putting several family names inside one FamilyName Element is acceptable</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="primary" default="undefined">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- <xs:enumeration value="undefined"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="prefix" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Affix" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>Inlcudes all Information that is not exactly a name: academic or aristocratic titles, ... the new position attribute can contain a suffx or prefix value</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="type" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="academicGrade"/>
- <xs:enumeration value="aristocraticPrefix"/>
- <xs:enumeration value="aristocraticTitle"/>
- <xs:enumeration value="familyNamePrefix"/>
- <xs:enumeration value="familyNameSuffix"/>
- <xs:enumeration value="formOfAddress"/>
- <xs:enumeration value="generation"/>
- <xs:enumeration value="qualification"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="position" use="optional">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="prefix"/>
- <xs:enumeration value="suffix"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="NationalityType" mixed="true">
- <xs:annotation>
- <xs:documentation>comapre, StaatsangehoerigkeitTyp</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="ISOCode3" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:length value="3"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="CountryNameDE" type="xs:string" minOccurs="0"/>
- <xs:element name="CountryNameEN" type="xs:string" minOccurs="0"/>
- <xs:element name="CountryNameFR" type="xs:string" minOccurs="0"/>
- <xs:any namespace="##other" processContents="lax"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="BankConnectionType">
- <xs:annotation>
- <xs:documentation>compare BankverbindungTyp</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="Holder" type="xs:string">
- <xs:annotation>
- <xs:documentation>Account holder, compare Inhaber</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="BankName" type="xs:string">
- <xs:annotation>
- <xs:documentation>compare BankName</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:choice>
- <xs:element name="NationalBankConnection">
- <xs:annotation>
- <xs:documentation>compare NationaleBankverbindung</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AccountNumber" type="xs:integer">
- <xs:annotation>
- <xs:documentation>compare Kontonummer</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="BankCode" type="xs:integer">
- <xs:annotation>
- <xs:documentation>compare BLZ</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="InternationalBankConnection">
- <xs:annotation>
- <xs:documentation>compare InternationaleBankverbindung</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="IBAN" type="xs:string">
- <xs:annotation>
- <xs:documentation>compare IBAN</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="BIC" type="xs:string">
- <xs:annotation>
- <xs:documentation>comapre BIC</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="AbstractAddressType">
- <xs:annotation>
- <xs:documentation>main structure of address data</xs:documentation>
- </xs:annotation>
- <xs:sequence minOccurs="0">
- <xs:element ref="Identification" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>unique identification entities</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="Id" type="xs:ID" use="optional"/>
- <xs:anyAttribute namespace="##other"/>
- </xs:complexType>
- <xs:complexType name="TypedPostalAddressType">
- <xs:annotation>
- <xs:documentation>postal address with type information, compare TypisiertePostAdresseTyp</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractAddressType">
- <xs:sequence minOccurs="0">
- <xs:element name="Type" type="xs:anyURI" minOccurs="0">
- <xs:annotation>
- <xs:documentation>type of address - category (eg 'Wohnsitz', 'Zentrale', ...)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element ref="PostalAddress"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="PostalAddressType">
- <xs:annotation>
- <xs:documentation>compare PostAdresseTyp</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractAddressType">
- <xs:sequence>
- <xs:element name="CountryCode" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Code for the country, use ISO or internatinal Postalstandard, compare Staatscode</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="[A-Z]{2}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="CountryName" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Name of the country, use ISO Name, or international Postal Standard, compare Staatsname</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PostalCode" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>ZIP, compare Postleitzahl</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Region" type="xs:string" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>compare Region</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="State" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>compare Bundesland</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Municipality" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>compare Gemeinde</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MunicipalityNumber" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>compare Gemeindekennzahl</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Hamlet" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>ZMR use, compare Ortschaft</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="HamletBilingual" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>ZMR use, comapre OrtschaftZweisprachig</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DeliveryAddress" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AddressLine" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="StreetName" type="xs:string" minOccurs="0"/>
- <xs:element name="BuildingNumber" type="xs:string" minOccurs="0"/>
- <xs:element name="Unit" type="xs:string" minOccurs="0"/>
- <xs:element name="DoorNumber" type="xs:string" minOccurs="0"/>
- <xs:element name="PostOfficeBox" type="xs:string" minOccurs="0"/>
- <xs:element name="LivingQuality" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>zmr use only</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DropOffPoint" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>zmr use only</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AreaNumber" type="xs:string" minOccurs="0"/>
- <xs:element name="AddressRegisterEntry" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Addressregister database keys used to identify Addresses</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AddressCode" type="string7"/>
- <xs:element name="SubCode" type="string3" minOccurs="0"/>
- <xs:element name="ObjectNumber" type="string7" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Recipient" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>If Addressis used outside of PersonData a recipient can be specified</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="PersonName" type="PersonNameType" minOccurs="0"/>
- <xs:element name="AdditionalText" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="Organization" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>rather OrganizationUnit e.G Sales Departement</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="OrganizationName" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>e.g. Smith Ltd</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" default="undefined">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="postOfficeBoxAddress"/>
- <xs:enumeration value="streetAddress"/>
- <xs:enumeration value="militaryAddress"/>
- <xs:enumeration value="undefined"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="CompactPostalAddressType">
- <xs:annotation>
- <xs:documentation>compare PostAdresseTyp</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractAddressType">
- <xs:sequence>
- <xs:element name="CountryCode" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Code for the country, use ISO or internatinal Postalstandard, compare Staatscode</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="[A-Z]{2}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="CountryName" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>Name of the country, use ISO Name, or international Postal Standard, compare Staatsname</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PostalCode" type="xs:string">
- <xs:annotation>
- <xs:documentation>ZIP, compare Postleitzahl</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Municipality" type="xs:string">
- <xs:annotation>
- <xs:documentation>compare Gemeinde</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DeliveryAddress">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="StreetName" type="xs:string">
- <xs:annotation>
- <xs:documentation>if streetname not available use name of Ortschaft</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="BuildingNumber" type="xs:string"/>
- <xs:element name="Unit" type="xs:string" minOccurs="0"/>
- <xs:element name="DoorNumber" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" default="undefined">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="postOfficeBoxAddress"/>
- <xs:enumeration value="streetAddress"/>
- <xs:enumeration value="militaryAddress"/>
- <xs:enumeration value="undefined"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="InternetAddressType">
- <xs:annotation>
- <xs:documentation>e.g. e-mail, webiste, compare InternetAdresseTyp</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractAddressType">
- <xs:sequence minOccurs="0">
- <xs:element ref="dsig:KeyInfo" minOccurs="0">
- <xs:annotation>
- <xs:documentation>certificate for secure communication</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Address" type="xs:anyURI">
- <xs:annotation>
- <xs:documentation>URI: email-Address, Web, FTP, LDAP, ..., comapre Adress</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="TelephoneAddressType">
- <xs:annotation>
- <xs:documentation>phone numbers, conmpare TelephoneAdresseTyp</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="AbstractAddressType">
- <xs:sequence minOccurs="0">
- <xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>type of phononumber - category (eg 'Festnetz', 'Mobile', 'fax', ...)</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Number" type="TelcomNumberType">
- <xs:annotation>
- <xs:documentation>phonenumber</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>any additional properties</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="MobileTelcomNumberType">
- <xs:annotation>
- <xs:documentation>like TelephoneAddresseType but with additional smsEnabled attribute</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:extension base="TelcomNumberType">
- <xs:attribute name="smsEnabled" type="xs:boolean" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="TelcomNumberType">
- <xs:annotation>
- <xs:documentation>formated number or set of telephone number parts</xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:element ref="FormattedNumber"/>
- <xs:group ref="TelcomNumberGroup"/>
- </xs:choice>
- </xs:complexType>
- <xs:group name="TelcomNumberGroup">
- <xs:annotation>
- <xs:documentation>set of telephone number parts</xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element ref="InternationalCountryCode" minOccurs="0"/>
- <xs:element ref="NationalNumber" minOccurs="0"/>
- <xs:element ref="AreaCityCode" minOccurs="0"/>
- <xs:element ref="SubscriberNumber"/>
- <xs:element ref="Extension" minOccurs="0"/>
- </xs:sequence>
- </xs:group>
- <!-- ### auxiliary types ### -->
- <xs:simpleType name="SexType">
- <xs:annotation>
- <xs:documentation>simple type for sex (gender) of person</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token">
- <xs:enumeration value="male"/>
- <xs:enumeration value="female"/>
- <xs:enumeration value="unknown"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="DateOfBirthType">
- <xs:annotation>
- <xs:documentation>simple type for dates (union), which may omit day and/or month</xs:documentation>
- </xs:annotation>
- <xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
- </xs:simpleType>
- <xs:simpleType name="DateOfDeathType">
- <xs:annotation>
- <xs:documentation>simple type for dates (union), which may omit day and/or month</xs:documentation>
- </xs:annotation>
- <xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
- </xs:simpleType>
- <xs:simpleType name="MaritalStatusType">
- <xs:annotation>
- <xs:documentation>simple type for marital status of a person</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token">
- <xs:enumeration value="single"/>
- <xs:enumeration value="married"/>
- <xs:enumeration value="divorced"/>
- <xs:enumeration value="widowed"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="xStringPatternExtensionType">
- <xs:annotation>
- <xs:documentation>pattern type for enlargement of type definitions. Contents as follows
-x:sometext or 12345 or _ or other symbols
-</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:pattern value="x:\S.*"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="DefinedRelationType">
- <xs:annotation>
- <xs:documentation>known relations (family + functional)</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="family:Parent"/>
- <xs:enumeration value="family:Child"/>
- <xs:enumeration value="family:Sibling"/>
- <xs:enumeration value="family:Grandparent"/>
- <xs:enumeration value="family:Grandchild"/>
- <xs:enumeration value="family:Spouse"/>
- <xs:enumeration value="function:LegalGuardian"/>
- <xs:enumeration value="function:IsGuardedBy"/>
- <xs:enumeration value="function:Cohabitant"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="RelationType">
- <xs:annotation>
- <xs:documentation>known + any other relation</xs:documentation>
- </xs:annotation>
- <xs:union memberTypes="xStringPatternExtensionType DefinedRelationType"/>
- </xs:simpleType>
- <xs:simpleType name="DefinedAlternativeNameTypeType">
- <xs:annotation>
- <xs:documentation>known types of alternative names</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="ArtistName"/>
- <xs:enumeration value="NickName"/>
- <xs:enumeration value="FormerName"/>
- <xs:enumeration value="Alias"/>
- <xs:enumeration value="MaidenName"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="AlternativeNameTypeType">
- <xs:annotation>
- <xs:documentation>known + any other alternative name types</xs:documentation>
- </xs:annotation>
- <xs:union memberTypes="xStringPatternExtensionType DefinedAlternativeNameTypeType"/>
- </xs:simpleType>
- <!-- ### additional data types for ZMR address #### -->
- <xs:simpleType name="FederalStateType">
- <xs:annotation>
- <xs:documentation>zmr use only</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Wien"/>
- <xs:enumeration value="Niederösterreich"/>
- <xs:enumeration value="Burgenland"/>
- <xs:enumeration value="Oberösterreich"/>
- <xs:enumeration value="Steiermark"/>
- <xs:enumeration value="Salzburg"/>
- <xs:enumeration value="Kärnten"/>
- <xs:enumeration value="Tirol"/>
- <xs:enumeration value="Vorarlberg"/>
- </xs:restriction>
- </xs:simpleType>
- <!-- ### strings of defined maximum lenght for use with ZMR address ###-->
- <xs:simpleType name="string3">
- <xs:restriction base="xs:string">
- <xs:maxLength value="3"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string4">
- <xs:restriction base="xs:string">
- <xs:maxLength value="4"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string7">
- <xs:restriction base="xs:string">
- <xs:maxLength value="7"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string20">
- <xs:restriction base="xs:string">
- <xs:maxLength value="20"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string30">
- <xs:restriction base="xs:string">
- <xs:maxLength value="30"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string50">
- <xs:restriction base="xs:string">
- <xs:maxLength value="50"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="string100">
- <xs:restriction base="xs:string">
- <xs:maxLength value="100"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="integer5">
- <xs:restriction base="xs:integer">
- <xs:minInclusive value="10000"/>
- <xs:maxInclusive value="99999"/>
- </xs:restriction>
- </xs:simpleType>
-</xs:schema>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Larissa Naber (Bundeskanzleramt) -->
+<!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Peter Reichstädter (CIO) -->
+<!--Generisches Schema zum Speichern und Austauschen von Personendaten
+ (c) 2001-2002 Chief Information Office Austria, Stabsstelle IKT-Strategie des Bundes, BMÖLS
+ Kontakt: Peter Reichstädter (peter.reichstaedter@cio.gv.at), Arno Hollosi (arno.hollosi@cio.gv.at)
+ Die freie Verwendung dieses Schemas in Applikationen (behördenintern, kommerziell, privat) ist erlaubt und erwünscht.
+-->
+<?xml-stylesheet type="text/xsl" href="getelementnames.xslt"?>
+<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
+ <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+ <xs:annotation>
+ <xs:documentation>This version of person deploys only global elements. All types derived from abstract types have been replaced by substitution groups</xs:documentation>
+ </xs:annotation>
+ <!-- ### signed structure of a person ### -->
+ <xs:element name="AbstractPersonData" type="AbstractPersonType">
+ <xs:annotation>
+ <xs:documentation>dummy abstract Peson Data element needed for bi-lingual schema (substitution groups)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PersonData" type="PersonDataType" substitutionGroup="AbstractPersonData">
+ <xs:annotation>
+ <xs:documentation>element of signed person datastructure type</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompactPersonData">
+ <xs:annotation>
+ <xs:documentation>element of signed person datastructure type</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:choice>
+ <xs:element ref="CompactPhysicalPerson"/>
+ <xs:element ref="CompactCorporateBody"/>
+ </xs:choice>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="InternetAddress"/>
+ <xs:element ref="TelephoneAddress"/>
+ <xs:element ref="CompactPostalAddress"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <!-- ### base type for person data ### -->
+ <xs:element name="Person" type="AbstractPersonType">
+ <xs:annotation>
+ <xs:documentation>element of person type, essential abstract, subsitute PhysicalPerson or CorporateBody instead or use with xsi:type="..."</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <!-- ### physical person and corporate body ### -->
+ <xs:element name="PhysicalPerson" type="PhysicalPersonType" substitutionGroup="Person">
+ <xs:annotation>
+ <xs:documentation>element of physical person type, dreived from Person (abstract)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompactPhysicalPerson" type="CompactPhysicalPersonType" substitutionGroup="Person">
+ <xs:annotation>
+ <xs:documentation>element of physical person type, dreived from Person (abstract)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CorporateBody" type="CorporateBodyType" substitutionGroup="Person">
+ <xs:annotation>
+ <xs:documentation>element of corporate body type, derived from Person</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompactCorporateBody" type="CompactCorporateBodyType" substitutionGroup="Person">
+ <xs:annotation>
+ <xs:documentation>element of corporate body type, derived from Person</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <!--### complex child elements of person, also available as standalone ###-->
+ <xs:element name="Name" type="PersonNameType">
+ <xs:annotation>
+ <xs:documentation>data related to the person's name</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompactName" type="CompactPersonNameType">
+ <xs:annotation>
+ <xs:documentation>data related to the person's name</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AlternativeName">
+ <xs:annotation>
+ <xs:documentation>Former name, Artist name, changes of Given name ..., compare AlternativName</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="PersonNameType">
+ <xs:attribute name="Type" type="AlternativeNameTypeType"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="relatedPerson">
+ <xs:annotation>
+ <xs:documentation>relatives (parents, ...), compare Verwandter</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="TypeOfRelation" type="RelationType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>type of the relationship, compare Verwandschftsgrad</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element ref="PhysicalPerson"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <!-- ### adress data for various types of communications ### -->
+ <xs:element name="Address" type="AbstractAddressType">
+ <xs:annotation>
+ <xs:documentation>element of address type, essentially abstract. Use InternetAddress, TelephoneAddress, PostalAddress, TypedPostalAddress instead, or use Address with xsi:type Attribute</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PostalAddress" type="PostalAddressType" substitutionGroup="Address">
+ <xs:annotation>
+ <xs:documentation>Postal or ZMR Address, compare PostAdresse</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CompactPostalAddress" type="CompactPostalAddressType" substitutionGroup="Address">
+ <xs:annotation>
+ <xs:documentation>Postal or ZMR Address, compare PostAdresse</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TypedPostalAddress" type="TypedPostalAddressType" substitutionGroup="Address">
+ <xs:annotation>
+ <xs:documentation>Typed Postal or ZMR Address, compare TypisiertePostAdresse</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="InternetAddress" type="InternetAddressType" substitutionGroup="Address">
+ <xs:annotation>
+ <xs:documentation>InternetAdress such as e-mail or website, compare InternetAdresse</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="TelephoneAddress" type="TelephoneAddressType" substitutionGroup="Address">
+ <xs:annotation>
+ <xs:documentation>Typed TelephoneAddress, compare TelefonAdresse</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="BankConnection">
+ <xs:annotation>
+ <xs:documentation>National or international bank connection, compare Bankverbindung</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="BankConnectionType">
+ <xs:attribute name="type" type="BankConnectionTypeType" use="optional"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <!-- ### Identification elements ###-->
+ <!--xs:element name="AbstractSimpleIdentification" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>possibility to include common austrian primary keys in human readable way, english translation not available</xs:documentation>
+ </xs:annotation>
+ </xs:element-->
+ <xs:element name="AbstractSimpleIdentification" type="AbstractSimpleIdentificationType">
+ <xs:annotation>
+ <xs:documentation>possibility to include common austrian primary keys in human readable way, english translation not available</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ZMRzahl" substitutionGroup="AbstractSimpleIdentification">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="AbstractSimpleIdentificationType">
+ <xs:attribute name="Identifier" type="xs:string" fixed="ZMR"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Stammzahl" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>
+ <xs:element name="Firmenbuchnummer" substitutionGroup="AbstractSimpleIdentification">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="AbstractSimpleIdentificationType">
+ <xs:attribute name="Identifier" type="xs:string" fixed="FN"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ERJPZahl" substitutionGroup="AbstractSimpleIdentification">
+ <xs:annotation>
+ <xs:documentation>Ergänzungsregister für nicht-natürliche Personen (CorporateBody)</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="AbstractSimpleIdentificationType">
+ <xs:attribute name="Identifier" type="xs:string" fixed="ERJ"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Vereinsnummer" substitutionGroup="AbstractSimpleIdentification">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="AbstractSimpleIdentificationType">
+ <xs:attribute name="Identifier" type="xs:string" fixed="VR"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Sozialversicherungsnummer" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>
+ <xs:element name="Steuernummer" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>
+ <xs:element name="Matrikelnummer" type="AbstractSimpleIdentificationType" substitutionGroup="AbstractSimpleIdentification"/>
+ <!-- ### additional telecom elements - not used internally - german translation not available ###-->
+ <xs:element name="Telephone" type="TelcomNumberType"/>
+ <xs:element name="Mobile" type="MobileTelcomNumberType"/>
+ <xs:element name="Fax" type="TelcomNumberType"/>
+ <xs:element name="Pager" type="TelcomNumberType"/>
+ <xs:element name="TTYTDD" type="TelcomNumberType">
+ <xs:annotation>
+ <xs:documentation>teletyper or telephone for the hearing impaired</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <!--### elements of simple type ####-->
+ <xs:element name="MaritalStatus" type="MaritalStatusType">
+ <xs:annotation>
+ <xs:documentation>status of a person in the cycle of life, compare Familienstand</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Sex" type="SexType">
+ <xs:annotation>
+ <xs:documentation>gender, comapre Geschlecht</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DateOfBirth" type="DateOfBirthType">
+ <xs:annotation>
+ <xs:documentation>date of birth, compare Geburtsdatum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DateOfDeath" type="DateOfDeathType">
+ <xs:annotation>
+ <xs:documentation>date of death, compare Sterbedatum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PlaceOfBirth" type="xs:token">
+ <xs:annotation>
+ <xs:documentation>place of birth, compare Geburtsort</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="CountryOfBirth" type="xs:token">
+ <xs:annotation>
+ <xs:documentation>country of birth, compare Geburtsland</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="StateOfBirth" type="xs:token">
+ <xs:annotation>
+ <xs:documentation>state of birth, comapre Geburtsbundesland</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Nationality" type="NationalityType">
+ <xs:annotation>
+ <xs:documentation>nationality of Person, compare Staatsangehoerigkeit. attention! New Fomrat is complex, string value accepted for compatibility only</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Confession" type="xs:token">
+ <xs:annotation>
+ <xs:documentation>confession (religion) of Person - xs:token? gibt es wirklich keine Staaten mit Leerzeichen im Namen?</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Occupation" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>occupation, compare Beruf</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <!--### complex telephone types ###-->
+ <xs:element name="InternationalCountryCode" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>compare InternationalerLaendercode</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="NationalNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>compare NationalNummer</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AreaCityCode" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>compare Vorwahl</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="SubscriberNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>compare Anschlussnummer</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="FormattedNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Complete number, ready formated - e.g. +43 1 5131345 4664 compare FormatierteNummer</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Extension" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>compare Klappe</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <!--### complex types ###-->
+ <xs:complexType name="AbstractSimpleIdentificationType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string"/>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:complexType name="PersonDataType">
+ <xs:annotation>
+ <xs:documentation>signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractPersonType">
+ <xs:sequence>
+ <xs:element ref="Person"/>
+ <xs:element ref="Address" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>one or more electronic signatures applied on fields above</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AdditionalData" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>container for your Information needs. Contained Elements must reside in a different Namespace</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:any namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="CompactPersonDataType">
+ <xs:annotation>
+ <xs:documentation>signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractPersonType">
+ <xs:sequence>
+ <xs:element ref="Person"/>
+ <xs:element ref="Address" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>one or more electronic signatures applied on fields above</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AdditionalData" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>container for your Information needs. Contained Elements must reside in a different Namespace</xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:any namespace="##any" processContents="lax">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:element name="Identification">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation>unique identifier</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="Value">
+ <xs:annotation>
+ <xs:documentation>actual value of the identifier.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="Id" type="xs:ID" use="optional"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Type" type="xs:anyURI">
+ <xs:annotation>
+ <xs:documentation>type of value (eg 'ZMR', 'SV-Nummer', 'Martrikelnummer', database identification, ...)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Authority" type="xs:anyURI" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>authority, which is reponsible for generation of the identifier (eg university in case of 'MatrikelNummer')</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="Id" type="xs:ID" use="optional"/>
+ <xs:anyAttribute namespace="##other"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType name="AbstractPersonType">
+ <xs:annotation>
+ <xs:documentation>main structure of person data</xs:documentation>
+ </xs:annotation>
+ <xs:choice minOccurs="0">
+ <xs:element ref="Identification" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>unique identification entities</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element ref="AbstractSimpleIdentification" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:choice>
+ <xs:attribute name="Id" type="xs:ID" use="optional"/>
+ <xs:anyAttribute namespace="##other"/>
+ </xs:complexType>
+ <xs:complexType name="PhysicalPersonType">
+ <xs:annotation>
+ <xs:documentation>physical person, compare NatuerlichePersonTyp</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractPersonType">
+ <xs:sequence minOccurs="0">
+ <xs:element ref="Name" minOccurs="0"/>
+ <xs:element ref="AlternativeName" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="MaritalStatus" minOccurs="0"/>
+ <xs:element ref="Sex" minOccurs="0"/>
+ <xs:element ref="DateOfBirth" minOccurs="0"/>
+ <xs:element ref="PlaceOfBirth" minOccurs="0"/>
+ <xs:element ref="StateOfBirth" minOccurs="0"/>
+ <xs:element ref="CountryOfBirth" minOccurs="0"/>
+ <xs:element ref="DateOfDeath" minOccurs="0"/>
+ <xs:element ref="Nationality" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="Confession" minOccurs="0"/>
+ <xs:element ref="Occupation" minOccurs="0"/>
+ <xs:element ref="relatedPerson" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="BankConnection" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="CompactPhysicalPersonType">
+ <xs:annotation>
+ <xs:documentation>physical person, compare NatuerlichePersonTyp</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractPersonType">
+ <xs:sequence minOccurs="0">
+ <xs:element ref="CompactName"/>
+ <xs:element ref="MaritalStatus" minOccurs="0"/>
+ <xs:element ref="Sex" minOccurs="0"/>
+ <xs:element ref="DateOfBirth" minOccurs="0"/>
+ <xs:element ref="PlaceOfBirth" minOccurs="0"/>
+ <xs:element ref="Nationality" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="CorporateBodyType">
+ <xs:annotation>
+ <xs:documentation>juridical person, organisation, compare NichtNatuerlichePersonTyp</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractPersonType">
+ <xs:sequence minOccurs="0">
+ <xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>URI pointing to a predefined Class of CorporateBodies, compare Typ</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="FullName" type="xs:token" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>name of corporate body (whole name), compare VollerName</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AlternativeName" type="xs:token" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>alternative names of corporate body (abbreviations, short name, synonyms, ...), comapre AlternativName</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="LegalForm" type="xs:anyURI" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>type of company (eg AG, OHG, ...), URI pointing to predefined LegalForm, compare Rechtsform</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Organization" type="xs:token" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>part of an organisation, see also X.500 ou (eg departement, section, branch, ...) , compare Organisation</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element ref="BankConnection" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="CompactCorporateBodyType">
+ <xs:annotation>
+ <xs:documentation>juridical person, organisation, compare NichtNatuerlichePersonTyp</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractPersonType">
+ <xs:sequence minOccurs="0">
+ <xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>URI pointing to a predefined Class of CorporateBodies, compare Typ</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="FullName" type="xs:token">
+ <xs:annotation>
+ <xs:documentation>name of corporate body (whole name), compare VollerName</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="LegalForm" type="xs:anyURI" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>type of company (eg AG, OHG, ...), URI pointing to predefined LegalForm, compare Rechtsform</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Organization" type="xs:token" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>part of an organisation, see also X.500 ou (eg departement, section, branch, ...) , compare Organisation</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="PersonNameType">
+ <xs:annotation>
+ <xs:documentation>container for parts of a name, comapre PersonenNameTyp</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="FormattedName" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Complete Name (including Affixes) of the Person, especially useful for names from different cultural environments</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="type" default="presentation">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="presentation"/>
+ <xs:enumeration value="legal"/>
+ <xs:enumeration value="sortOrder"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="LegalName" type="xs:string" minOccurs="0"/>
+ <xs:element name="GivenName" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Every given name should be contained inside a GivenName Tag. If that is not possible due to dabase contraints, ... putting several given names inside one GivenName Element is acceptable</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PreferredGivenName" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>A Person in possesion of more than one GivenName frequently preferrs the use of a Name other than the first GivenName</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MiddleName" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>MiddleNames are not commonly found in central Europe. The field is mainly for compatibility reasons</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="FamilyName" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Every family name should be contained inside a FamilyName Tag. If that is not possible due to dabase contraints, ... putting several family names inside one FamilyName Element is acceptable</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="primary" default="undefined">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ <xs:enumeration value="undefined"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="prefix" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Affix" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Inlcudes all Information that is not exactly a name: academic or aristocratic titles, ... the new position attribute can contain a suffx or prefix value</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="type" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="academicGrade"/>
+ <xs:enumeration value="aristocraticPrefix"/>
+ <xs:enumeration value="aristocraticTitle"/>
+ <xs:enumeration value="familyNamePrefix"/>
+ <xs:enumeration value="familyNameSuffix"/>
+ <xs:enumeration value="formOfAddress"/>
+ <xs:enumeration value="generation"/>
+ <xs:enumeration value="qualification"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="position" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="prefix"/>
+ <xs:enumeration value="suffix"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="CompactPersonNameType">
+ <xs:annotation>
+ <xs:documentation>container for parts of a name, comapre PersonenNameTyp</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="GivenName" type="xs:string" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Every given name should be contained inside a GivenName Tag. If that is not possible due to dabase contraints, ... putting several given names inside one GivenName Element is acceptable</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="FamilyName" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Every family name should be contained inside a FamilyName Tag. If that is not possible due to dabase contraints, ... putting several family names inside one FamilyName Element is acceptable</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="primary" default="undefined">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ <xs:enumeration value="undefined"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="prefix" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Affix" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>Inlcudes all Information that is not exactly a name: academic or aristocratic titles, ... the new position attribute can contain a suffx or prefix value</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="type" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="academicGrade"/>
+ <xs:enumeration value="aristocraticPrefix"/>
+ <xs:enumeration value="aristocraticTitle"/>
+ <xs:enumeration value="familyNamePrefix"/>
+ <xs:enumeration value="familyNameSuffix"/>
+ <xs:enumeration value="formOfAddress"/>
+ <xs:enumeration value="generation"/>
+ <xs:enumeration value="qualification"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="position" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="prefix"/>
+ <xs:enumeration value="suffix"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="NationalityType" mixed="true">
+ <xs:annotation>
+ <xs:documentation>comapre, StaatsangehoerigkeitTyp</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="ISOCode3" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:length value="3"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="CountryNameDE" type="xs:string" minOccurs="0"/>
+ <xs:element name="CountryNameEN" type="xs:string" minOccurs="0"/>
+ <xs:element name="CountryNameFR" type="xs:string" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="BankConnectionType">
+ <xs:annotation>
+ <xs:documentation>compare BankverbindungTyp</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="Holder" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Account holder, compare Inhaber</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="BankName" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>compare BankName</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:choice>
+ <xs:element name="NationalBankConnection">
+ <xs:annotation>
+ <xs:documentation>compare NationaleBankverbindung</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AccountNumber" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>compare Kontonummer</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="BankCode" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>compare BLZ</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="InternationalBankConnection">
+ <xs:annotation>
+ <xs:documentation>compare InternationaleBankverbindung</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="IBAN" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>compare IBAN</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="BIC" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>comapre BIC</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AbstractAddressType">
+ <xs:annotation>
+ <xs:documentation>main structure of address data</xs:documentation>
+ </xs:annotation>
+ <xs:sequence minOccurs="0">
+ <xs:element ref="Identification" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>unique identification entities</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="Id" type="xs:ID" use="optional"/>
+ <xs:anyAttribute namespace="##other"/>
+ </xs:complexType>
+ <xs:complexType name="TypedPostalAddressType">
+ <xs:annotation>
+ <xs:documentation>postal address with type information, compare TypisiertePostAdresseTyp</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractAddressType">
+ <xs:sequence minOccurs="0">
+ <xs:element name="Type" type="xs:anyURI" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>type of address - category (eg 'Wohnsitz', 'Zentrale', ...)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element ref="PostalAddress"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="PostalAddressType">
+ <xs:annotation>
+ <xs:documentation>compare PostAdresseTyp</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractAddressType">
+ <xs:sequence>
+ <xs:element name="CountryCode" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Code for the country, use ISO or internatinal Postalstandard, compare Staatscode</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[A-Z]{2}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="CountryName" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Name of the country, use ISO Name, or international Postal Standard, compare Staatsname</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PostalCode" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>ZIP, compare Postleitzahl</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Region" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>compare Region</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="State" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>compare Bundesland</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Municipality" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>compare Gemeinde</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="MunicipalityNumber" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>compare Gemeindekennzahl</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Hamlet" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>ZMR use, compare Ortschaft</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="HamletBilingual" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>ZMR use, comapre OrtschaftZweisprachig</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DeliveryAddress" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AddressLine" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="StreetName" type="xs:string" minOccurs="0"/>
+ <xs:element name="BuildingNumber" type="xs:string" minOccurs="0"/>
+ <xs:element name="Unit" type="xs:string" minOccurs="0"/>
+ <xs:element name="DoorNumber" type="xs:string" minOccurs="0"/>
+ <xs:element name="PostOfficeBox" type="xs:string" minOccurs="0"/>
+ <xs:element name="LivingQuality" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>zmr use only</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DropOffPoint" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>zmr use only</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="AreaNumber" type="xs:string" minOccurs="0"/>
+ <xs:element name="AddressRegisterEntry" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Addressregister database keys used to identify Addresses</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AddressCode" type="string7"/>
+ <xs:element name="SubCode" type="string3" minOccurs="0"/>
+ <xs:element name="ObjectNumber" type="string7" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Recipient" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>If Addressis used outside of PersonData a recipient can be specified</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="PersonName" type="PersonNameType" minOccurs="0"/>
+ <xs:element name="AdditionalText" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="Organization" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>rather OrganizationUnit e.G Sales Departement</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="OrganizationName" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>e.g. Smith Ltd</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="type" default="undefined">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="postOfficeBoxAddress"/>
+ <xs:enumeration value="streetAddress"/>
+ <xs:enumeration value="militaryAddress"/>
+ <xs:enumeration value="undefined"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="CompactPostalAddressType">
+ <xs:annotation>
+ <xs:documentation>compare PostAdresseTyp</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractAddressType">
+ <xs:sequence>
+ <xs:element name="CountryCode" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Code for the country, use ISO or internatinal Postalstandard, compare Staatscode</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[A-Z]{2}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="CountryName" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>Name of the country, use ISO Name, or international Postal Standard, compare Staatsname</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="PostalCode" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>ZIP, compare Postleitzahl</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Municipality" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>compare Gemeinde</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="DeliveryAddress">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="StreetName" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>if streetname not available use name of Ortschaft</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="BuildingNumber" type="xs:string"/>
+ <xs:element name="Unit" type="xs:string" minOccurs="0"/>
+ <xs:element name="DoorNumber" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="type" default="undefined">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="postOfficeBoxAddress"/>
+ <xs:enumeration value="streetAddress"/>
+ <xs:enumeration value="militaryAddress"/>
+ <xs:enumeration value="undefined"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="InternetAddressType">
+ <xs:annotation>
+ <xs:documentation>e.g. e-mail, webiste, compare InternetAdresseTyp</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractAddressType">
+ <xs:sequence minOccurs="0">
+ <xs:element ref="dsig:KeyInfo" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>certificate for secure communication</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Address" type="xs:anyURI">
+ <xs:annotation>
+ <xs:documentation>URI: email-Address, Web, FTP, LDAP, ..., comapre Adress</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="TelephoneAddressType">
+ <xs:annotation>
+ <xs:documentation>phone numbers, conmpare TelephoneAdresseTyp</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="AbstractAddressType">
+ <xs:sequence minOccurs="0">
+ <xs:element name="Type" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>type of phononumber - category (eg 'Festnetz', 'Mobile', 'fax', ...)</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="Number" type="TelcomNumberType">
+ <xs:annotation>
+ <xs:documentation>phonenumber</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>any additional properties</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="MobileTelcomNumberType">
+ <xs:annotation>
+ <xs:documentation>like TelephoneAddresseType but with additional smsEnabled attribute</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="TelcomNumberType">
+ <xs:attribute name="smsEnabled" type="xs:boolean" use="optional"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="TelcomNumberType">
+ <xs:annotation>
+ <xs:documentation>formated number or set of telephone number parts</xs:documentation>
+ </xs:annotation>
+ <xs:choice>
+ <xs:element ref="FormattedNumber"/>
+ <xs:group ref="TelcomNumberGroup"/>
+ </xs:choice>
+ </xs:complexType>
+ <xs:group name="TelcomNumberGroup">
+ <xs:annotation>
+ <xs:documentation>set of telephone number parts</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element ref="InternationalCountryCode" minOccurs="0"/>
+ <xs:element ref="NationalNumber" minOccurs="0"/>
+ <xs:element ref="AreaCityCode" minOccurs="0"/>
+ <xs:element ref="SubscriberNumber"/>
+ <xs:element ref="Extension" minOccurs="0"/>
+ </xs:sequence>
+ </xs:group>
+ <!-- ### auxiliary types ### -->
+ <xs:simpleType name="BankConnectionTypeType">
+ <xs:annotation>
+ <xs:documentation>known + any other bank account types</xs:documentation>
+ </xs:annotation>
+ <xs:union memberTypes="xStringPatternExtensionType DefinedBankConnectionTypeType"/>
+ </xs:simpleType>
+ <xs:simpleType name="DefinedBankConnectionTypeType">
+ <xs:annotation>
+ <xs:documentation>known/commin type of bank accounts</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
+ <xs:simpleType name="SexType">
+ <xs:annotation>
+ <xs:documentation>simple type for sex (gender) of person</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="male"/>
+ <xs:enumeration value="female"/>
+ <xs:enumeration value="unknown"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="DateOfBirthType">
+ <xs:annotation>
+ <xs:documentation>simple type for dates (union), which may omit day and/or month</xs:documentation>
+ </xs:annotation>
+ <xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
+ </xs:simpleType>
+ <xs:simpleType name="DateOfDeathType">
+ <xs:annotation>
+ <xs:documentation>simple type for dates (union), which may omit day and/or month</xs:documentation>
+ </xs:annotation>
+ <xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
+ </xs:simpleType>
+ <xs:simpleType name="MaritalStatusType">
+ <xs:annotation>
+ <xs:documentation>simple type for marital status of a person</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="single"/>
+ <xs:enumeration value="married"/>
+ <xs:enumeration value="divorced"/>
+ <xs:enumeration value="widowed"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="xStringPatternExtensionType">
+ <xs:annotation>
+ <xs:documentation>pattern type for enlargement of type definitions. Contents as follows
+x:sometext or 12345 or _ or other symbols
+</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="x:\S.*"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="DefinedRelationType">
+ <xs:annotation>
+ <xs:documentation>known relations (family + functional)</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="family:Parent"/>
+ <xs:enumeration value="family:Child"/>
+ <xs:enumeration value="family:Sibling"/>
+ <xs:enumeration value="family:Grandparent"/>
+ <xs:enumeration value="family:Grandchild"/>
+ <xs:enumeration value="family:Spouse"/>
+ <xs:enumeration value="function:LegalGuardian"/>
+ <xs:enumeration value="function:IsGuardedBy"/>
+ <xs:enumeration value="function:Cohabitant"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="RelationType">
+ <xs:annotation>
+ <xs:documentation>known + any other relation</xs:documentation>
+ </xs:annotation>
+ <xs:union memberTypes="xStringPatternExtensionType DefinedRelationType"/>
+ </xs:simpleType>
+ <xs:simpleType name="DefinedAlternativeNameTypeType">
+ <xs:annotation>
+ <xs:documentation>known types of alternative names</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="ArtistName"/>
+ <xs:enumeration value="NickName"/>
+ <xs:enumeration value="FormerName"/>
+ <xs:enumeration value="Alias"/>
+ <xs:enumeration value="MaidenName"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="AlternativeNameTypeType">
+ <xs:annotation>
+ <xs:documentation>known + any other alternative name types</xs:documentation>
+ </xs:annotation>
+ <xs:union memberTypes="xStringPatternExtensionType DefinedAlternativeNameTypeType"/>
+ </xs:simpleType>
+ <!-- ### additional data types for ZMR address #### -->
+ <xs:simpleType name="FederalStateType">
+ <xs:annotation>
+ <xs:documentation>zmr use only</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Wien"/>
+ <xs:enumeration value="Niederösterreich"/>
+ <xs:enumeration value="Burgenland"/>
+ <xs:enumeration value="Oberösterreich"/>
+ <xs:enumeration value="Steiermark"/>
+ <xs:enumeration value="Salzburg"/>
+ <xs:enumeration value="Kärnten"/>
+ <xs:enumeration value="Tirol"/>
+ <xs:enumeration value="Vorarlberg"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <!-- ### strings of defined maximum lenght for use with ZMR address ###-->
+ <xs:simpleType name="string3">
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="3"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="string4">
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="4"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="string7">
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="7"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="string20">
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="20"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="string30">
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="30"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="string50">
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="50"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="string100">
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="100"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="integer5">
+ <xs:restriction base="xs:integer">
+ <xs:minInclusive value="10000"/>
+ <xs:maxInclusive value="99999"/>
+ </xs:restriction>
+ </xs:simpleType>
+</xs:schema>
diff --git a/id.oa/.classpath b/id.oa/.classpath
deleted file mode 100644
index 5af765a17..000000000
--- a/id.oa/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path=""/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/id.oa/.cvsignore b/id.oa/.cvsignore
deleted file mode 100644
index a9a5aecf4..000000000
--- a/id.oa/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tmp
diff --git a/id.oa/.project b/id.oa/.project
deleted file mode 100644
index e49130a5f..000000000
--- a/id.oa/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>id.oa</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.ibm.etools.ctc.serviceprojectbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/id.oa/build.xml b/id.oa/build.xml
deleted file mode 100644
index adb191e76..000000000
--- a/id.oa/build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Ant Buildfile for MOA ID Auth component
-
- $Id$
-
--->
-<project name="id.oa" default="package" basedir=".">
- <property name="tmp" value="tmp"/>
- <property name="dist" value="${tmp}/dist"/>
-
- <!-- set up directories etc. -->
- <target name="init">
- <tstamp/>
- <echo>Time (hhmm): ${TSTAMP}</echo>
- <mkdir dir="${tmp}"/>
- <mkdir dir="${dist}"/>
- </target>
-
- <!-- package oa.war -->
- <target name="package" depends="init">
- <war warfile="${dist}/oa.war" webxml="web.xml">
- <fileset dir="html"/>
- </war>
- </target>
-
- <!-- clean temporary files -->
- <target name="clean">
- <delete dir="${tmp}"/>
- </target>
-</project>
diff --git a/id.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 35e49d743..000000000
--- a/id.oa/html/index.jsp
+++ /dev/null
@@ -1,60 +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 headers = request.getHeaderNames(); headers.hasMoreElements(); ) {
- String key = (String) headers.nextElement();
- String value = request.getHeader(key); %>
- <tr><td><%=key%></td><td><%=value%></td></tr>
- <% } %>
-</table>
-</p>
-
-<% String query=request.getQueryString(); %>
-<p>QueryString: "<%=query%>"
-</p>
-
-<p>Request parameters:
-<table border="1">
- <%
- /* collect parameters from request */
- for (Enumeration params = request.getParameterNames(); params.hasMoreElements(); ) {
- String name = (String) params.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.templates/.project b/id.templates/.project
deleted file mode 100644
index 055d6569e..000000000
--- a/id.templates/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>id.templates</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.ibm.etools.ctc.serviceprojectbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/id.templates/build.xml b/id.templates/build.xml
deleted file mode 100644
index 696616eaa..000000000
--- a/id.templates/build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Ant Buildfile for MOA ID templates component
-
- $Id$
-
--->
-<project name="id.templates" default="package" basedir=".">
- <property name="tmp" value="tmp"/>
- <property name="dist" value="${tmp}/dist"/>
-
- <!-- set up directories etc. -->
- <target name="init">
- <tstamp/>
- <echo>Time (hhmm): ${TSTAMP}</echo>
- <mkdir dir="${tmp}"/>
- <mkdir dir="${dist}"/>
- </target>
-
- <!-- package templates.war -->
- <target name="package" depends="init">
- <war warfile="${dist}/moaid-templates.war" webxml="web.xml">
- <fileset dir="html"/>
- </war>
- </target>
-
- <!-- clean temporary files -->
- <target name="clean">
- <delete dir="${tmp}"/>
- </target>
-</project>
diff --git a/id.templates/html/SampleBKUSelectionTemplate.html b/id.templates/html/SampleBKUSelectionTemplate.html
deleted file mode 100644
index 5536226a8..000000000
--- a/id.templates/html/SampleBKUSelectionTemplate.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>MOA ID - Auswahl der B&uuuml;rgerkartenumgebung</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta name="Author" content="Max Mustermann">
- <meta name="keywords" content="MOA-ID">
- <link rel="stylesheet" type="text/css" href="/moaid-templates/css/main.css">
- <link rel="stylesheet" type="text/css" href="/moaid-templates/css/display.css" media="screen,projection,tv,handheld">
-</head>
-
-<body>
-<img src="/moaid-templates/SampleLogo.gif" alt='Organisation XY'>
-<h1 align="center">Auswahl der B&uuml;rgerkartenumgebung</h1>
-<p></p>
-<p>Sie haben sich f&uuml;r Anmeldung mit Ihrer B&uuml;rgerkarte entschieden. Da es verschiedene Formen der B&uuml;rgerkarte gibt, m&uuml;ssen Sie nun w&auml;hlen, welche Sie bei der Anmeldung verwenden wollen.</p>
-<h3>Auswahl der B&uuml;rgerkarte</h3>
-<form name="CustomizedForm" method="post" action="<StartAuth>">
- <BKUSelect>
- <input type="submit" value="Ausw&auml;hlen"/>
-</form>
-<br/>
-<p></p>
-
- <input type="hidden" value="Weitere Info"/>
-</form>
-
-<h4>Hinweise: </h4>
-<ul>
- <li>
- <p>Wollen Sie eine A-Trust B&uuml;rgerkarte erwerben? Hier finden Sie Informationen
- dazu: <a href="http://www.a-trust.at/info.asp?node=337" target="_blank">A-Trust
- B&uuml;rgerkarte.</a> Bei der Anmeldung mit der A-Trust B&uuml;rgerkarte
- ben&ouml;tigen Sie eine funktionsf&auml;hige B&uuml;rgerkartensoftware sowie
- einen passenden Kartenleser.</p>
- </li>
- <li>
- <p>Wollen Sie ein A1-Signatur erwerben? Wenden Sie sich an 0800-664 680 um
- Informationen zur A1-Signatur zu erhalten.
- Hier finden Sie ebenfalls Informationen dazu: <a href="http://www.a1.net/signatur" target="_blank">A1-Signatur</a>.
- Bei der Anmeldung mit der A1-Signatur wird keine B&uuml;rgerkartensoftware und
- kein Kartenleser ben&ouml;tigt.</p>
- </li>
-</ul>
-<div align="right"><a href="http://validator.w3.org/check?uri=http://localhost:8080/moaid-templates/SampleBKUSElectionTemplate.html"><img border="0"
- src="/moaid-templates/valid-html401.gif"
- alt="Valid HTML 4.01!" height="31" width="88"></a> </div>
-<p align="right">&nbsp; </p>
-
-
-</body>
-</html>
diff --git a/id.templates/html/SampleLogo.gif b/id.templates/html/SampleLogo.gif
deleted file mode 100644
index 4b7c682b1..000000000
--- a/id.templates/html/SampleLogo.gif
+++ /dev/null
Binary files differ
diff --git a/id.templates/html/SampleTemplate.html b/id.templates/html/SampleTemplate.html
deleted file mode 100644
index efaa52795..000000000
--- a/id.templates/html/SampleTemplate.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>MOA ID - Identifizierter Zugang mit B&uuml;rgerkarte</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta name="Author" content="Max Mustermann">
- <meta name="keywords" content="MOA-ID">
- <link rel="stylesheet" type="text/css" href="/moaid-templates/css/main.css">
- <link rel="stylesheet" type="text/css" href="/moaid-templates/css/display.css" media="screen,projection,tv,handheld">
-</head>
-
-<body>
-<img src="/moaid-templates/SampleLogo.gif" alt='Organisation XY'>
-<h1 align="center">Sicherer Zugang zur Online-Anwendung mit B&uuml;rgerkarte</h1>
-<p></p>
-
-Der identifizierte Zugang erfolgt &uuml;ber die Module f&uuml;r Online Applikationen (MOA) unter Verwendung einer B&uuml;rgerkarte und deren Signaturfunktion.
-
-<p></p>
-<p>Wenn Sie in Folge die Schaltfl&auml;che "Anmeldung mit B&uuml;rgerkarte"
-aktivieren, so werden zur Signatur der Anmeldedaten aufgefordert. Wenn sie diese
-signieren, so werden sie zur Online-Anwendung weitergeleitet und angemeldet.</p>
-
-
-<form name="CustomizedForm" action="<BKU>" method="post">
- <div align="center">
- <input type="hidden"
- name="XMLRequest"
- value="<XMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<DataURL>"/>
- <input type="submit" value="Anmeldung mit B&uuml;rgerkarte" name="submit"/>
- </div>
-</form>
-<form name="CustomizedInfoForm"
- action="<BKU>"
- method="post">
- <input type="hidden"
- name="XMLRequest"
- value="<CertInfoXMLRequest>"/>
- <input type="hidden"
- name="DataURL"
- value="<CertInfoDataURL>"/>
-
-
-<br/>
-<p></p>
-
- <input type="hidden" value="Weitere Info"/>
-</form>
-
-<div align="right"><a href="http://validator.w3.org/check?uri=http://localhost:8080/moaid-templates/SampleTemplate.html"><img border="0"
- src="/moaid-templates/valid-html401.gif"
- alt="Valid HTML 4.01!" height="31" width="88"></a> </div>
-<p align="right">&nbsp; </p>
-
-</body>
-</html>
diff --git a/id.templates/html/css/display.css b/id.templates/html/css/display.css
deleted file mode 100644
index fc6da85b0..000000000
--- a/id.templates/html/css/display.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Beispiel Display-Stylesheet */
-
-span.printText {
- font-size:80%;
- margin-left:1em;
- margin-top:-1.2em;
- margin-bottom:1em;
- font-weight:bold;
- float:right
-}
-
-#mainmenu {
- padding-left: 8px
-}
-
-#currentcontext {
- background-color:#eff3ff;
- border-top: 1px solid #76769f;
- border-bottom: 1px solid #76769f;
-}
-
-#contextmenu {
- position: absolute;
- padding-top: 0.5em;
- margin-top: 1em;
- background: #e7e9f6;
- width: 12.5em;
-}
-
-#contextmenubottom {
- padding-top:1em;
- background:white;
- background-image:url(/style/img/mnv.gif);
- background-repeat:repeat-x;
-}
-
-#contentcontainer {
- position: absolute;
- padding: 0px;
- margin-left: 13.5em;
- margin-top: 1em;
- width: 40em;
- text-align: justify;
-}
-
-#content {
- margin-top:0em;
- margin-left:1em;
-}
-
-
-/* #z_location { font-size:80%; margin-left:1em; padding-top:1em; } */
diff --git a/id.templates/html/css/main.css b/id.templates/html/css/main.css
deleted file mode 100644
index bcad5589c..000000000
--- a/id.templates/html/css/main.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Haupt-Stylesheet fuer z.B. für CIO/ciointern/iktintern/WSIS Webseite sowie in MOA-ID Templates*/
-/* Original design by Tinfish Media Lab */
-/* Additional design by Bernd Martin, Arno Hollosi */
-
-body {
- margin-bottom:0.5em;
- margin-right:2em;
- margin-left:0.5em;
- margin-top:0.5em;
- background-color:#FFFFFF;
- color:#000000;
-}
-
-/* Font */
-body,table,td,th
-{
- font-family:arial,sans-serif;
- font-size:small;
-}
-th { background-color:#ffffbb; color:#000000; }
-
-
-/* Ueberschriften */
-h1,h2,h3,h4,h5
-{
- color:#336699;
- background-color:#FFFFFF;
-}
-h1 { font-size:140%; }
-h2 { font-size:120%; }
-h3 { font-size:110%; }
-
-/* Links */
-a:link { color:#336699; text-decoration:none; }
-a:visited { color:#660066; text-decoration:none; }
-a:active { color:#336699; text-decoration:none; }
-a:hover { color:#000000; text-decoration:underline; }
-
-dt { font-weight:bold; }
-
-dl.filelist dt { font-weight: normal; }
-dl.filelist dd { margin-bottom: 0.5em; }
-
-
-div.pic { font-size:80%; color:#888888; background-color:#FFFFFF; }
-
-div.verz0 { margin-left:0em; }
-div.verz1 { margin-left:1em; }
-div.verz2 { margin-left:2em; }
-div.verz3 { margin-left:3em; }
-div.verz4 { margin-left:4em; }
-div.verz5 { margin-left:5em; }
-div.verz6 { margin-left:6em; }
-div.verz7 { margin-left:7em; }
-
-div.backLink { font-size:70%; margin-left:0em; margin-bottom:0em; font-weight:bold }
-div.noJavaScript { font-size:70%; margin-top:1.2em; margin-bottom:1.2em; font-weight:bold }
-
-div.newsDate { font-size:70%; margin-left:0em; margin-bottom:0em; margin-top:1em; font-weight:bold }
-div.newsTitle { font-size:100%; margin-left:0em; margin-bottom:0.1em; font-weight:bold }
-div.newsDesc { font-size:90%; margin-left:2em; margin-bottom:0em; }
-div.newsCreator { font-size:70%; margin-left:2.6em; margin-bottom:1em; }
-div.newsResultDesc { font-size:90%; margin-left:2em; margin-bottom:1em; }
-
-div.indentSmall { margin-left:1em }
-div.indentNormal { margin-left:1.5em }
-div.indentHigh { margin-left:2em }
-
-div.pic { font-size:80%; color:#888888; background-color:#FFFFFF; }
-
-span.hinw { color:#993333; background-color:#FFFFFF; }
-span.filesizeinfo { font-size:75% }
-span.imprintText { font-size:80%; margin-left:1em; float:right }
-span.footer { font-size:80%; margin-left:1em; margin-bottom:1em;}
diff --git a/id.templates/html/valid-html401.gif b/id.templates/html/valid-html401.gif
deleted file mode 100644
index 1270561e1..000000000
--- a/id.templates/html/valid-html401.gif
+++ /dev/null
Binary files differ
diff --git a/id.templates/web.xml b/id.templates/web.xml
deleted file mode 100644
index 6954e9c87..000000000
--- a/id.templates/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 MOA-ID Templates</display-name>
- <description>>Sample MOA-ID Templates</description>
-</web-app>
-
diff --git a/spss.handbook/.classpath b/spss.handbook/.classpath
deleted file mode 100644
index c453f0ebd..000000000
--- a/spss.handbook/.classpath
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="clients/webservice/src"/>
- <classpathentry kind="src" path="clients/api/src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="clients/api/lib/iaik-moa-20060316/signed/iaik_ecc.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/iaik-moa-20060316/iaik_cms.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/iaik-moa-20060316/iaik_ixsil.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/iaik-moa-20060316/iaik_moa_full.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/iaik-moa-20060316/iaik_Pkcs11Wrapper.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/iaik-moa-20060316/signed/iaik_Pkcs11Provider.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/jaxen-1.0/jaxen-core.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/jaxen-1.0/jaxen-dom.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/jaxen-1.0/saxpath.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/jaxp-1.2_01/dom.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/jaxp-1.2_01/jaxp-api.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/jaxp-1.2_01/sax.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/postgres-jdbc2-7.3/pg73jdbc2.jar"/>
- <classpathentry kind="lib" path="clients/api/lib/xalan-j-2.5.1/xalan.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/axis-1_1/axis.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jcert.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/xerces-j-2.4.0/xercesImpl.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/axis-1_1/axis-ant.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/axis-1_1/commons-discovery.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/axis-1_1/commons-logging.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/axis-1_1/commons-logging-api.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/axis-1_1/jaxrpc.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/axis-1_1/log4j-1.2.8.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/axis-1_1/saaj.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/axis-1_1/wsdl4j.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jnet.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jsse.jar"/>
- <classpathentry kind="lib" path="clients/webservice/lib/xerces-j-2.4.0/xmlParserAPIs.jar"/>
- <classpathentry kind="src" path="/common"/>
- <classpathentry kind="src" path="/spss.server"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/spss.handbook/.cvsignore b/spss.handbook/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/spss.handbook/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/spss.handbook/.project b/spss.handbook/.project
deleted file mode 100644
index a0a76eb28..000000000
--- a/spss.handbook/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>spss.handbook</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/spss.handbook/clients/api/lib/commons-discovery-0.2/commons-discovery.jar b/spss.handbook/clients/api/lib/commons-discovery-0.2/commons-discovery.jar
deleted file mode 100644
index b88554847..000000000
--- a/spss.handbook/clients/api/lib/commons-discovery-0.2/commons-discovery.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging-api.jar b/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging-api.jar
deleted file mode 100644
index ade9a13c7..000000000
--- a/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging-api.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging.jar b/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging.jar
deleted file mode 100644
index b73a80fab..000000000
--- a/spss.handbook/clients/api/lib/commons-logging-1.0.4/commons-logging.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_Pkcs11Provider.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_Pkcs11Provider.jar
deleted file mode 100644
index b317a39dd..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_Pkcs11Provider.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_Pkcs11Wrapper.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_Pkcs11Wrapper.jar
deleted file mode 100644
index 0ee74172b..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_Pkcs11Wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_cms.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_cms.jar
deleted file mode 100644
index 7264a68f3..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_cms.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_ecc.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_ecc.jar
deleted file mode 100644
index d927d52e7..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_ecc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_ixsil.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_ixsil.jar
deleted file mode 100644
index 0f1027c15..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_ixsil.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_jce_full.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_jce_full.jar
deleted file mode 100644
index f09377142..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_jce_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_moa_full.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_moa_full.jar
deleted file mode 100644
index 2b2bace43..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/iaik_moa_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_Pkcs11Provider.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_Pkcs11Provider.jar
deleted file mode 100644
index 20ccd0d2d..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_Pkcs11Provider.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_ecc.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_ecc.jar
deleted file mode 100644
index 3dd52d3dd..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_ecc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_jce_full.jar b/spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_jce_full.jar
deleted file mode 100644
index c7258e64d..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/signed/iaik_jce_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/iaik-moa-20060316/win32/pkcs11wrapper.dll b/spss.handbook/clients/api/lib/iaik-moa-20060316/win32/pkcs11wrapper.dll
deleted file mode 100644
index da6bcf963..000000000
--- a/spss.handbook/clients/api/lib/iaik-moa-20060316/win32/pkcs11wrapper.dll
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-core.jar b/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-core.jar
deleted file mode 100644
index e52bf679c..000000000
--- a/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-core.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-dom.jar b/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-dom.jar
deleted file mode 100644
index 1a9926357..000000000
--- a/spss.handbook/clients/api/lib/jaxen-1.0/jaxen-dom.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/jaxen-1.0/saxpath.jar b/spss.handbook/clients/api/lib/jaxen-1.0/saxpath.jar
deleted file mode 100644
index 2b43955ba..000000000
--- a/spss.handbook/clients/api/lib/jaxen-1.0/saxpath.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/jaxp-1.2_01/dom.jar b/spss.handbook/clients/api/lib/jaxp-1.2_01/dom.jar
deleted file mode 100644
index f91f80a8b..000000000
--- a/spss.handbook/clients/api/lib/jaxp-1.2_01/dom.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/jaxp-1.2_01/jaxp-api.jar b/spss.handbook/clients/api/lib/jaxp-1.2_01/jaxp-api.jar
deleted file mode 100644
index 7a3295ee6..000000000
--- a/spss.handbook/clients/api/lib/jaxp-1.2_01/jaxp-api.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/jaxp-1.2_01/sax.jar b/spss.handbook/clients/api/lib/jaxp-1.2_01/sax.jar
deleted file mode 100644
index 9ffb844e5..000000000
--- a/spss.handbook/clients/api/lib/jaxp-1.2_01/sax.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/log4j-1.2.7/log4j-1.2.7.jar b/spss.handbook/clients/api/lib/log4j-1.2.7/log4j-1.2.7.jar
deleted file mode 100644
index 1595a56ef..000000000
--- a/spss.handbook/clients/api/lib/log4j-1.2.7/log4j-1.2.7.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/postgres-jdbc2-7.3/pg73jdbc2.jar b/spss.handbook/clients/api/lib/postgres-jdbc2-7.3/pg73jdbc2.jar
deleted file mode 100644
index 8bf46dd8e..000000000
--- a/spss.handbook/clients/api/lib/postgres-jdbc2-7.3/pg73jdbc2.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/lib/xalan-j-2.5.1/xalan.jar b/spss.handbook/clients/api/lib/xalan-j-2.5.1/xalan.jar
deleted file mode 100644
index 44d4d094d..000000000
--- a/spss.handbook/clients/api/lib/xalan-j-2.5.1/xalan.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/api/signatures/SimpleSignature.xml b/spss.handbook/clients/api/signatures/SimpleSignature.xml
deleted file mode 100644
index 9ecd215c1..000000000
--- a/spss.handbook/clients/api/signatures/SimpleSignature.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature> \ No newline at end of file
diff --git a/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.java b/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.java
deleted file mode 100644
index 2534e4913..000000000
--- a/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.api;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.SignatureCreationService;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * Dieses einfache Beispiel demonstriert grundlegend den Gebrauch der API von MOA SP/SS. Es wird damit eine
- * einfach aufgebaute XML-Signatur erzeugt.
- */
-public class CreateXMLSignature
-{
- /**
- * Methode main.
- *
- * Enthält beispielhaften Code zum grundlegenden Gebrauch der API von MOA SP/SS. Es wird damit eine
- * einfach aufgebaute XML-Signatur erzeugt.
- *
- * ACHTUNG: Stellen Sie bei Verwendung von J2SE 1.4.x bzw. 5.x sicher, dass Sie die System-Property
- * <code>java.endorsed.dirs</code> auf jenes Verzeichnis gesetzt haben, in dem sich die XPath-
- * und XSLT-Bibliothek <em>Xalan-J</em> befindet.
- *
- * @param args <ul>
- * <li>
- * args[0] enthält einen Verweis auf die Konfigurations-Datei von MOA SP/SS Der Verweis
- * enthält entweder eine absolute oder eine relative Pfadangabe, wobei eine relative
- * Angabe als relativ zum Arbeitsverzeichnis der Java VM interpretiert wird.
- * </li>
- * <li>
- * args[1] enthält einen Verweis auf die Konfigurations-Datei von Log4J, dem Logging-
- * Framework, das von MOA SP/SS verwendet wird. Der Verweis enthält entweder eine
- * absolute oder eine relative Pfadangabe, wobei eine relative Angabe als relativ zum
- * Arbeitsverzeichnis der Java VM interpretiert wird.
- * </li>
- * </ul>
- *
- * @throws Exception Sollten Fehler auftreten werden die Fehler an die Java-VM weitergeleitet.
- */
- public static void main(String[] args) throws Exception
- {
- // Setzen der System-Properties
- init(args);
-
- // Serverfunktionshandler instanzieren
- SPSSFactory spf = SPSSFactory.getInstance();
-
- // Zu signierende Daten in ein Contentobjekt einbinden (die Daten werden hier explizit angegeben,
- // sollen aber in der Signatur mittels URL "http://uri.data.org" referenziert werden
- byte[] data = "Diese Daten werden signiert.".getBytes("UTF-8");
- ByteArrayInputStream bis = new ByteArrayInputStream(data);
- Content cont = spf.createContent(bis, null);
-
- // Metainformationen zu den zu signierenden Daten erstellen
- MetaInfo mi = spf.createMetaInfo("text/plain", null, null, null);
-
- // Transformationen erstellen (hier werden keine Transformationen angewandt)
- CreateTransformsInfo cti = spf.createCreateTransformsInfo(null, mi);
- CreateTransformsInfoProfile ct = spf.createCreateTransformsInfoProfile(cti, null);
-
- // Datenobjekt aufbauen
- DataObjectInfo doi = spf.createDataObjectInfo(DataObjectInfo.STRUCTURE_ENVELOPING, false, cont, ct);
-
- // Erstellen eines SingleSignatureInfo-Containers
- // Enthält alle Angaben zur Erstellung *einer* Signatur
- List dataobjectinfolist = new ArrayList();
- dataobjectinfolist.add(doi);
- SingleSignatureInfo ssi = spf.createSingleSignatureInfo(dataobjectinfolist, null, false);
-
- // Erstellen des Request-Objekts (Schlüsselbezeichner, Liste von SingleSignatureInfo-Containern)
- List singlesignatureinfolist = new ArrayList();
- singlesignatureinfolist.add(ssi);
- CreateXMLSignatureRequest cxsreq = spf.createCreateXMLSignatureRequest("KG_allgemein",
- singlesignatureinfolist);
-
- // Signatureerstellungsservice instanzieren und aufrufen
- SignatureCreationService scs = SignatureCreationService.getInstance();
- CreateXMLSignatureResponse cxsres = scs.createXMLSignature(cxsreq);
-
- // Response auswerten
- List elements = cxsres.getResponseElements();
- SignatureEnvironmentResponse ser = (SignatureEnvironmentResponse) elements.get(0);
-
- // Auswertung des ersten (und einzigen) SignatureEnvironmentResponse-Containers
- int response_type = ser.getResponseType();
-
- if (response_type == SignatureEnvironmentResponse.ERROR_RESPONSE)
- {
- // Fehlerfall
- System.out.println("Bei der Erstellung der Signatur ist ein Fehler aufgetreten.");
- }
- else
- {
- // Signaturerstellung erfolgreich
- System.out.println("Signaturerstellung erfolgreich:");
-
- Element se = ser.getSignatureEnvironment();
- System.out.println(DOMUtils.serializeNode(se));
- }
- }
-
- /**
- * Setzt die notwendigen System-Properties für die Konfiguration der MOA SP/SS API.
- *
- * @param args Siehe @link CreateXMLSignature#main(String[]).
- */
- private static void init(String[] args)
- {
- if (args == null || args.length != 2)
- {
- System.out.println("Verwendung: CreateXMLSignature <MOASPSSConfigFile> <Log4JConfigFile>");
- }
- System.setProperty("moa.spss.server.configuration", args[0]);
- System.setProperty("log4j.configuration", "file:" + args[1]);
- }
-} \ No newline at end of file
diff --git a/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.java b/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.java
deleted file mode 100644
index fed8ba9f2..000000000
--- a/spss.handbook/clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.api;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.HashMap;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.SignatureVerificationService;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
-/**
- * Dieses einfache Beispiel demonstriert grundlegend den Gebrauch der API von MOA SP/SS.
- * Es wird damit eine einfach aufgebaute XML-Signatur geprüft.
- */
-
-public class VerifyXMLSignature
-{
- /**
- * Methode main.
- *
- * Enthält beispielhaften Code zum grundlegenden Gebrauch der API von MOA SP/SS.
- * Es wird damit eine einfach aufgebaute XML-Signatur geprüft.
- *
- * ACHTUNG: Stellen Sie bei Verwendung von J2SE 1.4.x bzw. 5.x sicher, dass Sie die System-Property
- * <code>java.endorsed.dirs</code> auf jenes Verzeichnis gesetzt haben, in dem sich die XPath-
- * und XSLT-Bibliothek <em>Xalan-J</em> befindet.
- *
- * @param args <ul>
- * <li>
- * args[0] enthält einen Verweis auf die Konfigurations-Datei von MOA SP/SS Der Verweis
- * enthält entweder eine absolute oder eine relative Pfadangabe, wobei eine relative
- * Angabe als relativ zum Arbeitsverzeichnis der Java VM interpretiert wird.
- * </li>
- * <li>
- * args[1] enthält einen Verweis auf die Konfigurations-Datei von Log4J, dem Logging-
- * Framework, das von MOA SP/SS verwendet wird. Der Verweis enthält entweder eine
- * absolute oder eine relative Pfadangabe, wobei eine relative Angabe als relativ zum
- * Arbeitsverzeichnis der Java VM interpretiert wird.
- * </li>
- * <li>
- * args[2] enthält Pfad und Dateiname des XML-Dokuments mit der darin enthaltenen, zu
- * prüfenden XML-Signatur. Verwenden Sie z.B. das mit diesem Handbuch mitgelieferte
- * Beispiel <code>clients/api/signatures/SimpleSignature.xml</code>.
- * </li>
- * </ul>
- */
- public static void main(String[] args)
- {
- // Setzen der System-Properties
- init(args);
-
- // Factory und Service instanzieren
- SPSSFactory spssFac = SPSSFactory.getInstance();
- SignatureVerificationService sigVerifyService = SignatureVerificationService.getInstance();
-
- // Content aus Dokument mit zu prüfender Signatur erstellen
- FileInputStream sigDocFIS = null;
- try
- {
- sigDocFIS = new FileInputStream(args[2]);
- }
- catch (FileNotFoundException e1)
- {
- System.err.println("XML-Dokument mit zu prüfender Signatur nicht gefunden: " + args[2]);
- System.exit(-1);
- }
- Content sigDocContent = spssFac.createContent(sigDocFIS, null);
-
- // Position der zu prüfenden Signatur im Dokument angeben
- // (Nachdem im XPath-Ausdruck ein NS-Präfix verwendet wird, muss in einer Lookup-Tabelle
- // der damit bezeichnete Namenraum mitgegeben werden)
- HashMap nSMap = new HashMap();
- nSMap.put("dsig", "http://www.w3.org/2000/09/xmldsig#");
- VerifySignatureLocation sigLocation = spssFac.createVerifySignatureLocation("//dsig:Signature", nSMap);
-
- // Zu prüfendes Dokument und Signaturposition zusammenfassen
- VerifySignatureInfo sigInfo = spssFac.createVerifySignatureInfo(sigDocContent, sigLocation);
-
- // Prüfrequest zusammenstellen
- VerifyXMLSignatureRequest verifyRequest = spssFac.createVerifyXMLSignatureRequest(
- null, // Wird Prüfzeit nicht angegeben, wird aktuelle Zeit verwendet
- sigInfo,
- null, // Keine Ergänzungsobjekte notwendig
- null, // Signaturmanifest-Prüfung soll nicht durchgeführt werden
- false, // Hash-Inputdaten, d.h. tatsächlich signierte Daten werden nicht zurückgeliefert
- "Test-Signaturdienste"); // ID des verwendeten Vertrauensprofils
-
- VerifyXMLSignatureResponse verifyResponse = null;
- try
- {
- // Aufruf der Signaturprüfung
- verifyResponse = sigVerifyService.verifyXMLSignature(verifyRequest);
- }
- catch (MOAException e)
- {
- // Service liefert Fehler
- System.err.println("Die Signaturprüfung hat folgenden Fehler geliefert:");
- System.err.println("Fehlercode: " + e.getMessageId());
- System.err.println("Fehlernachricht: " + e.getMessage());
- System.exit(-1);
- }
-
- // Auswertung der Response
- System.out.println();
- System.out.println("Ergebnisse der Signaturprüfung:");
- System.out.println();
-
- // Besondere Eigenschaften des Signatorzertifikats
- SignerInfo signerInfo = verifyResponse.getSignerInfo();
- System.out.println("*** Ist Zertifikat des Signators qualifiziert? " + ((signerInfo.isQualifiedCertificate()) ? "ja" : "nein"));
- System.out.println("*** Ist Zertifikat des Signators von einer Behörde? " + ((signerInfo.isPublicAuthority()) ? "ja" : "nein"));
-
- // Ergebnisse von Signatur- und Zertifikatsprüfung
- System.out.println();
- System.out.println("Ergebniscode der Signaturprüfung: " + verifyResponse.getSignatureCheck().getCode());
- System.out.println("Ergebniscode der Zertifikatsprüfung: " + verifyResponse.getCertificateCheck().getCode());
-
- // Signatorzertifikat
- System.out.println();
- System.out.println("*** Zertifikat des Signators:");
- System.out.println("Aussteller: " + signerInfo.getSignerCertificate().getIssuerDN());
- System.out.println("Subject: " + signerInfo.getSignerCertificate().getSubjectDN());
- System.out.println("Seriennummer: " + signerInfo.getSignerCertificate().getSerialNumber());
- }
-
- /**
- * Setzt die notwendigen System-Properties für die Konfiguration der MOA SP/SS API.
- *
- * @param args Siehe @link VerifyXMLSignature#main(String[]).
- */
- private static void init(String[] args)
- {
- if (args == null || args.length != 3)
- {
- System.out.println("Verwendung: VerifyXMLSignature <MOASPSSConfigFile> <Log4JConfigFile> <XMLDocWithSignature>");
- System.exit(-1);
- }
- System.setProperty("moa.spss.server.configuration", args[0]);
- System.setProperty("log4j.configuration", "file:" + args[1]);
- }
-} \ No newline at end of file
diff --git a/spss.handbook/clients/common/referencedData/Text.b64 b/spss.handbook/clients/common/referencedData/Text.b64
deleted file mode 100644
index 0f4636b9a..000000000
--- a/spss.handbook/clients/common/referencedData/Text.b64
+++ /dev/null
@@ -1 +0,0 @@
-RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu \ No newline at end of file
diff --git a/spss.handbook/clients/common/referencedData/Text.txt b/spss.handbook/clients/common/referencedData/Text.txt
deleted file mode 100644
index 3a75c06b3..000000000
--- a/spss.handbook/clients/common/referencedData/Text.txt
+++ /dev/null
@@ -1 +0,0 @@
-Diese Daten sind reiner Text. \ No newline at end of file
diff --git a/spss.handbook/clients/common/referencedData/WEB-INF/web.xml b/spss.handbook/clients/common/referencedData/WEB-INF/web.xml
deleted file mode 100644
index 002520ba5..000000000
--- a/spss.handbook/clients/common/referencedData/WEB-INF/web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <display-name>MOA Webservice Client: Referenzierte Web-Daten</display-name>
- <description>MOA Webservice Client: Referenzierte Web-Daten</description>
-</web-app>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.Para.xsl b/spss.handbook/clients/common/referencedData/XMLDocument.Para.xsl
deleted file mode 100644
index 11d6dd6f9..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.Para.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="urn:document" xmlns="http://www.w3.org/1999/xhtml">
- <xsl:output encoding="UTF-8" method="xml" indent="yes"/>
- <xsl:template match="/">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>HTML-Dokument</title>
- </head>
- <body>
- <xsl:apply-templates/>
- </body>
- </html>
- </xsl:template>
- <xsl:template match="doc:Paragraph">
- <p>
- <xsl:value-of select="child::text()"/>
- </p>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.signed.xml b/spss.handbook/clients/common/referencedData/XMLDocument.signed.xml
deleted file mode 100644
index 897b3c896..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.signed.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:XMLDocument xmlns:doc="urn:document">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>30zsZMPn1mR5G5oIGJvTRmCik3WuepfZF6AhLwxgJDMJlPQ8rheBWCaKihzXnHaS</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument> \ No newline at end of file
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.withResolvableSchemaHint.xml b/spss.handbook/clients/common/referencedData/XMLDocument.withResolvableSchemaHint.xml
deleted file mode 100644
index 4f1124637..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.withResolvableSchemaHint.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:XMLDocument xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document http://localhost:8080/referencedData/XMLDocument.xsd">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.withSchemaHint.xml b/spss.handbook/clients/common/referencedData/XMLDocument.withSchemaHint.xml
deleted file mode 100644
index 82f65d99e..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.withSchemaHint.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:XMLDocument xmlns:doc="urn:document" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document urn:XMLDocument.xsd">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.xml b/spss.handbook/clients/common/referencedData/XMLDocument.xml
deleted file mode 100644
index 1c48dce36..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:XMLDocument xmlns:doc="urn:document">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.xsd b/spss.handbook/clients/common/referencedData/XMLDocument.xsd
deleted file mode 100644
index a2930f1da..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="urn:document" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:document" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="XMLDocument">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Paragraph" maxOccurs="unbounded">
- <xs:complexType mixed="true">
- <xs:attribute name="ParaId" type="xs:ID" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocument.xsl b/spss.handbook/clients/common/referencedData/XMLDocument.xsl
deleted file mode 100644
index 85755c2e6..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocument.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="urn:document">
- <xsl:output encoding="UTF-8" method="xml" indent="yes"/>
- <xsl:template match="/doc:XMLDocument">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>HTML-Dokument</title>
- </head>
- <body>
- <xsl:for-each select="doc:Paragraph">
- <p>
- <xsl:value-of select="child::text()"/>
- </p>
- </xsl:for-each>
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.handbook/clients/common/referencedData/XMLDocumentRef.xsl b/spss.handbook/clients/common/referencedData/XMLDocumentRef.xsl
deleted file mode 100644
index c385f9d1f..000000000
--- a/spss.handbook/clients/common/referencedData/XMLDocumentRef.xsl
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet>
diff --git a/spss.handbook/clients/common/referencedData/referencedData.war b/spss.handbook/clients/common/referencedData/referencedData.war
deleted file mode 100644
index 6a05d6c7a..000000000
--- a/spss.handbook/clients/common/referencedData/referencedData.war
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/conf/http.properties b/spss.handbook/clients/webservice/conf/http.properties
deleted file mode 100644
index 1506169ed..000000000
--- a/spss.handbook/clients/webservice/conf/http.properties
+++ /dev/null
@@ -1,74 +0,0 @@
-###
-# Properties für den HTTP(S) Client
-###
-
-#
-# Signieren
-#
-
-# Name des Webservices, fix "SignatureCreation"
-signServiceQName = SignatureCreation
-
-# Zugangspunkt des Webservices
-signServiceEndPoint = http://localhost:8080/moa-spss/services/SignatureCreation
-#signServiceEndPoint = https://localhost:8443/moa-spss/services/SignatureCreation
-
-# Name des zu sendenden Signaturerstellungsrequests (entweder absolute
-# oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-# Arbeitsverzeichnis der Java VM interpretiert)
-signRequest = clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml
-#signRequest=clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml
-#signRequest=clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml
-#signRequest=clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml
-
-
-#
-# Verifizieren
-#
-
-# Name des Webservices, fix "SignatureVerification"
-verifyServiceQName = SignatureVerification
-
-# Zugangspunkt des Webservices
-verifyServiceEndPoint = http://localhost:8080/moa-spss/services/SignatureVerification
-#verifyServiceEndPoint = https://localhost:8443/moa-spss/services/SignatureVerification
-
-# Name des zu sendenden Signaturprüfrequests (entweder absolute
-# oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-# Arbeitsverzeichnis der Java VM interpretiert)
-verifyRequest=clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
-#verifyRequest=clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
-
-#
-# JSSE-Konfiguration
-#
-
-# Typ des JSSE-Truststores (entweder "JKS" für einen Java Key Store oder
-# "PKCS12" für eine PKCS#12-Datei).
-ssl.truststore.type = JKS
-
-# Relativer oder absoluter Pfad zum JSSE-Truststore. Ein relativer Pfad
-# wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-ssl.truststore.loc = clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
-#ssl.truststore.loc = clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
-
-# Passwort für den JSSE-Truststore.
-ssl.truststore.pwd = servers
-
-# Typ des JSSE-Keystores (entweder "JKS" für einen Java Key Store oder
-# "PKCS12" für eine PKCS#12-Datei).
-ssl.keystore.type = PKCS12
-
-# Relativer oder absoluter Pfad zum JSSE-Keystore. Ein relativer Pfad
-# wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-ssl.keystore.loc = clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
-#ssl.keystore.loc = clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
-
-# Passwort für den JSSE-Keystore.
-ssl.keystore.pwd = kunde1
-#ssl.keystore.pwd = kunde2
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/axis-ant.jar b/spss.handbook/clients/webservice/lib/axis-1_1/axis-ant.jar
deleted file mode 100644
index 9cb30a98a..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/axis-ant.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/axis.jar b/spss.handbook/clients/webservice/lib/axis-1_1/axis.jar
deleted file mode 100644
index 869ee16f5..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/axis.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/commons-discovery.jar b/spss.handbook/clients/webservice/lib/axis-1_1/commons-discovery.jar
deleted file mode 100644
index b88554847..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/commons-discovery.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging-api.jar b/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging-api.jar
deleted file mode 100644
index ade9a13c7..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging-api.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging.jar b/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging.jar
deleted file mode 100644
index b73a80fab..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/commons-logging.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/jaxrpc.jar b/spss.handbook/clients/webservice/lib/axis-1_1/jaxrpc.jar
deleted file mode 100644
index 5f6a56f02..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/jaxrpc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/log4j-1.2.8.jar b/spss.handbook/clients/webservice/lib/axis-1_1/log4j-1.2.8.jar
deleted file mode 100644
index 493a3ccc1..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/log4j-1.2.8.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/saaj.jar b/spss.handbook/clients/webservice/lib/axis-1_1/saaj.jar
deleted file mode 100644
index f2242abe5..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/saaj.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/axis-1_1/wsdl4j.jar b/spss.handbook/clients/webservice/lib/axis-1_1/wsdl4j.jar
deleted file mode 100644
index 820abd082..000000000
--- a/spss.handbook/clients/webservice/lib/axis-1_1/wsdl4j.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jcert.jar b/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jcert.jar
deleted file mode 100644
index d33134214..000000000
--- a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jcert.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jnet.jar b/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jnet.jar
deleted file mode 100644
index e1d340093..000000000
--- a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jnet.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jsse.jar b/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jsse.jar
deleted file mode 100644
index 123188c5e..000000000
--- a/spss.handbook/clients/webservice/lib/jsse-1_0_3/jsse-1_0_3.jsse.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xercesImpl.jar b/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xercesImpl.jar
deleted file mode 100644
index bff9af0c4..000000000
--- a/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xmlParserAPIs.jar b/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xmlParserAPIs.jar
deleted file mode 100644
index 6ba4ff805..000000000
--- a/spss.handbook/clients/webservice/lib/xerces-j-2.4.0/xmlParserAPIs.jar
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml
deleted file mode 100644
index bad31d170..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns:doc="urn:document">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-2" URI="#xpointer(id(&apos;signed-data-1-2-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>A8ml6/aZKCmj1hONwvLItIwGHoc=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-3" URI="#xpointer(id(&apos;signed-data-1-3-1&apos;)/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-4" URI="#xpointer(id(&apos;signed-data-1-4-1&apos;)/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-6" URI="NichtAufloesbareReferenz1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-7" URI="http://localhost:8080/referencedData/Text.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-8" URI="NichtAufloesbareReferenz2"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-9" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>mNsxUkFoF46XZVBivBo4aasFCTQ=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>kaAiAZgnUMYb3/IV5mmJinrH3et5M+o4OWMhgA3C9SZSPsE+ptWUAPU1VKl1G2AF</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-2-1"><doc:XMLDocument xmlns:doc="urn:document">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument></dsig:Object><dsig:Object Id="signed-data-1-3-1">RGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4=</dsig:Object><dsig:Object Id="signed-data-1-4-1">RGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4=</dsig:Object><dsig:Object Id="signed-data-1-1-1">RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</dsig:Object><dsig:Object><dsig:Manifest Id="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>a53jOsL7KbyltpByAK87FoMZphI=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-5" URI="http://localhost:8080/referencedData/Text.b64"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>a53jOsL7KbyltpByAK87FoMZphI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml
deleted file mode 100644
index f4dd2dbb6..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>KG_allgemein</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <!--Enveloping Data, direkte Angabe der Daten in base64 kodierter Form; Manifest-Referenz-->
- <DataObjectInfo Structure="enveloping" ChildOfManifest="true">
- <DataObject>
- <Base64Content>RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</Base64Content>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <!--Enveloping Data, direkte Angabe der Daten als XML-Fragment; SignedInfo-Referenz-->
- <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
- <DataObject>
- <XMLContent><doc:XMLDocument xmlns:doc="urn:document">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument></XMLContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>application/xml</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <!--Enveloping Data, Angabe der Daten als Referenz mittels Reference-Attribut, die von MOA aufgelöst wird; SignedInfo-Referenz-->
- <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/referencedData/Text.txt"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <!--Enveloping Data, Angabe der Daten als Referenz mittels LocRefContent, die von MOA aufgelöst wird; SignedInfo-Referenz-->
- <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
- <DataObject>
- <LocRefContent>http://localhost:8080/referencedData/Text.txt</LocRefContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <!--Detached Daten; direkte Angabe der Daten in base64 kodierter Form; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; Manifest-Referenz-->
- <DataObjectInfo Structure="detached" ChildOfManifest="true">
- <DataObject Reference="http://localhost:8080/referencedData/Text.b64">
- <Base64Content>RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</Base64Content>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <!--Detached Daten; direkte Angabe der Daten als XML-Fragment; Referenzierung in der Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="NichtAufloesbareReferenz1">
- <XMLContent><doc:XMLDocument xmlns:doc="urn:document">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument></XMLContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>application/xml</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <!--Detached Daten;Angabe der Daten als Referenz über das Reference-Attribut, die von MOA aufgelöst wird; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="http://localhost:8080/referencedData/Text.txt">
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <!--Detached Daten;Angabe der Daten als Referenz mittels LocRefContent, die von MOA aufgelöst wird; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
- <DataObjectInfo Structure="detached" ChildOfManifest="false">
- <DataObject Reference="NichtAufloesbareReferenz2">
- <LocRefContent>http://localhost:8080/referencedData/Text.txt</LocRefContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <!--Detached Daten, Verweis auf jenes Dokument, das die Signatur beinhalten wird; Angabe der Daten als Referenz über das Reference-Attribut, die von MOA aufgelöst wird; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
- <DataObjectInfo Structure="detached">
- <DataObject Reference=""/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <dsig:Transforms>
- <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
- </dsig:Transforms>
- <FinalDataMetaInfo>
- <MimeType>application/xml</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <CreateSignatureInfo>
- <CreateSignatureEnvironment>
- <LocRefContent>http://localhost:8080/referencedData/XMLDocument.xml</LocRefContent>
- </CreateSignatureEnvironment>
- <CreateSignatureEnvironmentProfile>
- <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
- </CreateSignatureEnvironmentProfile>
- </CreateSignatureInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml
deleted file mode 100644
index edcb03c09..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml
deleted file mode 100644
index 3344b4709..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>KG_allgemein</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="enveloping">
- <DataObject>
- <XMLContent>Diese Daten werden signiert.</XMLContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml
deleted file mode 100644
index def0daf25..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document urn:XMLDocument.xsd">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>vGVimRmUHwrDR8feQCK1DZ2kyDw0CCrXimJi/yCrIoqSkUKFlKrtAyP2RUBXXjye</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml
deleted file mode 100644
index 9144e83f8..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>KG_allgemein</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached">
- <DataObject Reference="#Para2"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <dsig:Transforms>
- <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
- <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet>
- </dsig:Transform>
- <dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
- </dsig:Transforms>
- <FinalDataMetaInfo>
- <MimeType>application/xhtml+xml</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- <Supplement>
- <Content Reference="XMLDocument.Para.xsl">
- <LocRefContent>http://localhost:8080/referencedData/XMLDocument.Para.xsl</LocRefContent>
- </Content>
- </Supplement>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <CreateSignatureInfo>
- <CreateSignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.withSchemaHint.xml"/>
- <CreateSignatureEnvironmentProfile>
- <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
- <Supplement>
- <Content Reference="urn:XMLDocument.xsd">
- <LocRefContent>http://localhost:8080/referencedData/XMLDocument.xsd</LocRefContent>
- </Content>
- </Supplement>
- </CreateSignatureEnvironmentProfile>
- </CreateSignatureInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml
deleted file mode 100644
index 1d5bd65ea..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/referencedData/Text.b64"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>a53jOsL7KbyltpByAK87FoMZphI=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-2" URI="http://localhost:8080/referencedData/XMLDocument.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2"><xp2:XPath Filter="subtract" xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xf2="http://www.w3.org/2002/06/xmldsig-filter2" xmlns:xp2="http://www.w3.org/2002/06/xmldsig-filter2">/doc:XMLDocument/doc:Paragraph[2]</xp2:XPath></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:doc="urn:document" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output encoding="UTF-8" indent="yes" method="xml"/>
- <xsl:template match="/doc:XMLDocument">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>HTML-Dokument</title>
- </head>
- <body>
- <xsl:for-each select="doc:Paragraph">
- <p>
- <xsl:value-of select="child::text()"/>
- </p>
- </xsl:for-each>
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>fIPwneCpjVqTXwHMN9DFfx6tJIU=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>kWm9iFL5UngH8uDG6094K99J/WB/PdlqzfI6WtGpJ3jiCTV7mn/mzYWMv09b3vee</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml b/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml
deleted file mode 100644
index 6375365b2..000000000
--- a/spss.handbook/clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>KG_allgemein</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached">
- <DataObject Reference="http://localhost:8080/referencedData/Text.b64"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <dsig:Transforms>
- <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/>
- </dsig:Transforms>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <DataObjectInfo Structure="detached">
- <DataObject Reference="http://localhost:8080/referencedData/XMLDocument.xml"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <dsig:Transforms>
- <dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2">
- <xp2:XPath xmlns:xp2="http://www.w3.org/2002/06/xmldsig-filter2" xmlns:doc="urn:document" Filter="subtract">/doc:XMLDocument/doc:Paragraph[2]</xp2:XPath>
- </dsig:Transform>
- <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="urn:document">
- <xsl:output encoding="UTF-8" method="xml" indent="yes"/>
- <xsl:template match="/doc:XMLDocument">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>HTML-Dokument</title>
- </head>
- <body>
- <xsl:for-each select="doc:Paragraph">
- <p>
- <xsl:value-of select="child::text()"/>
- </p>
- </xsl:for-each>
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet></dsig:Transform>
- <dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
- </dsig:Transforms>
- <FinalDataMetaInfo>
- <MimeType>application/xhtml+xml</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml
deleted file mode 100644
index daa22bdb3..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>serialNumber=615536615920,givenName=Gregor,SN=Karlinger,CN=Gregor Karlinger,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=TrustSignTest-Sig-01,OU=TrustSignTest-Sig-01,O=A-Trust Ges. für Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>2892</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIFLjCCBBagAwIBAgICC0wwDQYJKoZIhvcNAQEFBQAwgdkxCzAJBgNVBAYTAkFU
-MYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwAcgAg
-AFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAAZQBs
-AGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIASDEd
-MBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNVBAMTFFRydXN0U2ln
-blRlc3QtU2lnLTAxMB4XDTAzMDgyNzEyMDEyNFoXDTA2MDgyNzEyMDEyNFowZDEL
-MAkGA1UEBhMCQVQxGTAXBgNVBAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQT
-CUthcmxpbmdlcjEPMA0GA1UEKhMGR3JlZ29yMRUwEwYDVQQFEww2MTU1MzY2MTU5
-MjAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDSK1XaYK0Ydbk6V58g7QzQ
-Ysk0A6C2JyhiZy3078DJ1EkwzBMVejTNq1e9wp+BmeZ2YpiftNyRFfu/Gg8ksOUQ
-2oCn9A9pZLUGvtajA3aL8f182GQODRqQmelvYSUL/u9vAChOlcT+UEqj5jW4xjd4
-XsCotX4Kz+ofkD+SAlf1AgMBAAGjggH2MIIB8jATBgNVHSMEDDAKgAhKfsjmnWR0
-6TA+BggrBgEFBQcBAwEB/wQvMC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVIC
-AQACAQAwCgYIKwYBBQUHCwEwgYIGCCsGAQUFBwEBBHYwdDAvBggrBgEFBQcwAYYj
-aHR0cDovL29jc3AtdGVzdC5hLXRydXN0LmF0OjgyL29jc3AwQQYIKwYBBQUHMAKG
-NWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9UcnVzdFNpZ25UZXN0LVNpZy0w
-MWMuY3J0MFEGA1UdIARKMEgwPAYGKigAEQEDMDIwMAYIKwYBBQUHAgEWJGh0dHA6
-Ly93d3cuYS10cnVzdC5hdC9kb2NzL1RydXN0VGVzdDAIBgYEAIswAQEwbgYDVR0f
-BGcwZTBjoGGgX4ZdbGRhcDovL2xkYXAtdGVzdC5hLXRydXN0LmF0L291PVRydXN0
-U2lnblRlc3QtU2lnLTAxLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2Nh
-dGlvbmxpc3Q/MBEGA1UdDgQKBAhNa9QR1H4T3zAOBgNVHQ8BAf8EBAMCBsAwJQYD
-VR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8uZ3YuYXQwCQYDVR0TBAIwADAN
-BgkqhkiG9w0BAQUFAAOCAQEALi2DEl6whJsiQF+bsNVR8CQhXg6ZuzTGlPhyCBum
-765Y5gMRLEfAx2D8Wv4XXPHasAxZ/NKZRwbfLWN7IxPeVHF+vCShlXmYGWVj75fE
-EGStIKyULqZB7jOJdsFHNdvp8yQaexR9olO3neXjrFmcXFVhpZFJomBH6JEL0uRa
-LsPlN97OTa1NKkdj92SX8IkcV2k9yQ3Nl2KgicZDlxdYtSDGh9P0KddJZZJTRAdm
-ixWb4Y2cGkRDhXoHzvHcZQ7eqJYHPapm3NTZ428I7LCKma8859rMwRSNTN14yIVL
-KkgBtxvmstGVa33Ki53LBkSSuBMH3Pa+4xbnYSkJA4phaA==</dsig:X509Certificate><QualifiedCertificate/></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>1</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml b/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml
deleted file mode 100644
index 16e961b96..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" Signatories="1">
- <DateTime>2004-08-17T08:00:00+02:00</DateTime>
- <CMSSignature>MIIHiwYJKoZIhvcNAQcCoIIHfDCCB3gCAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCCBTIw
-ggUuMIIEFqADAgECAgILTDANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UEBhMCQVQxgYswgYgGA1UE
-Ch6BgABBAC0AVAByAHUAcwB0ACAARwBlAHMALgAgAGYA/AByACAAUwBpAGMAaABlAHIAaABlAGkA
-dABzAHMAeQBzAHQAZQBtAGUAIABpAG0AIABlAGwAZQBrAHQAcgAuACAARABhAHQAZQBuAHYAZQBy
-AGsAZQBoAHIAIABHAG0AYgBIMR0wGwYDVQQLExRUcnVzdFNpZ25UZXN0LVNpZy0wMTEdMBsGA1UE
-AxMUVHJ1c3RTaWduVGVzdC1TaWctMDEwHhcNMDMwODI3MTIwMTI0WhcNMDYwODI3MTIwMTI0WjBk
-MQswCQYDVQQGEwJBVDEZMBcGA1UEAxMQR3JlZ29yIEthcmxpbmdlcjESMBAGA1UEBBMJS2FybGlu
-Z2VyMQ8wDQYDVQQqEwZHcmVnb3IxFTATBgNVBAUTDDYxNTUzNjYxNTkyMDCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAoNIrVdpgrRh1uTpXnyDtDNBiyTQDoLYnKGJnLfTvwMnUSTDMExV6NM2r
-V73Cn4GZ5nZimJ+03JEV+78aDySw5RDagKf0D2lktQa+1qMDdovx/XzYZA4NGpCZ6W9hJQv+728A
-KE6VxP5QSqPmNbjGN3hewKi1fgrP6h+QP5ICV/UCAwEAAaOCAfYwggHyMBMGA1UdIwQMMAqACEp+
-yOadZHTpMD4GCCsGAQUFBwEDAQH/BC8wLTAIBgYEAI5GAQEwFQYGBACORgECMAsTA0VVUgIBAAIB
-ADAKBggrBgEFBQcLATCBggYIKwYBBQUHAQEEdjB0MC8GCCsGAQUFBzABhiNodHRwOi8vb2NzcC10
-ZXN0LmEtdHJ1c3QuYXQ6ODIvb2NzcDBBBggrBgEFBQcwAoY1aHR0cDovL3d3dy5hLXRydXN0LmF0
-L2NlcnRzL1RydXN0U2lnblRlc3QtU2lnLTAxYy5jcnQwUQYDVR0gBEowSDA8BgYqKAARAQMwMjAw
-BggrBgEFBQcCARYkaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvVHJ1c3RUZXN0MAgGBgQAizAB
-ATBuBgNVHR8EZzBlMGOgYaBfhl1sZGFwOi8vbGRhcC10ZXN0LmEtdHJ1c3QuYXQvb3U9VHJ1c3RT
-aWduVGVzdC1TaWctMDEsbz1BLVRydXN0LGM9QVQ/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdD8w
-EQYDVR0OBAoECE1r1BHUfhPfMA4GA1UdDwEB/wQEAwIGwDAlBgNVHREEHjAcgRpncmVnb3Iua2Fy
-bGluZ2VyQGNpby5ndi5hdDAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBBQUAA4IBAQAuLYMSXrCEmyJA
-X5uw1VHwJCFeDpm7NMaU+HIIG6bvrljmAxEsR8DHYPxa/hdc8dqwDFn80plHBt8tY3sjE95UcX68
-JKGVeZgZZWPvl8QQZK0grJQupkHuM4l2wUc12+nzJBp7FH2iU7ed5eOsWZxcVWGlkUmiYEfokQvS
-5Fouw+U33s5NrU0qR2P3ZJfwiRxXaT3JDc2XYqCJxkOXF1i1IMaH0/Qp10llklNEB2aLFZvhjZwa
-REOFegfO8dxlDt6olgc9qmbc1NnjbwjssIqZrzzn2szBFI1M3XjIhUsqSAG3G+ay0ZVrfcqLncsG
-RJK4Ewfc9r7jFudhKQkDimFoMYICITCCAh0CAQEwgeAwgdkxCzAJBgNVBAYTAkFUMYGLMIGIBgNV
-BAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwAcgAgAFMAaQBjAGgAZQByAGgAZQBp
-AHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAAZQBsAGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUA
-cgBrAGUAaAByACAARwBtAGIASDEdMBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNV
-BAMTFFRydXN0U2lnblRlc3QtU2lnLTAxAgILTDAJBgUrDgMCGgUAoIGXMCMGCSqGSIb3DQEJBDEW
-BBRrneM6wvspvKW2kHIArzsWgxmmEjAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMCkGCyqGSIb3
-DQEJEAIEMRowGAwLdGV4dC9wbGFpbhsGCSqGSIb3DQEHATArBgsqhkiG9w0BCRACEzEcMBowGDAW
-BBQdhdZ+dQSz53K2vT9KOGCxp6+qIDANBgkqhkiG9w0BAQEFAASBgFTEY4mMXQx2fNk9zo64MRxI
-mS38vuD7W7LjBoUQ/w6mPi60kiqA/Pnf5I7fvM2epuo4xHpft1diuTY0fa9VqSv+q13Lr1x+l3ON
-oxX27oCPLcJq6sFipZj50Bx5BHhgTX+59cNIT3eTRLenBzrJ/ccNd5OLqgkfiwsvqSk48lou</CMSSignature>
- <DataObject>
- <Content>
- <Base64Content>RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</Base64Content>
- </Content>
- </DataObject>
- <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml
deleted file mode 100644
index daa22bdb3..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>serialNumber=615536615920,givenName=Gregor,SN=Karlinger,CN=Gregor Karlinger,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=TrustSignTest-Sig-01,OU=TrustSignTest-Sig-01,O=A-Trust Ges. für Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>2892</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIFLjCCBBagAwIBAgICC0wwDQYJKoZIhvcNAQEFBQAwgdkxCzAJBgNVBAYTAkFU
-MYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwAcgAg
-AFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAAZQBs
-AGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIASDEd
-MBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNVBAMTFFRydXN0U2ln
-blRlc3QtU2lnLTAxMB4XDTAzMDgyNzEyMDEyNFoXDTA2MDgyNzEyMDEyNFowZDEL
-MAkGA1UEBhMCQVQxGTAXBgNVBAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQT
-CUthcmxpbmdlcjEPMA0GA1UEKhMGR3JlZ29yMRUwEwYDVQQFEww2MTU1MzY2MTU5
-MjAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDSK1XaYK0Ydbk6V58g7QzQ
-Ysk0A6C2JyhiZy3078DJ1EkwzBMVejTNq1e9wp+BmeZ2YpiftNyRFfu/Gg8ksOUQ
-2oCn9A9pZLUGvtajA3aL8f182GQODRqQmelvYSUL/u9vAChOlcT+UEqj5jW4xjd4
-XsCotX4Kz+ofkD+SAlf1AgMBAAGjggH2MIIB8jATBgNVHSMEDDAKgAhKfsjmnWR0
-6TA+BggrBgEFBQcBAwEB/wQvMC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVIC
-AQACAQAwCgYIKwYBBQUHCwEwgYIGCCsGAQUFBwEBBHYwdDAvBggrBgEFBQcwAYYj
-aHR0cDovL29jc3AtdGVzdC5hLXRydXN0LmF0OjgyL29jc3AwQQYIKwYBBQUHMAKG
-NWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9UcnVzdFNpZ25UZXN0LVNpZy0w
-MWMuY3J0MFEGA1UdIARKMEgwPAYGKigAEQEDMDIwMAYIKwYBBQUHAgEWJGh0dHA6
-Ly93d3cuYS10cnVzdC5hdC9kb2NzL1RydXN0VGVzdDAIBgYEAIswAQEwbgYDVR0f
-BGcwZTBjoGGgX4ZdbGRhcDovL2xkYXAtdGVzdC5hLXRydXN0LmF0L291PVRydXN0
-U2lnblRlc3QtU2lnLTAxLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2Nh
-dGlvbmxpc3Q/MBEGA1UdDgQKBAhNa9QR1H4T3zAOBgNVHQ8BAf8EBAMCBsAwJQYD
-VR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8uZ3YuYXQwCQYDVR0TBAIwADAN
-BgkqhkiG9w0BAQUFAAOCAQEALi2DEl6whJsiQF+bsNVR8CQhXg6ZuzTGlPhyCBum
-765Y5gMRLEfAx2D8Wv4XXPHasAxZ/NKZRwbfLWN7IxPeVHF+vCShlXmYGWVj75fE
-EGStIKyULqZB7jOJdsFHNdvp8yQaexR9olO3neXjrFmcXFVhpZFJomBH6JEL0uRa
-LsPlN97OTa1NKkdj92SX8IkcV2k9yQ3Nl2KgicZDlxdYtSDGh9P0KddJZZJTRAdm
-ixWb4Y2cGkRDhXoHzvHcZQ7eqJYHPapm3NTZ428I7LCKma8859rMwRSNTN14yIVL
-KkgBtxvmstGVa33Ki53LBkSSuBMH3Pa+4xbnYSkJA4phaA==</dsig:X509Certificate><QualifiedCertificate/></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>1</Code></CertificateCheck></VerifyCMSSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml b/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml
deleted file mode 100644
index d41b0e278..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <CMSSignature>MIIHsAYJKoZIhvcNAQcCoIIHoTCCB50CAQExCzAJBgUrDgMCGgUAMDAGCSqGSIb3DQEHAaAjBCFE
-aWVzZSBEYXRlbiB3YXJlbiBiYXNlNjQga29kaWVydC6gggUyMIIFLjCCBBagAwIBAgICC0wwDQYJ
-KoZIhvcNAQEFBQAwgdkxCzAJBgNVBAYTAkFUMYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAg
-AEcAZQBzAC4AIABmAPwAcgAgAFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAA
-aQBtACAAZQBsAGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIASDEd
-MBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNVBAMTFFRydXN0U2lnblRlc3QtU2ln
-LTAxMB4XDTAzMDgyNzEyMDEyNFoXDTA2MDgyNzEyMDEyNFowZDELMAkGA1UEBhMCQVQxGTAXBgNV
-BAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQTCUthcmxpbmdlcjEPMA0GA1UEKhMGR3JlZ29y
-MRUwEwYDVQQFEww2MTU1MzY2MTU5MjAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDSK1Xa
-YK0Ydbk6V58g7QzQYsk0A6C2JyhiZy3078DJ1EkwzBMVejTNq1e9wp+BmeZ2YpiftNyRFfu/Gg8k
-sOUQ2oCn9A9pZLUGvtajA3aL8f182GQODRqQmelvYSUL/u9vAChOlcT+UEqj5jW4xjd4XsCotX4K
-z+ofkD+SAlf1AgMBAAGjggH2MIIB8jATBgNVHSMEDDAKgAhKfsjmnWR06TA+BggrBgEFBQcBAwEB
-/wQvMC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVICAQACAQAwCgYIKwYBBQUHCwEwgYIGCCsG
-AQUFBwEBBHYwdDAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AtdGVzdC5hLXRydXN0LmF0OjgyL29j
-c3AwQQYIKwYBBQUHMAKGNWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9UcnVzdFNpZ25UZXN0
-LVNpZy0wMWMuY3J0MFEGA1UdIARKMEgwPAYGKigAEQEDMDIwMAYIKwYBBQUHAgEWJGh0dHA6Ly93
-d3cuYS10cnVzdC5hdC9kb2NzL1RydXN0VGVzdDAIBgYEAIswAQEwbgYDVR0fBGcwZTBjoGGgX4Zd
-bGRhcDovL2xkYXAtdGVzdC5hLXRydXN0LmF0L291PVRydXN0U2lnblRlc3QtU2lnLTAxLG89QS1U
-cnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/MBEGA1UdDgQKBAhNa9QR1H4T3zAO
-BgNVHQ8BAf8EBAMCBsAwJQYDVR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8uZ3YuYXQwCQYD
-VR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEALi2DEl6whJsiQF+bsNVR8CQhXg6ZuzTGlPhyCBum
-765Y5gMRLEfAx2D8Wv4XXPHasAxZ/NKZRwbfLWN7IxPeVHF+vCShlXmYGWVj75fEEGStIKyULqZB
-7jOJdsFHNdvp8yQaexR9olO3neXjrFmcXFVhpZFJomBH6JEL0uRaLsPlN97OTa1NKkdj92SX8Ikc
-V2k9yQ3Nl2KgicZDlxdYtSDGh9P0KddJZZJTRAdmixWb4Y2cGkRDhXoHzvHcZQ7eqJYHPapm3NTZ
-428I7LCKma8859rMwRSNTN14yIVLKkgBtxvmstGVa33Ki53LBkSSuBMH3Pa+4xbnYSkJA4phaDGC
-AiEwggIdAgEBMIHgMIHZMQswCQYDVQQGEwJBVDGBizCBiAYDVQQKHoGAAEEALQBUAHIAdQBzAHQA
-IABHAGUAcwAuACAAZgD8AHIAIABTAGkAYwBoAGUAcgBoAGUAaQB0AHMAcwB5AHMAdABlAG0AZQAg
-AGkAbQAgAGUAbABlAGsAdAByAC4AIABEAGEAdABlAG4AdgBlAHIAawBlAGgAcgAgAEcAbQBiAEgx
-HTAbBgNVBAsTFFRydXN0U2lnblRlc3QtU2lnLTAxMR0wGwYDVQQDExRUcnVzdFNpZ25UZXN0LVNp
-Zy0wMQICC0wwCQYFKw4DAhoFAKCBlzAjBgkqhkiG9w0BCQQxFgQUa53jOsL7KbyltpByAK87FoMZ
-phIwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATApBgsqhkiG9w0BCRACBDEaMBgMC3RleHQvcGxh
-aW4bBgkqhkiG9w0BBwEwKwYLKoZIhvcNAQkQAhMxHDAaMBgwFgQUHYXWfnUEs+dytr0/Sjhgsaev
-qiAwDQYJKoZIhvcNAQEBBQAEgYBUxGOJjF0MdnzZPc6OuDEcSJkt/L7g+1uy4waFEP8Opj4utJIq
-gPz53+SO37zNnqbqOMR6X7dXYrk2NH2vVakr/qtdy69cfpdzjaMV9u6Ajy3CaurBYqWY+dAceQR4
-YE1/ufXDSE93k0S3pwc6yf3HDXeTi6oJH4sLL6kpOPJaLg==</CMSSignature>
- <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml
deleted file mode 100644
index f4db026fe..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><HashInputData PartOf="SignedInfo"><Base64Content>PGRvYzpYTUxEb2N1bWVudCB4bWxuczpkb2M9InVybjpkb2N1bWVudCI+CiAgPGRv
-YzpQYXJhZ3JhcGg+SWNoIGJpbiBkZXIgZXJzdGUgQWJzYXR6IGluIGRpZXNlbSBE
-b2t1bWVudC48L2RvYzpQYXJhZ3JhcGg+CiAgPGRvYzpQYXJhZ3JhcGggUGFyYUlk
-PSJQYXJhMiI+VW5kIGljaCBiaW4gZGVyIHp3ZWl0ZSBBYnNhdHogaW4gZGllc2Vt
-IERva3VtZW50LgpJY2ggaGFiZSB3ZWl0ZXJzIGVpbiBlaWdlbmVucyBJRC1BdHRy
-aWJ1dCBiZWtvbW1lbi48L2RvYzpQYXJhZ3JhcGg+CjwvZG9jOlhNTERvY3VtZW50Pg==</Base64Content></HashInputData><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
deleted file mode 100644
index d97e76f78..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <DateTime>2004-08-18T17:00:00+02:00</DateTime>
- <VerifySignatureInfo>
- <VerifySignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.signed.xml"/>
- <VerifySignatureLocation xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/doc:XMLDocument/dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <ReturnHashInputData/>
- <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml
deleted file mode 100644
index 3798b2706..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><ReferenceInputData PartOf="SignedInfo"><XMLContent xml:space="preserve"><doc:Paragraph ParaId="Para2" xmlns:doc="urn:document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph></XMLContent></ReferenceInputData><ReferenceInputData PartOf="SignedInfo"><XMLContent xml:space="preserve"><dsig:Manifest Id="manifest-1-1" xmlns:doc="urn:document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dsig:Reference URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>B9nRChTbct68n9h5+Cb2mfNkASI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData PartOf="SignedInfo"><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:doc="urn:document" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><etsi:SignedSignatureProperties><etsi:SigningTime>2004-08-20T12:42:21</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>FOWcAqaHew69LEIDiGuiWVnB0mc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>application/xhtml+xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData><SignatureCheck><Code>0</Code></SignatureCheck><SignatureManifestCheck><Code>0</Code></SignatureManifestCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
deleted file mode 100644
index 657beca77..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent><doc:XMLDocument xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document http://localhost:8080/referencedData/XMLDocument.xsd">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest" URI="#manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>1aSV+vFkwG6NZCk5ZUzZV3J4eSo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id(&apos;etsi-signed-1-1&apos;)/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Dy1xXsV2LgSFJlGwYiunav1KC7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>f1v/vi1S7xiL+7ofWOUqBfoqOy42EnlXYFoTYcaUZaBiAecDvyX9StPRWTUls/j2</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest Id="manifest-1-1"><dsig:Reference URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>B9nRChTbct68n9h5+Cb2mfNkASI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2005-03-29T09:55:29</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>FOWcAqaHew69LEIDiGuiWVnB0mc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>application/xhtml+xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature>
-</doc:XMLDocument></XMLContent>
- </VerifySignatureEnvironment>
- <VerifySignatureLocation xmlns:doc="urn:document">/doc:XMLDocument/dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <SignatureManifestCheckParams ReturnReferenceInputData="true">
- <ReferenceInfo>
- <VerifyTransformsInfoProfile>
- <dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms>
- <TransformParameter URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
- </VerifyTransformsInfoProfile>
- <VerifyTransformsInfoProfile>
- <dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms>
- </VerifyTransformsInfoProfile>
- </ReferenceInfo>
- </SignatureManifestCheckParams>
- <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml
deleted file mode 100644
index 2fab33b20..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml
deleted file mode 100644
index 5565601d8..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
- <VerifySignatureLocation xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml
deleted file mode 100644
index 2fab33b20..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.response.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.response.xml
deleted file mode 100644
index 2fab33b20..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.response.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml
deleted file mode 100644
index 50ddbc1da..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent><doc:XMLDocument xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document urn:XMLDocument.xsd">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>vGVimRmUHwrDR8feQCK1DZ2kyDw0CCrXimJi/yCrIoqSkUKFlKrtAyP2RUBXXjye</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument></XMLContent>
- </VerifySignatureEnvironment>
- <VerifySignatureLocation xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/doc:XMLDocument/dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <SupplementProfile>
- <Content Reference="XMLDocument.Para.xsl">
- <LocRefContent>http://localhost:8080/referencedData/XMLDocument.Para.xsl</LocRefContent>
- </Content>
- </SupplementProfile>
- <SupplementProfile>
- <Content Reference="urn:XMLDocument.xsd">
- <XMLContent><xs:schema targetNamespace="urn:document" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:document" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="XMLDocument">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Paragraph" maxOccurs="unbounded">
- <xs:complexType mixed="true">
- <xs:attribute name="ParaId" type="xs:ID" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-</xs:schema>
-
-</XMLContent>
- </Content>
- </SupplementProfile>
- <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml
deleted file mode 100644
index 9d3b6dea7..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><XMLDSIGManifestCheck><Code>0</Code><Info><ReferringSigReference>1</ReferringSigReference></Info></XMLDSIGManifestCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml b/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
deleted file mode 100644
index a57fbb934..000000000
--- a/spss.handbook/clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <VerifySignatureInfo>
- <VerifySignatureEnvironment>
- <XMLContent><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>nUUaW6OtcsNvV/QhqmkU2QXT1Mw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pzI1j60BNsnS+zjXYtXlh109HjJGEMrMzTzkUB54rReOpI1ynNkG2RE7AiOlvpPh</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten sind signiert.</dsig:Object><dsig:Object><dsig:Manifest Id="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>EYxznGxNRAIcHQeUsj+zsK+uaHA=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></XMLContent>
- </VerifySignatureEnvironment>
- <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
- </VerifySignatureInfo>
- <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml
deleted file mode 100644
index be2eb37ad..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns:doc="urn:document">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>30zsZMPn1mR5G5oIGJvTRmCik3WuepfZF6AhLwxgJDMJlPQ8rheBWCaKihzXnHaS</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml
deleted file mode 100644
index 7f89028c6..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>KG_allgemein</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="detached">
- <DataObject Reference=""/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <dsig:Transforms>
- <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
- </dsig:Transforms>
- <FinalDataMetaInfo>
- <MimeType>text/xml</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <CreateSignatureInfo>
- <CreateSignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.xml"/>
- <CreateSignatureEnvironmentProfile>
- <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
- </CreateSignatureEnvironmentProfile>
- </CreateSignatureInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml
deleted file mode 100644
index fb4204a09..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document http://localhost:8080/referencedData/XMLDocument.xsd">
- <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
- <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest" URI="#manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>1aSV+vFkwG6NZCk5ZUzZV3J4eSo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id(&apos;etsi-signed-1-1&apos;)/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Dy1xXsV2LgSFJlGwYiunav1KC7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>f1v/vi1S7xiL+7ofWOUqBfoqOy42EnlXYFoTYcaUZaBiAecDvyX9StPRWTUls/j2</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest Id="manifest-1-1"><dsig:Reference URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>B9nRChTbct68n9h5+Cb2mfNkASI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2005-03-29T09:55:29</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>FOWcAqaHew69LEIDiGuiWVnB0mc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>application/xhtml+xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml
deleted file mode 100644
index b19f66b61..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <KeyIdentifier>KG_allgemein</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="true">
- <DataObjectInfo Structure="detached">
- <DataObject Reference="#Para2"/>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <dsig:Transforms>
- <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
- <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet>
- </dsig:Transform>
- <dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
- </dsig:Transforms>
- <FinalDataMetaInfo>
- <MimeType>application/xhtml+xml</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- <CreateSignatureInfo>
- <CreateSignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.withResolvableSchemaHint.xml"/>
- <CreateSignatureEnvironmentProfile>
- <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
- </CreateSignatureEnvironmentProfile>
- </CreateSignatureInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml
deleted file mode 100644
index a465e2126..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>nUUaW6OtcsNvV/QhqmkU2QXT1Mw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pzI1j60BNsnS+zjXYtXlh109HjJGEMrMzTzkUB54rReOpI1ynNkG2RE7AiOlvpPh</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten sind signiert.</dsig:Object><dsig:Object><dsig:Manifest Id="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>EYxznGxNRAIcHQeUsj+zsK+uaHA=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml b/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml
deleted file mode 100644
index da7e82025..000000000
--- a/spss.handbook/clients/webservice/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <KeyIdentifier>KG_allgemein</KeyIdentifier>
- <SingleSignatureInfo SecurityLayerConformity="false">
- <DataObjectInfo Structure="enveloping" ChildOfManifest="true">
- <DataObject>
- <XMLContent>Diese Daten sind signiert.</XMLContent>
- </DataObject>
- <CreateTransformsInfoProfile>
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
- </CreateTransformsInfoProfile>
- </DataObjectInfo>
- </SingleSignatureInfo>
-</CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt b/spss.handbook/clients/webservice/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt
deleted file mode 100644
index f8527bb6d..000000000
--- a/spss.handbook/clients/webservice/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:doc="urn:document">
-<head>
-<title>HTML-Dokument</title>
-</head>
-<body>
-<p>Ich bin der erste Absatz in diesem Dokument.</p>
-</body>
-</html>
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1.der b/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1.der
deleted file mode 100644
index b6091332c..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12 b/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
deleted file mode 100644
index 33f76bf9c..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore b/spss.handbook/clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
deleted file mode 100644
index 9c6c55359..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2.der b/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2.der
deleted file mode 100644
index 20bc38e14..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12 b/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
deleted file mode 100644
index ec7bf8e48..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore b/spss.handbook/clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
deleted file mode 100644
index d32a22f0f..000000000
--- a/spss.handbook/clients/webservice/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.java b/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.java
deleted file mode 100644
index 00ae94c11..000000000
--- a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.webservice;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.Properties;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-
-import org.apache.axis.message.SOAPBodyElement;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-
-/**
- * Diese Klasse implementiert einen einfachen Client für das MOA SP/SS Webservice mittels Apache Axis. Die
- * Verbindung erfolgt ungesichert über HTTP.
- */
-public class HTTP
-{
- protected Properties props_;
-
- /**
- * Methode main.
- *
- * Enthält den Beispielcode der nötig ist um von Java aus auf MOA-SPSS zugreifen zu können. Der Zugriff
- * passiert über das AXIS-Framework. Die Verbindung erfolgt ungesichert über HTTP.
- *
- * @param args <ul>
- * <li>
- * args[0] enthält entweder die Bezeichnung "sign" oder "verify" zur Kennzeichnung,
- * ob ein Signaturerstellungsrequest, oder ein Signaturprüfrequest gesendet werden soll.
- * </li>
- * <li>
- * args[1] enthält einen Verweis auf eine Property-Datei, die die nähere Konfiguration
- * für dieses Beispiel enthält. Der Verweis enthält entweder eine absolute oder eine
- * relative Pfadangabe, wobei eine relative Angabe als relativ zum Arbeitsverzeichnis der
- * Java VM interpretiert wird. Folgende Properties müssen in der Property-Datei vorhanden
- * sein:
- * <ul>
- * <li>
- * <code>signServiceQName</code>: Name des Webservices, fix "SignatureCreation"
- * </li>
- * <li>
- * <code>signServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
- * </li>
- * <li>
- * <code>signRequest</code>: Name des zu sendenden Signaturerstellungsrequests (entweder
- * absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
- * Arbeitsverzeichnis der Java VM interpretiert)
- * </li>
- * <li>
- * <code>verifyServiceQName</code>: Name des Webservices, fix "SignatureVerification"
- * </li>
- * <li>
- * <code>verifyServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
- * </li>
- * <li>
- * <code>verifyRequest</code>: Name des zu sendenden Signaturprüfrequests (entweder
- * absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
- * Arbeitsverzeichnis der Java VM interpretiert)
- * </li>
- * </ul>
- * </li>
- * </ul>
- */
- public static void main(String[] args)
- {
- try
- {
- // Prüfen, ob Beispiel korrekt verwendet wird
- checkArgs(args, "HTTP");
-
- // Initialisieren des Clients
- HTTP httpClient = new HTTP(args);
-
- // Ausführen der Serviceabfrage
- httpClient.execute(args[0]);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- /**
- * Prüft, ob das Beispiel korrekt verwendet wird.
- *
- * @param args Die Aufrufparameter für das Beispiel. Siehe {@link HTTP#main(String[])}.
- *
- * @param exampleName Der Name dieses Beispiels, der im Hilfetext gedruckt wird.
- */
- protected static void checkArgs(String[] args, String exampleName)
- {
- if (args == null || args.length != 2 || (!"sign".equals(args[0]) && !"verify".equals(args[0])))
- {
- System.out.println("Verwendung: " + exampleName + " \"sign\"|\"verify\" Properties-Datei");
- }
- }
-
- /**
- * Erzeugt den MOA Client. Es erfolgt die Auswertung der übergebenen Aufrufparameter.
- *
- * @param args Die Aufrufparameter für das Beispiel. Siehe {@link HTTP#main(String[])}.
- *
- * @throws Exception wenn der MOA Client mit den übergebenen Aufrufparametern nicht korrekt erzeugt
- * werden konnte.
- */
- protected HTTP(String[] args) throws Exception
- {
- props_ = new Properties();
- props_.load(new FileInputStream(args[1]));
- }
-
- /**
- * Führt die Abfrage beim MOA-Service aus.
- *
- * @param mode Steuert, ob eine Signatur erstellt ("sign") oder geprüft ("verify") werden soll.
- *
- * @throws Exception wenn dabei etwas schiegeht.
- */
- protected void execute(String mode) throws Exception
- {
- // Datei mit Request einlesen
- FileInputStream inputStream = new FileInputStream(getProperty(mode + "Request"));
-
- // Parser/DOMBuilder instanzieren
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- // XML Datei in einen DOM-Baum umwandeln
- Document xmlRequest = builder.parse(inputStream);
-
- // AXIS-Server instanzieren
- Service service = ServiceFactory.newInstance().createService(new QName(getProperty(mode + "ServiceQName")));
-
- // Call öffnen
- Call call = service.createCall();
-
- // Neues BodyElement anlegen und mit dem DOM-Baum füllen
- SOAPBodyElement body = new SOAPBodyElement(xmlRequest.getDocumentElement());
- SOAPBodyElement[] params = new SOAPBodyElement[]
- {
- body
- };
-
- // Call mit Endpoint verknüpfen
- call.setTargetEndpointAddress(getProperty(mode + "ServiceEndPoint"));
-
- // Call auslösen und die Antworten speichern
- System.out.println("Calling ...");
- Vector responses = (Vector) call.invoke(params);
-
- // Erstes Body Element auslesen
- SOAPBodyElement response = (SOAPBodyElement) responses.get(0);
-
- // Aus der Response den DOM-Baum lesen
- Document root_response = response.getAsDocument();
- System.out.println("Return ...");
-
- // XML-Formatierung konfiguieren
- OutputFormat format = new OutputFormat((Document) root_response);
- format.setLineSeparator("\n");
- format.setIndenting(false);
- format.setPreserveSpace(true);
- format.setOmitXMLDeclaration(false);
- format.setEncoding("UTF-8");
-
- // Ausgabe der Webservice-Antwort auf die Konsole
- XMLSerializer conSerializer = new XMLSerializer(System.out, format);
- conSerializer.serialize(root_response);
-
- // Ausgabe der Webservice-Antwort in Datei
- String responseFile = getProperty(mode + "Request").substring(0, getProperty(mode + "Request").lastIndexOf('.'))
- + ".response.xml";
- XMLSerializer fileSerializer = new XMLSerializer(new FileOutputStream(responseFile), format);
- fileSerializer.serialize(root_response);
- }
-
- /**
- * Prüft ob die Property mit dem angegebenen Namen in den Konfigurations-Properties enthalten ist.
- *
- * @param propName Name der zu untersuchenden Property.
- *
- * @return den Wert der gesuchten Property.
- *
- * @throws Exception wenn die gesuchte Property nicht vorhanden ist.
- */
- protected String getProperty(String propName) throws Exception
- {
- String propValue = props_.getProperty(propName);
- if ((propValue == null) || "".equals(propValue.trim()))
- {
- throw new Exception("Property named \"" + propName + "\" does not exist.");
- }
- return propValue;
- }
-} \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.java b/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.java
deleted file mode 100644
index ef509088a..000000000
--- a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.webservice;
-
-
-/**
- * Diese Klasse implementiert einen einfachen Client für das MOA SP/SS Webservice mittels Apache Axis. Die
- * Verbindung erfolgt gesichert über SSL, und zwar sowohl mit Server- und Clientauthentisierung.
- */
-public class HTTPSClientAuth extends HTTPSServerAuth
-{
- // JSSE Konstanten
- public static final String KEYSTORE = "javax.net.ssl.keyStore";
- public static final String KEYSTOREPASSWORD = "javax.net.ssl.keyStorePassword";
- public static final String KEYSTORETYPE = "javax.net.ssl.keyStoreType";
-
- /**
- * Methode main.
- *
- * Enthält den Beispielcode der nötig ist um von Java aus auf MOA-SPSS zugreifen zu können. Der Zugriff
- * passiert über das AXIS-Framework. Die Verbindung erfolgt gesichert über SSL, und zwar sowohl mit
- * Server- und Clientauthentisierung.
- *
- * @param args <ul>
- * <li>
- * args[0] enthält entweder die Bezeichnung "sign" oder "verify" zur Kennzeichnung,
- * ob ein Signaturerstellungsrequest, oder ein Signaturprüfrequest gesendet werden soll.
- * </li>
- * <li>
- * args[1] enthält einen Verweis auf eine Property-Datei, die die nähere Konfiguration
- * für dieses Beispiel enthält. Der Verweis enthält entweder eine absolute oder eine
- * relative Pfadangabe, wobei eine relative Angabe als relativ zum Arbeitsverzeichnis der
- * Java VM interpretiert wird. Folgende Properties müssen in der Properties-Datei vorhanden
- * sein:
- * <ul>
- * <li>
- * <code>signServiceQName</code>: Name des Webservices, fix "SignatureCreation"
- * </li>
- * <li>
- * <code>signServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
- * </li>
- * <li>
- * <code>signRequest</code>: Name des zu sendenden Signaturerstellungsrequests (entweder
- * absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
- * Arbeitsverzeichnis der Java VM interpretiert)
- * </li>
- * <li>
- * <code>verifyServiceQName</code>: Name des Webservices, fix "SignatureVerification"
- * </li>
- * <li>
- * <code>verifyServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
- * </li>
- * <li>
- * <code>verifyRequest</code>: Name des zu sendenden Signaturprüfrequests (entweder
- * absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
- * Arbeitsverzeichnis der Java VM interpretiert)
- * </li>
- * <li>
- * <code>ssl.truststore.type</code>: Typ des JSSE-Truststores (entweder "JKS" für einen
- * Java Key Store oder "PKCS12" für eine PKCS#12-Datei).
- * </li>
- * <li><code>ssl.truststore.type</code>: Relativer oder absoluter Pfad zum JSSE-Truststore.
- * Ein relativer Pfad wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
- * </li>
- * <li><code>ssl.truststore.pwd</code>: Passwort für den JSSE-Truststore.
- * </li>
- * <li>
- * <code>ssl.keystore.type</code>: Typ des JSSE-Keystores (entweder "JKS" für einen
- * Java Key Store oder "PKCS12" für eine PKCS#12-Datei).
- * </li>
- * <li><code>ssl.keystore.type</code>: Relativer oder absoluter Pfad zum JSSE-Keystore.
- * Ein relativer Pfad wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
- * </li>
- * <li><code>ssl.keystore.pwd</code>: Passwort für den JSSE-Keystore.
- * </li>
- * </ul>
- * </li>
- * </ul>
- */
- public static void main(String[] args)
- {
- try
- {
- // Prüfen, ob Beispiel korrekt verwendet wird
- checkArgs(args, "HTTP");
-
- // Initialisieren des Clients
- HTTPSClientAuth httpClient = new HTTPSClientAuth(args);
-
- // Ausführen der Serviceabfrage
- httpClient.execute(args[0]);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- /**
- * Erzeugt den MOA Client. Es erfolgt die Auswertung der übergebenen Aufrufparameter.
- *
- * @param args Die Aufrufparameter für das Beispiel. Siehe {@link HTTPSClientAuth#main(String[])}.
- *
- * @throws Exception wenn der MOA Client mit den übergebenen Aufrufparametern nicht korrekt erzeugt
- * werden konnte.
- */
- protected HTTPSClientAuth(String[] args) throws Exception
- {
- super(args);
- }
-
- /**
- * Konfiguriert JSSE für eine SSL-Verbindung mit Client- und Serverauthentisierung.
- */
- protected void configureSSL() throws Exception
- {
- super.configureSSL();
-
- // Konfiguriere Key-Store (enthält privaten Schlüssel und Zertifikat des Clients)
- System.setProperty(KEYSTORETYPE, getProperty("ssl.keystore.type"));
- System.setProperty(KEYSTORE, getProperty("ssl.keystore.loc"));
- System.setProperty(KEYSTOREPASSWORD, getProperty("ssl.keystore.pwd"));
- }
-} \ No newline at end of file
diff --git a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java b/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java
deleted file mode 100644
index 712c9dbe7..000000000
--- a/spss.handbook/clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package at.gv.egovernment.moa.spss.handbook.clients.webservice;
-
-import java.security.Security;
-
-import com.sun.net.ssl.internal.ssl.Provider;
-
-/**
- * Diese Klasse implementiert einen einfachen Client für das MOA SP/SS Webservice mittels Apache Axis. Die
- * Verbindung erfolgt gesichert über SSL, und zwar nur mit Serverauthentisierung.
- */
-public class HTTPSServerAuth extends HTTP
-{
- // JSSE Konstanten
- public static final String HANDLER = "java.protocol.handler.pkgs";
- public static final String TRUSTSTORE = "javax.net.ssl.trustStore";
- public static final String TRUSTSTOREPASSWORD = "javax.net.ssl.trustStorePassword";
- public static final String TRUSTSTORETYPE = "javax.net.ssl.trustStoreType";
-
- /**
- * Methode main.
- *
- * Enthält den Beispielcode der nötig ist um von Java aus auf MOA-SPSS zugreifen zu können. Der Zugriff
- * passiert über das AXIS-Framework. Die Verbindung erfolgt gesichert über SSL, und zwar nur mit
- * Serverauthentisierung.
- *
- * @param args <ul>
- * <li>
- * args[0] enthält entweder die Bezeichnung "sign" oder "verify" zur Kennzeichnung,
- * ob ein Signaturerstellungsrequest, oder ein Signaturprüfrequest gesendet werden soll.
- * </li>
- * <li>
- * args[1] enthält einen Verweis auf eine Property-Datei, die die nähere Konfiguration
- * für dieses Beispiel enthält. Der Verweis enthält entweder eine absolute oder eine
- * relative Pfadangabe, wobei eine relative Angabe als relativ zum Arbeitsverzeichnis der
- * Java VM interpretiert wird. Folgende Properties müssen in der Properties-Datei vorhanden
- * sein:
- * <ul>
- * <li>
- * <code>signServiceQName</code>: Name des Webservices, fix "SignatureCreation"
- * </li>
- * <li>
- * <code>signServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
- * </li>
- * <li>
- * <code>signRequest</code>: Name des zu sendenden Signaturerstellungsrequests (entweder
- * absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
- * Arbeitsverzeichnis der Java VM interpretiert)
- * </li>
- * <li>
- * <code>verifyServiceQName</code>: Name des Webservices, fix "SignatureVerification"
- * </li>
- * <li>
- * <code>verifyServiceEndPoint</code>: Zugangspunkt des Webservices (URL)
- * </li>
- * <li>
- * <code>verifyRequest</code>: Name des zu sendenden Signaturprüfrequests (entweder
- * absolute oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
- * Arbeitsverzeichnis der Java VM interpretiert)
- * </li>
- * <li>
- * <code>ssl.truststore.type</code>: Typ des JSSE-Truststores (entweder "JKS" für einen
- * Java Key Store oder "PKCS12" für eine PKCS#12-Datei).
- * </li>
- * <li><code>ssl.truststore.type</code>: Relativer oder absoluter Pfad zum JSSE-Truststore.
- * Ein relativer Pfad wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
- * </li>
- * <li><code>ssl.truststore.pwd</code>: Passwort für den JSSE-Truststore.
- * </li>
- * </ul>
- * </li>
- * </ul>
- */
- public static void main(String[] args)
- {
- try
- {
- // Prüfen, ob Beispiel korrekt verwendet wird
- checkArgs(args, "HTTP");
-
- // Initialisieren des Clients
- HTTPSServerAuth httpClient = new HTTPSServerAuth(args);
-
- // Ausführen der Serviceabfrage
- httpClient.execute(args[0]);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- /**
- * Erzeugt den MOA Client. Es erfolgt die Auswertung der übergebenen Aufrufparameter.
- *
- * @param args Die Aufrufparameter für das Beispiel. Siehe {@link HTTPSServerAuth#main(String[])}.
- *
- * @throws Exception wenn der MOA Client mit den übergebenen Aufrufparametern nicht korrekt erzeugt
- * werden konnte.
- */
- protected HTTPSServerAuth(String[] args) throws Exception
- {
- super(args);
- configureSSL();
- }
-
- /**
- * Konfiguriert JSSE für eine SSL-Verbindung mit Serverauthentisierung.
- *
- * @throws Exception wenn die Konfiguration von JSSE fehlschlägt.
- */
- protected void configureSSL() throws Exception
- {
- // Aktivieren Sie die nächste Zeile für detailliertes Logging des SSL-Verbindungsaufbaus
- // System.setProperty("javax.net.debug", "all");
-
- // Setzen des korrekten Protokoll-Handlers für https
- Security.addProvider(new Provider());
- System.setProperty(HANDLER, "com.sun.net.ssl.internal.www.protocol");
-
- // Konfiguriere Trust-Store (enthält SSL-Zertifikat des MOA Services, dem vertraut wird)
- System.setProperty(TRUSTSTORETYPE, getProperty("ssl.truststore.type"));
- System.setProperty(TRUSTSTORE, getProperty("ssl.truststore.loc"));
- System.setProperty(TRUSTSTOREPASSWORD, getProperty("ssl.truststore.pwd"));
- }
-} \ No newline at end of file
diff --git a/spss.handbook/conf/moa-spss/certstore/032F2123890A879585CE96674CA4C37B55986729/E1201A308CC10323C27D9084B048996E44B8F710 b/spss.handbook/conf/moa-spss/certstore/032F2123890A879585CE96674CA4C37B55986729/E1201A308CC10323C27D9084B048996E44B8F710
deleted file mode 100644
index a7948e488..000000000
--- a/spss.handbook/conf/moa-spss/certstore/032F2123890A879585CE96674CA4C37B55986729/E1201A308CC10323C27D9084B048996E44B8F710
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/04462EF01783744F9F4CDE3705FD86D488697C9F/D44EED7580C7792242D73E267A89C7DB25E4BD08 b/spss.handbook/conf/moa-spss/certstore/04462EF01783744F9F4CDE3705FD86D488697C9F/D44EED7580C7792242D73E267A89C7DB25E4BD08
deleted file mode 100644
index 73434134e..000000000
--- a/spss.handbook/conf/moa-spss/certstore/04462EF01783744F9F4CDE3705FD86D488697C9F/D44EED7580C7792242D73E267A89C7DB25E4BD08
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/083E1A0528C48475951A6610360D813E2713DCC7/7E691392F741B7E4B4AA9A76D75851BDE18BE5A7 b/spss.handbook/conf/moa-spss/certstore/083E1A0528C48475951A6610360D813E2713DCC7/7E691392F741B7E4B4AA9A76D75851BDE18BE5A7
deleted file mode 100644
index 8c434777e..000000000
--- a/spss.handbook/conf/moa-spss/certstore/083E1A0528C48475951A6610360D813E2713DCC7/7E691392F741B7E4B4AA9A76D75851BDE18BE5A7
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/0889EBEC55D9E34E782E6D3C250840EB932EEA2F/9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726 b/spss.handbook/conf/moa-spss/certstore/0889EBEC55D9E34E782E6D3C250840EB932EEA2F/9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726
deleted file mode 100644
index 3af27c013..000000000
--- a/spss.handbook/conf/moa-spss/certstore/0889EBEC55D9E34E782E6D3C250840EB932EEA2F/9CD9ADF04626E7E8C9A1C8DACE3B0B8A2979C726
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/0F843FB1E0C626540BE638B79A2987E2611CE630 b/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/0F843FB1E0C626540BE638B79A2987E2611CE630
deleted file mode 100644
index 29d93550e..000000000
--- a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/0F843FB1E0C626540BE638B79A2987E2611CE630
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/69F21C82DC9A7A940ACEC414593E59C9E61E522F b/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/69F21C82DC9A7A940ACEC414593E59C9E61E522F
deleted file mode 100644
index 2a88295a7..000000000
--- a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/69F21C82DC9A7A940ACEC414593E59C9E61E522F
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/FC72939DC06EDDF8C51549ECF00AC92BF2B39F35 b/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/FC72939DC06EDDF8C51549ECF00AC92BF2B39F35
deleted file mode 100644
index 84a1690d2..000000000
--- a/spss.handbook/conf/moa-spss/certstore/0AF04E7099C9829BD1F8437362BA0036E0705C4D/FC72939DC06EDDF8C51549ECF00AC92BF2B39F35
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/0FE419AB943E7E5C6A7190CC6BBE8E3F914C658A/FB356CEF4406D1F135E3FC59026B338D3F518F9A b/spss.handbook/conf/moa-spss/certstore/0FE419AB943E7E5C6A7190CC6BBE8E3F914C658A/FB356CEF4406D1F135E3FC59026B338D3F518F9A
deleted file mode 100644
index 04c6ea363..000000000
--- a/spss.handbook/conf/moa-spss/certstore/0FE419AB943E7E5C6A7190CC6BBE8E3F914C658A/FB356CEF4406D1F135E3FC59026B338D3F518F9A
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D/E7340D1FB627D8917A9C0D23F21515C441BF1214 b/spss.handbook/conf/moa-spss/certstore/10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D/E7340D1FB627D8917A9C0D23F21515C441BF1214
deleted file mode 100644
index fd23a38d6..000000000
--- a/spss.handbook/conf/moa-spss/certstore/10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D/E7340D1FB627D8917A9C0D23F21515C441BF1214
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/125E4AC6B38C1E0BF34BF7D927CBB947E35141E8/2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7D b/spss.handbook/conf/moa-spss/certstore/125E4AC6B38C1E0BF34BF7D927CBB947E35141E8/2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7D
deleted file mode 100644
index 1a3106742..000000000
--- a/spss.handbook/conf/moa-spss/certstore/125E4AC6B38C1E0BF34BF7D927CBB947E35141E8/2CA36B76BC6CCDC29296111A4EFCAFC0553BBC7D
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/1607988A938D3D339F40AFB567384BC5B7540935/9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2 b/spss.handbook/conf/moa-spss/certstore/1607988A938D3D339F40AFB567384BC5B7540935/9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2
deleted file mode 100644
index 28cb48bb0..000000000
--- a/spss.handbook/conf/moa-spss/certstore/1607988A938D3D339F40AFB567384BC5B7540935/9FDCFE5A082FD69BF5D9E73C25FBE9EA1AC0ACF2
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/1A283D1183DB82A548427B4F19E99E7A8EA728D7/49969819654C230ECDF779ABB9629A211FCC43D6 b/spss.handbook/conf/moa-spss/certstore/1A283D1183DB82A548427B4F19E99E7A8EA728D7/49969819654C230ECDF779ABB9629A211FCC43D6
deleted file mode 100644
index bdfcb7ab1..000000000
--- a/spss.handbook/conf/moa-spss/certstore/1A283D1183DB82A548427B4F19E99E7A8EA728D7/49969819654C230ECDF779ABB9629A211FCC43D6
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/1BF3C1D2767F5C333AD5531531FEE3A712935B73/D0AF386E182F00983637F97C0A5F4708F9F641A7 b/spss.handbook/conf/moa-spss/certstore/1BF3C1D2767F5C333AD5531531FEE3A712935B73/D0AF386E182F00983637F97C0A5F4708F9F641A7
deleted file mode 100644
index eaac3518b..000000000
--- a/spss.handbook/conf/moa-spss/certstore/1BF3C1D2767F5C333AD5531531FEE3A712935B73/D0AF386E182F00983637F97C0A5F4708F9F641A7
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/20DD04B052D2D364E5FF851A3FD314F0FD91253E/6814C7316CEA7191C9CB3BE58199B4A957210D9C b/spss.handbook/conf/moa-spss/certstore/20DD04B052D2D364E5FF851A3FD314F0FD91253E/6814C7316CEA7191C9CB3BE58199B4A957210D9C
deleted file mode 100644
index 4dd2c49bf..000000000
--- a/spss.handbook/conf/moa-spss/certstore/20DD04B052D2D364E5FF851A3FD314F0FD91253E/6814C7316CEA7191C9CB3BE58199B4A957210D9C
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/22973CFC20EA68162A0B2E837D45FB8266ACDBCF/C529469053D9F95810A8F7F2DB9A6596A7655732 b/spss.handbook/conf/moa-spss/certstore/22973CFC20EA68162A0B2E837D45FB8266ACDBCF/C529469053D9F95810A8F7F2DB9A6596A7655732
deleted file mode 100644
index 13abede5c..000000000
--- a/spss.handbook/conf/moa-spss/certstore/22973CFC20EA68162A0B2E837D45FB8266ACDBCF/C529469053D9F95810A8F7F2DB9A6596A7655732
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/238ACC1D03DA5A2E7E580D760FB3EE218FDC5A97/D3C063F219ED073E34AD5D750B327629FFD59AF2 b/spss.handbook/conf/moa-spss/certstore/238ACC1D03DA5A2E7E580D760FB3EE218FDC5A97/D3C063F219ED073E34AD5D750B327629FFD59AF2
deleted file mode 100644
index 33e776369..000000000
--- a/spss.handbook/conf/moa-spss/certstore/238ACC1D03DA5A2E7E580D760FB3EE218FDC5A97/D3C063F219ED073E34AD5D750B327629FFD59AF2
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/1C43C0BA36CC8DE659180B2FAC9A6F54430D5941 b/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/1C43C0BA36CC8DE659180B2FAC9A6F54430D5941
deleted file mode 100644
index d2e7db667..000000000
--- a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/1C43C0BA36CC8DE659180B2FAC9A6F54430D5941
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/AC36A78C66FEC87CC0FD2C32B49214C65676E0C5 b/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/AC36A78C66FEC87CC0FD2C32B49214C65676E0C5
deleted file mode 100644
index f2f1c6562..000000000
--- a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/AC36A78C66FEC87CC0FD2C32B49214C65676E0C5
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/C92238A7178A6C61F8BACA22D6CF7E50772BA9F0 b/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/C92238A7178A6C61F8BACA22D6CF7E50772BA9F0
deleted file mode 100644
index 476a3efb2..000000000
--- a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/C92238A7178A6C61F8BACA22D6CF7E50772BA9F0
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/DFAE695342AC81A521025904406884399822B233 b/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/DFAE695342AC81A521025904406884399822B233
deleted file mode 100644
index 5c88b668a..000000000
--- a/spss.handbook/conf/moa-spss/certstore/23A16796B3D718035F1E0DB209A42938767631DA/DFAE695342AC81A521025904406884399822B233
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/2962CDAADFA0BF8EE53B80870C53E551A43EA72A/12B06E039F1A36D8238AFC508009E1ADF88BF66F b/spss.handbook/conf/moa-spss/certstore/2962CDAADFA0BF8EE53B80870C53E551A43EA72A/12B06E039F1A36D8238AFC508009E1ADF88BF66F
deleted file mode 100644
index 4d1852203..000000000
--- a/spss.handbook/conf/moa-spss/certstore/2962CDAADFA0BF8EE53B80870C53E551A43EA72A/12B06E039F1A36D8238AFC508009E1ADF88BF66F
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/2C976220B378E08DF5E68CBC54C05CE41224FD29/0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38 b/spss.handbook/conf/moa-spss/certstore/2C976220B378E08DF5E68CBC54C05CE41224FD29/0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38
deleted file mode 100644
index 69a8e4872..000000000
--- a/spss.handbook/conf/moa-spss/certstore/2C976220B378E08DF5E68CBC54C05CE41224FD29/0CC37CC35E18F9909E43E4E9894D0CDF06EE9A38
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/2F5DA022AAFF668F34C35A80049D690F3CFE3040/D62327E6B19B7968A8BE6588DEAB0BC0DB684D8D b/spss.handbook/conf/moa-spss/certstore/2F5DA022AAFF668F34C35A80049D690F3CFE3040/D62327E6B19B7968A8BE6588DEAB0BC0DB684D8D
deleted file mode 100644
index 807fa786c..000000000
--- a/spss.handbook/conf/moa-spss/certstore/2F5DA022AAFF668F34C35A80049D690F3CFE3040/D62327E6B19B7968A8BE6588DEAB0BC0DB684D8D
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/31B5BA02D476873C5220CDCFA0C095C4A31DEFDF/88D6151358A5E3C81D7AE1A536121DC03011BC03 b/spss.handbook/conf/moa-spss/certstore/31B5BA02D476873C5220CDCFA0C095C4A31DEFDF/88D6151358A5E3C81D7AE1A536121DC03011BC03
deleted file mode 100644
index 376d0753f..000000000
--- a/spss.handbook/conf/moa-spss/certstore/31B5BA02D476873C5220CDCFA0C095C4A31DEFDF/88D6151358A5E3C81D7AE1A536121DC03011BC03
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/3314CE3E42175EACC28D57C35F192430BBADAC1A/B1D0BC027906A3B7E7518C93ACB26D978233ED27 b/spss.handbook/conf/moa-spss/certstore/3314CE3E42175EACC28D57C35F192430BBADAC1A/B1D0BC027906A3B7E7518C93ACB26D978233ED27
deleted file mode 100644
index 5171276f4..000000000
--- a/spss.handbook/conf/moa-spss/certstore/3314CE3E42175EACC28D57C35F192430BBADAC1A/B1D0BC027906A3B7E7518C93ACB26D978233ED27
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/337F895A0435AA7E2629C5282B5A0DBBE19EE1C7/75F792DE2CF544007F470F1B924961C2BD2EF517 b/spss.handbook/conf/moa-spss/certstore/337F895A0435AA7E2629C5282B5A0DBBE19EE1C7/75F792DE2CF544007F470F1B924961C2BD2EF517
deleted file mode 100644
index f8a8957ac..000000000
--- a/spss.handbook/conf/moa-spss/certstore/337F895A0435AA7E2629C5282B5A0DBBE19EE1C7/75F792DE2CF544007F470F1B924961C2BD2EF517
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/3A095C38EB5D5824FE61BE43F9CDF6515DC94805/65698A39E03FF00FD552D4AD99FB290C2B9D4BEA b/spss.handbook/conf/moa-spss/certstore/3A095C38EB5D5824FE61BE43F9CDF6515DC94805/65698A39E03FF00FD552D4AD99FB290C2B9D4BEA
deleted file mode 100644
index 836ba3767..000000000
--- a/spss.handbook/conf/moa-spss/certstore/3A095C38EB5D5824FE61BE43F9CDF6515DC94805/65698A39E03FF00FD552D4AD99FB290C2B9D4BEA
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F b/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F
deleted file mode 100644
index 69de75609..000000000
--- a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/0F5A0342F5CD448799C3C6D178607E3F2B5BCB8F
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AE b/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AE
deleted file mode 100644
index efa28178e..000000000
--- a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/51A44C28F313E3F9CB5E7C0A1E0E0DD2843758AE
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733 b/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733
deleted file mode 100644
index 289fc2198..000000000
--- a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/9E0512DD61DA5949D1D8631C3F19D75F496C3733
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6 b/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6
deleted file mode 100644
index b7d4b08a6..000000000
--- a/spss.handbook/conf/moa-spss/certstore/3B2F8C424AA88CA305C519FDEFCF29DDB7E96AE2/E6E6FC88719177C9B7421825757C5E47BCAC85F6
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/3B76D7A5CE7EC6022D7990CFEA534C908717DF54/C0C699EFE6E837CB5E4CFC3A61077617A22C1A9E b/spss.handbook/conf/moa-spss/certstore/3B76D7A5CE7EC6022D7990CFEA534C908717DF54/C0C699EFE6E837CB5E4CFC3A61077617A22C1A9E
deleted file mode 100644
index b2beddaa5..000000000
--- a/spss.handbook/conf/moa-spss/certstore/3B76D7A5CE7EC6022D7990CFEA534C908717DF54/C0C699EFE6E837CB5E4CFC3A61077617A22C1A9E
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/3C627C9D89A5BFB5E4E385982DF33B7E7F6E8D2D/C5AC86EC5B771BEBDF8B6E040F109A1186E229B9 b/spss.handbook/conf/moa-spss/certstore/3C627C9D89A5BFB5E4E385982DF33B7E7F6E8D2D/C5AC86EC5B771BEBDF8B6E040F109A1186E229B9
deleted file mode 100644
index 54893c9d6..000000000
--- a/spss.handbook/conf/moa-spss/certstore/3C627C9D89A5BFB5E4E385982DF33B7E7F6E8D2D/C5AC86EC5B771BEBDF8B6E040F109A1186E229B9
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/3C7CE93947421CB66603DC7DBAB0F04C4788382F/23E594945195F2414803B4D564D2A3A3F5D88B8C b/spss.handbook/conf/moa-spss/certstore/3C7CE93947421CB66603DC7DBAB0F04C4788382F/23E594945195F2414803B4D564D2A3A3F5D88B8C
deleted file mode 100644
index 8588ce58a..000000000
--- a/spss.handbook/conf/moa-spss/certstore/3C7CE93947421CB66603DC7DBAB0F04C4788382F/23E594945195F2414803B4D564D2A3A3F5D88B8C
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/4224231A54F64581FBA2AB6ED82ADE467F144BDC/65EF37033859C2F709A64086D3A5BD1B8F1A85A4 b/spss.handbook/conf/moa-spss/certstore/4224231A54F64581FBA2AB6ED82ADE467F144BDC/65EF37033859C2F709A64086D3A5BD1B8F1A85A4
deleted file mode 100644
index 6e17b9db5..000000000
--- a/spss.handbook/conf/moa-spss/certstore/4224231A54F64581FBA2AB6ED82ADE467F144BDC/65EF37033859C2F709A64086D3A5BD1B8F1A85A4
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/45E2F3F807C6EAB9EDC1B3250F7558CA12A063DE/3A77E9B577661D99F9BBA5A352B29C7FF58A3D26 b/spss.handbook/conf/moa-spss/certstore/45E2F3F807C6EAB9EDC1B3250F7558CA12A063DE/3A77E9B577661D99F9BBA5A352B29C7FF58A3D26
deleted file mode 100644
index 55707d69f..000000000
--- a/spss.handbook/conf/moa-spss/certstore/45E2F3F807C6EAB9EDC1B3250F7558CA12A063DE/3A77E9B577661D99F9BBA5A352B29C7FF58A3D26
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/47ED4C584F9DCD54A6C2925252C5603ADAC93F49/84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923E b/spss.handbook/conf/moa-spss/certstore/47ED4C584F9DCD54A6C2925252C5603ADAC93F49/84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923E
deleted file mode 100644
index 3be7b6a06..000000000
--- a/spss.handbook/conf/moa-spss/certstore/47ED4C584F9DCD54A6C2925252C5603ADAC93F49/84E4E75DBB2FD6397E6ABBD27FBE16D5BA71923E
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/487F4DEE9E63DADEB4CAAB07E0E166ACC9F584B6/9891BBEA9FDA665EEEC31C403A00A5CA5628D0FA b/spss.handbook/conf/moa-spss/certstore/487F4DEE9E63DADEB4CAAB07E0E166ACC9F584B6/9891BBEA9FDA665EEEC31C403A00A5CA5628D0FA
deleted file mode 100644
index 4e18de8d7..000000000
--- a/spss.handbook/conf/moa-spss/certstore/487F4DEE9E63DADEB4CAAB07E0E166ACC9F584B6/9891BBEA9FDA665EEEC31C403A00A5CA5628D0FA
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/52B42552A440A54C21A39D46D7F176AF28BEB5AA/51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4 b/spss.handbook/conf/moa-spss/certstore/52B42552A440A54C21A39D46D7F176AF28BEB5AA/51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4
deleted file mode 100644
index 9b2ee0fc6..000000000
--- a/spss.handbook/conf/moa-spss/certstore/52B42552A440A54C21A39D46D7F176AF28BEB5AA/51AC8CFF36818AA25498A293DF48EBCFFFF6D0B4
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/550E9627E9094A2D1BB6385821334D02122BCF26/B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0F b/spss.handbook/conf/moa-spss/certstore/550E9627E9094A2D1BB6385821334D02122BCF26/B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0F
deleted file mode 100644
index 5dd9558d0..000000000
--- a/spss.handbook/conf/moa-spss/certstore/550E9627E9094A2D1BB6385821334D02122BCF26/B7BCA7BC3C41FD0DC835175486FAB3FB4626EC0F
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830 b/spss.handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830
deleted file mode 100644
index 7e9fd5b0b..000000000
--- a/spss.handbook/conf/moa-spss/certstore/562428A359B1CC3A820ABCC9C8F625CBB6A6A510/FCD9E881BCCCB9352EEF337C8D4EAAD65C4EC830
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/58090A698038FEDAD56B4B976F23C29950D1D5A5/6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25B b/spss.handbook/conf/moa-spss/certstore/58090A698038FEDAD56B4B976F23C29950D1D5A5/6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25B
deleted file mode 100644
index b15880c29..000000000
--- a/spss.handbook/conf/moa-spss/certstore/58090A698038FEDAD56B4B976F23C29950D1D5A5/6BDA1FF41EEBC5DA66912F3C69B60C2A41C6E25B
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/59484253C7D4C5BEAB7D2BABFAC13DDD1CA53FCC/341EA32E448659125A67DD04177FD17468FCFCB1 b/spss.handbook/conf/moa-spss/certstore/59484253C7D4C5BEAB7D2BABFAC13DDD1CA53FCC/341EA32E448659125A67DD04177FD17468FCFCB1
deleted file mode 100644
index 6da18c620..000000000
--- a/spss.handbook/conf/moa-spss/certstore/59484253C7D4C5BEAB7D2BABFAC13DDD1CA53FCC/341EA32E448659125A67DD04177FD17468FCFCB1
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD b/spss.handbook/conf/moa-spss/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD
deleted file mode 100644
index c19647ad8..000000000
--- a/spss.handbook/conf/moa-spss/certstore/60EF765436B4F314F2285BE2D89A511073AC0D58/334710B9169BCD20687A6302EEB16AEB97F288CD
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/6144BFC0CBE85C63DEFB6F208D80385B89F68046/D031945D982820B92FADBC7F71F6D1D9DFFDA2C9 b/spss.handbook/conf/moa-spss/certstore/6144BFC0CBE85C63DEFB6F208D80385B89F68046/D031945D982820B92FADBC7F71F6D1D9DFFDA2C9
deleted file mode 100644
index 39f88d881..000000000
--- a/spss.handbook/conf/moa-spss/certstore/6144BFC0CBE85C63DEFB6F208D80385B89F68046/D031945D982820B92FADBC7F71F6D1D9DFFDA2C9
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2B b/spss.handbook/conf/moa-spss/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2B
deleted file mode 100644
index d361d919f..000000000
--- a/spss.handbook/conf/moa-spss/certstore/6F5F08A3A5D59CA877CB146F00BB0264369B2304/ADEC5673B57A18F16EFAF75EEFBFAD4841E2CD2B
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/6F86F897C45679B45F03C67D44B6447EFF43B758/53CB69CF933C2D28FB9DF91F2852A99EC3352EA0 b/spss.handbook/conf/moa-spss/certstore/6F86F897C45679B45F03C67D44B6447EFF43B758/53CB69CF933C2D28FB9DF91F2852A99EC3352EA0
deleted file mode 100644
index 89cfe44fd..000000000
--- a/spss.handbook/conf/moa-spss/certstore/6F86F897C45679B45F03C67D44B6447EFF43B758/53CB69CF933C2D28FB9DF91F2852A99EC3352EA0
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/728C819D737EE42627F96F839C33BB6E68E85F68/00845B74CA13FE0A9056E6C0B5126FECF73B0D8C b/spss.handbook/conf/moa-spss/certstore/728C819D737EE42627F96F839C33BB6E68E85F68/00845B74CA13FE0A9056E6C0B5126FECF73B0D8C
deleted file mode 100644
index cc8b505ec..000000000
--- a/spss.handbook/conf/moa-spss/certstore/728C819D737EE42627F96F839C33BB6E68E85F68/00845B74CA13FE0A9056E6C0B5126FECF73B0D8C
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/474BC41135FB88BF58B5A8D976A1D5583378D85E b/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/474BC41135FB88BF58B5A8D976A1D5583378D85E
deleted file mode 100644
index c9da41583..000000000
--- a/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/474BC41135FB88BF58B5A8D976A1D5583378D85E
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01 b/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01
deleted file mode 100644
index 28fbdf42f..000000000
--- a/spss.handbook/conf/moa-spss/certstore/738B34854780955AE8FAF12349F2C9C52105A52C/6B618820CE6A5EC0B5E63A9170335E5EA9F3BA01
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/76011AE57123CC4E476C094C48C461DC37A0DEDD/FDC348410699803DE7D8276813BC2232EA99A878 b/spss.handbook/conf/moa-spss/certstore/76011AE57123CC4E476C094C48C461DC37A0DEDD/FDC348410699803DE7D8276813BC2232EA99A878
deleted file mode 100644
index 424f849a1..000000000
--- a/spss.handbook/conf/moa-spss/certstore/76011AE57123CC4E476C094C48C461DC37A0DEDD/FDC348410699803DE7D8276813BC2232EA99A878
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/7A9DC855647136050A8D75D6571AC64739F36C6C/BF648929E7DAABD8D97B3202F48D6C4A19C78F6C b/spss.handbook/conf/moa-spss/certstore/7A9DC855647136050A8D75D6571AC64739F36C6C/BF648929E7DAABD8D97B3202F48D6C4A19C78F6C
deleted file mode 100644
index 4989f3e73..000000000
--- a/spss.handbook/conf/moa-spss/certstore/7A9DC855647136050A8D75D6571AC64739F36C6C/BF648929E7DAABD8D97B3202F48D6C4A19C78F6C
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/88D9F0C0EBB72C58516EC96AEED397FA86B40E39/6DCD5118D1542E6C205C580775C5420B7509506B b/spss.handbook/conf/moa-spss/certstore/88D9F0C0EBB72C58516EC96AEED397FA86B40E39/6DCD5118D1542E6C205C580775C5420B7509506B
deleted file mode 100644
index 06b40aa67..000000000
--- a/spss.handbook/conf/moa-spss/certstore/88D9F0C0EBB72C58516EC96AEED397FA86B40E39/6DCD5118D1542E6C205C580775C5420B7509506B
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/3B8484BF1370941BF03F206B5C4958DA4E1559BB b/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/3B8484BF1370941BF03F206B5C4958DA4E1559BB
deleted file mode 100644
index 6f97837a2..000000000
--- a/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/3B8484BF1370941BF03F206B5C4958DA4E1559BB
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/C0EF3E7A54B4C501295F77974B1995E36B25C92B b/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/C0EF3E7A54B4C501295F77974B1995E36B25C92B
deleted file mode 100644
index 508f7f076..000000000
--- a/spss.handbook/conf/moa-spss/certstore/8B23D64DBA1572885563DF070BE9C22A39A3BD26/C0EF3E7A54B4C501295F77974B1995E36B25C92B
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/8FDB1CB752D82C88C89F9E9DA7AD2F54C6FA6F3B/842B3870A64001CDD90978D0E554DAF94D9ABDFE b/spss.handbook/conf/moa-spss/certstore/8FDB1CB752D82C88C89F9E9DA7AD2F54C6FA6F3B/842B3870A64001CDD90978D0E554DAF94D9ABDFE
deleted file mode 100644
index a0e3fdda1..000000000
--- a/spss.handbook/conf/moa-spss/certstore/8FDB1CB752D82C88C89F9E9DA7AD2F54C6FA6F3B/842B3870A64001CDD90978D0E554DAF94D9ABDFE
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/679A4F81FC705DDEC419778DD2EBD875F4C242C6 b/spss.handbook/conf/moa-spss/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/679A4F81FC705DDEC419778DD2EBD875F4C242C6
deleted file mode 100644
index 36a442b89..000000000
--- a/spss.handbook/conf/moa-spss/certstore/9014D44A2072A5D74E12C7FE47F37D68371E1C42/679A4F81FC705DDEC419778DD2EBD875F4C242C6
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/91C4DD783D6D38F0325FE74930BF61F656364EA9/53A6B611F8CEE0315BCCE5D59898931ED390E400 b/spss.handbook/conf/moa-spss/certstore/91C4DD783D6D38F0325FE74930BF61F656364EA9/53A6B611F8CEE0315BCCE5D59898931ED390E400
deleted file mode 100644
index 6c0216239..000000000
--- a/spss.handbook/conf/moa-spss/certstore/91C4DD783D6D38F0325FE74930BF61F656364EA9/53A6B611F8CEE0315BCCE5D59898931ED390E400
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/45B43346251FDF9E95DCB7F36928785D46D63913 b/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/45B43346251FDF9E95DCB7F36928785D46D63913
deleted file mode 100644
index f3cf5e676..000000000
--- a/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/45B43346251FDF9E95DCB7F36928785D46D63913
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/E33619C88426E4FE956041E6751ADDEC9C10F0BC b/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/E33619C88426E4FE956041E6751ADDEC9C10F0BC
deleted file mode 100644
index fc5bd433b..000000000
--- a/spss.handbook/conf/moa-spss/certstore/96107213A757FFB88DECEE469373162636D7146C/E33619C88426E4FE956041E6751ADDEC9C10F0BC
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/975729FFAF7EB667BCF68E9B886EA876E44F46D0/35202B14F69409EAA51CD8AB547AC0CD5E993F3F b/spss.handbook/conf/moa-spss/certstore/975729FFAF7EB667BCF68E9B886EA876E44F46D0/35202B14F69409EAA51CD8AB547AC0CD5E993F3F
deleted file mode 100644
index 3beb4529a..000000000
--- a/spss.handbook/conf/moa-spss/certstore/975729FFAF7EB667BCF68E9B886EA876E44F46D0/35202B14F69409EAA51CD8AB547AC0CD5E993F3F
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6 b/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6
deleted file mode 100644
index 781d1e4f2..000000000
--- a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/3F4E01DF7547CDD38DCCFCCD76170C299ECEB9F6
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/9D4CB7E3DBF24AE596972D59C375DD6384BB5E8B b/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/9D4CB7E3DBF24AE596972D59C375DD6384BB5E8B
deleted file mode 100644
index 8286cabbc..000000000
--- a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/9D4CB7E3DBF24AE596972D59C375DD6384BB5E8B
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/A562C4B99E2847251CB4A1F05DA1FF43E7296F0B b/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/A562C4B99E2847251CB4A1F05DA1FF43E7296F0B
deleted file mode 100644
index a0148f63b..000000000
--- a/spss.handbook/conf/moa-spss/certstore/9D3E6FACCD6AF894CDD2B91D1B9E3C2E310EAB93/A562C4B99E2847251CB4A1F05DA1FF43E7296F0B
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8C b/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8C
deleted file mode 100644
index 61d346a8f..000000000
--- a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9039DBD29DB8AD0F8E2015F05FCD40582CCCBE8C
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9F0E0FBB25F66FF88C8E033EFF358923C84A2926 b/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9F0E0FBB25F66FF88C8E033EFF358923C84A2926
deleted file mode 100644
index 9ae7ffa0c..000000000
--- a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/9F0E0FBB25F66FF88C8E033EFF358923C84A2926
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/C87D1855227D995C332C4C9072A2E2053F2CC623 b/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/C87D1855227D995C332C4C9072A2E2053F2CC623
deleted file mode 100644
index a68ae2db7..000000000
--- a/spss.handbook/conf/moa-spss/certstore/9F5A9B8D0F919C96B9472442BFBBDD34232A627D/C87D1855227D995C332C4C9072A2E2053F2CC623
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/42AD1897A4643D2AA634D980F16349E6694F3B1B b/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/42AD1897A4643D2AA634D980F16349E6694F3B1B
deleted file mode 100644
index f1d7b6a28..000000000
--- a/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/42AD1897A4643D2AA634D980F16349E6694F3B1B
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/FE7891B6ED7B178F528A28B21478299F865889BD b/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/FE7891B6ED7B178F528A28B21478299F865889BD
deleted file mode 100644
index c1b90c0f4..000000000
--- a/spss.handbook/conf/moa-spss/certstore/A07E912CAA2AB620034B05353E7D4B91807880ED/FE7891B6ED7B178F528A28B21478299F865889BD
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/A15B5DBE14A19CF859F48E2DA2A29A4C3DB4D680/3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02B b/spss.handbook/conf/moa-spss/certstore/A15B5DBE14A19CF859F48E2DA2A29A4C3DB4D680/3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02B
deleted file mode 100644
index e27a87038..000000000
--- a/spss.handbook/conf/moa-spss/certstore/A15B5DBE14A19CF859F48E2DA2A29A4C3DB4D680/3AC12E21FFF9ACAB2BCFF52BBD885FB7AAC9A02B
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/8784ED81F5A22779EB0B081945FD151992557FBE b/spss.handbook/conf/moa-spss/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/8784ED81F5A22779EB0B081945FD151992557FBE
deleted file mode 100644
index cc35ba691..000000000
--- a/spss.handbook/conf/moa-spss/certstore/A24C49B7F1B637E7F72C12CAB35910EC8EF1C6CF/8784ED81F5A22779EB0B081945FD151992557FBE
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/20CAECDCA766243AAD6FA1327618FC81BA65DC0F b/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/20CAECDCA766243AAD6FA1327618FC81BA65DC0F
deleted file mode 100644
index b596d82e3..000000000
--- a/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/20CAECDCA766243AAD6FA1327618FC81BA65DC0F
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/96D5D179016A5A6546973BA63733617EE1F1540D b/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/96D5D179016A5A6546973BA63733617EE1F1540D
deleted file mode 100644
index 4adc3b7ec..000000000
--- a/spss.handbook/conf/moa-spss/certstore/A4B140FBD4D5EA2AC3A570299945D8FCBBAD2231/96D5D179016A5A6546973BA63733617EE1F1540D
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7A b/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7A
deleted file mode 100644
index b6f39e354..000000000
--- a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/DFA7DDEF5C212F0F0651E2A9DE1CE4A1AC63AF7A
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/E619D25B380B7B13FDA33E8A58CD82D8A88E0515 b/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/E619D25B380B7B13FDA33E8A58CD82D8A88E0515
deleted file mode 100644
index f9fef65fc..000000000
--- a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/E619D25B380B7B13FDA33E8A58CD82D8A88E0515
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92 b/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92
deleted file mode 100644
index f9f27442b..000000000
--- a/spss.handbook/conf/moa-spss/certstore/A95F0C3FA54CA93E3D5BA61AD23459300FA498D6/F825578F8F5484DFB40F81867C392D6CB0012B92
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/AAB27F0E98B28AF253454415F6490CB5F43A4B49/A9D28607928FA8615E2615CC9D71B535C5D0D419 b/spss.handbook/conf/moa-spss/certstore/AAB27F0E98B28AF253454415F6490CB5F43A4B49/A9D28607928FA8615E2615CC9D71B535C5D0D419
deleted file mode 100644
index 10a1f7141..000000000
--- a/spss.handbook/conf/moa-spss/certstore/AAB27F0E98B28AF253454415F6490CB5F43A4B49/A9D28607928FA8615E2615CC9D71B535C5D0D419
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/AC1B67D7D5A300767C0944ACE8458DD49960F1BD/4D523730501ADB80A76B0B473A4D21C7D86F8374 b/spss.handbook/conf/moa-spss/certstore/AC1B67D7D5A300767C0944ACE8458DD49960F1BD/4D523730501ADB80A76B0B473A4D21C7D86F8374
deleted file mode 100644
index 61a7ccb15..000000000
--- a/spss.handbook/conf/moa-spss/certstore/AC1B67D7D5A300767C0944ACE8458DD49960F1BD/4D523730501ADB80A76B0B473A4D21C7D86F8374
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/B310CEED301C503EDB15720F94D5D7E76BF423DA/AA94FD422AEB8F5B6E8508314CE0DC68BCD53305 b/spss.handbook/conf/moa-spss/certstore/B310CEED301C503EDB15720F94D5D7E76BF423DA/AA94FD422AEB8F5B6E8508314CE0DC68BCD53305
deleted file mode 100644
index ea3512e3d..000000000
--- a/spss.handbook/conf/moa-spss/certstore/B310CEED301C503EDB15720F94D5D7E76BF423DA/AA94FD422AEB8F5B6E8508314CE0DC68BCD53305
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/B3EB7B59ECFF1E25E16C64BB24993D1B20DCFC28/07A6DEED70213CCF598F278789680DA4C04A0331 b/spss.handbook/conf/moa-spss/certstore/B3EB7B59ECFF1E25E16C64BB24993D1B20DCFC28/07A6DEED70213CCF598F278789680DA4C04A0331
deleted file mode 100644
index 46dd968f0..000000000
--- a/spss.handbook/conf/moa-spss/certstore/B3EB7B59ECFF1E25E16C64BB24993D1B20DCFC28/07A6DEED70213CCF598F278789680DA4C04A0331
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/BAA9ADD095E87E0B490B6DD933AA2F450C6B9492/7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2 b/spss.handbook/conf/moa-spss/certstore/BAA9ADD095E87E0B490B6DD933AA2F450C6B9492/7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2
deleted file mode 100644
index 63ba5cce5..000000000
--- a/spss.handbook/conf/moa-spss/certstore/BAA9ADD095E87E0B490B6DD933AA2F450C6B9492/7A430B6E3592BEEDFAA0DD5DD6262C27EB8D26D2
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/BE47A5DA41A35F740D98305DA8FF4096B71492BE/D1474E7D99512D05B98DD37B3FE86496A03D088D b/spss.handbook/conf/moa-spss/certstore/BE47A5DA41A35F740D98305DA8FF4096B71492BE/D1474E7D99512D05B98DD37B3FE86496A03D088D
deleted file mode 100644
index 0bab77032..000000000
--- a/spss.handbook/conf/moa-spss/certstore/BE47A5DA41A35F740D98305DA8FF4096B71492BE/D1474E7D99512D05B98DD37B3FE86496A03D088D
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/BED4C70D83B5042F4254459064FDEACD43DD1EDF/7BE0C8E441786C69A3CB35BDBEF235F8B5310E04 b/spss.handbook/conf/moa-spss/certstore/BED4C70D83B5042F4254459064FDEACD43DD1EDF/7BE0C8E441786C69A3CB35BDBEF235F8B5310E04
deleted file mode 100644
index 0a8de4bb9..000000000
--- a/spss.handbook/conf/moa-spss/certstore/BED4C70D83B5042F4254459064FDEACD43DD1EDF/7BE0C8E441786C69A3CB35BDBEF235F8B5310E04
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/C15FFFE6EFAD484909C9EFC6CD5C20435E326685/DDBAE68B1FF60FFBB2854C78727B76C95EC83BBE b/spss.handbook/conf/moa-spss/certstore/C15FFFE6EFAD484909C9EFC6CD5C20435E326685/DDBAE68B1FF60FFBB2854C78727B76C95EC83BBE
deleted file mode 100644
index 6428b8256..000000000
--- a/spss.handbook/conf/moa-spss/certstore/C15FFFE6EFAD484909C9EFC6CD5C20435E326685/DDBAE68B1FF60FFBB2854C78727B76C95EC83BBE
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/C2A7CAE9E68EB7945828D193CB22CDD246BC7F95/6955D95F6B0799F7D96F4FC28E6E6C64758C1240 b/spss.handbook/conf/moa-spss/certstore/C2A7CAE9E68EB7945828D193CB22CDD246BC7F95/6955D95F6B0799F7D96F4FC28E6E6C64758C1240
deleted file mode 100644
index f11bd6247..000000000
--- a/spss.handbook/conf/moa-spss/certstore/C2A7CAE9E68EB7945828D193CB22CDD246BC7F95/6955D95F6B0799F7D96F4FC28E6E6C64758C1240
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/C52E4A04A22D98C70E19F1969AD71C838E4371B3/F96FE4F59166EFA9000B21A16EF22CF14468890C b/spss.handbook/conf/moa-spss/certstore/C52E4A04A22D98C70E19F1969AD71C838E4371B3/F96FE4F59166EFA9000B21A16EF22CF14468890C
deleted file mode 100644
index 348257122..000000000
--- a/spss.handbook/conf/moa-spss/certstore/C52E4A04A22D98C70E19F1969AD71C838E4371B3/F96FE4F59166EFA9000B21A16EF22CF14468890C
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/C7E1D3604D2A960201D70F29B8A80EDA11475EEB/C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3ED b/spss.handbook/conf/moa-spss/certstore/C7E1D3604D2A960201D70F29B8A80EDA11475EEB/C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3ED
deleted file mode 100644
index a3f8a7409..000000000
--- a/spss.handbook/conf/moa-spss/certstore/C7E1D3604D2A960201D70F29B8A80EDA11475EEB/C18ECC8FD712ACAFBEAEDC1FA13F5AB19930E3ED
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/C976280EC7FECF169577E31D8CA0BB00967904B1/7666A8BD2C2513DE489C06D08D566F177ECE84AA b/spss.handbook/conf/moa-spss/certstore/C976280EC7FECF169577E31D8CA0BB00967904B1/7666A8BD2C2513DE489C06D08D566F177ECE84AA
deleted file mode 100644
index 3c1f2f8a2..000000000
--- a/spss.handbook/conf/moa-spss/certstore/C976280EC7FECF169577E31D8CA0BB00967904B1/7666A8BD2C2513DE489C06D08D566F177ECE84AA
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/CABD2EA6CA438084840DCCAE875F341E2D3A2C43/02A0E6456442E35198532ACFFB6FEE3B606D9FA3 b/spss.handbook/conf/moa-spss/certstore/CABD2EA6CA438084840DCCAE875F341E2D3A2C43/02A0E6456442E35198532ACFFB6FEE3B606D9FA3
deleted file mode 100644
index 5026d395f..000000000
--- a/spss.handbook/conf/moa-spss/certstore/CABD2EA6CA438084840DCCAE875F341E2D3A2C43/02A0E6456442E35198532ACFFB6FEE3B606D9FA3
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/8AB0A3519AFA7F3C04074522678BAA1CB3DC734F b/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/8AB0A3519AFA7F3C04074522678BAA1CB3DC734F
deleted file mode 100644
index c34d0f380..000000000
--- a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/8AB0A3519AFA7F3C04074522678BAA1CB3DC734F
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/DF47B3040E7632614464BD2EC4ECD1B8030F53E3 b/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/DF47B3040E7632614464BD2EC4ECD1B8030F53E3
deleted file mode 100644
index d894e92ca..000000000
--- a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/DF47B3040E7632614464BD2EC4ECD1B8030F53E3
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/E117479B4A41D7F3223FCAE50560B0D57B22217D b/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/E117479B4A41D7F3223FCAE50560B0D57B22217D
deleted file mode 100644
index 380486f65..000000000
--- a/spss.handbook/conf/moa-spss/certstore/CE91CC7CF2DDDEE6623A1A91B3298DCAD2375F2B/E117479B4A41D7F3223FCAE50560B0D57B22217D
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/D4D40BD33958CD9169A7AB6304AA2BBAD22DC595/07976A2A16EC182670161B46886B05E1FEAC16B1 b/spss.handbook/conf/moa-spss/certstore/D4D40BD33958CD9169A7AB6304AA2BBAD22DC595/07976A2A16EC182670161B46886B05E1FEAC16B1
deleted file mode 100644
index 22d64fb5f..000000000
--- a/spss.handbook/conf/moa-spss/certstore/D4D40BD33958CD9169A7AB6304AA2BBAD22DC595/07976A2A16EC182670161B46886B05E1FEAC16B1
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/D708C897515970D33EF7CD0C2474449D3AB6AA83/52ED0FAFBD38A868C678174D7EB03D266ADB221C b/spss.handbook/conf/moa-spss/certstore/D708C897515970D33EF7CD0C2474449D3AB6AA83/52ED0FAFBD38A868C678174D7EB03D266ADB221C
deleted file mode 100644
index 42a64da07..000000000
--- a/spss.handbook/conf/moa-spss/certstore/D708C897515970D33EF7CD0C2474449D3AB6AA83/52ED0FAFBD38A868C678174D7EB03D266ADB221C
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/DD29E76659D18371B78E61E7DF4D4B8FEDCAF8E7/8BA5C0847597612C7E16970EAE55EF58D32E9CF3 b/spss.handbook/conf/moa-spss/certstore/DD29E76659D18371B78E61E7DF4D4B8FEDCAF8E7/8BA5C0847597612C7E16970EAE55EF58D32E9CF3
deleted file mode 100644
index 010c5d5b6..000000000
--- a/spss.handbook/conf/moa-spss/certstore/DD29E76659D18371B78E61E7DF4D4B8FEDCAF8E7/8BA5C0847597612C7E16970EAE55EF58D32E9CF3
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/27337257493B86B9BFF78D569F938D692A430EAE b/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/27337257493B86B9BFF78D569F938D692A430EAE
deleted file mode 100644
index 5375c57c3..000000000
--- a/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/27337257493B86B9BFF78D569F938D692A430EAE
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/4832F0A28C3724A92F6CB3314F747D0E74FC7344 b/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/4832F0A28C3724A92F6CB3314F747D0E74FC7344
deleted file mode 100644
index 7085c5ac9..000000000
--- a/spss.handbook/conf/moa-spss/certstore/DF5F53FDADAFC93F4789141B5A7627EB9F3BD29F/4832F0A28C3724A92F6CB3314F747D0E74FC7344
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/E6A4C843059A6043B4DC967F9EF892B695990777/B4B77C83465979E3679E3A33F972F48EE3730A18 b/spss.handbook/conf/moa-spss/certstore/E6A4C843059A6043B4DC967F9EF892B695990777/B4B77C83465979E3679E3A33F972F48EE3730A18
deleted file mode 100644
index 6225c0ca7..000000000
--- a/spss.handbook/conf/moa-spss/certstore/E6A4C843059A6043B4DC967F9EF892B695990777/B4B77C83465979E3679E3A33F972F48EE3730A18
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/EA7E6D37E678C1BCA5060F97DAF09F559DFD04B7/3AAD23B00CA10E54E6368DF7952E3F4B5108B65C b/spss.handbook/conf/moa-spss/certstore/EA7E6D37E678C1BCA5060F97DAF09F559DFD04B7/3AAD23B00CA10E54E6368DF7952E3F4B5108B65C
deleted file mode 100644
index a3aa0000d..000000000
--- a/spss.handbook/conf/moa-spss/certstore/EA7E6D37E678C1BCA5060F97DAF09F559DFD04B7/3AAD23B00CA10E54E6368DF7952E3F4B5108B65C
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/EEE6351C5C6EBD8644AB88E7648D44FA07C72A80/14E59C02A6877B0EBD2C4203886BA25959C1D267 b/spss.handbook/conf/moa-spss/certstore/EEE6351C5C6EBD8644AB88E7648D44FA07C72A80/14E59C02A6877B0EBD2C4203886BA25959C1D267
deleted file mode 100644
index 332aa817a..000000000
--- a/spss.handbook/conf/moa-spss/certstore/EEE6351C5C6EBD8644AB88E7648D44FA07C72A80/14E59C02A6877B0EBD2C4203886BA25959C1D267
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/F1B84756A1EAB09C171B2783DD163B42A9BD0BBB/ED5608CE67EA5CB79AC024CEA7445F9BCBE48703 b/spss.handbook/conf/moa-spss/certstore/F1B84756A1EAB09C171B2783DD163B42A9BD0BBB/ED5608CE67EA5CB79AC024CEA7445F9BCBE48703
deleted file mode 100644
index 069640ffc..000000000
--- a/spss.handbook/conf/moa-spss/certstore/F1B84756A1EAB09C171B2783DD163B42A9BD0BBB/ED5608CE67EA5CB79AC024CEA7445F9BCBE48703
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/F3DA7C495789E656FA27E611CCAFA05F232ADEA0/F3AE9FEA4DECEE5330770A2520BD86909929E7BE b/spss.handbook/conf/moa-spss/certstore/F3DA7C495789E656FA27E611CCAFA05F232ADEA0/F3AE9FEA4DECEE5330770A2520BD86909929E7BE
deleted file mode 100644
index c3fc91352..000000000
--- a/spss.handbook/conf/moa-spss/certstore/F3DA7C495789E656FA27E611CCAFA05F232ADEA0/F3AE9FEA4DECEE5330770A2520BD86909929E7BE
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/F48B57F89BACD8687EBB12223A5B8E5EF3774583/CAF84A42305615AC2C582F6412BDA3E36DAC3D25 b/spss.handbook/conf/moa-spss/certstore/F48B57F89BACD8687EBB12223A5B8E5EF3774583/CAF84A42305615AC2C582F6412BDA3E36DAC3D25
deleted file mode 100644
index 83aeb1fce..000000000
--- a/spss.handbook/conf/moa-spss/certstore/F48B57F89BACD8687EBB12223A5B8E5EF3774583/CAF84A42305615AC2C582F6412BDA3E36DAC3D25
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/F613568C1D7A1300B32609998288211959DBDFB0/D7EDAF7381F7FC93B4C28FA372190D7A59CFA696 b/spss.handbook/conf/moa-spss/certstore/F613568C1D7A1300B32609998288211959DBDFB0/D7EDAF7381F7FC93B4C28FA372190D7A59CFA696
deleted file mode 100644
index 5631441a9..000000000
--- a/spss.handbook/conf/moa-spss/certstore/F613568C1D7A1300B32609998288211959DBDFB0/D7EDAF7381F7FC93B4C28FA372190D7A59CFA696
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/certstore/F7D331850EC13D22284909E0FC3493A65FFA7F30/EC988340526163D5B7AC80481B2AC76828EDDC6C b/spss.handbook/conf/moa-spss/certstore/F7D331850EC13D22284909E0FC3493A65FFA7F30/EC988340526163D5B7AC80481B2AC76828EDDC6C
deleted file mode 100644
index 585047fa2..000000000
--- a/spss.handbook/conf/moa-spss/certstore/F7D331850EC13D22284909E0FC3493A65FFA7F30/EC988340526163D5B7AC80481B2AC76828EDDC6C
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der b/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der
deleted file mode 100644
index 332aa817a..000000000
--- a/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden[pwd=allekunden].p12 b/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden[pwd=allekunden].p12
deleted file mode 100644
index 8827ed99c..000000000
--- a/spss.handbook/conf/moa-spss/keys/common/moa-signaturdienst-allekunden[pwd=allekunden].p12
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der b/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der
deleted file mode 100644
index 63ba5cce5..000000000
--- a/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1[pwd=kunde1].p12 b/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1[pwd=kunde1].p12
deleted file mode 100644
index 4499ab52b..000000000
--- a/spss.handbook/conf/moa-spss/keys/customer1/moa-signaturdienst-kunde1[pwd=kunde1].p12
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der b/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der
deleted file mode 100644
index 4f87134e7..000000000
--- a/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2[pwd=kunde2].p12 b/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2[pwd=kunde2].p12
deleted file mode 100644
index 5b7631133..000000000
--- a/spss.handbook/conf/moa-spss/keys/customer2/moa-signaturdienst-kunde2[pwd=kunde2].p12
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/log4j.properties b/spss.handbook/conf/moa-spss/log4j.properties
deleted file mode 100644
index be9d38586..000000000
--- a/spss.handbook/conf/moa-spss/log4j.properties
+++ /dev/null
@@ -1,37 +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
-
-# Configure root logger and loggers for moa-spss
-log4j.rootLogger=info, stdout
-log4j.logger.moa.spss.server=info, moaspss
-log4j.logger.iaik.server=info, moaspss
-
-# 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} | %20c | %10t | %m%n
-
-# Configure the 'moaspss' appender to write moa-spss related logging output
-# to the file 'logs/moa-spss.log'. The file is rolled over every 1000KB,
-# and a maximum history of 10 log files is being kept.
-log4j.appender.moaspss=org.apache.log4j.RollingFileAppender
-log4j.appender.moaspss.File=logs/moa-spss.log
-log4j.appender.moaspss.MaxFileSize=1000KB
-log4j.appender.moaspss.MaxBackupIndex=10
-log4j.appender.moaspss.layout=org.apache.log4j.PatternLayout
-log4j.appender.moaspss.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c | %10t | %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 char(5), log_msg text)
-#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/spss.handbook/conf/moa-spss/sp.minimum.config.xml b/spss.handbook/conf/moa-spss/sp.minimum.config.xml
deleted file mode 100644
index e2a556677..000000000
--- a/spss.handbook/conf/moa-spss/sp.minimum.config.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--MOA SPSS 1.3 Configuration File created by MOA SPSS Configuration Mapper-->
-<cfg:MOAConfiguration xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-<cfg:SignatureVerification>
-<cfg:CertificateValidation>
-<cfg:PathConstruction>
-<cfg:AutoAddCertificates>true</cfg:AutoAddCertificates>
-<cfg:UseAuthorityInformationAccess>true</cfg:UseAuthorityInformationAccess>
-<cfg:CertificateStore>
-<cfg:DirectoryStore>
-<cfg:Location>certstore</cfg:Location>
-</cfg:DirectoryStore>
-</cfg:CertificateStore>
-</cfg:PathConstruction>
-<cfg:PathValidation>
-<cfg:ChainingMode>
-<cfg:DefaultMode>pkix</cfg:DefaultMode>
-</cfg:ChainingMode>
-<cfg:TrustProfile>
-<cfg:Id>Test-Signaturdienste</cfg:Id>
-<cfg:TrustAnchorsLocation>trustProfiles/test</cfg:TrustAnchorsLocation>
-</cfg:TrustProfile>
-</cfg:PathValidation>
-<cfg:RevocationChecking>
-<cfg:EnableChecking>true</cfg:EnableChecking>
-<cfg:MaxRevocationAge>0</cfg:MaxRevocationAge>
-<cfg:ServiceOrder>
-<cfg:Service>CRL</cfg:Service>
-<cfg:Service>OCSP</cfg:Service>
-</cfg:ServiceOrder>
-<cfg:Archiving>
-<cfg:EnableArchiving>false</cfg:EnableArchiving>
-<cfg:ArchiveDuration>365</cfg:ArchiveDuration>
-<cfg:Archive>
-<cfg:DatabaseArchive>
-<cfg:JDBCURL>jdbc:url</cfg:JDBCURL>
-<cfg:JDBCDriverClassName>fully.qualified.classname</cfg:JDBCDriverClassName>
-</cfg:DatabaseArchive>
-</cfg:Archive>
-</cfg:Archiving>
-</cfg:RevocationChecking>
-</cfg:CertificateValidation>
-</cfg:SignatureVerification>
-</cfg:MOAConfiguration>
diff --git a/spss.handbook/conf/moa-spss/spss.config.xml b/spss.handbook/conf/moa-spss/spss.config.xml
deleted file mode 100644
index d792f9478..000000000
--- a/spss.handbook/conf/moa-spss/spss.config.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--MOA SPSS 1.3 Configuration File created by MOA SPSS Configuration Mapper-->
-<cfg:MOAConfiguration xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <cfg:SignatureCreation>
- <cfg:KeyModules>
- <cfg:SoftwareKeyModule>
- <cfg:Id>SKM_Kunde1</cfg:Id>
- <cfg:FileName>keys/customer1/moa-signaturdienst-kunde1[pwd=kunde1].p12</cfg:FileName>
- <cfg:Password>kunde1</cfg:Password>
- </cfg:SoftwareKeyModule>
- <cfg:SoftwareKeyModule>
- <cfg:Id>SKM_Kunde2</cfg:Id>
- <cfg:FileName>keys/customer2/moa-signaturdienst-kunde2[pwd=kunde2].p12</cfg:FileName>
- <cfg:Password>kunde2</cfg:Password>
- </cfg:SoftwareKeyModule>
- <cfg:SoftwareKeyModule>
- <cfg:Id>SKM_allgemein</cfg:Id>
- <cfg:FileName>keys/common/moa-signaturdienst-allekunden[pwd=allekunden].p12</cfg:FileName>
- <cfg:Password>allekunden</cfg:Password>
- </cfg:SoftwareKeyModule>
- </cfg:KeyModules>
- <cfg:KeyGroup>
- <cfg:Id>KG_Kunde1</cfg:Id>
- <cfg:Key>
- <cfg:KeyModuleId>SKM_Kunde1</cfg:KeyModuleId>
- <cfg:KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
- </cfg:KeyCertIssuerSerial>
- </cfg:Key>
- </cfg:KeyGroup>
- <cfg:KeyGroup>
- <cfg:Id>KG_Kunde2</cfg:Id>
- <cfg:Key>
- <cfg:KeyModuleId>SKM_Kunde2</cfg:KeyModuleId>
- <cfg:KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>8</dsig:X509SerialNumber>
- </cfg:KeyCertIssuerSerial>
- </cfg:Key>
- </cfg:KeyGroup>
- <cfg:KeyGroup>
- <cfg:Id>KG_allgemein</cfg:Id>
- <cfg:Key>
- <cfg:KeyModuleId>SKM_allgemein</cfg:KeyModuleId>
- <cfg:KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>9</dsig:X509SerialNumber>
- </cfg:KeyCertIssuerSerial>
- </cfg:Key>
- </cfg:KeyGroup>
- <cfg:KeyGroupMapping>
- <cfg:KeyGroupId>KG_allgemein</cfg:KeyGroupId>
- </cfg:KeyGroupMapping>
- <cfg:KeyGroupMapping>
- <cfg:CustomerId>
- <dsig:X509IssuerName>CN=Test CA - Verschl\C3\BCsselung B\C3\BCrger,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>0</dsig:X509SerialNumber>
- </cfg:CustomerId>
- <cfg:KeyGroupId>KG_Kunde1</cfg:KeyGroupId>
- </cfg:KeyGroupMapping>
- <cfg:KeyGroupMapping>
- <cfg:CustomerId>
- <dsig:X509IssuerName>CN=Test CA - Verschl\C3\BCsselung B\C3\BCrger,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1</dsig:X509SerialNumber>
- </cfg:CustomerId>
- <cfg:KeyGroupId>KG_Kunde2</cfg:KeyGroupId>
- </cfg:KeyGroupMapping>
- <cfg:XMLDSig>
- <cfg:CanonicalizationAlgorithm>http://www.w3.org/TR/2001/REC-xml-c14n-20010315</cfg:CanonicalizationAlgorithm>
- <cfg:DigestMethodAlgorithm>http://www.w3.org/2000/09/xmldsig#sha1</cfg:DigestMethodAlgorithm>
- </cfg:XMLDSig>
- </cfg:SignatureCreation>
- <cfg:SignatureVerification>
- <cfg:CertificateValidation>
- <cfg:PathConstruction>
- <cfg:AutoAddCertificates>true</cfg:AutoAddCertificates>
- <cfg:UseAuthorityInformationAccess>true</cfg:UseAuthorityInformationAccess>
- <cfg:CertificateStore>
- <cfg:DirectoryStore>
- <cfg:Location>certstore</cfg:Location>
- </cfg:DirectoryStore>
- </cfg:CertificateStore>
- </cfg:PathConstruction>
- <cfg:PathValidation>
- <cfg:ChainingMode>
- <cfg:DefaultMode>pkix</cfg:DefaultMode>
- <cfg:TrustAnchor>
- <cfg:Identification>
- <dsig:X509IssuerName>CN=A-Trust-nQual-0,OU=A-Trust-nQual-0,O=A-Trust,C=AT</dsig:X509IssuerName>
- <dsig:X509SerialNumber>536</dsig:X509SerialNumber>
- </cfg:Identification>
- <cfg:Mode>chaining</cfg:Mode>
- </cfg:TrustAnchor>
- </cfg:ChainingMode>
- <cfg:TrustProfile>
- <cfg:Id>Test-Signaturdienste</cfg:Id>
- <cfg:TrustAnchorsLocation>trustProfiles/test</cfg:TrustAnchorsLocation>
- </cfg:TrustProfile>
- <cfg:TrustProfile>
- <cfg:Id>CertifiedSignature</cfg:Id>
- <cfg:TrustAnchorsLocation>trustProfiles/certifiedSignature</cfg:TrustAnchorsLocation>
- </cfg:TrustProfile>
- <cfg:TrustProfile>
- <cfg:Id>CertifiedSignature+Test</cfg:Id>
- <cfg:TrustAnchorsLocation>trustProfiles/certifiedSignature+Test</cfg:TrustAnchorsLocation>
- </cfg:TrustProfile>
- <cfg:TrustProfile>
- <cfg:Id>SecureSignature</cfg:Id>
- <cfg:TrustAnchorsLocation>trustProfiles/secureSignature</cfg:TrustAnchorsLocation>
- </cfg:TrustProfile>
- <cfg:TrustProfile>
- <cfg:Id>SecureSignature-Qual-Only</cfg:Id>
- <cfg:TrustAnchorsLocation>trustProfiles/secureSignature-qual-only</cfg:TrustAnchorsLocation>
- </cfg:TrustProfile>
- <cfg:TrustProfile>
- <cfg:Id>SecureSignature+Test</cfg:Id>
- <cfg:TrustAnchorsLocation>trustProfiles/secureSignature+Test</cfg:TrustAnchorsLocation>
- </cfg:TrustProfile>
- <cfg:TrustProfile>
- <cfg:Id>IdentityLink</cfg:Id>
- <cfg:TrustAnchorsLocation>trustProfiles/identityLink</cfg:TrustAnchorsLocation>
- </cfg:TrustProfile>
- <cfg:TrustProfile>
- <cfg:Id>IdentityLink+Test</cfg:Id>
- <cfg:TrustAnchorsLocation>trustProfiles/identityLink+Test</cfg:TrustAnchorsLocation>
- </cfg:TrustProfile>
- </cfg:PathValidation>
- <cfg:RevocationChecking>
- <cfg:EnableChecking>true</cfg:EnableChecking>
- <cfg:MaxRevocationAge>0</cfg:MaxRevocationAge>
- <cfg:ServiceOrder>
- <cfg:Service>CRL</cfg:Service>
- <cfg:Service>OCSP</cfg:Service>
- </cfg:ServiceOrder>
- <cfg:Archiving>
- <cfg:EnableArchiving>false</cfg:EnableArchiving>
- <cfg:ArchiveDuration>365</cfg:ArchiveDuration>
- <cfg:Archive>
- <cfg:DatabaseArchive>
- <cfg:JDBCURL>jdbc:url</cfg:JDBCURL>
- <cfg:JDBCDriverClassName>fully.qualified.classname</cfg:JDBCDriverClassName>
- </cfg:DatabaseArchive>
- </cfg:Archive>
- </cfg:Archiving>
- </cfg:RevocationChecking>
- </cfg:CertificateValidation>
- </cfg:SignatureVerification>
-</cfg:MOAConfiguration>
diff --git a/spss.handbook/conf/moa-spss/ss.minimum.config.xml b/spss.handbook/conf/moa-spss/ss.minimum.config.xml
deleted file mode 100644
index 8ab10a994..000000000
--- a/spss.handbook/conf/moa-spss/ss.minimum.config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--MOA SPSS 1.3 Configuration File created by MOA SPSS Configuration Mapper-->
-<cfg:MOAConfiguration xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-<cfg:SignatureCreation>
-<cfg:KeyModules>
-<cfg:SoftwareKeyModule>
-<cfg:Id>SKM_Kunde1</cfg:Id>
-<cfg:FileName>keys/customer1/moa-signaturdienst-kunde1(pwd=kunde1).p12</cfg:FileName>
-<cfg:Password>kunde1</cfg:Password>
-</cfg:SoftwareKeyModule>
-</cfg:KeyModules>
-<cfg:KeyGroup>
-<cfg:Id>KG_Kunde1</cfg:Id>
-<cfg:Key>
-<cfg:KeyModuleId>SKM_Kunde1</cfg:KeyModuleId>
-<cfg:KeyCertIssuerSerial>
-<dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName>
-<dsig:X509SerialNumber>7</dsig:X509SerialNumber>
-</cfg:KeyCertIssuerSerial>
-</cfg:Key>
-</cfg:KeyGroup>
-<cfg:KeyGroupMapping>
-<cfg:CustomerId>
-<dsig:X509IssuerName>CN=Test CA - Verschl\C3\BCsselung B\C3\BCrger,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName>
-<dsig:X509SerialNumber>0</dsig:X509SerialNumber>
-</cfg:CustomerId>
-<cfg:KeyGroupId>KG_Kunde1</cfg:KeyGroupId>
-</cfg:KeyGroupMapping>
-<cfg:XMLDSig>
-<cfg:CanonicalizationAlgorithm>http://www.w3.org/TR/2001/REC-xml-c14n-20010315</cfg:CanonicalizationAlgorithm>
-<cfg:DigestMethodAlgorithm>http://www.w3.org/2000/09/xmldsig#sha1</cfg:DigestMethodAlgorithm>
-</cfg:XMLDSig>
-</cfg:SignatureCreation>
-</cfg:MOAConfiguration>
diff --git a/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server.der b/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server.der
deleted file mode 100644
index c3b3003d9..000000000
--- a/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server[pwd=server].p12 b/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server[pwd=server].p12
deleted file mode 100644
index af524d060..000000000
--- a/spss.handbook/conf/moa-spss/sslKeys/server/moa-ssl-server[pwd=server].p12
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore b/spss.handbook/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore
deleted file mode 100644
index 780e58934..000000000
--- a/spss.handbook/conf/moa-spss/sslKeys/tomcat/tomcat[pwd=server].keystore
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore b/spss.handbook/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore
deleted file mode 100644
index b3673b45d..000000000
--- a/spss.handbook/conf/moa-spss/sslKeys/tomcat/trustedClients[pwd=clients].keystore
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
deleted file mode 100644
index 8c434777e..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
deleted file mode 100644
index efa28178e..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
deleted file mode 100644
index 33e776369..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
deleted file mode 100644
index b7d4b08a6..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
deleted file mode 100644
index 289fc2198..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
deleted file mode 100644
index 69de75609..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.TrustSignTest-Enc-01.20011206-20041206.SerNo0450[CertifiedKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.TrustSignTest-Enc-01.20011206-20041206.SerNo0450[CertifiedKeypair].cer
deleted file mode 100644
index 836ba3767..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.TrustSignTest-Enc-01.20011206-20041206.SerNo0450[CertifiedKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20021120-20051120.SerNo16f8[CertifiedKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20021120-20051120.SerNo16f8[CertifiedKeypair].cer
deleted file mode 100644
index fc5bd433b..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20021120-20051120.SerNo16f8[CertifiedKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20030903-20060903.SerNo4848[CertifiedKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20030903-20060903.SerNo4848[CertifiedKeypair].cer
deleted file mode 100644
index f3cf5e676..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust.a-sign-TEST-Premium-Enc-01.20030903-20060903.SerNo4848[CertifiedKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
deleted file mode 100644
index 3be7b6a06..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Stabsstelle.TestCA-Verschluesselung-Buerger.20040518-20100101.SerNo0004[CertifiedKeypair].der b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Stabsstelle.TestCA-Verschluesselung-Buerger.20040518-20100101.SerNo0004[CertifiedKeypair].der
deleted file mode 100644
index d3c213711..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Stabsstelle.TestCA-Verschluesselung-Buerger.20040518-20100101.SerNo0004[CertifiedKeypair].der
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDljCCAwOgAwIBAgIBBDAJBgUrDgMCHQUAMHQxCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMRcwFQYDVQQDEw5UZXN0IENBIC0gUm9v
-dDAeFw0wNDA1MTgxMzQ1NTdaFw0wOTEyMzEyMjU5MzBaMIGGMQswCQYDVQQGEwJB
-VDEsMCoGA1UEChMjU3RhYnN0ZWxsZSBJS1QtU3RyYXRlZ2llIGRlcyBCdW5kZXMx
-HjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczEpMCcGA1UEAxQgVGVzdCBD
-QSAtIFZlcnNjaGz8c3NlbHVuZyBC/HJnZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBALmykoSgYUpJiaK5NlC5jTcMQikEIB6kOdS7e82DBbT5G13zQeuiNBA2
-KzLMPMBK62Go+ZV8w94N5cSm2auuempVAHNF80ao9G3wYgK0xOVZXvf/145o8TIw
-StPPckmVPL2OPa8/DIB8tqNjblFxy+XcBnTQMLKaxYSzwA/zULoNAgMBAAGjggEr
-MIIBJzAOBgNVHQ8BAf8EBAMCAcYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4E
-FgQUjRMKvtgH3PngerFS/Rt+vuEDbLMwXQYDVR0gBFYwVDBSBgwrBgEEAZUSAQID
-AQEwQjBABggrBgEFBQcCAjA0GjJEaWVzZXMgWmVydGlmaWthdCBpc3QgbnVyIGb8
-ciBUZXN0endlY2tlIGdlZWlnbmV0LjA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8v
-bGFicy5jaW8uZ3YuYXQvdGVtcC9jcmxzL3Jvb3QuY3JsMBQGByooAAoBAQEECQwH
-QktBLUlLVDARBglghkgBhvhCAQEEBAMCAQIwHwYDVR0jBBgwFoAUZWxSwiqQLpxu
-4vk3Op4dYHG46XswCQYFKw4DAh0FAAOBgQAnuY7RPFXLpO2hb3h1B0cy5p861j6E
-eD+c/ZKAGqIh4kh3A65D8Zl90GSv9vV4L03dnN5hc7rm/bwKzDI57/PI2dL0H/S4
-OOl4tt4fZmjN8Xrv3oJxNEa+6AJ8TGCcouc/Eqxnpc0SxkP6UQrA8J8RM/8fk05U
-DAyTZbTQ5wPIhA==
------END CERTIFICATE-----
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
deleted file mode 100644
index 06b40aa67..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
deleted file mode 100644
index 7e9fd5b0b..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
deleted file mode 100644
index 8c434777e..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
deleted file mode 100644
index efa28178e..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20041201-20141201.SerNoe242.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
deleted file mode 100644
index 33e776369..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
deleted file mode 100644
index b7d4b08a6..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20010427-20040427.SerNo006f[CertifiedKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
deleted file mode 100644
index 289fc2198..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0213[CertifiedKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
deleted file mode 100644
index 69de75609..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust.A-Trust-nQual-01.20011212-20041212.SerNo0218[CertifiedKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
deleted file mode 100644
index 3be7b6a06..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646.cer
deleted file mode 100644
index 06b40aa67..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
deleted file mode 100644
index 7e9fd5b0b..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
deleted file mode 100644
index 376d0753f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Test_Signaturdient_Personenbindung.20030822-20060822.SerNo0002.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Test_Signaturdient_Personenbindung.20030822-20060822.SerNo0002.cer
deleted file mode 100644
index c19647ad8..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/Test_Signaturdient_Personenbindung.20030822-20060822.SerNo0002.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/A-Trust_OCSP_Responder_03.20051205-20081205.SerNo01b588.der b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/A-Trust_OCSP_Responder_03.20051205-20081205.SerNo01b588.der
deleted file mode 100644
index e27a87038..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/A-Trust_OCSP_Responder_03.20051205-20081205.SerNo01b588.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/MOA-Test-CA-Signaturdienste.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/MOA-Test-CA-Signaturdienste.cer
deleted file mode 100644
index 424f849a1..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/MOA-Test-CA-Signaturdienste.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-01.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-01.cer
deleted file mode 100644
index 6f97837a2..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-01.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-01a.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-01a.cer
deleted file mode 100644
index 508f7f076..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-01a.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-02.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-02.cer
deleted file mode 100644
index 61a7ccb15..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-02.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
deleted file mode 100644
index 376d0753f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink-signerCerts/Nikolaus_Schwab.20040219-20070219.SerNo5C39.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/A-Trust_OCSP_Responder_03.20051205-20081205.SerNo01b588.der b/spss.handbook/conf/moa-spss/trustProfiles/identityLink/A-Trust_OCSP_Responder_03.20051205-20081205.SerNo01b588.der
deleted file mode 100644
index e27a87038..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/A-Trust_OCSP_Responder_03.20051205-20081205.SerNo01b588.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-01.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-01.cer
deleted file mode 100644
index 6f97837a2..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-01.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-01a.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-01a.cer
deleted file mode 100644
index 508f7f076..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-01a.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-02.cer b/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-02.cer
deleted file mode 100644
index 61a7ccb15..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-02.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
deleted file mode 100644
index f9fef65fc..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
deleted file mode 100644
index 36a442b89..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
deleted file mode 100644
index d361d919f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
deleted file mode 100644
index ad13d7b28..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
deleted file mode 100644
index f9f27442b..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
deleted file mode 100644
index b6f39e354..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.TrustSignTest-Sig-01.20011206-20041206.SerNo0588[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.TrustSignTest-Sig-01.20011206-20041206.SerNo0588[SecureSignatureKeypair].cer
deleted file mode 100644
index 28cb48bb0..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.TrustSignTest-Sig-01.20011206-20041206.SerNo0588[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20021120-20051120.SerNo16f9[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20021120-20051120.SerNo16f9[SecureSignatureKeypair].cer
deleted file mode 100644
index 28fbdf42f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20021120-20051120.SerNo16f9[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20030903-20060903.SerNo484a[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20030903-20060903.SerNo484a[SecureSignatureKeypair].cer
deleted file mode 100644
index c9da41583..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.a-sign-TEST-Premium-Sig-01.20030903-20060903.SerNo484a[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
deleted file mode 100644
index 3be7b6a06..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Stabsstelle.TestCA_Signatur_Buerger.20040518-20100101.SerNo0003[CertifiedKeypair].der b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Stabsstelle.TestCA_Signatur_Buerger.20040518-20100101.SerNo0003[CertifiedKeypair].der
deleted file mode 100644
index 807fa786c..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Stabsstelle.TestCA_Signatur_Buerger.20040518-20100101.SerNo0003[CertifiedKeypair].der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
deleted file mode 100644
index 06b40aa67..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
deleted file mode 100644
index 7e9fd5b0b..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-01.20041201-20141201.SerNoE243[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-01.20041201-20141201.SerNoE243[SecureSignatureKeypair].cer
deleted file mode 100644
index f9fef65fc..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-01.20041201-20141201.SerNoE243[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-02.20041203-20141203.SerNoE248[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-02.20041203-20141203.SerNoE248[SecureSignatureKeypair].cer
deleted file mode 100644
index 36a442b89..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust-Qual-02.20041203-20141203.SerNoE248[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
deleted file mode 100644
index d361d919f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
deleted file mode 100644
index ad13d7b28..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
deleted file mode 100644
index f9f27442b..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
deleted file mode 100644
index b6f39e354..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
deleted file mode 100644
index f9fef65fc..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-01.20041201-20141201.SerNoE243.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
deleted file mode 100644
index 36a442b89..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust-Qual-02.20041203-20141203.SerNoE248.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
deleted file mode 100644
index d361d919f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011130-20041130.SerNo01f6[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
deleted file mode 100644
index ad13d7b28..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20011215-20041215.SerNo021e[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
deleted file mode 100644
index f9f27442b..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo0291[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
deleted file mode 100644
index b6f39e354..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
deleted file mode 100644
index 3be7b6a06..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
deleted file mode 100644
index 06b40aa67..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom.A1-Signatur.20040326-20140326.SerNo6646[SecureSignatureKeypair].cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
deleted file mode 100644
index 7e9fd5b0b..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/mobilkom_A1-Signatur_20060912-20110912_SerNo027866.cer
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/test/signaturdienst.der b/spss.handbook/conf/moa-spss/trustProfiles/test/signaturdienst.der
deleted file mode 100644
index 55707d69f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/test/signaturdienst.der
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/handbook.html b/spss.handbook/handbook.html
deleted file mode 100644
index 2497d7f70..000000000
--- a/spss.handbook/handbook.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
- <head>
- <meta http-equiv="refresh" content="0; URL=handbook/index.html">
- </head>
- <body><p><a href="handbook/index.html">Zum Handbuch ...</a></p></body>
-</html> \ No newline at end of file
diff --git a/spss.handbook/handbook/common/LogoBKA.png b/spss.handbook/handbook/common/LogoBKA.png
deleted file mode 100644
index 6a92647fd..000000000
--- a/spss.handbook/handbook/common/LogoBKA.png
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/handbook/common/LogoMoa4c.3148x3545.jpg b/spss.handbook/handbook/common/LogoMoa4c.3148x3545.jpg
deleted file mode 100644
index a5ba135ef..000000000
--- a/spss.handbook/handbook/common/LogoMoa4c.3148x3545.jpg
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/handbook/common/LogoMoa4c.jpg b/spss.handbook/handbook/common/LogoMoa4c.jpg
deleted file mode 100644
index a1102090b..000000000
--- a/spss.handbook/handbook/common/LogoMoa4c.jpg
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/handbook/common/LogoMoaBw.jpg b/spss.handbook/handbook/common/LogoMoaBw.jpg
deleted file mode 100644
index 5a31e3e15..000000000
--- a/spss.handbook/handbook/common/LogoMoaBw.jpg
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/handbook/common/MOA.css b/spss.handbook/handbook/common/MOA.css
deleted file mode 100644
index 81e0a3f8d..000000000
--- a/spss.handbook/handbook/common/MOA.css
+++ /dev/null
@@ -1,300 +0,0 @@
-body
-{
- font-family: "Times New Roman", Times, serif;
- font-size: medium;
- font-weight: normal;
- margin-left: 2.5em;
- margin-right: 2.5em;
-}
-
-p
-{
- margin-top: 0pt;
- margin-bottom: 0.5em;
- text-align: justify
-}
-
-pre
-{
- font-family: "Courier New", monospace;
- font-size: 90%;
- background-color: #cccccc;
- color: #000000;
- margin-left:1.5%;
- margin-right:1.5%;
- margin-top: 1em;
- margin-bottom: 1em;
- border: #008000 none;
-}
-
-hr
-{
- color: #000080;
- background-color: #000080;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-
-table.fixedWidth
-{
- width: 97%;
- margin-left:1.5%;
- margin-right:1.5%;
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-
-table.varWidth
-{
- margin-left:1.5%;
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-th
-{
- text-align: left;
-}
-
-h1
-{
- color: #000080;
- text-align: left;
- font-size: 167%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h2
-{
- color: #000080;
- font-size: 150%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h3
-{
- color: #000080;
- font-size: 133%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h4
-{
- color: #000080;
- font-size: 116%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h5
-{
- color: #000080;
- font-size: 100%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h6
-{
- color: #000080;
- font-size: 83%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-code
-{
- font-family: "Courier New", Courier, monospace;
- font-size: 90%;
- color: #000000
-}
-
-dd
-{
- margin-top: 0.8em;
- margin-bottom: 0.8em;
- text-align: justify
-
-}
-
-dt
-{
- margin-top: 0.8em;
- font-family: Arial, Helvetica, sans-serif;
- color: #000080
-}
-
-ol
-{
- margin-top: 0.5em;
- margin-bottom: 0.5em
-}
-
-ol.alpha
-{
- list-style-type: lower-alpha
-}
-
-li
-{
- margin-top: 0.25em;
- margin-bottom: 0.25em;
- text-align: justify
-}
-
-a:hover
-{
- color: #990000
-}
-
-
-.title
-{
- text-align: left;
- font-size: 167%;
- color: #000080;
- font-family: Arial, Helvetica, sans-serif;
- margin-top: 0.4em;
- margin-bottom: 0.4em
-}
-
-.subtitle
-{
- text-align: left;
- font-size: 133%;
- color: #000080;
- font-family: Arial, Helvetica, sans-serif;
- margin-top: 0.4em;
- margin-bottom: 0.4em
-}
-
-.glossaryTerm
-{
- font-style: italic;
- color: #006699
-}
-
-.example
-{
- font-family: "Courier New", monospace;
- background-color: #CCFFFF;
- color: #000000;
- margin: 0pt 0pt;
- border: #008000 none
-}
-
-.schema
-{
- font-family: "Courier New", monospace;
- background-color: #FFFFCC;
- color: #000000;
- margin: 0pt 0pt;
- border: #008000 none
-}
-
-.documentinfo
-{
- font-family: Arial, Helvetica, sans-serif;
- font-size: 100%;
-}
-
-.ol-contents
-{
- font-size: 100%;
- margin-top: 0.0em;
- margin-bottom: 0.0em;
-}
-
-.li-contents
-{
- font-size: 100%;
- margin-top: 0.0em;
- margin-bottom: 0.0em;
-}
-
-.logoTitle
-{
- text-align: center;
- font-size: 133%;
- color: #000080;
- font-family: Arial, Helvetica, sans-serif;
-}
-
-.logoTable
-{
- margin-bottom: 0px;
- margin-left: 0px
-}
-
-.superscript
-{
- vertical-align: super;
- font-size: 66%;
-}
-
-.term
-{
- font-style: italic;
-}
-
-.comment
-{
- color: #000000;
- background: #ffff00;
- font-style: italic
-}
-
-.addedErrata12
-{
- color: #FF0000;
- background-color: #FFEEEE;
- text-decoration: underline
-}
-
-.deletedErrata12
-{
- color: #999999;
- background-color: #EEEEEE;
- text-decoration: line-through
-}
-
-.added12
-{
- color: #FF0000;
- text-decoration: underline
-; background-color: #F8F0FF
-}
-
-.deleted12
-{
- color: #999999;
- text-decoration: line-through
-; background-color: #f8f0ff
-}
-
-.rfc2119Keyword
-{
- font-variant: small-caps;
- font-style: normal;
-}
-
-.remark { font-style: italic}
-
-li.faq
-{
- margin-top: 1.5em;
- margin-bottom: 1.5em;
-}
-
-.faq-question
-{
- color: #000080;
- font-size: 100%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal;
- margin-bottom: 0.4em;
-}
diff --git a/spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd b/spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd
deleted file mode 100644
index 1521b4f1b..000000000
--- a/spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- MOA SP/SS 1.3 Configuration Schema
--->
-<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:config="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
- <xs:element name="MOAConfiguration">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Common" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="HardwareCryptoModule" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Name" type="xs:string"/>
- <xs:element name="SlotId" type="xs:string" minOccurs="0"/>
- <xs:element name="UserPIN" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="SignatureCreation" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="KeyModules">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="HardwareKeyModule">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Id" type="xs:token"/>
- <xs:element name="Name" type="xs:string"/>
- <xs:element name="SlotId" type="xs:string" minOccurs="0"/>
- <xs:element name="UserPIN" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="SoftwareKeyModule">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Id" type="xs:token"/>
- <xs:element name="FileName" type="xs:string"/>
- <xs:element name="Password" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="KeyGroup" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Id" type="xs:token"/>
- <xs:sequence maxOccurs="unbounded">
- <xs:element name="Key">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="KeyModuleId" type="xs:token"/>
- <xs:element name="KeyCertIssuerSerial" type="dsig:X509IssuerSerialType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="KeyGroupMapping" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="CustomerId" type="dsig:X509IssuerSerialType" minOccurs="0"/>
- <xs:element name="KeyGroupId" type="xs:token" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="XMLDSig">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="CanonicalizationAlgorithm" type="xs:anyURI" minOccurs="0"/>
- <xs:element name="DigestMethodAlgorithm" type="xs:anyURI" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CreateTransformsInfoProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="CreateSignatureEnvironmentProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="SignatureVerification" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="CertificateValidation">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="PathConstruction">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AutoAddCertificates" type="xs:boolean"/>
- <xs:element name="UseAuthorityInformationAccess" type="xs:boolean"/>
- <xs:element name="CertificateStore">
- <xs:complexType>
- <xs:choice>
- <xs:element name="DirectoryStore">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Location" type="xs:token"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="PathValidation">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="ChainingMode">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="DefaultMode" type="config:ChainingModeType"/>
- <xs:element name="TrustAnchor" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Identification" type="dsig:X509IssuerSerialType"/>
- <xs:element name="Mode" type="config:ChainingModeType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="TrustProfile" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Id" type="xs:token"/>
- <xs:element name="TrustAnchorsLocation" type="xs:anyURI"/>
- <xs:element name="SignerCertsLocation" type="xs:anyURI" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="RevocationChecking">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="EnableChecking" type="xs:boolean"/>
- <xs:element name="MaxRevocationAge" type="xs:integer"/>
- <xs:element name="ServiceOrder" minOccurs="0">
- <xs:complexType>
- <xs:sequence minOccurs="2" maxOccurs="2">
- <xs:element name="Service">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="OCSP"/>
- <xs:enumeration value="CRL"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Archiving">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="EnableArchiving" type="xs:boolean"/>
- <xs:element name="ArchiveDuration" type="xs:nonNegativeInteger" minOccurs="0"/>
- <xs:element name="Archive" minOccurs="0">
- <xs:complexType>
- <xs:choice>
- <xs:element name="DatabaseArchive">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="JDBCURL" type="xs:anyURI"/>
- <xs:element name="JDBCDriverClassName" type="xs:token"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="DistributionPoint" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="CAIssuerDN" type="xs:token"/>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="CRLDP">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="IndirectCRLIssuer" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="Location" type="xs:anyURI"/>
- <xs:element name="ReasonCode" minOccurs="0" maxOccurs="unbounded">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="unused"/>
- <xs:enumeration value="keyCompromise"/>
- <xs:enumeration value="cACompromise"/>
- <xs:enumeration value="affiliationChanged"/>
- <xs:enumeration value="superseded"/>
- <xs:enumeration value="cessationOfOperation"/>
- <xs:enumeration value="certificateHold"/>
- <xs:enumeration value="privilegeWithdrawn"/>
- <xs:enumeration value="aACompromise"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="OCSPDP">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Location" type="xs:anyURI"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="VerifyTransformsInfoProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="SupplementProfile" type="config:ProfileType" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:simpleType name="ChainingModeType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="chaining"/>
- <xs:enumeration value="pkix"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:complexType name="ProfileType">
- <xs:sequence>
- <xs:element name="Id" type="xs:token"/>
- <xs:element name="Location" type="xs:anyURI"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
diff --git a/spss.handbook/handbook/config/config.html b/spss.handbook/handbook/config/config.html
deleted file mode 100644
index f1097e55a..000000000
--- a/spss.handbook/handbook/config/config.html
+++ /dev/null
@@ -1,1014 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
- <title>MOA SS und SP - Konfiguration</title>
- <link rel="stylesheet" href="../common/MOA.css" type="text/css">
-</head>
-<body bgcolor="white" text="#000000" link="#990000" vlink="#666666" alink="#cc9966">
- <table class="logoTable" width="100%" border="0" cellspacing="0" cellpadding="10">
- <tr>
- <td align="center" class="logoTitle" width="267"><img src="../common/LogoBKA.png" alt="Logo BKA" width="267" height="37" align="left"></td>
- <td align="center" class="logoTitle">Open Source<br>
- f&uuml;r das E-Government</td>
- <td align="center" class="logoTitle" width="123"><img src="../common/LogoMoa4c.jpg" alt="Logo MOA" width="123" height="138" align="right"></td>
- </tr>
- </table>
- <hr/>
- <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.3</a></p>
- <p class="subtitle">Konfiguration</p>
- <hr/>
- <h1>Inhalt</h1>
- <ol>
- <li>
- <p><a href="#&#252;bersicht">&Uuml;bersicht</a></p>
- <ol>
- <li><a href="#&#252;bersicht_allgemeines">Allgemeines</a>
- <ol>
- <li><a href="#&#252;bersicht_allgemeines_namenskonventionen">Namenskonventionen</a></li>
- </ol>
- </li>
- <li><a href="#&#252;bersicht_zentraledatei">Zentrale Konfigurationsdatei</a>
- <ol>
- <li><a href="#&#252;bersicht_zentraledatei_aktualisierung">Aktualisierung auf das Format von MOA SP/SS 1.3</a></li>
- </ol>
- </li>
- <li><a href="#&#252;bersicht_bekanntmachung">Bekanntmachung der Konfigurationsdatei
- </a>
- <ol>
- <li><a href="#&#252;bersicht_bekanntmachung_laufenderbetrieb">Aktualisierung der Konfiguration im laufenden Betrieb</a></li>
- </ol>
- </li>
- <li><a href="#&#252;bersicht_logging">Konfiguration des Loggings</a></li>
- </ol>
- </li>
- <li><a href="#konfigurationsparameter">Konfigurationsparameter</a>
- <ol>
- <li><a href="#konfigurationsparameter_allgemein">Allgemeines Parameter</a> <ol>
- <li><a href="#konfigurationsparameter_allgemein_hardwarecryptomodule">Hardwarebasiertes Kryptographiemodul</a></li>
- </ol>
- </li>
- <li><a href="#konfigurationsparameter_ss">Parameter f&uuml;r MOA SS</a> <ol>
- <li><a href="#konfigurationsparameter_ss_keymodules">Schl&uuml;sselspeicher</a> <ol>
- <li><a href="#konfigurationsparameter_ss_keymodules_hardwarekeymodule">Hardware-Schl&uuml;sselspeicher</a></li>
- <li><a href="#konfigurationsparameter_ss_keymodules_softwarekeymodule">Software-Schl&uuml;sselspeicher</a></li>
- </ol>
- </li>
- <li><a href="#konfigurationsparameter_ss_keygroup">Schl&uuml;sselgruppe</a></li>
- <li><a href="#konfigurationsparameter_ss_keygroupmapping">Zuordnung von Schl&uuml;sselgruppen zu einem
- Kunden</a></li>
- <li><a href="#konfigurationsparameter_ss_xmldsig">Parameter f&uuml;r XML-Signaturen</a> </li>
- <li><a href="#konfigurationsparameter_ss_createtransformsinfoprofile">Profil f&uuml;r Transformationen</a></li>
- <li><a href="#konfigurationsparameter_ss_createsignatureenvironmentprofile">Profil f&uuml;r Signaturumgebung </a></li>
- </ol>
- </li>
- <li><a href="#konfigurationsparameter_sp">Parameter f&uuml;r MOA SP</a> <ol>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation">Zertifikatsvalidierung</a> <ol>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_pathconstruction">Konstruktion des Zertifikatspfads</a>
- <ol>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_pathconstruction_autoaddcertificates">Cachen von Zertifikaten</a></li>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_pathconstruction_useauthorityinfoaccess">Auswertung der Zertifikatserweiterung <span class="term">Authority Information Access</span></a></li>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_pathconstruction_certificatestore">Lokalisierung des Zertifikatsspeichers</a></li>
- </ol>
- </li>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_pathvalidation">Valdierung des Zertifikatspfads</a>
- <ol>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_pathvalidation_chainingmode">G&uuml;ltigkeitsmodell f&uuml;r die Zertifikatskettenpr&uuml;fung</a></li>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_pathvalidation_trustprofile">Vertrauensprofile</a></li>
- </ol>
- </li>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_revocationchecking">Widerrufspr&uuml;fung</a>
- <ol>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_revocationchecking_enablechecking">Aktivieren
- der Widerrufspr&uuml;fung</a></li>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_revocationchecking_maxrevocationage">Maximales Alter der Widerrufsinformation</a></li>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_revocationchecking_serviceorder">Reihenfolge der Widerrufsdienste</a></li>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_revocationchecking_archiving">Archivierung von Widerrufsinformationen</a></li>
- <li><a href="#konfigurationsparameter_sp_certificatevalidation_revocationchecking_distributionpoint">Manuelle
- Konfiguration von Verteilungspunkten f&uuml;r Widerrufsinformationen</a></li>
- </ol>
- </li>
- </ol>
- </li>
- <li><a href="#konfigurationsparameter_sp_verifytransformsinfoprofile">Profil f&uuml;r Transformationen</a></li>
- <li><a href="#konfigurationsparameter_sp_supplementprofile">Profil f&uuml;r Erg&auml;nzungsobjekte</a></li>
- </ol>
- </li>
- </ol>
- </li>
- <li><a href="#beispielkonfigurationen">Beispielkonfigurationen</a>
- <ol>
- <li><a href="#beispielkonfigurationen_minss">Minimale Konfiguration f&uuml;r MOA SS</a></li>
- <li><a href="#beispielkonfigurationen_minsp">Minimale Konfiguration f&uuml;r MOA SP</a></li>
- <li><a href="#beispielkonfigurationen_typspss">Typische Konfiguration f&uuml;r MOA SP/SS</a></li>
- </ol>
- </li>
- </ol>
- <hr/>
- <h1><a name="übersicht" id="übersicht"></a>1 &Uuml;bersicht </h1>
- <p>Dieses Handbuch beschreibt detailliert die Konfigurationsm&ouml;glichkeiten f&uuml;r MOA SP/SS. Wenn nicht anders angegeben, beziehen sich die Erl&auml;uterungen sowohl auf die Konfiguration des Webservices als auch auf die Konfiguration von MOA SP/SS f&uuml;r den Einsatz als Klassenbibliothek.</p>
- <h2><a name="&uuml;bersicht_allgemeines" id="&uuml;bersicht_allgemeines"></a>1.1 Allgemeines</h2>
- <h3><a name="&uuml;bersicht_allgemeines_namenskonventionen" id="&uuml;bersicht_allgemeines_namenskonventionen"></a>1.1.1 Namenskonventionen </h3>
- <p>Folgende Namenraum-Pr&auml;fixe werden in diesem Handbuch zur Kennzeichnung der Namenr&auml;ume
- von XML-Elementen verwendet: </p>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <th scope="col">Pr&auml;fix</th>
- <th scope="col">Namenraum</th>
- </tr>
- <tr>
- <td><code>cfg</code></td>
- <td><code>http://reference.e-government.gv.at/namespace/moaconfig/20021122#</code></td>
- </tr>
- <tr>
- <td><code>dsig</code></td>
- <td><code>http://www.w3.org/2000/09/xmldsig#</code></td>
- </tr>
- <tr>
- <td>moa</td>
- <td><code>http://reference.e-government.gv.at/namespace/moa/20020822#</code></td>
- </tr>
- <tr>
- <td><code>xs</code></td>
- <td><code>http://www.w3.org/2001/XMLSchema</code></td>
- </tr>
- </table>
- <h2><a name="übersicht_zentraledatei" id="übersicht_zentraledatei"></a>1.2 Zentrale Konfigurationsdatei</h2>
- <p>Die Konfiguration von MOA SP/SS erfolgt zentral &uuml;ber eine einzige Konfigurationsdatei. Das Format der Konfigurationsdatei ist XML und muss dem Schema <a href="./MOA-SPSS-config-1.3.xsd">MOA-SPSS-config-1.3.xsd</a> entsprechen. <a href="#konfigurationsparameter">Abschnitt 2</a> erl&auml;utert die Konfigurationsm&ouml;glichkeiten im Einzelnen.</p>
- <h3><a name="&uuml;bersicht_zentraledatei_aktualisierung" id="&uuml;bersicht_zentraledatei_aktualisierung"></a>1.2.1
- Aktualisierung auf das Format von MOA SP/SS 1.3</h3>
- <p>Mit dem Wechsel auf Version 1.3 verwendet MOA SP/SS ein neues, &uuml;bersichtlicheres Format f&uuml;r die
- XML-Konfigurationsdatei. </p>
- <p>Wenn Sie von einer &auml;lteren Version von MOA SP/SS auf die Version 1.3 wechseln und Ihre bestehende
- Konfiguration beibehalten wollen, steht Ihnen ein einfaches Kommandozeilenwerkzeug zur Verf&uuml;gung, mit dem
- Sie Ihre Konfigurationsdatei vom bisherigen auf das neue Format migrieren k&ouml;nnen. </p>
- <p>Dieses Werkzeug k&ouml;nnen Sie durch Ausf&uuml;hren des Scripts <code>configtool</code> aus dem Verzeichnis
- <code>tools</code> im MOA-Installationsverzeichnis verwenden:</p>
- <pre>configtool c:\pfad\zur\konfiguration\config.alt.xml c:\pfad\zur\konfiguration\config.neu.xml</pre>
- <p>Der erste Parameter f&uuml;r das Script gibt also Pfad und Dateiname der bestehenden, alten Konfigurationsdatei
- an, der zweite Parameter Pfad und Dateiname f&uuml;r die zu erzeugende Konfigurationsdatei im neuen Format (<span class="remark">Hinweis:
- Die Beispielpfade beziehen sich auf Windows-Betriebssysteme; f&uuml;r Unix-Betriebssysteme w&auml;hlen Sie bitte sinngem&auml;&szlig;e
- Pfade.</span>). </p>
- <h2><a name="übersicht_bekanntmachung" id="übersicht_bekanntmachung"></a>1.3 Bekanntmachung der Konfigurationsdatei</h2>
- <p>Die zentrale Konfigurationsdatei von MOA SP/SS wird der <span class="term">Java Virtual Machine</span>, in der MOA SP/SS l&auml;uft, durch eine <span class="term">System Property </span> mitgeteilt (wird beim Starten der <span class="term">Java Virtual Machine</span> in der Form <code>-D&lt;name&gt;=&lt;wert&gt;</code> gemacht). Der Name der <span class="term">System Property</span> lautet <code>moa.spss.server.configuration</code>; als Wert der <span class="term">System Property</span> ist der Pfad sowie der Name der Konfigurationsdatei im Dateisystem anzugeben, z.B.</p>
- <pre>moa.spss.server.configuration=C:/Programme/apache/tomcat-4.1.30/conf/moa-spss/moa-spss.config.xml
-</pre>
-<p>Weitere Informationen zum Bekanntmachen der zentralen Konfigurationsdatei f&uuml;r MOA SP/SS erhalten Sie in <a href="../install/install.html#webservice_basisinstallation_installation_spssdeploy">Abschnitt 2.1.2.3</a> des Installationshandbuchs.</p>
-<h3><a name="übersicht_bekanntmachung_laufenderbetrieb" id="übersicht_bekanntmachung_laufenderbetrieb"></a>1.3.1
- Aktualisierung der Konfiguration im laufenden Betrieb</h3>
-<p>Wird MOA SP/SS als Webservice eingesetzt, kann durch Aufrufen einer speziellen URL des Webservice ein erneutes Einlesen der Konfigurationsdatei erzwungen werden. Damit ist es m&ouml;glich, &Auml;nderungen an der Konfigurationsdatei vorzunehmen, und diese &Auml;nderungen ohne Neustart des zu Grunde liegenden Servlet Containers in den Betrieb zu &uuml;bernehmen.</p>
-<p>Weitere Informationen zum erneuten Einlesen der Konfigurationsdatei im Webservice-Betrieb erhalten Sie in <a href="../install/install.html#webservice_basisinstallation_installation_changeonthefly">Abschnitt 2.1.2.5</a> des Installationshandbuchs.</p>
-<h2><a name="übersicht_logging" id="übersicht_logging"></a>1.4 Konfiguration des Loggings</h2>
- <p>MOA SP/SS verwendet als Framework f&uuml;r Logging-Information die Open Source Software <code>log4j</code>. Die Konfiguration der Logging-Information erfolgt nicht direkt durch MOA SP/SS, sondern &uuml;ber eine eigene Konfigurationsdatei, die der <span class="term">Java Virtual Machine</span> durch eine <span class="term">System Property </span> mitgeteilt wird. Der Name der <span class="term">System Property </span> lautet <code>log4j.configuration</code>; als Wert der <span class="term">System Property </span> ist eine URL anzugeben, die auf die <code>log4j</code>-Konfigurationsdatei verweist, z.B.</p>
- <p>
- <pre>log4j.configuration=file:/C:/Programme/apache/tomcat-4.1.30/conf/moa-spss/log4j.properties</pre>
- Weitere Informationen zur Konfiguration des Loggings erhalten Sie in <a href="../install/install.html#webservice_basisinstallation_logging">Abschnitt 2.1.3</a> des Installationshandbuchs.
-<p></p>
- <h1><a name="konfigurationsparameter"></a>2 Konfigurationsparameter</h1>
- <p>Nachfolgend werden die verf&uuml;gbaren Konfigurationsparameter der zentralen Konfigurationsdatei im Detail erl&auml;utert. Die Reihenfolge der Abhandlung entspricht der Reihenfolge des vorgeschriebenen Auftretens in der Konfigurationsdatei. F&uuml;r beispielhafte Konfigurationsdateien siehe <a href="#beispielkonfigurationen">Abschnitt 3</a>. </p>
- <p>Muss der Wert eines Konfigurationsparameters eine URL oder eine Pfadangabe sein, und wird als konkreter Wert eine relative URL bzw. ein relativer Pfad angegeben, so wird diese Angabe relativ zum Pfad jenes Verzeichnisses interpretiert, in dem die zentrale Konfigurationsdatei gespeichert ist.</p>
- <h2><a name="konfigurationsparameter_allgemein" id="konfigurationsparameter_allgemein"></a>2.1
- Allgemeine Parameter</h2>
- <h3><a name="konfigurationsparameter_allgemein_hardwarecryptomodule" id="konfigurationsparameter_allgemein_hardwarecryptomodule"></a>2.1.1 Hardwarebasiertes Kryptographiemodul</h3>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:Common/cfg:HardwareCryptoModule</code></td>
- </tr>
- <tr>
- <td> Gebrauch</td>
- <td>Null mal bis unbeschr&auml;nkt oft </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Mit diesem Element wird MOA SP bzw. SS die Verf&uuml;gbarkeit eines Hardware-Kryptographiemoduls
- mitgeteilt. Wird ein solches Hardware-Kryptographiemodul konfiguriert, versucht MOA SP/SS das
- Hardware-Kryptographiemodul f&uuml;r die Verifikation des Signaturwerts (MOA SP) bzw. f&uuml;r die Berechnung
- von Hashwerten (MOA SP und MOA SS) anstatt des standardm&auml;&szlig;ig konfigurierten Software-Kryptographiemoduls
- zu verwenden. </p>
- <p>Werden mehrere Hardware-Kryptographiemodule konfiguriert, pr&uuml;ft MOA SP/SS entsprechend
- der Konfigurationsreihenfolge der Hardware-Kryptographiemodule, ob eines der Module die ben&ouml;tigte
- Funktion (Hashwertberechnung, Siganturpr&uuml;fung) zur Verf&uuml;gung stellt. Verwendet wird das erste Hardware-Kryptographiemodul,
- das ide ben&ouml;tigte Funktion zur Verf&uuml;gung stellen kann. </p>
- <p>Das Element weist bis zu drei Kindelemente auf:</p>
- <ul>
- <li>Element <code>cfg:Name</code>: Dieses obligatorische Element vom Typ <code>xs:string</code> enth&auml;lt
- den Dateinamen der DLL (Windows) oder der Shared-Library (Unix), welche die PKCS#11-Schnittstelle
- zum Hardware-Kryptographiemodul implementiert; der Wert enth&auml;lt entweder einen Dateinamen
- mit absoluter Pfadangabe oder einen Dateinamen ohne Pfadangabe. Im letzteren Fall wird der Dateiname
- relativ zum Suchpfad des Betriebssystems interpretiert. </li>
- <li>Element <code>cfg:SlotId</code>: Dieses optionale Element vom Typ <code>xs:string</code> gibt
- des Slot der PKCS#11-Schnittstelle an, &uuml;ber den das Hardware-Kryptographiemodul von MOA
- SP/SS angesprochen werden soll. Fehlt dieses Attribut, w&auml;hlt MOA SP/SS selbst einen Slot
- aus der Liste der verf&uuml;gbaren Slots aus. </li>
- <li>Element <code>cfg:UserPIN</code>: Dieses obligatorische Element vom Typ <code>xs:string</code> enth&auml;lt
- den PIN-Code zur Freischaltung der Kryptographiefunktionen &uuml;ber die PKCS#11-Schnittstelle
- des Hardware-Kryptographiemoduls. </li>
- </ul></td>
- </tr>
- </table>
- <h2><a name="konfigurationsparameter_ss" id="konfigurationsparameter_ss"></a>2.2 Parameter f&uuml;r MOA SS</h2>
- <h3><a name="konfigurationsparameter_ss_keymodules" id="konfigurationsparameter_ss_keymodules"></a>2.2.1 Schl&uuml;sselspeicher</h3>
- <h4><a name="konfigurationsparameter_ss_keymodules_hardwarekeymodule" id="konfigurationsparameter_ss_keymodules_hardwarekeymodule"></a>2.2.1.1 Hardware-Schl&uuml;sselspeicher</h4>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureCreation/cfg:KeyModules/cfg:HardwareKeyModule</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal bis unbeschr&auml;nkt oft; zumindest ein Hardware- (<code>cfg:HardwareKeyModule</code>) oder
- Software-Schl&uuml;sselspeicher (<code>cfg:SoftwareKeyModule</code>) muss
- jedoch vorhanden sein</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p>Mit diesem Element wird MOA SS die Verf&uuml;gbarkeit eines Hardware-Schl&uuml;sselspeichers mitgeteilt. </p>
- <p>Das Element weist bis zu vier Kindelemente auf:</p>
- <ul>
- <li>Element <code>cfg:Id</code>: Dieses obligatorische Element vom Typ <code>xs:token</code> enth&auml;lt
- einen frei w&auml;hlbaren Identifikator f&uuml;r dieses Konfigurationselement, der innerhalb der
- XML-Konfigurationsdatei eindeutig sein muss. Mit Hilfe dieses Identifikators wird im Konfigurationselement <code>cfg:SignatureCreation/cfg:KeyGroup</code> auf
- dieses Konfigurationselement referenziert.</li>
- <li> Element <code>cfg:Name</code>: Dieses obligatorische Element vom Typ <code>xs:string</code> enth&auml;lt
- den Dateinamen der DLL (Windows) oder der Shared-Library (Unix), welche die PKCS#11-Schnittstelle
- zum Hardware-Schl&uuml;sselspeicher implementiert; der Wert enth&auml;lt entweder einen Dateinamen
- mit absoluter Pfadangabe oder einen Dateinamen ohne Pfadangabe. Im letzteren Fall wird der Dateiname
- relativ zum Suchpfad des Betriebssystems interpretiert. </li>
- <li>Element <code>cfg:SlotId</code>: Dieses optionale Element vom Typ <code>xs:string</code> gibt des
- Slot der PKCS#11-Schnittstelle an, &uuml;ber den der Hardware-Schl&uuml;sselspeicher von MOA SS
- angesprochen werden soll. Fehlt dieses Attribut, w&auml;hlt MOA SS selbst einen Slot aus der Liste
- der verf&uuml;gbaren Slots aus. </li>
- <li>Element <code>cfg:UserPIN</code>: Dieses obligatorische Element vom Typ <code>xs:string</code> enth&auml;lt
- den PIN-Code zur Freischaltung der Schl&uuml;sselverwendung &uuml;ber die PKCS#11-Schnittstelle
- des Hardware-Schl&uuml;sselspeichers. </li>
- </ul> </td>
- </tr>
- </table>
- <h4><a name="konfigurationsparameter_ss_keymodules_softwarekeymodule" id="konfigurationsparameter_ss_keymodules_softwarekeymodule"></a>2.2.1.2
- Software-Schl&uuml;sselspeicher</h4>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureCreation/cfg:KeyModules/cfg:SoftwareKeyModule</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal bis unbeschr&auml;nkt oft; zumindest ein Hardware- (<code>cfg:HardwareKeyModule</code>) oder
- Software-Schl&uuml;sselspeicher (<code>cfg:SoftwareKeyModule</code>) muss jedoch vorhanden sein</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p>Mit diesem Element wird MOA SS die Verf&uuml;gbarkeit eines Software-Schl&uuml;sselspeichers in
- Form einer PKCS#12-Datei mitgeteilt. </p>
- <p>Das Element weist drei obligatorische Kindelemente auf:</p>
- <ul>
- <li>Element <code>cfg:Id</code>: Dieses Element vom Typ <code>xs:token</code> enth&auml;lt einen
- frei w&auml;hlbaren Identifikator f&uuml;r dieses Konfigurationselement, der innerhalb der XML-Konfigurationsdatei
- eindeutig sein muss. Mit Hilfe dieses Identifikators wird im Konfigurationselement <code>cfg:SignatureCreation/cfg:KeyGroup</code> auf
- dieses Konfigurationselement referenziert.</li>
- <li> Element <code>cfg:Filename</code>: Dieses Element vom Typ <code>xs:string</code> enth&auml;lt
- den Dateinamen der PKCS#12-Datei, die den Software-Schl&uuml;sselspeicher repr&auml;sentiert. Der
- Wert enth&auml;lt einen Dateinamen mit absoluter oder relativer Pfadangabe. Eine relative Pfadangabe
- wird von MOA SS relativ zum Pfad jenes Verzeichnisses interpretiert, in dem die zentrale Konfigurationsdatei
- gespeichert ist.</li>
- <li>Element <code>cfg:Password</code>: Dieses Element vom Typ <code>xs:string</code> enth&auml;lt
- das Passwort zum Entschl&uuml;sseln der Inhalte der PKCS#12-Datei. </li>
- </ul> </td>
- </tr>
- </table>
- <h3><a name="konfigurationsparameter_ss_keygroup" id="konfigurationsparameter_ss_keygroup"></a>2.2.2 Schl&uuml;sselgruppe</h3>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureCreation/cfg:KeyGroup</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>einmal bis unbeschr&auml;nkt oft </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p>Mit diesem Element wird in MOA SS eine Schl&uuml;sselgruppe definiert. Eine Schl&uuml;sselgruppe
- ist eine Zusammenfassung von einem oder mehreren privaten Schl&uuml;sseln, die in Hardware- bzw. Softwareschl&uuml;sselspeichern
- (vergleiche Abschnitte <a href="#konfigurationsparameter_ss_keymodules_hardwarekeymodule">2.2.1.1</a> bzw. <a href="#konfigurationsparameter_ss_keymodules_softwarekeymodule">2.2.1.2</a>)
- verwaltet werden. Die Schl&uuml;sselgruppe wird vom Kunden von MOA SS &uuml;ber einen eindeutigen Bezeichner
- im Request zur Signaturerstellung angesprochen. </p>
- <p>Sinn der Zusammenfassung von mehreren privaten Schl&uuml;sseln zu einer Schl&uuml;sselgruppe ist
- es, dass MOA SS selbst entscheidet, welcher konkrete Schl&uuml;ssel aus der Schl&uuml;sselgruppe
- zur Erstellung der Signatur verwendet wird. Durch die somit m&ouml;gliche Parallelisierung (mehrere
- private Schl&uuml;ssel werden parallel f&uuml;r Anfragen, die auf die gleiche Schl&uuml;sselgruppe
- referenzieren) l&auml;sst sich der Durchsatz der erstellten Signaturen verbessern. </p>
- <p>Das Element <code>cfg:SignatureCreation/cfg:KeyGroup</code> hat folgenden Element-Inhalt:</p>
- <ul>
- <li>Element <code>cfg:Id</code>: Dieses obligatorische Element vom Typ <code>xs:token</code> enth&auml;lt
- einen frei w&auml;hlbaren Identifikator f&uuml;r dieses Konfigurationselement, der innerhalb der
- XML-Konfigurationsdatei eindeutig sein muss. Mit Hilfe dieses Identifikators wird im Konfigurationselement <code>cfg:SignatureCreation/cfg:KeyGroupMapping</code> auf
- dieses Konfigurationselement referenziert. Weiters wird dieser Identifikator im Request zur Erstellung
- der Signatur verwendet, um die zu verwendende Schl&uuml;sselgruppe anzugeben.</li>
- <li>Element <code>cfg:Key</code>: Dieses Element muss zumindest einmal vorkommen. Jedes Element beschreibt
- einen der privaten Schl&uuml;ssel, aus denen sich die Schl&uuml;sselgruppe zusammensetzt. Das Element
- hat folgenden Element-Inhalt:
- <ul>
- <li>Element <code>cfg:KeyModuleId</code>: Dieses Element kommt genau einmal vor. Mit ihm wird
- auf einen der konfigurierten Hardware- oder Software-Schl&uuml;sselspeicher referenziert.
- Sein Textinhalt vom Typ <code>xs:token</code> enth&auml;lt den Identifikator des Hardware-
- oder Software-Schl&uuml;sselspeichers, so wie er in <code>cfg:SignatureCreation/cfg:KeyModules/cfg:HardwareKeyModule/cfg:Id</code> bzw. <code>cfg:SignatureCreation/cfg:KeyModules/cfg:SoftwareKeyModule/cfg:Id</code> festgelegt
- wurde. </li>
- <li>Element <code>cfg:KeyCertIssuerSerial</code>: Dieses Element kommt ebenfalls genau einmal
- vor. Mit ihm wird ein privater Schl&uuml;ssel innerhalb des mit <code>cfg:KeyModuleId</code> ausgew&auml;hlten
- Schl&uuml;sselspeichers ausgew&auml;hlt (sowohl Hardware- als auch Softwareschl&uuml;sselspeicher
- k&ouml;nnen ja prinzipiell mehr als nur einen einzigen privaten Schl&uuml;ssel verwalten).
- Das Element hat folgenden Element-Inhalt:
- <ul>
- <li>Element <code>dsig:X509IssuerName</code>: Dieses Element kommt genau einmal vor.
- Sein Textinhalt vom Typ <code>xs:string</code> enth&auml;lt den Namen des Ausstellers
- des Zertifikats f&uuml;r den ausgew&auml;hlten privaten Schl&uuml;ssel.</li>
- <li>Element <code>dsig:X509SerialNumber</code>: Dieses Element kommt genau einmal vor.
- Sein Textinhalt vom Typ <code>xs:integer</code> enth&auml;lt die Seriennummer des Zertifikats
- f&uuml;r den ausgew&auml;hlten privaten Schl&uuml;ssel. </li>
- </ul>
- </li>
- </ul>
- </li>
- </ul>
- <p>Um auf einfache Weise f&uuml;r alle in Ihren Schl&uuml;sselspeichern enthaltenen privaten Schl&uuml;ssel
- die jeweiligen Werte f&uuml;r <code>dsig:X509IssuerName</code> und <code>dsig:X509SerialNumber</code> zu
- erhalten, gehen Sie am besten wie folgt vor:</p>
- <ol>
- <li>Erfassen Sie in der zentralen Konfigurationsdatei alle Ihre Schl&uuml;sselspeicher mit Hilfe
- der Konfigurationselemente <code>cfg:SignatureCreation/cfg:KeyModules/cfg:HardwareKeyModule</code> bzw. <code>cfg:SignatureCreation/cfg:KeyModules/cfg:SoftwareKeyModule</code>. </li>
- <li>Starten Sie nun - mit bewusst fehlenden <code>cfg:SignatureCreation/cfg:KeyGroup</code> Elementen - den MOA SP/SS Server.
- Stellen Sie dabei sicher, dass das Log-Level f&uuml;r den Logger <code>moa.spss.server</code> zumindest
- auf das Niveau <code>info</code> eingestellt ist (Informationen zur Konfiguration des Loggings
- von MOA SP/SS finden Sie in <a href="../install/install.html#webservice_basisinstallation_logging">Abschnitt
- 2.1.3</a> des Installationshandbuchs). Im Log-File werden dann alle verf&uuml;gbaren privaten Schl&uuml;ssel
- an Hand der Werte <code>dsig:X509IssuerName</code> und <code>dsig:X509SerialNumber</code> aufgelistet.
- Vergleichen Sie den folgenden beispielhaften Auszug:<br>
- <pre>INFO | 15 15:10:14,737 | moa.spss.server | TID=startup NID=node1 MSG=Key <br> ID=SKM_Kunde1;CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT;7
-INFO | 15 15:10:14,737 | moa.spss.server | TID=startup NID=node1 MSG=Key
- ID=SKM_allgemein;CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT;9<br>INFO | 15 15:10:14,737 | moa.spss.server | TID=startup NID=node1 MSG=Key <br> ID=SKM_Kunde2;CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT;8</pre>
- Der Wert der Eigenschaft <code>ID</code> des Logging-Eintrags gliedert sich in drei Teile:
- <ol>
- <li>Der erste Teil enth&auml;lt den Identifikator des Hardware- bzw. Softwareschl&uuml;sselspeichers,
- so wie er im entsprechenden Konfigurationselement <code>cfg:SignatureCreation/cfg:KeyModules/cfg:HardwareKeyModule</code> bzw. <code>cfg:SignatureCreation/cfg:KeyModules/cfg:SoftwareKeyModule</code> erfasst
- wurde. </li>
- <li>Der zweite Teil enth&auml;lt nach dem ersten Semikolon den Namen des Ausstellers des Zertifikats
- f&uuml;r den privaten Schl&uuml;ssel, so wie er in <code>dsig:X509IssuerName</code> ben&ouml;tigt
- wird. </li>
- <li>Der dritte Teil enth&auml;lt nach dem zweiten Semikolon die Seriennummer des Zertifikats f&uuml;r
- den privaten Schl&uuml;ssel, so wie er in <code>dsig:X509SerialNumber</code> ben&ouml;tigt wird. </li>
- </ol>
- </li>
- <li>Erfassen Sie nun mit Hilfe der neu gewonnenen Informationen die Schl&uuml;sselgruppen, die in
- MOA SS zur Verf&uuml;gung stehen sollen. </li>
- </ol>
- <p>Wenn Ihnen f&uuml;r einen privaten Schl&uuml;ssel, den Sie in eine Schl&uuml;sselgruppe aufnehmen
- wollen, das Zertifikat bekannt ist und es in Form einer DER-kodierten Datei vorliegt, k&ouml;nnen
- Sie alternativ das Script <code>certtool</code> aus dem Verzeichnis <code>tools</code> im MOA-Installationsverzeichnis
- verwenden, um zu den Werten f&uuml;r <code>dsig:X509IssuerName</code> und <code>dsig:X509SerialNumber</code> zu
- kommen: </p>
- <pre>certtool -info &lt;certfilename&gt;</pre> <p><code>&lt;certfilename&gt;</code> enth&auml;lt den Namen der DER-kodierten Zertifikatsdatei, f&uuml;r
- die die beiden Werte <code>dsig:X509IssuerName</code> und <code>dsig:X509SerialNumber</code> geliefert
- werden sollen. Eine beispielhafte Ausgabe des Scripts sieht wie folgt aus: </p>
- <pre>SubjectDN (RFC2253):
- CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT
-IssuerDN (RFC2253) :
- CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT<br>Serial Number :
- 9</pre> <p>Die Werte f&uuml;r <code>IssuerDN (RFC2253)</code> sowie <code>Serial Number</code> entsprechen
- den Werten f&uuml;r <code>dsig:X509IssuerName</code> und <code>dsig:X509SerialNumber</code>.</p></td>
- </tr>
- </table>
- <h3><a name="konfigurationsparameter_ss_keygroupmapping" id="konfigurationsparameter_ss_keygroupmapping"></a>2.2.3
- Zuordnung von Schl&uuml;sselgruppen zu Kunden</h3>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureCreation/cfg:KeyGroupMapping</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>einmal bis unbeschr&auml;nkt oft </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Das Element <code>cfg:SignatureCreation/cfg:KeyGroupMapping</code> ordnet einem Kunden von MOA SS die ihm zur Verf&uuml;gung
- stehenden Schl&uuml;sselgruppen zu, indem das den Kunden repr&auml;sentierende SSL-Clientzertifikat
- mit einer oder mehreren Schl&uuml;sselgruppen assoziiert wird. </p>
- <p>Das Element hat folgenden Element-Inhalt:</p>
- <ul>
- <li>Element <code>cfg:CustomerId</code>: Dieses Element bezeichnet auf eindeutige
- Weise das den Kunden repr&auml;sentierende SSL-Clientzertifikat. Der Aufbau des Elements enspricht
- dem Aufbau des Elements <code>cfg:KeyCertIssuerSerial</code> in Abschnitt <a href="#konfigurationsparameter_ss_keygroup">2.2.2</a>.
- Um zu den Werten f&uuml;r Ausstellername und Seriennummer des SSL-Clientzertifikats zu kommen,
- k&ouml;nnen Sie auch hier das Script <code>certtool</code> (vergleiche Abschnitt <a href="#konfigurationsparameter_ss_keygroup">2.2.2</a>)
- verwenden. </li>
- <li>Element <code>cfg:KeyGroupId</code>: Dieses Element vom Typ <code>xs:token</code> kommt so oft
- vor, wie Schl&uuml;sselgruppen
- einem bestimmten SSL-Clientzertifikat zugeordnet werden sollen, mindestens jedoch einmal. Sein
- Wert repr&auml;sentiert dem Identifikator der Schl&uuml;sselgruppe, so wie er in <code>cfg:SignatureCreation/cfg:KeyGroup/cfg:Id</code> festgelegt
- wurde. </li>
- </ul>
- <p class="remark">Bitte beachten Sie: F&uuml;r maximal ein Konfigurationselement <code>cfg:SignatureCreation/cfg:KeyGroupMapping</code> kann <code>cfg:CustomerId</code> auch
- weggelassen werden. Die darin enthaltenen Schl&uuml;sselgruppen stehen dann allen Kunden von MOA
- SS gleicherma&szlig;en zur Verf&uuml;gung.</p></td>
- </tr>
- </table>
- <h3><a name="konfigurationsparameter_ss_xmldsig" id="konfigurationsparameter_ss_xmldsig"></a>2.2.4 Parameter
- f&uuml;r XML-Signaturen </h3>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureCreation/cfg:XMLDSig/cfg:CanonicalizationAlgorithm</code></td>
- </tr>
- <tr>
- <td> Gebrauch</td>
- <td>Null mal oder einmal </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Als Inhalt des Elements kann der Kanonisierungs-Algorithmus, der f&uuml;r das Erstellen von XML-Signaturen verwendet werden soll und in der Signatur als Inhalt von <code>dsig:Signature/dsig:SignedInfo/dsig:CanonicalizationMethod</code> aufscheint, spezifiziert werden. Folgende Werte d&uuml;rfen verwendet werden:</p>
- <p>
- <pre>http://www.w3.org/TR/2001/REC-xml-c14n-20010315 <br>http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments <br>http://www.w3.org/2001/10/xml-exc-c14n# <br>http://www.w3.org/2001/10/xml-exc-c14n#WithComments </pre>
- <p></p> <p>Wird das Element nicht angegeben, wird folgender Wert als Default-Wert verwendet:</p>
- <pre>http://www.w3.org/TR/2001/REC-xml-c14n-20010315 </pre> <p>Für die genaue Bedeutung der Werte siehe die <a href="http://www.w3.org/TR/xmldsig-core/" target="_blank">Spezifikation für XML-Signaturen</a>.</p></td>
- </tr>
- </table>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureCreation/cfg:XMLDSig/cfg:DigestMethodAlgorithm</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal oder einmal </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Als Inhalt des Elements kann der Digest-Algorithmus, der f&uuml;r das Erstellen von XML-Signaturen verwendet werden soll und in der Signatur als Inhalt von <code>dsig:Signature/dsig:SignedInfo/dsig:Reference/dsig:DigestMethod</code> aufscheint, spezifiziert werden. Folgende Werte d&uuml;rfen verwendet werden:</p>
- <p>
- <pre>http://www.w3.org/2000/09/xmldsig#sha1
-</pre>
- <p></p>
- <p>Wird das Element nicht angegeben, wird folgender Wert als Default-Wert verwendet:</p>
- <pre>http://www.w3.org/2000/09/xmldsig#sha1</pre> <p>F&uuml;r die genaue Bedeutung der Werte siehe die <a href="http://www.w3.org/TR/xmldsig-core/" target="_blank">Spezifikation f&uuml;r XML-Signaturen</a>.</p></td>
- </tr>
- </table>
- <h3><a name="konfigurationsparameter_ss_createtransformsinfoprofile" id="konfigurationsparameter_ss_createtransformsinfoprofile"></a>2.2.5 Profil f&uuml;r Transformationen</h3>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureCreation/cfg:CreateTransformsInfoProfile</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal bis unbeschr&auml;nkt oft</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p>MOA SS erlaubt die Hinterlegung von vordefinierten Profilen f&uuml;r Transformationen, die im Rahmen
- einer XML-Signaturerstellung zur Anwendung kommen sollen. Im Request zur XML-Signaturerstellung
- reicht es dann aus, auf dieses Profil zu referenzieren, anstatt die gesamten Transformationen explizit
- anzugeben. </p>
- <p><code>cfg:CreateTransformsInfoProfile</code> enth&auml;lt f&uuml;r ein bestimmtes Datenobjekt
- f&uuml;r eine zu erstellende XML-Signatur die auf dieses Datenobjekt anzuwendenden Transformationen,
- sowie allenfalls f&uuml;r die Durchf&uuml;hrung der Transformationen notwendige Erg&auml;nzungsobjekte
- (z.B. einen zu importierenden Stylesheet f&uuml;r eine XSL-Transformation).</p>
- <p><code>cfg:CreateTransformsInfoProfile</code> weist folgende obligatorische Kindelemene auf: </p>
- <ul>
- <li>Element<code> Id</code>: Dieses Element<code></code> vom Typ <code>xs:token</code> enth&auml;lt einen frei
- w&auml;hlbaren Identifikator f&uuml;r dieses Konfigurationselement, der innerhalb der XML-Konfigurationsdatei
- eindeutig sein muss. Dieser Identifikator wird im Request zur Erstellung der XML-Signatur verwendet,
- um das hinterlegte Profil zu referenzieren (vergleiche Element <code>moa:CreateTransformsInfoProfileID</code>). </li>
- <li>Element<code></code> <code>Location</code>: Dieses Element<code></code> vom Typ <code>xs:anyURI</code> enth&auml;lt
- den Namen der XML-Datei, die das hinterlegte Profil beinhaltet. Der Wert enth&auml;lt eine relative
- oder absolute URI. Eine relative URI
- wird von MOA SS als File-URI relativ zum Lage jenes Verzeichnisses interpretiert, in dem die zentrale
- Konfigurationsdatei gespeichert ist. Die XML-Datei muss als Wurzelelement das Element<code> moa:CreateTransformsInfoProfile
- </code>enthalten.</li>
- </ul> </td>
- </tr>
- </table>
- <h3><a name="konfigurationsparameter_ss_createsignatureenvironmentprofile" id="konfigurationsparameter_ss_createsignatureenvironmentprofile"></a>2.2.6 Profil f&uuml;r Signaturumgebung </h3>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureCreation/cfg:CreateSignatureEnvironmentProfile</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal bis unbeschr&auml;nkt oft</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p>MOA SS erlaubt die Hinterlegung von vordefinierten Profilen f&uuml;r die Signaturumgebung,
- die im Rahmen einer XML-Signaturerstellung zur Anwendung kommen soll. Im Request zur XML-Signaturerstellung
- reicht es dann aus, auf dieses Profil zu referenzieren, anstatt die Informationen zur Signaturumgebung
- explizit anzugeben. </p>
- <p><code>cfg:CreateSignatureEnvironmentProfile</code> enth&auml;lt f&uuml;r eine zu erstellende XML-Signatur,
- die in ein bereits bestehendes XML-Dokument integriert werden soll, die Stelle, an der die XML-Signatur
- eingef&uuml;gt werden soll, sowie allenfalls f&uuml;r die Verarbeitung des bestehenden XML-Dokuments
- notwendige Erg&auml;nzungsobjekte (z.B. ein XML-Schema f&uuml;r das validierende Parsen des bestehenden
- XML-Dokuments).</p>
- <p><code>cfg:</code><code>CreateSignatureEnvironmentProfile</code> weist folgende obligatorische Kindelemene
- auf: </p>
- <ul>
- <li>Element<code> Id</code>: Dieses Element<code></code> vom Typ <code>xs:token</code> enth&auml;lt
- einen frei w&auml;hlbaren Identifikator f&uuml;r dieses Konfigurationselement, der innerhalb der
- XML-Konfigurationsdatei eindeutig sein muss. Dieser Identifikator wird im Request zur Erstellung
- der XML-Signatur verwendet, um das hinterlegte Profil zu referenzieren (vergleiche Element <code>moa:</code><code>CreateSignatureEnvironmentProfileID</code>). </li>
- <li>Element<code></code> <code>Location</code>: Dieses Element<code></code> vom Typ <code>xs:anyURI</code> enth&auml;lt
- den Namen der XML-Datei, die das hinterlegte Profil beinhaltet. Der Wert enth&auml;lt eine relative
- oder absolute URI. Eine relative URI wird von MOA SS als File-URI relativ zum Lage jenes Verzeichnisses
- interpretiert, in dem die zentrale Konfigurationsdatei gespeichert ist. Die XML-Datei muss als
- Wurzelelement das Element<code> moa:CreateSignatureEnvironmentProfile </code>enthalten.</li>
- </ul></td>
- </tr>
- </table>
- <h2><a name="konfigurationsparameter_sp" id="konfigurationsparameter_sp"></a>2.3
- Parameter f&uuml;r MOA SP </h2>
- <h3> <a name="konfigurationsparameter_sp_certificatevalidation" id="konfigurationsparameter_sp_certificatevalidation"></a>2.3.1
- Zertifikatsvalidierung</h3>
- <h4><a name="konfigurationsparameter_sp_certificatevalidation_pathconstruction" id="konfigurationsparameter_sp_certificatevalidation_pathconstruction"></a>2.3.1.1
- Konstruktion des Zertifikatspfads</h4>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_pathconstruction_autoaddcertificates" id="konfigurationsparameter_sp_certificatevalidation_pathconstruction_autoaddcertificates"></a>2.3.1.1.1 Cachen von Zertifikaten </h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td> Name </td>
- <td><code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:PathConstruction/cfg:AutoAddCertificates</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>genau einmal</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Der Inhalt dieses Elements vom Typ <code>xs:boolean</code> gibt an, ob Zertifikate, die in einer
- zu pr&uuml;fenden
- Signatur enthalten sind bzw. bei der Zertifikatspfaderstellung durch Auswertung der Zertifikatserweiterung <span class="term">Authority
- Information Access</span> (siehe
- auch Parameter <code>cfg:UseAuthorityInfoAccess</code>) aus dem Internet geladen werden, automatisch
- in den lokalen Zertifikatsspeicher (siehe Abschnitt <span class="comment">x.y.z</span>) hinzugef&uuml;gt werden sollen.</p>
- <p>Zul&auml;ssige Werte f&uuml;r diesen Parameter sind <code>true</code> oder <code>false</code>.</p>
- </td>
- </tr>
- </table>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_pathconstruction_useauthorityinfoaccess" id="konfigurationsparameter_sp_certificatevalidation_pathconstruction_useauthorityinfoaccess"></a>2.3.1.1.2 Auswertung
- der Zertifikatserweiterung <span class="term">Authority Information Access</span>
- </h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td> Name </td>
- <td><code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:PathConstruction/cfg:UseAuthorityInfoAccess</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>genau einmal</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Der Inhalt dieses Elements vom Typ <code>xs:boolean</code> gibt an, ob die Zertifikatserweiterung <span class="term">Authority
- Information Access</span> f&uuml;r die Zertifikatspfaderstellung verwendet werden soll. Wird der
- Wert auf <code>true</code> gesetzt, dann setzt MOA auch den Parameter <code>cfg:AutoAddCertificate</code> automatisch
- auf <code>true</code> und ignoriert den gegebenenfalls in der Konfigurationsdatei daf&uuml;r gesetzten
- Wert. </p>
- <p>Zul&auml;ssige Werte f&uuml;r diesen Parameter sind <code>true</code> oder <code>false</code>.</p></td>
- </tr>
- </table>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_pathconstruction_certificatestore" id="konfigurationsparameter_sp_certificatevalidation_pathconstruction_certificatestore"></a>2.3.1.1.3 Lokalisierung
- des Zertifikatsspeichers </h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td> Name </td>
- <td><code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:PathConstruction/cfg:CertificateStore/cfg:DirectoryStore/cfg:Location</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>genau einmal</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Der Inhalt dieses Elements vom Typ <code>xs:token</code> gibt ein Verzeichnis im lokalen Dateisystem
- an, das von MOA als lokaler Zertifikatsspeicher verwendet werden soll.
-Zul&auml;ssige Werte f&uuml;r diesen Parameter sind absolute oder relative Pfadangaben, wobei relative Pfadangaben
-als relativ zum Pfad jenes Verzeichnisses interpretiert werden, in dem die zentrale
- Konfigurationsdatei gespeichert ist. Beispiele f&uuml;r zul&auml;ssige Werte lauten:</p>
- <pre>C:/Programme/apache/tomcat-4.1.30/conf/moa-spss/certstore</pre>
- <pre>certstore</pre></td>
- </tr>
- </table>
- <h4><a name="konfigurationsparameter_sp_certificatevalidation_pathvalidation" id="konfigurationsparameter_sp_certificatevalidation_pathvalidation"></a>2.3.1.2
- Valdierung des Zertifikatspfads</h4>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_pathvalidation_chainingmode" id="konfigurationsparameter_sp_certificatevalidation_pathvalidation_chainingmode"></a>2.3.1.2.1 G&uuml;ltigkeitsmodell
- f&uuml;r die Zertifikatskettenpr&uuml;fung</h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:PathValidation/cfg:ChainingMode</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>genau einmal </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Dieses Element legt fest, ob MOA SP f&uuml;r die Pr&uuml;fung der G&uuml;ltigkeit
- einer konstruierten Zertifikatskette das Kettenmodell aus ISIS-MTT oder das Schalenmodell aus dem PKIX
- RFC 3280 verwenden soll. Es hat folgende Kindelemente:</p>
- <ul>
- <li><code>cfg:DefaultMode</code>: Dieses obligatorische Element gibt das Default-Modell f&uuml;r die Pr&uuml;fung
- der G&uuml;ltigkeit einer konstruierten Zertifikatskette an. G&uuml;ltige Werte sind <code>chaining</code> (Kettenmodell)
- oder <code>pkix</code> (Schalenmodell). </li>
- <li><code>cfg:TrustAnchor</code>: Dieses Element kann beliebig oft (auch gar nicht) verwendet
- werden, um f&uuml;r bestimmte Vertrauensanker (vergleiche n&auml;chsten Parameter <code>cfg:TrustProfile</code>)
- Ausnahmen vom Default-Modell vorzugeben.
- Das Element weist folgende Kindelemente auf:
- <ul>
- <li><code>cfg:Identification</code>: Dieses obligatorische Element identifiziert den Vertrauensanker,
- f&uuml;r den ein bestimmtes Modell konfiguriert werden soll. Es entspricht vom Aufbau jenem
- von <code>cfg:KeyCertIssuerSerial</code> in
- Abschnitt <a href="#konfigurationsparameter_ss_keygroup">2.2.2</a>. Um zu den Werten f&uuml;r
- Ausstellername und Seriennummer des Vertrauensankers zu kommen, k&ouml;nnen Sie auch hier
- das Script <code>certtool</code> (vergleiche Abschnitt <a href="#konfigurationsparameter_ss_keygroup">2.2.2</a>)
- verwenden. </li>
- <li><code>cfg:Mode</code>: Dieses obligatorische Element vom Typ <code>xs:string</code> gibt
- jenes Modell an, das von MOA SP f&uuml;r die
- Pr&uuml;fung von konstruierten Zertifikatsketten zu verwenden ist, die im mittels <code>cfg:Identification/dsig:X509IssuerName</code> und <code>cfg:Identification/dsig:X509SerialNumber</code> angegebenen
- Vertrauensanker m&uuml;nden. G&uuml;ltige Werte sind <code>chaining</code> (Kettenmodell)
- oder <code>pkix</code> (Schalenmodell).</li>
- </ul>
- </li>
- </ul> </td>
- </tr>
- </table>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_pathvalidation_trustprofile" id="konfigurationsparameter_sp_certificatevalidation_pathvalidation_trustprofile"></a>2.3.1.2.2 Vertrauensprofile </h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:PathValidation/cfg:TrustProfile</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>einmal bis unbeschr&auml;nkt oft (zumindest ein Vertrauensprofil muss vorhanden sein) </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Das Element <code>cfg:</code><code>TrustProfile</code> wird dazu verwendet, um in MOA SP ein Vertrauensprofil
- f&uuml;r die Signaturpr&uuml;fung einzurichten. Ein Vertrauensprofil besteht aus einer Menge von Vertrauensankern
- und einer optionalen Menge von explizit erlaubten Signatorzertifikaten. </p>
- <p>Ein Vertrauensanker ist ein CA-Zertifikat, das explizit als vertrauensw&uuml;rdig eingestuft wird.
- MOA SP versucht bei der Konstruktion einer Zertifikatskette, einen Pfad vom Signatorzertifikat bis
- hin zu einem der konfigurierten Vertrauensanker zu finden. Gelingt dies, wird auch das Signatorzertifikat
- als vertrauensw&uuml;rdig betrachtet, ansonsten nicht. </p>
- <p>Wird neben der Menge von Vertrauensankern auch noch eine Menge von explizit erlaubten Signatorzertifikaten
- angegeben, pr&uuml;ft MOA SP nicht nur, ob sich ein Pfad vom Signatorzertifikat zu einem konfigurierten
- Vertrauensanker konstruieren l&auml;sst, sondern dar&uuml;ber hinaus auch noch, ob das Signatorzertifikat
- aus der zu pr&uuml;fenden Signatur in der Menge der explizit erlaubten Signatorzertifikate vorkommt.
- Explizit erlaubte Signatorzertifikate sollten Sie dann konfigurieren, wenn nicht allen von einer
- als Vertrauensanker konfigurierten CA ausgestellten Zertifikaten vertraut werden soll, sondern nur
- ganz bestimmten Zertifikaten dieser CA. </p>
- <p>In MOA SP k&ouml;nnen beliebig viele solcher Vertrauensprofile konfiguriert werden. Der Kunde von
- MOA SP gibt im Request zur Signaturpr&uuml;fung an, gegen welches Vertrauensprofil MOA SP die Zertifikatspr&uuml;fung
- vornehmen soll.</p>
- <p>Das Element <code>cfg:</code><code>TrustProfile</code> weist folgende Kindelemente
- auf:</p>
- <ul>
- <li><code>Id</code>: Dieses obligatorische Element vom Typ <code>xs:token</code> enth&auml;lt einen
- frei w&auml;hlbaren Identifikator f&uuml;r dieses Konfigurationselement, der innerhalb der XML-Konfigurationsdatei
- eindeutig sein muss. Dieser Identifikator wird im Request zur Signaturpr&uuml;fung verwendet, um
- das zu verwendende Vertrauensprofil auszuw&auml;hlen. </li>
- <li>Element <code>TrustAnchorsLocation</code>: Dieses obligatorische Element vom Typ <code>xs:anyURI </code> enth&auml;lt
- eine relative oder absolute URL, die ein Verzeichnis im lokalen Dateisystem referenziert.
- Eine relative URL wird relativ zum Pfad jenes Verzeichnisses interpretiert, in dem die zentrale
- Konfigurationsdatei gespeichert ist. Eine absolute URL muss als Protokoll-Teil <code>file</code> verwenden.
- Das referenzierte Verzeichnis muss eine oder mehrere DER-kodierte Zertifikatsdateien beinhalten.
- Jede Zertifikatsdatei repr&auml;sentiert einen Vertrauensanker. </li>
- <li>Element <code>SignerCertsLocation</code>: Dieses optionale Element vom Typ <code>xs:anyURI </code> enth&auml;lt
- eine relative oder absolute URL, die ein Verzeichnis im lokalen Dateisystem referenziert. Eine
- relative URL wird relativ zum Pfad jenes Verzeichnisses interpretiert, in dem die zentrale Konfigurationsdatei
- gespeichert ist. Eine absolute URL muss als Protokoll-Teil <code>file</code> verwenden. Das referenzierte
- Verzeichnis muss eine oder mehrere DER-kodierte Zertifikatsdateien beinhalten. Jede Zertifikatsdatei
- repr&auml;sentiert ein explizit erlaubtes Signatorzertifikat. </li>
- </ul></td>
- </tr>
- </table>
- <h4><a name="konfigurationsparameter_sp_certificatevalidation_revocationchecking" id="konfigurationsparameter_sp_certificatevalidation_revocationchecking"></a>2.3.1.3
- Widerrufspr&uuml;fung</h4>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_revocationchecking_enablechecking" id="konfigurationsparameter_sp_certificatevalidation_revocationchecking_enablechecking"></a>2.3.1.3.1 Aktivieren
- der Widerrufspr&uuml;fung</h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td> Name </td>
- <td><code> cfg:SignatureVerification/cfg:CertificateValidation/cfg:RevocationChecking/cfg:EnableChecking</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>genau einmal </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Der Inhalt dieses Elements vom Typ <code>xs:boolean</code> gibt an, ob bei der Zertifikats&uuml;berpr&uuml;fung im Zuge einer Signaturpr&uuml;fung auch der
- Zertifikatsstatus jedes einzelnen Zertifikats des gebildeten Zertifikatspfads &uuml;berpr&uuml;ft werden
- soll. </p>
- <p class="remark">Bitte beachten Sie: Die Widerrufspr&uuml;fung ist ein sehr wichtiger Schritt der
- Zertifikats&uuml;berpr&uuml;fung und somit der Signaturpr&uuml;fung. Eine Deaktivierung sollte nur
- in begr&uuml;ndeten Ausnahmef&auml;llen in Erw&auml;gung gezogen werden, z.B. f&uuml;r Testsituationen. </p>
- <p>Zul&auml;ssige Werte f&uuml;r diesen Parameter sind <code>true</code> oder <code>false</code>.</p> </td>
- </tr>
- </table>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_revocationchecking_maxrevocationage" id="konfigurationsparameter_sp_certificatevalidation_revocationchecking_maxrevocationage"></a>2.3.1.3.2
- Maximales Alter der Widerrufsinformation </h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td> Name </td>
- <td><code> cfg:SignatureVerification/cfg:CertificateValidation/cfg:RevocationChecking/cfg:MaxRevocationAge</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>genau einmal</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Der Inhalt dieses Elements vom Typ <code>xs:integer</code> gibt an, wie aktuell eine ggf. lokal
- gespeicherte Widerrufsinformation sein muss, damit sie von MOA SP als g&uuml;ltig angesehen wird. Ist
- die lokal gespeicherte Widerrufsinformation nicht aktuell genug, wird sie von MOA SP erneut aus dem
- Internet geladen.</p>
- <p>Dieser Parameter wird nur ausgewertet, wenn die Widerrufspr&uuml;fung aktiviert ist (siehe Parameter <code>cfg:EnableChecking</code>). </p>
- <p>Zul&auml;ssige Werte f&uuml;r diesen Parameter sind ganze Zahlen: </p>
- <ul>
- <li>Ein beliebiger negativer Wert bedeutet, dass eine Widerrufsinformation jedes Mal, wenn sie ben&ouml;tigt
- wird, neu aus dem Internet geladen wird. </li>
- <li>Der Wert <code>0</code> bedeutet, dass eine Widerrufsinformation dann neu geladen wird, wenn
- das Datum im Feld <code>nextUpdate</code> der entsprechenden Widerrufsliste bereits &uuml;berschritten
- ist.</li>
- <li>Ein positiver Wert gibt gibt die Zeitspanne in Millisekunden an, nach der eine ggf. vorhandene
- lokale Widerrufsinformation sp&auml;testens durch erneutes Laden aus dem Internet aktualisiert
- wird.</li>
- </ul> </td>
- </tr>
- </table>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_revocationchecking_serviceorder" id="konfigurationsparameter_sp_certificatevalidation_revocationchecking_serviceorder"></a>2.3.1.3.3
- Reihenfolge der Widerrufsdienste</h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td> Name </td>
- <td><code> cfg:SignatureVerification/cfg:CertificateValidation/cfg:RevocationChecking/cfg:ServiceOrder</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal oder einmal </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Dieses Element gibt an, in welcher Reihenfolge MOA SP die Widerrufsdienste f&uuml;r die Pr&uuml;fung des
- Widerrufs f&uuml;r ein Zertifikat kontaktieren soll, wenn f&uuml;r das Zertifikat mehrere unterschiedliche Widerrufsdienste
- (CRL, OCSP) verf&uuml;gbar sind. Das Element weist folgendes Kindelement auf: </p>
- <ul>
- <li><code>cfg:Service</code>: Dieses Element vom Typ <code>xs:token</code> muss genau zwei mal vorkommen. G&uuml;tlige Werte f&uuml;r den
- Textinhalt des Elements sind <code>OCSP</code> und <code>CRL</code>. Damit kann entweder die Reihenfolge (CRL, OCSP) oder (OCSP,
- CRL) festgelegt werden. </li>
- </ul> <p>Wird das Element nicht angegeben, so lautet die von MOA SP dann verwendete Default-Reihenfolge (CRL,
- OCSP).</p> </td>
- </tr>
- </table>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_revocationchecking_archiving" id="konfigurationsparameter_sp_certificatevalidation_revocationchecking_archiving"></a>2.3.1.3.4
- Archivierung von Widerrufsinformationen</h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td> Name </td>
- <td><code> cfg:SignatureVerification/cfg:CertificateValidation/cfg:RevocationChecking/cfg:Archiving/cfg:EnableArchiving</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>genau einmal </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Der Inhalt dieses Elements vom Typ <code>xs:boolean</code> gibt an, ob mittlerweile ung&uuml;ltig
- gewordene (i.e. historische) CRL-Widerrufsinformationen von MOA SP archiviert werden soll. </p>
- <p>Wird dieser
- Parameter auf den Wert <code>true</code> gesetzt, muss auch der Parameter <code>cfg:Archive</code> (siehe
- unten) angegeben werden. Zul&auml;ssige Werte f&uuml;r diesen Parameter sind <code>true</code> oder <code>false</code>.</p> </td>
- </tr>
- </table>
-
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:RevocationChecking/cfg:Archiving/cfg:ArchiveDuration</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal oder einmal </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Dieses Element vom Typ <code>xs:nonNegativeInteger</code> gibt (in Tagen) an, wie lange Widerrufsinformationen
- von MOA SP archiviert werden m&uuml;ssen. Das Element wird von MOA SP nur dann ausgewertet, wenn der
- Konfigurationsparameter <code>cfg:EnableArchiving</code> auf
- true gesetzt ist. </p>
- <p>Wird das Element nicht angegeben, so verwendet MOA SP den Default-Wert von 365 Tagen.</p> </td>
- </tr>
- </table>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td> Name </td>
- <td><code> cfg:SignatureVerification/cfg:CertificateValidation/cfg:RevocationChecking/cfg:Archiving/cfg:Archive</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal oder einmal </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p>Dieses Element gibt an, welches Archiv MOA SP zur Archivierung von mittlerweile ung&uuml;ltig
- gewordene (i.e. historische) CRL-Widerrufsinformationen verwenden soll, falls der Konfigurationsparameter <code>cfg:EnableArchiving</code> auf
- <code>true</code> gesetzt ist. Es muss angegeben werden, wenn der
- Konfigurationsparameter <code>cfg:EnableArchiving</code> auf true gesetzt ist. Das Element weist folgendes
- Kindelement auf:</p>
- <ul>
- <li><code>cfg:DatabaseArchive</code>: Dieses obligatorische Element dient zur Angabe der notwendigen
- Informationen f&uuml;r die Benutzung eines datenbankbasierten CRL-Archivs durch MOA SP. Das Datenbankarchiv
- ist die einzige derzeit unterst&uuml;tzte Archivform. Das Element weist folgende Kindelemente auf:
- <ul>
- <li> <code>cfg:JDBCURL</code>: Dieses obligatorische Element vom Typ <code>xs:anyURI</code> gibt
- die JDBC-URL zu jener Datenbank an, in der MOA historische Widerrufsinformationen archivieren
- soll. Der genaue Aufbau der JDBC-URL ist abh&auml;ngig von der verwendeten Datenbank. Im Fall von
- PostgreSQL kann folgende URL verwendet werden:
- <pre>jdbc:postgresql://&lt;host&gt;/&lt;moadb&gt;?user=&lt;moauser&gt;&amp;amp;password=&lt;moapassword&gt;</pre>
- <p> Die Platzhalter <code>&lt;host&gt;</code>, <code>&lt;moadb&gt;</code>, <code>&lt;moauser&gt;</code> und <code>&lt;moapassword&gt;</code> m&uuml;ssen
- dabei an die tats&auml;chlich verwendete Datenbank angepasst werden.</p>
- <p class="remark"> Bitte beachten Sie: Die Kodierung des Zeichens &quot;&amp;&quot; als "&amp;amp;" ist
- erforderlich, da es andernfalls zu einem Validierungsfehler beim Parsen der XML-Konfigurationsdatei
- durch MOA kommen w&uuml;rde.</p>
- <p class="remark"> Bitte beachten Sie: MOA SP legt eigenst&auml;ndig eine passende Tabelle in der angegebenen
- Datenbank an und bef&uuml;llt diese dann in weiterer Folge. Der in der JDBC-URL angegebene Benutzer
- muss mit den dazu passenden Rechten ausgestattet sein. </p>
- </li>
- <li><p><code>cfg:JDBCDriverClassName</code>: Dieses obligatorische Element vom Typ <code>xs:token</code> gibt den
- vollst&auml;ndig
- qualifizierten Java-Klassennamen des JDBC-Treibers an, der von MOA SP zur Ansprache der f&uuml;r
- die CRL-Archivierung zu verwendenden Datenbank ben&uuml;tzt werden soll.</p>
- <p class="remark">Bitte beachten Sie: Informationen zum Anlegen einer Datenbank in postgreSQL finden Sie in <a href="../install/install.html#webservice_erweiterungsm&#246;glichkeiten_datenbank_postgresql">Abschnitt
- 2.2.2.1</a> des Installationshandbuchs.</p>
- </li>
- </ul>
- </li>
- </ul> </td>
- </tr>
- </table>
- <h5><a name="konfigurationsparameter_sp_certificatevalidation_revocationchecking_distributionpoint" id="konfigurationsparameter_sp_certificatevalidation_revocationchecking_distributionpoint"></a>2.3.1.3.5
- Manuelle Konfiguration von Verteilungspunkten f&uuml;r Widerrufsinformationen</h5>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:RevocationChecking/cfg:DistributionPoint</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal bis unbeschr&auml;nkt oft </td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p> Das Element <code>cfg:</code><code>CRLDistributionPoint</code> kann dazu verwendet werden, manuelle
- Verteilungspunkte f&uuml;r Widerrufsinformationen einer bestimmten CA zu konfigurieren. </p>
- <p>Dies macht f&uuml;r veraltete Zertifikate Sinn, die nicht den aktuellen Vorgaben aus dem PKIX RFC 3280 entsprechen und im Zertifikat selbst keine Zertifikatserweiterung mit einem solchen Verteilungspunkt enthalten.</p>
- <p>Weiters kann diese manuelle Konfiguration verwendet werden, wenn die in einem Zertifikat enthaltenen Verteilungspunkte f&uuml;r eine bestimmte CA durch einen manuellen Eintrag &uuml;berschrieben werden soll (etwa weil die im Zertifikat enthaltenen Verteilungspunkte in Form von ldap-URLs angegeben sind, MOA SP aber der Zugriff auf ldap-URLs per Firewall-Einstellungen untersagt ist; dann k&ouml;nnte man stattdessen manuell eine (lokale) http-URL als Verteilungspunkt angeben, die von MOA SP dann aufgel&ouml;st werden kann). </p>
- <p>Das Element weist folgende Kind-Elemente auf:</p>
- <ul>
- <li>Element <code>cfg:CAIssuerDN</code>: Dieses Element enth&auml;lt als Textinhalt vom Typ <code>xs:string</code> den
- Namen jener CA, die das Zertifikat ausgestellt hat, dessen Widerruf mit Hilfe des zu konfigurierenden
- Verteilungspunktes gepr&uuml;ft werden soll. Um zu diesem Wert zu kommen, k&ouml;nnen Sie auch
- hier das Script <code>certtool</code> (vergleiche Abschnitt<a href="#konfigurationsparameter_ss_keygroup"> 2.2.2</a>)
- verwenden, in dem Sie es f&uuml;r das Zertifikat anwenden, dessen Widerruf mit Hilfe des zu konfigurierenden
- Verteilungspunktes gepr&uuml;ft werden soll.</li>
- <li>Element <code>cfg:CRLDP</code>: Dieses Element verweist auf einen Verteilungspunkt, an dem eine
- Widerrufsliste abgeholt werden kann. Es weist folgende Kind-Elemente auf:
- <ul>
- <li>Element<code> cfg:Location</code>: Der Wert dieses obligatorischen Elements vom Typ<code> xs:anyURI</code> enth&auml;lt
- die URL f&uuml;r den zu konfigurierenden Verteilungspunkt. Es werden die Protokolle HTTP, HTTPS
- und LDAP unterst&uuml;tzt.</li>
- <li>Element<code> cfg:ReasonCode</code>: Dieses Element vom Typ <code>xs:token</code> kann
- null mal bis unbeschr&auml;nkt
- oft vorkommen und enth&auml;lt
- jeweils einen laut PKIX RFC 3280 m&ouml;glichen Grund eines Widerrufs,
- f&uuml;r
- welche die &uuml;ber den zu konfigurierenden Verteilungspunkt zu beziehende Widerrufsliste
- ausgestellt ist. G&uuml;ltige Gr&uuml;nde sind <code>unused</code>, <code>keyCompromise</code>, <code>cACompromise</code>, <code>affiliationChanged</code>, <code>superseded</code>, <code>cessationOfOperation</code>, <code>certificateHold</code>, <code>privilegeWithdrawn</code> und <code>aACompromise</code>.
- Wird eine Widerrufsliste f&uuml;r mehrere Gr&uuml;nde ausgestellt, muss also das Element <code>cfg:ReasonCode</code> mehrmals
- angegeben werden. Wird das Element null mal angegeben, gilt der Verteilungspunkt f&uuml;r alle m&ouml;glichen
- Widerrufsgr&uuml;nde.</li>
- </ul>
- </li>
- <li>Element <code>cfg:OCSPDP</code>: Dieses Element verweist auf einen Verteilungspunkt, an dem die
- Widerrufsinformation von einem OCSP-Responder bezogen werden kann. Es weist folgendes Kind-Element
- auf:
- <ul>
- <li></li>
- </ul>
- Element<code> cfg:Location</code>: Der Wert dieses obligatorischen Elements vom Typ<code> xs:anyURI</code> enth&auml;lt
- die URL f&uuml;r den zu konfigurierenden Verteilungspunkt. Es werden die Protokolle HTTP, HTTPS und
- LDAP unterst&uuml;tzt.</li>
- </ul>
- <p>Hinweis: Die Elemente <code>cfg:CRLDP</code> bzw. <code>cfg:OSCPDP</code> k&ouml;nnen beliebig oft als Kinder von <code>cfg:CRLDistributionPoint</code> angegeben
- werden. Die Reihenfolge spielt dabei keine Rolle. Jedenfalls muss aber eines dieser beiden Elemente
- angegeben werden. </p></td>
- </tr>
- </table>
-
- <h3><a name="konfigurationsparameter_sp_verifytransformsinfoprofile" id="konfigurationsparameter_sp_verifytransformsinfoprofile"></a>2.3.2 Profil f&uuml;r Transformationen</h3>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureVerification/cfg:VerifyTransformsInfoProfile</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal bis unbeschr&auml;nkt oft</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p>MOA SP erlaubt die Hinterlegung eines vordefinierten Profils f&uuml;r eine erlaubte Transformationsfolge,
- deren Einhaltung im Rahmen einer XML-Signaturpr&uuml;fung kontrolliert wird. Im Request
- zur XML-Signaturpr&uuml;fung reicht es dann aus, auf dieses Profil zu referenzieren, anstatt die
- gesamten Transformationen explizit anzugeben. </p>
- <p><code>cfg:VerifyTransformsInfoProfile</code> enth&auml;lt f&uuml;r ein bestimmtes Datenobjekt f&uuml;r
- eine zu pr&uuml;fende XML-Signatur eine
- f&uuml;r dieses Datenobjekt erlaubte Transformationsfolge, bestehend aus den anzuwendenden Transformationen,
- sowie allenfalls f&uuml;r die Durchf&uuml;hrung der Transformationen erlaubte implizite Transformationsparameter
- (z.B. einen zu importierenden Stylesheet f&uuml;r eine XSL-Transformation).</p>
- <p><code>cfg:</code><code>VerifyTransformsInfoProfile</code> weist folgende obligatorische Kindelemene
- auf: </p>
- <ul>
- <li>Element<code> Id</code>: Dieses Element<code></code> vom Typ <code>xs:token</code> enth&auml;lt
- einen frei w&auml;hlbaren Identifikator f&uuml;r dieses Konfigurationselement, der innerhalb der
- XML-Konfigurationsdatei eindeutig sein muss. Dieser Identifikator wird im Request zur Pr&uuml;fung
- der XML-Signatur verwendet, um das hinterlegte Profil zu referenzieren (vergleiche Element <code>moa:</code><code>VerifyTransformsInfoProfileID</code>). </li>
- <li>Element<code></code> <code>Location</code>: Dieses Element<code></code> vom Typ <code>xs:anyURI</code> enth&auml;lt
- den Namen der XML-Datei, die das hinterlegte Profil beinhaltet. Der Wert enth&auml;lt eine relative
- oder absolute URI. Eine relative URI wird von MOA SP als File-URI relativ zum Lage jenes Verzeichnisses
- interpretiert, in dem die zentrale Konfigurationsdatei gespeichert ist. Die XML-Datei muss als
- Wurzelelement das Element<code> moa:VerifyTransformsInfoProfile </code>enthalten.</li>
- </ul></td>
- </tr>
- </table>
- <h3><a name="konfigurationsparameter_sp_supplementprofile" id="konfigurationsparameter_sp_supplementprofile"></a>2.3.3 Profil f&uuml;r Erg&auml;nzungsobjekte</h3>
- <table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <td>Name</td>
- <td><code>cfg:SignatureVerification/cfg:SupplementProfile</code></td>
- </tr>
- <tr>
- <td>Gebrauch</td>
- <td>Null mal bis unbeschr&auml;nkt oft</td>
- </tr>
- <tr>
- <td>Erl&auml;uterung</td>
- <td><p>MOA SS erlaubt die Hinterlegung eines vordefinierten Profils f&uuml;r ein Erg&auml;nzungsobjekt,
- das im Rahmen einer XML-Signaturpr&uuml;fung verwendet werden soll. Im Request zur XML-Signaturpr&uuml;fung reicht es dann aus, auf dieses Profil zu referenzieren, anstatt die Informationen zur Signaturumgebung
- explizit anzugeben. </p>
- <p><code>cfg:SupplementProfile</code> enth&auml;lt f&uuml;r ein Datenobjekt in der zu pr&uuml;fenden
- XML-Signatur ein allenfalls f&uuml;r die Durchf&uuml;hrung der vorgegebenen Transformationen notwendiges
- Erg&auml;nzungsobjekt (z.B. einen zu importierenden Stylesheet f&uuml;r eine XSL-Transformation).</p>
- <p><code>cfg:</code><code>SupplementProfile</code> weist folgende obligatorische Kindelemene auf: </p>
- <ul>
- <li>Element<code> Id</code>: Dieses Element<code></code> vom Typ <code>xs:token</code> enth&auml;lt
- einen frei w&auml;hlbaren Identifikator f&uuml;r dieses Konfigurationselement, der innerhalb der
- XML-Konfigurationsdatei eindeutig sein muss. Dieser Identifikator wird im Request zur Pr&uuml;fung
- der XML-Signatur verwendet, um das hinterlegte Profil zu referenzieren (vergleiche Element <code>moa:</code><code>SupplementProfileID</code>). </li>
- <li>Element<code></code> <code>Location</code>: Dieses Element<code></code> vom Typ <code>xs:anyURI</code> enth&auml;lt
- den Namen der XML-Datei, die das hinterlegte Profil beinhaltet. Der Wert enth&auml;lt eine relative
- oder absolute URI. Eine relative URI wird von MOA SP als File-URI relativ zum Lage jenes Verzeichnisses
- interpretiert, in dem die zentrale Konfigurationsdatei gespeichert ist. Die XML-Datei muss als
- Wurzelelement das Element<code> moa:SupplementProfile </code>enthalten.</li>
- </ul></td>
- </tr>
- </table>
- <h1><a name="beispielkonfigurationen"></a>3 Beispielkonfigurationen</h1>
- <h2><a name="beispielkonfigurationen_minss" id="beispielkonfigurationen_minss"></a>3.1 Minimale Konfiguration f&uuml;r MOA SS</h2>
- <p>Nachfolgend finden Sie eine zentrale Konfigurationsdatei mit den minimal notwendigen Eintr&auml;gen f&uuml;r
- den alleinigen Betrieb von MOA SS. Darin sind als Kinder des Wurzelelements <code>cfg:MOAConfiguration</code> folgende
- Konfigurationselemente enthalten:</p>
- <ul>
- <li>Ein Software-Schl&uuml;sselspeicher (<code>cfg:SignatureCreation/cfg:KeyModules/cfg:SoftwareKeyModule</code>);</li>
- <li>Eine Schl&uuml;sselgruppe (<code>cfg:SignatureCreation/</code><code>cfg:KeyGroup</code>);</li>
- <li>Eine Zuordnung dieser Schl&uuml;sselgruppe f&uuml;r einen bestimmten Kunden (<code>cfg:SignatureCreation/cfg:KeyGroupMapping</code>). </li>
- </ul>
- <p><a href="../../conf/moa-spss/ss.minimum.config.xml">Minimale Konfiguration f&uuml;r MOA SS</a> </p>
- <h2><a name="beispielkonfigurationen_minsp" id="beispielkonfigurationen_minsp"></a>3.2 Minimale Konfiguration f&uuml;r MOA SP</h2>
- <p>Nachfolgend finden Sie eine zentrale Konfigurationsdatei mit den minimal notwendigen Eintr&auml;gen f&uuml;r
- den alleinigen Betrieb von MOA SP. Darin sind als Kinder des Wurzelelements <code>cfg:MOAConfiguration</code> folgende
- Konfigurationselemente enthalten:</p>
- <ul>
- <li>Einstellungen betreffend die Konstruktion des Zertifikatspfades (<code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:PathConstruction</code>);</li>
- <li>Einstellungen betreffend die Validierung des Zertifikatspfades (<code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:PathValidation</code>),
- unter anderem ein Vertrauensprofil (<code>cfg:TrustProfile</code>);</li>
- <li>Einstellungen betreffend die Widerrufspr&uuml;fung von Zertifikaten des Zertifikatspfades (<code>cfg:SignatureVerification/cfg:CertificateValidation/cfg:RevocationChecking</code>) . </li>
- </ul>
- <p><a href="../../conf/moa-spss/sp.minimum.config.xml">Minimale Konfiguration f&uuml;r MOA SP</a> </p>
- <h2><a name="beispielkonfigurationen_typspss" id="beispielkonfigurationen_typspss"></a>3.3 Typische Konfiguration f&uuml;r MOA SP/SS</h2>
- <p>Nachfolgend finden Sie eine typische zentrale Konfigurationsdatei mit Eintr&auml;gen f&uuml;r den kombinierten Betrieb von MOA SP und SS. Diese Datei wird auch als Konfiguration von MOA SP und SS verwendet, die f&uuml;r das Ausf&uuml;hren der Beispiele des <a href="../usage/usage.html">Anwenderhandbuchs</a> notwendig ist.</p>
- <p><a href="../../conf/moa-spss/spss.config.xml">Typische Konfiguration f&uuml;r MOA SP/SS</a> </p>
- <p>&nbsp; </p>
-</body>
-</html>
diff --git a/spss.handbook/handbook/faq/faq.html b/spss.handbook/handbook/faq/faq.html
deleted file mode 100644
index 74f26e70a..000000000
--- a/spss.handbook/handbook/faq/faq.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
- <title>MOA SS und SP - FAQ</title>
- <link rel="stylesheet" href="../common/MOA.css" type="text/css">
-</head>
-<body bgcolor="white" text="#000000" link="#990000" vlink="#666666" alink="#cc9966">
- <table class="logoTable" width="100%" border="0" cellspacing="0" cellpadding="10">
- <tr>
- <td align="center" class="logoTitle" width="267"><img src="../common/LogoBKA.png" alt="Logo BKA" width="267" height="37" align="left"></td>
- <td align="center" class="logoTitle">Open Source<br>
- f&uuml;r das E-Government</td>
- <td align="center" class="logoTitle" width="123"><img src="../common/LogoMoa4c.jpg" alt="Logo MOA" width="123" height="138" align="right"></td>
- </tr>
- </table>
- <hr/>
- <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.3</a></p>
- <p class="subtitle">FAQ</p>
- <hr/>
- <h1>Inhalt</h1>
- <ol>
- <li>
- <p><a href="#allgemeines">Allgemeines</a></p>
- </li>
- <li>
- <p><a href="#uebersicht_fragen">&Uuml;bersicht der Fragen </a></p>
- </li>
- <li>
- <p><a href="#antworten">Antworten</a></p>
- </li>
- </ol>
-<hr/>
- <h1><a name="allgemeines"></a>1 Allgemeines</h1>
- <p> Dieses Dokument enth&auml;lt eine Reihe von h&auml;ufig gestellten Fragen zu Installation, Konfiguration und Verwendung von MOA Serversignatur (SS) und Signaturpr&uuml;fung (SP). </p>
- <h1><a name="uebersicht_fragen" id="uebersicht_fragen"></a>2 &Uuml;bersicht der Fragen </h1>
- <h2> Installation</h2>
- <ol>
- <li>Beim Starten von MOA SPSS tritt folgende Exception auf: <code>java.lang.ClassCastException: iaik.asn1.structures.Name</code>. Was kann der Fehler sein? [<a href="#installation_1">Zur Antwort</a>]</li>
- <li>Ich m&ouml;chte MOA SS/SP in einer Umgebung betreiben, die einen Internet-Zugang nur &uuml;ber einen Proxy erlaubt. Funktioniert das? [<a href="#installation_1">Zur Antwort</a>] </li>
- </ol>
- <h2>Konfiguration</h2>
- <ol>
- <li>Ich m&ouml;chte gerne die CRL-Archivierung von MOA verwenden, m&ouml;chte aber eine andere als die in der Konfiguration erw&auml;hnte postgreSQL-Datenbank verwenden. Geht das? [<a href="#konfiguration_1">Zur Antwort</a>]</li>
- <li>Ich m&ouml;chte ein Zertifikat (z.B. einer Zwischen-Zertifizierungsstelle) manuell in den internen Zertifikatsspeicher von MOA SP importieren. Wie funktioniert das? [<a href="#konfiguration_2">Zur Antwort</a>]</li>
- <li>Meine bestehende Konfigurationsdatei funktioniert mit MOA SP/SS 1.3 oder h&ouml;her nicht mehr. Was ist passiert?
- [<a href="#konfiguration_3">Zur Antwort</a>] </li>
- </ol>
- <h2>Verwendung</h2>
- <ol>
- <li>Bei der Pr&uuml;fung einer Signatur liefert die Pr&uuml;fung des Zertifikatsstatus den Code 1. Was kann der Fehler sein? [<a href="#verwendung_1">Zur Antwort</a>] </li>
- </ol>
- <h1><a name="antworten" id="antworten"></a>3 Antworten</h1>
- <h2>Installation</h2>
- <ol>
- <li class="faq"><div class="faq-question"><a name="installation_1"></a>Beim Starten von MOA SPSS tritt folgende Exception auf: <code>java.lang.ClassCastException: iaik.asn1.structures.Name</code>. Was kann der Fehler sein?</div>
- <p>Auf Grund einer mangelhaften Implementierung in einigen Versionen des JDK 1.3.1 kann es beim Betrieb von MOA zu folgendem Problem kommen: Sun macht in der Implementierung von <code>PKCS7.getCertificate()</code> einen Downcast vom Interface<code> java.security.Principal</code> auf die eigene Implementierung, was zu einer <span class="term">ClassCastException</span> f&uuml;hrt, wenn der JCE-Provider von Sun nicht an erster Stelle in der List der Security-Provider installiert ist. MOA geht nun aber so vor, dass der JCE-Provider des IAIK an die erste Stelle installiert wird, wenn er zum Zeitpunkt der Konfiguration noch nicht installiert war. Wird dann von irgendeinem ClassLoader der jar-Verifier ben&uuml;tzt, wird <code>PKCS7.getCertificate()</code> verwendet, und es kommt zu einer <span class="term">ClassCastException</span>. </p>
- <p>Wird MOA &uuml;ber die API-Schnittstelle verwendet, ist ein Workaround die manuelle Installation des IAIK-JCE-Providers nach dem Sun JCE-Provider (etwa an die letzte Stelle), bevor die MOA-Konfiguration aufgerufen wird. Bei Verwendung der Webservices ist die M&ouml;glichkeit der statischen Konfiguration der JCE-Provider mittels Angabe in der Datei <code>$JAVA_HOME/jre/lib/security/java.security</code> der einzige bekannte Workaround. Hierzu m&uuml;ssen die Eintr&auml;ge </p>
- <pre> security.provider.1=sun.security.provider.Sun
- security.provider.2=com.sun.rsajca.Provider </pre>
- <p>durch folgenden Eintrag erg&auml;nzt werden:</p>
- <pre>security.provider.3=iaik.security.provider.IAIK</pre>
- </li>
- <li class="faq">
- <div class="faq-question"><a name="installation_2" id="installation_2"></a>Ich m&ouml;chte MOA SS/SP in einer Umgebung betreiben, die einen Internet-Zugang nur &uuml;ber einen Proxy erlaubt. Funktioniert das?</div>
- <p>Ja, zumindest f&uuml;r Zugriffe &uuml;ber HTTP. Sie m&uuml;ssen dazu die nachfolgenden JAVA System-Properties setzen:</p>
- <pre>http.proxyHost=&lt;proxyhost&gt;
-http.proxyPort=&lt;proxyport&gt;
-http.nonProxyHosts=&quot;&lt;exceptionhosts&gt;&quot;</pre>
- <p><code>&lt;proxyhost&gt;</code> gibt den Namen oder die IP-Adresse des Proxies an.</p>
- <p><code>&lt;proxyport&gt;</code> gibt den Port des Proxies an.</p>
- <p><code>&lt;exceptionhosts&gt;</code> enth&auml;lt eine Liste von Rechnernamen, die nicht &uuml;ber den Proxy laufen sollen. Jedenfalls m&uuml;ssen sie hier <code>localhost</code> angeben. Einzelne Namen sind durch eine Pipe (<code>|</code>) zu trennen. Bitte beachten Sie, dass IP-Addressen nicht angegeben werden d&uuml;rfen, sowie die verpflichtend zu verwendenen Anf&uuml;hrungszeichen.<br>
- </p>
- </li>
- </ol>
- <h2>Konfiguration</h2>
- <ol>
- <li class="faq"><div class="faq-question"><a name="konfiguration_1" id="konfiguration_1"></a>Ich m&ouml;chte gerne die CRL-Archivierung von MOA verwenden, m&ouml;chte aber eine andere als die in der Konfiguration erw&auml;hnte postgreSQL-Datenbank verwenden. Geht das?</div>
- <p>Ja, das ist m&ouml;glich. Wenn Sie eine mySQL-Datenbank verwenden m&ouml;chten, sind folgende Ma&szlig;nahmen zu treffen:</p>
- <ul>
- <li><a href="http://www.mysql.com/downloads/api-jdbc.html">Laden</a> Sie den mySQL-JDBC-Connector herunter und f&uuml;gen Sie das im Download enthaltene jar-File <code>mysql-connector-java-3.x.x-stable-bin.jar</code> zum Klassenpfad f&uuml;r MOA SPSS hinzu.</li>
- <li>Geben Sie im MOA-Konfigurationsfile mit Hilfe des generischen Konfigurationsparameters <code>DataBaseArchiveParameter.JDBCUrl</code> eine g&uuml;ltige JDBC-URL zu Ihrer mySQL-Datenbank angeben. Hinweise zum Format dieser URL f&uuml;r mySQL finden Sie <a href="http://www.mysql.com/documentation/connector-j/index.html">hier</a>. </li>
- </ul>
- <p>Wenn Sie eine andere Datenbank verwenden m&ouml;chten, beispielsweise Oracle, gehen Sie sinngem&auml;&szlig; wie oben vor und setzen zus&auml;tzlich noch folgenden Schritt:</p>
- <ul>
- <li>Geben Sie im MOA-Konfigurationsfile mit Hilfe des generischen Konfigurationsparameters <code>DataBaseArchiveParameter.JDBCDriverClass</code> den vollst&auml;ndig qualifizierten Klassennamen des JDBC-Treibers an, der die Verbindung zu Ihrer Datenbank herstellt. </li>
- </ul>
- </li>
- <li class="faq">
- <div class="faq-question"><a name="konfiguration_2" id="konfiguration_2"></a>Ich m&ouml;chte ein Zertifikat (z.B. einer Zwischen-Zertifizierungsstelle) manuell in den internen Zertifikatsspeicher von MOA SP importieren. Wie funktioniert das?</div>
- <p>Sie k&ouml;nnen f&uuml;r diesen Zweck ein mit MOA SP/SS mitgeliefertes Kommandozeilen-Tool verwenden, das Sie im Verzeichnis <code>$MOA_SPSS_INST/tools</code> finden. Wechseln Sie zu diesem Verzeichnis und rufen Sie die Script-Datei <code>certtools.bat</code> bzw. <code>certtools.sh</code> (je nach Betriebssystem) auf. Achten Sie darauf, dass die Umgebungsvariable <code>$JAVA_HOME</code> korrekt gesetzt ist. Die Syntax f&uuml;r dieses Tool lautet:</p>
- <pre>certtool -add &lt;cert&gt; &lt;store&gt;</pre>
- <p><code>&lt;cert&gt;</code> bezeichnet dabei Pfad und Dateiname des zu importierenden X509-Zertifikats. Das Zertifikat muss DER-kodiert vorliegen.</p>
- <p><code>&lt;store&gt;</code> bezeichnet den Pfad des internen Zertifikatsspeichers von MOA SP. Wenn Sie nach der Installationsanleitung vorgegangen sind, lautet dieser Pfad <code>$CATALINA_HOME/conf/moa-spss/certstore</code>.</p>
- </li>
- <li class="faq">
- <div class="faq-question"><a name="konfiguration_3" id="konfiguration_3"></a>
- Meine bestehende Konfigurationsdatei
- funktioniert mit MOA SP/SS 1.3 oder h&ouml;her nicht mehr. Was ist passiert?</div>
- <p>Mit dem Wechsel auf Version 1.3 verwendet MOA SP/SS ein neues, &uuml;bersichtlicheres Format f&uuml;r die
- XML-Konfigurationsdatei. </p>
- <p>Wenn Sie von einer &auml;lteren Version von MOA SP/SS auf die Version 1.3 wechseln und Ihre bestehende
- Konfiguration beibehalten wollen, steht Ihnen ein einfaches Kommandozeilenwerkzeug zur Verf&uuml;gung, mit
- dem Sie Ihre Konfigurationsdatei vom bisherigen auf das neue Format migrieren k&ouml;nnen.</p>
- <p>Informationen zur Verwendung des Werkzeugs finden Sie in <a href="../config/config.html#&#252;bersicht_zentraledatei_aktualisierung">Abschnitt 1.2.1</a> des Konfigurationshandbuchs. </p>
- </li>
- </ol>
- <h2>Verwendung</h2>
- <ol>
- <li class="faq"><div class="faq-question"><a name="verwendung_1" id="verwendung_1"></a>Bei der Pr&uuml;fung einer Signatur liefert die Pr&uuml;fung des Zertifikatsstatus den Code 1. Was kann der Fehler sein? </div>
- <p>Dieser Fehlercode bedeutet: Es konnte keine formal korrekte Zertifikatskette vom Signatorzertifikat zu einem vertrauensw&uuml;rdigen Wurzelzertifikat konstruiert werden. Das kann grunds&auml;tzlich eine der beiden folgenden Ursachen haben:</p>
- <ul>
- <li>Keines der Zertifikate in der Kette vom Signatorzertifikat bis zu einem selbstsignierten Wurzelzertifikat ist im anzuwendenden <span class="term">TrustProfile</span> enthalten. </li>
- <li>Die Zertifikatskette konnte nicht bis zu einem im anzuwendenden <span class="term">TrustProfile</span> enthaltenen vertrauensw&uuml;rdigen Zertifikat gebildet werden. </li>
- </ul>
- <p>Pr&uuml;fen Sie also zun&auml;chst, ob sie im anzuwendenden <span class="term">TrustProfile</span> ein passendes vertrauensw&uuml;rdiges Zertifikat konfiguriert haben. Das kann beispielsweise das Zertifikat jener CA sein, die das Signatorzertifikat ausgestellt hat, oder aber auch das Zertifikat einer CA weiter oben in der Hierarchie des Zertifizierungsdiensteanbieters, beispielsweise das selbstsignierte Wurzelzertifikat.</p>
- <p>Wenn diese Pr&uuml;fung das Problem nicht behebt, gelingt des MOA SP vermutlich nicht, ein f&uuml;r die Bildung der Zertifikatskette notwendiges Zertifikat zu lokalisieren. M&ouml;gliche Gr&uuml;nde sowie L&ouml;sungsm&ouml;glichkeiten daf&uuml;r sind:</p>
- <ul>
- <li>Das aktuell letzte Zertifikat in der bereits gebildeten Zertifikatskette besitzt zwar die Zertifikatserweiterung <span class="term">AuthorityInformationAccess</span> mit einem Hinweis auf das n&auml;chste Zertifikat der zu bildenden Kette, das darin per URL referenzierte Zertifikat kann jedoch nicht geladen werden. Pr&uuml;fen Sie daher zun&auml;chst, ob MOA SP/SS per HTTP oder LDAP Zugriffe nach au&szlig;en t&auml;tigen darf. </li>
- <li>Das aktuell letzte Zertifikat in der bereits gebildeten Zertifikatskette besitzt keine Zertifikatserweiterung <span class="term">AuthorityInformationAccess</span> mit einem Hinweis auf das n&auml;chste Zertifikat der zu bildenden Kette, und auch im internen Zertifikatsspeicher von MOA SP ist das n&auml;chste Zertifikat nicht enthalten. Ist Ihnen das n&auml;chste Zertifikat bekannt (z.B. durch manuellen Download von der Webseite des Zertifizierungsdiensteanbieters), k&ouml;nnen Sie es manuell in den internen Zertifikatsspeicher importieren. Eine Anleitung dazu finden Sie <a href="#konfiguration_2">hier</a>. <br>
- </li>
- </ul>
- </li>
- </ol>
-</body>
-</html>
diff --git a/spss.handbook/handbook/index.html b/spss.handbook/handbook/index.html
deleted file mode 100644
index 4fa5728f6..000000000
--- a/spss.handbook/handbook/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
- <title>MOA SS und SP - &Uuml;bersicht</title>
- <link rel="stylesheet" href="./common/MOA.css" type="text/css">
-</head>
-<body bgcolor="white" text="#000000" link="#990000" vlink="#666666" alink="#cc9966">
- <table class="logoTable" width="100%" border="0" cellspacing="0" cellpadding="10">
- <tr>
- <td align="center" class="logoTitle" width="267"><img src="common/LogoBKA.png" alt="Logo BKA" width="267" height="37" align="left"></td>
- <td align="center" class="logoTitle">Open Source<br>
- f&uuml;r das E-Government</td>
- <td align="center" class="logoTitle" width="123"><img src="common/LogoMoa4c.jpg" alt="Logo MOA" width="123" height="138" align="right"></td>
- </tr>
- </table>
- <hr/>
- <p class="title">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP) </p>
- <p class="subtitle">&Uuml;bersicht zur Dokumentation der Version 1.2 </p>
- <hr/>
- <dl>
- <dt><a href="./intro/intro.html">Einf&uuml;hrung</a></dt>
- <dd>&Uuml;bersicht &uuml;ber die beiden Module.</dd>
- <dt><a href="./install/install.html">Installation</a></dt>
- <dd>Detaillierte Anleitung f&uuml;r die Installation. </dd>
- <dt><a href="./config/config.html">Konfiguration</a></dt>
- <dd>Erl&auml;uterung aller Konfigurationsoptionen sowie Leitfaden f&uuml;r h&auml;ufige Konfigurationsaufgaben.</dd>
- <dt><a href="./usage/usage.html">Anwendung</a></dt>
- <dd>Beispiele zur Verwendung der beiden Module.</dd>
- <dt><a href="./faq/faq.html">FAQ</a></dt>
- <dd>H&auml;ufig gestellte Fragen zu Installation, Konfiguration und Anwendung. </dd>
- </dl>
-</body>
-</html>
diff --git a/spss.handbook/handbook/install/install.html b/spss.handbook/handbook/install/install.html
deleted file mode 100644
index eb287ee8a..000000000
--- a/spss.handbook/handbook/install/install.html
+++ /dev/null
@@ -1,486 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
- <title>MOA SS und SP - Installation</title>
- <link rel="stylesheet" href="../common/MOA.css" type="text/css">
-</head>
-<body bgcolor="white" text="#000000" link="#990000" vlink="#666666" alink="#cc9966">
- <table class="logoTable" width="100%" border="0" cellspacing="0" cellpadding="10">
- <tr>
- <td align="center" class="logoTitle" width="267"><img src="../common/LogoBKA.png" alt="Logo BKA" width="267" height="37" align="left"></td>
- <td align="center" class="logoTitle">Open Source<br>
- f&uuml;r das E-Government</td>
- <td align="center" class="logoTitle" width="123"><img src="../common/LogoMoa4c.jpg" alt="Logo MOA" width="123" height="138" align="right"></td>
- </tr>
- </table>
- <hr/>
- <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.3</a></p>
- <p class="subtitle">Installation</p>
- <hr/>
- <h1>Inhalt</h1>
- <ol>
- <li>
- <p><a href="#&#220;bersicht">&Uuml;bersicht</a></p>
- </li>
- <li>
- <p><a href="#webservice">Webservice</a></p>
- <ol>
- <li><a href="#webservice_basisinstallation">Basisinstallation</a>
- <ol>
- <li><a href="#webservice_basisinstallation_einf&#252;hrung">Einf&uuml;hrung</a></li>
- <li><a href="#webservice_basisinstallation_installation">Installation</a>
- <ol>
- <li><a href="#webservice_basisinstallation_installation_vorbereitung">Vorbereitung</a></li>
- <li><a href="#webservice_basisinstallation_installation_tomcatconfig">Konfiguration von Apache Tomcat</a>
- <ol>
- <li><a href="#webservice_basisinstallation_installation_tomcatconfig_httpconn">Konfiguration des HTTP Connectors</a></li>
- <li><a href="#webservice_basisinstallation_installation_tomcatconfig_httpsconn">Konfiguration des HTTPS Connectors</a></li>
- <li><a href="#webservice_basisinstallation_installation_tomcatconfig_moaadmin">Einrichten des MOA SP/SS Administrators</a></li>
- </ol>
- </li>
- <li><a href="#webservice_basisinstallation_installation_spssdeploy">Einsatz des MOA SP/SS Webservices in Tomcat</a></li>
- <li><a href="#webservice_basisinstallation_installation_tomcatconfig_httpsconn">Starten und Stoppen von Tomcat</a>
- <ol>
- <li><a href="#webservice_basisinstallation_installation_tomcatstartstop_windows">Unter Windows</a></li>
- <li><a href="#webservice_basisinstallation_installation_tomcatstartstop_unix">Unter Unix</a></li>
- <li><a href="#webservice_basisinstallation_installation_tomcatstartstop_verify">Pr&uuml;fen des erfolgreichen Starts</a> </li>
- </ol>
- </li>
- <li><a href="#webservice_basisinstallation_installation_changeonthefly">&Auml;nderung der Konfiguration im laufenden Betrieb</a></li>
- </ol>
- </li>
- <li><a href="#webservice_basisinstallation_logging">Logging</a>
- <ol>
- <li><a href="#webservice_basisinstallation_logging_format">Format der Log-Meldungen</a></li>
- <li><a href="#webservice_basisinstallation_logging_messages">Wichtige Log-Meldungen</a></li>
- </ol>
- </li>
- </ol>
- </li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten">Erweiterungsm&ouml;glichkeiten</a> <ol>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_webserver">Vorgeschalteter Webserver</a> <ol>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_webserver_iis">Microsoft Internet Information Server (MS IIS)</a> <ol>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_webserver_iis_jk">Konfiguration von <span class="term">Jakarta mod_jk</span> im MS IIS</a></li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_webserver_iis_tomcat">Konfiguration von Tomcat</a></li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_webserver_iis_ssl">Konfiguration von SSL</a></li>
- </ol>
- </li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_webserver_apache">Apache</a> <ol>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_webserver_apache_jk">Konfiguration von <span class="term">Jakarta mod_jk</span> im Apache </a></li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_webserver_apache_tomcat">Konfiguration von Tomcat</a></li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_webserver_apache_ssl">Konfiguration von SSL mit <span class="term">mod_SSL</span></a></li>
- </ol>
- </li>
- </ol>
- </li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_datenbank">Datenbank</a> <ol>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_datenbank_postgresql">PostgreSQL</a> <ol>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_datenbank_postgresql_benutzer">Anlegen eines Benutzers und einer Datenbank f&uuml;r MOA SP/SS</a></li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_datenbank_postgresql_crls">Archivierung von CRLs</a> </li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_datenbank_postgresql_logging">Logging</a></li>
- </ol>
- </li>
- <li><a href="#webservice_erweiterungsm&#246;glichkeiten_datenbank_andere">Andere Datenbanken</a> </li>
- </ol>
- </li>
- </ol>
- </li>
- </ol>
- <li><a href="#klassenbibliothek">Klassenbibliothek</a>
- <ol>
- <li><a href="#klassenbibliothek_basisinstallation">Basisinstallation</a>
- <ol>
- <li><a href="#klassenbibliothek_basisinstallation_einfuehrung">Einf&uuml;hrung</a></li>
- <li><a href="#klassenbibliothek_basisinstallation_vorbereitung">Vorbereitung</a></li>
- <li><a href="#klassenbibliothek_basisinstallation_verwendung">Verwendung</a></li>
- <li><a href="#klassenbibliothek_basisinstallation_logging">Logging</a></li>
- </ol>
- </li>
- <li><a href="#klassenbibliothek_erweiterungsm&#246;glichkeiten">Erweiterungsm&ouml;glichkeiten</a></li>
- </ol>
- </li>
- </ol>
- <ol type="A">
- <li><a href="#referenzierte_software">Referenzierte Software</a></li>
- </ol>
- <hr/>
- <h1><a name="übersicht" id="übersicht"></a>1 &Uuml;bersicht</h1>
- <p> Die Module Signaturpr&uuml;fung (SP) und Serversignatur (SS) sind als plattformunabh&auml;ngige Module ausgelegt, die entweder als Webservice &uuml;ber HTTP bzw. HTTPS oder als Klassenbibliothek &uuml;ber ein API angesprochen werden k&ouml;nnen. Dieses Handbuch beschreibt die Installation der beiden Module als Webservice oder als Klassenbibliothek, sowie die Einrichtung der Systemumgebung.</p>
- <h1><a name="webservice"></a>2 Webservice </h1>
- <p>Dieser Abschnitt beschreibt die Installation von MOA SP/SS als Webservice. Im ersten Unterkapitel wird eine minimale Basisinstallation beschrieben. Das zweite Unterkapitel zeigt eine Reihe von optionalen Erweiterungsm&ouml;glichkeiten auf.</p>
- <h2><a name="webservice_basisinstallation" id="webservice_basisinstallation"></a>2.1 Basisinstallation</h2>
- <h3><a name="webservice_basisinstallation_einführung" id="webservice_basisinstallation_einführung"></a>2.1.1 Einf&uuml;hrung </h3>
- <p> Die Basisinstallation des Webservices stellt einerseits die minimalen Anforderungen f&uuml;r den Betrieb von MOA SP/SS als Webservices dar, andererseits dient sie als Ausgangspunkt f&uuml;r optionale <a href="#webservice_erweiterungsm&#246;glichkeiten">Erweiterungsm&ouml;glichkeiten</a>.</p>
- <p> Folgende Software ist Voraussetzung f&uuml;r die Basisinstallation des Webservices: </p>
- <ul>
- <li><a href="#referenziertesoftware">J2SE 1.3.1 SDK oder J2SE 1.4.2 SDK oder J2SE 5.0 SDK </a></li>
- <li><a href="#referenziertesoftware">Apache Tomcat 4.1.18 oder h&ouml;her </a></li>
- </ul>
- <p>In diesem Betriebs-Szenario wird das MOA SP/SS Webservice in Tomcat zum Einsatz gebracht. Tomcat fungiert gleichzeitig als HTTP- und HTTPS-Endpunkt f&uuml;r das MOA SP/SS Webservice. Beide Protokolle werden direkt in Tomcat konfiguriert. Das MOA SP/SS Webservice verwendet Log4j als Logging Toolkit.</p>
- <h3><a name="webservice_basisinstallation_installation" id="webservice_basisinstallation_installation"></a>2.1.2 Installation</h3>
- <h4><a name="webservice_basisinstallation_installation_vorbereitung" id="webservice_basisinstallation_installation_vorbereitung"></a>2.1.2.1 Vorbereitung</h4>
- <p>Die folgenden Schritte dienen der Vorbereitung der Installation.</p>
- <dl>
- <dt>Installation von J2SE SDK</dt>
- <dd>Installieren Sie <a href="#referenziertesoftware">J2SE 1.3.1 SDK</a> oder <a href="#referenziertesoftware">J2SE 1.4.2 SDK</a> oder <a href="#referenziertesoftware">J2SE 5.0 SDK</a> in ein beliebiges Verzeichnis. Wir empfehlen die Installation von <a href="#referenziertesoftware">J2SE 5.0 SDK</a>. Das Wurzelverzeichnis der J2SE SDK Installation wird im weiteren Verlauf als <code>$JAVA_HOME</code> bezeichnet. </dd>
- <dt>Installation von Apache Tomcat 4.1</dt>
- <dd> Installieren Sie <a href="#referenziertesoftware">Apache Tomcat 4.1.18</a> oder h&ouml;her in ein Verzeichnis, das keine Leerzeichen im Pfadnamen enth&auml;lt. Wir empfehlen die Installation von <a href="#referenziertesoftware">Apache Tomcat 4.1.31</a>. Verwenden Sie bitte die zu Ihrem J2SE SDK passende Distribution von Tomcat. Das Wurzelverzeichnis der Tomcat-Installation wird im weiteren Verlauf als <code>$CATALINA_HOME</code> bezeichnet.</dd>
- <dt>Entpacken der MOA SP/SS Webservice Distribution</dt>
- <dd> Entpacken Sie die Datei <code>moa-spss-1.2.x.zip</code> in ein beliebiges Verzeichnis. Dieses Verzeichnis wird im weiteren Verlauf als <code>$MOA_SPSS_INST</code> bezeichnet. </dd>
- <dt>Installation der Krypographiebibliotheken von SIC/IAIK</dt>
- <dd>
- <p>Die Installation der Kryptographiebibliotheken von <a href="http://jce.iaik.tugraz.at/" target="_blank">SIC/IAIK</a> ist abh&auml;ngig vom eingesetzten J2SE SDK:</p>
- <dl>
- <dt>J2SE 1.3.1 SDK</dt>
- <dd>Kopieren Sie alle Dateien aus dem Verzeichnis
-
-
- <code>$MOA_SPSS_INST/ext13</code> in das Verzeichnis <code>$JAVA_HOME/jre/lib/ext</code>.</dd>
- <dt>J2SE 1.4.2 SDK oder JSE 5.0 SDK </dt>
- <dd>Kopieren Sie alle Dateien aus dem Verzeichnis <code>$MOA_SPSS_INST/ext14</code> in das Verzeichnis <code>$JAVA_HOME/jre/lib/ext</code>. Zus&auml;tzlich m&uuml;ssen Sie die Rechtedateien Ihres J2SE 1.4.2 SDK bzw. J2SE 5.0 SDK austauschen. Laden Sie dazu die <span class="term">Unlimited Strength
-
-
- Jurisdiction Policy Files</span> von der <a href="http://java.sun.com/j2se/1.4.2/download.html" target="_blank">J2SE 1.4.2 SDK Downloadseite</a> bzw. <a href="http://java.sun.com/j2se/1.5.0/download.html">J2SE 5.0 SDK Downloadseite</a> und folgen Sie der darin enthaltenen Installationsanweisung. </dd>
- </dl>
- </dd>
- </dl>
- <h4><a name="webservice_basisinstallation_installation_tomcatconfig" id="webservice_basisinstallation_installation_tomcatconfig"></a>2.1.2.2 Konfiguration von Apache Tomcat</h4>
- <p> Die zentrale Konfigurations-Datei von Tomcat ist <code>$CATALINA_HOME/conf/server.xml</code>. 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. </p>
- <h5><a name="webservice_basisinstallation_installation_tomcatconfig_httpconn" id="webservice_basisinstallation_installation_tomcatconfig_httpconn"></a>2.1.2.2.1 Konfiguration des HTTP Connectors</h5>
- <p> Die Datei <code>$MOA_SPSS_INST/tomcat/server.xml</code> enth&auml;lt eine minimale Tomcat-Konfiguration, die ausschlie&szlig;lich den Connector f&uuml;r HTTP auf Port 8080 freischaltet. Durch kopieren dieser Datei nach <code>$CATALINA_HOME/conf/server.xml</code> kann Tomcat mit dieser Konfiguration gestartet werden. Wir empfehlen diese Konfiguration nur f&uuml;r F&auml;lle, in denen das MOA SP/SS Webservice in einer abgeschlossenen Netzwerkumgebung betrieben wird. </p>
- <h5><a name="webservice_basisinstallation_installation_tomcatconfig_httpsconn" id="webservice_basisinstallation_installation_tomcatconfig_httpsconn"></a>2.1.2.2.2 Konfiguration des HTTPS Connectors</h5>
- <p>Wird das MOA SP/SS Webservice in einer nicht abgeschlossenen Umgebung (z.B. Erreichbarkeit &uuml;ber das Internet) betrieben, ist die gegenseitige Identit&auml;tsfeststellung von Kunde und Webservice essentiell: </p>
- <ul>
- <li> Nutzt ein Kunde MOA SP, ist es f&uuml;r ihn wichtig, die Identit&auml;t des Webservice eindeutig feststellen zu k&ouml;nnen, denn er vertraut dem Webservice ja die Pr&uuml;fung einer elektronischen Signatur an.</li>
- <li>Nutzt ein Kunde MOA SS, ist es f&uuml;r ihn wesentlich, dass nur er Zugriff auf die f&uuml;r ihn vom Webservice verwalteten privaten Schl&uuml;ssel hat, um elektronische Signaturen zu erstellen. Das Webservice muss also die Identit&auml;t des Kunden pr&uuml;fen. </li>
- </ul>
- <p>Beide Identit&auml;tspr&uuml;fungen k&ouml;nnen mit hoher Qualit&auml;t vorgenommen werden, wenn die Erreichbarkeit des Webservice auf SSL mit Server- (f&uuml;r MOA SP) bzw. Client- und Serverauthentisierung (f&uuml;r MOA SS) eingeschr&auml;nkt wird. </p>
- <p>F&uuml;r die dazu notwendige Konfiguration kann die im vorigen Abschnitt besprochene minimale Tomcat-Konfiguration als Ausgangspunkt verwendet werden: Zun&auml;chst ist der HTTP Connector abzuschalten (auszukommentieren). Anschlie&szlig;end ist der HTTPS Connector zu konfigurieren. Das Dokument <a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/ssl-howto.html">Tomcat SSL Configuration HOW-TO </a> gibt einen guten &Uuml;berblick dazu. Grob zusammengefasst sind folgende Schritte durchzuf&uuml;hren: </p>
- <ul>
- <li>Erstellung eines <span class="term">Server-Keystores</span>, der den privaten Schl&uuml;ssel sowie das zugeh&ouml;rige Zertifikat des Webservices enth&auml;lt, mit dem es sich bei Aufbau einer SSL-Verbindung gegen&uuml;ber dem Kunden ausweist.sowie das dazugeh&ouml;rige ZertiServer-Zertifikat enth&auml;lt. Sie k&ouml;nnen diesen Keystore z.B. mit <code>keytool</code> erstellen, einem Programm, das Ihrem J2SE SDK beiliegt.</li>
- <li>Erstellung eines <span class="term">Client-Keystores</span>, der die Zertifikate aller Kunden des Webservices enth&auml;lt. Nur Kunden des Webservices, die sich beim Aufbau einer SSL-Verbindung gegen&uuml;ber dem Webservice mit einem im <span class="term">Client-Keystore</span> enthaltenen Zertifikat ausweisen, erhalten grunds&auml;tzlich Zugriff zu den Diensten des Webservices (f&uuml;r die Konfiguration, welcher Kunde welche Schl&uuml;ssel von MOA SS verwenden darf, siehe <a href="../config/config.html#konfigurationsparameter_ss_keygroupmapping">Abschnitt 2.2.3 des Konfigurationshandbuchs</a>). Auch dieser Keystore kann z.B. mit <code>keytool</code> erstellt werden. Dieser Keystore ist optional und braucht nur erstellt zu werden, wenn sich die Kunden gegen&uuml;ber dem Webservice authentisieren m&uuml;ssen. </li>
- <li>Konfiguration des HTTPS Connectors in <code>$CATALINA_HOME/conf/server.xml</code>.</li>
- </ul>
- <p>Die Konfiguration des HTTPS Connectors kann entfallen, wenn Tomcat ein Webserver vorgeschaltet ist, und dieser die SSL-Kommunikation mit dem Kunden &uuml;bernimmt (siehe <a href="#webservice_erweiterungsm&#246;glichkeiten_webserver">Abschnitt 2.2.1</a>).</p>
- <h5><a name="webservice_basisinstallation_installation_tomcatconfig_moaadmin" id="webservice_basisinstallation_installation_tomcatconfig_moaadmin"></a>2.1.2.2.3 Einrichten des MOA SP/SS Administrators </h5>
- <p>Das MOA SP/SS Webservice kann <span class="term">remote</span> durch den Aufruf einer speziellen URL des Webservices dazu veranlasst werden, seine Konfiguration neu einzulesen (vergleiche Abschnitt <a href="#webservice_basisinstallation_installation_changeonthefly">2.1.2.5</a>). Der Zugriff auf diese URL ist durch eine Passwort-Abfrage gesch&uuml;tzt, und kann nur von Tomcat-Benutzern aufgerufen werden, denen die Tomcat-Benutzer-Rolle <code>moa-admin</code> zugeordnet wurde.</p>
- <p> Um diese Benutzer-Rolle und einen oder mehrere Benutzer einzurichten, m&uuml;ssen in der Datei <code>$CATALINA_HOME/conf/tomcat-users.xml </code>unter dem Element <code>&lt;tomcat-users&gt;</code> sinngem&auml;&szlig; folgende Eintr&auml;ge hinzugef&uuml;gt werden: </p>
- <p>
- <pre>&lt;role rolename="moa-admin"/&gt;
-&lt;user username="moa-chief" password="openSesam" roles="moa-admin"/&gt; </pre>
-<p>Soll der Aufruf dieser URL niemandem erm&ouml;glicht werden, sind die oben beschriebenen Eintr&auml;ge einfach nicht vorzunehmen.</p>
-
-<h4><a name="webservice_basisinstallation_installation_spssdeploy" id="webservice_basisinstallation_installation_spssdeploy"></a>2.1.2.3 Einsatz des MOA SP/SS Webservices in Tomcat</h4>
-<p> Um das MOA SP/SS Webservice in Tomcat f&uuml;r den Einsatz vorzubereiten, sind folgende Schritte notwendig:</p>
-<ul>
- <li>Die Datei <code>$MOA_SPSS_INST/moa-spss.war</code> enth&auml;lt das einsatzfertige MOA SP/SS Webarchiv und muss ins Verzeichnis <code>$CATALINA_HOME/webapps</code> kopiert werden. Dort wird sie beim ersten Start von Tomcat automatisch ins Verzeichnis <code>$CATALINA_HOME/webapps/ moa-spss</code> entpackt. </li>
- <li>Die zentrale Konfigurationsdatei f&uuml;r MOA SP/SS und die zugeh&ouml;rigen Profil-Verzeichnisse m&uuml;ssen in ein beliebiges Verzeichnis im Dateisystem kopiert werden (z.B. <code>$CATALINA_HOME/conf/moa-spss</code>). Eine funktionsf&auml;hige Konfiguration, die als Ausgangspunkt f&uuml;r die Konfiguration des MOA SP/SS Webservices dienen kann, finden Sie <a href="../../conf/moa-spss/spss.config.xml">hier</a>. </li>
- <li>Wird Tomcat unter J2SE 1.4.x SDK oder höher betrieben, müssen die Dateien <code>xalan.jar</code>, <code>xercesImpl.jar</code> und <code>xmlParserAPIs.jar</code> aus dem Verzeichnis <code>$MOA_SPSS_INST/endorsed14</code> in das Tomcat-Verzeichnis <code>$CATALINA_HOME/common/endorsed</code> kopiert werden. Sind gleichnamige Dateien dort bereits vorhanden, m&uuml;ssen sie &uuml;berschrieben werden. Die ggf. in diesem Verzeichnis vorhandene Datei <code>xml-apis.jar</code> muss gel&ouml;scht werden.</li>
- <li>Folgende <span class="term">System Properties</span> k&ouml;nnen gesetzt werden (wird beim Starten von Tomcat der <span class="term">Java Virtual Machine</span> in der Umgebungsvariablen <code>CATALINA_OPTS</code> in der Form <code>-D&lt;name&gt;=&lt;wert&gt;</code> &uuml;bergeben):
- <ul>
- <li id="klein"><code>moa.spss.server.configuration</code>: Pfad und Name der zentralen Konfigurationsdatei f&uuml;r MOA SP/SS. Eine beispielhafte Konfigurationsdatei finden Sie <a href="../../conf/moa-spss/spss.config.xml">hier</a>. Wird ein relativer Pfad angegeben, wird dieser relativ zum Startverzeichnis der <span class="term">Java Virtual Machine</span> interpretiert. Ist diese <span class="term">System Property</span> nicht gesetzt, wird automatisch eine im Webarchiv unter <code>WEB-INF/conf</code> enthaltene Default-Konfiguration herangezogen.</li>
- <li id="klein"><code>log4j.configuration</code>: URL der Log4j Konfigurationsdatei. Eine beispielhafte Log4j-Konfiguration finden Sie <a href="../../conf/moa-spss/log4j.properties">hier</a>. Wird eine relative URL angegeben, wird diese als File-URL relativ zum Startverzeichnis der <span class="term">Java Virtual Machine</span> interpretiert. Ist diese <span class="term">System Property</span> nicht gesetzt, wird automatisch eine im Webarchiv unter <code>WEB-INF/classes</code> enthaltene Default-Konfiguration herangezogen.</li>
- <li id="klein"><code>moa.node.id</code>: Frei w&auml;hlbarer Name des Rechner-Knotens, auf dem MOA SP/SS l&auml;uft. Der Name des Knotens wird bei Log-Ausgaben von MOA SP/SS angef&uuml;hrt und dient zur Unterscheidung mehrerer gleichzeitig betriebener MOA SP/SS Webservice-Instanzen. </li>
- <li id="klein"><code>javax.net.ssl.trustStore</code>: Pfad und Dateiname des <span class="term">Truststores</span> f&uuml;r vertrauensw&uuml;rdige SSL Client-Zertifikate (optional; nur, wenn SSL Client-Authentisierung durchgef&uuml;hrt werden soll). Ein relativer Pfad werden relativ zum Startverzeichnis der <span class="term">Java Virtual Machine</span> interpretiert.</li>
- <li id="klein"><code>javax.net.ssl.trustStorePassword</code>: Passwort f&uuml;r den <span class="term">Truststore</span> (optional; nur, wenn SSL Client-Authentisierung durchgef&uuml;hrt werden soll). </li>
- <li id="klein"><code>javax.net.ssl.trustStoreType</code>: Truststore-Typ (optional; nur, wenn SSL Client-Authentisierung durchgef&uuml;hrt werden soll). Je nach verwendetem Keystore-Typ muss <code>jks</code> (<span class="term">Java Key Store</span>) oder <code>pkcs12</code> (PKCS#12-Datei) angegeben werden.</li>
- </ul>
- </li>
-</ul>
-<h4><a name="webservice_basisinstallation_installation_tomcatstartstop" id="webservice_basisinstallation_installation_tomcatstartstop"></a>2.1.2.4 Starten und Stoppen von Tomcat</h4>
-<h5><a name="webservice_basisinstallation_installation_tomcatstartstop_windows" id="webservice_basisinstallation_installation_tomcatstartstop_windows"></a>2.1.2.4.1 Unter Windows</h5>
-<div id="block">
- <p>Das Verzeichnis <code>$MOA_SPSS_INST/tomcat/win32</code> enth&auml;lt Script-Dateien zum Starten und Stoppen von Tomcat. Vor der erstmaligen Verwendung der Scripts m&uuml;ssen in den ersten Zeilen die Umgebungsvariablen <code>JAVA_HOME</code> (Basisverzeichnis des eingesetzten J2SE SDK) und <code>CATALINA_HOME</code> (Basisverzeichnis der eingesetzten Tomcat-Installation) angepasst werden. Evtl. m&uuml;ssen Sie auch noch die in den Script-Dateien gesetzten, in Abschnitt 2.1.2.3 besprochenen <span class="term">System Properties</span> anpassen. </p>
-</div>
-<h5><a name="webservice_basisinstallation_installation_tomcatstartstop_unix" id="webservice_basisinstallation_installation_tomcatstartstop_unix"></a>2.1.2.4.2 Unter Unix</h5>
-<p>Zun&auml;chst m&uuml;ssen die in Abschnitt 2.1.2.3 besprochenen <span class="term">System Properties</span> mit Hilfe der Umgebungsvariablen <code>CATALINA_OPTS</code> gesetzt sein. Die Datei <code>$MOA_SPSS_INST/tomcat/unix/moa-env.sh</code> enth&auml;lt ein Beispiel daf&uuml;r. Weiters m&uuml;ssen noch die Umgebungsvariablen <code>JAVA_HOME</code> (Basisverzeichnis des eingesetzten J2SE SDK) und <code>CATALINA_HOME</code> (Basisverzeichnis der eingesetzten Tomcat-Installation) angepasst werden.</p>
-<p>Nun kann Tomcat aus seinem Basisverzeichnis mit </p>
-<pre>bin/catalina.sh start</pre>
-gestartet werden. Das Stoppen von Tomcat erfolgt analog mit
-<pre>bin/catalina.sh stop</pre>
-<h5><a name="webservice_basisinstallation_installation_tomcatstartstop_verify" id="webservice_basisinstallation_installation_tomcatstartstop_verify"></a>2.1.2.4.3 Pr&uuml;fen des erfolgreichen Starts </h5>
-<div id="block">
- <p>Ein erfolgreicher Start des MOA SP/SS Webservices ist an folgender Log-Meldung ersichtlich: <br>
- </p>
-</div>
-<pre>INFO | 18 10:09:45,155 | main | TID=startup NID=&lt;null&gt; MSG=MOA Konfiguration erfolgreich geladen
-</pre>
-<p>Bei leichten Fehlern in der Konfiguration geben <code>WARN</code> Log-Meldungen unmittelbar davor Aufschluss &uuml;ber fehlerhafte Konfigurations-Eintr&auml;ge.
- Nach dem Starten von Tomcat steht das MOA SP/SS Webservice f&uuml;r die Server-Signatur und Signatur-Pr&uuml;fung unter den Endpunkten </p>
-<pre>http://&lt;host&gt;:&lt;port&gt;/moa-spss/services/SignatureCreation
-</pre>
-<p>bzw.
-</p>
-<pre>http://&lt;host&gt;:&lt;port&gt;/moa-spss/services/SignatureVerification
-</pre>
-<p>zur Verf&uuml;gung. Die Verf&uuml;gbarkeit des Services k&ouml;nnen Sie einfach &uuml;berpr&uuml;fen, indem Sie die Endpunkte mit einem Web-Browser aufgerufen; dies sollte nach erfolgreichem Start zur Anzeige einer Informationsseite f&uuml;hren. </p>
-<p>Konnte das MOA SP/SS Webservice nicht ordnungsgem&auml;&szlig; gestartet werden, f&uuml;hrt das zu folgender Log-Meldung:</p>
-<pre>FATAL | 18 10:17:03,475 | main | TID=startup NID=&lt;null&gt; <br> MSG=Fehler beim Lesen der MOA Konfiguration: das Service steht nicht zur Verf&uuml;gung
-</pre>
-In diesem Fall geben die <code>WARN</code> bzw. <code>ERROR</code> Log-Meldungen unmittelbar davor Aufschluss &uuml;ber den genaueren Grund.
-<h4><a name="webservice_basisinstallation_installation_changeonthefly" id="webservice_basisinstallation_installation_changeonthefly"></a>2.1.2.5 &Auml;nderung der Konfiguration im laufenden Betrieb </h4>
-<p> Sie k&ouml;nnen die Konfiguration f&uuml;r MOA SP/SS im laufenden Betrieb aktualisieren, in dem Sie mittels eines Web-Browsers folgende URL aufrufen:</p>
-<pre> http://&lt;host&gt;:&lt;port&gt;/moa-spss/ConfigurationUpdate </pre>
-<p>Damit dies funktioniert, muss in der Konfiguration von Tomcat ein spezieller Benutzer sowie eine spezielle Benutzerrolle eingerichtet werden (vergleiche Abschnitt <a href="#webservice_basisinstallation_installation_tomcatconfig_moaadmin">2.1.2.2.3</a>). </p>
-<h3><a name="webservice_basisinstallation_logging" id="webservice_basisinstallation_logging"></a>2.1.3 Logging </h3>
-<p>Das MOA SP/SS Webservice verwendet <a href="#referenziertesoftware">Jakarta Log4j</a> 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="#referenziertesoftware">Jakarta Log4j</a> Handbuch beschrieben sind. Unter anderem gibt es die M&ouml;glichkeit, folgende Einstellungen vorzunehmen:
-<ul>
- <li id="klein">
- <p>Das verwendete Log-Level (<code>DEBUG</code>, <code>INFO</code>, <code>WARN</code>, <code>ERROR</code>, <code>FATAL</code>);</p>
- </li>
- <li id="klein">
- <p>Name und maximale Gr&ouml;&szlig;e der Log-Datei(en);</p>
- </li>
- <li id="klein">
- <p>Das Aussehen der Log-Eintr&auml;ge.</p>
- </li>
-</ul>
- <p>Das MOA SP/SS Webservice verwendet folgende Log-Hierarchien: </p>
-<ul>
- <li>
- <p><code>moa.spss.server</code> f&uuml;r alle Log-Meldungen aus dem MOA/SPSS Webservice; </p>
- </li>
- <li>
- <p><code>iaik.server</code> f&uuml;r alle Log-Meldungen aus den SIC/IAIK Kryptographie-Modulen. </p>
- </li>
-</ul>
- <p>Eine f&uuml;r MOA SP/SS passende Konfigurationsdatei f&uuml;r Log4j finden Sie <a href="../../conf/moa-spss/log4j.properties">hier</a>. Wird diese Datei als Logging-Konfiguration verwendet, so werden alle Log-Meldungen sowohl in die Konsole, als auch in die Datei <code>moa-spss.log</code> geschrieben. </p>
- <h4><a name="webservice_basisinstallation_logging_format" id="webservice_basisinstallation_logging_format"></a>2.1.3.1 Format der Log-Meldungen</h4>
- <p> Anhand einer konkreten Log-Meldung wird das Format der MOA SP/SS Log-Meldungen erl&auml;utert: </p>
- <pre>INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=node1
- MSG=Starte neue Transaktion: TID=1049225059594-100, Service=SignatureVerification
-</pre>
-<p> Der Wert <code>INFO</code> besagt, dass die Log-Meldung im Log-Level <code>INFO</code> entstanden ist. Folgende Log-Levels existieren:</p>
- <ul>
- <li>
- <p><code>DEBUG</code>: Log-Meldungen im Log-Level <code>DEBUG</code> geben Auskunft &uuml;ber die innere Arbeitsweise des Systems. Sie sind haupts&auml;chlich f&uuml;r Entwickler interessant.</p>
- </li>
- <li>
- <p><code>INFO</code>: Diese Log-Meldungen geben Status-Informationen &uuml;ber den Ablauf des Webservices, wie z.B. &uuml;ber das Einlangen einer neuen Anfrage.</p>
- </li>
- <li>
- <p><code>WARN</code>: Bei der Ausf&uuml;hrung einer Anfrage sind leichte Fehler aufgetreten. Der Ablauf des Webservices ist nicht weiter beeintr&auml;chtigt.</p>
- </li>
- <li>
- <p><code>ERROR</code>: Die Ausf&uuml;hrung einer Anfrage musste abgebrochen werden. Das Webservice ist davon nicht beeintr&auml;chtigt. </p>
- </li>
- <li>
- <p><code>FATAL</code>: Es ist ein Fehler aufgetreten, der den weiteren Betrieb des Webservices nicht mehr erlaubt.</p>
- </li>
- </ul>
- <p>Der n&auml;chste Wert <code>01 21:25:26,540</code> gibt den Zeitpunkt an, zu dem die Log-Meldung generiert wurde (in diesem Fall den 1. Tag im aktuellen Monat, sowie die genaue Uhrzeit). </p>
- <p> Der Wert <code>Thread-3</code> bezeichnet den Thread, von dem die Anfrage bearbeitet wird.</p>
- <p> Der Wert von <code>TID</code> gibt die f&uuml;r jede Anfrage eindeutige Transaktions-ID an. Log-Meldungen, die bei der Abarbeitung dieser Anfrage geschrieben werden, enthalten alle einen Hinweis auf die entsprechende Transaktions-ID.</p>
- <p> Der Wert von <code>NID</code> gibt den Rechner-Knoten an, auf dem das MOA SP/SS Webservice l&auml;uft (bei <code>NID=&lt;null&gt;</code> ist dieser Wert nicht konfiguriert, vergleiche Abschnitt <a href="#webservice_basisinstallation_installation_spssdeploy">2.1.2.3</a>).</p>
- <p> 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.</p>
- <h4> <a name="webservice_basisinstallation_logging_messages" id="webservice_basisinstallation_logging_messages"></a>2.1.3.2 Wichtige Log-Meldungen</h4>
- <p> Neben den im Abschnitt <a href="#webservice_basisinstallation_installation_tomcatstartstop_verify">2.1.2.4.3</a> beschriebenen Log-Meldungen, die anzeigen, ob das Service ordnungsgem&auml;&szlig; gestartet wurde, geben nachfolgenden Log-Meldungen Aufschluss &uuml;ber die Abarbeitung von Anfragen. </p>
- <p>Die Entgegennahme einer Anfrage wird angezeigt durch:
-
- </p>
- <pre>INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=&lt;null&gt;
- MSG=Starte neue Transaktion: TID=1049225059594-100, Service=SignatureVerification
-INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=&lt;null&gt;
- MSG=Aufruf von Adresse=127.0.0.1
-INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=&lt;null&gt;
- MSG=Client-Zertifikat nicht verf&uuml;gbar</pre>
- <p> Die dritte Log-Meldung besagt, dass f&uuml;r die Abarbeitung dieser Anfrage kein Client-Zertifikat verf&uuml;gbar ist (entweder, weil die Anfrage &uuml;ber HTTP eingelangt ist, oder weil die SSL Client-Authentisierung nicht eingeschaltet ist). Bei erfolgreicher SSL Client-Authentisierung, gibt beispielsweise folgende Log-Meldung Informationen &uuml;ber das Client-Zertifikat aus:
- <pre>INFO | 12 13:58:08,772 | Thread-10 | TID=1045054687159-2 NID=&lt;null&gt;
- MSG=Client-Zertifikat: Subject=CN=Testuser, OU=MOA, O=BRZ, L=Vienna, ST=Vienna, C=AT,
- Serial=1.039.104.204, Issuer=CN=TestCA, OU=MOA, O=BRZ, L=Vienna, ST=Vienna, C=AT</pre>
- <p>Eine erfolgreich abgearbeitete Anfrage wird angezeigt durch:
- </p>
- <pre>INFO | 01 21:25:53,168 | Thread-3 | TID=1049225059594-106 NID=&lt;null&gt;
- MSG=Anfrage erfolgreich abgearbeitet</pre>
- <p>Ein Fehler beim Abarbeiten der Anfrage wird angezeigt durch: </p>
- <pre>INFO | 01 21:25:27,642 | Thread-3 | TID=1049225059594-100 NID=&lt;null&gt;
- MSG=Fehler beim Abarbeiten der Anfrage</pre>
- <div id="block">
- <p>In diesem Fall gibt der mitgeloggte Stacktrace Auskunft &uuml;ber die Art des Fehlers. Der Aufrufer des MOA SP/SS Webservices bekommt einen Fehlercode sowie eine kurze Beschreibung des Fehlers als Antwort zur&uuml;ck. </p>
- <p> Die Tats&auml;chlich &uuml;bertragenen Anfragen bzw. Antworten werden aus Effizienzgr&uuml;nden nur im Log-Level <code>DEBUG</code> angezeigt. </p>
- </div>
- <h2><a name="webservice_erweiterungsmöglichkeiten" id="webservice_erweiterungsmöglichkeiten"></a>2.2 Erweiterungsm&ouml;glichkeiten</h2>
-<p>Ausgehend von der <a href="#webservice_basisinstallation">Basisinstallation</a> k&ouml;nnen die optionalen Erweiterungen, die in den nachfolgenden Abschnitten beschrieben werden, unabh&auml;ngig und in beliebiger Kombination aufgesetzt werden.</p>
- <h3><a name="webservice_erweiterungsmöglichkeiten_webserver" id="webservice_erweiterungsmöglichkeiten_webserver"></a>2.2.1 Vorgeschalteter Webserver</h3>
- <h4><a name="webservice_erweiterungsmöglichkeiten_webserver_iis" id="webservice_erweiterungsmöglichkeiten_webserver_iis"></a>2.2.1.1 Microsoft Internet Information Server (MS IIS) </h4>
- <p>Den MOA SP/SS Webservices 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 eingerichteten MOA SP/SS Webservice wird durch <span class="term">Jakarta mod_jk</span> durchgef&uuml;hrt. Die angef&uuml;hrten Konfigurationsschritte gehen von einer MS IIS Standard-Installation aus.</p>
- <h5><a name="webservice_erweiterungsmöglichkeiten_webserver_iis_jk" id="webservice_erweiterungsmöglichkeiten_webserver_iis_jk"></a>2.2.1.1.1 Konfiguration von <span class="term">Jakarta mod_jk</span> im MS IIS</h5>
- <p> F&uuml;r die Kommunikation des MS IIS mit dem im Tomcat eingerichteten MOA SP/SS Webservice wird das <span class="term">ISAPI</span>-Modul von <span class="term">Jakarta mod_jk</span> im MS IIS installiert und konfiguriert. Eine detaillierte Installations- und Konfigurationsanleitung gibt das <span class="term"><a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/howto/iis.html" target="_blank">mod_jk</a></span><a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/jk/iishowto.html"> IIS HowTo</a>. Beispiele f&uuml;r <code>workers.properties</code> und <code>uriworkermap.properties</code> Dateien liegen im Verzeichnis <code>$MOA_SPSS_INST/tomcat</code> bei.</p>
- <h5><a name="webservice_erweiterungsmöglichkeiten_webserver_iis_tomcat" id="webservice_erweiterungsmöglichkeiten_webserver_iis_tomcat"></a>2.2.1.1.2 Konfiguration von Tomcat</h5>
- <p> Damit Tomcat die Aufrufe entgegennehmen kann, die von MS IIS mittels <span class="term">Jakarta mod_jk</span> weiterleitet werden, muss in <code>$CATALINA_HOME/conf/server.xml</code> der <span class="term">AJP 1.3 Connector</span> aktiviert werden. Im Gegenzug k&ouml;nnen die Konnektoren f&uuml;r HTTP und HTTPS deaktiviert werden. Das geschieht am einfachsten durch Ein- bzw. Auskommentieren der entsprechenden <code>Connector</code> Konfigurations-Elemente in dieser Datei. Die Datei <code>$MOA_SPSS_INST/tomcat/server.mod_jk.xml</code> enth&auml;lt eine Konfiguration, die ausschlie&szlig;lich den Port f&uuml;r den <span class="term">AJP 1.3 Connector</span> offen l&auml;sst.</p>
- <h5><a name="webservice_erweiterungsmöglichkeiten_webserver_iis_ssl" id="webservice_erweiterungsmöglichkeiten_webserver_iis_ssl"></a>2.2.1.1.3 Konfiguration von SSL</h5>
- <p> Die Dokumentation zum Einrichten von SSL auf dem MS IIS steht nach Installation des IIS unter http://localhost/iisHelp/ oder aber auch auf den Websiten vo Mircrosoft zur Verf&uuml;gung. </p>
- <h4><a name="webservice_erweiterungsm&ouml;glichkeiten_webserver_apache" id="webservice_erweiterungsm&ouml;glichkeiten_webserver_apache"></a>2.2.1.2 Apache</h4>
- <p>Den MOA SP/SS Webservices kann ein Apache Webserver vorgeschaltet sein. Das Prinzip funktioniert wie bei MS IIS, auch hier wird <span class="term">Jakarta mod_jk</span> f&uuml;r die Kommunikation zwischen Webserver und Tomcat eingesetzt. Die angef&uuml;hrten Konfigurationsschritte gehen von einer Standard-Installation des Apache Webservers aus und sind ident f&uuml;r die Versionen 1.3.x und 2.0.x.</p>
- <h5><a name="webservice_erweiterungsmöglichkeiten_webserver_apache_jk" id="webservice_erweiterungsmöglichkeiten_webserver_apache_jk"></a>2.2.1.2.1 Konfiguration von <span class="term">Jakarta mod_jk</span> im Apache </h5>
- <p>Um das MOA-SPSS Webservice hinter einem Apache Webserver zu betreiben, ist die Konfiguration des Apache-Moduls <span class="term">mod_jk</span> erforderlich. Eine detaillierte Installations- und Konfigurationsanleitung gibt das <span class="term"><a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/howto/apache.html" target="_blank">mod_jk</a></span><a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/howto/apache.html" target="_blank"> Apache HowTo</a>. Ein Beispiel f&uuml;r eine <code>workers.properties</code> Datei liegt im Verzeichnis <code>$MOA_SPSS_INST/tomcat</code> bei.</p>
- <p>Um das MOA SP/SS Webservice dem Apache Webserver bekannt zu machen, sind zumindest folgende Eintr&auml;ge im globalen Kontext der Apache-Konfigurationsdatei notwendig:</p>
- <pre>LoadModule jk_module /usr/lib/apache/mod_jk.so<br>AddModule jk_module<br>JkOptions +ForwardKeySize +ForwardURICompat -ForwardDirectories<br>JkWorkersFile conf/workers.properties <br>JkMount /moa-spss/* moaworker </pre>
- <p>Die Pfad- und Dateinamen k&ouml;nnen je nach existierender Apache Installation geringf&uuml;gig variieren.</p>
- <h5><a name="webservice_erweiterungsmöglichkeiten_webserver_apache_tomcat" id="webservice_erweiterungsmöglichkeiten_webserver_apache_tomcat"></a>2.2.1.2.2 Konfiguration von Tomcat</h5>
- <p>Die Konfiguration von Tomcat ist analog zu Abschnitt <a href="#webservice_erweiterungsm&#246;glichkeiten_webserver_iis_tomcat">2.2.1.1.2</a> durchzuf&uuml;hren.</p>
- <h5><a name="webservice_erweiterungsmöglichkeiten_webserver_apache_ssl" id="webservice_erweiterungsmöglichkeiten_webserver_apache_ssl"></a>2.2.1.2.2 Konfiguration von SSL mit <span class="term">mod_SSL</span></h5>
- <p>Apache kann in Verbindung mit <span class="term">mod_SSL</span> als SSL-Endpunkt f&uuml;r das MOA SP/SS Webservice fungieren. In diesem Fall entf&auml;llt die SSL-Konfiguration in Tomcat, da Apache und Tomcat auch im Fall von SSL Daten via <span class="term">mod_jk</span> austauschen. Eine detaillierte Installations- und Konfigurationsanleitung enth&auml;lt die <a href="http://www.modssl.org/docs/" target="_blank">Online-Dokumentation</a> von <span class="term">mod_SSL</span>.</p>
- <p>Bei der Verwendung von Client-Authentisierung muss darauf geachtet werden, dass <span class="term">mod_ssl</span> die HTTP-Header mit den Informationen &uuml;ber das Client-Zertifikat exportiert. Dies wird durch Angabe der folgenden Option in der Apache-Konfiguration erreicht: </p>
- <pre>SSLOptions +ExportCertData +StdEnvVars</pre>
- <p>Je nach vorhandener SSL-Konfiguration des Apache Webservers kann diese Option im globalen Kontext, im Kontext des Virtual Hosts oder im Kontexts eines Verzeichnisses spezifiziert werden.</p>
- <h3><a name="webservice_erweiterungsmöglichkeiten_datenbank" id="webservice_erweiterungsmöglichkeiten_datenbank"></a>2.2.2 Datenbank</h3>
- <p>Die MOA SP/SS Module k&ouml;nnen eine Datenbank zum Archivieren von Certificate Revocation Lists (CRLs), sowie zum Abspeichern von Log-Meldungen verwenden. In beiden F&auml;llen wird eine installierte und konfigurierte Datenbank vorausgesetzt.</p>
- <h4><a name="webservice_erweiterungsmöglichkeiten_datenbank_postgresql" id="webservice_erweiterungsmöglichkeiten_datenbank_postgresql"></a>2.2.2.1 PostgreSQL</h4>
- <p>Eine detaillierte &Uuml;bersicht &uuml;ber die Installation und Konfiguration von <span class="term">PostgreSQL</span> gibt die <a href="http://techdocs.postgresql.org/" target="_blank">Online-Dokumentation</a>. </p>
- <p class="term">Bitte beachten Sie: Eine M&ouml;glichkeit, PostgreSQL unter MS Windows zu installieren, besteht darin, <a href="http://sources.redhat.com/cygwin/" target="_blank">Cygwin</a> mit dem PostgreSQL-Package zu installieren. Alternative Installationsvarianten werden auf <a href="http://techdocs.postgresql.org/guides/Windows" target="_blank">dieser Seite</a> angef&uuml;hrt.</p>
- <h5><a name="webservice_erweiterungsmöglichkeiten_datenbank_postgresql_benutzer" id="webservice_erweiterungsmöglichkeiten_datenbank_postgresql_benutzer"></a>2.2.2.1.1 Anlegen eines Benutzers und einer Datenbank f&uuml;r MOA SP/SS</h5>
- <p>Damit die MOA SP/SS Module eine Verbindung zu <span class="term">PostgreSQL</span> aufbauen kann, m&uuml;ssen der Name eines <span class="term">PostgreSQL</span>-Benutzers und einer <span class="term">PostgreSQL</span>-Datenbank bekannt sein. Sollten diese nicht vorhanden sein, kann mit folgenden Kommandos ein Benutzer namens <code>moa</code> und eine Datenbank namens <code>moadb</code> angelegt werden:</p>
- <pre>createuser -U postgres -d -A -P moa<br>createdb -U moa moadb</pre>
- <p>Da die MOA SP/SS Module &uuml;ber <span class="term">JDBC</span> mit der Datenbank kommunizieren, ist in der Folge die Angabe einer <span class="term">JDBC</span>-URL notwendig, welche die Verbindungsparameter enth&auml;lt. Wurden der Benutzer und die Datenbank wie im obigen Beispiel angelegt, ist folgende <span class="term">JDBC</span>-URL anzugeben (Annahme: als Passwort f&uuml;r den Benutzer moa wurde moapass gew&auml;hlt):</p>
- <pre> jdbc:postgresql://host/moadb?user=moa&amp;password=moapass</pre>
- <p>Die Zeichen <code>jdbc:postgresql://</code> sind unver&auml;nderliche Bestandteile einer <span class="term">PostgreSQL</span> <span class="term">JDBC</span>-URL. <code>host</code> gibt den Rechner an, auf dem <span class="term">PostgreSQL</span> l&auml;uft. <code>moadb</code> identifiziert den Namen der Datenbank. &Uuml;ber die Parameter <code>user=</code> und <code>pass=</code> werden Benutzername und Passwort f&uuml;r den DB-User bekanntgegeben.</p>
- <h5><a name="webservice_erweiterungsmöglichkeiten_datenbank_postgresql_crls" id="webservice_erweiterungsmöglichkeiten_datenbank_postgresql_crls"></a>2.2.2.1.2 Archivierung von CRLs</h5>
- <p>Zum Archivieren von CRLs m&uuml;ssen in der MOA SP/SS Konfigurationsdatei die Kinder des Elements <code>cfg:MOAConfiguration/cfg:SignatureVerification/cfg:CertificateValidation/cfg:RevocationChecking/cfg:Archiving</code> entsprechend
- konfiguriert werden: </p>
- <ul>
- <li><code>cfg:EnableArchiving</code> muss auf den Wert <code>true</code> gesetzt sein;</li>
- <li><code>cfg:ArchiveDuration</code> muss als nichtnegative Ganzzahl die maximale Archivierungsdauer in Tagen enthalten;</li>
- <li><code>cfg:Archive</code> muss genau ein Element <code>cfg:DatabaseArchive</code> enthalten, das wiederum aus zwei Elementen
- bestehen muss:
- <ul>
- <li><code>cfg:JDBCURL</code> muss eine g&uuml;ltige JDBC-URL enthalten, mit der auf die Datenbank zur Archivierung
- zugegriffen werden kann (<span class="remark">Hinweis: da es sich hierbei um einen Eintrag
- in eine XML-Datei handelt, muss das Zeichen <code>&amp;</code> in der in Abschnitt <a href="#webservice_erweiterungsm&#246;glichkeiten_datenbank_postgresql_benutzer">2.2.2.1.1</a> gezeigten
- JDBC-URL
- durch die Zeichenfolge <code>&amp;amp;</code> ersetzt werden.</span>);</li>
- <li><code>cfg:JDBCDriverClassName</code> muss den vollst&auml;ndig qualifizierten Java-Klassennamen des JDBC-Treibers
- enthalten. </li>
- </ul>
- </li>
- </ul>
- <p>Vergleiche auch Abschnitt <a href="../config/config.html#konfigurationsparameter_sp_certificatevalidation_revocationchecking_archiving">2.3.1.3.4</a> im
- Konfigurationshandbuch.</p>
- <h5><a name="webservice_erweiterungsmöglichkeiten_datenbank_postgresql_logging" id="webservice_erweiterungsmöglichkeiten_datenbank_postgresql_logging"></a>2.2.2.1.3 Logging</h5>
- <p>F&uuml;r das Logging in eine <span class="term">PostgreSQL</span> Datenbank mittels <span class="term">Jakarta Log4j</span> muss zun&auml;chst eine Tabelle f&uuml;r die Log-Meldungen angelegt werden. Dies kann mit folgendem SQL-Statement erreicht werden:</p>
- <pre> create table spss_log (log_time timestamp, log_level varchar(5), log_msg text);</pre>
- <p>Damit <span class="term">Log4j</span> die Log-Meldungen in diese Datenbanktabelle schreibt, muss die <span class="term">Log4j</span>-Konfiguration adaptiert werden. Die mit MOA SP/SS mitgelieferte, beispielhafte <a href="../../conf/moa-spss/log4j.properties">Log4j-Konfiguration</a> enth&auml;lt bereits die notwendigen Eintr&auml;ge f&uuml;r das Logging in eine PostgreSQL Datenbank, die jedoch standardm&auml;&szlig;ig ausgeschaltet sind. </p>
- <p>Wie beim Caching von CRLs ist auch hier die Angabe einer <span class="term">JDBC</span>-URL notwendig, damit die MOA SP/SS Module eine Verbindung zur Datenbank aufnehmen k&ouml;nnen.</p>
- <p><span class="remark">Bitte beachten Sie: Bei Tests hat sich das Logging in eine Datenbank mit Jakarta Log4j als Performance-Engpass herausgestellt. Es wird deshalb empfohlen, dieses Feature mit Bedacht einzusetzen.</span></p>
- <h4><a name="webservice_erweiterungsmöglichkeiten_datenbank_andere" id="webservice_erweiterungsmöglichkeiten_datenbank_andere"></a>2.2.2.2 Andere Datenbanken </h4>
- <p>&Uuml;ber die generische Anbindung JDBC k&ouml;nnen auch andere Datenbanken f&uuml;r die Archivierung von CRLs bzw. f&uuml;r die Speicherung der Log-Meldungen eingesetzt werden. Hinweise zu bestimmten Datenbanken finden Sie in den <a href="../faq/faq.html">FAQ</a>. </p>
- <p>Die in Abschnitt <a href="#webservice_erweiterungsm&#246;glichkeiten_datenbank_postgresql">2.2.2.1</a> gemachten Angaben zu Archivierung von CRLs bzw. zur Speicherung von Log-Meldungen gelten sinngem&auml;&szlig;. </p>
- <h3><a name="webservice_erweiterungsmöglichkeiten_hsm" id="webservice_erweiterungsmöglichkeiten_hsm"></a>2.2.3 Hardware Security Module (HSM)</h3>
- <p>MOA SS kann f&uuml;r die Erstellung von Signaturen auf die Dienste eines HSM zur&uuml;ckgreifen. Voraussetzung daf&uuml;r ist, dass f&uuml;r das HSM eine Implementierung der Schnittstelle PCKS#11 (PKCS#11-Bibliothek) angeboten wird. </p>
- <p>F&uuml;r die Einbindung des HSM in MOA SS m&uuml;ssen zun&auml;chst die Bibliotheken aus <code>$MOA_SPSS_INST/pkcs11</code> in ein beliebiges Verzeichnis kopiert werden, welches dann in den Libray-Pfad des jeweiligen Betriebssystems aufgenommen werden muss (Windows: Umgebungsvariable <code>PATH</code>; Linux: Umgebungsvariable <code>LD_LIBRARY_PATH</code>). </p>
- <p>Der Name der f&uuml;r das HSM spezifischen PKCS#11-Bibliothek muss in der Konfigurationsdatei eingetragen werden (vergleiche Abschnitt <a href="../config/config.html#konfigurationsparameter_ss_keymodules_hardwarekeymodule">2.2.1.1</a> des Konfigurationshandbuchs).</p>
- <h1><a name="klassenbibliothek"></a>3 Klassenbibliothek</h1>
- <p>Dieser Abschnitt beschreibt die Verwendung von MOA SP/SS als Klassenbibliothek. Im ersten Unterkapitel wird eine minimale Basisinstallation beschrieben. Das zweite Unterkapitel zeigt eine Reihe von optionalen Erweiterungsm&ouml;glichkeiten auf.</p>
- <h2><a name="klassenbibliothek_basisinstallation" id="klassenbibliothek_basisinstallation"></a>3.1 Basisinstallation</h2>
- <h3><a name="klassenbibliothek_basisinstallation_einfuehrung" id="klassenbibliothek_basisinstallation_einfuehrung"></a>3.1.1 Einf&uuml;hrung </h3>
- <p>Die Basisinstallation der Klassenbibliothek stellt einerseits die minimalen Anforderungen f&uuml;r den Einsatz von MOA SP/SS als Klassenbibliothek dar, andererseits dient sie als Ausgangspunkt f&uuml;r optionale Erweiterungsm&ouml;glichkeiten.</p>
- <p> Folgende Software ist Voraussetzung f&uuml;r die Basisinstallation der Klassenbibliothek: </p>
- <ul>
- <li><a href="#referenziertesoftware">J2SE 1.3.1 JRE</a> oder <a href="#referenziertesoftware">J2SE 1.4.2 JRE</a> oder <a href="#referenziertesoftware">J2SE 5.0 JRE</a> </li>
- </ul>
- <h3><a name="klassenbibliothek_basisinstallation_vorbereitung" id="klassenbibliothek_basisinstallation_vorbereitung"></a>3.1.2 Vorbereitung </h3>
- <p>Die folgenden Schritte dienen der Vorbereitung der Installation.</p>
- <dl>
- <dt>Installation von J2SE SDK</dt>
- <dd>Installieren Sie <a href="#referenziertesoftware">J2SE 1.3.1 SDK</a> oder <a href="#referenziertesoftware">J2SE 1.4.2 SDK</a> oder <a href="#referenziertesoftware">J2SE 5.0 SDK</a> in ein beliebiges Verzeichnis. Wir empfehlen die Installation von <a href="#referenziertesoftware">J2SE 5.0 SDK</a>. Das Wurzelverzeichnis der J2SE SDK Installation wird im weiteren Verlauf als <code>$JAVA_HOME</code> bezeichnet. </dd>
- <dt>Entpacken der MOA SP/SS Klassenbibliotheks-Distribution</dt>
- <dd> Entpacken Sie die Datei <code>moa-spss-1.2.x-lib.zip</code> in ein beliebiges Verzeichnis. Dieses Verzeichnis wird im weiteren Verlauf als <code>$MOA_SPSS_INST</code> bezeichnet. </dd>
- <dt>Installation der Krypographiebibliotheken von SIC/IAIK</dt>
- <dd>
- <p>Die Installation der Kryptographiebibliotheken von <a href="http://jce.iaik.tugraz.at/" target="_blank">SIC/IAIK</a> ist abh&auml;ngig vom eingesetzten J2SE SDK:</p>
- <dl>
- <dt>J2SE 1.3.1 SDK</dt>
- <dd>Kopieren Sie alle Dateien aus dem Verzeichnis <code>$MOA_SPSS_INST/ext13</code> in das Verzeichnis <code>$JAVA_HOME/jre/lib/ext</code>.</dd>
- <dt>J2SE 1.4.2 SDK oder JSE 5.0 SDK </dt>
- <dd>Kopieren Sie alle Dateien aus dem Verzeichnis <code>$MOA_SPSS_INST/ext14</code> in das Verzeichnis <code>$JAVA_HOME/jre/lib/ext</code>. Zus&auml;tzlich m&uuml;ssen Sie die Rechtedateien Ihres J2SE 1.4.2 SDK bzw. J2SE 5.0 SDK austauschen. Laden Sie dazu die <span class="term">Unlimited Strength Jurisdiction Policy Files</span> von der <a href="http://java.sun.com/j2se/1.4.2/download.html" target="_blank">J2SE 1.4.2 SDK Downloadseite</a> bzw. <a href="http://java.sun.com/j2se/1.5.0/download.html">J2SE 5.0 SDK Downloadseite</a> und folgen Sie der darin enthaltenen Installationsanweisung. </dd>
- </dl>
- </dd>
- </dl>
- <h3><a name="klassenbibliothek_basisinstallation_verwendung" id="klassenbibliothek_basisinstallation_verwendung"></a>3.1.3 Verwendung</h3>
- <p> Um die MOA SP/SS Klassenbibliothek in einer Applikation verwenden zu k&ouml;nnen, m&uuml;ssen die mit MOA SP/SS ausgelieferten Bibliotheken in den Java Klassenpfad der Applikation eingebunden werden. </p>
- <p>Die nachfolgende Tabelle listet diese Klassenbibliotheken auf; die Eintr&auml;ge in der Spalte Dateien sind relativ zum Verzeichnis <code>$MOA_SPSS_INST</code> zu interpretieren.</p>
-<table class="fixedWidth" border="1" cellpadding="2">
-<tbody><tr>
-<th>Klassenbibliothek</th><th>Version</th><th>Dateien</th>
-
-</tr><tr>
-<td>MOA SP/SS</td>
-<td>1.2.x&nbsp; </td>
-<td><code>moa-spss.jar</code>, <code>moa-common.jar</code></td>
-</tr><tr>
-<td>MOA IAIK</td>
-<td>1.0.7&nbsp; </td>
-<td><p><code>lib/iaik_moa_full.jar</code>, <code>lib/iaik_Pkcs11Wrapper.jar</code>,
- <code>lib/iaik_cms.jar</code>, <code>lib/iaik_ixsil.jar</code></p>
- </td>
-</tr><tr>
-<td>JAXP</td><td>1.2_01&nbsp; </td><td><code>lib/jaxp-api.jar</code>, <code>lib/sax.jar</code>, <code>lib/dom.jar</code></td>
-
-</tr><tr>
-<td>Xerces-J</td><td>2.4.0&nbsp; </td><td><code>lib/xercesImpl.jar</code>, <code>lib/xmlParserAPIs.jar</code></td>
-</tr><tr>
-<td>Xalan-J</td><td>2.5.1&nbsp; </td><td><p><code>lib/xalan.jar</code></p>
- <p class="remark">Bitte beachten Sie: Wenn Sie J2SE 1.4.2 JRE oder J2SE 5.0 JRE verwenden, m&uuml;ssen Sie diese Bibliothek der Java VM als endorsed bekanntgeben. Sie k&ouml;nnen dies tun, indem Sie entweder</p>
- <ul>
- <li class="remark">die Bibliothek in das (ggf. vorher anzulegende) Verzeichnis <code>$JAVA_HOME/jre/lib/endorsed/</code> kopieren; oder</li>
- <li class="remark">die System Property <code>java.endorsed.dirs</code> verwenden, und als Wert den Pfad zu jenem Verzeichnis angeben, in dem Sie die Bibliothek vorhalten (also z.B. <code>java.endorsed.dirs=c:/mylibdir</code>).</li>
- </ul></td>
-</tr><tr>
-<td>Jaxen</td><td>1.0&nbsp; </td><td><code>lib/jaxen-core.jar</code>, <code>lib/jaxen-dom.jar</code>, <code>lib/saxpath.jar</code></td>
-
-</tr><tr>
-<td>Commons-Logging</td>
-<td>1.0.4&nbsp; </td>
-<td><code>lib/commons-logging-api.jar</code>, <code>lib/commons-logging.jar</code></td>
-</tr><tr>
-<td>Log4j</td><td>1.2.7&nbsp; </td><td><code>lib/log4j-1.2.7.jar</code></td>
-</tr><tr>
-<td>Commons-Discovery</td><td>0.2&nbsp; </td><td><code>lib/commons-discovery.jar</code></td>
-
-</tr><tr>
-<td>JSSE</td><td>1.0.3_01&nbsp; </td>
-<td><p>Diese Bibliotheken ben&ouml;tigen Sie nur, wenn Sie J2SE 1.3.1 verwenden:</p>
- <p><code>lib/ext13/jsse.jar</code>, <code>lib/ext13/jcert.jar</code>, <code>lib/ext13/jnet.jar</code></p>
- <p class="remark">Bitte beachten Sie: Diese Bibliotheken ben&ouml;tigen Sie nur, wenn Sie J2SE 1.3.1 verwenden.</p> </td>
-</tr><tr>
-<td>Postgres JDBC2</td><td>7.3&nbsp; </td><td><p><code>lib/pg73jdbc2.jar</code></p>
- <p><span class="remark">Bitte beachten Sie: Wenn Sie keine Datenbank f&uuml;r MOA SP/SS verwenden (vergleiche </span><a href="#webservice_erweiterungsm&#246;glichkeiten_datenbank">2.2.2</a><span class="remark">), ben&ouml;tigen Sie diese Bibliothek nicht.</span></p></td>
-</tr><tr>
-</tr>
-</tbody></table>
-
- <h3><a name="klassenbibliothek_basisinstallation_logging" id="klassenbibliothek_basisinstallation_logging"></a>3.1.4 Logging</h3>
- <p> Die MOA SP/SS Klassenbibliothek verwendet <a href="#referenziertesoftware">Jakarta Log4j</a> f&uuml;r die Ausgabe von Log-Meldungen am Bildschirm bzw. in Log-Dateien. Die im Abschnitt <a href="#webservice_basisinstallation_logging">2.1.3</a> gemachten Aussagen lassen sich gro&szlig;teils auf den Einsatz der MOA SP/SS Klassenbibliothek &uuml;bertragen. </p>
- <h2><a name="klassenbibliothek_erweiterungsmöglichkeiten" id="klassenbibliothek_erweiterungsmöglichkeiten"></a>3.2 Erweiterungsm&ouml;glichkeiten </h2>
- <p>Die im Abschnitt <a href="#webservice_erweiterungsm&#246;glichkeiten">2.2</a> angef&uuml;hrten Erweiterungsm&ouml;glichkeiten f&uuml;r die MOA SP/SS Webservices gelten in analoger Weise auch f&uuml;r die Klassenbibliothek.</p>
- <h1><a name="referenzierte_software"></a>A Referenzierte Software</h1>
-<p>Auf folgende Software-Pakete wird in diesem Handbuch verwiesen:</p>
-<table class="fixedWidth" border="1" cellpadding="2">
- <tr>
- <th scope="col">Name</th>
- <th scope="col">Beschreibung</th>
- </tr>
- <tr>
- <td><a href="http://jakarta.apache.org/tomcat/index.html" target="_blank">Apache Tomcat 4.1.x </a></td>
- <td>Servlet-Container des Apache Jakarta Projekts in der Version 4.1.x </td>
- </tr>
- <tr>
- <td><a href="http://java.sun.com/j2se/1.3.1/" target="_blank">J2SE 1.3.1 SDK/JRE</a> </td>
- <td>Java 2 Standard Edition in der Version 1.3.1 (Software Development Kit bzw. Java Runtime Environment) </td>
- </tr>
- <tr>
- <td><a href="http://java.sun.com/j2se/1.4.2/" target="_blank">J2SE 1.4.2 SDK/JRE</a></td>
- <td>Java 2 Standard Edition in der Version 1.4.2 (Software Development Kit bzw. Java Runtime Environment) </td>
- </tr>
- <tr>
- <td><a href="http://java.sun.com/j2se/1.5.0/" target="_blank">J2SE 5.0 SDK/JRE</a> </td>
- <td>Java 2 Standard Edition in der Version 5.0 (Software Development Kit bzw. Java Runtime Environment) </td>
- </tr>
- <tr>
- <td><a href="http://jakarta.apache.org/log4j/" target="_blank">Jakarta Log4J </a></td>
- <td>Logging Framework des Apache Jakarta Projekts </td>
- </tr>
-</table>
-</body>
-</html>
diff --git a/spss.handbook/handbook/intro/intro.html b/spss.handbook/handbook/intro/intro.html
deleted file mode 100644
index 8b1bc381f..000000000
--- a/spss.handbook/handbook/intro/intro.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
- <title>MOA SS und SP - Einf&uuml;hrung</title>
- <link rel="stylesheet" href="../common/MOA.css" type="text/css">
-</head>
-<body bgcolor="white" text="#000000" link="#990000" vlink="#666666" alink="#cc9966">
- <table class="logoTable" width="100%" border="0" cellspacing="0" cellpadding="10">
- <tr>
- <td align="center" class="logoTitle" width="267"><img src="../common/LogoBKA.png" alt="Logo BKA" width="267" height="37" align="left"></td>
- <td align="center" class="logoTitle">Open Source<br>
- f&uuml;r das E-Government</td>
- <td align="center" class="logoTitle" width="123"><img src="../common/LogoMoa4c.jpg" alt="Logo MOA" width="123" height="138" align="right"></td>
- </tr>
- </table>
- <hr/>
- <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.3</a></p>
- <p class="subtitle">Einf&uuml;hrung</p>
- <hr/>
- <h1>Inhalt</h1>
- <ol>
- <li>
- <p><a href="#allgemeines">Allgemeines</a></p>
- </li>
- <li>
- <p><a href="#ss">Modul Serversignatur (SS) </a></p>
- </li>
- <li><a href="#sp">Modul Signaturpr&uuml;fung (SP) </a></li>
- </ol>
-<hr/>
- <h1><a name="allgemeines"></a>1 Allgemeines</h1>
- <p> Die Module Serversignatur (SS) und Signaturpr&uuml;fung (SP) k&ouml;nnen von Anwendungen verwendet werden, um elektronische Signaturen zu erstellen bzw. vorliegende elektronische Signaturen zu &uuml;berpr&uuml;fen.</p>
- <p> Die Funktionalit&auml;t und der Aufbau der Schnittstelle zu den beiden Modulen ist in der <a href="../spec/MOA-SPSS-1.2.pdf" target="_blank" class="term">Spezifikation MOA SP/SS (V1.2)</a> detailliert beschrieben. Da diese Spezifikation auf der <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.html" target="_blank" class="term"> Schnittstellenspezifikation des Security-Layers (V 1.1)</a> aufbaut, ist deren Kenntnis zum Verstehen der Schnittstellen zu SS und SP erforderlich. </p>
- <h1><a name="ss"></a>2 Modul Serversignatur (SS) </h1>
- <p> Das Modul Serversignatur (SS) dient zum Erstellen von XML-Signaturen in Anlehnung an die <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.html"> </a><a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.html" target="_blank" class="term">Schnittstellenspezifikation des Security-Layers (V 1.1)</a>. Eine Signatur kann entweder rein in Software erstellt werden, oder aber unter Zuhilfenahme eines Hardware Security Modules (HSM), das den privaten Schl&uuml;ssel gesch&uuml;tzt enth&auml;lt und die Signatur berechnet.</p>
- <p> Der Zugriff auf einzelne Signaturschl&uuml;ssel in MOA SS kann basierend auf dem f&uuml;r TLS-Client-Authentisierung verwendeten Zertifikat eingeschr&auml;nkt werden. </p>
- <p> Anwendungen k&ouml;nnen das Modul entweder als Web-Service oder &uuml;ber ein Java-API ansprechen. </p>
- <h1><a name="sp"></a>3 Modul Signaturpr&uuml;fung (SP) </h1>
- <p> Das Modul Signaturpr&uuml;fung (SP) dient zum &Uuml;berpr&uuml;fen von <a href="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/" target="_blank">XML-Signaturen</a> und <a href="http://www.ietf.org/rfc/rfc2630.txt" target="_blank">CMS-Signaturen</a>. </p>
- <p>Im Zuge der Verifikation einer XML-Signatur werden die Signatur, gegebenenfalls vorhandene XMLDSIG-Manifeste, als auch die G&uuml;ltigkeit und Anwendbarkeit des Zertifikats &uuml;berpr&uuml;ft. Bei XML-Signaturen kann zus&auml;tzlich &uuml;berpr&uuml;ft werden, ob sie den speziellen Anforderungen <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.html" target="_blank" class="term">Schnittstellenspezifikation des Security-Layers (V 1.1)</a> entsprechen (vgl. Signaturmanifest). </p>
- <p> Anwendungen k&ouml;nnen das Modul entweder als Web-Service oder &uuml;ber ein Java-API ansprechen.</p>
-</body>
-</html>
diff --git a/spss.handbook/handbook/spec/MOA-SPSS-1.3.pdf b/spss.handbook/handbook/spec/MOA-SPSS-1.3.pdf
deleted file mode 100644
index 6709a4081..000000000
--- a/spss.handbook/handbook/spec/MOA-SPSS-1.3.pdf
+++ /dev/null
Binary files differ
diff --git a/spss.handbook/handbook/spec/MOA-SPSS-1.3.wsdl b/spss.handbook/handbook/spec/MOA-SPSS-1.3.wsdl
deleted file mode 100644
index cc7aec4dc..000000000
--- a/spss.handbook/handbook/spec/MOA-SPSS-1.3.wsdl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Web Service Description for MOA SP/SS 1.3
--->
-<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: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">
- <import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.3.xsd"/>
- <message name="CreateXMLSignatureInput">
- <part name="body" element="moa:CreateXMLSignatureRequest"/>
- </message>
- <message name="CreateXMLSignatureOutput">
- <part name="body" element="moa:CreateXMLSignatureResponse"/>
- </message>
- <message name="VerifyCMSSignatureInput">
- <part name="body" element="moa:VerifyCMSSignatureRequest"/>
- </message>
- <message name="VerifyCMSSignatureOutput">
- <part name="body" element="moa:VerifyCMSSignatureResponse"/>
- </message>
- <message name="VerifyXMLSignatureInput">
- <part name="body" element="moa:VerifyXMLSignatureRequest"/>
- </message>
- <message name="VerifyXMLSignatureOutput">
- <part name="body" element="moa:VerifyXMLSignatureResponse"/>
- </message>
- <message name="MOAFault">
- <part name="body" element="moa:ErrorResponse"/>
- </message>
- <portType name="SignatureCreationPortType">
- <operation name="createXMLSignature">
- <input message="tns:CreateXMLSignatureInput"/>
- <output message="tns:CreateXMLSignatureOutput"/>
- <fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
- </portType>
- <portType name="SignatureVerificationPortType">
- <operation name="verifyCMSSignature">
- <input message="tns:VerifyCMSSignatureInput"/>
- <output message="tns:VerifyCMSSignatureOutput"/>
- <fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
- <operation name="verifyXMLSignature">
- <input message="tns:VerifyXMLSignatureInput"/>
- <output message="tns:VerifyXMLSignatureOutput"/>
- <fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
- </portType>
- <binding name="SignatureCreationBinding" type="tns:SignatureCreationPortType">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="createXMLSignature">
- <soap:operation soapAction="urn:CreateXMLSignatureAction"/>
- <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 use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </fault>
- </operation>
- </binding>
- <binding name="SignatureVerificationBinding" type="tns:SignatureVerificationPortType">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="verifyCMSSignature">
- <soap:operation soapAction="urn:VerifyCMSSignatureAction"/>
- <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 use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </fault>
- </operation>
- <operation name="verifyXMLSignature">
- <soap:operation soapAction="urn:VerifyXMLSignatureAction"/>
- <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 use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </fault>
- </operation>
- </binding>
- <service name="SignatureCreationService">
- <port name="SignatureCreationPort" binding="tns:SignatureCreationBinding">
- <!--
- Please note that the location URL must be adapted to the actual service URL.
- -->
- <soap:address location="http://localhost/moa-spss/services/SignatureCreation"/>
- </port>
- </service>
- <service name="SignatureVerificationService">
- <port name="SignatureVerificationPort" binding="tns:SignatureVerificationBinding">
- <!--
- Please note that the location URL must be adapted to the actual service URL.
- -->
- <soap:address location="http://localhost/moa-spss/services/SignatureVerification"/>
- </port>
- </service>
-</definitions>
diff --git a/spss.handbook/handbook/spec/MOA-SPSS-1.3.xsd b/spss.handbook/handbook/spec/MOA-SPSS-1.3.xsd
deleted file mode 100644
index 9c40d8153..000000000
--- a/spss.handbook/handbook/spec/MOA-SPSS-1.3.xsd
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- MOA SP/SS 1.3 Schema
--->
-<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <!--########## Create XML Signature ###-->
- <!--### Create XML Signature Request ###-->
- <xsd:element name="CreateXMLSignatureRequest">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="CreateXMLSignatureRequestType"/>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="CreateXMLSignatureRequestType">
- <xsd:sequence>
- <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>
- <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="DataObjectInfo" maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="DataObjectInfoType">
- <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="CreateSignatureInfo" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>
- <xsd:choice>
- <xsd:annotation>
- <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>
- </xsd:annotation>
- <xsd:element ref="CreateSignatureEnvironmentProfile"/>
- <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>
- </xsd:choice>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <!--### Create XML Signature Response ###-->
- <xsd:complexType name="CreateXMLSignatureResponseType">
- <xsd:choice maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>
- </xsd:annotation>
- <xsd:element name="SignatureEnvironment">
- <xsd:annotation>
- <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:any namespace="##any" processContents="lax"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element ref="ErrorResponse"/>
- </xsd:choice>
- </xsd:complexType>
- <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>
- <!--########## Verify CMS Signature ###-->
- <!--### Verifiy CMS Signature Request ###-->
- <xsd:element name="VerifyCMSSignatureRequest">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="VerifyCMSSignatureRequestType">
- <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="VerifyCMSSignatureRequestType">
- <xsd:sequence>
- <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
- <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
- <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
- <xsd:element name="TrustProfileID" type="xsd:token">
- <xsd:annotation>
- <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <!--### Verify CMS Signature Response ###-->
- <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>
- <xsd:complexType name="VerifyCMSSignatureResponseType">
- <xsd:sequence maxOccurs="unbounded">
- <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
- <xsd:annotation>
- <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="SignatureCheck" type="CheckResultType"/>
- <xsd:element name="CertificateCheck" type="CheckResultType"/>
- </xsd:sequence>
- </xsd:complexType>
- <!--########## Verify XML Signature ###-->
- <!--### Verify XML Signature Request ###-->
- <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>
- <xsd:complexType name="VerifyXMLSignatureRequestType">
- <xsd:sequence>
- <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
- <xsd:element name="VerifySignatureInfo">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>
- <xsd:element name="VerifySignatureLocation" type="xsd:token"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element ref="SupplementProfile"/>
- <xsd:element name="SupplementProfileID" type="xsd:string"/>
- </xsd:choice>
- <xsd:element name="SignatureManifestCheckParams" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="ReturnHashInputData" minOccurs="0"/>
- <xsd:element name="TrustProfileID" type="xsd:token">
- <xsd:annotation>
- <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <!--### Verify XML Signature Response ###-->
- <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>
- <xsd:complexType name="VerifyXMLSignatureResponseType">
- <xsd:sequence>
- <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
- <xsd:annotation>
- <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="HashInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ReferenceInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
- <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
- <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="CertificateCheck" type="CheckResultType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="ProfileIdentifierType">
- <xsd:restriction base="xsd:token"/>
- </xsd:simpleType>
- <xsd:complexType name="InputDataType">
- <xsd:complexContent>
- <xsd:extension base="ContentExLocRefBaseType">
- <xsd:attribute name="PartOf" use="optional" default="SignedInfo">
- <xsd:simpleType>
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="SignedInfo"/>
- <xsd:enumeration value="XMLDSIGManifest"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="ReferringSigReference" type="xsd:nonNegativeInteger" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="MetaInfoType">
- <xsd:sequence>
- <xsd:element name="MimeType" type="MimeTypeType"/>
- <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>
- <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="FinalDataMetaInfoType">
- <xsd:complexContent>
- <xsd:extension base="MetaInfoType">
- <xsd:sequence>
- <xsd:element name="Type" type="xsd:anyURI" minOccurs="0"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="DataObjectInfoType">
- <xsd:sequence>
- <xsd:element name="DataObject">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="ContentOptionalRefType"/>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:choice>
- <xsd:annotation>
- <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>
- </xsd:annotation>
- <xsd:element ref="CreateTransformsInfoProfile"/>
- <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="Structure" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="detached"/>
- <xsd:enumeration value="enveloping"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:complexType name="TransformsInfoType">
- <xsd:sequence>
- <xsd:element ref="dsig:Transforms" minOccurs="0"/>
- <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="XMLDataObjectAssociationType">
- <xsd:sequence>
- <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
- <xsd:element name="Content" type="ContentRequiredRefType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CMSDataObjectOptionalMetaType">
- <xsd:sequence>
- <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
- <xsd:element name="Content" type="CMSContentBaseType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CMSContentBaseType">
- <xsd:complexContent>
- <xsd:restriction base="ContentOptionalRefType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- </xsd:choice>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="CheckResultType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ReferencesCheckResultType">
- <xsd:complexContent>
- <xsd:restriction base="CheckResultType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">
- <xsd:complexContent mixed="true">
- <xsd:restriction base="AnyChildrenType">
- <xsd:sequence>
- <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ManifestRefsCheckResultType">
- <xsd:complexContent>
- <xsd:restriction base="CheckResultType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
- <xsd:complexContent mixed="true">
- <xsd:restriction base="AnyChildrenType">
- <xsd:sequence>
- <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <!--########## Error Response ###-->
- <xsd:element name="ErrorResponse" type="ErrorResponseType">
- <xsd:annotation>
- <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:complexType name="ErrorResponseType">
- <xsd:sequence>
- <xsd:element name="ErrorCode" type="xsd:integer"/>
- <xsd:element name="Info" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- <!--########## Auxiliary Types ###-->
- <xsd:simpleType name="KeyIdentifierType">
- <xsd:restriction base="xsd:string"/>
- </xsd:simpleType>
- <xsd:simpleType name="KeyStorageType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Software"/>
- <xsd:enumeration value="Hardware"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:simpleType name="MimeTypeType">
- <xsd:restriction base="xsd:token"/>
- </xsd:simpleType>
- <xsd:complexType name="AnyChildrenType" mixed="true">
- <xsd:sequence>
- <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="XMLContentType" mixed="true">
- <xsd:complexContent mixed="true">
- <xsd:extension base="AnyChildrenType">
- <xsd:attribute ref="xml:space" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ContentBaseType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="XMLContentType"/>
- <xsd:element name="LocRefContent" type="xsd:anyURI"/>
- </xsd:choice>
- </xsd:complexType>
- <xsd:complexType name="ContentExLocRefBaseType">
- <xsd:complexContent>
- <xsd:restriction base="ContentBaseType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="XMLContentType"/>
- </xsd:choice>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ContentOptionalRefType">
- <xsd:complexContent>
- <xsd:extension base="ContentBaseType">
- <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ContentRequiredRefType">
- <xsd:complexContent>
- <xsd:restriction base="ContentOptionalRefType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="XMLContentType"/>
- <xsd:element name="LocRefContent" type="xsd:anyURI"/>
- </xsd:choice>
- <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="VerifyTransformsDataType">
- <xsd:choice maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>
- </xsd:annotation>
- <xsd:element ref="VerifyTransformsInfoProfile"/>
- <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- <xsd:element name="QualifiedCertificate"/>
- <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
- <xsd:complexType name="PublicAuthorityType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="SignatoriesType">
- <xsd:union memberTypes="AllSignatoriesType">
- <xsd:simpleType>
- <xsd:list itemType="xsd:positiveInteger"/>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
- <xsd:simpleType name="AllSignatoriesType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="all"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="CreateSignatureLocationType">
- <xsd:simpleContent>
- <xsd:extension base="xsd:token">
- <xsd:attribute name="Index" type="xsd: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.handbook/handbook/usage/usage.html b/spss.handbook/handbook/usage/usage.html
deleted file mode 100644
index 69e21d5f0..000000000
--- a/spss.handbook/handbook/usage/usage.html
+++ /dev/null
@@ -1,1236 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
- <title>MOA SS und SP - Anwendung</title>
- <link rel="stylesheet" href="../common/MOA.css" type="text/css">
-</head>
-<body bgcolor="white" text="#000000" link="#990000" vlink="#666666" alink="#cc9966">
- <table class="logoTable" width="100%" border="0" cellspacing="0" cellpadding="10">
- <tr>
- <td align="center" class="logoTitle" width="267"><img src="../common/LogoBKA.png" alt="Logo BKA" width="267" height="37" align="left"></td>
- <td align="center" class="logoTitle">Open Source<br>
- f&uuml;r das E-Government</td>
- <td align="center" class="logoTitle" width="123"><img src="../common/LogoMoa4c.jpg" alt="Logo MOA" width="123" height="138" align="right"></td>
- </tr>
- </table>
- <hr/>
- <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.3</a></p>
- <p class="subtitle">Anwendung</p>
- <hr/>
- <h1>Inhalt</h1>
- <ol>
- <li>
- <p><a href="#&#252;bersicht">&Uuml;bersicht</a></p>
- </li>
- <li>
- <p><a href="#webservice">Verwendung des Webservices</a></p>
- <ol>
- <li><a href="#webservice_xmlrequests">XML-Requests</a> <ol>
- <li><a href="#webservice_xmlrequests_erstellungxml">Erstellung einer XML-Signatur</a> <ol>
- <li><a href="#webservice_xmlrequests_erstellungxml_simple">Einfaches Beispiel</a></li>
- <li><a href="#webservice_xmlrequests_erstellungxml_daten">Angabe der zu signierenden Daten</a></li>
- <li><a href="#webservice_xmlrequests_erstellungxml_transformationen">Transformationen</a></li>
- <li><a href="#webservice_xmlrequests_erstellungxml_ergaenzungsobjekte">Erg&auml;nzungsobjekte</a> </li>
- </ol>
- </li>
- <li><a href="#webservice_xmlrequests_pruefungcms">Pr&uuml;fung einer CMS-Signatur </a> <ol>
- <li><a href="#webservice_xmlrequests_pruefungcms_einfach">Einfaches Beispiel</a></li>
- <li><a href="#webservice_xmlrequests_pruefungcms_erweitert">Erweitertes Beispiel</a> </li>
- </ol>
- </li>
- <li><a href="#webservice_xmlrequests_pruefungxml">Pr&uuml;fung einer XML-Signatur </a> <ol>
- <li><a href="#webservice_xmlrequests_pruefungxml_einfach">Einfaches Beispiel</a></li>
- <li><a href="#webservice_xmlrequests_pruefungxml_erweitert">Erweitertes Beispiel</a></li>
- <li><a href="#webservice_xmlrequests_pruefungxml_xmldsigmanifest">Pr&uuml;fung eines XMLDSIG-Manifests</a></li>
- <li><a href="#webservice_xmlrequests_pruefungxml_ergaenzungsobjekte">Erg&auml;nzungsobjekte</a></li>
- <li><a href="#webservice_xmlrequests_pruefungxml_signaturmanifest">Signatur-Manifest des Security-Layers</a></li>
- </ol>
- </li>
- </ol>
- </li>
- <li><a href="#webservice_clients">Webservice-Clients
- </a> <ol>
- <li><a href="#webservice_clients_&#252;bersicht">&Uuml;bersicht</a></li>
- <li><a href="#webservice_clients_gemeinsamkeiten">Gemeinsamkeiten</a></li>
- <li><a href="#webservice_clients_httpsserverauth">Besonderheiten von <code>HTTPSServerAuth.java</code></a></li>
- <li><a href="#webservice_clients_httpsclientauth">Besonderheiten von <code>HTTPSClientAuth.java</code></a></li>
- </ol>
- </li>
- </ol>
- </li>
- <li><a href="#klassenbibliothek">Verwendung der Klassenbibliothek</a>
- <ol>
- <li><a href="#klassenbibliothek_vorbereitung">Vorbereitung</a></li>
- <li><a href="#klassenbibliothek_allgemeines">Allgemeines</a> </li>
- <li><a href="#klassenbibliothek_beispiele">Beispiele</a></li>
- <li><a href="#klassenbibliothek_apidoc">API-Dokumentation</a> </li>
- </ol>
- </li>
- </ol>
- <ol type="A">
- <li><a href="#referenzierte_software">Referenzierte Software</a></li>
- </ol>
-<hr/>
- <h1><a name="übersicht" id="übersicht"></a>1 &Uuml;bersicht</h1>
- <p> Die Module Signaturpr&uuml;fung (SP) und Serversignatur (SS) sind als plattformunabh&auml;ngige Module ausgelegt, die entweder als Webservice &uuml;ber HTTP bzw. HTTPS oder als Klassenbibliothek &uuml;ber ein API angesprochen werden k&ouml;nnen. Dieses Handbuch beschreibt die Anwendung der beiden Module auf jede dieser beiden Arten.</p>
- <h1><a name="webservice"></a>2 Verwendung des Webservices </h1>
- <p>Dieser Abschnitt beschreibt die Verwendung der Module SP und SS &uuml;ber die Webservice-Schnittstelle. Im ersten Unterabschnitt werden typische XML-Requests zur Signaturerstellung mittels SS bzw. zur Signaturpr&uuml;fung mittels SP vorgestellt, wie sie an das Webservice gesendet werden k&ouml;nnen. Der zweite Unterabschnitt stellt beispielhafte Implementierungen eines Webservice-Clients in Java vor, mit dem die Requests aus dem ersten Unterabschnitt an das Webservice gesendet werden k&ouml;nnen.</p>
- <h2><a name="webservice_xmlrequests" id="webservice_xmlrequests"></a>2.1 XML-Requests </h2>
- <p>Dieser Abschnitt stellt typische XML-Requests f&uuml;r die Erstellung einer XML-Signatur mittels SS bzw. zur Pr&uuml;fung einer CMS- bzw. XML-Signatur mittels SP vor. Zu jedem Request wird jeweils auch eine typische Response des Services besprochen. </p>
- <p class="remark">Bitte beachten Sie: Einige der vorgestellten Requests referenzieren beispielhafte Daten auf <code>localhost</code>, z.B. <code>http://localhost:8080/referencedData/Text.txt</code>. Wenn Sie diese Beispiele ausprobieren m&ouml;chten, m&uuml;ssen Sie daf&uuml;r sorgen, dass MOA SS bzw. SP diese Daten auch tats&auml;chlich aufl&ouml;sen kann. Wenn Sie Ihre Tomcat-Installation auf <code>localhost:8080</code> betreiben, ist es ausreichend, wenn sie die diesem Handbuch beiliegende Webapplikation <code><a href="../../clients/common/referencedData/referencedData.war">referencedData.war</a></code> in das Verzeichnis <code>webapps</code> Ihrer Tomcat-Installation kopieren. Ansonsten m&uuml;ssen Sie zus&auml;tzlich die URLs in den Requests anpassen. </p>
- <h3><a name="webservice_xmlrequests_erstellungxml" id="webservice_xmlrequests_erstellungxml"></a>2.1.1 Erstellung einer XML-Signatur</h3>
- <h4><a name="webservice_xmlrequests_erstellungxml_simple" id="webservice_xmlrequests_erstellungxml_simple"></a>2.1.1.1 Einfaches Beispiel</h4>
- <h5>Request</h5>
- <p><code><a href="../../clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.xml" target="_blank">CreateXMLSignatureRequest.Simple.xml</a></code> ist ein einfacher XML-Request zur Erzeugung einer XML-Signatur. Sein Aufbau wird nachfolgend analysiert:</p>
- <pre> &lt;KeyIdentifier&gt;KG_allgemein&lt;/KeyIdentifier&gt; </pre>
- <p><code>KG_allgemein</code> bezeichnet eine Schl&uuml;sselgruppe, aus der SS einen Signaturschl&uuml;ssel selektieren soll und muss einer in der SP/SS-Konfigurationsdatei definierten Schl&uuml;sselgruppe entsprechen. </p>
- <pre> &lt;SingleSignatureInfo SecurityLayerConformity="false"&gt;</pre>
- <p> F&uuml;r jedes <code>SingleSignatureInfo</code>Element wird eine eigene XML-Signatur erzeugt. Wird das Attribut <code>SecurityLayerConformity</code> auf <code>true</code> gesetzt, dann wird eine XML-Signatur gem&auml;&szlig; <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.html#signaturerstellungNachXMLDSIGAntwort" target="_blank">Security-Layer Spezifikation V1.1 </a> erzeugt; d.h. es werden signierte Properties (Zeitpunkt der Signaturerstellung, das f&uuml;r die Signatur&uuml;berpr&uuml;fung zu verwendende Zertifikat, Metainformationen zu den signierten Datenobjekten) und ein Manifest, das alle implizite Transformationsparameter enth&auml;lt, zur Signatur hinzugef&uuml;gt. </p>
- <pre> &lt;DataObjectInfo Structure="enveloping"&gt;
- &lt;DataObject&gt;
- &lt;XMLContent&gt;Diese Daten werden signiert.&lt;XMLContent&gt;
- &lt;/DataObject&gt;</pre>
- <p> </p>
- <p> F&uuml;r jedes Daten-Objekt, das in die XML-Signatur als <code>dsig:Reference</code> aufgenommen werden soll, muss ein <code>DataObjectInfo</code> Element spezifiziert werden. Das Attribut <code>Structure</code> gibt an, ob die Daten in die Signatur in ein <code>dsig:Object</code> Element integriert werden sollen (<code>Structure="enveloping"</code>), oder &uuml;ber einen URL referenziert werden sollen (<code>Structure="detached"</code>). </p>
- <p> Im Fall von <code>Structure="enveloping"</code> muss im nachfolgenden <code>DataObject</code> Element entweder das Attribut <code>Reference</code> (enth&auml;lt eine URL, von der SS die Daten beziehen soll) gesetzt sein, oder aber die zu signierenden Daten werden explizit in einem der Elemente <code>Base64Content</code> (enth&auml;lt Daten in Base64 kodierter Form) oder <code>XMLContent</code> (enth&auml;lt Daten als beliebiges XML-Fragment) oder <code>LocRefContent</code> (enth&auml;lt eine URL, von der SS die Daten beziehen soll; in diesem Fall also gleichwertig wie ein gesetztes Attribut <code>Reference</code>) spezifiziert sein. Die Angabe der zu signierenden Daten &uuml;ber das Attribut <code>Reference</code> und gleichzeitig einem der Elemente <code>Base64Content</code> oder <code>XMLContent</code> oder <code>LocRefContent</code> ist nicht erlaubt.</p>
- <p>Im Fall von <code>Structure="detached"</code> muss das Attribut <code>Reference</code> im nachfolgenden <code>DataObject</code> Element gesetzt sein. Es enth&auml;lt jene URL, die zur Referenzierung der Daten als Wert von <code>dsig:Reference/@URI</code> in die XML-Signatur aufgenommen wird. Die Angabe eines der Element <code>Base64Content</code> oder <code>XMLContent</code> oder <code>LocRefContent</code> ist optional. Unterbleibt die Angabe, bezieht SS die Daten von der URL im Attribut <code>Reference</code>. Wird eines der Elemente verwendet, bezieht SS die Daten durch Analyse des angegebenen Elements (siehe obiger Absatz). </p>
- <p>Im konkreten Beispiel sollen die Daten in ein <code>dsig:Object</code> Element integriert werden (<code>Structure="enveloping"</code>). Die Daten werden mittels <code>XMLContent</code> als XML-Fragment (ein einfacher Textknoten) angegeben.</p>
- <p>
- <pre> &lt;CreateTransformsInfoProfile&gt;<br> &lt;CreateTransformsInfo&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;text/plain&lt;MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;</pre>
- Zu jedem Daten-Objekt k&ouml;nnen optional Transformationen (z.B. XPath, XSLT, Base64-Decodierung, etc.) angegeben werden. Werden - wie hier im Beispiel - keine Transformationen angegeben, so muss zumindest der MIME-Type der zu signierenden Daten spezifiziert werden. <p></p>
- <h5>Response</h5>
- <p><code><a href="../../clients/webservice/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml" target="_blank">CreateXMLSignatureRequest.Simple.resp.xml</a></code> ist eine typische Response des SS Webservices auf den obigen Request. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass die dargestellte Response zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
- <p>
- <pre>&lt;CreateXMLSignatureResponse
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot; <br> xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;<br> &lt;SignatureEnvironment&gt;<br> &lt;dsig:Signature Id=&quot;signature-1-1&quot; xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;<br> &lt;dsig:SignedInfo&gt;
- ...
- &lt;dsig:Reference Id=&quot;reference-1-1&quot; URI=&quot;#xpointer(id(&amp;apos;signed-data-1-1-1&amp;apos;)/node())&quot;&gt;
- ...
- &lt;/dsig:Reference&gt;
- ...
- &lt;/dsig:SignedInfo&gt;
- ...
- &lt;dsig:Object Id=&quot;signed-data-1-1-1&quot;&gt;Diese Daten werden signiert.&lt;/dsig:Object&gt;
- &lt;/dsig:Signature&gt;<br> &lt;/SignatureEnvironment&gt;<br>&lt;/CreateXMLSignatureResponse&gt;</pre>
- <p></p>
- <p><code>CreateXMLSignatureResponse</code> enth&auml;lt je erzeugter Signatur ein Element <code>SignatureEnvironment</code> (in diesem Fall genau ein Element). <code>SignatureEnvironment</code> enth&auml;lt die von SS erzeugte XML-Signatur, die im obigen Request spezifiziert wurde. Man erkennt, dass die XML-Signatur genau ein Daten-Objekt unterzeichnet (ein <code>dsig:Reference</code> Element ist enthalten). Das unterzeichnete Datenobjekt ist in der Signaturstruktur selbst enthalten (<code>enveloping</code>), und zwar in einem <code>dsig:Object</code> Element. </p>
- <h4><a name="webservice_xmlrequests_erstellungxml_daten" id="webservice_xmlrequests_erstellungxml_daten"></a>2.1.1.2 Angabe der zu signierenden Daten </h4>
- <h5>Request</h5>
- <p>Dieses Beispiel stellt die vielf&auml;ltigen M&ouml;glichkeiten vor, wie MOA SS mitgeteilt werden kann, welche Daten signiert (wenn keine Transformationen angegeben werden) bzw. als Eingangsdaten f&uuml;r die Berechnung der Transformationen verwendet werden sollen (wenn Transformationen angegeben werden).</p>
- <p>Mit <a href="../../clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.xml" target="_blank"><code>CreateXMLSignatureRequest.Refs.xml</code></a> sollen insgesamt neun Datenobjekte signiert werden:</p>
- <pre>&lt;CreateXMLSignatureRequest
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;<br> &lt;KeyIdentifier&gt;KG_allgemein&lt;/KeyIdentifier&gt;<br> &lt;SingleSignatureInfo SecurityLayerConformity=&quot;false&quot;&gt;</pre>
- <p>Die Signatur soll mit dem Schl&uuml;ssel <code>KG_allgemein</code> erstellt werden; jene Elemente, die speziell f&uuml;r eine Security-Layer V1.1 konforme Signatur notwendig sind (vergleiche <a href="#webservice_xmlrequests_erstellungxml_simple" class="term">Einfaches Beispiel</a>), brauchen nicht erstellt zu werden (<code>SecurityLayerConformity=&quot;false&quot;</code>).</p>
- <pre> &lt;DataObjectInfo Structure=&quot;enveloping&quot; ChildOfManifest=&quot;true&quot;&gt;
- &lt;DataObject&gt;
- &lt;Base64Content&gt;RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu&lt;/Base64Content&gt;
- &lt;/DataObject&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;text/plain&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;</pre>
- <p>Die Daten sollen in der <span class="term">Enveloping</span> Form in die Signatur integriert werden, d. h. die Daten werden in einem <code>dsig:Object</code> als Teil der XML-Struktur der Signatur aufgenommen (<code>Structure=&quot;enveloping&quot;</code>). Weiters sollen die Daten nicht &uuml;ber &uuml;ber eine <code>dsig:Reference</code> in <code>dsig:SignedInfo</code>, sondern &uuml;ber eine <code>dsig:Reference</code> in einem eigenen <code>dsig:Manifest</code> aufgenommen werden (<code>ChildOfManifest=&quot;true&quot;</code>).</p>
- <p>Die Daten selbst werden explizit in base64 kodierter Form als Inhalt des Elements <code>Base64Content</code> angegeben. Das Attribut <code>DataObject/@Reference</code> darf nicht angegeben werden, da die Daten in der <span class="term">Enveloping</span> Form integriert werden sollen, und <code>Base64Content</code> verwendet wird.</p>
- <p>Es werden - wie in allen &uuml;brigen F&auml;llen dieses Beispiels - keine Transformationen angegeben. Der Mime-Type der zu signierenden Daten wird als <code>text/plain</code> angegeben, da der Inhalt von <code>Base64Content</code> die base64-Kodierung des Texts <code>Diese Daten waren base64 kodiert.</code> ist. </p>
- <pre>
- &lt;DataObjectInfo Structure=&quot;enveloping&quot; ChildOfManifest=&quot;false&quot;&gt;
- &lt;DataObject&gt;
- &lt;XMLContent&gt;&lt;doc:XMLDocument xmlns:doc=&quot;urn:document&quot;&gt;
- &lt;doc:Paragraph&gt;Ich bin der erste Absatz in diesem Dokument.&lt;/doc:Paragraph&gt;
- &lt;doc:Paragraph ParaId=&quot;Para2&quot;&gt;Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.&lt;/doc:Paragraph&gt;
-&lt;/doc:XMLDocument&gt;&lt;/XMLContent&gt;
- &lt;/DataObject&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;application/xml&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
- <p>Die Daten sollen in der <span class="term">Enveloping</span> Form in die Signatur integriert werden, d. h. die Daten werden in einem <code>dsig:Object</code> als Teil der XML-Struktur der Signatur aufgenommen (<code>Structure=&quot;enveloping&quot;</code>). Diesmal sollen die Daten direkt &uuml;ber eine <code>dsig:Reference</code> in <code>dsig:SignedInfo</code> aufgenommen werden (<code>ChildOfManifest=&quot;false&quot;</code>).</p>
- <p>Die Daten selbst werden explizit als XML-Fragment als Inhalt des Elements <code>XMLContent</code> angegeben. Das Attribut <code>DataObject/@Reference</code> darf nicht angegeben werden, da die Daten in der <span class="term">Enveloping</span> Form integriert werden sollen, und <code>XMLContent</code> verwendet wird.</p>
- <p>Der Mime-Type der zu signierenden Daten wird als <code>application/xml</code> angegeben.</p>
-<pre>
- &lt;DataObjectInfo Structure=&quot;enveloping&quot; ChildOfManifest=&quot;false&quot;&gt;
- &lt;DataObject Reference=&quot;http://localhost:8080/referencedData/Text.txt&quot;/&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;text/plain&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>Die Daten sollen in der <span class="term">Enveloping</span> Form in die Signatur integriert werden, d. h. die Daten werden in einem <code>dsig:Object</code> als Teil der XML-Struktur der Signatur aufgenommen (<code>Structure=&quot;enveloping&quot;</code>). Wiederum sollen die Daten direkt &uuml;ber eine <code>dsig:Reference</code> in <code>dsig:SignedInfo</code> aufgenommen werden (<code>ChildOfManifest=&quot;false&quot;</code>).
-</p>
-<p>Die Daten werden diesmal nicht explizit angegeben, sondern mittels der URL in <code>DataObject/@Reference</code> referenziert. MOA SS versucht diese URL aufzul&ouml;sen, um zu den zu signierenden Daten zu gelangen. <code>Base64Content</code> oder <code>XMLContent</code> oder <code>LocRefContent</code> d&uuml;rfen nicht verwendet werden, da die Daten in der <span class="term">Enveloping</span> Form integriert werden sollen, und bereits <code>DataObject/@Reference</code> eingesetzt wird. </p>
-<p>Der Mime-Type der zu signierenden Daten wird als <code>text/plain</code> angegeben.</p>
-<pre>
- &lt;DataObjectInfo Structure=&quot;enveloping&quot; ChildOfManifest=&quot;false&quot;&gt;
- &lt;DataObject&gt;
- &lt;LocRefContent&gt;http://localhost:8080/referencedData/Text.txt&lt;/LocRefContent&gt;
- &lt;/DataObject&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;text/plain&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>Die Daten sollen wiederum in der <span class="term">Enveloping</span> Form in die Signatur integriert werden, d. h. die Daten werden in einem <code>dsig:Object</code> als Teil der XML-Struktur der Signatur aufgenommen (<code>Structure=&quot;enveloping&quot;</code>). Wiederum sollen die Daten direkt &uuml;ber eine <code>dsig:Reference</code> in <code>dsig:SignedInfo</code> aufgenommen werden (<code>ChildOfManifest=&quot;false&quot;</code>). </p>
-<p>Die Daten werden wie im vorhergehenden Fall nicht explizit angegeben, sondern referenziert. Diesmal wird die URL jedoch nicht <code>DataObject/@Reference</code> verwendet, sondern als Textinhalt des Elements <code>LocRefContent</code> (<code>LocRef</code> steht f&uuml;r <span class="term">Location Reference</span>). <code>DataObject/@Reference</code> darf in diesem Fall nicht verwendet werden. Diese Methode ist semantisch v&ouml;llig ident mit dem vorhergehenden Fall. </p>
-<p>Der Mime-Type der zu signierenden Daten wird als <code>text/plain</code> angegeben.</p>
-<pre>
- &lt;DataObjectInfo Structure=&quot;detached&quot; ChildOfManifest=&quot;true&quot;&gt;
- &lt;DataObject Reference=&quot;http://localhost:8080/referencedData/Text.b64&quot;&gt;
- &lt;Base64Content&gt;RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu&lt;/Base64Content&gt;
- &lt;/DataObject&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;text/plain&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>Die Daten sollen diesmal in der <span class="term">Detached</span> Form in die Signatur aufgenommen werden, d. h. die Daten werden nicht direkt in die Signaturstruktur integriert, sondern lediglich mittels URI im Attribut <code>URI</code> der anzufertigenden <code>dsig:Reference</code> referenziert (<code>Structure=&quot;detached&quot;</code>). Die Daten sollen indirekt &uuml;ber eine <code>dsig:Reference</code> eines <code>dsig:Manifest</code>s aufgenommen werden (<code>ChildOfManifest=&quot;true&quot;</code>). </p>
-<p>Die URI in <code>DataObject/@Reference</code> enth&auml;lt dabei die URI, die zur Referenzierung in <code>dsig:Reference/@URI</code> aufgenommen werden soll. Die Daten selbst hingegen werden im diesem Beispiel explizit in base64 kodierter Form als Inhalt des Elements <code>Base64Content</code> angegeben. MOA SS l&ouml;st also keine URL zur Erlangung der Daten auf, sondern verwendet den Inhalt von <code>Base64Content</code>. </p>
-<p>Der Mime-Type der zu signierenden Daten wird als <code>text/plain</code> angegeben.</p>
-<pre>
- &lt;DataObjectInfo Structure="detached" ChildOfManifest="false"&gt;
- &lt;DataObject Reference="NichtAufloesbareReferenz1"&gt;
- &lt;XMLContent&gt;&lt;doc:XMLDocument xmlns:doc="urn:document"&gt;
- &lt;doc:Paragraph&gt;Ich bin der erste Absatz in diesem Dokument.&lt;/doc:Paragraph&gt;
- &lt;doc:Paragraph ParaId="Para2"&gt;Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.&lt;/doc:Paragraph&gt;
-&lt;/doc:XMLDocument&gt;&lt;/XMLContent&gt;
- &lt;/DataObject&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;application/xml&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>Die Daten sollen auch diesmal in der <span class="term">Detached</span> Form in die Signatur aufgenommen werden, d. h. die Daten werden nicht direkt in die Signaturstruktur integriert, sondern lediglich mittels URI im Attribut <code>URI</code> der anzufertigenden <code>dsig:Reference</code> referenziert (<code>Structure=&quot;detached&quot;</code>). Diesmal sollen die Daten direkt &uuml;ber eine <code>dsig:Reference</code> in <code>dsig:SignedInfo</code> aufgenommen werden (<code>ChildOfManifest=&quot;false&quot;</code>).
-</p>
-<p>Die URI in <code>DataObject/@Reference</code> enth&auml;lt dabei die URI, die zur Referenzierung in <code>dsig:Reference/@URI</code> aufgenommen werden soll. Die Daten selbst hingegen werden im diesem Beispiel explizit als XML-Fragment in <code>XMLContent</code> angegeben. MOA SS l&ouml;st auch hier keine URL zur Erlangung der Daten auf, sondern verwendet den Inhalt von <code>XMLContent</code>. Zur Verdeutlichung dieses Umstandes wurde die URI in <code>DataObject/@Reference</code> auf einen Wert gesetzt, der von MOA SS ganz sicher nicht aufgel&ouml;st werden kann (<code>NichtAufloesbareReferenz1</code>). </p>
-<p>Der Mime-Type der zu signierenden Daten wird als <code>application/xml</code> angegeben.</p>
-<pre>
- &lt;DataObjectInfo Structure=&quot;detached&quot; ChildOfManifest=&quot;false&quot;&gt;
- &lt;DataObject Reference=&quot;http://localhost:8080/referencedData/Text.txt&quot;&gt;
- &lt;/DataObject&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;text/plain&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>Wiederum sollen die Daten in der <span class="term">Detached</span> Form in die Signatur aufgenommen werden (<code>Structure=&quot;detached&quot;</code>). Wie zuvor sollen die Daten direkt &uuml;ber eine <code>dsig:Reference</code> in <code>dsig:SignedInfo</code> aufgenommen werden (<code>ChildOfManifest=&quot;false&quot;</code>). </p>
-<p>Die URI in <code>DataObject/@Reference</code> enth&auml;lt dabei die URI, die zur Referenzierung in <code>dsig:Reference/@URI</code> aufgenommen werden soll. Nachdem eine explizite Angabe der Daten mittels <code>Base64Content</code>, <code>XMLContent</code> oder <code>LocRefContent</code> unterbleibt, wird MOA SS versuchen, die URI in <code>dsig:Reference/@URI</code> als URL aufzul&ouml;sen, um so zu den zu signierenden Daten zu gelangen. </p>
-<p>Der Mime-Type der zu signierenden Daten wird als <code>text/plain</code> angegeben.</p>
-<pre>
- &lt;DataObjectInfo Structure=&quot;detached&quot; ChildOfManifest=&quot;false&quot;&gt;
- &lt;DataObject Reference=&quot;NichtAufloesbareReferenz2&quot;&gt;
- &lt;LocRefContent&gt;http://localhost:8080/referencedData/Text.txt&lt;/LocRefContent&gt;
- &lt;/DataObject&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;text/plain&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>Wiederum sollen die Daten in der <span class="term">Detached</span> Form in die Signatur aufgenommen werden (<code>Structure=&quot;detached&quot;</code>). Wie zuvor sollen die Daten direkt &uuml;ber eine <code>dsig:Reference</code> in <code>dsig:SignedInfo</code> aufgenommen werden (<code>ChildOfManifest=&quot;false&quot;</code>).</p>
-<p>Die URI in <code>DataObject/@Reference</code> enth&auml;lt dabei die URI, die zur Referenzierung in <code>dsig:Reference/@URI</code> aufgenommen werden soll. Den Hinweis, wie MOA SS zu den zu signierenden Daten gelangen soll, ist jedoch in LocRefContent enthalten. MOA SS wird also versuchen, die dort enthaltene URL aufzul&ouml;sen, um zu den zu signierenden Daten zu gelangen. Zur Verdeutlichung dieses Umstandes wurde die URI in <code>DataObject/@Reference</code> auf einen Wert gesetzt, der von MOA SS ganz sicher nicht aufgel&ouml;st werden kann (<code>NichtAufloesbareReferenz2</code>). Diese Art der Datenangabe kann eingesetzt werden, wenn die Daten zum Zeitpunkt der Signaturerstellung von einem anderen Ort bezogen werden m&uuml;ssen, als sp&auml;ter dann bei der Signaturpr&uuml;fung.</p>
-<p>Der Mime-Type der zu signierenden Daten wird als <code>text/plain</code> angegeben.</p>
-<pre>
- &lt;DataObjectInfo Structure=&quot;detached&quot; ChildOfManifest=&quot;false&quot;&gt;
- &lt;DataObject Reference=&quot;&quot;/&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#enveloped-signature&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;application/xml&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>Im letzten Fall schlie&szlig;lich sollen wiederum Daten in der <span class="term">Detached</span> Form in die Signatur aufgenommen werden (<code>Structure=&quot;detached&quot;</code>). Wie zuvor sollen die Daten direkt &uuml;ber eine <code>dsig:Reference</code> in <code>dsig:SignedInfo</code> aufgenommen werden (<code>ChildOfManifest=&quot;false&quot;</code>).</p>
-<p>Die Referenz auf die zu signierenden Daten ist wiederum in <code>DataObject/@Reference</code> enthalten; sie verweist diesmal jedoch nicht auf ein externes Dokument, sondern auf das gesamte (XML-)Dokument, in das die zu erstellende Signatur integriert werden soll, und zwar, indem <code>DataObject/@Reference</code> den leeren String (<code>&quot;&quot;</code>) enth&auml;lt. Nachdem dadurch zwangsl&auml;ufig auch die Signatur in den zu signierenden Daten enthalten w&auml;re, wird die Signatur durch die Angabe einer Enveloped Signature Transform aus den zu signierenden Daten herausgenommen, bevor dar&uuml;ber der Hashwert berechnet wird (dsig:Transform).</p>
-<p>Offen bleibt die Frage, wie MOA SS nun wei&szlig;, in welches (XML-)Dokument es die die Signatur integrieren soll. Siehe dazu die Erl&auml;uterungen zum n&auml;chsten Ausschnitts des Requests. </p>
-<p>Der Mime-Type der zu signierenden Daten wird als <code>application/xml</code> angegeben.</p>
-<pre>
- &lt;CreateSignatureInfo&gt;
- &lt;CreateSignatureEnvironment&gt;
- &lt;LocRefContent&gt;http://localhost:8080/referencedData/XMLDocument.xml&lt;/LocRefContent&gt;
- &lt;/CreateSignatureEnvironment&gt;
- &lt;CreateSignatureEnvironmentProfile&gt;
- &lt;CreateSignatureLocation Index=&quot;4&quot; xmlns:doc=&quot;urn:document&quot;&gt;/doc:XMLDocument&lt;/CreateSignatureLocation&gt;
- &lt;/CreateSignatureEnvironmentProfile&gt;
- &lt;/CreateSignatureInfo&gt;
-</pre>
-<p>Das Element <code>CreateSignatureInfo</code> ist grunds&auml;tzlich optional, und muss nur angegeben werden, wenn die zu erstellende Signatur von MOA SS in ein bestehendes XML-Dokument integriert werden soll (was in diesem Beispiel ja der Fall ist).</p>
-<p><code>CreateSignatureEnvironment</code> enth&auml;lt das XML-Dokument, in das die zu erstellende Signatur integriert werden soll. In diesem Beispiel wird dieses Dokument mit Hilfe von <code>LocRefContent</code> referenziert, d. h. MOA SS wird versuchen, die darin enthaltene URL aufzul&ouml;sen, um das XML-Dokument zu erhalten. Alternativ k&ouml;nnte auch <code>Base64Content</code> (explizite Angabe des XML-Dokuments in base64 kodierter Form) oder <code>XMLContent</code> (direkte Angabe des XML-Dokuments im Request) verwendet werden.</p>
-<p><a name="webservice_xmlrequests_erstellungxml_daten_hinweisCreateSignatureLocation"></a><code>CreateSignatureLocation</code> enth&auml;lt die Angabe jener Stelle, an der die Signatur in das XML-Dokument eingesetzt werden soll. Der Inhalt dieses Elements bezeichnet mittels <span class="term">XPath</span>-Ausdruck das <span class="term">Parent</span>-Element der Signatur, der Wert des Attributs <code>CreateSignatureLocation/@Index</code> enth&auml;lt den Offset innerhalb dieses <span class="term">Parent</span>-Elements. Betrachten Sie zur Verdeutlichung das XML-Dokument <a href="../../clients/common/referencedData/XMLDocument.xml" target="_blank"><code>XMLDocument.xml</code></a>, in das die Signatur integriert werden soll: Die Signatur soll unmittelbar nach dem zweiten <code>doc:Paragraph</code> Element in das XML-Dokument eingef&uuml;gt werden. Der Inhalt von <code>CreateSignatureLocation</code> (<code>/doc:XMLDocument</code>) selektiert das zuk&uuml;nftige <span class="term">Parent</span>-Element der Signatur, also <code>doc:XMLDocument</code>. Das Attribut <code>Index</code> enth&auml;lt deshalb den Wert <code>4</code> (und nicht etwa <code>2</code> oder <code>3</code>), da erstens bei <code>0</code> zu z&auml;hlen begonnen wird, und zweitens auch die Text-Knoten, die lediglich Whitespace enthalten, f&uuml;r diesen Offset z&auml;hlen (um diese Textknoten erkennen zu k&ouml;nnen, m&uuml;ssen Sie das XML-Dokument in einem Text-Editor &ouml;ffnen). Beachten Sie weiters, dass das im <span class="term">XPath</span>-Ausdruck verwendete Namespace-Prefix <code>doc</code> im Kontext des Elements <code>CreateSignatureLocation</code> bekannt sein muss. Deshalb enth&auml;lt dieses Element auch die entsprechende Namespace-Deklaration (<code>xmlns:doc=&quot;urn:document&quot;</code>).</p>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml" target="_blank">CreateXMLSignatureRequest.Refs.resp.xml</a></code> ist eine typische Response des SS Webservices auf den obigen Request. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass die dargestellte Response zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
-<pre>
-&lt;CreateXMLSignatureResponse
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;SignatureEnvironment&gt;
- &lt;doc:XMLDocument xmlns:doc=&quot;urn:document&quot;&gt;
- &lt;doc:Paragraph&gt;Ich bin der erste Absatz in diesem Dokument.&lt;/doc:Paragraph&gt;
- &lt;doc:Paragraph ParaId=&quot;Para2&quot;&gt;Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.&lt;/doc:Paragraph&gt;&lt;dsig:Signature Id=&quot;signature-1-1&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/2001/04/xmldsig-more#ecdsa-sha1&quot;/&gt;
-</pre>
-<p>Die Antwort enth&auml;lt in <code>SignatureEnvironment</code> das Ergebnis der Signaturerstellung. Nachdem die Signatur in ein bestehendes XML-Dokument integriert werden sollte, enth&auml;lt <code>SignatureEnvironment</code> das Dokument-Element dieses XML-Dokuments (<code>doc:XMLDocument</code>). Man erkennt auch gut, dass die XML-Signatur als f&uuml;nfter Kindknoten (Offset <code>4</code>) von <code>doc:XMLDocument</code> eingef&uuml;gt wurde.</p>
-<pre>
- &lt;dsig:Reference Id=&quot;reference-1-2&quot; URI=&quot;#xpointer(id(&apos;signed-data-1-2-1&apos;)/node())&quot;&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;A8ml6/aZKCmj1hONwvLItIwGHoc=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Diese <code>dsig:Reference</code> wurde auf Grund des zweiten <code>DataObjectInfo</code> Elements im Request erstellt. Man erkennt gut den Verweis in <code>dsig:Reference/@URI</code> auf das <code>dsig:Object</code>, das die signierten Daten enth&auml;lt (der XPointer verweist auf s&auml;mtliche Kindknoten jenes Elements, das ein ID-Attribut mit dem Wert <code>signed-data-1-2-1</code> aufweist, des ersten vorkommenden <code>dsig:Object</code>s der Signatur). </p>
-<pre>
- &lt;dsig:Reference Id=&quot;reference-1-3&quot; URI=&quot;#xpointer(id(&apos;signed-data-1-3-1&apos;)/node())&quot;&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#base64&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;0P878Dsmtxv5goj+6KgNmj6S/EE=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Diese <code>dsig:Reference</code> wurde auf Grund des dritten <code>DataObjectInfo</code> Elements im Request erstellt. Die Text-Daten wurden von der angegebenen URL (<code>http://localhost:8080/referencedData/Text.txt</code>) aufgel&ouml;st und in das <code>dsig:Object</code> mit dem ID-Attribut <code>signed-data-1-3-1</code> gesteckt. Um Probleme mit nicht in XML darstellbare Zeichen zu vermeiden, wurde der Text nicht direkt signiert, sondern in base64 kodierter Form in das <code>dsig:Object</code> integriert, und eine Transformation zur base64 Dekodierung spezifiziert. </p>
-<pre>
- &lt;dsig:Reference Id=&quot;reference-1-4&quot; URI=&quot;#xpointer(id(&apos;signed-data-1-4-1&apos;)/node())&quot;&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#base64&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;0P878Dsmtxv5goj+6KgNmj6S/EE=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Diese <code>dsig:Reference</code> wurde auf Grund des vierten <code>DataObjectInfo</code> Elements im Request erstellt. Wie schon bei der Beschreibung des Requests angef&uuml;hrt, ist die erstellte<code> dsig:Reference</code> semantisch genau gleich wie die vorhergehende. </p>
-<pre>
- &lt;dsig:Reference Id=&quot;reference-1-6&quot; URI=&quot;NichtAufloesbareReferenz1&quot;&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;2b83+NbXDFijHzz+sH0T7fM36sA=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Diese <code>dsig:Reference</code> wurde auf Grund des sechsten <code>DataObjectInfo</code> Elements im Request erstellt. Die zu signierenden Daten wurden aus dem <code>XMLContent</code> des Requests entnommen, als Wert von <code>dsig:Reference/@URI</code> wurde der Wert von <code>DataObjectInfo/@Reference</code> &uuml;bernommen. </p>
-<pre>
- &lt;dsig:Reference Id=&quot;reference-1-7&quot; URI=&quot;http://localhost:8080/referencedData/Text.txt&quot;&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;0P878Dsmtxv5goj+6KgNmj6S/EE=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Diese <code>dsig:Reference</code> wurde auf Grund des siebenten <code>DataObjectInfo</code> Elements im Request erstellt. Um zu den zu signierenden Daten zu gelangen, wurde von MOA SS die URL in <code>DataObjectInfo/@Reference</code> aufgel&ouml;st. Gleicherma&szlig;en wurde die URL in <code>dsig:Reference/@URI</code> &uuml;bernommen. </p>
-<pre>
- &lt;dsig:Reference Id=&quot;reference-1-8&quot; URI=&quot;NichtAufloesbareReferenz2&quot;&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;0P878Dsmtxv5goj+6KgNmj6S/EE=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Diese <code>dsig:Reference</code> wurde auf Grund des achten <code>DataObjectInfo</code> Elements im Request erstellt. Um zu den zu signierenden Daten zu gelangen, wurde von MOA SS die URL in LocRefContent aufgel&ouml;st. In <code>dsig:Reference/@URI</code> wurde der Wert aus <code>DataObjectInfo/@Reference</code> &uuml;bernommen.</p>
-<pre>
- &lt;dsig:Reference Id=&quot;reference-1-9&quot; URI=&quot;&quot;&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#enveloped-signature&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;2b83+NbXDFijHzz+sH0T7fM36sA=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Diese <code>dsig:Reference</code> wurde auf Grund des neunten <code>DataObjectInfo</code> Elements im Request erstellt. Als zu signierende Daten wurde das XML-Dokument ausgew&auml;hlt, in das die XML-Signatur integriert werden solle. Vor der Berechnung des Hashwerts wurde eine <span class="term">Enveloped Signature</span> Transformation zwischengeschaltet, welche die XML-Struktur der Signatur selbst aus den Hash-Eingangsdaten herausschneidet. </p>
-<pre>
- &lt;dsig:Reference Type=&quot;http://www.w3.org/2000/09/xmldsig#Manifest&quot; URI=&quot;#dsig-manifest-1-1&quot;&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;mNsxUkFoF46XZVBivBo4aasFCTQ=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Diese <code>dsig:Reference</code> verweist auf das <code>dsig:Manifest</code> weiter unten in der XML-Struktur der Signatur. Das <code>dsig:Manifest</code> wurde angelegt, weil bei zwei <code>DataObjectInfo</code>s im Request das Attribut <code>ChildOfManifest</code> auf den Wert <code>true</code> gesetzt wurde.</p>
-<pre>
- &lt;/dsig:SignedInfo&gt;
- &lt;dsig:SignatureValue&gt;...&lt;/dsig:SignatureValue&gt;
- &lt;dsig:KeyInfo&gt;...&lt;/dsig:KeyInfo&gt;
- &lt;dsig:Object Id=&quot;signed-data-1-2-1&quot;&gt;
- &lt;doc:XMLDocument xmlns:doc=&quot;urn:document&quot;&gt;
- &lt;doc:Paragraph&gt;Ich bin der erste Absatz in diesem Dokument.&lt;/doc:Paragraph&gt;
- &lt;doc:Paragraph ParaId=&quot;Para2&quot;&gt;Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.&lt;/doc:Paragraph&gt;
- &lt;/doc:XMLDocument&gt;
- &lt;/dsig:Object&gt;
- &lt;dsig:Object Id=&quot;signed-data-1-3-1&quot;&gt;RGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4=&lt;/dsig:Object&gt;
- &lt;dsig:Object Id=&quot;signed-data-1-4-1&quot;&gt;RGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4=&lt;/dsig:Object&gt;
- &lt;dsig:Object Id=&quot;signed-data-1-1-1&quot;&gt;RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu&lt;/dsig:Object&gt;
-</pre>
-<p><code>SignatureValue</code> und <code>KeyInfo</code> werden an dieser Stelle nicht n&auml;her betrachtet.</p>
-<p>Das erste <code>dsig:Object</code> enth&auml;lt die Daten aus dem zweiten <code>DataObjectInfo</code>; das zweite <code>dsig:Object</code> jene aus dem dritten <code>DataObjectInfo</code>; das dritte <code>dsig:Object</code> jene aus dem vierten <code>DataObjectInfo</code>; das vierte <code>dsig:Object</code> schlie&szlig;lich jene aus dem ersten <code>DataObjectInfo</code>.</p>
-<pre>
- &lt;dsig:Object&gt;
- &lt;dsig:Manifest Id=&quot;dsig-manifest-1-1&quot;&gt;
- &lt;dsig:Reference Id=&quot;reference-1-1&quot; URI=&quot;#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())&quot;&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#base64&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;a53jOsL7KbyltpByAK87FoMZphI=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
- &lt;dsig:Reference Id=&quot;reference-1-5&quot; URI=&quot;http://localhost:8080/referencedData/Text.b64&quot;&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;a53jOsL7KbyltpByAK87FoMZphI=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
- &lt;/dsig:Manifest&gt;
- &lt;/dsig:Object&gt;
-</pre>
-<p>Das f&uuml;nfte <code>dsig:Object</code> enth&auml;lt das <code>dsig:Manifest</code>, das von MOA SS auf Grund des ersten bzw. f&uuml;nften <code>DataObjectInfo</code> des Requests erstellt wurde. Darin enthalten sind die zum ersten und f&uuml;nten <code>DataObjectInfo</code> korrespondierenden <code>dsig:Reference</code> Elemente. Die Daten f&uuml;r die erste im <code>dsig:Manifest</code> enthaltene <code>dsig:Reference</code> wurden aus dem <code>Base64Content</code> Element des ersten <code>DataObjectInfo</code> entnommen, jene f&uuml;r die zweite <code>dsig:Reference</code> aus dem <code>Base64Content</code> Element des f&uuml;nften <code>DataObjectInfo</code>. Der Wert des <code>URI</code> Attributs der zweiten <code>dsig:Reference</code> wurde aus dem <code>DataObject/@Reference</code> des f&uuml;nften <code>DataObjectInfo</code> &uuml;bernommen. </p>
-<h4><a name="webservice_xmlrequests_erstellungxml_transformationen" id="webservice_xmlrequests_erstellungxml_transformationen"></a>2.1.1.3 Transformationen</h4>
-<h5>Request</h5>
-<p>Dieses Beispiel (<a href="../../clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml" target="_blank"><code>CreateXMLSignatureRequest.Transforms.xml</code></a>) stellt die wichtigsten Transformationen vor, die von MOA SS bei der Erstellung einer Signatur verwendet werden k&ouml;nnen. Eine Transformation bzw. eine Kette mehrerer hintereinandergeschalteter Transformationen werden auf die Referenz-Eingangsdaten (also jene Daten, die in DataObjectInfo/DataObject angegeben werden) angewendet; das Ergebnis flie&szlig;t dann in die Hashwert-Berechnung ein. </p>
-<pre>&lt;CreateXMLSignatureRequest
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;<br> &lt;KeyIdentifier&gt;KG_allgemein&lt;/KeyIdentifier&gt;<br> &lt;SingleSignatureInfo SecurityLayerConformity=&quot;false&quot;&gt;</pre>
-<p>Die Signatur soll mit dem Schl&uuml;ssel <code>KG_allgemein</code> erstellt werden; jene Elemente, die speziell f&uuml;r eine Security-Layer V1.1 konforme Signatur notwendig sind (vergleiche <a href="#webservice_xmlrequests_erstellungxml_simple" class="term">Einfaches Beispiel</a>), brauchen nicht erstellt zu werden (<code>SecurityLayerConformity=&quot;false&quot;</code>).</p>
-<pre>
- &lt;DataObjectInfo Structure=&quot;detached&quot;&gt;
- &lt;DataObject Reference=&quot;http://localhost:8080/referencedData/Text.b64&quot;/&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#base64&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;text/plain&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>F&uuml;r das erste zu signierende Datenobjekt werden die Referenz-Eingangsdaten mittels <code>DataObject/@Reference</code> referenziert, d. h. MOA SS l&ouml;st die darin enthaltene URL auf, um zu den Daten zu gelangen. Es handelt sich dabei um einen <a href="../../clients/common/referencedData/Text.b64" target="_blank">base64 kodierten Text</a>.</p>
-<p>Unterschrieben werden soll nun aber nicht dieser base64 kodierte Text, sondern der entsprechend dekodierte Text. Dies l&auml;sst sich elegant durch die Angabe einer <span class="term"><a href="http://www.w3.org/TR/xmldsig-core/#sec-Base-64" target="_blank">Base64 Decoding</a></span><a href="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/#sec-Base-64" target="_blank"> Transformation</a> bewerkstelligen. Dazu wird als erstes Kindelement von <code>CreateTransformsInfo</code> ein <code>dsig:Transforms</code> Element im Request angegeben. Dieses <code>dsig:Transforms</code> Element nimmt ein oderer mehrere <code>dsig:Transform</code> Elemente auf, wobei jedes <code>dsig:Transform</code> Element f&uuml;r eine Transformation steht. In unserem Fall wird nur eine einzige Transformation ben&ouml;tigt; die Angabe, um welche Transformation es sich handelt, wird durch das Attribut <code>dsig:Transform/@Algorithm</code> angegeben. F&uuml;r die <span class="term">Base64 Decoding</span> Transformation muss der Wert auf <code>http://www.w3.org/2000/09/xmldsig#base64</code> gesetzt werden. Sie ist eine parameterlose Transformation, d. h. <code>dsig:Transform</code> hat keine Kindelemente.</p>
-<p>Der Mime-Type der zu signierenden Daten wird als <code>text/plain</code> angegeben, da ja tats&auml;chlich nach der durchgef&uuml;hrten Transformation dekodierter Text vorliegt, &uuml;ber den dann der Hashwert berechnet wird. </p>
-<pre>
- &lt;DataObjectInfo Structure=&quot;detached&quot;&gt;
- &lt;DataObject Reference=&quot;http://localhost:8080/referencedData/XMLDocument.xml&quot;/&gt;
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;
- &lt;xp2:XPath
- xmlns:xp2=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;
- xmlns:doc=&quot;urn:document&quot;
- Filter=&quot;subtract&quot;&gt;/doc:XMLDocument/doc:Paragraph[2]&lt;/xp2:XPath&gt;
- &lt;/dsig:Transform&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/TR/1999/REC-xslt-19991116&quot;&gt;
- &lt;xsl:stylesheet version=&quot;1.0&quot;
- xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot; xmlns:doc=&quot;urn:document&quot;&gt;
- &lt;xsl:output encoding=&quot;UTF-8&quot; method=&quot;xml&quot; indent=&quot;yes&quot;/&gt;
- &lt;xsl:template match=&quot;/doc:XMLDocument&quot;&gt;
- &lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;
- &lt;head&gt;
- &lt;title&gt;HTML-Dokument&lt;/title&gt;
- &lt;/head&gt;
- &lt;body&gt;
- &lt;xsl:for-each select=&quot;doc:Paragraph&quot;&gt;
- &lt;p&gt;
- &lt;xsl:value-of select=&quot;child::text()&quot;/&gt;
- &lt;/p&gt;
- &lt;/xsl:for-each&gt;
- &lt;/body&gt;
- &lt;/html&gt;
- &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;&lt;/dsig:Transform&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/TR/2001/REC-xml-c14n-20010315&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;application/xhtml+xml&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
- &lt;/CreateTransformsInfo&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>F&uuml;r das zweite zu signierende Datenobjekt werden die Referenz-Eingangsdaten wiederum mittels <code>DataObject/@Reference</code> referenziert, d. h. MOA SS l&ouml;st die darin enthaltene URL auf, um zu den Daten zu gelangen. Es handelt sich dabei um ein <a href="../../clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.xml" target="_blank">XML-Dokument</a>.</p>
-<p>Zun&auml;chst soll von diesem XML-Dokument jedoch ein Teil weggeschnitten werden, da er nicht mitsigniert werden soll. F&uuml;r diesen Zweck bietet sich die<a href="http://www.w3.org/TR/2002/REC-xmldsig-filter2-20021108/" target="_blank" class="term"> XPath Filter 2 Transformation</a> an. Das Attribut <code>dsig:Transform/@Algorithm</code> ist dazu auf den Wert <code>http://www.w3.org/2002/06/xmldsig-filter2</code> zu setzen. Diese Transformation ben&ouml;tigt weiters Transformationsparameter. Diese werden als Kindelement <code>xp2:XPath</code> in <code>dsig:Transform</code> angegeben. Das Attribut <code>Filter</code> selektiert den Filtermodus; f&uuml;r das Bespiel wird den Modus <code>subtract</code> ben&ouml;tigt, da ein Teil weggefiltert werden soll. Der Textinhalt von <code>xp2:XPath</code> ist ein XPath-Ausdruck, der den Wurzelknoten jenes Teilbaums selektiert, der weggefiltert werden soll. F&uuml;r das Beispiel soll das zweite <code>doc:Paragraph</code> Element des XML-Dokuments weggefiltert werden. Beachten Sie, dass das im XPath-Ausdruck verwendete Namespace-Prefix <code>doc</code> im Kontext des <code>xp2:XPath</code> Elements deklariert sein muss.</p>
-<p>Als n&auml;chstes soll nun das XML-Dokument mit Hilfe eines Stylesheets in ein XHTML-Dokument &uuml;bergef&uuml;hrt werden. Dazu kann die <a href="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/#sec-XSLT" target="_blank" class="term">XSLT Transformation</a> verwendet werden. Das Attribut <code>dsig:Transform/@Algorithm</code> ist dazu auf den Wert <code>http://www.w3.org/TR/1999/REC-xslt-19991116</code> zu setzen. Auch diese Transformation ben&ouml;tigt Transformationsparameter: Als Kindelement von <code>dsig:Transform</code> wird jener Stylesheet angegeben, mit dem die Stylesheet-Transformation ausgef&uuml;hrt werden soll.</p>
-<p>Abschlie&szlig;end soll, wie in der Spezifikation der<span class="term"> XSLT-Transformation</span> <a href="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/#sec-XSLT" target="_blank">empfohlen</a>, eine Kanonisierungstransformation angewendet werden. Damit k&ouml;nnen Unterschiede im Output unterschiedlicher XSLT-Engines, wie sie in der Praxis vorkommen, abgefangen werden. Beachten Sie, dass als Voraussetzung dazu die Output-Methode im Stylesheet auf <code>xml</code> festgelegt werden muss (<code>&lt;xsl:output method=&quot;xml&quot;&gt;</code>), denn nur XML-Output kann anschlie&szlig;end kanonisiert werden. Das Attribut <code>dsig:Transform/@Algorithm</code> ist f&uuml;r die <a href="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/#sec-c14nAlg" target="_blank"><span class="term">Canonical XML Transformation</span></a> auf den Wert http://www.w3.org/TR/2001/REC-xml-c14n-20010315 zu setzen. Die Transformation ben&ouml;tigt keine Transformationsparameter.</p>
-<p>Das Ergebnis der drei hintereinandergeschalteten Transformationen, welches der Hashwert-Berechnung zuflie&szlig;t, finden Sie <a href="../../clients/webservice/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt" target="_blank">hier</a>. </p>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml" target="_blank">CreateXMLSignatureRequest.Transforms.resp.xml</a></code> ist eine typische Response des SS Webservices auf den obigen Request. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass die dargestellte Response zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
-<pre>
-&lt;CreateXMLSignatureResponse
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;SignatureEnvironment&gt;
- &lt;dsig:Signature Id=&quot;signature-1-1&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/2001/04/xmldsig-more#ecdsa-sha1&quot;/&gt;
-</pre>
-<p>Die Antwort enth&auml;lt in <code>SignatureEnvironment</code> das Ergebnis der Signaturerstellung. Nachdem die Signatur in kein bestehendes Dokument eingef&uuml;gt werden sollte, enh&auml;lt <code>SignatureEnvironment</code> direkt die erzeugte XML-Signatur (<code>dsig:Signature</code>).</p>
-<pre>
- &lt;dsig:Reference Id=&quot;reference-1-1&quot; URI=&quot;http://localhost:8080/referencedData/Text.b64&quot;&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#base64&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;a53jOsL7KbyltpByAK87FoMZphI=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Die erste <code>dsig:Reference</code> wurde auf Grund des ersten <code>DataObjectInfo</code> im Request erstellt. Man erkennt dass die URL auf die Referenz-Eingangsdaten (Wert des Attributs <code>dsig:Reference/@URI</code>) aus <code>DataObject/@Reference</code> &uuml;bernommen und eine <span class="term">Base64 Decoding Transformation</span> eingef&uuml;gt w&uuml;rde. Die im Request spezifizierten Transformationen werden also eins zu eins in die XML-Signatur &uuml;bernommen.</p>
-<pre>
- &lt;dsig:Reference Id=&quot;reference-1-2&quot; URI=&quot;http://localhost:8080/referencedData/XMLDocument.xml&quot;&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;
- &lt;xp2:XPath Filter=&quot;subtract&quot; xmlns:doc=&quot;urn:document&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;
- xmlns:xf2=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;
- xmlns:xp2=&quot;http://www.w3.org/2002/06/xmldsig-filter2&quot;&gt;/doc:XMLDocument/doc:Paragraph[2]&lt;/xp2:XPath&gt;
- &lt;/dsig:Transform&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/TR/1999/REC-xslt-19991116&quot;&gt;
- &lt;xsl:stylesheet version=&quot;1.0&quot;
- xmlns:doc=&quot;urn:document&quot; xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
- &lt;xsl:output encoding=&quot;UTF-8&quot; indent=&quot;yes&quot; method=&quot;xml&quot;/&gt;
- &lt;xsl:template match=&quot;/doc:XMLDocument&quot;&gt;...&lt;/xsl:template&gt;
- &lt;/xsl:stylesheet&gt;
- &lt;/dsig:Transform&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/TR/2001/REC-xml-c14n-20010315&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;fIPwneCpjVqTXwHMN9DFfx6tJIU=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
-</pre>
-<p>Die zweite <code>dsig:Reference</code> wurde auf Grund des zweiten <code>DataObjectInfo</code> im Request erstellt. Man erkennt auch hier gut, dass die URL auf die Referenz-Eingangsdaten (Wert des Attributs <code>dsig:Reference/@URI</code>) aus <code>DataObject/@Reference</code> &uuml;bernommen und die drei Transformationen wie im Request angegeben eingef&uuml;gt wurden. </p>
-<h4><a name="webservice_xmlrequests_erstellungxml_ergaenzungsobjekte"></a>2.1.1.4 Erg&auml;nzungsobjekte </h4>
-<h5>Request</h5>
-<p>Dieses Beispiel (<a href="../../clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.xml" target="_blank"><code>CreateXMLSignatureRequest.Supplements.xml</code></a>) stellt die Verwendung von Erg&auml;nzungsobjekten vor. Ein Erg&auml;nzungsobjekt betrifft entweder ein zu signierendes Datum (Zusammenhang mit einem <code>DataObject</code>) oder jenes Dokument, in das eine zu erzeugende Signatur eingef&uuml;gt werden soll (Zusammenhang mit <code>CreateSignatureEnvironment</code>). Es muss dann angegeben werden, wenn in einem zu signierenden Datum bzw. im Einf&uuml;gedokument auf Daten per Referenz verwiesen wird, diese referenzierten Daten aber von MOA SS nicht aufgel&ouml;st werden k&ouml;nnen. Das Erg&auml;nzungsobjekt enth&auml;lt dann genau diese Daten, die nicht von MOA SS aufgel&ouml;st werden k&ouml;nnen.</p>
-<pre>
-&lt;CreateXMLSignatureRequest
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;KeyIdentifier&gt;KG_allgemein&lt;/KeyIdentifier&gt;
- &lt;SingleSignatureInfo SecurityLayerConformity=&quot;false&quot;&gt;
-</pre>
-<p>Die Signatur soll mit dem Schl&uuml;ssel <code>KG_allgemein</code> erstellt werden; jene Elemente, die speziell f&uuml;r eine Security-Layer V1.1 konforme Signatur notwendig sind (vergleiche <a href="#webservice_xmlrequests_erstellungxml_simple" class="term">Einfaches Beispiel</a>), brauchen nicht erstellt zu werden (<code>SecurityLayerConformity=&quot;false&quot;</code>).</p>
-<pre>
- &lt;DataObjectInfo Structure=&quot;detached&quot;&gt;
- &lt;DataObject Reference=&quot;#Para2&quot;/&gt;
-</pre>
-<p>Das zu signierende Datum in diesem Beispiel ist ein Teil des Dokuments, in das die zu erstellende Signatur eingef&uuml;gt werden soll. Der Wert des <code>Reference</code> Attributs ist <code>#Para2</code>, das bedeutet, dass jenes Element des Einf&uuml;gedokuments signiert werden soll, das ein ID-Attribut mit dem Wert <code>#Para2</code> aufweist. Damit MOA SS diesen Hinweis auswerten kann, muss es das Einf&uuml;gedokument validierend parsen, denn sonst w&uuml;sste es ja nicht, welche Attribute &uuml;berhaupt ID-Attribute sind. Das zum validierenden Parsen notwendige XML-Schema wird MOA SS in diesem Beispiel &uuml;ber ein Erg&auml;nzungsobjekt zum Einf&uuml;gedokument mitgeteilt (siehe weiter unten). </p>
-<pre>
- &lt;CreateTransformsInfoProfile&gt;
- &lt;CreateTransformsInfo&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/TR/1999/REC-xslt-19991116&quot;&gt;
- &lt;xsl:stylesheet version=&quot;1.0&quot; xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
- &lt;xsl:include href=&quot;XMLDocument.Para.xsl&quot;/&gt;
-&lt;/xsl:stylesheet&gt;
- &lt;/dsig:Transform&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2001/10/xml-exc-c14n#&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;FinalDataMetaInfo&gt;
- &lt;MimeType&gt;application/xhtml+xml&lt;/MimeType&gt;
- &lt;/FinalDataMetaInfo&gt;
-</pre>
-<p>Das Beispiel enth&auml;lt als erste Transformation eine <span class="term">XSLT-Transformation</span>. Der als Kindelement von <code>dsig:Transform</code> angegebene Stylesheet verweist dabei mittels <code>xsl:include</code> auf einen weiteren Stylesheet. Dieser weitere Stylesheet kann jedoch von MOA nicht direkt aufgel&ouml;st werden, da er als relative Referenz angegeben wird. Deshalb ist es notwendig, diesen weiteren Stylesheet als Erg&auml;nzungsobjekt zu den signierenden Daten anzugeben:</p>
-<pre>
- &lt;/CreateTransformsInfo&gt;
- &lt;Supplement&gt;
- &lt;Content Reference=&quot;XMLDocument.Para.xsl&quot;&gt;
- &lt;LocRefContent&gt;http://localhost:8080/referencedData/XMLDocument.Para.xsl&lt;/LocRefContent&gt;
- &lt;/Content&gt;
- &lt;/Supplement&gt;
- &lt;/CreateTransformsInfoProfile&gt;
- &lt;/DataObjectInfo&gt;
-</pre>
-<p>Ein Erg&auml;nzungsobjekt f&uuml;r zu signierende Daten wird im entsprechenden <code>DataObjectInfo</code> Element angegeben, und zwar als Inhalt des Elements <code>CreateTransformsInfoProfile/Supplement</code>. Das verpflichtend zu verwendende Attribut <code>Content/@Reference</code> enth&auml;lt dabei die Referenz auf das Erg&auml;nzungsobjekt in exakt jener Schreibweise, wie sie in der <code>xsl:include</code> Direktive vorkommt, hier also <code>XMLDocument.Para.xsl</code>. Das Element <code>Content</code> beinhaltet das Erg&auml;nzungsobjekt so, wie es MOA SS verwenden soll (Elemente <code>Base64Content</code> oder <code>XMLContent</code>, vergleiche <a href="#webservice_xmlrequests_erstellungxml_simple"><span class="term">Einfaches Beispiel</span></a>), bzw. enth&auml;lt eine von MOA SS aufl&ouml;sbare Referenz auf das Erg&auml;nzungsobjekt (Element <code>LocRefContent</code>, vergleiche <a href="#webservice_xmlrequests_erstellungxml_simple"><span class="term">Einfaches Beispiel</span></a>). Im konkreten Beispiel wird <code>LocRefContent</code> verwendet. </p>
-<pre>
- &lt;CreateSignatureInfo&gt;
- &lt;CreateSignatureEnvironment
- Reference=&quot;http://localhost:8080/referencedData/XMLDocument.withSchemaHint.xml&quot;/&gt;
- &lt;CreateSignatureEnvironmentProfile&gt;
- &lt;CreateSignatureLocation
- Index=&quot;4&quot; xmlns:doc=&quot;urn:document&quot;&gt;/doc:XMLDocument&lt;/CreateSignatureLocation&gt;
-</pre>
-<p>Eingef&uuml;gt werden soll die zu erzeugende Signatur in ein <a href="../../clients/common/referencedData/XMLDocument.withSchemaHint.xml" target="_blank">bestehendes Dokument</a>, das MOA SS durch Aufl&ouml;sen der in <code>CreateSignatureEnvironment/@Reference</code> angegebenen URL erh&auml;lt. Eingef&uuml;gt werden soll die Signatur als f&uuml;nfter Kindknoten des Wurzelelements <code>doc:XMLDocument</code>. Beachten Sie wiederum die <a href="#webservice_xmlrequests_erstellungxml_daten_hinweisCreateSignatureLocation">Hinweise</a> zur Z&auml;hlweise f&uuml;r das Attribut <code>Index</code> bzw. zur Deklaration der im XPath-Ausdruck verwendeten Namespace-Deklarationen (hier <code>doc</code>). </p>
-<pre>
- &lt;Supplement&gt;
- &lt;Content Reference=&quot;urn:XMLDocument.xsd&quot;&gt;
- &lt;LocRefContent&gt;http://localhost:8080/referencedData/XMLDocument.xsd&lt;/LocRefContent&gt;
- &lt;/Content&gt;
- &lt;/Supplement&gt;
- &lt;/CreateSignatureEnvironmentProfile&gt;
- &lt;/CreateSignatureInfo&gt;
-</pre>
-<p>Wie oben bereits angemerkt, muss MOA SS zur Aufl&ouml;sung der ID-Referenz <code>#Para2</code> das Einf&uuml;gedokument validierend parsen. Im Einf&uuml;gedokument ist zwar nun ein Hinweis auf die dazu notwendige Grammatikinformation in Form eines XML-Schemas enthalten (Attribut <code>xsi:schemaLocation</code> enth&auml;lt den Wert <code>&quot;urn:document urn:XMLDocument.xsd&quot;</code>). Nachdem die darin angegebene URI <code>urn:XMLDocument.xsd</code> jedoch von MOA nicht direkt aufgel&ouml;st werden kann, wird im Request ein Erg&auml;nzungsobjekt zum Einf&uuml;gedokument angegeben (<code>CreateSignatureEnvironmentProfile/Supplement</code>). Das Attribut <code>Content/@Reference</code> enth&auml;lt die Referenz auf das Erg&auml;nzungsobjekt in exakt jener Schreibweise, wie sie im Attribut <code>xsi:schemaLocation</code> angegeben wurde (<code>urn:XMLDocument.xsd</code>). Das Element <code>Content</code> beinhaltet das Erg&auml;nzungsobjekt so, wie es MOA SS verwenden soll (Elemente <code>Base64Content</code> oder <code>XMLContent</code>, vergleiche <a href="#webservice_xmlrequests_erstellungxml_simple"><span class="term">Einfaches Beispiel</span></a>), bzw. enth&auml;lt eine von MOA SS aufl&ouml;sbare Referenz auf das Erg&auml;nzungsobjekt (Element <code>LocRefContent</code>, vergleiche <a href="#webservice_xmlrequests_erstellungxml_simple"><span class="term">Einfaches Beispiel</span></a>). Im konkreten Beispiel wird <code>LocRefContent</code> verwendet. </p>
-<p>Beachten Sie bitte, dass die Verwendung von Erg&auml;nzungsobjekten f&uuml;r die Mitteilung von XML-Schemata nur dann funktioniert, wenn die Referenz auf das XML-Schema in der <code>xsi:schemaLocation</code> eine absolute URI ist (also z.B. wie hier <code>urn:XMLDocument.xsd</code> oder auch <code>http://example.org/XMLDocument.xsd</code>, nicht aber z.B. <code>XMLDocument.xsd</code> oder <code>../schemas/XMLDocument.xsd</code>).</p>
-<p>Auch f&uuml;r das Aufl&ouml;sen eines Verweises in einer DTD kann in analoger Weise von Erg&auml;nzungsobjekten Gebrauch gemacht werden. </p>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml" target="_blank">CreateXMLSignatureRequest.Supplements.resp.xml</a></code> ist eine typische Response des SS Webservices auf den obigen Request. Er wird an dieser Stelle nicht n&auml;her analysiert, da er keine f&uuml;r das Thema des Beispiels relevanten Besonderheiten aufweist.</p>
-<h3><a name="webservice_xmlrequests_pruefungcms" id="webservice_xmlrequests_pruefungcms"></a>2.1.2 Pr&uuml;fung einer CMS-Signatur</h3>
-<h4><a name="webservice_xmlrequests_pruefungcms_einfach" id="webservice_xmlrequests_pruefungcms_einfach"></a>2.1.2.1 Einfaches Beispiel</h4>
-<h5>Request</h5>
-<p>Dieses Beispiel (<a href="../../clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.xml" target="_blank"><code>VerifyCMSSignatureRequest.Simple.xml</code></a>) ist ein einfacher Request zur Pr&uuml;fung einer CMS-Signatur. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass der nachfolgende Ausschnitt aus dem Request aus Gr&uuml;nden der &Uuml;bersichtlichkeit gek&uuml;rzt wurde.</p>
-<pre>
-&lt;VerifyCMSSignatureRequest
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;&gt;
- &lt;CMSSignature&gt;MIIHsAYJKo...4sLL6kpOPJaLg==&lt;/CMSSignature&gt;
- &lt;TrustProfileID&gt;Test-Signaturdienste&lt;/TrustProfileID&gt;
-&lt;/VerifyCMSSignatureRequest&gt;
-</pre>
-<p>Der Request enth&auml;lt zun&auml;chst in <code>CMSSignature</code> die zu pr&uuml;fende CMS-Signatur, und zwar in base64 kodierter Form. In diesem Beispiel wird davon ausgegangen, dass es sich dabei um eine <span class="term">Enveloping</span> Signature handelt, d. h. dass die signierten Daten als Teil der CMS-Struktur vorhanden sind. F&uuml;r die Behandlung einer <span class="term">Detached</span> Signature sei auf das <a href="#webservice_xmlrequests_pruefungcms_detached">n&auml;chste Beispiel</a> verwiesen.</p>
-<p>Abschlie&szlig;end enth&auml;lt der Request in <code>TrustProfileID</code> die Angabe des Vertrauensprofils, gegen das die Vertrauenspr&uuml;fung des Zertifikats durchgef&uuml;hrt werden soll. Ein Vertrauensprofil mit dem angegebenen Namen muss in der f&uuml;r die Signaturpr&uuml;fung verwendeten Instanz von MOA SP eingerichtet sein. </p>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml" target="_blank">VerifyCMSSignatureRequest.Simple.resp.xml</a></code> ist eine typische Response des SP Webservices auf den obigen Request. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass die dargestellte Response zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
-<pre>
-&lt;VerifyCMSSignatureResponse
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;SignerInfo&gt;
- &lt;dsig:X509Data&gt;
- &lt;dsig:X509SubjectName&gt;serialNumber=615536615920,givenName=Gregor,SN=Karlinger,
-CN=Gregor Karlinger,C=AT&lt;/dsig:X509SubjectName&gt;
- &lt;dsig:X509IssuerSerial&gt;
- &lt;dsig:X509IssuerName&gt;CN=TrustSignTest-Sig-01,OU=TrustSignTest-Sig-01,
-O=A-Trust Ges. für Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT&lt;/dsig:X509IssuerName&gt;
- &lt;dsig:X509SerialNumber&gt;2892&lt;/dsig:X509SerialNumber&gt;
- &lt;/dsig:X509IssuerSerial&gt;
- &lt;dsig:X509Certificate&gt;...&lt;/dsig:X509Certificate&gt;
- &lt;QualifiedCertificate/&gt;
- &lt;/dsig:X509Data&gt;
- &lt;/SignerInfo&gt;
-</pre>
-<p>Die Response enth&auml;lt zun&auml;chst in <code>SignerInfo/dsig:X509Data</code> Informationen &uuml;ber den Signator, die aus dem in der CMS-Signatur enthaltenen Signatorzertifikat entnommen sind. </p>
-<p><code>dsig:X509SubjectName</code> ist immer vorhanden und enth&auml;lt den Namen des Signators. <code>dsig:X509IssuerSerial</code> ist ebenfalls immer vorhanden und enth&auml;lt den Namen des Austellers des Signatorzertifikats (<code>dsig:X509IssuerName</code>) sowie die Seriennummer des Zertifikats (<code>dsig:X509SerialNumber</code>). Auch <code>dsig:X509Certificate</code> ist immer vorhanden und enth&auml;lt das Signatorzertifikat in base64 kodierter Form. </p>
-<p>Optional vorhanden ist das inhaltslose Element <code>QualifiedCertificate</code>, und zwar dann, wenn es sich beim Signatorzertifikat um ein qualifiziertes Zertifikat handelt. Ebenfalls optional vorhanden ist schlie&szlig;lich - in diesem Beispiel nicht ersichtlich - das Element <code>PublicAuthority</code>, und zwar dann, wenn das Signatorzertifikat die &ouml;sterreichspezifische Zertifikatserweiterung <a href="http://www.cio.gv.at/it-infrastructure/pki/" target="_blank">Verwaltungseigenschaft</a> aufweist. Ist in dieser Zertifikatserweiterung das Verwaltungskennzeichen mitkodiert, wird dieses Kennzeichen als Textinhalt des optionalen Elements <code>PublicAuthority/Code</code> geliefert.</p>
-<pre>
- &lt;SignatureCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/SignatureCheck&gt;
-</pre>
-<p> Anschlie&szlig;end an <code>SignerInfo</code> enth&auml;lt die Response mit <code>SignatureCheck/Code</code> das Resultat der kryptographischen Pr&uuml;fung der Signatur. In unserem Beispiel ist dort der Wert <code>0</code> enthalten, d. h. die Signatur konnte erfolgreich validiert werden. F&uuml;r eine &Uuml;bersicht der m&ouml;glichen Kodes siehe <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#signaturpruefungNachCMSAntwort" target="_blank">Security-Layer 1.2</a>.</p>
-<pre>
- &lt;CertificateCheck&gt;
- &lt;Code&gt;1&lt;/Code&gt;
- &lt;/CertificateCheck&gt;
-</pre>
-<p>Abschlie&szlig;end enth&auml;lt die Response mit <code>CertificateCheck/Code</code> das Resultat der Pr&uuml;fung des Signatorzertifikats. Zun&auml;chst pr&uuml;ft MOA SP, ob ausgehend vom Signatorzertifikat eine Zertifikatskette zu einem im zugeh&ouml;rigen Vertrauensprofil konfigurierten sog. <span class="term">Trust Anchor</span> gebildet werden kann. Gelingt dies, wird die G&uuml;ltigkeit jedes Zertifikats dieser Kette &uuml;berpr&uuml;ft. In unserem Beispiel enth&auml;lt <code>Code</code> den Wert <code>1</code>, d. h. MOA SP konnte die oben erl&auml;uterte Zertifikatskette nicht bilden. F&uuml;r eine &Uuml;bersicht der m&ouml;glichen Kodes siehe <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#signaturpruefungNachCMSAntwort" target="_blank">Security-Layer 1.2</a>.</p>
-<h4><a name="webservice_xmlrequests_pruefungcms_erweitert" id="webservice_xmlrequests_pruefungcms_erweitert"></a>2.1.2.2 Erweitertes Beispiel</h4>
-<h5>Request</h5>
-<p>Dieses erweiterte Beispiel zur Pr&uuml;fung einer CMS-Signatur (<a href="../../clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.xml" target="_blank"><code>VerifyCMSSignatureRequest.Extended.xml</code></a>) demonstriert die Pr&uuml;fung mehrerer Signatoren einer CMS-Signatur, die Angabe des Pr&uuml;fzeitpunkts sowie die Pr&uuml;fung einer <span class="term">Detached Signature</span>, d. h. einer Signatur, in der die signierten Daten nicht enthalten sind und daher extra angegeben werden m&uuml;ssen. </p>
-<pre>
-&lt;VerifyCMSSignatureRequest
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- Signatories=&quot;1&quot;&gt;
- &lt;DateTime&gt;2004-08-17T08:00:00+02:00&lt;/DateTime&gt;
- &lt;CMSSignature&gt;MIIHiwYJKoZI...kfiwsvqSk48lou&lt;/CMSSignature&gt;
- &lt;DataObject&gt;
- &lt;Content&gt;
- &lt;Base64Content&gt;RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu&lt;/Base64Content&gt;
- &lt;/Content&gt;
- &lt;/DataObject&gt;
- &lt;TrustProfileID&gt;Test-Signaturdienste&lt;/TrustProfileID&gt;
-&lt;/VerifyCMSSignatureRequest&gt;
-</pre>
-<p> Liegt eine zu pr&uuml;fende CMS-Signatur vor, die von mehreren Unterzeichnenden signiert worden ist, kann das Attribut <code>VerifyCMSSignatureRequest/@Signatories</code> verwendet werden, um jene Unterzeichnenden auszuw&auml;hlen, deren Unterschriften von MOA SP gepr&uuml;ft werden sollen. Der Default-Wert f&uuml;r dieses optionale Attribut ist <code>1</code>. Soll nicht die Unterschrift allein des ersten Unterzeichnenden gepr&uuml;ft werden, muss das Attribut explizit angegeben werden. Es enth&auml;lt dann eine oder mehrere Ganzzahlwerte, getrennt durch Leerzeichen. Jede Ganzzahl bezeichnet einen Unterzeichnenden, wobei die Reihenfolge der Auflistung der Unterzeichner in der CMS-Signatur entspricht. Der Wert <code>&quot;1 3&quot;</code> w&uuml;rde beispielsweise aussagen, dass MOA SP die Unterschrift des ersten sowie des dritten Unterzeichnenden pr&uuml;fen soll.</p>
-<p>Mit dem optionalen Element <code>DateTime</code> kann der Zeitpunkt der Signaturpr&uuml;fung explizit vorgegeben werden. Inhalt dieses Elements ist die Angabe von Datum und Uhrzeit entsprechend dem XML-Schema Datentyp <a href="http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/#dateTime" target="_blank"><span class="term">dateTime</span></a>. Enth&auml;lt der angegebene Zeitpunkt keinen Zeitzonen-Offset zur UTC, wird der Zeitpunkt als lokale Zeit des Servers interpretiert, auf dem MOA SP l&auml;uft. Wird <code>DateTime</code> nicht angegeben, versucht MOA SP, den Zeitpunkt der Signaturerstellung aus der Signatur zu ermitteln (anhand des Signaturattributs <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#ref-etsicms" target="_blank" class="term">SigningTime</a>). Enth&auml;lt die Signatur keinen Zeitpunkt der Signaturerstellung, verwendet MOA SP die aktuelle Systemzeit des Servers, auf dem es l&auml;uft. </p>
-<p>Das optionale Element <code>DataObject</code> muss dann angegeben werden, wenn eine <span class="term">Detached Signature</span> gepr&uuml;ft werden soll, d. h. wenn in der CMS-Signatur die signierten Daten nicht mitkodiert sind. In <code>DataObject/Content/Base64Content</code> sind in einem solchen Fall diese Daten in base64 kodierter Form bereit zu stellen.</p>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml" target="_blank">VerifyCMSSignatureRequest.Extended.resp.xml</a></code> ist eine typische Response des SP Webservices auf den obigen Request. Er wird an dieser Stelle nicht n&auml;her analysiert, da er keine f&uuml;r das Thema des Beispiels relevanten Besonderheiten aufweist.</p>
-<h3><a name="webservice_xmlrequests_pruefungxml"></a>2.1.3 Pr&uuml;fen einer XML-Signatur</h3>
-<h4><a name="webservice_xmlrequests_pruefungxml_einfach"></a>2.1.3.1 Einfaches Beispiel</h4>
-<h5>Request</h5>
-<p><code><a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.xml" target="_blank">VerifyXMLSignatureRequest.Simple.xml</a></code> ist ein einfacher XML-Request zur Pr&uuml;fung einer XML-Signatur. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass der dargestellte Request zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
-<pre>
-&lt;VerifyXMLSignatureRequest xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;&gt;
- &lt;VerifySignatureInfo&gt;
- &lt;VerifySignatureEnvironment&gt;
- &lt;XMLContent&gt;
- &lt;dsig:Signature Id=&quot;signature-1-1&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/2001/04/xmldsig-more#ecdsa-sha1&quot;/&gt;
- &lt;dsig:Reference Id=&quot;reference-1-1&quot; URI=&quot;#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())&quot;&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;tLODyeiWFbAkQKwhrR23jtcgu4k=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
- &lt;/dsig:SignedInfo&gt;
- &lt;dsig:SignatureValue&gt;...&lt;/dsig:SignatureValue&gt;
- &lt;dsig:KeyInfo&gt;...&lt;/dsig:KeyInfo&gt;
- &lt;dsig:Object Id=&quot;signed-data-1-1-1&quot;&gt;Diese Daten werden signiert.&lt;/dsig:Object&gt;
- &lt;/dsig:Signature&gt;
- &lt;/XMLContent&gt;
- &lt;/VerifySignatureEnvironment&gt;
-</pre>
-<p>Das Element <code>VerifySignatureEnvironment</code> enth&auml;lt jenes XML-Dokument, das die zu pr&uuml;fende XML-Signatur enth&auml;lt. Auch hier stehen eine Reihe von M&ouml;glichkeiten zur Verf&uuml;gung, dieses XML-Dokument anzugeben. Im Beispiel wurde das Element <code>XMLContent</code> verwendet; alternativ stehen die Elemente <code>Base64Content</code> und <code>LocRefContent</code> bzw. gleichwertig zu <code>LocRefContent</code> das Attribut <code>Reference</code> zur Verf&uuml;gung.</p>
-<p>Im konkreten Beispiel enth&auml;lt das angegebene XML-Dokument direkt als Root-Element die zu pr&uuml;fende Signatur (<code>dsig:Signature</code>). Es handelt sich dabei um eine <span class="term">Enveloping Signature</span>, d. h. die signierten Daten sind in einem <code>dsig:Object</code> als Teil der XML-Struktur der Signatur kodiert. Tats&auml;chlich signiert ist hier die Zeichenkette <code>Diese Daten werden signiert.</code></p>
-<pre>
- &lt;VerifySignatureLocation
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;/dsig:Signature&lt;/VerifySignatureLocation&gt;
- &lt;/VerifySignatureInfo&gt;
-</pre>
-<p>Das Element <code>VerifySignatureLocation</code> enth&auml;lt als Text den XPath-Ausdruck zur Selektion der XML-Signatur innerhalb des zu pr&uuml;fenden XML-Dokuments. Die Auswertung des XPath-Ausdrucks muss genau ein Element <code>dsig:Signature</code> ergeben. Bitte beachten Sie, dass im Kontext des Elements <code>VerifySignatureLocation</code> alle im XPath-Ausdruck verwendeten Namespace-Pr&auml;fixe bekannt sein m&uuml;ssen (hier das Pr&auml;fix <code>dsig</code>). </p>
-<pre>
- &lt;TrustProfileID&gt;Test-Signaturdienste&lt;/TrustProfileID&gt;
-&lt;/VerifyXMLSignatureRequest&gt;
-</pre>
-<p>Das Element <code>TrustProfileID</code> schlie&szlig;lich enth&auml;lt den Bezeichner des Vertrauensprofils, gegen das die Zertifikatspr&uuml;fung von MOA SP durchgef&uuml;hrt wird. Ein Vertrauensprofil enth&auml;lt die Zertifikate jene Zertifizierungsdiensteanbieter, denen als Aussteller von Signatorzertifikaten vertraut wird. Ein Vertrauensprofil mit dem gew&auml;hlten Namen (hier <code>Test-Signaturdienste</code>) muss in der Konfiguration von MOA SP hinterlegt sein. </p>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml" target="_blank">VerifyXMLSignatureRequest.Simple.resp.xml</a></code> ist eine typische Response des SP Webservices auf den obigen Request. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass die dargestellte Response zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
-<pre>
-&lt;VerifyXMLSignatureResponse
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;SignerInfo&gt;
- &lt;dsig:X509Data&gt;
- &lt;dsig:X509SubjectName&gt;CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,
- O=Stabsstelle IKT-Strategie des Bundes,C=AT&lt;/dsig:X509SubjectName&gt;
- &lt;dsig:X509IssuerSerial&gt;
- &lt;dsig:X509IssuerName&gt;CN=Test CA - Signaturdienste,OU=Technik und Standards,
- O=Stabstelle IKT-Strategie des Bundes,C=AT&lt;/dsig:X509IssuerName&gt;
- &lt;dsig:X509SerialNumber&gt;9&lt;/dsig:X509SerialNumber&gt;
- &lt;/dsig:X509IssuerSerial&gt;
- &lt;dsig:X509Certificate&gt;...&lt;/dsig:X509Certificate&gt;
- &lt;PublicAuthority&gt;
- &lt;Code&gt;BKA-IKT&lt;/Code&gt;
- &lt;/PublicAuthority&gt;
- &lt;/dsig:X509Data&gt;
- &lt;/SignerInfo&gt;
-</pre>
-<p>Die Response enth&auml;lt zun&auml;chst in <code>SignerInfo/dsig:X509Data</code> Informationen &uuml;ber den Signator, die aus dem in der XML-Signatur enthaltenen Signatorzertifikat entnommen sind. </p>
-<p><code>dsig:X509SubjectName</code> ist immer vorhanden und enth&auml;lt den Namen des Signators. <code>dsig:X509IssuerSerial</code> ist ebenfalls immer vorhanden und enth&auml;lt den Namen des Austellers des Signatorzertifikats (<code>dsig:X509IssuerName</code>) sowie die Seriennummer des Zertifikats (<code>dsig:X509SerialNumber</code>). Auch <code>dsig:X509Certificate</code> ist ist immer vorhanden und enth&auml;lt das Signatorzertifikat in base64 kodierter Form. </p>
-<p>Optional vorhanden - in diesem Beispiel nicht ersichtlich - ist das inhaltslose Element <code>QualifiedCertificate</code>, und zwar dann, wenn es sich beim Signatorzertifikat um ein qualifiziertes Zertifikat handelt. Ebenfalls optional vorhanden ist schlie&szlig;lich das Element <code>PublicAuthority</code>, und zwar dann, wenn das Signatorzertifikat die &ouml;sterreichspezifische Zertifikatserweiterung <a href="http://www.cio.gv.at/it-infrastructure/pki/" target="_blank">Verwaltungseigenschaft</a> aufweist. Ist in dieser Zertifikatserweiterung das Verwaltungskennzeichen mitkodiert, wird dieses Kennzeichen als Textinhalt des optionalen Elements <code>PublicAuthority/Code</code> geliefert.</p>
-<pre>
- &lt;SignatureCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/SignatureCheck&gt;
-</pre>
-<p> Anschlie&szlig;end an <code>SignerInfo</code> enth&auml;lt die Response mit <code>SignatureCheck/Code</code> das Resultat der kryptographischen Pr&uuml;fung der Signatur. In unserem Beispiel ist dort der Wert <code>0</code> enthalten, d. h. die Signatur konnte erfolgreich validiert werden. F&uuml;r eine &Uuml;bersicht der m&ouml;glichen Kodes siehe <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#signaturpruefungNachXMLDSIGAntwort" target="_blank">Security-Layer 1.2</a>.</p>
-<pre>
- &lt;CertificateCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/CertificateCheck&gt;
-</pre>
-<p>Abschlie&szlig;end enth&auml;lt die Response mit <code>CertificateCheck/Code</code> das Resultat der Pr&uuml;fung des Signatorzertifikats. Zun&auml;chst pr&uuml;ft MOA SP, ob ausgehend vom Signatorzertifikat eine Zertifikatskette zu einem im zugeh&ouml;rigen Vertrauensprofil konfigurierten sog. <span class="term">Trust Anchor</span> gebildet werden kann. Gelingt dies, wird die G&uuml;ltigkeit jedes Zertifikats dieser Kette &uuml;berpr&uuml;ft. In unserem Beispiel enth&auml;lt <code>Code</code> den Wert <code>0</code>, d. h. MOA SP konnte die Kette bilden, und alle Zertifikate der Kette sind g&uuml;ltig. F&uuml;r eine &Uuml;bersicht der m&ouml;glichen Kodes siehe <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#signaturpruefungNachCMSAntwort" target="_blank">Security-Layer 1.2</a>.</p>
-<h4><a name="webservice_xmlrequests_pruefungxml_erweitert"></a>2.1.3.2 Erweitertes Beispiel </h4>
-<h5>Request</h5>
-<p>Dieses erweiterte Beispiel zur Pr&uuml;fung einer XML-Signatur (<a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml" target="_blank"><code>VerifyXMLSignatureRequest.Enveloped.xml</code></a>) demonstriert die Pr&uuml;fung einer <span class="term">Enveloped Signature</span>, d. h. einer Signatur, die in ein XML-Dokument integriert ist, die Angabe des Pr&uuml;fzeitpunkts sowie die Anweisung an MOA SP, in der Response die von der Signatur abgedeckten Daten zu retournieren.</p>
-<pre>
-&lt;VerifyXMLSignatureRequest xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;&gt;
- &lt;DateTime&gt;2004-08-18T17:00:00+02:00&lt;/DateTime&gt;
-</pre>
-<p>Mit dem optionalen Element <code>DateTime</code> kann der Zeitpunkt der Signaturpr&uuml;fung explizit vorgegeben werden. Inhalt dieses Elements ist die Angabe von Datum und Uhrzeit entsprechend dem XML-Schema Datentyp <a href="http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/#dateTime" target="_blank"><span class="term">dateTime</span></a>. Enth&auml;lt der angegebene Zeitpunkt keinen Zeitzonen-Offset zur UTC, wird der Zeitpunkt als lokale Zeit des Servers interpretiert, auf dem MOA SP l&auml;uft. Wird <code>DateTime</code> nicht angegeben, versucht MOA SP, den Zeitpunkt der Signaturerstellung aus der Signatur zu ermitteln (anhand des Signaturattributs <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#ref-etsicms" target="_blank" class="term">SigningTime</a>). Enth&auml;lt die Signatur keinen Zeitpunkt der Signaturerstellung, verwendet MOA SP die aktuelle Systemzeit des Servers, auf dem es l&auml;uft.</p>
-<pre>
- &lt;VerifySignatureInfo&gt;
- &lt;VerifySignatureEnvironment Reference=&quot;http://localhost:8080/referencedData/XMLDocument.signed.xml&quot;/&gt;
- &lt;VerifySignatureLocation xmlns:doc=&quot;urn:document&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;/doc:XMLDocument/dsig:Signature&lt;/VerifySignatureLocation&gt;
- &lt;/VerifySignatureInfo&gt;
-</pre>
-<p>Das Element <code>VerifySignatureEnvironment</code> enth&auml;lt in diesem Fall mit dem Attribut <code>Reference</code> eine Referenz auf das XML-Dokument (<code><a href="../../clients/common/referencedData/XMLDocument.signed.xml" target="_blank">XMLDocument.signed.xml</a></code>), das die zu pr&uuml;fende Signatur beinhaltet. Als Textinhalt von <code>VerifySignatureLocation</code> ist ein XPath-Ausdruck angegeben, der die zu pr&uuml;fende Signatur innerhalb des XML-Dokuments ausw&auml;hlt. Bitte beachten Sie, dass im Kontext des Elements <code>VerifySignatureLocation</code> alle im XPath-Ausdruck verwendeten Namespace-Pr&auml;fixe bekannt sein m&uuml;ssen (hier die Pr&auml;fixe <code>doc</code> und <code>dsig</code>). </p>
-<pre>
- &lt;ReturnHashInputData/&gt;
- &lt;TrustProfileID&gt;Test-Signaturdienste&lt;/TrustProfileID&gt;
-&lt;/VerifyXMLSignatureRequest&gt;
-</pre>
-<p>Durch Angabe des optionalen, leeren Elements <code>ReturnHashInputData</code> wird MOA SP angewiesen, im Response jene Daten zur&uuml;ckzuliefern, die von der Signatur abgedeckt sind, d. h. tats&auml;chlich signiert wurden (siehe unten). Diese Information ist f&uuml;r die MOA SP verwendende Anwendung essentiell, da sie wissen muss, ob tats&auml;chlich die von ihr geforderten Daten signiert wurden. Wird <code>HashInputData</code> im Request nicht angegeben, muss die Anwendung selbst die Signatur analysieren, um diese Information zu erhalten. </p>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml" target="_blank">VerifyXMLSignatureRequest.Enveloped.resp.xml</a></code> ist eine typische Response des SP Webservices auf den obigen Request. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass die dargestellte Response zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
-<pre>
-&lt;VerifyXMLSignatureResponse
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;SignerInfo&gt;
- &lt;dsig:X509Data&gt;...&lt;/dsig:X509Data&gt;
- &lt;/SignerInfo&gt;
-</pre>
-<p>Die Response enth&auml;lt zun&auml;chst in <code>SignerInfo/dsig:X509Data</code> Informationen &uuml;ber den Signator, die aus dem in der XML-Signatur enthaltenen Signatorzertifikat entnommen sind (siehe <a href="#webservice_xmlrequests_pruefungxml_einfach">Einfaches Beispiel</a>).</p>
-<pre>
- &lt;HashInputData PartOf=&quot;SignedInfo&quot;&gt;
- &lt;Base64Content&gt;PGRvYzp...hNTERvY3VtZW50Pg==&lt;/Base64Content&gt;
- &lt;/HashInputData&gt;
-</pre>
-<p>Wurde im Request - so wie in diesem Beispiel - das Element <code>ReturnHashInputData</code> angegeben, enth&auml;lt
- die Response nach <code>SignerInfo</code> f&uuml;r jede <code>dsig:Reference</code> in <code>dsig:SignedInfo</code> der
- XML-Signatur (bzw. auch f&uuml;r jede <code>dsig:Reference</code> aus einem <code>dsig:Manifest</code>, auf
- das mittels des Attributs <code>Type=&quot;http://www.w3.org/2000/09/xmldsig#Manifest&quot;</code> in einer <code>dsig:Reference</code> aus <code>dsig:SignedInfo</code> verwiesen
- wird; solche Manifeste kommen aber in diesem Beispiel nicht vor) ein Element <code>HashInputData</code>.</p>
-<p>Die Reihenfolge der <code>HashInputData</code>-Elemente
- entspricht der Reihenfolge der <code>dsig:Reference</code>-Elemente in <code>dsig:SignedInfo</code> der
- XML-Signatur (enth&auml;lt die XML-Signatur auch <code>dsig:Manifest</code>-Elemente, auf die jeweils in einer <code>dsig:Reference</code> aus <code>dsig:SignedInfo</code> verwiesen wird, werden zuerst <code>HashInputData</code>-Elemente f&uuml;r alle <code>dsig:Reference</code>-Elemente
- aus <code>dsig:SignedInfo</code> und anschlie&szlig;end <code>HashInputData</code>-Elemente f&uuml;r alle <code>dsig:Reference</code>-Elemente
- aus den einzelnen <code>dsig:Manifest</code>-Elementen geliefert). </p>
-<p>Das Attribut PartOf weist mit dem Wert SignedInfo darauf hin, dass die <code>dsig:Reference</code>,
-f&uuml;r welche die Hasheingangsdaten gelten, Teil von <code>dsig:SignedInfo</code> ist (f&uuml;r eine <code>dsig:Reference</code> aus
-einem <code>dsig:SignedInfo</code> w&uuml;rde der gelieferte Wert <code>XMLDSIGManifest</code> lauten; weiters
-w&uuml;rde<code> HashInputData</code> in einem solchen Fall ein weiteres Attribut
-
-
-<code>ReferringSigReference</code> aufweisen, dessen Wert die Nummer jener <code>dsig:Reference</code> aus <code>dsig:SignedInfo </code>als
-positive Ganzzahl repr&auml;sentiert, die auf das beinhaltende <code>dsig:Manifest</code> verweist.). </p>
-<p>Der Inhalt wird dabei stets mittels <code>Base64Content</code> in
- base64-kodierter Form geliefert.</p>
-<pre>
- &lt;SignatureCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/SignatureCheck&gt;
- &lt;CertificateCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/CertificateCheck&gt;
-&lt;/VerifyXMLSignatureResponse&gt;
-</pre>
-<p>Die Elemente <code>SignatureCheck</code> und <code>CertificateCheck</code> enthalten die Resultate der kryptographischen Pr&uuml;fung der Signatur sowie der Zertifikatspr&uuml;fung (siehe <a href="#webservice_xmlrequests_pruefungxml_einfach">Einfaches Beispiel</a>).</p>
-<h4><a name="webservice_xmlrequests_pruefungxml_xmldsigmanifest"></a>2.1.3.3 Pr&uuml;fung eines XMLDSIG-Manifests </h4>
-<h5>Request</h5>
-<p>Dieses Beispiel zur Pr&uuml;fung einer XML-Signatur (<a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml" target="_blank"><code>VerifyXMLSignatureRequest.XMLDSigManifest.xml</code></a>) demonstriert die Pr&uuml;fung eines in der XML-Signatur vorhandenden <a href="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/#sec-Manifest" target="_blank">Manifests nach XMLDSig</a>. Bitte beachten Sie, dass der dargestellte Request zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
-<pre>
-&lt;VerifyXMLSignatureRequest
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;VerifySignatureInfo&gt;
- &lt;VerifySignatureEnvironment&gt;
- &lt;XMLContent&gt;
- &lt;dsig:Signature xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot; Id=&quot;signature-1-1&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/2001/04/xmldsig-more#ecdsa-sha1&quot;/&gt;
- &lt;dsig:Reference Type=&quot;http://www.w3.org/2000/09/xmldsig#Manifest&quot; URI=&quot;#dsig-manifest-1-1&quot;&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;nUUaW6OtcsNvV/QhqmkU2QXT1Mw=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
- &lt;/dsig:SignedInfo&gt;
- &lt;dsig:SignatureValue&gt;315gCwZI...OXFwr+&lt;/dsig:SignatureValue&gt;
- &lt;dsig:KeyInfo&gt;...&lt;/dsig:KeyInfo&gt;
- &lt;dsig:Object Id=&quot;signed-data-1-1-1&quot;&gt;Diese Daten sind signiert.&lt;/dsig:Object&gt;
- &lt;dsig:Object&gt;
- &lt;dsig:Manifest Id=&quot;dsig-manifest-1-1&quot;&gt;
- &lt;dsig:Reference Id=&quot;reference-1-1&quot; URI=&quot;#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())&quot;&gt;
- &lt;dsig:DigestMethod Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#sha1&quot;/&gt;
- &lt;dsig:DigestValue&gt;EYxznGxNRAIcHQeUsj+zsK+uaHA=&lt;/dsig:DigestValue&gt;
- &lt;/dsig:Reference&gt;
- &lt;/dsig:Manifest&gt;
- &lt;/dsig:Object&gt;
- &lt;/dsig:Signature&gt;
- &lt;/XMLContent&gt;
- &lt;/VerifySignatureEnvironment&gt;
-</pre>
-<p>Das Element <code>VerifySignatureEnvironment</code> enth&auml;lt als <code>XMLContent</code> die zu pr&uuml;fende XML-Signatur. Man erkennt, dass sich die einzige <code>dsig:Reference</code> im <code>dsig:SignedInfo</code> der XML-Signatur auf ein Manifest nach XMLDSig bezieht (erkennbar am Attribut <code>Type</code>, das auf den Wert <code>http://www.w3.org/2000/09/xmldsig#Manifest</code> gesetzt ist). Im Response (siehe unten) werden wir deshalb ein eigenes Resultat f&uuml;r die Manifest-Pr&uuml;fung erhalten.</p>
-<p>Das Manifest selbst ist in einem <code>dsig:Object</code>, also innerhalb der XML-Struktur der XML-Signatur kodiert. Es enth&auml;lt eine <code>dsig:Reference</code>, welche sich auf die Zeichenkette <code>Diese Daten sind signiert.</code> bezieht.</p>
-<pre>
- &lt;VerifySignatureLocation&gt;//dsig:Signature&lt;/VerifySignatureLocation&gt;
- &lt;/VerifySignatureInfo&gt;
- &lt;TrustProfileID&gt;Test-Signaturdienste&lt;/TrustProfileID&gt;
-&lt;/VerifyXMLSignatureRequest&gt;
-</pre>
-<p>Das Element <code>VerifySignatureLocation</code> w&auml;hlt die zu pr&uuml;fende Signatur innerhalb des in <code>VerifySignatureEnvironment</code> angegebenen XML-Dokuments aus. Das Element <code>TrustProfileID</code> w&auml;hlt das Vertrauensprofil aus, gegen das die Zertifikatspr&uuml;fung durchgef&uuml;hrt werden soll. </p>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml" target="_blank">VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml</a></code> ist eine typische Response des SP Webservices auf den obigen Request. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass die dargestellte Response zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
-<pre>
-&lt;VerifyXMLSignatureResponse
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;SignerInfo&gt;
- &lt;dsig:X509Data&gt;...&lt;/dsig:X509Data&gt;
- &lt;/SignerInfo&gt;
- &lt;SignatureCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/SignatureCheck&gt;
-</pre>
-<p>Die Response enth&auml;lt zun&auml;chst in <code>SignerInfo/dsig:X509Data</code> Informationen &uuml;ber den Signator, die aus dem in der XML-Signatur enthaltenen Signatorzertifikat entnommen sind (siehe <a href="#webservice_xmlrequests_pruefungxml_einfach">Einfaches Beispiel</a>). Das Element<code> SignatureCheck</code> enth&auml;lt das Resultat der kryptographischen Pr&uuml;fung der Signatur (siehe <a href="#webservice_xmlrequests_pruefungxml_einfach">Einfaches Beispiel</a>).</p>
-<pre>
- &lt;XMLDSIGManifestCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;Info&gt;
- &lt;ReferringSigReference&gt;1&lt;/ReferringSigReference&gt;
- &lt;/Info&gt;
- &lt;/XMLDSIGManifestCheck&gt;
-</pre>
-<p>Neu ist in dieser Response das an <code>SignatureCheck</code> anschlie&szlig;ende Element <code>XMLDSIGManifestCheck</code>. Ein oder mehrere solche Elemente werden immer dann zur&uuml;ckgeliefert, wenn in <code>dsig:SignedInfo</code> der XML-Signatur <code>dsig:Reference</code> Elemente existieren, die sich auf ein Manifest nach XMLDSIG beziehen (siehe oben). Je solcher <code>dsig:Reference</code> enth&auml;lt die Antwort ein korrespondierendes Element <code>XMLDSIGManifestCheck</code>, im konkreten Beispiel als eines.</p>
-<p>Das Element <code>Code</code> gibt das Ergebnis der durchgef&uuml;hrten Pr&uuml;fung des XMLDSIG-Manifests an. In diesem Fall bedeutet <code>0</code>, dass die Pr&uuml;fung jeder <code>dsig:Reference </code>im <code>dsig:Manifest</code> (im konkreten Beispiel also genau einer <code>dsig:Reference</code>) erfolgreich durchgef&uuml;hrt werden konnte. F&uuml;r eine &Uuml;bersicht der m&ouml;glichen Kodes siehe <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#signaturpruefungNachXMLDSIGAntwort" target="_blank">Security-Layer 1.2</a>.</p>
-<p>Das Element <code>Info/ReferringSigReference</code> enth&auml;lt als Textinhalt die Nummer jenes <code>dsig:Reference</code> Elements in <code>dsig:SignedInfo</code> der XML-Signatur, welches auf das untersuchte Manifest nach XMLDSIG verweist, wobei mit <code>1</code> zu z&auml;hlen begonnen wird.</p>
-<pre>
- &lt;CertificateCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/CertificateCheck&gt;
-&lt;/VerifyXMLSignatureResponse&gt;
-</pre>
-<p>Das Element<code> CertificateCheck</code> enth&auml;lt das Resultat der Zertifikatspr&uuml;fung (siehe <a href="#webservice_xmlrequests_pruefungxml_einfach">Einfaches Beispiel</a>).</p>
-<h4><a name="webservice_xmlrequests_pruefungxml_ergaenzungsobjekte"></a>2.3.1.4 Erg&auml;nzungsobjekte </h4>
-<p>Dieses Beispiel zur Pr&uuml;fung einer XML-Signatur (<a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.xml" target="_blank"><code>VerifyXMLSignatureRequest.Supplements.xml</code></a>) demonstriert die Verwendung von Erg&auml;nzungsobjekten. Ein Erg&auml;nzungsobjekt betrifft entweder ein signiertes Datum (Zusammenhang mit einem <code>dsig:Reference</code> der XML-Signatur) oder jenes Dokument, in dem sich die zu pr&uuml;fende XML-Signatur befindet (Zusammenhang mit <code>VerifySignatureEnvironment</code>). Es muss dann angegeben werden, wenn auf ein signiertes Datum bzw. in einem signierten Datum bzw. in dem die XML-Signatur enthaltenden XML-Dokument auf weitere Daten per Referenz verwiesen wird, diese Referenz aber von MOA SP nicht aufgel&ouml;st werden kann. Das Erg&auml;nzungsobjekt enth&auml;lt dann genau diese Daten die nicht von MOA SS aufgel&ouml;st werden k&ouml;nnen.</p>
-<p>Bitte beachten Sie, dass der dargestellte Request zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde.</p>
-<pre>
-&lt;VerifyXMLSignatureRequest xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;&gt;
- &lt;VerifySignatureInfo&gt;
- &lt;VerifySignatureEnvironment&gt;
- &lt;XMLContent&gt;
- &lt;doc:XMLDocument ... xsi:schemaLocation=&quot;urn:document urn:XMLDocument.xsd&quot;&gt;
- &lt;doc:Paragraph&gt;Ich bin der erste Absatz in diesem Dokument.&lt;/doc:Paragraph&gt;
- &lt;doc:Paragraph ParaId=&quot;Para2&quot;&gt;Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.&lt;/doc:Paragraph&gt;
- &lt;dsig:Signature Id=&quot;signature-1-1&quot; xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;dsig:SignedInfo&gt;
- ...
- &lt;dsig:Reference Id=&quot;reference-1-1&quot; URI=&quot;#Para2&quot;&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/TR/1999/REC-xslt-19991116&quot;&gt;
- &lt;xsl:stylesheet version=&quot;1.0&quot; xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
- &lt;xsl:include href=&quot;XMLDocument.Para.xsl&quot;/&gt;
- &lt;/xsl:stylesheet&gt;
- &lt;/dsig:Transform&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2001/10/xml-exc-c14n#&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- ...
- &lt;/dsig:Reference&gt;
- &lt;/dsig:SignedInfo&gt;
- &lt;dsig:SignatureValue&gt;5rXIIkbP/djWmTgQEICy...0Sf8jvnz+d&lt;/dsig:SignatureValue&gt;
- &lt;dsig:KeyInfo&gt;...&lt;/dsig:KeyInfo&gt;
- &lt;/dsig:Signature&gt;
- &lt;/doc:XMLDocument&gt;
- &lt;/XMLContent&gt;
- &lt;/VerifySignatureEnvironment&gt;
-</pre>
-<p>Das Element <code>VerifySignatureEnvironment</code> enth&auml;lt das XML-Dokument mit der zu pr&uuml;fenden XML-Signatur. </p>
-<p>Man erkennt, dass das Attribut <code>dsig:Reference/@URI</code> das Element<code> doc:Paragraph</code> mit dem auf den Wert <code>Para2</code> gesetzten ID-Attribut <code>ParaId</code> referenziert. MOA kann jedoch den Umstand, dass es sich bei <code>doc:Paragraph/@ParaId</code> um ein ID-Attribut handelt, nur dann erkennen, wenn es das XML-Dokument validierend parst. Der dazu n&ouml;tige Verweis auf das passende XML-Schema ist zwar mit dem Attribut <code>xsi:schemaLocation</code> vorhanden, jedoch handelt es sich dabei mit <code>urn:XMLDocument.xsd</code> um eine nicht aufl&ouml;sbare Referenz. Deshalb wird im Request ein passendes Erg&auml;nzungsobjekt ben&ouml;tigt (siehe unten).</p>
-<p>Weiters erkennt man, dass <code>dsig:Reference</code> ein XSLT-Transformation enth&auml;lt. Im darin kodierten Stylesheet-Parameter (<code>dsig:Transform/xsl:stylesheet</code>) wird ein weiterer Stylesheet inkludiert (<code>XMLDocument.Para.xsl</code>). Diese Referenz ist aber wiederum f&uuml;r MOA SP nicht aufl&ouml;sbar. Auch hier wird also ein passendes Erg&auml;nzungsobjekt ben&ouml;tigt (siehe unten). </p>
-<pre>
- &lt;VerifySignatureLocation xmlns:doc=&quot;urn:document&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;/doc:XMLDocument/dsig:Signature&lt;/VerifySignatureLocation&gt;
- &lt;/VerifySignatureInfo&gt;
-</pre>
-<p>Das Element <code>VerifySignatureLocation</code> w&auml;hlt die zu pr&uuml;fende Signatur innerhalb des in <code>VerifySignatureEnvironment</code> angegebenen XML-Dokuments aus.</p>
-<pre>
- &lt;SupplementProfile&gt;
- &lt;Content Reference=&quot;XMLDocument.Para.xsl&quot;&gt;
- &lt;LocRefContent&gt;http://localhost:8080/referencedData/XMLDocument.Para.xsl&lt;/LocRefContent&gt;
- &lt;/Content&gt;
- &lt;/SupplementProfile&gt;
-</pre>
-<p>Das erste Element <code>SupplementProfile</code> enth&auml;lt nun das Erg&auml;nzungsobjekt f&uuml;r den oben beschriebenen inkludierten Stylesheet. <code>Content/@Reference</code> enth&auml;lt die Referenz genau so, wie sie oben im Attribut <code>xsl:stylesheet/@href</code> angegeben wurde. Im Inhalt von <code>Content</code> werden entweder explizit jene Daten angegeben, die von MOA statt des Aufl&ouml;sens der Referenz verwendet werden sollen (<code>Base64Content</code> oder<code> XMLContent</code>), oder aber es wird - wie im konkreten Beispiel - <code></code>mit <code>LocRefContent</code> eine aufl&ouml;sbare Referenz f&uuml;r diese Daten an MOA SP &uuml;bergeben. </p>
-<pre>
- &lt;SupplementProfile&gt;
- &lt;Content Reference=&quot;urn:XMLDocument.xsd&quot;&gt;
- &lt;XMLContent&gt;
- &lt;xs:schema targetNamespace=&quot;urn:document&quot; xmlns:xs=&quot;http://www.w3.org/2001/XMLSchema&quot;
- xmlns=&quot;urn:document&quot; elementFormDefault=&quot;qualified&quot; attributeFormDefault=&quot;unqualified&quot;&gt;
- ...
- &lt;/xs:schema&gt;
- &lt;/XMLContent&gt;
- &lt;/Content&gt;
- &lt;/SupplementProfile&gt;
- &lt;TrustProfileID&gt;Test-Signaturdienste&lt;/TrustProfileID&gt;
-&lt;/VerifyXMLSignatureRequest&gt;
-</pre>
-<p>Das zweite Element <code>SupplementProfile</code> enth&auml;lt analog das Erg&auml;nzungsobjekt f&uuml;r das oben beschriebene XML-Schema. <code>Content/@Reference</code> enth&auml;lt die Referenz genau so, wie sie oben im Attribut <code>xsi:schemaLocation</code> angegeben wurde. </p>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml" target="_blank">VerifyXMLSignatureRequest.Supplements.resp.xml</a></code> ist eine typische Response des SP Webservices auf den obigen Request. Er wird an dieser Stelle nicht n&auml;her analysiert, da er keine f&uuml;r das Thema des Beispiels relevanten Besonderheiten aufweist.</p>
-<h4><a name="webservice_xmlrequests_pruefungxml_signaturmanifest" id="webservice_xmlrequests_pruefungxml_signaturmanifest"></a>2.1.3.5 Signatur-Manifest des Security-Layers </h4>
-<h5>Request</h5>
-<p>Dieses Beispiel zur Pr&uuml;fung einer XML-Signatur (<a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml" target="_blank"><code>VerifyXMLSignatureRequest.SigManifest.xml</code></a>) demonstriert die &Uuml;berpr&uuml;fung des Zusammenhangs zwischen den <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#glossar_Referenz-Eingangsdaten" target="_blank">Referenz-Eingangsdaten</a> und den <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#glossar_Hash-Eingangsdaten" target="_blank">Hash-Eingangsdaten</a> f&uuml;r die <code>dsig:Reference</code>-Elemente einer XML-Signatur. Mit Hilfe dieser Pr&uuml;fung kann eine Anwendung feststellen, ob bei der Erstellung einer XML-Signatur jene Transformationen bzw. auch jene inkludierten Stylesheets (vgl. <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#signaturerstellungNachXMLDSIGAntwortImplTransParam" target="_blank">Implizite Transformationsparameter</a>) einer XSLT-Transformation angewendet wurden, welche die Anwendung vorgegeben hat. Bei erfolgreicher Pr&uuml;fung dieses Zusammenhangs kann die Anwendung die Referenz-Eingangsdaten einer <code>dsig:Reference</code> als gesichert ansehen, obwohl eigentlich die Hash-Eingangsdaten durch die Signatur gesichert sind. Dies ist jenen F&auml;llen sinnvoll, in denen die Anwendung grunds&auml;tzlich mit XML-Daten arbeitet, diese Daten jedoch f&uuml;r das Signieren durch eine Person in ein f&uuml;r diese Person verst&auml;ndliches Format wie z.B. HTML umgewandelt werden sollen.</p>
-<pre>
-&lt;VerifyXMLSignatureRequest
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;VerifySignatureInfo&gt;
- &lt;VerifySignatureEnvironment&gt;
- &lt;XMLContent&gt;
- &lt;doc:XMLDocument xmlns:doc=&quot;urn:document&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
- xsi:schemaLocation=&quot;urn:document http://localhost:8080/referencedData/XMLDocument.xsd&quot;&gt;
- &lt;doc:Paragraph&gt;Ich bin der erste Absatz in diesem Dokument.&lt;/doc:Paragraph&gt;
- &lt;doc:Paragraph ParaId=&quot;Para2&quot;&gt;Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.&lt;/doc:Paragraph&gt;
- &lt;dsig:Signature xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot; Id=&quot;signature-1-1&quot;&gt;
- &lt;dsig:SignedInfo&gt;
- ...
- &lt;dsig:Reference Id=&quot;reference-1-1&quot; URI=&quot;#Para2&quot;&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/TR/1999/REC-xslt-19991116&quot;&gt;
- &lt;xsl:stylesheet version=&quot;1.0&quot; xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
- &lt;xsl:include href=&quot;http://localhost:8080/referencedData/XMLDocument.Para.xsl&quot;/&gt;
- &lt;/xsl:stylesheet&gt;
- &lt;/dsig:Transform&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2001/10/xml-exc-c14n#&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- ...
- &lt;/dsig:Reference&gt;
- &lt;dsig:Reference
- Type=&quot;http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest&quot;
- URI=&quot;#manifest-1-1&quot;&gt;
- ...
- &lt;/dsig:Reference&gt;
- &lt;dsig:Reference Type=&quot;http://uri.etsi.org/01903/v1.1.1#SignedProperties&quot; ...&gt;...&lt;/dsig:Reference&gt;
- &lt;/dsig:SignedInfo&gt;
- &lt;dsig:SignatureValue&gt;jnXc/X+hUY...uBxo9q&lt;/dsig:SignatureValue&gt;
- &lt;dsig:KeyInfo&gt;...&lt;/dsig:KeyInfo&gt;
- &lt;dsig:Object&gt;
- &lt;dsig:Manifest Id=&quot;manifest-1-1&quot;&gt;
- &lt;dsig:Reference URI=&quot;http://localhost:8080/referencedData/XMLDocument.Para.xsl&quot;&gt;
- ...
- &lt;/dsig:Reference&gt;
- &lt;/dsig:Manifest&gt;
- &lt;/dsig:Object&gt;
- &lt;dsig:Object Id=&quot;etsi-signed-1-1&quot;&gt;
- &lt;etsi:QualifyingProperties Target=&quot;#signature-1-1&quot; xmlns:etsi=&quot;http://uri.etsi.org/01903/v1.1.1#&quot;&gt;
- ...
- &lt;/etsi:QualifyingProperties&gt;
- &lt;/dsig:Object&gt;
- &lt;/dsig:Signature&gt;
- &lt;/doc:XMLDocument&gt;
- &lt;/XMLContent&gt;
- &lt;/VerifySignatureEnvironment&gt;
-</pre>
-<p>Das Element <code>VerifySignatureEnvironment</code> enth&auml;lt das XML-Dokument mit der zu pr&uuml;fenden XML-Signatur. Die XML-Signatur wurde von einer B&uuml;rgerkarten-Umgebung erstellt. Man erkennt, dass das Element <code>dsig:SignedInfo</code> der XML-Signatur drei <code>dsig:Reference</code>-Elemente enth&auml;lt. </p>
-<p>Die erste <code>dsig:Reference</code> bezieht sich auf die eigentlich signierten Nutzdaten. Das zweite <code>doc:Paragraph</code>-Element stellt die Referenz-Eingangsdaten f&uuml;r diese <code>dsig:Reference</code> dar, welche mit Hilfe einer XSLT-Transformation in ein kleines HTML-Dokument &uuml;bergef&uuml;hrt wird, wor&uuml;ber dann der Hashwert der dsig:Reference gebildet wird (Hash-Eingangsdaten).</p>
-<p>Die zweite <code>dsig:Reference</code> bezieht sich auf das von der B&uuml;rgerkarten-Umgebung angefertigte Signaturmanifest. Das Signaturmanifest ist vorhanden, weil die XSLT-Transformation der ersten <code>dsig:Reference</code> einen weiteren Stylesheet inkludiert, und die Daten dieses weiteren Stylesheets ansonsten nicht von der XML-Signatur abgedeckt w&auml;ren (vgl. <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html#signaturerstellungNachXMLDSIGAntwortImplTransParam" target="_blank">Implizite Transformationsparameter</a>). Das Signaturmanifest enth&auml;lt eine einzige <code>dsig:Reference</code>, die den inkludierten Stylesheet referenziert und so in die XML-Signatur einbindet.</p>
-<p>Die dritte <code>dsig:Reference</code> bezieht sich auf die von der B&uuml;rgerkarten-Umgebung angefertigten Signatureigenschaften, die hier nicht n&auml;her betrachtet werden. </p>
-<pre>
- &lt;VerifySignatureLocation xmlns:doc=&quot;urn:document&quot;&gt;/doc:XMLDocument/dsig:Signature&lt;/VerifySignatureLocation&gt;
- &lt;/VerifySignatureInfo&gt;
-</pre>
-<p>Das Element <code>VerifySignatureLocation</code> w&auml;hlt die zu pr&uuml;fende Signatur innerhalb des in <code>VerifySignatureEnvironment</code> angegebenen XML-Dokuments aus.</p>
-<pre>
- &lt;SignatureManifestCheckParams ReturnReferenceInputData=&quot;true&quot;&gt;
- &lt;ReferenceInfo&gt;
- &lt;VerifyTransformsInfoProfile&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/TR/1999/REC-xslt-19991116&quot;&gt;
- &lt;xsl:stylesheet version=&quot;1.0&quot; xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
- &lt;xsl:include href=&quot;http://localhost:8080/referencedData/XMLDocument.Para.xsl&quot;/&gt;
- &lt;/xsl:stylesheet&gt;
- &lt;/dsig:Transform&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2001/10/xml-exc-c14n#&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;TransformParameter URI=&quot;http://localhost:8080/referencedData/XMLDocument.Para.xsl&quot;/&gt;
- &lt;/VerifyTransformsInfoProfile&gt;
- &lt;VerifyTransformsInfoProfile&gt;
- &lt;dsig:Transforms&gt;
- &lt;dsig:Transform Algorithm=&quot;http://www.w3.org/2000/09/xmldsig#enveloped-signature&quot;/&gt;
- &lt;/dsig:Transforms&gt;
- &lt;/VerifyTransformsInfoProfile&gt;
- &lt;/ReferenceInfo&gt;
- &lt;/SignatureManifestCheckParams&gt;
- &lt;TrustProfileID&gt;Test-Signaturdienste&lt;/TrustProfileID&gt;
-&lt;/VerifyXMLSignatureRequest&gt;
-</pre>
-<p>Mit Angabe des optionalen Elements <code>SignatureManifestCheckParams</code> wird MOA SP angewiesen, den oben skizzierten Zusammenhang zwischen Referenz-Eingangsdaten und Hash-Eingangsdaten zu &uuml;berpr&uuml;fen. Wird das Attribut <code>ReturnReferenceInputData</code> wie im Beispiel auf den Wert <code>true</code> gesetzt, liefert MOA SP in der Response die Hash-Eingangsdaten f&uuml;r alle Referenzen in <code>dsig:SignedInfo</code> der XML-Signatur an die Anwendung zur&uuml;ck, was in der Regel von der Anwendung wohl gew&uuml;nscht wird, wenn MOA SP schon den Zusammenhang zwischen Referenz-Eingangsdaten und Hash-Eingangsdaten pr&uuml;fen soll.</p>
-<p>Die Pr&uuml;fung des Zusammenhangs untergliedert sich in zwei Teilpr&uuml;fungen:</p>
-<ul>
- <li>&Uuml;berpr&uuml;fung, ob jede <code>dsig:Reference</code> in <code>dsig:SignedInfo</code> der Signatur eine vorgegebene Transformationskette inkludiert;</li>
- <li>&Uuml;berpr&uuml;fung, ob die in der vorgegebenen Transformationskette ggf. enthaltenen inkludierten Stylesheets (implizite Transformationsparameter) durch ein Signaturmanifest mitsigniert sind.</li>
-</ul>
-<p>Damit MOA SP die erste Teilpr&uuml;fung durchf&uuml;hren kann, muss in <code>SignatureManifestCheckParams</code> je <code>dsig:Reference</code> Element in <code>dsig:SignedInfo</code> der XML-Signatur ein Element <code>ReferenceInfo</code> angeben. Ausgenommen sind <code>dsig:Reference</code>-Elemente, die auf ein Signaturmanifest (Attribut <code>Type</code> ist gesetzt und hat den Wert <code>http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest</code>), auf ein XMLDSIG-Manifest (Attribut <code>Type</code> ist gesetzt und hat den Wert <code>http://www.w3.org/2000/09/xmldsig#Manifest</code>) oder auf Signatureigenschaften (Attribut <code>Type</code> ist gesetzt und hat den Wert <code>http://uri.etsi.org/01903/v1.1.1#SignedProperties</code>) verweisen. </p>
-<p>Das Element <code>ReferenceInfo</code> enth&auml;lt eine oder mehrere erlaubte Transformationsketten, die jeweils durch ein Element <code>VerifyTransformsInfoProfile/dsig:Transforms</code> repr&auml;sentiert werden. Im konkreten Beispiel werden f&uuml;r die einzige zu pr&uuml;fende <code>dsig:Reference</code> zwei erlaubte Transformationsketten angegeben. Die Transformationen in der <code>dsig:Reference</code> m&uuml;ssen einer dieser beiden Ketten entsprechen; im konkreten Beispiel entsprechen sie der ersten. </p>
-<p>Nachdem die erste erlaubte Transformationskette eine XSLT-Transformation mit einem inkludierten Stylesheet enth&auml;lt, muss MOA SP auch &uuml;berpr&uuml;fen, ob dieser inkludierte Stylesheet korrekt durch ein Signaturmanifest mitunterschrieben wurde. Nachdem wichtig ist, dass nicht irgendein beliebiger Stylesheet verwendet und mitunterschrieben wurde, sondern genau jener, den die Anwendung bei der Signaturerstellung vorgegeben hat, muss die Anwendung MOA SP mitteilen, welcher Stylesheet das sein muss. Die Anwendung verwendet dazu das Element <code>VerifyTransformsInfoProfile/TransformParameter</code>. Das Attribut <code>TransformParameter/@URI</code> enth&auml;lt die Referenz auf den Stylesheet genau so, wie er im Stylesheet-Parameter der zu pr&uuml;fenden Signatur verwendet wird (<code>dsig:Transform/xsl:stylesheet/xsl:inlcude/@href</code>). F&uuml;r den Inhalt dieses Elements hat die Anwendung drei M&ouml;glichkeiten: </p>
-<ul>
- <li>Die Anwendung l&auml;sst den Inhalt leer. Dies wird sie dann machen, wenn sie darauf vertrauen kann, dass die Aufl&ouml;sung der in <code>TransformParameter/@URI</code> angegebenen Referenz bei der Signaturpr&uuml;fung zum gleichen Resultat f&uuml;hrt wie seinerzeit beim Erstellen der Signatur (z.B. weil die Referenz auf einen Webserver unter Kontrolle der Anwendung zeigt);</li>
- <li>Die Anwendung gibt im Element <code>TransformParameter/Base64Content</code> explizit den inkludierten Stylesheet an. MOA SP verwendet dann diesen Stylesheet, um den Hashwert der <code>dsig:Reference</code> im Signaturmanifest zu kontrollieren;</li>
- <li>Die Anwendung gibt im Element <code>TransformParameter/Hash </code>den Hashwert des inkludierten Stylesheets an. MOA SP l&ouml;st dann die Referenz in <code>dsig:Transform/xsl:stylesheet/xsl:inlcude/@href</code> auf und stellt sicher, dass der &uuml;ber das Aufl&ouml;sungsergebnis gebildete Hashwert jenem in <code>TransformParameter/Hash </code>entspricht. Diese M&ouml;glichkeit wird die Anwendung dann verwenden, wenn es sich um einen sehr umfangreichen Stylesheet handelt, der nicht im Request mit&uuml;bertragen werden soll.</li>
-</ul>
-<h5>Response</h5>
-<p><code><a href="../../clients/webservice/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml" target="_blank">VerifyXMLSignatureRequest.SigManifest.resp.xml</a></code> ist eine typische Response des SP Webservices auf den obigen Request. Sein Aufbau wird nachfolgend analysiert. Bitte beachten Sie, dass die dargestellte Response zur bessernen Lesbarkeit einger&uuml;ckt und gek&uuml;rzt wurde. </p>
-<pre>
-&lt;VerifyXMLSignatureResponse
- xmlns=&quot;http://reference.e-government.gv.at/namespace/moa/20020822#&quot;
- xmlns:dsig=&quot;http://www.w3.org/2000/09/xmldsig#&quot;&gt;
- &lt;SignerInfo&gt;...&lt;/SignerInfo&gt;
-</pre>
-<p>Die Response enth&auml;lt zun&auml;chst in <code>SignerInfo/dsig:X509Data</code> Informationen &uuml;ber den Signator, die aus dem in der XML-Signatur enthaltenen Signatorzertifikat entnommen sind (siehe <a href="#webservice_xmlrequests_pruefungxml_einfach">Einfaches Beispiel</a>). </p>
-<pre>
- &lt;ReferenceInputData PartOf=&quot;SignedInfo&quot;&gt;
- &lt;XMLContent xml:space=&quot;preserve&quot;&gt;
- &lt;doc:Paragraph ParaId=&quot;Para2&quot; xmlns:doc=&quot;urn:document&quot;
- xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;...&lt;/doc:Paragraph&gt;
- &lt;/XMLContent&gt;
- &lt;/ReferenceInputData&gt;
- &lt;ReferenceInputData PartOf=&quot;SignedInfo&quot;&gt;
- &lt;XMLContent xml:space=&quot;preserve&quot;&gt;
- &lt;dsig:Manifest Id=&quot;manifest-1-1&quot; xmlns:doc=&quot;urn:document&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
- ...
- &lt;/dsig:Manifest&gt;
- &lt;/XMLContent&gt;
- &lt;/ReferenceInputData&gt;
- &lt;ReferenceInputData PartOf=&quot;SignedInfo&quot;&gt;
- &lt;XMLContent xml:space=&quot;preserve&quot;&gt;
- &lt;etsi:SignedProperties xmlns:doc=&quot;urn:document&quot;
- xmlns:etsi=&quot;http://uri.etsi.org/01903/v1.1.1#&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
- ...
- &lt;/etsi:SignedProperties&gt;
- &lt;/XMLContent&gt;
- &lt;/ReferenceInputData&gt;
-</pre>
-<p>Nachdem im Request spezifiziert wurde, dass in der Response die Referenzeingangsdaten f&uuml;r alle <code>dsig:Reference</code>-Elemente
- von <code>dsig:SignedInfo</code> (bzw. auch f&uuml;r jede <code>dsig:Reference</code> aus einem <code>dsig:Manifest</code>,
- auf das mittels des Attributs <code>Type=&quot;http://www.w3.org/2000/09/xmldsig#Manifest&quot;</code> in einer <code>dsig:Reference</code> aus <code>dsig:SignedInfo</code> verwiesen
- wird; solche Manifeste kommen aber in diesem Beispiel nicht vor) der gepr&uuml;ften
- XML-Signatur &uuml;bermittelt
- werden sollen, enth&auml;lt
- die Response nach <code>SignerInfo</code> drei <code>ReferenceInputData</code>-Elemente. Das erste <code>ReferenceInputData</code>-Element
- enth&auml;lt das zuvor besprochene <code>doc:Paragraph</code> Element, das zweite das Signaturmanifest, das
- dritte die Signatureigenschaften. Das Attribut <code>PartOf</code> jedes Elements weist mit dem Wert <code>SignedInfo</code> darauf hin,
- dass die <code>dsig:Reference</code>, f&uuml;r welche die Referenzeingangsdaten gelten, Teil von <code>dsig:SignedInfo</code> ist. </p>
-<pre>
- &lt;SignatureCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/SignatureCheck&gt;
-</pre>
-<p>Das Element<code> SignatureCheck</code> enth&auml;lt das Resultat der kryptographischen Pr&uuml;fung der Signatur (siehe <a href="#webservice_xmlrequests_pruefungxml_einfach">Einfaches Beispiel</a>).</p>
-<pre>
- &lt;SignatureManifestCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/SignatureManifestCheck&gt;
-</pre>
-<p>Das Element <code>SignatureManifestCheck</code> enh&auml;lt das Resultat der Pr&uuml;fung des Zusammenhangs zwischen Referenz-Eingangsdaten und Hash-Eingangsdaten. Der Kode <code>0</code> im konkreten Beispiel bedeutet, dass alle Referenzen die in der Anfrage zur &Uuml;berpr&uuml;fung der XML-Signatur gemachten Einschr&auml;nkungen bez&uuml;glich der erlaubten Transformationskette(n) einhalten, sowie dass die Anforderungen hinsichtlich des Signaturmanifests werden eingehalten. F&uuml;r eine &Uuml;bersicht der m&ouml;glichen Kodes siehe die <a href="../spec/MOA-SPSS-1.2.pdf" target="_blank">Spezifikation zu MOA SP/SS</a>, Abschnitt 5.1.3.1.4.</p>
-<pre>
- &lt;CertificateCheck&gt;
- &lt;Code&gt;0&lt;/Code&gt;
- &lt;/CertificateCheck&gt;
-&lt;/VerifyXMLSignatureResponse&gt;
-</pre>
-<p>Das Element<code> CertificateCheck</code> enth&auml;lt das Resultat der Zertifikatspr&uuml;fung (siehe <a href="#webservice_xmlrequests_pruefungxml_einfach">Einfaches Beispiel</a>).</p>
-<h2><a name="webservice_clients" id="webservice_clients"></a>2.2 Webservice-Clients</h2>
-<p><a href="#webservice_xmlrequests">Abschnitt 2.1</a> bespricht eine Reihe von typischen XML-Requests, die &uuml;ber die Webservice-Schnittstelle an MOA SP/SS gesendet werden k&ouml;nnen, um entweder Signaturen zu erstellen (MOA SS) oder Signaturen zu pr&uuml;fen (MOA SP). Dieser Abschnitt zeigt die Verwendung des prototypischen Webservice-Clients, der mit dieser Dokumentation zu MOA SP/SS ausgeliefert wird.</p>
-<h3><a name="webservice_clients_übersicht" id="webservice_clients_übersicht"></a>2.2.1 &Uuml;bersicht</h3>
-<p>Der Webservice-Client existiert in drei Varianten, wobei jede Variante in einer eigenen Java-Klasse implementiert ist:</p>
-<ul>
- <li>Der einfache Client (<code><a href="../../clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.java">HTTP.java</a></code>) arbeitet ohne Authentifikation. Er pr&uuml;ft weder die Authentizit&auml;t des verwendeten MOA-Webservices, noch identifiziert er sich selbst gegen&uuml;ber dem MOA-Webservice.</li>
- <li>Der Client mit Server-Authentisierung (<code><a href="../../clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java">HTTPSServerAuth.java</a></code>) pr&uuml;ft die Authentizit&auml;t des verwendeten MOA-Websservices an Hand dessen SSL-Serverzertifikats, identifiziert sich selbst jedoch nicht gegen&uuml;ber dem MOA-Webservice.</li>
- <li>Der Client mit Client- und Server-Authentisierung (<code><a href="../../clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.java">HTTPSClientAuth.java</a></code>) pr&uuml;ft einerseits die Authentizit&auml;t des verwendeten MOA-Websservices an Hand dessen SSL-Serverzertifikats; andererseits weist er sich selbst mittels eines SSL-Client-Zertifikats gegen&uuml;ber dem MOA-Webservice aus. </li>
-</ul>
-<p>Welcher der drei Varianten des Webservice-Clients zum Einsatz kommen soll, h&auml;ngt von der Art ab, wie das MOA-Webservice betrieben wird, d.h. ob es Server- bzw. Client-Authentisierung unterst&uuml;tzt bzw. verlangt. Befinden sich sowohl MOA-Webservice als auch der Webservice-Client im gleichen, abgeschotteten Netzwerk, kann auch eine Kommunikation ohne Authenifikation in Betracht gezogen werden. Ansonsten wird der Standardfall wohl der Betrieb mit Server-Authentisierung (Verwendung von MOA SP) bzw. mit Server- und Client-Authentisierung (Verwendung von MOA SS) sein.</p>
-<p class="remark">Hinweis: Das <a href="../../">Wurzelverzeichnis</a> dieses Handbuchs stellt ein komplettes und sofort verwendbares Eclipse Projekt dar. </p>
-<h3><a name="webservice_clients_gemeinsamkeiten" id="webservice_clients_gemeinsamkeiten"></a>2.2.2 Gemeinsamkeiten</h3>
-<p>Dieser Abschnitt beschreibt die Gemeinsamkeiten aller drei Varianten des Webservice-Clients. </p>
-<p>Zun&auml;chst einmal ben&ouml;tigen alle drei Varianten die folgenden Java-Bibliotheken, die im Ordner <a href="../../clients/webservice/lib/">clients/webservice/lib/</a> dieses Handbuchs bereits enthalten sind:</p>
-<table class="fixedwidth" border="1" cellpadding="2">
- <TBODY>
- <TR>
- <TH>Java-Bibliothek</TH>
- <TH>Bemerkung</TH>
- </TR><TR>
- <TD><a href="#referenzierte_software">J2SE</a></TD>
- <TD> J2SE 1.3.1 SDK oder J2SE 1.4.2 SDK oder J2SE 5.0 SDK. </TD>
- </TR>
- <TR>
- <TD><a href="#referenzierte_software">Apache Xerces</a></TD>
- <TD>XML-Parser, Version 2.0.2 oder h&ouml;her; nicht n&ouml;tig wenn JDSE 1.4.2 oder h&ouml;her verwendet wird. </TD>
- </TR>
- <TR>
- <TD><a href="#referenzierte_software">AXIS Framework</a></TD>
- <TD>Webservice-Framework, Version 1.1.</TD>
- </TR>
- <TR>
- <TD><a href="#referenzierte_software">JSSE</a></TD>
- <TD>Java Secure Socket Extension, Version 1.0.3 oder h&ouml;her; nur notwendig f&uuml;r die Varianten <code>HTTPServerAuth</code> und <code>HTTPClientAuth</code>.</TD>
- </TR>
- </TBODY>
-</TABLE>
-<p>Weiters ist allen drei Varianten der folgende Kern-Ablauf gemeinsam:</p>
-<ol>
- <li>Der Webservice-Client liest einen vorbereiteten MOA-XML-Request (z. B. einen der in <a href="#webservice_xmlrequests">Abschnitt 2.1</a> gezeigten) vom Dateisystem ein.</li>
- <li>Der Webservice-Client erstellt einen SOAP-Request mit dem vom Dateisystem gelesenen MOA-XML-Request als Nutzlast.</li>
- <li>Der Webservice-Client sendet den erstellten SOAP-Request &uuml;ber HTTP an MOA SP/SS. </li>
- <li>Der Webservice-Client empf&auml;ngt die SOAP-Response von MOA SP/SS.</li>
- <li>Der Webservice-Client extrahiert die Nutzlast des SOAP-Responses (d. h. die zum MOA-XML-Request aus Schritt 1 passende MOA-XML-Response), gibt diese auf die Konsole aus und speichert sie im Dateisystem. </li>
-</ol>
-<p>Konfiguriert werden k&ouml;nnen alle drei Varianten mit Hilfe von zwei Kommandozeilen-Parametern:</p>
-<ol>
- <li>Der erste Kommandozeilenparameter gibt an, ob MOA SS (Wert <code>sign</code>) oder MOA SP (Wert <code>verify</code>) kontaktiert werden soll. </li>
- <li>Der zweite Kommandozeilenparameter enth&auml;lt Pfad und Dateiname einer Java-Properties-Datei, die die weiteren Konfigurationsparameter f&uuml;r den Webservice-Client enth&auml;lt. Ein relativer Pfad wird als relativ zum Arbeitsverzeichnis der Java Virtual Machine interpretiert. Genaue Infos zu den m&ouml;glichen Konfigurationsparametern entnehmen Sie bitte der Quellcodedokumentation der jeweiligen Variante des Webservice-Clients. <a href="../../clients/webservice/conf/http.properties"><code>http.properties</code></a> enth&auml;lt eine auf dieses Handbuch abgestimmte Konfiguration.</li>
-</ol>
-<h3><a name="webservice_clients_httpsserverauth" id="webservice_clients_httpsserverauth"></a>2.2.3 Besonderheiten von <code>HTTPSServerAuth.java</code></h3>
-<p>Diese Variante des Webservice-Clients verwendet JSSE, um im Schritt 3 des Kernablaufs aus <a href="#webservice_clients_gemeinsamkeiten">Abschnitt 2.2.2</a> eine SSL-Verbindung mit Server-Authentifizierung zum MOA SP/SS Server aufzubauen. In dieser SSL-Verbindung sendet der Webservice-Client dann den erstellten SOAP-Request &uuml;ber HTTPS.</p>
-<p>Die Konfiguration von JSSE (Speicher f&uuml;r die vertrauensw&uuml;rdigen Serverzertifikate, Typ dieses Speichers, Passwort f&uuml;r diesen Speicher) wird mittels zus&auml;tzlicher Parameter in der in <a href="#webservice_clients_gemeinsamkeiten">Abschnitt 2.2.2</a> besprochenen Java-Properties-Datei vorgenommen. Genaue Infos zu diesen Konfigurationsparametern entnehmen Sie bitte der Quellcodedokumentation von <code><a href="../../clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java">HTTPSServerAuth.java</a></code>. <a href="../../clients/webservice/conf/http.properties"><code>http.properties</code></a> enth&auml;lt eine auf dieses Handbuch abgestimmte Konfiguration.</p>
-<p>Falls Sie Probleme beim SSL-Verbindungsaufbau zwischen Webservice-Client und MOA SP/SS Webservice haben, empfiehlt sich die Aktivierung des JSSE Loggings. Das Setzen der daf&uuml;r notwendigen Java System Property ist im Quellcode von <code><a href="../../clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.java">HTTPSServerAuth.java</a></code> bereits enthalten, jedoch auskommentiert. Suchen Sie einfach nach dem String <code>javax.net.debug</code>, um zur entsprechenden Stelle im Quellcode zu gelangen. </p>
-<h3><a name="webservice_clients_httpsclientauth" id="webservice_clients_httpsclientauth"></a>2.2.4 Besonderheiten von <code>HTTPSClientAuth.java</code> </h3>
-<p>Diese Variante des Webservice-Clients verwendet JSSE, um im Schritt 3 des Kernablaufs aus <a href="#webservice_clients_gemeinsamkeiten">Abschnitt 2.2.2</a> eine SSL-Verbindung mit Server- und Client-Authentifizierung zum MOA SP/SS Server aufzubauen. In dieser SSL-Verbindung sendet der Webservice-Client dann den erstellten SOAP-Request &uuml;ber HTTPS.</p>
-<p>Die gegen&uuml;ber <a href="#webservice_clients_httpsserverauth">Abschnitt 2.2.3</a> zus&auml;tzlich notwendige Konfiguration von JSSE (Speicher f&uuml;r das SSL-Client-Zertifikat sowie den dazugeh&ouml;rigen privaten Schl&uuml;ssel, Typ dieses Speichers, Passwort f&uuml;r diesen Speicher) wird mittels zus&auml;tzlicher Parameter in der in <a href="#webservice_clients_gemeinsamkeiten">Abschnitt 2.2.2</a> besprochenen Java-Properties-Datei vorgenommen. Genaue Infos zu diesen Konfigurationsparametern entnehmen Sie bitte der Quellcodedokumentation von <code><a href="../../clients/webservice/src/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.java">HTTPSClientAuth.java</a></code>. <a href="../../clients/webservice/conf/http.properties"><code>http.properties</code></a> enth&auml;lt eine auf dieses Handbuch abgestimmte Konfiguration.</p>
-<p>Beachten Sie bitte auch den Hinweis zum JSSE Logging aus <a href="#webservice_clients_httpsserverauth">Abschnitt 2.2.3</a>.</p>
-<h1><a name="klassenbibliothek" id="klassenbibliothek"></a>3 Verwendung der Klassenbibliothek</h1>
-<p>Neben dem Betrieb von MOA SP/SS als Webservice ist als Alternative auch die Verwendung von MOA SP/SS als Klassenbibliothek m&ouml;glich, also die direkte Einbindung in ein Java-Programm unter Verwendung des Application Programmers Interface (API) von MOA SP/SS. </p>
-<h2><a name="klassenbibliothek_vorbereitung" id="klassenbibliothek_vorbereitung"></a>3.1 Vorbereitung</h2>
-<p>Um das API von MOA SP/SS verwenden zu k&ouml;nnen, m&uuml;ssen einerseits die MOA-Bibliotheken selbst, andererseits eine Reihe von unterst&uuml;tzenden Bibliotheken in den Klassenpfad aufgenommen werden. Eine &Uuml;bersicht dazu finden Sie im Installationshandbuch im <a href="../install/install.html#klassenbibliothek">Abschnitt 3</a>.
-<h2><a name="klassenbibliothek_allgemeines" id="klassenbibliothek_allgemeines"></a>3.2 Allgemeines </h2>
-<p>Der strukturelle Aufbau der API entspricht weitgehend der Struktur eines MOA-XML-Requests. Es werden daher in diesem Abschnitt nur zwei grundlegende Beispiele gebracht; f&uuml;r komplexere Aufgaben k&ouml;nnen die XML-Beispiele aus <a href="#webservice_xmlrequests">Abschnitt 2.1</a> als Vorlage verwendet und einfach in die &quot;API-Welt&quot; &uuml;bertragen werden.
-<h2><a name="klassenbibliothek_beispiele" id="klassenbibliothek_beispiele"></a>3.3 Beispiele </h2>
-<p>Dieses Handbuch enth&auml;lt zwei Beispiele f&uuml;r die Verwendung der API von MOA SP/SS:
-<ol>
- <li><code><a href="../../clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.java">CreateXMLSignature.java</a></code>: Erstellung einer einfachen XML-Signatur; dieses Beispiel entspricht dem MOA-XML-Request aus <a href="#webservice_xmlrequests_erstellungxml_simple">Abschnitt 2.1.1.1</a>. <br>
- Die Konfiguration der API erfolgt &uuml;ber Kommandozeilenparameter (Lage der Konfigurationsdatei f&uuml;r MOA SP/SS, Lage der Konfigurationsdatei f&uuml;r das Logging mit Log4j). Detaillierte Informationen dazu finden Sie in der Quellcodedokumentation des Beispiels. </li>
- <li><code><a href="../../clients/api/src/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.java">VerifyXMLSignature.java</a></code>: Pr&uuml;fung einer einfachen XML-Signatur; dieses Beispiel entspricht dem MOA-XML-Request aus <a href="#webservice_xmlrequests_pruefungxml_einfach">Abschnitt 2.1.3.1</a>. <br>
- Die Konfiguration der API erfolgt &uuml;ber Kommandozeilenparameter (Lage der Konfigurationsdatei f&uuml;r MOA SP/SS, Lage der Konfigurationsdatei f&uuml;r das Logging mit Log4j). Detaillierte Informationen dazu finden Sie in der Quellcodedokumentation des Beispiels. <br>
- Die Auswahl der zu pr&uuml;fenden Signatur erfolgt ebenfalls per Kommandozeilenparameter. Detaillierte Informationen dazu finden Sie ebenfalls in der Quellcodedokumentation des Beispiels. </li>
-</ol>
-<h2><a name="klassenbibliothek_apidoc" id="klassenbibliothek_apidoc"></a>3.4 API-Dokumentation </h2>
-<p>F&uuml;r die vollst&auml;ndige Dokumentation des API von MOA SP/SS sei auf die <a href="../../api-doc/index.html">Java Doc der API</a> verwiesen.
-<p>
-<h1><a name="referenzierte_software" id="referenzierte_software"></a>A Referenzierte Software</h1>
-<p>Auf folgende Software-Pakete wird in diesem Handbuch verwiesen:</p>
-<table class="fixedWidth" border="1" cellpadding="2">
- <tbody>
- <tr>
- <th scope="col">Name</th>
- <th scope="col">Beschreibung</th>
- </tr>
- <tr>
- <td><a href="http://xml.apache.org/xerces2-j/">Apache Xerces 2</a> </td>
- <td>XML-Parser aus dem Apache Project</td>
- </tr>
- <tr>
- <td><a href="http://xml.apache.org/axis/">Apache Axis</a></td>
- <td>Webservice-Framework aus dem Apache Project</td>
- </tr>
- <tr>
- <td><a href="http://java.sun.com/j2se/1.3.1/" target="_blank">J2SE 1.3.1 SDK/JRE</a> </td>
- <td>Java 2 Standard Edition in der Version 1.3.1 (Software Development Kit bzw. Java Runtime Environment) </td>
- </tr>
- <tr>
- <td><a href="http://java.sun.com/j2se/1.4.2/" target="_blank">J2SE 1.4.2 SDK/JRE</a></td>
- <td>Java 2 Standard Edition in der Version 1.4.2 (Software Development Kit bzw. Java Runtime Environment) </td>
- </tr>
- <tr>
- <td><a href="http://java.sun.com/j2se/1.5.0/" target="_blank">J2SE 5.0 SDK/JRE</a> </td>
- <td>Java 2 Standard Edition in der Version 5.0 (Software Development Kit bzw. Java Runtime Environment) </td>
- </tr>
- <tr>
- <td><a href="http://java.sun.com/products/jsse/">JSSE</a></td>
- <td>Java Secure Socket Extension </td>
- </tr>
- </tbody>
-</table>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/spss.iaiklibsupdate/.cvsignore b/spss.iaiklibsupdate/.cvsignore
deleted file mode 100644
index 1521c8b76..000000000
--- a/spss.iaiklibsupdate/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-dist
diff --git a/spss.iaiklibsupdate/.project b/spss.iaiklibsupdate/.project
deleted file mode 100644
index c8c83c163..000000000
--- a/spss.iaiklibsupdate/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>MOA SPSS IAIK Libs Update</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/spss.iaiklibsupdate/ant.1-6-5/INSTALL b/spss.iaiklibsupdate/ant.1-6-5/INSTALL
deleted file mode 100644
index 83c11675a..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-For installation instructions see the manual in the docs subdirectory
-or online at <http://ant.apache.org/manual/index.html>.
diff --git a/spss.iaiklibsupdate/ant.1-6-5/KEYS b/spss.iaiklibsupdate/ant.1-6-5/KEYS
deleted file mode 100644
index 2be9dfdac..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/KEYS
+++ /dev/null
@@ -1,310 +0,0 @@
-This file contains the PGP keys of various developers.
-
-Users: pgp < KEYS
- gpg --import 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>
-sig 3 51898504 2001-05-29 Conor MacNeill <conor@cortexebusiness.com.au>
-sig 5F6B8B72 2002-01-11 Stefan Bodewig <bodewig@apache.org>
-uid Conor MacNeill <conor@apache.org>
-sig 3 51898504 2001-05-29 Conor MacNeill <conor@cortexebusiness.com.au>
-sig 5F6B8B72 2002-01-11 Stefan Bodewig <bodewig@apache.org>
-sub 1024g/D1ECBA5D 2001-05-29
-sig 51898504 2001-05-29 Conor MacNeill <conor@cortexebusiness.com.au>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.0 (GNU/Linux)
-
-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+IRgQQEQIABgUCPD6eTgAKCRCiEVrhX2uLcqCcAKCr
-1Wylqju9YjBi5Twej9ze69JFBQCeOaMgo6yjnkcV3PnVInLlaMwPr5q0LUNvbm9y
-IE1hY05laWxsIDxjb25vckBjb3J0ZXhlYnVzaW5lc3MuY29tLmF1PohXBBMRAgAX
-BQI7E6xMBQsHCgMEAxUDAgMWAgECF4AACgkQgQRkT1GJhQTY0ACgmZmKheHzjPJs
-5hybpyvnvEiPYqYAn2+ryxdtz8XyOMExGRmHNlhG7svsiEYEEBECAAYFAjw+nlUA
-CgkQohFa4V9ri3JYYACg1WN+NCptfKVP1mbrIa+0ajztsiIAnAn+m70iwRRFZCxr
-jcULoY5SjyTLuQENBDsTqy0QBACfsCxJ6iCtgX8zjlVtMsMfDqu72x5sYatWKn8c
-u+4Oj5mi0x6azZIhwCa+K3ihLVOyG1mCRnzztGTIxWYRhq3TESIVOfgm+NgLGrmA
-XUTFyCT+21TExLCpuVZKmUHsWXLxDtfQ1diPeQpiQ8+Fvb/4jLGFjFIrQ2VjtFQn
-kumkSwADBgP9H0bF4hdMuVEcSJ9imxSoJshcOOA3Vd2+YiCTZhBygWM49wY5jNos
-/DArIjNCE53IlOu/UtHB2jqkSqjF0soGYsUjeCWouiTP9hLuMKPjnqj9ryJPTDKz
-nTCZ4TuB5CtzrKTlWLmPCPpFsGqe4KjMeKg/mqGqjPKl97xgStK9N9GIRgQYEQIA
-BgUCOxOrLQAKCRCBBGRPUYmFBMM6AJsF3FFyZGEmbt9aGG1W/u0oI9mcLgCfQyJ+
-aalbspazea4J9zgi59SSwOM=
-=cBdR
------END PGP PUBLIC KEY BLOCK-----
-
-pub 1024D/5F6B8B72 2001-05-28 Stefan Bodewig <bodewig@apache.org>
-sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <bodewig@apache.org>
-sig 51898504 2002-01-11 Conor MacNeill <conor@cortexebusiness.com.au>
-sig 3 F88341D9 2003-03-17 Lars Eilebrecht <lars@eilebrecht.org>
-sig 3 2261D073 2003-03-17 Astrid Keáler (Kess) <kess@kess-net.de>
-sig 21D0A71B 2003-03-17 Dirk-Willem van Gulik <dirkx@apache.org>
-sig 75A67692 2003-03-18 Erik Abele <erik@codefaktor.de>
-sig B3B2A12C 2003-05-20 ct magazine CERTIFICATE <pgpCA@ct.heise.de>
-sig 3 8103A37E 2003-04-04 Andre Malo <nd@apache.org>
-uid Stefan Bodewig <bodewig@bost.de>
-sig 3 5F6B8B72 2001-05-28 Stefan Bodewig <bodewig@apache.org>
-sig 51898504 2002-01-11 Conor MacNeill <conor@cortexebusiness.com.au>
-sig 3 F88341D9 2003-03-17 Lars Eilebrecht <lars@eilebrecht.org>
-sig 3 2261D073 2003-03-17 Astrid Keáler (Kess) <kess@kess-net.de>
-sig 21D0A71B 2003-03-17 Dirk-Willem van Gulik <dirkx@apache.org>
-sig 75A67692 2003-03-18 Erik Abele <erik@codefaktor.de>
-sig B3B2A12C 2003-05-20 ct magazine CERTIFICATE <pgpCA@ct.heise.de>
-sig 3 8103A37E 2003-04-04 Andre Malo <nd@apache.org>
-uid Stefan Bodewig <stefan.bodewig@freenet.de>
-sig 3 5F6B8B72 2003-03-07 Stefan Bodewig <bodewig@apache.org>
-sig 3 F88341D9 2003-03-17 Lars Eilebrecht <lars@eilebrecht.org>
-sig 3 2261D073 2003-03-17 Astrid Keáler (Kess) <kess@kess-net.de>
-sig 21D0A71B 2003-03-17 Dirk-Willem van Gulik <dirkx@apache.org>
-sig 75A67692 2003-03-18 Erik Abele <erik@codefaktor.de>
-sig B3B2A12C 2003-05-20 ct magazine CERTIFICATE <pgpCA@ct.heise.de>
-sig 3 8103A37E 2003-04-04 Andre Malo <nd@apache.org>
-sub 1024g/24774157 2001-05-28
-sig 5F6B8B72 2001-05-28 Stefan Bodewig <bodewig@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.0 (GNU/Linux)
-
-mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ
-5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82
-EXwWOFuYMJisuxdT940iQzosm3GOv4MJdEg3oI2SgfEyRQQ6vO4Ob5rHDwCg5taZ
-nrHOrXx2dIGHxpxRZ0SUl30D/jmtttFjYOQ3LBMriikz5mh2sK3ZnoSRF4o5O0zW
-Ve6e2SFXOEjVjImKsH6KCbdQNelrAdgiyOoXClyQKsQ27pncbdWo6bO0E3POJZVm
-XaeW7iudHVr63rU5PViXObIQrdQl0D59j5brKj4vdlTyUw8kaHPvbKPDEOwvZq4Y
-LJQ5BACA1YilTeXRJqwFsNlpcxCHwlULD4QUVP496prQWf1B7Z6g0KvLGrQsO0Vn
-Jcn+fEqukysTJixSXCPebosltd4RalJIupVYkp4w6MJ7biaDAlLuNhDcI/AiXTmV
-dXUedVXIaM8I3Ne23gucwbAyc0Hvb+3cSAKRhl/azFQhuHBvlrQjU3RlZmFuIEJv
-ZGV3aWcgPGJvZGV3aWdAYXBhY2hlLm9yZz6IWgQTEQIAGgULBwoDBAMVAwIDFgIB
-AheAAhkBBQI7EiJPAAoJEKIRWuFfa4tyjzgAn3a+nFeNb3mAZQR4lRcXy3F+8eTh
-AJ4iuLt4No6TUB9xNETrm3Y/0TvkU4hGBBARAgAGBQI8PtWPAAoJEIEEZE9RiYUE
-nZIAnjOkQx1BfxN9+E7Yiz4MOxqZjSUpAKDQi0Alv/VR61fmR7KHZ11J2g+HSIiZ
-BBMBAgAGBQI+dd8MAAoJED6Pt/L4g0HZJ2QD5RzYjJ0fi1Gr6NsjmIiU/lvfvPqj
-bNoK2A2flkmLo2lk9jSa1AmF0ETOoCg8hZZHCbxyPZRdsmDJFXrZZWVTdUyZHhHb
-Wx53DR3HavmVEEdDZBSkxfXdSu1CNq31sbdcumtd03FI6SV827cPzl1/RGUiOkEL
-eK0hZb3IvSd5iEYEExECAAYFAj512sEACgkQ7tHqOSJh0HNFuACfb7quMJZHOk5p
-pmTxf4GVS5bh3E4AniLa5788ktdcZCBE5Or+G+yuIGooiD8DBRA+daoa/W+IxiHQ
-pxsRAkQFAKDmlWVuQnWfaGK9z8CP4vESTfiXyQCgpnf1yJWDgqWvUHOAvOeaTPDR
-cOmIRgQQEQIABgUCPnekEAAKCRAVP6DNdaZ2ki/rAJ9Q0x5m4SE3hMNGUoMgS0MN
-mYXDOQCdGa0QW2fZW4B1wSjiUIi6VgY+F7GIRgQQEQIABgUCPsoulgAKCRDb0kX8
-s7KhLBfwAKDV6uwqf9AMBJlr4aE45rWOnlWAeQCgjBYQVHWFjV1cmpT06vE4bMDV
-J6+IRgQTEQIABgUCPo3OLAAKCRDKaTl0gQOjfpFKAJ9TY+mKmq0INLC9iqxbEETj
-NwOn0gCgspeNEqX1SUjt932Lj3IvXR6fkAi0IFN0ZWZhbiBCb2Rld2lnIDxib2Rl
-d2lnQGJvc3QuZGU+iFcEExECABcFAjsSOYEFCwcKAwQDFQMCAxYCAQIXgAAKCRCi
-EVrhX2uLcsm6AKDaA//SYJv2pcXwGBC89OSzGvxy3gCg1kx6qu6zJKaWaE1L9oFq
-Vc65OUSIRgQQEQIABgUCPD7VlQAKCRCBBGRPUYmFBNCzAJ9tv7tNS6NwaOZQ8cR0
-pGslJGKtuQCgpttMmhhRrUwyVuEXc+dKX7rdQMKImQQTAQIABgUCPnXfDwAKCRA+
-j7fy+INB2Vm6A+IDxiYtMvd/mad+7hRoKXvD5AddB1SwnvQdJe0ewStFBYZxZdNO
-LXdkVngCwAJziPGZcQmocEHVMrN+Mxe+3OX0PEZ+3KOOsAUi+fTov2xvf8EWKgX9
-d0li9iEytVA4M0c52a3bPTC0Kki/KAY3m8oNvAmTwWB9dBSooFFDMIhGBBMRAgAG
-BQI+ddrHAAoJEO7R6jkiYdBzruYAnAzvTrvDQNvoAoaDQJ+o/ydqMA8ZAJwNEOQD
-Hsz+6ynbMPoQmKmUqfEISIg/AwUQPnWqIf1viMYh0KcbEQIkpwCeInf4o3C5Ykh/
-xBodVImrp2Cvcy8AoMn3me5p4Sl2rm2tjVxTJZt2sUr7iEYEEBECAAYFAj53pBoA
-CgkQFT+gzXWmdpIpGgCgiTARP6Cf+JKOxUaVFr0L9DC5oUcAoIxF7D5mOVK/AFcp
-1cxNk3BLtdq3iEYEEBECAAYFAj7KLjIACgkQ29JF/LOyoSwAbACglNp7V2Pw4U57
-5IuooM677bZf8pwAn2U2TcHj7PYprU+qYRkyJ3pa7FyyiEYEExECAAYFAj6NzjUA
-CgkQymk5dIEDo35YPwCeJIU/monN96nP4jJjAuflEXMbemUAoJXq7oVCYuOCqWr/
-T3VW0DM3W+dntCpTdGVmYW4gQm9kZXdpZyA8c3RlZmFuLmJvZGV3aWdAZnJlZW5l
-dC5kZT6IXAQTEQIAHAUCPmiBXAIbAwQLBwMCAxUCAwMWAgECHgECF4AACgkQohFa
-4V9ri3JPKACfXhFOr4gMMIQwEGvUb6J/X4asuzIAnje2H9T1r/jSVi1NbIEtQfbp
-myQXiJkEEwECAAYFAj513w8ACgkQPo+38viDQdmGkgPnUYJfHlDrQ2jYJWuPDve9
-n4pV9OvyIllKyLdfULjsLWXw4Jm+fMQJgWr2GEov1ZYIyS2+rGDZpbz/vxaBVbgq
-M8TPdiXzxwU8AFq4k+Em4fKXR58ByLSJjvLLza61spNHJennEUFp3tTpEsr4bNuu
-aoRYhtiKzTqNuoC+0x+IRgQTEQIABgUCPnXaxwAKCRDu0eo5ImHQc5lcAJ9FOoAL
-4uHMuqHXrrxsEVPJvEJ2/ACggaOR62EziUqcqpdm/1Zy3P4T22iIPwMFED51qjj9
-b4jGIdCnGxECWssAoKnkR63bWGCFDB5YJtfZJ+nQq3TAAKD1bzG/kITQpIHsT2vC
-Y1yBmlWbBYhGBBARAgAGBQI+d6QaAAoJEBU/oM11pnaS+9IAn0kFlXAzOhhu4r5f
-glMVuw5bTAd0AKCtYRX2ESU/+tsE8vuXWtsMCGeI5YhGBBARAgAGBQI+yi67AAoJ
-ENvSRfyzsqEsSccAoKqG39X2y6xoQa56nviF5iCj/oTFAJwLKx9GyKEUbSM9f/IQ
-7AsZPhHT54hGBBMRAgAGBQI+jc41AAoJEMppOXSBA6N+xYgAn1HbGamcXTDYSFjn
-3U5ik2vQa8nuAKC/uUM01gsdn+71EiAkmrjlH6H9MLkBDQQ7EiJUEAQAzVKWS8Qr
-kysydbTJu2/14wIbz2Coi93aAGelwCwXSxf50JpYdY3Lkcvd0FqT8bcEnz43MCSx
-8vlKubQtUpx9WMGIb4ixtShLJ4lAa6FJldhychz/dnxSNyz5N8W6sby4dTVxac0r
-loxjAOurGanhG7TMtgfDi0cEEoXRyAVoKyMAAwUD/j1pJm4Npq2mlJoE7MK3vAhg
-KwYHFflmJusmqvSAtRuFdT15pbMJrA5bAK+lA3SVOOhhWTCItlphSR2qxJCAcBTe
-OMqUi5ohFcCkSRNvwmDtH+80B3BehlEsEKNk8Z3moa2ch7Oxnb6XEXH5tGJ5Qvx9
-Qid6ZfBaXx7bc8yKyCb4iEYEGBECAAYFAjsSIlQACgkQohFa4V9ri3INMgCgnc22
-kj8TfjktU6u4SUUqud25ZZcAn0B2b0zPjKjGuiwdKSnkFbNcFS3g
-=9dY9
------END PGP PUBLIC KEY BLOCK-----
-
-pub 1024R/697ECEDD 2000-04-06 Henri Gomez <hgomez@slib.fr>
-sig 697ECEDD 2000-04-06 Henri Gomez <hgomez@slib.fr>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.0 (GNU/Linux)
-
-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 1024R/397DCAD5 2002-07-03 Henri Gomez <hgomez@users.sourceforge.net>
-sig 397DCAD5 2002-07-03 Henri Gomez <hgomez@users.sourceforge.net>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.0 (GNU/Linux)
-
-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-----
-
-pub 1024D/307A10A5 2002-07-18 Henri Gomez <hgomez@users.sourceforge.net>
-sig 3 307A10A5 2002-07-18 Henri Gomez <hgomez@users.sourceforge.net>
-sub 2048g/862B8F70 2002-07-18
-sig 307A10A5 2002-07-18 Henri Gomez <hgomez@users.sourceforge.net>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.0 (GNU/Linux)
-
-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-----
-
-pub 1024D/EDF62C35 2002-04-10 Magesh Umasankar <umagesh@apache.org>
-sig 3 EDF62C35 2002-04-10 Magesh Umasankar <umagesh@apache.org>
-sig 3 5F6B8B72 2003-03-07 Stefan Bodewig <bodewig@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.2.0 (GNU/Linux)
-
-mQGiBDy0ebgRBADuKIKD8PuJ4wKEV1h2AprwJjxCRx8vn48XNwfLZuvhw8cpArtK
-rZwhoGPPUPEEXgtTNerlKq4VwpAwcnvRz7oC/7aWkUbcR2sAyhfe2scohwPgw7Xv
-+isWC0NDPdrxvXG/PUOG/cnELunr51ymybBqBxUd2gMhYIxPo67D+YPYLwCgwcZp
-yc/6kJa116ESWHrti342GD8D/1srpnRs9CiS1DQF1uZ1wW4vzj4VD61tKsjdWD8D
-V573R22iMDLSj4oMB536WxUH7snz8XsAKm/peqJ6G9m0smtmWA1ago5yzQj70WqF
-xzWBhHn2I/YfAQ8pb2s9q1lClj8elnCxT65L27ydBAZteejb2VqjtQ6iGy86PUT2
-wRUvBADZmoV1eIZJEM5NnxBv1EtvRYZtIQEzZ8dO2A1LOS7qlVr8IypljNPLGhzX
-VHNvVsjC9QMUSWeBsDedvQHQ3hJpIMnTI32XE1V4gX06gfVTZdhf2fLTtwnsHZp0
-oumqshGDVRhNJJdDYLikxWOxOfkNveKEqJFvtuBR+ZqqluQKebQlTWFnZXNoIFVt
-YXNhbmthciA8dW1hZ2VzaEBhcGFjaGUub3JnPohXBBMRAgAXBQI8tHm4BQsHCgME
-AxUDAgMWAgECF4AACgkQ76Pnee32LDWSRwCfeASWXvpdt7bSFPMtszU/7uPEktsA
-n23mYUN5WKJA1ZreW+0CcZ2ESnOviEYEExECAAYFAj5ogYgACgkQohFa4V9ri3IW
-YACgsxGig0PL0M86rJsA/IpXjBdg3ysAoJzsoUZ/7s2BxDfzF/FRTVIzS+TMuQEN
-BDy0eb8QBACBVb9YDJRp9Irzmq71Jf9FIPw+4g/cWpF3t/Eb7eSzMcOvTAXyNIWz
-aaOjHre7lFctHfq8ls/6gR7uqajiAnfQcfTcu7pp+F5KsU0Embt83SFzZ3aoJwET
-mB/LqUyrrGDiue3lU+flJO7UmcsRvtk0+BDkyCeB9HgfdpXbBLCyuwADBQP+PNxX
-4e1tg3ZJo/xNEnD2Re3HjmQRrr0RYJLUGjgQrAEONSgowx3IW8/JssmNJVjnYm0q
-jSKsb8rergCFJhPNZ8Dd/k00pKcrq+IN6j7WTYLqPce87zrGAZUtmDwDSp5mxy5E
-xWJJxsgBPk4YBQLzJt21A3BgK/i24Sze2VLbaZuIRgQYEQIABgUCPLR5vwAKCRDv
-o+d57fYsNa8xAJ4mLfonZbd64+YY9rfvhIh3Vsl3AACeLPPKtma2K6XCfhTBEDnj
-hzSr4vo=
-=lBfF
------END PGP PUBLIC KEY BLOCK-----
-pub 1024D/265B4C63 2003-08-18 Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
-sig 3 265B4C63 2003-12-06 Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
-sig 3 5F6B8B72 2003-12-12 Stefan Bodewig <bodewig@apache.org>
-uid Antoine Levy-Lambert (Apache Ant Committer) <antoine@antbuild.com>
-sig 3 265B4C63 2003-08-18 Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
-sig 3 5F6B8B72 2003-12-12 Stefan Bodewig <bodewig@apache.org>
-sub 1024g/A3060393 2003-08-18
-sig 265B4C63 2003-08-18 Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.2 (MingW32)
-
-mQGiBD9AzmcRBACMqgb7IFvC/nLxw7mUAgHENeZXY3JOQJ8wVBevIbbMEeFvzHE2
-diFydqUXocPexduYr0ahkf033WvWdAiNqDLfVW/HFOsc1TpjbHkqPUHtJ62Ya5tg
-nH4UGN9BYZfMbfVDOSz41lYwmfK5HYgpZN/sBQBSKf2qgoFB+LxYaae8YwCgrWlu
-fYhf7fkKbbdSf3BGS67ggNkD/0VvkXkw1SEnPaqrkKGkPKomCTb2auGxcYYI3/rP
-1m+SGRf0gE1NtocmIEitiR6WvfKUjoMAXSCp5KdnUXmO9rwzkM002KCA7K5CY+e/
-2bLDuiQ3rNiD4mFfG6M+UnmZ+GMFba1p9Cp4PqLNLsCHz67t7hEsscTZQ8mZ9xKM
-+GCsA/9P+XFM7JDn9MLhYab9qo1CkceBkthUP6jWGjuAZ00elmBCkpkzNv5aIzss
-xih2GpaU/tmcMjw8FGp0dTwzqdpmbZBLjunRnuBTir4m4l5G9rwl4JbfK1PVqk4a
-VKkh9W7/yqBcEfNcsfJO9cqaQ+PzcnCoDiD9UHEBYzUhrCKwhLRCQW50b2luZSBM
-ZXZ5LUxhbWJlcnQgKEFwYWNoZSBBbnQgQ29tbWl0dGVyKSA8YW50b2luZUBhbnRi
-dWlsZC5jb20+iFsEExECABsFAj9AzmcGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ
-hhTWqyZbTGMnOgCeJV2gI+1CIxMR7dcIhXjPkiusreIAn2SGOsPS0o89l0EIVuc9
-J2F03aB+iEYEExECAAYFAj/ZwioACgkQohFa4V9ri3J8CACgiGlh+td0BAnJPq19
-ovEQR2DJ02MAoLP203EF+BLPpykeTcGp8UEWmeGQtEBBbnRvaW5lIExldnktTGFt
-YmVydCAoQXBhY2hlIEFudCBDb21taXR0ZXIpIDxhbnRvaW5lQGFwYWNoZS5vcmc+
-iF4EExECAB4FAj/SSwYCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQhhTWqyZb
-TGOh/QCfbrSoipMlizyGT6c8BOPEd9zzfi0AnRRTqTDzXzsGk4CG/BJME9CCm7Ts
-iEYEExECAAYFAj/ZwiMACgkQohFa4V9ri3IOVACgh2QHS1+cVjvM4eLjls1bJwWi
-o5IAoLtAszHrwHS5qrhvr2rtnlyyyV2guQENBD9AzmkQBACNpBfqi2PweozCtxoX
-PqzKdRDKqCw7TOrDR6lbP3z/ov/1SN5Vc0XqNzBSGqwBcmGWtneABkX7n4uzJrC5
-wvX/TZ/DkMvypPyeNVMu+/ZMlzdbx06OUDKr6Fy/NtaI7cN1rw+Igyv22Q8ilhhg
-s/5Rdj84EtJkWQjVRml6wXSAZwADBwP/TqyhOC4sA5YrePYGH8i46h0SU9dXjfEF
-JijC8vXZ+BNQHQVK3fjEXedZL8Zvvp1bsMu7Muz9SMnqygM1unp2NGxLRd/9315p
-Qh0VStYKn0xq13ybOKr0Gsyx5yyl3Nzlu/1qAR0es/zN4jV7/IQi3R2GOvezcpHX
-mkbsYiZAhu2IRgQYEQIABgUCP0DOaQAKCRCGFNarJltMYxcsAKCSJJUABlXYnLBj
-b+WtmAzu0JjZNACdFJ4KIATJDK/5ajFq5+irOpodoHc=
-=UomR
------END PGP PUBLIC KEY BLOCK-----
diff --git a/spss.iaiklibsupdate/ant.1-6-5/LICENSE b/spss.iaiklibsupdate/ant.1-6-5/LICENSE
deleted file mode 100644
index f820d4bd3..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Apache License
- * Version 2.0, January 2004
- * http://www.apache.org/licenses/
- *
- * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- * 1. Definitions.
- *
- * "License" shall mean the terms and conditions for use, reproduction,
- * and distribution as defined by Sections 1 through 9 of this document.
- *
- * "Licensor" shall mean the copyright owner or entity authorized by
- * the copyright owner that is granting the License.
- *
- * "Legal Entity" shall mean the union of the acting entity and all
- * other entities that control, are controlled by, or are under common
- * control with that entity. For the purposes of this definition,
- * "control" means (i) the power, direct or indirect, to cause the
- * direction or management of such entity, whether by contract or
- * otherwise, or (ii) ownership of fifty percent (50%) or more of the
- * outstanding shares, or (iii) beneficial ownership of such entity.
- *
- * "You" (or "Your") shall mean an individual or Legal Entity
- * exercising permissions granted by this License.
- *
- * "Source" form shall mean the preferred form for making modifications,
- * including but not limited to software source code, documentation
- * source, and configuration files.
- *
- * "Object" form shall mean any form resulting from mechanical
- * transformation or translation of a Source form, including but
- * not limited to compiled object code, generated documentation,
- * and conversions to other media types.
- *
- * "Work" shall mean the work of authorship, whether in Source or
- * Object form, made available under the License, as indicated by a
- * copyright notice that is included in or attached to the work
- * (an example is provided in the Appendix below).
- *
- * "Derivative Works" shall mean any work, whether in Source or Object
- * form, that is based on (or derived from) the Work and for which the
- * editorial revisions, annotations, elaborations, or other modifications
- * represent, as a whole, an original work of authorship. For the purposes
- * of this License, Derivative Works shall not include works that remain
- * separable from, or merely link (or bind by name) to the interfaces of,
- * the Work and Derivative Works thereof.
- *
- * "Contribution" shall mean any work of authorship, including
- * the original version of the Work and any modifications or additions
- * to that Work or Derivative Works thereof, that is intentionally
- * submitted to Licensor for inclusion in the Work by the copyright owner
- * or by an individual or Legal Entity authorized to submit on behalf of
- * the copyright owner. For the purposes of this definition, "submitted"
- * means any form of electronic, verbal, or written communication sent
- * to the Licensor or its representatives, including but not limited to
- * communication on electronic mailing lists, source code control systems,
- * and issue tracking systems that are managed by, or on behalf of, the
- * Licensor for the purpose of discussing and improving the Work, but
- * excluding communication that is conspicuously marked or otherwise
- * designated in writing by the copyright owner as "Not a Contribution."
- *
- * "Contributor" shall mean Licensor and any individual or Legal Entity
- * on behalf of whom a Contribution has been received by Licensor and
- * subsequently incorporated within the Work.
- *
- * 2. Grant of Copyright License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * copyright license to reproduce, prepare Derivative Works of,
- * publicly display, publicly perform, sublicense, and distribute the
- * Work and such Derivative Works in Source or Object form.
- *
- * 3. Grant of Patent License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * (except as stated in this section) patent license to make, have made,
- * use, offer to sell, sell, import, and otherwise transfer the Work,
- * where such license applies only to those patent claims licensable
- * by such Contributor that are necessarily infringed by their
- * Contribution(s) alone or by combination of their Contribution(s)
- * with the Work to which such Contribution(s) was submitted. If You
- * institute patent litigation against any entity (including a
- * cross-claim or counterclaim in a lawsuit) alleging that the Work
- * or a Contribution incorporated within the Work constitutes direct
- * or contributory patent infringement, then any patent licenses
- * granted to You under this License for that Work shall terminate
- * as of the date such litigation is filed.
- *
- * 4. Redistribution. You may reproduce and distribute copies of the
- * Work or Derivative Works thereof in any medium, with or without
- * modifications, and in Source or Object form, provided that You
- * meet the following conditions:
- *
- * (a) You must give any other recipients of the Work or
- * Derivative Works a copy of this License; and
- *
- * (b) You must cause any modified files to carry prominent notices
- * stating that You changed the files; and
- *
- * (c) You must retain, in the Source form of any Derivative Works
- * that You distribute, all copyright, patent, trademark, and
- * attribution notices from the Source form of the Work,
- * excluding those notices that do not pertain to any part of
- * the Derivative Works; and
- *
- * (d) If the Work includes a "NOTICE" text file as part of its
- * distribution, then any Derivative Works that You distribute must
- * include a readable copy of the attribution notices contained
- * within such NOTICE file, excluding those notices that do not
- * pertain to any part of the Derivative Works, in at least one
- * of the following places: within a NOTICE text file distributed
- * as part of the Derivative Works; within the Source form or
- * documentation, if provided along with the Derivative Works; or,
- * within a display generated by the Derivative Works, if and
- * wherever such third-party notices normally appear. The contents
- * of the NOTICE file are for informational purposes only and
- * do not modify the License. You may add Your own attribution
- * notices within Derivative Works that You distribute, alongside
- * or as an addendum to the NOTICE text from the Work, provided
- * that such additional attribution notices cannot be construed
- * as modifying the License.
- *
- * You may add Your own copyright statement to Your modifications and
- * may provide additional or different license terms and conditions
- * for use, reproduction, or distribution of Your modifications, or
- * for any such Derivative Works as a whole, provided Your use,
- * reproduction, and distribution of the Work otherwise complies with
- * the conditions stated in this License.
- *
- * 5. Submission of Contributions. Unless You explicitly state otherwise,
- * any Contribution intentionally submitted for inclusion in the Work
- * by You to the Licensor shall be under the terms and conditions of
- * this License, without any additional terms or conditions.
- * Notwithstanding the above, nothing herein shall supersede or modify
- * the terms of any separate license agreement you may have executed
- * with Licensor regarding such Contributions.
- *
- * 6. Trademarks. This License does not grant permission to use the trade
- * names, trademarks, service marks, or product names of the Licensor,
- * except as required for reasonable and customary use in describing the
- * origin of the Work and reproducing the content of the NOTICE file.
- *
- * 7. Disclaimer of Warranty. Unless required by applicable law or
- * agreed to in writing, Licensor provides the Work (and each
- * Contributor provides its Contributions) on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied, including, without limitation, any warranties or conditions
- * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- * PARTICULAR PURPOSE. You are solely responsible for determining the
- * appropriateness of using or redistributing the Work and assume any
- * risks associated with Your exercise of permissions under this License.
- *
- * 8. Limitation of Liability. In no event and under no legal theory,
- * whether in tort (including negligence), contract, or otherwise,
- * unless required by applicable law (such as deliberate and grossly
- * negligent acts) or agreed to in writing, shall any Contributor be
- * liable to You for damages, including any direct, indirect, special,
- * incidental, or consequential damages of any character arising as a
- * result of this License or out of the use or inability to use the
- * Work (including but not limited to damages for loss of goodwill,
- * work stoppage, computer failure or malfunction, or any and all
- * other commercial damages or losses), even if such Contributor
- * has been advised of the possibility of such damages.
- *
- * 9. Accepting Warranty or Additional Liability. While redistributing
- * the Work or Derivative Works thereof, You may choose to offer,
- * and charge a fee for, acceptance of support, warranty, indemnity,
- * or other liability obligations and/or rights consistent with this
- * License. However, in accepting such obligations, You may act only
- * on Your own behalf and on Your sole responsibility, not on behalf
- * of any other Contributor, and only if You agree to indemnify,
- * defend, and hold each Contributor harmless for any liability
- * incurred by, or claims asserted against, such Contributor by reason
- * of your accepting any such warranty or additional liability.
- *
- * END OF TERMS AND CONDITIONS
- *
- * APPENDIX: How to apply the Apache License to your work.
- *
- * To apply the Apache License to your work, attach the following
- * boilerplate notice, with the fields enclosed by brackets "[]"
- * replaced with your own identifying information. (Don't include
- * the brackets!) The text should be enclosed in the appropriate
- * comment syntax for the file format. We also recommend that a
- * file or class name and description of purpose be included on the
- * same "printed page" as the copyright notice for easier
- * identification within third-party archives.
- *
- * Copyright [yyyy] [name of copyright owner]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
diff --git a/spss.iaiklibsupdate/ant.1-6-5/LICENSE.dom b/spss.iaiklibsupdate/ant.1-6-5/LICENSE.dom
deleted file mode 100644
index 05013f198..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/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/spss.iaiklibsupdate/ant.1-6-5/LICENSE.sax b/spss.iaiklibsupdate/ant.1-6-5/LICENSE.sax
deleted file mode 100644
index 006c924b2..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/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/spss.iaiklibsupdate/ant.1-6-5/LICENSE.xerces b/spss.iaiklibsupdate/ant.1-6-5/LICENSE.xerces
deleted file mode 100644
index 70cb54a0d..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/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/spss.iaiklibsupdate/ant.1-6-5/NOTICE b/spss.iaiklibsupdate/ant.1-6-5/NOTICE
deleted file mode 100644
index 1fb6dde47..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/NOTICE
+++ /dev/null
@@ -1,15 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Ant distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- This product includes also software developed by :
- - the W3C consortium (http://www.w3c.org) ,
- - the SAX project (http://www.saxproject.org)
-
- Please read the different LICENSE files present in the root directory of
- this distribution.
diff --git a/spss.iaiklibsupdate/ant.1-6-5/README b/spss.iaiklibsupdate/ant.1-6-5/README
deleted file mode 100644
index 263c111d5..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/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 Ant
- Project web site <http://ant.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 Ant Project
- <http://ant.apache.org/>
diff --git a/spss.iaiklibsupdate/ant.1-6-5/TODO b/spss.iaiklibsupdate/ant.1-6-5/TODO
deleted file mode 100644
index 8bbbc3d6a..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-Things that are scheduled for Ant 1.6.2. Once this list is empty, we
-can roll the first beta.
-
-Please go ahead and assign things that are not already assigned to
-anybody else (assignments look like [Stefan]) to yourself - and please
-remove items from this list once they are complete.
-
-
-
diff --git a/spss.iaiklibsupdate/ant.1-6-5/bin/ant b/spss.iaiklibsupdate/ant.1-6-5/bin/ant
deleted file mode 100644
index cf336db07..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/ant
+++ /dev/null
@@ -1,299 +0,0 @@
-#! /bin/sh
-
-# Copyright 2001-2005 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Extract launch and ant arguments, (see details below).
-ant_exec_args=
-no_config=false
-use_jikes_default=false
-ant_exec_debug=false
-show_help=false
-for arg in "$@" ; do
- if [ "$arg" = "--noconfig" ] ; then
- no_config=true
- elif [ "$arg" = "--usejikes" ] ; then
- use_jikes_default=true
- elif [ "$arg" = "--execdebug" ] ; then
- ant_exec_debug=true
- elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then
- show_help=true
- ant_exec_args="$ant_exec_args -h"
- else
- if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then
- show_help=true
- fi
- ant_exec_args="$ant_exec_args \"$arg\""
- fi
-done
-
-# Source/default ant configuration
-if $no_config ; then
- rpm_mode=false
- usejikes=$use_jikes_default
-else
- # load system-wide ant configuration
- if [ -f "/etc/ant.conf" ] ; then
- . /etc/ant.conf
- fi
-
- # load user ant configuration
- if [ -f "$HOME/.ant/ant.conf" ] ; then
- . $HOME/.ant/ant.conf
- fi
- if [ -f "$HOME/.antrc" ] ; then
- . "$HOME/.antrc"
- fi
-
- # provide default configuration values
- if [ -z "$rpm_mode" ] ; then
- rpm_mode=false
- fi
- if [ -z "$usejikes" ] ; then
- usejikes=$use_jikes_default
- fi
-fi
-
-# Setup Java environment in rpm mode
-if $rpm_mode ; then
- if [ -f /usr/share/java-utils/java-functions ] ; then
- . /usr/share/java-utils/java-functions
- set_jvm
- set_javacmd
- fi
-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" -o ! -d "$ANT_HOME" ] ; then
- ## resolve links - $0 may be a link to ant's home
- PRG="$0"
- progname=`basename "$0"`
-
- # need this for relative symlinks
- 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"`/..
-
- # 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"`
-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=`which java 2> /dev/null `
- if [ -z "$JAVACMD" ] ; then
- JAVACMD=java
- fi
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly."
- echo " We cannot execute $JAVACMD"
- exit 1
-fi
-
-# Build local classpath using just the launcher in non-rpm mode or
-# use the Jpackage helper in rpm mode with basic and default jars
-# specified in the ant.conf configuration. Because the launcher is
-# used, libraries linked in ANT_HOME will also be include, but this
-# is discouraged as it is not java-version safe. A user should
-# request optional jars and their dependencies via the OPT_JAR_LIST
-# variable
-if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then
- LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
- # If the user requested to try to add some other jars to the classpath
- if [ -n "$OPT_JAR_LIST" ] ; then
- _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"
- if [ -n "$_OPTCLASSPATH" ] ; then
- LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH"
- fi
- fi
-
- # Explicitly add javac path to classpath, assume JAVA_HOME set
- # properly in rpm mode
- 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
-
- # if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
- # user CLASSPATH first and ant-found jars after.
- # In that case, the user CLASSPATH will override ant-found jars
- #
- # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
- # with ant-found jars first and user CLASSPATH after
- if [ -n "$CLASSPATH" ] ; then
- # merge local and specified classpath
- if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH="$CLASSPATH"
- elif [ -n "$CLASSPATH_OVERRIDE" ] ; then
- LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
- else
- LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
- fi
-
- # remove class path from launcher -cp option
- CLASSPATH=""
- fi
-else
- # not using rpm_mode; use launcher to determine classpaths
- if [ -z "$LOCALCLASSPATH" ] ; then
- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
- else
- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
- fi
-fi
-
-if [ -n "$JAVA_HOME" ] ; then
- # OSX hack to make Ant work with jikes
- if $darwin ; then
- OSXHACK="${JAVA_HOME}/../Classes"
- if [ -d "${OSXHACK}" ] ; then
- for i in "${OSXHACK}"/*.jar
- do
- JIKESPATH="$JIKESPATH:$i"
- done
- fi
- fi
-fi
-
-# Allow Jikes support (off by default)
-if $usejikes; then
- ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
-fi
-
-# For Cygwin, switch paths to appropriate format before running java
-# For PATHs convert to unix format first, then to windows format to ensure
-# both formats are supported. Probably this will fail on directories with ;
-# in the name in the path. Let's assume that paths containing ; are more
-# rare than windows style paths on cygwin.
-if $cygwin; then
- if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
- format=mixed
- else
- format=windows
- fi
- ANT_HOME=`cygpath --$format "$ANT_HOME"`
- ANT_LIB=`cygpath --$format "$ANT_LIB"`
- JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
- LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
- LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
- if [ -n "$CLASSPATH" ] ; then
- CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
- CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
- fi
- CYGHOME=`cygpath --$format "$HOME"`
-fi
-
-# Show script help if requested
-if $show_help ; then
- echo $0 '[script options] [options] [target [target2 [target3] ..]]'
- echo 'Script Options:'
- echo ' --help, --h print this message and ant help'
- echo ' --noconfig suppress sourcing of /etc/ant.conf,'
- echo ' $HOME/.ant/ant.conf, and $HOME/.antrc'
- echo ' configuration files'
- echo ' --usejikes enable use of jikes by default, unless'
- echo ' set explicitly in configuration files'
- echo ' --execdebug print ant exec line generated by this'
- echo ' launch script'
- echo ' '
-fi
-# add a second backslash to variables terminated by a backslash under cygwin
-if $cygwin; then
- case "$ANT_HOME" in
- *\\ )
- ANT_HOME="$ANT_HOME\\"
- ;;
- esac
- case "$CYGHOME" in
- *\\ )
- CYGHOME="$CYGHOME\\"
- ;;
- esac
- case "$JIKESPATH" in
- *\\ )
- JIKESPATH="$JIKESPATH\\"
- ;;
- esac
- case "$LOCALCLASSPATH" in
- *\\ )
- LOCALCLASSPATH="$LOCALCLASSPATH\\"
- ;;
- esac
- case "$CLASSPATH" in
- *\\ )
- CLASSPATH="$CLASSPATH\\"
- ;;
- esac
-fi
-# Execute ant using eval/exec to preserve spaces in paths,
-# java options, and ant args
-ant_sys_opts=
-if [ -n "$CYGHOME" ]; then
- if [ -n "$JIKESPATH" ]; then
- ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\""
- else
- ant_sys_opts="-Dcygwin.user.home=\"$CYGHOME\""
- fi
-else
- if [ -n "$JIKESPATH" ]; then
- ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
- fi
-fi
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
-if $ant_exec_debug ; then
- echo $ant_exec_command
-fi
-eval $ant_exec_command
diff --git a/spss.iaiklibsupdate/ant.1-6-5/bin/ant.bat b/spss.iaiklibsupdate/ant.1-6-5/bin/ant.bat
deleted file mode 100644
index 55df28186..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/ant.bat
+++ /dev/null
@@ -1,126 +0,0 @@
-@echo off
-
-REM Copyright 2001,2004-2005 The Apache Software Foundation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-
-if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
-
-if "%OS%"=="Windows_NT" @setlocal
-if "%OS%"=="WINNT" @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=
-
-set _USE_CLASSPATH=yes
-
-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
-if ""%1""==""-noclasspath"" goto clearclasspath
-set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-
-rem here is there is a -noclasspath in the options
-:clearclasspath
-set _USE_CLASSPATH=no
-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%\lib\ant.jar" goto checkJava
-
-rem check for ant in Program Files
-if not exist "%ProgramFiles%\ant" goto checkSystemDrive
-set ANT_HOME=%ProgramFiles%\ant
-goto checkJava
-
-:checkSystemDrive
-rem check for ant in root directory of system drive
-if not exist %SystemDrive%\ant\lib\ant.jar 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\lib\ant.jar 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 _JAVACMD=%JAVACMD%
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-goto checkJikes
-
-:noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=java.exe
-
-:checkJikes
-if not "%JIKESPATH%"=="" goto runAntWithJikes
-
-:runAnt
-if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
-if not "%CLASSPATH%"=="" goto runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-goto end
-
-:runAntNoClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-goto end
-
-:runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
-goto end
-
-:runAntWithJikes
-if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
-if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
-
-:runAntWithJikesNoClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-goto end
-
-:runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
-goto end
-
-:end
-set _JAVACMD=
-set ANT_CMD_LINE_ARGS=
-
-if "%OS%"=="Windows_NT" @endlocal
-if "%OS%"=="WINNT" @endlocal
-
-:mainEnd
-if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
-
diff --git a/spss.iaiklibsupdate/ant.1-6-5/bin/ant.cmd b/spss.iaiklibsupdate/ant.1-6-5/bin/ant.cmd
deleted file mode 100644
index 94b5a4541..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/ant.cmd
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- Run ant
-*/
-
-'@echo off'
-parse arg mode envarg '::' antarg
-
-if mode\='.' & mode\='..' & mode\='/' then do
- envarg = mode envarg
- mode = ''
-end
-
-if antarg = '' then do
- antarg = envarg
- envarg = ''
-end
-
-x = setlocal()
-
-env="OS2ENVIRONMENT"
-antenv = _getenv_('antenv')
-if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"'
-
-if mode = '' then mode = _getenv_('ANT_MODE' '..')
-if mode \= '/' then do
- runrc = _getenv_('runrc')
- antrc = _getenv_('antrc' 'antrc.cmd')
- if mode = '..' then mode = '-r'
- else mode = ''
- interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
-end
-
-if _testenv_() = 0 then do
- say 'Ant environment is not set properly'
- x = endlocal()
- exit 16
-end
-
-settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
-
-java = _getenv_('javacmd' 'java')
-opts = value('ANT_OPTS',,env)
-args = value('ANT_ARGS',,env)
-lcp = value('LOCALCLASSPATH',,env)
-cp = value('CLASSPATH',,env)
-if value('ANT_USE_CP',,env) \= '' then do
- if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
- lcp = lcp || cp
- 'SET CLASSPATH='
-end
-if lcp\='' then lcp = '-classpath' lcp
-
-cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg
-launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
-if launcher = '' then entry = 'org.apache.tools.ant.Main'
-else entry = 'org.apache.tools.ant.launch.Launcher'
-java opts lcp entry settings args antarg
-
-x = endlocal()
-
-return rc
-
-_testenv_: procedure expose env ANT_HOME JAVA_HOME
-ANT_HOME = value('ANT_HOME',,env)
-if ANT_HOME = '' then return 0
-JAVA_HOME = value('JAVA_HOME',,env)
-if JAVA_HOME = '' then return 0
-cp = translate(value('CLASSPATH',,env))
-if pos(translate(ANT_HOME), cp) = 0 then return 0
-if pos(translate(JAVA_HOME), cp) = 0 then return 0
-return 1
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
diff --git a/spss.iaiklibsupdate/ant.1-6-5/bin/antRun b/spss.iaiklibsupdate/ant.1-6-5/bin/antRun
deleted file mode 100644
index baddd71cd..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/antRun
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright 2001-2002,2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-# Args: DIR command
-cd "$1"
-CMD="$2"
-shift
-shift
-
-exec "$CMD" "$@"
diff --git a/spss.iaiklibsupdate/ant.1-6-5/bin/antRun.bat b/spss.iaiklibsupdate/ant.1-6-5/bin/antRun.bat
deleted file mode 100644
index aae98ccf0..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/antRun.bat
+++ /dev/null
@@ -1,47 +0,0 @@
-@echo off
-
-REM
-REM Copyright 2001-2002,2004-2005 The Apache Software Foundation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM
-REM
-
-if "%OS%"=="Windows_NT" @setlocal
-if "%OS%"=="WINNT" @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
-if "%OS%"=="WINNT" @endlocal
-
diff --git a/spss.iaiklibsupdate/ant.1-6-5/bin/antRun.pl b/spss.iaiklibsupdate/ant.1-6-5/bin/antRun.pl
deleted file mode 100644
index 7cdd8687c..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/antRun.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright 2001,2003-2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#######################################################################
-#
-# 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
-# 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/spss.iaiklibsupdate/ant.1-6-5/bin/antenv.cmd b/spss.iaiklibsupdate/ant.1-6-5/bin/antenv.cmd
deleted file mode 100644
index 05efa8506..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/antenv.cmd
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- Ant environment
-*/
-
-'@echo off'
-call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs"
-call SysLoadFuncs
-
-/* Prepare the parameters for later use */
-parse arg argv
-mode = ''
-args = ''
-opts = ''
-cp = ''
-lcp = ''
-
-do i = 1 to words(argv)
- param = word(argv, i)
- select
- when param='-lcp' then mode = 'l'
- when param='-cp' | param='-classpath' then mode = 'c'
- when abbrev('-opts', param, 4) then mode = 'o'
- when abbrev('-args', param, 4) then mode = 'a'
- otherwise
- select
- when mode = 'a' then args = space(args param, 1)
- when mode = 'c' then cp = space(cp param, 1)
- when mode = 'l' then lcp = space(lcp param, 1)
- when mode = 'o' then opts = space(opts param, 1)
- otherwise
- say 'Option' param 'ignored'
- end
- end
-end
-
-env="OS2ENVIRONMENT"
-antconf = _getenv_('antconf' 'antconf.cmd')
-runrc = _getenv_('runrc')
-interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC'
-ANT_HOME = value('ANT_HOME',,env)
-JAVA_HOME = value('JAVA_HOME',,env)
-classpath = value('CLASSPATH',,env)
-classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS")
-if classes \= '' then classpath = prepend(classpath classes)
-classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS")
-if classes \= '' then classpath = prepend(classpath classes)
-
-classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar')
-'SET CLASSPATH=' || classpath
-
-/* Setting classpathes, options and arguments */
-envset = _getenv_('envset')
-if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"'
-if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"'
-if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"'
-if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"'
-
-exit 0
-
-addpath: procedure
-parse arg path elem
-if elem = '' then do
- if path\='' & right(path, 1)\=';' then path = path || ';'
- return path
-end
-if substr(path, length(path)) = ';' then glue = ''
-else glue = ';'
-if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';'
-return path
-
-prepend: procedure
-parse arg path elem
-if elem = '' then do
- if path\='' & right(path, 1)\=';' then path = path || ';'
- return path
-end
-if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path
-return path
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
diff --git a/spss.iaiklibsupdate/ant.1-6-5/bin/complete-ant-cmd.pl b/spss.iaiklibsupdate/ant.1-6-5/bin/complete-ant-cmd.pl
deleted file mode 100644
index 20dd47619..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/complete-ant-cmd.pl
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright 2001,2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# 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/spss.iaiklibsupdate/ant.1-6-5/bin/envset.cmd b/spss.iaiklibsupdate/ant.1-6-5/bin/envset.cmd
deleted file mode 100644
index 8fbd4dde7..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/envset.cmd
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-SET environment variables
-First optional parameter:
- ; parameters are considered parts of a path variable, semicolons are
- appended to each element if not already present
- -D parameters are properties for Java or Makefile etc., -D will be
- prepended and the parameters will be separated by a space
- =D the same as above but equal sign is not required
- , parameters should be comma separated in the environment variable
- - parameters should be separated by the next parameter
- Other values mean that the first parameter is missing and the environment
- variable will be set to the space separated parameters
-
-Second parameter: name of the environment variable
-
-Next parameters: values
-; implies that the equal sign is considered a part of the parameter and is
-not interpreted
-
--D requires parameters in the form name=value. If the equal sign is not found,
-the parameters are changed to name=expanded_name
-
-Other options have optional equal sign. If it is found, only the part after
-the equal sign will be oprionally expanded.
-
-If the parameter is the minus sign, the next parameter will not be expanded.
-If the parameter is a single dot, it will be replaced with the value of the
-environment variable as it existed before envset was invoked.
-
-For other parameters the batch looks for the environment variable with the
-same name (in uppercase). If it is found, it forms the expanded_name. If
-the environment variable with such a name does not exist, the expanded_name
-will hold the parameter name without case conversion.
-*/
-
-parse arg mode envar args
-
-equal = 0
-sep = ' '
-
-/* Parse command line parameters */
-select
- when mode='-' then do
- sep = envar
- parse var args envar args
- end
- when mode=';' then do
- sep = ''
- equal = -1
- end
- when mode='-D' then equal = 1
- when mode='=D' then mode = '-D'
- when mode=',' then sep = ','
-otherwise
- args = envar args
- envar = mode
- mode = ''
-end
-
-env = 'OS2ENVIRONMENT'
-envar = translate(envar)
-orig = value(envar,,env)
-newval = ''
-expand = 1
-
-/* for each parameter... */
-do i = 1 to words(args)
- if expand > 0 & word(args, i) = '-' then expand = 0
- else call addval word(args, i)
-end
-
-/* Optionally enclose path variable by quotes */
-if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"'
-
-/* Set the new value, 'SET' cannot be used since it does not allow '=' */
-x = value(envar, newval, env)
-exit 0
-
-addval: procedure expose sep equal orig expand newval mode env
-parse arg var
-
-if var = '.' then expvar = orig
-else do
- if equal >= 0 then do
- parse var var name '=' val
- if val = '' then var = name
- else var = val
- end
- if expand = 0 then expvar = var
- else expvar = value(translate(var),,env)
- if expvar = '' then expvar = var
- if equal >= 0 then do
- if val = '' then do
- parse var expvar key '=' val
- if val <> '' then name = key
- else do
- if equal > 0 then val = key
- else name = key
- end
- end
- else val = expvar
- if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"'
- if val = '' then expvar = name
- else expvar = name || '=' || val
- end
- if mode = '-D' then expvar = '-D' || expvar
- if mode = ';' then do
- if right(expvar, 1) <> ';' then expvar = expvar || ';'
- end
-end
-
-if newval = '' then newval = expvar
-else newval = newval || sep || expvar
-expand = 1
-return
diff --git a/spss.iaiklibsupdate/ant.1-6-5/bin/lcp.bat b/spss.iaiklibsupdate/ant.1-6-5/bin/lcp.bat
deleted file mode 100644
index 6a1f679e7..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/lcp.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-REM
-REM Copyright 2001-2004 The Apache Software Foundation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM
-REM
-
-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/spss.iaiklibsupdate/ant.1-6-5/bin/runant.pl b/spss.iaiklibsupdate/ant.1-6-5/bin/runant.pl
deleted file mode 100644
index eca470822..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/runant.pl
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright 2000-2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#######################################################################
-#
-# 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
-# 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=1;
-
-#######################################################################
-#
-# 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;
-}
-
-my $oncygwin = ($^O eq "cygwin");
-
-#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 = "$HOME/lib/ant-launcher.jar";
-#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;
-push @ARGS, @ANT_OPTS;
-
-my $CYGHOME = "";
-
-my $classpath=$ENV{CLASSPATH};
-if ($oncygwin == 1) {
- $localpath = `cygpath --path --windows $localpath`;
- chomp ($localpath);
- if (! $classpath eq "")
- {
- $classpath = `cygpath --path --windows "$classpath"`;
- chomp ($classpath);
- }
- $HOME = `cygpath --path --windows $HOME`;
- chomp ($HOME);
- $CYGHOME = `cygpath --path --windows $ENV{HOME}`;
- chomp ($CYGHOME);
-}
-push @ARGS, "-classpath", "$localpath";
-push @ARGS, "-Dant.home=$HOME";
-if ( ! $CYGHOME eq "" )
-{
- push @ARGS, "-Dcygwin.user.home=\"$CYGHOME\""
-}
-push @ARGS, "org.apache.tools.ant.launch.Launcher", @ANT_ARGS;
-push @ARGS, @ARGV;
-if (! $classpath eq "")
-{
- if ($onnetware == 1)
- {
- # make classpath literally $CLASSPATH
- # this is to avoid pushing us over the 512 character limit
- # even skip the ; - that is already in $localpath
- push @ARGS, "-lib", "\$CLASSPATH";
- }
- else
- {
- push @ARGS, "-lib", "$classpath";
- }
-}
-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/spss.iaiklibsupdate/ant.1-6-5/bin/runant.py b/spss.iaiklibsupdate/ant.1-6-5/bin/runant.py
deleted file mode 100644
index c7b53b692..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/runant.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/python
-# Copyright 2001,2003-2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-"""
-
- 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
-
- created: 2001-04-11
- author: Pierre Dittgen pierre.dittgen@criltelecom.com
-
- Assumptions:
-
- - the "java" executable/script is on the command path
-"""
-import os, os.path, string, sys
-
-# Change it to 1 to get extra debug information
-debug = 0
-
-#######################################################################
-
-# If ANT_HOME is not set default to script's parent directory
-if os.environ.has_key('ANT_HOME'):
- ANT_HOME = os.environ['ANT_HOME']
-else:
- ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
-
-# set ANT_LIB location
-ANT_LIB = os.path.join(ANT_HOME, 'lib')
-
-# set JAVACMD (check variables JAVACMD and JAVA_HOME)
-JAVACMD = None
-if not os.environ.has_key('JAVACMD'):
- if os.environ.has_key('JAVA_HOME'):
- if not os.path.exists(os.environ['JAVA_HOME']):
- print "Warning: JAVA_HOME is not defined correctly."
- else:
- JAVACMD = os.path.join(os.environ['JAVA_HOME'], 'bin', 'java')
- else:
- print "Warning: JAVA_HOME not set."
-else:
- JAVACMD = os.environ['JAVACMD']
-if not JAVACMD:
- JAVACMD = 'java'
-
-launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar')
-if not os.path.exists(launcher_jar):
- print 'Unable to locate ant-launcher.jar. Expected to find it in %s' % \
- ANT_LIB
-
-# Build up standard classpath (LOCALCLASSPATH)
-LOCALCLASSPATH = launcher_jar
-if os.environ.has_key('LOCALCLASSPATH'):
- LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH']
-
-ANT_OPTS = ""
-if os.environ.has_key('ANT_OPTS'):
- ANT_OPTS = os.environ['ANT_OPTS']
-
-OPTS = ""
-if os.environ.has_key('JIKESPATH'):
- OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH']
-
-ANT_ARGS = ""
-if os.environ.has_key('ANT_ARGS'):
- ANT_ARGS = os.environ['ANT_ARGS']
-
-CLASSPATH = ""
-if os.environ.has_key('CLASSPATH'):
- CLASSPATH = os.environ['CLASSPATH']
-
-# Builds the commandline
-cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \
- 'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \
- % (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \
- CLASSPATH, string.join(sys.argv[1:], ' '))
-
-if debug:
- print '\n%s\n\n' % (cmdline)
-
-# Run the biniou!
-os.system(cmdline)
diff --git a/spss.iaiklibsupdate/ant.1-6-5/bin/runrc.cmd b/spss.iaiklibsupdate/ant.1-6-5/bin/runrc.cmd
deleted file mode 100644
index acdf724a3..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/bin/runrc.cmd
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- Run RC file, name is in the first arg, second arg is either PATH
- ENV or -r or nothing
-*/
-
-parse arg name path rest
-
-if name = '' then do
- say 'RC file name is missing'
- exit 1
-end
-
-if rest \= '' then do
- say 'Too many parameters'
- exit 1
-end
-
-call runit name path
-exit 0
-
-runit: procedure
-parse arg name path dir
-
-if path \= '' & path \= '-r' then do
- dir = value(translate(path),,'OS2ENVIRONMENT')
- if dir = '' then return
- dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */
-end
-
-if dir = '' then dir = directory()
-
-if path = '-r' then do /* recursive call */
- subdir = filespec('path', dir)
- if subdir \= '\' then do
- subdir = left(subdir, length(subdir)-1)
- call runit name path filespec('drive', dir) || subdir
- end
-end
-
-/* Look for the file and run it */
-if right(dir, 1) \= '\' then dir = dir || '\'
-rcfile = stream(dir || name, 'c', 'query exists')
-if rcfile \= '' then interpret 'call "' || rcfile || '"'
-
-return
diff --git a/spss.iaiklibsupdate/ant.1-6-5/lib/README b/spss.iaiklibsupdate/ant.1-6-5/lib/README
deleted file mode 100644
index 38fa1fa90..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/lib/README
+++ /dev/null
@@ -1,14 +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.6.2 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 from the 2.6.2 release of Apache Xerces.
-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/spss.iaiklibsupdate/ant.1-6-5/lib/ant-launcher.jar b/spss.iaiklibsupdate/ant.1-6-5/lib/ant-launcher.jar
deleted file mode 100644
index 1a7161251..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/lib/ant-launcher.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/ant.1-6-5/lib/ant.jar b/spss.iaiklibsupdate/ant.1-6-5/lib/ant.jar
deleted file mode 100644
index 3beb3b802..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/lib/ant.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/ant.1-6-5/lib/xercesImpl.jar b/spss.iaiklibsupdate/ant.1-6-5/lib/xercesImpl.jar
deleted file mode 100644
index f0fb0e89b..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/lib/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/ant.1-6-5/lib/xml-apis.jar b/spss.iaiklibsupdate/ant.1-6-5/lib/xml-apis.jar
deleted file mode 100644
index 2dd837714..000000000
--- a/spss.iaiklibsupdate/ant.1-6-5/lib/xml-apis.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/build.bat b/spss.iaiklibsupdate/build.bat
deleted file mode 100644
index b6dc93b2f..000000000
--- a/spss.iaiklibsupdate/build.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-
-rem
-rem Script for calling Ant in order to generate the update dist zips
-rem
-rem Author: Gregor Karlinger
-rem Version: $Id: $
-rem
-
-
-if %OS%=="Windows_NT" @setlocal
-
-set ANT=.\ant.1-6-5\bin\ant.bat
-set BUILD_FILE=.\build.xml
-
-set ZIPFILE_EVAL=spss-1-3-0-iaiklib-update-eval.zip
-set ZIPFILE_PROD=spss-1-3-0-iaiklib-update-prod.zip
-
-call %ANT% -f %BUILD_FILE% build-all %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/spss.iaiklibsupdate/build.xml b/spss.iaiklibsupdate/build.xml
deleted file mode 100644
index 3169be320..000000000
--- a/spss.iaiklibsupdate/build.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Ant Buildfile for IAIK libraries Update ZIPs
-
- Author: Gregor Karlinger
-
- $Id$
-
--->
-<project name="moa-spss-iaiklibs-update-zipbuilder" default="build-all" basedir=".">
- <property environment="env"/>
-
- <property name="zipname.eval" value="dist/${env.ZIPFILE_EVAL}"/>
- <property name="zipname.prod" value="dist/${env.ZIPFILE_PROD}"/>
-
- <target name="init">
- <description>set up directories etc.</description>
- <mkdir dir="dist"/>
- </target>
-
- <target name="build-eval" depends="init">
- <description>Generates a zip containing the IAIK evaluation library update</description>
- <zip destfile="${zipname.eval}">
- <fileset dir="." includes="ant.1-6-5/**, iaiklibs.eval/**, setEnvironment.bat, update.eval.bat, update.xml, readme.eval.txt"/>
- </zip>
- </target>
-
- <target name="build-prod" depends="init">
- <description>Generates a zip containing the IAIK production library update</description>
- <zip destfile="${zipname.prod}">
- <fileset dir="." includes="ant.1-6-5/**, iaiklibs.prod/**, setEnvironment.bat, update.prod.bat, update.xml, readme.prod.txt"/>
- </zip>
- </target>
-
- <target name="build-all" depends="build-eval, build-prod"/>
-</project>
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/iaik_Pkcs11Provider.jar b/spss.iaiklibsupdate/iaiklibs.eval/iaik_Pkcs11Provider.jar
deleted file mode 100644
index f5ca425db..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/iaik_Pkcs11Provider.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/iaik_Pkcs11Wrapper.jar b/spss.iaiklibsupdate/iaiklibs.eval/iaik_Pkcs11Wrapper.jar
deleted file mode 100644
index 0ee74172b..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/iaik_Pkcs11Wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/iaik_cms.jar b/spss.iaiklibsupdate/iaiklibs.eval/iaik_cms.jar
deleted file mode 100644
index 31d400e5c..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/iaik_cms.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/iaik_ecc.jar b/spss.iaiklibsupdate/iaiklibs.eval/iaik_ecc.jar
deleted file mode 100644
index baee85463..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/iaik_ecc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/iaik_ixsil.jar b/spss.iaiklibsupdate/iaiklibs.eval/iaik_ixsil.jar
deleted file mode 100644
index 99b77eeef..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/iaik_ixsil.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/iaik_jce_full.jar b/spss.iaiklibsupdate/iaiklibs.eval/iaik_jce_full.jar
deleted file mode 100644
index 37d688a00..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/iaik_jce_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/iaik_moa_full.jar b/spss.iaiklibsupdate/iaiklibs.eval/iaik_moa_full.jar
deleted file mode 100644
index 6f8023843..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/iaik_moa_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_Pkcs11Provider_signed.jar b/spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_Pkcs11Provider_signed.jar
deleted file mode 100644
index 2897f436c..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_Pkcs11Provider_signed.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_ecc_signed.jar b/spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_ecc_signed.jar
deleted file mode 100644
index 2a7957226..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_ecc_signed.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_jce_full_signed.jar b/spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_jce_full_signed.jar
deleted file mode 100644
index 68dfc70a7..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/signed/iaik_jce_full_signed.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/win32/pkcs11wrapper.dll b/spss.iaiklibsupdate/iaiklibs.eval/win32/pkcs11wrapper.dll
deleted file mode 100644
index da6bcf963..000000000
--- a/spss.iaiklibsupdate/iaiklibs.eval/win32/pkcs11wrapper.dll
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/iaik_Pkcs11Provider.jar b/spss.iaiklibsupdate/iaiklibs.prod/iaik_Pkcs11Provider.jar
deleted file mode 100644
index b317a39dd..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/iaik_Pkcs11Provider.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/iaik_Pkcs11Wrapper.jar b/spss.iaiklibsupdate/iaiklibs.prod/iaik_Pkcs11Wrapper.jar
deleted file mode 100644
index 0ee74172b..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/iaik_Pkcs11Wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/iaik_cms.jar b/spss.iaiklibsupdate/iaiklibs.prod/iaik_cms.jar
deleted file mode 100644
index 7264a68f3..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/iaik_cms.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/iaik_ecc.jar b/spss.iaiklibsupdate/iaiklibs.prod/iaik_ecc.jar
deleted file mode 100644
index d927d52e7..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/iaik_ecc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/iaik_ixsil.jar b/spss.iaiklibsupdate/iaiklibs.prod/iaik_ixsil.jar
deleted file mode 100644
index 0f1027c15..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/iaik_ixsil.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/iaik_jce_full.jar b/spss.iaiklibsupdate/iaiklibs.prod/iaik_jce_full.jar
deleted file mode 100644
index f09377142..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/iaik_jce_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/iaik_moa_full.jar b/spss.iaiklibsupdate/iaiklibs.prod/iaik_moa_full.jar
deleted file mode 100644
index 2b2bace43..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/iaik_moa_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_Pkcs11Provider.jar b/spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_Pkcs11Provider.jar
deleted file mode 100644
index 20ccd0d2d..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_Pkcs11Provider.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_ecc.jar b/spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_ecc.jar
deleted file mode 100644
index 3dd52d3dd..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_ecc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_jce_full.jar b/spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_jce_full.jar
deleted file mode 100644
index c7258e64d..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/signed/iaik_jce_full.jar
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/win32/pkcs11wrapper.dll b/spss.iaiklibsupdate/iaiklibs.prod/win32/pkcs11wrapper.dll
deleted file mode 100644
index da6bcf963..000000000
--- a/spss.iaiklibsupdate/iaiklibs.prod/win32/pkcs11wrapper.dll
+++ /dev/null
Binary files differ
diff --git a/spss.iaiklibsupdate/readme.eval.txt b/spss.iaiklibsupdate/readme.eval.txt
deleted file mode 100644
index 4a0d02ab1..000000000
--- a/spss.iaiklibsupdate/readme.eval.txt
+++ /dev/null
@@ -1,166 +0,0 @@
------------------------------------------------------------------------
-MOA SP/SS - Ergänzende Krypto-Bibliotheken von SIC/IAIK (EVALUIERUNG)
------------------------------------------------------------------------
-
-Im Folgenden finden Sie eine detaillierte Anleitung zur Ergänzung
-von MOA SP/SS mit den Kryptographie-Bibliotheken von SIC/IAIK
-(http://jce.iaik.tugraz.at/).
-
-Ohne diese ergänzenden Bibliotheken ist es nicht möglich, MOA SP/SS
-zu betreiben!
-
-Bitte beachten Sie, dass die vorliegenden Krypto-Bibliotheken von
-SIC/IAIK nur für eine Evaluierung einsetzen dürfen. Wenn Sie
-MOA SP/SS produktiv einsetzen möchten, müssen Sie von SIC/IAIK eine
-Produktivlizenz für diese Krypto-Bibliotheken erwerben. Wenden Sie
-sich diesbezüglich bitte an den Verkauf von SIC/IAIK unter
-mailto:jce-sales@iaik.at.
-
------------------------------------------------------------------------
-
-Das vorliegende Paket ergänzt Ihre MOA SP/SS *Distribution* mit den
-Krypto-Bibliotheken von SIC/IAIK. Bitte beachten Sie, dass dieses Paket
-nicht geeignet ist, eine bestehende *Installation* von MOA SP/SS zu
-ergänzen.
-
-Weitere Hinweise finden Sie im Installations-Handbuch von MOA SP/SS
-(http://www.cio.gv.at/onlineservices/basicmodules/moa-spss/handbook/).
-
------------------------------------------------------------------------
-MOA SP/SS Webservice-Version
------------------------------------------------------------------------
-
-Gehen Sie wie folgt vor, um die *Webservice-Version* MOA SP/SS zu
-installieren:
-
-1. Führen Sie die ersten drei Schritte laut Abschnitt 2.1.2.1
- (Vorbereitung) des Installationshandbuchs für MOA SP/SS aus:
- - Installation von J2SE SDK
- - Installation von Apache Tomcat 4.1
- - Entpacken der MOA SP/SS Webservice Distribution
-
-2. Entpacken Sie den Inhalt dieses Ergänzungspakets in ein beliebiges
- Verzeichnis. Im Folgenden wird dieses Verzeichnis mit
- $SPSS_WS_UPDATE bezeichnet.
-
-3. Passen Sie die Datei $SPSS_WS_UPDATE/setEnvironment.bat an:
-
- a. Setzen Sie den Wert der Umgebungsvariablen JAVA_HOME auf das
- Wurzelverzeichnis einer vorhanden Java J2SE SKD oder JRE
- (1.3 oder höher). Java wird vom eingesetzten Installer
- (Apache Ant) benötigt.
-
- b. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_WS_INSTALL auf
- den Pfad $MOA_SPSS_INST (vgl. Installationshandbuch, Abschnitt
- 2.1.2.1).
-
- c. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_LIB_INSTALL auf
- den leeren Wert ("MOA_SPSS_LIB_INSTALL=").
-
- d. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_DEV auf
- den leeren Wert ("MOA_SPSS_DEV=").
-
-4. Wechseln Sie ins Verzeichnis $SPSS_WS_UPDATE. Führen Sie die Script-
- Datei update.eval.bat aus.
- Achten Sie auf etwaige Fehlermeldungen während der Ausführung. Wenn
- keine Fehler aufgetreten sind, konnte die Distribution der Webservice-
- Version von MOA SP/SS erfolgreich ergänzt werden.
-
-5. Führen Sie den fünften Schritt laut laut Abschnitt 2.1.2.1
- (Vorbereitung) des Installationshandbuchs für MOA SP/SS aus:
- - Installation der Krypographiebibliotheken von SIC/IAIK
-
-6. Folgen Sie dann den weiteren Schritten des Installationshandbuchs
- für MOA SP/SS, beginnend mit Abschnitt 2.1.2.2 (Konfiguration von
- Apache Tomcat).
-
-Hinweis: Die erwähnten Scriptdateien wurden für Windows-BS erstellt.
-Wenn Sie MOA SP/SS auf einem Unix-System installieren, müssen Sie die
-Scripts entsprechend migrieren.
-
------------------------------------------------------------------------
-MOA SP/SS API-Version
------------------------------------------------------------------------
-
-Gehen Sie wie folgt vor, um die *API-Version* MOA SP/SS zu
-installieren:
-
-1. Führen Sie die ersten drei Schritte laut Abschnitt 3.1.2
- (Vorbereitung) des Installationshandbuchs für MOA SP/SS aus:
- - Installation von J2SE SDK
- - Entpacken der MOA SP/SS Klassenbibliotheks-Distribution
-
-2. Entpacken Sie den Inhalt dieses Ergänzungspakets in ein beliebiges
- Verzeichnis. Im Folgenden wird dieses Verzeichnis mit
- $SPSS_LIB_UPDATE bezeichnet.
-
-3. Passen Sie die Datei $SPSS_LIB_UPDATE/setEnvironment.bat an:
-
- a. Setzen Sie den Wert der Umgebungsvariablen JAVA_HOME auf das
- Wurzelverzeichnis einer vorhanden Java J2SE SKD oder JRE
- (1.3 oder höher). Java wird vom eingesetzten Installer
- (Apache Ant) benötigt.
-
- b. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_LIB_INSTALL auf
- den Pfad $MOA_SPSS_INST (vgl. Installationshandbuch, Abschnitt
- 3.1.2).
-
- c. Setzen Sie den Wert der Umgebungsvariablen SPSS_WS_INSTALL auf
- den leeren Wert ("MOA_SPSS_WS_INSTALL=").
-
- d. Setzen Sie den Wert der Umgebungsvariablen SPSS_DEV auf
- den leeren Wert ("MOA_SPSS_DEV=").
-
-4. Wechseln Sie ins Verzeichnis $SPSS_LIB_UPDATE. Führen Sie die Script-
- Datei update.eval.bat aus.
- Achten Sie auf etwaige Fehlermeldungen während der Ausführung. Wenn
- keine Fehler aufgetreten sind, konnte die Distribution der Webservice-
- Version von MOA SP/SS erfolgreich ergänzt werden.
-
-5. Führen Sie den vierten Schritt laut laut Abschnitt 3.1.2
- (Vorbereitung) des Installationshandbuchs für MOA SP/SS aus:
- - Installation der Krypographiebibliotheken von SIC/IAIK
-
-6. Folgen Sie dann den weiteren Schritten des Installationshandbuchs
- für MOA SP/SS, beginnend mit Abschnitt 3.1.3 (Verwendung).
-
-Hinweis: Die erwähnten Scriptdateien wurden für Windows-BS erstellt.
-Wenn Sie MOA SP/SS auf einem Unix-System installieren, müssen Sie die
-Scripts entsprechend migrieren.
-
------------------------------------------------------------------------
-MOA SP/SS Entwicklungsdistribution (Source)
------------------------------------------------------------------------
-
-Gehen Sie wie folgt vor, um die MOA SP/SS Entwicklungsdistribution mit
-den Kryptographiebibliotheken von SIC/IAIK zu erweitern:
-
-1. Entpacken Sie die Entwicklungsdistribution in ein beliebiges Verzeich-
- nis. Im Folgenden wird dieses Verzeichnis mit $MOA_SPSS_DEV bezeichnet.
-
-2. Entpacken Sie den Inhalt dieses Ergänzungspakets in ein beliebiges
- weiteres Verzeichnis. Im Folgenden wird dieses Verzeichnis mit
- $SPSS_DEV_UPDATE bezeichnet.
-
-3. Passen Sie die Datei $SPSS_DEV_UPDATE/setEnvironment.bat an:
-
- a. Setzen Sie den Wert der Umgebungsvariablen JAVA_HOME auf das
- Wurzelverzeichnis einer vorhanden Java J2SE SKD oder JRE
- (1.3 oder höher). Java wird vom eingesetzten Installer
- (Apache Ant) benötigt.
-
- b. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_DEV auf
- den Pfad $MOA_SPSS_DEV.
-
- c. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_WS_INSTALL auf
- den leeren Wert ("MOA_SPSS_WS_INSTALL=").
-
- d. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_LIB_INSTALL auf
- den leeren Wert ("MOA_SPSS_LIB_INSTALL=").
-
-4. Wechseln Sie ins Verzeichnis $SPSS_DEV_UPDATE. Führen Sie die Script-
- Datei update.eval.bat aus.
- Achten Sie auf etwaige Fehlermeldungen während der Ausführung. Wenn
- keine Fehler aufgetreten sind, konnte die Entwicklungsdistribution
- von MOA SP/SS erfolgreich ergänzt werden.
- \ No newline at end of file
diff --git a/spss.iaiklibsupdate/readme.prod.txt b/spss.iaiklibsupdate/readme.prod.txt
deleted file mode 100644
index efb7d4514..000000000
--- a/spss.iaiklibsupdate/readme.prod.txt
+++ /dev/null
@@ -1,159 +0,0 @@
------------------------------------------------------------------------
-MOA SP/SS - Ergänzende Krypto-Bibliotheken von SIC/IAIK (PRODUKTION)
------------------------------------------------------------------------
-
-Im Folgenden finden Sie eine detaillierte Anleitung zur Ergänzung
-von MOA SP/SS mit den Kryptographie-Bibliotheken von SIC/IAIK
-(http://jce.iaik.tugraz.at/).
-
-Ohne diese ergänzenden Bibliotheken ist es nicht möglich, MOA SP/SS
-zu betreiben!
-
------------------------------------------------------------------------
-
-Das vorliegende Paket ergänzt Ihre MOA SP/SS *Distribution* mit den
-Krypto-Bibliotheken von SIC/IAIK. Bitte beachten Sie, dass dieses Paket
-nicht geeignet ist, eine bestehende *Installation* von MOA SP/SS zu
-ergänzen.
-
-Weitere Hinweise finden Sie im Installations-Handbuch von MOA SP/SS
-(http://www.cio.gv.at/onlineservices/basicmodules/moa-spss/handbook/).
-
------------------------------------------------------------------------
-MOA SP/SS Webservice-Version
------------------------------------------------------------------------
-
-Gehen Sie wie folgt vor, um die *Webservice-Version* MOA SP/SS zu
-installieren:
-
-1. Führen Sie die ersten drei Schritte laut Abschnitt 2.1.2.1
- (Vorbereitung) des Installationshandbuchs für MOA SP/SS aus:
- - Installation von J2SE SDK
- - Installation von Apache Tomcat 4.1
- - Entpacken der MOA SP/SS Webservice Distribution
-
-2. Entpacken Sie den Inhalt dieses Ergänzungspakets in ein beliebiges
- Verzeichnis. Im Folgenden wird dieses Verzeichnis mit
- $SPSS_WS_UPDATE bezeichnet.
-
-3. Passen Sie die Datei $SPSS_WS_UPDATE/setEnvironment.bat an:
-
- a. Setzen Sie den Wert der Umgebungsvariablen JAVA_HOME auf das
- Wurzelverzeichnis einer vorhanden Java J2SE SKD oder JRE
- (1.3 oder höher). Java wird vom eingesetzten Installer
- (Apache Ant) benötigt.
-
- b. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_WS_INSTALL auf
- den Pfad $MOA_SPSS_INST (vgl. Installationshandbuch, Abschnitt
- 2.1.2.1).
-
- c. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_LIB_INSTALL auf
- den leeren Wert ("MOA_SPSS_LIB_INSTALL=").
-
- d. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_DEV auf
- den leeren Wert ("MOA_SPSS_DEV=").
-
-4. Wechseln Sie ins Verzeichnis $SPSS_WS_UPDATE. Führen Sie die Script-
- Datei update.prod.bat aus.
- Achten Sie auf etwaige Fehlermeldungen während der Ausführung. Wenn
- keine Fehler aufgetreten sind, konnte die Distribution der Webservice-
- Version von MOA SP/SS erfolgreich ergänzt werden.
-
-5. Führen Sie den fünften Schritt laut laut Abschnitt 2.1.2.1
- (Vorbereitung) des Installationshandbuchs für MOA SP/SS aus:
- - Installation der Krypographiebibliotheken von SIC/IAIK
-
-6. Folgen Sie dann den weiteren Schritten des Installationshandbuchs
- für MOA SP/SS, beginnend mit Abschnitt 2.1.2.2 (Konfiguration von
- Apache Tomcat).
-
-Hinweis: Die erwähnten Scriptdateien wurden für Windows-BS erstellt.
-Wenn Sie MOA SP/SS auf einem Unix-System installieren, müssen Sie die
-Scripts entsprechend migrieren.
-
------------------------------------------------------------------------
-MOA SP/SS API-Version
------------------------------------------------------------------------
-
-Gehen Sie wie folgt vor, um die *API-Version* MOA SP/SS zu
-installieren:
-
-1. Führen Sie die ersten drei Schritte laut Abschnitt 3.1.2
- (Vorbereitung) des Installationshandbuchs für MOA SP/SS aus:
- - Installation von J2SE SDK
- - Entpacken der MOA SP/SS Klassenbibliotheks-Distribution
-
-2. Entpacken Sie den Inhalt dieses Ergänzungspakets in ein beliebiges
- Verzeichnis. Im Folgenden wird dieses Verzeichnis mit
- $SPSS_LIB_UPDATE bezeichnet.
-
-3. Passen Sie die Datei $SPSS_LIB_UPDATE/setEnvironment.bat an:
-
- a. Setzen Sie den Wert der Umgebungsvariablen JAVA_HOME auf das
- Wurzelverzeichnis einer vorhanden Java J2SE SKD oder JRE
- (1.3 oder höher). Java wird vom eingesetzten Installer
- (Apache Ant) benötigt.
-
- b. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_LIB_INSTALL auf
- den Pfad $MOA_SPSS_INST (vgl. Installationshandbuch, Abschnitt
- 3.1.2).
-
- c. Setzen Sie den Wert der Umgebungsvariablen SPSS_WS_INSTALL auf
- den leeren Wert ("MOA_SPSS_WS_INSTALL=").
-
- d. Setzen Sie den Wert der Umgebungsvariablen SPSS_DEV auf
- den leeren Wert ("MOA_SPSS_DEV=").
-
-4. Wechseln Sie ins Verzeichnis $SPSS_LIB_UPDATE. Führen Sie die Script-
- Datei update.prod.bat aus.
- Achten Sie auf etwaige Fehlermeldungen während der Ausführung. Wenn
- keine Fehler aufgetreten sind, konnte die Distribution der Webservice-
- Version von MOA SP/SS erfolgreich ergänzt werden.
-
-5. Führen Sie den vierten Schritt laut laut Abschnitt 3.1.2
- (Vorbereitung) des Installationshandbuchs für MOA SP/SS aus:
- - Installation der Krypographiebibliotheken von SIC/IAIK
-
-6. Folgen Sie dann den weiteren Schritten des Installationshandbuchs
- für MOA SP/SS, beginnend mit Abschnitt 3.1.3 (Verwendung).
-
-Hinweis: Die erwähnten Scriptdateien wurden für Windows-BS erstellt.
-Wenn Sie MOA SP/SS auf einem Unix-System installieren, müssen Sie die
-Scripts entsprechend migrieren.
-
------------------------------------------------------------------------
-MOA SP/SS Entwicklungsdistribution (Source)
------------------------------------------------------------------------
-
-Gehen Sie wie folgt vor, um die MOA SP/SS Entwicklungsdistribution mit
-den Kryptographiebibliotheken von SIC/IAIK zu erweitern:
-
-1. Entpacken Sie die Entwicklungsdistribution in ein beliebiges Verzeich-
- nis. Im Folgenden wird dieses Verzeichnis mit $MOA_SPSS_DEV bezeichnet.
-
-2. Entpacken Sie den Inhalt dieses Ergänzungspakets in ein beliebiges
- weiteres Verzeichnis. Im Folgenden wird dieses Verzeichnis mit
- $SPSS_DEV_UPDATE bezeichnet.
-
-3. Passen Sie die Datei $SPSS_DEV_UPDATE/setEnvironment.bat an:
-
- a. Setzen Sie den Wert der Umgebungsvariablen JAVA_HOME auf das
- Wurzelverzeichnis einer vorhanden Java J2SE SKD oder JRE
- (1.3 oder höher). Java wird vom eingesetzten Installer
- (Apache Ant) benötigt.
-
- b. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_DEV auf
- den Pfad $MOA_SPSS_DEV.
-
- c. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_WS_INSTALL auf
- den leeren Wert ("MOA_SPSS_WS_INSTALL=").
-
- d. Setzen Sie den Wert der Umgebungsvariablen MOA_SPSS_LIB_INSTALL auf
- den leeren Wert ("MOA_SPSS_LIB_INSTALL=").
-
-4. Wechseln Sie ins Verzeichnis $SPSS_DEV_UPDATE. Führen Sie die Script-
- Datei update.prod.bat aus.
- Achten Sie auf etwaige Fehlermeldungen während der Ausführung. Wenn
- keine Fehler aufgetreten sind, konnte die Entwicklungsdistribution
- von MOA SP/SS erfolgreich ergänzt werden.
- \ No newline at end of file
diff --git a/spss.iaiklibsupdate/setEnvironment.bat b/spss.iaiklibsupdate/setEnvironment.bat
deleted file mode 100644
index 0ef21ecd8..000000000
--- a/spss.iaiklibsupdate/setEnvironment.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-
-rem
-rem PLEASE CHANGE THIS ENV VARIABLES ACCORDING TO YOUR ENVIRONMENT!
-rem
-rem Helper script for setting env variables for the IAIK lib update script
-rem
-rem Author: Gregor Karlinger
-rem Version: $Id: $
-rem
-
-rem Home of JDK used by Apache Ant for executing the update script
-SET JAVA_HOME=C:\Programme\Java\jdk1.5.0_02
-
-rem Home of the MOA SPSS webservice install directory (the update is performed on that directory)
-rem Please set empty value if webservice update should not be performed, i.e. "SET MOA_SPSS_WS_INSTALL="
-SET MOA_SPSS_WS_INSTALL=E:\cio\projekte\basismodule\wartung\projekt\spss.server\tmp\dist\ws
-
-rem Home of the MOA SPSS API install directory (the update is performed on that directory)
-rem Please set empty value if API update should not be performed, i.e. "SET MOA_SPSS_LIB_INSTALL="
-SET MOA_SPSS_LIB_INSTALL=E:\cio\projekte\basismodule\wartung\projekt\spss.server\tmp\dist\lib
-
-rem Home of the MOA SPSS development directory (the update is performed on that directory)
-rem Please set empty value if dev update should not be performed, i.e. "SET MOA_SPSS_DEV="
-SET MOA_SPSS_DEV=E:\cio\projekte\basismodule\wartung\projekt\spss.server\tmp\dist\src
diff --git a/spss.iaiklibsupdate/update.eval.bat b/spss.iaiklibsupdate/update.eval.bat
deleted file mode 100644
index 31b407342..000000000
--- a/spss.iaiklibsupdate/update.eval.bat
+++ /dev/null
@@ -1,39 +0,0 @@
-
-rem
-rem NO NEED TO CHANGE ANYTHING HERE!
-rem
-rem Helper script for calling Ant
-rem
-rem Author: Gregor Karlinger
-rem Version: $Id: $
-rem
-
-
-if %OS%=="Windows_NT" @setlocal
-
-set ANT=.\ant.1-6-5\bin\ant.bat
-set BUILD_FILE=.\update.xml
-set IAIK_LIB_TYPE=eval
-
-call setEnvironment.bat
-
-if not "%MOA_SPSS_WS_INSTALL%"=="" (
- echo Performing webservice update ...
- call %ANT% -f %BUILD_FILE% update-ws %1 %2 %3 %4 %5 %6 %7 %8 %9
- echo ... done
-)
-
-if not "%MOA_SPSS_LIB_INSTALL%"=="" (
- echo Performing API update ...
- call %ANT% -f %BUILD_FILE% update-lib %1 %2 %3 %4 %5 %6 %7 %8 %9
- echo ... done
-)
-
-if not "%MOA_SPSS_DEV%"=="" (
- echo Performing development base update ...
- call %ANT% -f %BUILD_FILE% update-dev %1 %2 %3 %4 %5 %6 %7 %8 %9
- echo ... done
-)
-
-if %OS%=="Windows_NT" @endlocal
-
diff --git a/spss.iaiklibsupdate/update.prod.bat b/spss.iaiklibsupdate/update.prod.bat
deleted file mode 100644
index a5633b16b..000000000
--- a/spss.iaiklibsupdate/update.prod.bat
+++ /dev/null
@@ -1,39 +0,0 @@
-
-rem
-rem NO NEED TO CHANGE ANYTHING HERE!
-rem
-rem Helper script for calling Ant
-rem
-rem Author: Gregor Karlinger
-rem Version: $Id: $
-rem
-
-
-if %OS%=="Windows_NT" @setlocal
-
-set ANT=.\ant.1-6-5\bin\ant.bat
-set BUILD_FILE=.\update.xml
-set IAIK_LIB_TYPE=prod
-
-call setEnvironment.bat
-
-if not "%MOA_SPSS_WS_INSTALL%"=="" (
- echo Performing webservice update ...
- call %ANT% -f %BUILD_FILE% update-ws %1 %2 %3 %4 %5 %6 %7 %8 %9
- echo ... done
-)
-
-if not "%MOA_SPSS_LIB_INSTALL%"=="" (
- echo Performing API update ...
- call %ANT% -f %BUILD_FILE% update-lib %1 %2 %3 %4 %5 %6 %7 %8 %9
- echo ... done
-)
-
-if not "%MOA_SPSS_DEV%"=="" (
- echo Performing development base update ...
- call %ANT% -f %BUILD_FILE% update-dev %1 %2 %3 %4 %5 %6 %7 %8 %9
- echo ... done
-)
-
-if %OS%=="Windows_NT" @endlocal
-
diff --git a/spss.iaiklibsupdate/update.xml b/spss.iaiklibsupdate/update.xml
deleted file mode 100644
index be156323d..000000000
--- a/spss.iaiklibsupdate/update.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Ant Buildfile for IAIK libraries update for MOA SP/SS Server
-
- Author: Gregor Karlinger
-
- $Id$
-
--->
-<project name="moa-spss-iaiklibs-update" default="update-ws" basedir=".">
- <property environment="env"/>
-
- <property name="iaiklibs.base" value="iaiklibs.${env.IAIK_LIB_TYPE}"/>
-
- <property name="spss.ws.install" value="${env.MOA_SPSS_WS_INSTALL}"/>
- <property name="ws.ext13" value="${spss.ws.install}/ext13"/>
- <property name="ws.ext14" value="${spss.ws.install}/ext14"/>
- <property name="ws.tools" value="${spss.ws.install}/tools"/>
- <property name="ws.war" value="${spss.ws.install}/moa-spss.war"/>
-
- <property name="spss.lib.install" value="${env.MOA_SPSS_LIB_INSTALL}"/>
- <property name="lib.ext13" value="${spss.lib.install}/ext13"/>
- <property name="lib.ext14" value="${spss.lib.install}/ext14"/>
- <property name="lib.tools" value="${spss.lib.install}/tools"/>
- <property name="lib.lib" value="${spss.lib.install}/lib"/>
-
- <property name="spss.dev" value="${env.MOA_SPSS_DEV}"/>
- <property name="lib.common.jce" value="${spss.dev}/common/lib/iaik-jce-3.0.6"/>
- <property name="lib.spss.iaik-moa" value="${spss.dev}/spss.server/lib/iaik-moa-20050623"/>
- <property name="lib.handbook.iaik-moa" value="${spss.dev}/spss.handbook/clients/api//lib/iaik-moa-20050623"/>
-
- <target name="init">
- <mkdir dir="${ws.ext13}"/>
- <mkdir dir="${ws.ext14}"/>
- <mkdir dir="${ws.tools}"/>
- </target>
-
- <target name="update-ws" depends="init">
- <description>Updates WS version of MOA SPSS with SIC/IAIK libraries</description>
- <copy toDir="${ws.ext13}">
- <fileset dir="${iaiklibs.base}" includes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/>
- </copy>
- <copy toDir="${ws.ext14}">
- <fileset dir="${iaiklibs.base}/signed" includes="iaik_jce_full_signed.jar, iaik_ecc_signed.jar, iaik_Pkcs11Provider_signed.jar"/>
- </copy>
- <copy toDir="${ws.tools}">
- <fileset dir="${iaiklibs.base}" includes="iaik_moa_full.jar"/>
- </copy>
- <war warfile="${ws.war}" update="yes">
- <lib dir="${iaiklibs.base}"
- excludes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar, win32/**, linux/**, solaris/**, signed/**"/>
- </war>
- </target>
-
- <target name="update-lib" depends="init">
- <description>Updates API version of MOA SPSS with SIC/IAIK libraries</description>
- <copy toDir="${lib.ext13}">
- <fileset dir="${iaiklibs.base}" includes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/>
- </copy>
- <copy toDir="${lib.ext14}">
- <fileset dir="${iaiklibs.base}/signed" includes="iaik_jce_full_signed.jar, iaik_ecc_signed.jar, iaik_Pkcs11Provider_signed.jar"/>
- </copy>
- <copy toDir="${lib.tools}">
- <fileset dir="${iaiklibs.base}" includes="iaik_moa_full.jar"/>
- </copy>
- <copy toDir="${lib.lib}">
- <fileset dir="${iaiklibs.base}" excludes="signed/**, iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/>
- </copy>
- </target>
-
- <target name="update-dev">
- <description>Updates development base of MOA SPSS with SIC/IAIK libraries</description>
- <copy toDir="${lib.common.jce}">
- <fileset dir="${iaiklibs.base}" includes="iaik_jce_full.jar"/>
- </copy>
- <copy toDir="${lib.handbook.iaik-moa}">
- <fileset dir="${iaiklibs.base}"/>
- </copy>
- <copy toDir="${lib.spss.iaik-moa}">
- <fileset dir="${iaiklibs.base}"/>
- </copy>
- </target>
-</project>
diff --git a/spss.server/.checkstyle b/spss.server/.checkstyle
deleted file mode 100644
index 0ca3f3e78..000000000
--- a/spss.server/.checkstyle
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<checkstyle>
- <file-filters>
- <file-filter value="src/test/*"/>
- <file-filter value="tmp/*"/>
- <file-filter value="doc/*"/>
- </file-filters>
-</checkstyle>
diff --git a/spss.server/.cvsignore b/spss.server/.cvsignore
deleted file mode 100644
index c828a607d..000000000
--- a/spss.server/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-tmp
-releases
-.classpath
diff --git a/spss.server/.project b/spss.server/.project
deleted file mode 100644
index b6893d21d..000000000
--- a/spss.server/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>spss.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>
- <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
- </natures>
-</projectDescription>
diff --git a/spss.server/.tomcatplugin b/spss.server/.tomcatplugin
deleted file mode 100644
index 66a889120..000000000
--- a/spss.server/.tomcatplugin
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tomcatProjectProperties>
- <rootDir>/moa-spss</rootDir>
- <exportSource>false</exportSource>
- <updateXml>false</updateXml>
- <warLocation></warLocation>
- <webPath></webPath>
-</tomcatProjectProperties>
diff --git a/spss.server/build.xml b/spss.server/build.xml
deleted file mode 100644
index a6970a43e..000000000
--- a/spss.server/build.xml
+++ /dev/null
@@ -1,460 +0,0 @@
-<!--
-
- Ant Buildfile for MOA SP/SS Server
-
- Authors: Patrick Peck, Gregor Karlinger
-
- $Id$
-
--->
-<project name="moa-spss-server" default="deploy-catalina" basedir=".">
- <property environment="env"/>
- <property name="script-suffix" value="${env.SCRIPT_SUFFIX}"/>
- <property name="version" value="1.3.1"/>
- <property name="lib" value="lib"/>
- <property name="src" value="src"/>
- <property name="res" value="res"/>
- <property name="data" value="data"/>
- <property name="licenses" value="licenses"/>
- <property name="handbook" value="../spss.handbook"/>
- <property name="deploy.conf" value="${handbook}/conf"/>
- <property name="doc" value="doc"/>
- <property name="tmp" value="tmp"/>
- <property name="compile" value="${tmp}/compile"/>
- <property name="tools" value="${tmp}/tools"/>
- <property name="tmp.doc" value="${tmp}/doc"/>
- <property name="api-doc" value="${tmp}/api-doc"/>
- <property name="api-doc.internal" value="${tmp}/api-doc-internal"/>
- <property name="prj.build" value="../build"/>
- <property name="prj.common" value="../common"/>
- <property name="prj.handbook" value="../spss.handbook"/>
- <property name="dist" value="${tmp}/dist"/>
- <property name="dist.ws" value="${dist}/ws"/>
- <property name="dist.ws.conf" value="${dist.ws}/conf"/>
- <property name="dist.ws-zip" value="${dist}/ws-zip"/>
- <property name="dist.lib" value="${dist}/lib"/>
- <property name="dist.lib-zip" value="${dist}/lib-zip"/>
- <property name="dist.src" value="${dist}/src"/>
- <property name="dist.src-zip" value="${dist}/src-zip"/>
- <property name="lib.axis" value="${lib}/axis-1.0"/>
- <property name="lib.jaxp" value="${lib}/jaxp-1.2_01"/>
- <property name="lib.jaxen" value="${lib}/jaxen-1.0"/>
- <property name="lib.xerces" value="${lib}/xerces-j-2.4.0"/>
- <property name="lib.xalan" value="${lib}/xalan-j-2.5.1"/>
- <property name="lib.jsse" value="${lib}/jsse-1.0.3_03"/>
- <property name="lib.postgres-jdbc" value="${lib}/postgres-jdbc2-7.3"/>
- <property name="lib.iaik-moa" value="../spss.iaiklibsupdate/iaiklibs.prod"/>
- <property name="lib.junit" value="${lib}/junit-3.8.1"/>
- <property name="lib.servlet" value="${lib}/servlet-2.3"/>
- <property name="lib.commons-logging" value="${lib}/commons-logging-1.0.4"/>
- <property name="lib.commons-discovery" value="${lib}/commons-discovery-0.2"/>
- <property name="lib.log4j" value="${lib}/log4j-1.2.7"/>
- <property name="lib.idoclet" value="${lib}/iDoclet-1.0"/>
-
- <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}/iaik_ixsil.jar"/>
- <pathelement location="${lib.iaik-moa}/iaik_jce_full.jar"/>
- <pathelement location="${lib.iaik-moa}/iaik_ecc.jar"/>
- <pathelement location="${env.MOA_COMMON_TEST_JAR}"/>
- </path>
-
- <target name="init">
- <description>set up directories etc.</description>
- <tstamp/>
- <mkdir dir="${tmp}"/>
- <mkdir dir="${compile}"/>
- <mkdir dir="${tools}"/>
- <mkdir dir="${api-doc}"/>
- <mkdir dir="${api-doc.internal}"/>
- <mkdir dir="${dist}"/>
- <mkdir dir="${dist.ws}"/>
- <mkdir dir="${dist.ws-zip}"/>
- <mkdir dir="${dist.lib}"/>
- <mkdir dir="${dist.lib-zip}"/>
- <mkdir dir="${dist.src}"/>
- <mkdir dir="${dist.src-zip}"/>
- </target>
-
- <target name="compile" depends="init">
- <description>compile everything</description>
- <javac srcdir="${src}" destdir="${compile}"
- classpathref="compile.classpath"
- debug="on">
- </javac>
- </target>
-
- <target name="package-ws" depends="compile, manifest">
- <description>package the server war file</description>
- <war warfile="${dist.ws}/moa-spss.war" webxml="web.xml" manifest="${tmp}/MANIFEST.MF">
- <lib dir="${lib.xalan}"/>
- <lib dir="${lib.xerces}"/>
- <lib dir="${lib.jaxp}"/>
- <lib dir="${lib.log4j}"/>
- <lib dir="${lib.postgres-jdbc}"/>
- <lib dir="${lib.axis}"/>
- <lib dir="${lib.jaxen}"/>
-
- <lib dir="${lib.iaik-moa}"
- excludes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar, win32/**, linux/**, solaris/**, signed/**"/>
- <!--lib dir="${lib.iaik-moa}"
- excludes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar, signed/,linux/libpkcs11wrapper.so,solaris/libpkcs11wrapper.so"/-->
-
-
- <lib file="${lib.commons-logging}/commons-logging.jar"/>
- <lib file="${lib.commons-discovery}/commons-discovery.jar"/>
- <lib file="${env.MOA_COMMON_JAR}"/>
- <classes dir="${compile}" excludes="test/**"/>
- <classes dir="${res}" excludes="resources/tools/**, test/**"/>
- <classes file="${handbook}/conf/moa-spss/log4j.properties"/>
- <webinf file="server-config.wsdd"/>
- <webinf dir="${handbook}" includes="conf/**"/>
- <zipfileset file="${res}/resources/wsdl/MOA-SPSS-1.3.xsd" prefix="resources/schemas"/>
- </war>
- </target>
-
- <target name="package-lib" depends="compile">
- <description>package the library jar file</description>
- <jar destfile="${dist.lib}/moa-spss.jar">
- <fileset dir="${compile}" excludes="test/**"/>
- <fileset dir="${res}" excludes="resources/tools/**, test/**"/>
- <fileset dir="${handbook}/conf/moa-spss" includes="log4j.properties"/>
- </jar>
- </target>
-
- <target name="package-tools" depends="compile">
- <description>package the configuration tools</description>
- <jar destfile="${tools}/tools.jar">
- <fileset dir="${compile}" includes="at/**/tools/**"/>
- <fileset dir="${res}" includes="resources/tools/**"/>
- </jar>
- </target>
-
- <target name="api-doc-internal" depends="init">
- <description>create JavaDoc for the server internal classes</description>
- <javadoc defaultexcludes="yes"
- destdir="${api-doc.internal}"
- author="true"
- version="true"
- use="true"
- windowtitle="MOA SP/SS Server Internal API">
- <packageset dir="${prj.common}/src">
- <exclude name="test/**"/>
- </packageset>
- <packageset dir="src">
- <exclude name="test/**"/>
- <exclude name="at/gv/egovernment/moa/spss/api/**"/>
- </packageset>
- <group title="Exception Classes"
- packages="at.gv.egovernment.moa.spss.server">
- </group>
- <group title="MOA Configuration">
- <package name="at.gv.egovernment.moa.spss.server.config"/>
- <package name="at.gv.egovernment.moa.spss.server.iaik.config"/>
- </group>
- <group title="Web Service Handling">
- <package name="at.gv.egovernment.moa.spss.server.service"/>
- <package name="at.gv.egovernment.moa.spss.server.transaction"/>
- </group>
- <group title="Mapping MOA API calls to the IAIK API"
- packages="at.gv.egovernment.moa.spss.server.invoke">
- </group>
- <group title="Implementations of IAIK interfaces"
- packages="at.gv.egovernment.moa.spss.server.iaik.*">
- </group>
- <group title="Utilities">
- <package name="at.gv.egovernment.moa.util"/>
- <package name="at.gv.egovernment.moa.spss.server.util"/>
- </group>
- <group title="Logging">
- <package name="at.gv.egovernment.moa.logging"/>
- <package name="at.gv.egovernment.moa.spss.server.logging"/>
- </group>
- <group title="External Tools"
- packages="at.gv.egovernment.moa.spss.server.tools">
- </group>
- <link offline="false" href="http://java.sun.com/j2se/1.3/docs/api/"/>
- <doctitle><![CDATA[<h1>MOA SP/SS Server Internal API</h1>]]></doctitle>
- <classpath refid="compile.classpath"/>
- </javadoc>
- </target>
-
- <target name="api-doc" depends="init">
- <description>create JavaDoc for the SP/SS API</description>
- <javadoc defaultexcludes="yes"
- destdir="${api-doc}"
- author="false"
- version="false"
- use="true"
- Overview="${src}/at/gv/egovernment/moa/spss/overview.htm"
- windowtitle="MOA SP/SS API">
- <packageset dir="src">
- <include name="at/gv/egovernment/moa/spss/**"/>
- <exclude name="at/gv/egovernment/moa/spss/server/**"/>
- <exclude name="at/gv/egovernment/moa/spss/api/impl/**"/>
- <exclude name="test/**"/>
- </packageset>
- <packageset dir="${prj.common}/src">
- <exclude name="test/**"/>
- </packageset>
- <group title="API Factory and Services">
- <package name="at.gv.egovernment.moa.spss.api"/>
- </group>
- <group title="Exceptions">
- <package name="at.gv.egovernment.moa.spss"/>
- </group>
- <group title="API Objects for Signature Creation">
- <package name="at.gv.egovernment.moa.spss.api.xmlsign"/>
- </group>
- <group title="API Objects for CMS Signature Verification">
- <package name="at.gv.egovernment.moa.spss.api.cmsverify"/>
- </group>
- <group title="API Objects for XML Signature Verification">
- <package name="at.gv.egovernment.moa.spss.api.xmlverify"/>
- </group>
- <group title="Common API Objects">
- <package name="at.gv.egovernment.moa.spss.api.common"/>
- </group>
- <group title="Builders and Parsers to convert API Objects to and from XML">
- <package name="at.gv.egovernment.moa.spss.api.xmlbind"/>
- </group>
- <group title="Utilities">
- <package name="at.gv.egovernment.moa.util"/>
- <package name="at.gv.egovernment.moa.spss.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/"/>
- <doclet name="iContract.doclet.Standard"
- path="${lib.idoclet}/iDoclet.jar">
- <param name="-use"/>
- </doclet>
- <doctitle><![CDATA[<h1>MOA SP/SS API</h1>]]></doctitle>
- <classpath refid="compile.classpath"/>
- </javadoc>
- </target>
-
- <target name="dist-ws" depends="package-ws, package-tools">
- <description>create the webservice distributable</description>
- <copy toDir="${dist.ws}/tomcat">
- <fileset dir="${data}/deploy/tomcat"/>
- </copy>
- <copy toDir="${dist.ws}/conf">
- <fileset dir="${handbook}/conf"/>
- </copy>
- <copy toDir="${dist.ws}/ext13">
-
- <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/>
-
- <fileset dir="${lib.jsse}"/>
- </copy>
-
- <copy toDir="${dist.ws}/ext14">
- <fileset dir="${lib.iaik-moa}/signed"/>
- </copy>
-
- <copy toDir="${dist.ws}/endorsed14">
- <fileset dir="${lib.xalan}"/>
- <fileset dir="${lib.xerces}"/>
- </copy>
- <copy toDir="${dist.ws}/tools">
- <fileset dir="${tools}"/>
- <fileset dir="${lib.iaik-moa}">
- <include name="iaik_jce_full.jar"/>
- <include name="iaik_moa_full.jar"/>
- <include name="iaik_ecc.jar"/>
- </fileset>
- <fileset dir="${lib.log4j}"/>
- <fileset dir="${lib.xalan}"/>
- <fileset dir="${data}/deploy/tools"/>
- </copy>
- <copy toDir="${dist.ws}/pkcs11">
- <fileset dir="${lib.iaik-moa}" includes="win32/**, linux/**, solaris/**"/>
- </copy>
- <copy toDir="${dist.ws}/licenses">
- <fileset dir="${licenses}"/>
- </copy>
- <copy toDir="${dist.ws}">
- <fileset dir="." includes="readme.inst.txt, readme.update.txt, history.txt"/>
- </copy>
- <fixcrlf srcdir="${dist.ws}" includes="**/*.sh" eol="lf" eof="remove"/>
- </target>
-
- <target name="dist-ws-doc" depends="dist-ws, api-doc">
- <description>
- create the webservice-distributable, including all documentation
- </description>
- <copy toDir="${dist.ws}/doc/api-doc">
- <fileset dir="${api-doc}"/>
- </copy>
- <!-- Handbuch aus dem Projekt spss.handbook -->
- <copy toDir="${dist.ws}/doc">
- <fileset dir="${handbook}" excludes="bin/** conf/** handbook/common/LogoMoa4c.3148x3545.jpg .project .classpath" />
- </copy>
- </target>
-
- <target name="dist-ws-zip" depends="dist-ws-doc">
- <description>
- create the zipped webservice distributable
- </description>
- <zip zipfile="${dist.ws-zip}/moa-spss-${version}.zip">
- <zipfileset dir="${dist.ws}" prefix="moa-spss-${version}"/>
- </zip>
- </target>
-
- <target name="dist-lib" depends="package-lib">
- <description>create the library distributable</description>
- <copy todir="${dist.lib}" file="${env.MOA_COMMON_JAR}"/>
- <copy todir="${dist.lib}/lib">
- <fileset dir="${lib.jaxp}"/>
- <fileset dir="${lib.jaxen}"/>
- <fileset dir="${lib.xerces}"/>
- <fileset dir="${lib.xalan}"/>
- <fileset dir="${lib.postgres-jdbc}"/>
-
- <fileset dir="${lib.iaik-moa}" excludes="signed/**, iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/>
-
- <fileset dir="${lib.commons-logging}"/>
- <fileset dir="${lib.log4j}"/>
- <fileset dir="${lib.commons-discovery}"/>
- </copy>
- <copy toDir="${dist.lib}/conf">
- <fileset dir="${handbook}/conf"/>
- </copy>
- <copy toDir="${dist.lib}/ext13">
-
- <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/>
-
- <fileset dir="${lib.jsse}"/>
- </copy>
-
- <copy toDir="${dist.lib}/ext14">
- <fileset dir="${lib.iaik-moa}/signed"/>
- </copy>
-
- <copy toDir="${dist.lib}/tools">
- <fileset dir="${tools}"/>
- <fileset dir="${lib.iaik-moa}">
- <include name="iaik_jce_full.jar"/>
- <include name="iaik_moa_full.jar"/>
- <include name="iaik_ecc.jar"/>
- </fileset>
- <fileset dir="${lib.log4j}"/>
- <fileset dir="${lib.xalan}"/>
- <fileset dir="${data}/deploy/tools"/>
- </copy>
- <copy toDir="${dist.lib}/licenses">
- <fileset dir="${licenses}"/>
- </copy>
- <copy toDir="${dist.lib}">
- <fileset dir="." includes="readme.inst.txt, readme.update.txt, history.txt"/>
- </copy>
- <fixcrlf srcdir="${dist.lib}" includes="**/*.sh" eol="lf" eof="remove"/>
- </target>
-
- <target name="dist-lib-doc" depends="dist-lib, api-doc">
- <description>
- create the library distributable, including all documentation
- </description>
- <copy toDir="${dist.lib}/doc/api-doc">
- <fileset dir="${api-doc}"/>
- </copy>
- <!-- Handbuch aus dem Projekt spss.handbook -->
- <copy toDir="${dist.lib}/doc">
- <fileset dir="${handbook}" excludes="bin/** conf/** handbook/common/LogoMoa4c.3148x3545.jpg .project .classpath"/>
- </copy>
- </target>
-
- <target name="dist-lib-zip" depends="dist-lib-doc">
- <description>
- create the zipped library distributable
- </description>
- <zip zipfile="${dist.lib-zip}/moa-spss-${version}-lib.zip">
- <zipfileset dir="${dist.lib}" prefix="moa-spss-${version}-lib"/>
- </zip>
- </target>
-
- <target name="dist-src">
- <description>create the source distributable</description>
- <copy toDir="${dist.src}/build">
- <fileset dir="${prj.build}"/>
- </copy>
- <copy toDir="${dist.src}/common">
- <fileset dir="${prj.common}" excludes="tmp/**, bin/**, lib/iaik-jce-3.0.6/**"/>
- </copy>
- <copy toDir="${dist.src}/spss.handbook">
- <fileset dir="${prj.handbook}"/>
- </copy>
- <copy toDir="${dist.src}/spss.server">
- <fileset dir="." excludes="tmp/**, bin/**, lib/iaik-moa-20050623/**"/>
- </copy>
- <copy toDir="${dist.src}">
- <fileset dir="." includes="readme.src.txt"/>
- </copy>
- <!--mkdir "${dist.src}/spss.server/lib/iaik-moa/iaik-moa-20051107"/-->
- <copy toDir="${dist.src}/spss.server/lib/iaik-moa-20060316">
- <fileset dir="${lib.iaik-moa}"/>
- </copy>
- <fixcrlf srcdir="${dist.src}" includes="**/*.sh" eol="lf" eof="remove"/>
- </target>
-
- <target name="dist-src-doc" depends="dist-src, api-doc-internal">
- <copy toDir="${dist.src}/spss.server/doc/api-doc-internal">
- <fileset dir="${api-doc.internal}"/>
- </copy>
- </target>
-
- <target name="dist-src-zip" depends="dist-src-doc">
- <zip zipfile="${dist.src-zip}/moa-spss-${version}-src.zip">
- <zipfileset dir="${dist.src}" prefix="moa-spss-${version}-src"/>
- </zip>
- </target>
-
- <target name="dist-all" depends="dist-ws-zip, dist-lib-zip, dist-src-zip">
- <description>create all distributables</description>
- </target>
-
- <target name="deploy-catalina" depends="dist-ws" if="env.CATALINA_HOME">
- <description>
- deploy the webservice to catalina (needs CATALINA_HOME defined)
- </description>
- <delete dir="${env.CATALINA_HOME}/webapps/moa-spss"/>
- <copy file="${dist.ws}/moa-spss.war" toDir="${env.CATALINA_HOME}/webapps"/>
- <!-- copy endorsed jars -->
- <copy toDir="${env.CATALINA_HOME}/common/endorsed">
- <fileset dir="${dist.ws}/endorsed14"/>
- </copy>
- <!-- copy sample configuration -->
- <copy toDir="${env.CATALINA_HOME}/conf">
- <fileset dir="${deploy.conf}"/>
- </copy>
- </target>
-
- <target name="clean">
- <description>clean temporary files</description>
- <delete dir="${tmp}"/>
- </target>
-
- <target name="manifest">
- <filter token="version" value="${version}" />
- <copy file="manifest.template" tofile="${tmp}/MANIFEST.MF" overwrite="true" filtering="true" />
- </target>
-
-</project>
diff --git a/spss.server/data/deploy/tomcat/server.mod_jk.xml b/spss.server/data/deploy/tomcat/server.mod_jk.xml
deleted file mode 100644
index e6035b8be..000000000
--- a/spss.server/data/deploy/tomcat/server.mod_jk.xml
+++ /dev/null
@@ -1,166 +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"/>
- -->
-
- <!-- 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"/>
-
- <!-- 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>
-
-</Server>
-
diff --git a/spss.server/data/deploy/tomcat/server.xml b/spss.server/data/deploy/tomcat/server.xml
deleted file mode 100644
index 3e5966ca9..000000000
--- a/spss.server/data/deploy/tomcat/server.xml
+++ /dev/null
@@ -1,169 +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="ROOT" debug="0"/>
- -->
-
- </Host>
-
- </Engine>
-
- </Service>
-
-</Server>
-
diff --git a/spss.server/data/deploy/tomcat/unix/moa-env.sh b/spss.server/data/deploy/tomcat/unix/moa-env.sh
deleted file mode 100644
index 49d6723a3..000000000
--- a/spss.server/data/deploy/tomcat/unix/moa-env.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-MOA_START=`pwd`
-
-CONFIG_OPT=-Dmoa.spss.server.configuration=$MOA_START/conf/moa-spss/spss.config.xml
-LOGGING_OPT=-Dlog4j.configuration=file:$MOA_START/conf/moa-spss/log4j.properties
-# NODE_ID_OPT=-Dmoa.node-id=node1
-# TRUST_STORE_OPT=-Djavax.net.ssl.trustStore=truststore.jks
-# TRUST_STORE_PASS_OPT=-Djavax.net.ssl.trustStorePassword=changeit
-# TRUST_STORE_TYPE_OPT=-Djavax.net.ssl.trustStoreType=jks
-
-export CATALINA_OPTS="$CONFIG_OPT $LOGGING_OPT $NODE_ID_OPT $TRUST_STORE_OPT $TRUST_STORE_PASS_OPT $TRUST_STORE_TYPE_OPT"
-
-echo CATALINA_OPTS=$CATALINA_OPTS
diff --git a/spss.server/data/deploy/tomcat/uriworkermap.properties b/spss.server/data/deploy/tomcat/uriworkermap.properties
deleted file mode 100644
index 673acf65d..000000000
--- a/spss.server/data/deploy/tomcat/uriworkermap.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# a sample mod_jk uriworkermap.properties file for mapping
-# MOA SP/SS web service requests to workers
-
-/moa-spss/*=moaworker \ No newline at end of file
diff --git a/spss.server/data/deploy/tomcat/win32/startTomcat.bat b/spss.server/data/deploy/tomcat/win32/startTomcat.bat
deleted file mode 100644
index b7d740d12..000000000
--- a/spss.server/data/deploy/tomcat/win32/startTomcat.bat
+++ /dev/null
@@ -1,27 +0,0 @@
-rem ----------------------------------------------------------------------------------------------
-rem Modify these entries according to your needs
-
-rem JDK home directory (no trailing path separator)
-set JAVA_HOME=<jdk home directory>
-
-rem Tomcat 4.1.x home directory (no trailing path separator)
-set CATALINA_HOME=<Tomcat 4.1.x home directory>
-
-rem ----------------------------------------------------------------------------------------------
-
-set MOA_SPSS_CFG_HOME=%CATALINA_HOME%\conf\moa-spss
-
-set PARAM_SPSSCONFIG=-Dmoa.spss.server.configuration=%MOA_SPSS_CFG_HOME%\spss.config.xml
-set PARAM_LOGGING=-Dlog4j.configuration=file:%MOA_SPSS_CFG_HOME%\log4j.properties
-set PARAM_NODEID=-Dmoa.node-id=Node1
-set PARAMS_MOA=%PARAM_SPSSCONFIG% %PARAM_LOGGING% %PARAM_NODEID%
-
-rem set PARAM_TRUST_STORE=-Djavax.net.ssl.trustStore=truststore.jks
-rem set PARAM_TRUST_STORE_PASS=-Djavax.net.ssl.trustStorePassword=changeit
-rem set PARAM_TRUST_STORE_TYPE=-Djavax.net.ssl.trustStoreType=jks
-rem set PARAMS_SSL=%PARAM_TRUST_STORE% %PARAM_TRUST_STORE_PASS% %PARAM_TRUST_STORE_TYPE%
-
-set CATALINA_OPTS=%PARAMS_MOA% %PARAMS_SSL%
-
-cd %CATALINA_HOME%
-bin\catalina.bat start \ No newline at end of file
diff --git a/spss.server/data/deploy/tomcat/win32/stopTomcat.bat b/spss.server/data/deploy/tomcat/win32/stopTomcat.bat
deleted file mode 100644
index 09dd83f2d..000000000
--- a/spss.server/data/deploy/tomcat/win32/stopTomcat.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-rem ----------------------------------------------------------------------------------------------
-rem Modify these entries according to your needs
-
-rem JDK home directory (no trailing path separator)
-set JAVA_HOME=<jdk home directory>
-
-rem Tomcat 4.1.x home directory (no trailing path separator)
-set CATALINA_HOME=<Tomcat 4.1.x home directory>
-
-rem ----------------------------------------------------------------------------------------------
-
-cd %CATALINA_HOME%
-bin\catalina.bat stop \ No newline at end of file
diff --git a/spss.server/data/deploy/tomcat/workers.properties b/spss.server/data/deploy/tomcat/workers.properties
deleted file mode 100644
index 9350ddc77..000000000
--- a/spss.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/spss.server/data/deploy/tools/certtool.bat b/spss.server/data/deploy/tools/certtool.bat
deleted file mode 100644
index 0504211b8..000000000
--- a/spss.server/data/deploy/tools/certtool.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-
-rem
-rem Script to invoke the CertTool class
-rem
-rem Author: Patrick Peck
-rem Version: $Id: certtool.bat,v 1.6 2003/05/08 11:46:29 peck Exp $
-rem
-
-
-if %OS%=="Windows_NT" @setlocal
-
-set CERTTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool
-set TOOLSPATH=%~p0
-set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%iaik_moa_full.jar;%TOOLSPATH%iaik_jce_full.jar;%TOOLSPATH%iaik_ecc.jar;%TOOLSPATH%log4j-1.2.7.jar
-
-if "%JAVA_HOME%"=="" goto noJavaHome
-%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CERTTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto end
-
-:noJavaHome
-echo error: JAVA_HOME not defined
-
-:end
-if %OS%=="Windows_NT" @endlocal \ No newline at end of file
diff --git a/spss.server/data/deploy/tools/certtool.sh b/spss.server/data/deploy/tools/certtool.sh
deleted file mode 100644
index c7ff374f4..000000000
--- a/spss.server/data/deploy/tools/certtool.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-#
-# Script to invoke the CertTool class
-#
-# Author:Patrick Peck
-# Version: $Id: certtool.sh,v 1.9 2003/06/23 16:01:27 peck Exp $
-#
-
-
-if [ -z "$JAVA_HOME" ]; then
- echo "error: JAVA_HOME not defined";
- exit;
-fi
-
-CERTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool
-TOOLSPATH=`dirname $PWD/$0`
-CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/iaik_moa_full.jar:$TOOLSPATH/iaik_jce_full.jar:$TOOLSPATH/iaik_ecc.jar:$TOOLSPATH/log4j-1.2.7.jar
-
-$JAVA_HOME/bin/java -classpath $CLASSPATH $CERTOOL $*
diff --git a/spss.server/data/deploy/tools/configtool.bat b/spss.server/data/deploy/tools/configtool.bat
deleted file mode 100644
index 868df11f0..000000000
--- a/spss.server/data/deploy/tools/configtool.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-
-rem
-rem Script to invoke the ConfigTool class
-rem
-rem Author: Gregor Karlinger
-rem Version: $Id: $
-rem
-
-
-if %OS%=="Windows_NT" @setlocal
-
-set CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool
-set TOOLSPATH=%~p0
-set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%xalan.jar;
-
-if "%JAVA_HOME%"=="" goto noJavaHome
-%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CONFIGTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto end
-
-:noJavaHome
-echo error: JAVA_HOME not defined
-
-:end
-if %OS%=="Windows_NT" @endlocal \ No newline at end of file
diff --git a/spss.server/data/deploy/tools/configtool.sh b/spss.server/data/deploy/tools/configtool.sh
deleted file mode 100644
index f7f29bae1..000000000
--- a/spss.server/data/deploy/tools/configtool.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-#
-# Script to invoke the ConfigTool class
-#
-# Author: Gregor Karlinger
-# Version: $Id: $
-#
-
-
-if [ -z "$JAVA_HOME" ]; then
- echo "error: JAVA_HOME not defined";
- exit;
-fi
-
-CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool
-TOOLSPATH=`dirname $PWD/$0`
-CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/xalan.jar
-
-$JAVA_HOME/bin/java -classpath $CLASSPATH $CONFIGTOOL $*
diff --git a/spss.server/history.txt b/spss.server/history.txt
deleted file mode 100644
index 76ad452ae..000000000
--- a/spss.server/history.txt
+++ /dev/null
@@ -1,241 +0,0 @@
-
-##############
-1.3.1D01
-##############
-
-- IAIK-MOA: CRL wird nun auch akzeptiert, wenn im CLRSigner-Zertifikat KeyUsage crlSign-Bit nicht gesetzt ist,
- allerdings nur wenn das Zertifikat ein Trust-Anchor ist.
-- IAIK-MOA: Eine indirekte CRL wird nun auch akzeptiert, wenn die "IssuingDistributionPoint"-Extension fehlt
-
-- Logging: commons-logging-1.0.4-Libraries (unterstützt auch Tomcat 5*)
-
-##############
-1.3.0
-##############
-
-- "E-CARD"-Release
-- Update der Zertifikatsspeicher und Trustprofile
-- Update PKI auf OCSP (auch schon in 1.3.0D01 enthalten)
-- Update IAIK-Libraries (ab sofort wieder in der Distribution enthalten)
- Versionsnummern:
- iaik-jce: Version 3.13_3.13_NONEwithRSA (MOA-ID kann nun auch mit JDK1.5 verwendet werden)
- iaik-cms: Version 3.2
- iaikPkcs11Provider: Version 1.1.9
- iaikPkcs11Wrapper: Version 1.2.14
- ixsil: Version IXSIL-1_2_2
- ecc: Version 2.0
-
-##############
-1.3.0D01
-##############
-
-- Default-Wert für Archivierungsdauer von Widerrufsinformation von 0 auf 365
- Tage geändert.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=305.
-
-- Default-Reihenfolge der Verwendung von Widerrufspunkten von (CRL, OCSP) auf
- (OCSP, CRL) geändert.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=304.
-
-- XML-Schema für die Konfiguration von MOA SP/SS komplett überarbeitet.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=271.
-
-- Änderungen der Semantik des Elements VerifyXMLSignatureRequest/ReturnHashInputData
- bzw. des Attributs VerifyXMLSignatureRequest/SignatureManifestCheckParams/
- @ReturnReferenceInputData. Es werden nunmehr auch die Hash-Eingangsdaten bzw.
- die Referenz-Eingangsdaten für dsig:Reference-Elemente in XMLDSIG-Manifesten
- zurückgeliefert.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=232.
-
-- TCP-Verbindungen zur Auflösung von externen Referenzen wurden bisher nicht
- sauber geschlossen. Damit kam es bei sehr komplexen XML-Signaturen unter
- Umständen zu einem Ressourcen-Problem, da zu viele TCP-Verbindungen gleich-
- zeitig geöffnet wurden. Dieses Probem wurde behoben.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=283.
-
-- Trustprofil um eine Menge explizit erlaubter Signatorzertifikate erweitert.
- Dadurch ist es nun möglich, nicht nur generell allen von einer als Vertrauens-
- anker gesetzten CA ausgestellten Zertifikate zu vertrauen, sondern diese Zerti-
- fikate weiter auf eine taxativ aufgezählte Liste von Signatorzertifikaten ein-
- zuschränken.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=267.
-
-- MOA SS Webservice Clients, die sich mit einem Zertifikat ausweisen, können nun
- auch auf die Key-Groups des anonymen Key-Group-Mappings zugreifen.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=224.
-
-- MOA SS fit für Mehrfachsignaturen, d.h. mehrere XML-Signaturen in einem XML-
- Dokument gemacht. Bisher scheiterte das an den fix vergebenen Id-Attributen
- innerhalb der dsig:Signature-Struktur.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=214.
-
-- MOA SP so verändert, dass die Prüfungen zum Signaturmanifest laut SL 1.2 jeden-
- falls durchgeführt werden, auch wenn das Element SignatureManifestCheckParams
- in VerifyXMLSignatureRequest nicht angegeben wird.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=269.
-
-- Verwendete JSSE Bibliothek auf Version 1.0.3 aktualisiert, da frühere Versionen
- einen sicherheitskritischen Fehler enthalten.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=124.
-
-##############
-1.2.1
-##############
-
-- Packaging umgestellt. Ab dieser Release werden die Kryptographiebibliotheken
- des IAIK nicht mehr mit den Distributionen von MOA SP/SS mitgeliefert, sondern
- sind vom Kunden selbst zu besorgen.
-
-##############
-1.2.0
-##############
-
-- Fehler beim validierenden Parsen des SignatureEnvironments eines Signaturer-
- stellungsrequests behoben. War das Debug-Level ungleich debug, kam es bisher
- zu einem Fehler.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=220.
-
-- Default-Wert für das Konfigurationsattribut cfg:CRLDistributionPoint/
- cfg:DistributionPoint/@reasonCodes so verändert, dass bei Weglassen des
- Attributs alle Reason-Codes gesetzt werden.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=244.
-
-- Commons Logging Bibliothek auf die Version 1.0.4 aktualisiert, damit Logging
- auch beim Betrieb unter Tomcat 5 funktioniert.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=245.
-
-- Werden bei der Zusammenstellung eines Signaturprüfrequests über das MOA API
- keine Supplements angegeben (null), kommt es nunmehr zu keinem Fehler mehr.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=247.
-
-##############
-1.2.0D04
-##############
-
-- Update des MOA-Kerns von IAIK. Gepatched wurde darin die fehlerhafte Kodierung
- des Signaturwerts für ECDSA-Signaturen. Bisher wurde das Paar (r,s) fehlerhafter
- Weise in eine ASN.1-Struktur eingepackt.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=218.
-
-##############
-1.2.0D03
-##############
-
-- Update auf eine neuere Version der XML-Signaturbibliothek sowie damit ver-
- bunden ein Update auf neuere Versionen von Xalan (2.5.1) sowie Xerces (2.4.0).
- Grund: Mit der neuen Xerces-Version funktioniert nun auch das Parsen einer
- XML-Personenbindung mit ECDSA-Schlüsseln.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=215.
-
-- Update des MOA-Kerns von IAIK. Es werden nun ECDSA-Signaturen, welche den
- Signaturalgorithmus mit "http://www.w3.org/2004/01/xmldsig-more#"
- kennzeichnen, erfolgreich von MOA SP erkannt und geprüft. Ebenso erstellt
- MOA SP nun ECDSA-Signaturen mit dem erwähnten Signaturalgorithmus.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=217.
-
-- Prüfung des Signaturmanifests funktioniert nun auch bei vorhandener EC14N
- Transformation. Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=197.
-
-- Das Element SignerInfo/QualifiedCertificate der Antwort auf eine XML-
- Signaturprüfung erscheint nun im korrekten Namespace.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=189.
-
-- Eine falsche Fehlermeldung im Zusammenhang mit Ergänzungsobjekten wurde
- korrigiert. Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=174.
-
-- Fehlender Typ des Elements TrustProfileID im XML-Schema wurde ergänzt.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=163.
-
-- Stack Overflow bei Prüfung bestimmter XML-Signaturen tritt nun nicht mehr
- auf. Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=132.
-
-- Unpräzise Fehlermeldungen verbessert.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=127.
- Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=74.
-
-
-##############
-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. Siehe
- https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=54.
-
-- Die Verwendung von EC14N-Transformationen ohne InclusiveNamespaces funktioniert
- nun auch. Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=44.
-
-- Signaturerstellung mit DSA-Schlüssel funktioniert nun. Siehe
- https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=52.
-
-##############
-1.2.0D01
-##############
-
-- In den Befehlen CreateXMLSignatureRequest sowie VerifyXMLSignatureRequest kann
- nun in allen Fällen, in denen bisher entweder Base64Content oder XMLContent
- angegeben werden konnte, auch eine dritte Spielart verwendet werden, nämlich
- LocRefContent. LocRefContent hat als Text-Inhalt eine URL, von der MOA den
- Content bezieht
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=41).
-
-##############
-1.1.0
-##############
-
-- Einfach verwendbare Scripts für Starten/Stopen sowie Install/Uninstall als
- Service unter Windows in die Auslieferung aufgenommen
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=36).
-
-- Drei neue Fragen in die FAQ aufgenommen
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=34,
- https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=35,
- https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=37).
-
-- Zertifikatsspeicher der Default-Konfiguration enthält nun alle CA-Zertifikate
- A-Trust sowie das Root-Zertifikats des Mobilkom-Bürgerkarten-Versuchs
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=33).
-
-- Konfigurationsparameter "checkRevocation" ist hat nun Default-Wert "false"
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=32).
-
-- Fehlerhafte Einträge in den minimalen Default-Konfigurationsfiles behoben
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=30,
- https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=31).
-
-- Ein CreateXMLSignatureRequest, der nicht den Default-Namespace verwendet, sondern
- ein ns-Präfix verwendet, wird nun auch korrekt verarbeitet
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=19).
-
-- Wird eine Enveloped Signature erzeugt, wird nun das korrekte XML-Dokument mit der
- erzeugten Signatur in der Antwort zurückgeliefert
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=12).
-
-- WSDL-File, das über die URI <MOA-SPSS-Basis-URL>/services/SignatureCreation?wsdl
- bzw. <MOA-SPSS-Basis-URL>/services/SignatureVerification?wsdl abgefragt werden
- kann, ist nun aktuell (MOA-SPSS-Schema 1.1) und enthält einen korrekten Verweis
- auf das MOA-SPSS-Schema 1.1
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=6).
-
-- Problem mit Auflösung von LDAP-URLs beim Einsatz als Webservice in Tomcat behoben.
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=2).
-
-- Bei der Prüfung auf Security-Layer-Konformität wird nun das korrekte Resultat
- zurückgeliefert, wenn die Signatur keine impliziten Transformationsparameter
- enthält
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=3).
-
-- Unterstützung anderer Datenbanken als postgreSQL und mySQL für das CRL-Archiv
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=7).
-
-- Diverse Fehler in der Dokumentation beseitigt
- (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=8,
- https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=9,
- https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=29).
-
-##############
-1.0.9
-##############
-
-- Erste öffentliche Release \ No newline at end of file
diff --git a/spss.server/lib/axis-1.0/axis.jar b/spss.server/lib/axis-1.0/axis.jar
deleted file mode 100644
index 7cf31027a..000000000
--- a/spss.server/lib/axis-1.0/axis.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/axis-1.0/jaxrpc.jar b/spss.server/lib/axis-1.0/jaxrpc.jar
deleted file mode 100644
index 4a2081643..000000000
--- a/spss.server/lib/axis-1.0/jaxrpc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/axis-1.0/saaj.jar b/spss.server/lib/axis-1.0/saaj.jar
deleted file mode 100644
index cf43f1fcd..000000000
--- a/spss.server/lib/axis-1.0/saaj.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/axis-1.0/wsdl4j.jar b/spss.server/lib/axis-1.0/wsdl4j.jar
deleted file mode 100644
index e90968e03..000000000
--- a/spss.server/lib/axis-1.0/wsdl4j.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/commons-discovery-0.2/commons-discovery.jar b/spss.server/lib/commons-discovery-0.2/commons-discovery.jar
deleted file mode 100644
index b88554847..000000000
--- a/spss.server/lib/commons-discovery-0.2/commons-discovery.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/commons-logging-1.0.4/commons-logging-api.jar b/spss.server/lib/commons-logging-1.0.4/commons-logging-api.jar
deleted file mode 100644
index ade9a13c7..000000000
--- a/spss.server/lib/commons-logging-1.0.4/commons-logging-api.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/commons-logging-1.0.4/commons-logging.jar b/spss.server/lib/commons-logging-1.0.4/commons-logging.jar
deleted file mode 100644
index b73a80fab..000000000
--- a/spss.server/lib/commons-logging-1.0.4/commons-logging.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/iDoclet-1.0/iDoclet.jar b/spss.server/lib/iDoclet-1.0/iDoclet.jar
deleted file mode 100644
index 6b4600e94..000000000
--- a/spss.server/lib/iDoclet-1.0/iDoclet.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/jaxen-1.0/jaxen-core.jar b/spss.server/lib/jaxen-1.0/jaxen-core.jar
deleted file mode 100644
index e52bf679c..000000000
--- a/spss.server/lib/jaxen-1.0/jaxen-core.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/jaxen-1.0/jaxen-dom.jar b/spss.server/lib/jaxen-1.0/jaxen-dom.jar
deleted file mode 100644
index 1a9926357..000000000
--- a/spss.server/lib/jaxen-1.0/jaxen-dom.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/jaxen-1.0/saxpath.jar b/spss.server/lib/jaxen-1.0/saxpath.jar
deleted file mode 100644
index 2b43955ba..000000000
--- a/spss.server/lib/jaxen-1.0/saxpath.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/jaxp-1.2_01/dom.jar b/spss.server/lib/jaxp-1.2_01/dom.jar
deleted file mode 100644
index f91f80a8b..000000000
--- a/spss.server/lib/jaxp-1.2_01/dom.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/jaxp-1.2_01/jaxp-api.jar b/spss.server/lib/jaxp-1.2_01/jaxp-api.jar
deleted file mode 100644
index 7a3295ee6..000000000
--- a/spss.server/lib/jaxp-1.2_01/jaxp-api.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/jaxp-1.2_01/sax.jar b/spss.server/lib/jaxp-1.2_01/sax.jar
deleted file mode 100644
index 9ffb844e5..000000000
--- a/spss.server/lib/jaxp-1.2_01/sax.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/jsse-1.0.3_03/jcert.jar b/spss.server/lib/jsse-1.0.3_03/jcert.jar
deleted file mode 100644
index d83aaf27e..000000000
--- a/spss.server/lib/jsse-1.0.3_03/jcert.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/jsse-1.0.3_03/jnet.jar b/spss.server/lib/jsse-1.0.3_03/jnet.jar
deleted file mode 100644
index 2397ef451..000000000
--- a/spss.server/lib/jsse-1.0.3_03/jnet.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/jsse-1.0.3_03/jsse.jar b/spss.server/lib/jsse-1.0.3_03/jsse.jar
deleted file mode 100644
index 669106075..000000000
--- a/spss.server/lib/jsse-1.0.3_03/jsse.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/junit-3.8.1/junit.jar b/spss.server/lib/junit-3.8.1/junit.jar
deleted file mode 100644
index 674d71e89..000000000
--- a/spss.server/lib/junit-3.8.1/junit.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/log4j-1.2.7/log4j-1.2.7.jar b/spss.server/lib/log4j-1.2.7/log4j-1.2.7.jar
deleted file mode 100644
index 1595a56ef..000000000
--- a/spss.server/lib/log4j-1.2.7/log4j-1.2.7.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/postgres-jdbc2-7.3/pg73jdbc2.jar b/spss.server/lib/postgres-jdbc2-7.3/pg73jdbc2.jar
deleted file mode 100644
index 8bf46dd8e..000000000
--- a/spss.server/lib/postgres-jdbc2-7.3/pg73jdbc2.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip b/spss.server/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip
deleted file mode 100644
index c450772ea..000000000
--- a/spss.server/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/xalan-j-2.5.1/xalan.jar b/spss.server/lib/xalan-j-2.5.1/xalan.jar
deleted file mode 100644
index 44d4d094d..000000000
--- a/spss.server/lib/xalan-j-2.5.1/xalan.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/xerces-j-2.4.0/xercesImpl.jar b/spss.server/lib/xerces-j-2.4.0/xercesImpl.jar
deleted file mode 100644
index bff9af0c4..000000000
--- a/spss.server/lib/xerces-j-2.4.0/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/lib/xerces-j-2.4.0/xmlParserAPIs.jar b/spss.server/lib/xerces-j-2.4.0/xmlParserAPIs.jar
deleted file mode 100644
index 6ba4ff805..000000000
--- a/spss.server/lib/xerces-j-2.4.0/xmlParserAPIs.jar
+++ /dev/null
Binary files differ
diff --git a/spss.server/licenses/Apache-2.0.txt b/spss.server/licenses/Apache-2.0.txt
deleted file mode 100644
index 57bc88a15..000000000
--- a/spss.server/licenses/Apache-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/spss.server/licenses/IAIK-License.txt b/spss.server/licenses/IAIK-License.txt
deleted file mode 100644
index c0db63b22..000000000
--- a/spss.server/licenses/IAIK-License.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-IAIK MOA Runtime Lizenz
-
-Stiftung SIC gewährt dem Lizenznehmer eine nicht-exklusive, nicht-übertragbare
-Runtime Lizenz für die "IAIK MOA" Module im Kontext von MOA SP/SS und MOA ID.
-Alle Versuche, Teile oder die kompletten IAIK Crypto Toolkits, die zusammen
-mit dem MOA Produktbündel ausgeliefert werden, für andere Zwecke als jenem
-für Applikationen im MOA Kontext zu verwenden, sind nicht erlaubt. Auch weitere
-Versuche, die sich auf die Entwicklung von Anwendungen , oder aber darüber hinaus
-auf die Schaffung eines eigenen Toolkits, oder die Aufnahme in ein weiters
-weiteres Toolkit beziehen, sind nicht erlaubt.
-Die hier beschriebene Runtime Lizenz ist nicht übertragbar auf weitere
-Vertragspartner des Kunden, Personen, Organisationen oder Unternehmen
-außerhalb der Organisation des Lizenznehmers.
diff --git a/spss.server/licenses/Jaxen.txt b/spss.server/licenses/Jaxen.txt
deleted file mode 100644
index bef65a520..000000000
--- a/spss.server/licenses/Jaxen.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Copyright 2003 (C) The Werken Company. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
- 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 name "jaxen" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of The Werken Company. For written permission,
- please contact bob@werken.com.
-
- 4. Products derived from this Software may not be called "jaxen"
- nor may "jaxen" appear in their names without prior written
- permission of The Werken Company. "jaxen" is a registered
- trademark of The Werken Company.
-
- 5. Due credit should be given to The Werken Company.
- (http://jaxen.werken.com/).
-
- THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS
- ``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 WERKEN COMPANY 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. \ No newline at end of file
diff --git a/spss.server/licenses/PostgreSQL-JDBC.txt b/spss.server/licenses/PostgreSQL-JDBC.txt
deleted file mode 100644
index 30d54d778..000000000
--- a/spss.server/licenses/PostgreSQL-JDBC.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 1997-2005, PostgreSQL Global Development Group
-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. Neither the name of the PostgreSQL Global Development Group nor the names
- of its contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. \ No newline at end of file
diff --git a/spss.server/manifest.template b/spss.server/manifest.template
deleted file mode 100644
index ad8035280..000000000
--- a/spss.server/manifest.template
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-version: 1.0
-
-Name: at/gv/egovernment/moa/spss/
-Implementation-Title: MOA-SP/SS
-Implementation-Version: @version@
-Implementation-URL: http://www.cio.gv.at/onlineservices/basicmodules/moa-spss/ \ No newline at end of file
diff --git a/spss.server/readme.inst.txt b/spss.server/readme.inst.txt
deleted file mode 100644
index a8b181cd8..000000000
--- a/spss.server/readme.inst.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Willkommen zur Installation von MOA SP/SS!
-
-Für eine Anleitung zur Installation verwenden Sie bitte das
-Installationshandbuch "handbook.html" im Verzeichnis "doc" dieser
-Distribution.
-
-BEVOR SIE STARTEN BEACHTEN SIE BITTE FOLGENDE HINWEISE ZUR
-LIZENSIERUNG VON MOA SP/SS SOWIE DER VON IHM VERWENDETEN
-BIBLIOTHEKEN:
-
-1. MOA SP/SS selbst ist freie Software und wird von Bundeskanzler-
- amt und Bundesministerium für Finanzen zu den Bedingungen der
- Apache 2.0 Lizenz zur Verfügung gestellt. Eine Kopie dieser
- Lizenz finden Sie in der Datei "Apache-2.0.txt" im Verzeichnis
- "licenses" dieser Distribution.
-
-2. MOA SP/SS verwendet Kryptographie-Biliotheken, deren Rechte bei
- der Stiftung Secure Information and Communication Technologies
- (http://jcewww.iaik.tugraz.at) liegen. Für diese Kryptographie-
- Bibliotheken besteht folgende Situation:
-
- Stiftung SIC gewährt dem Lizenznehmer eine nicht-exklusive,
- nicht-übertragbare Runtime Lizenz für die "IAIK MOA" Module
- im Kontext von MOA SP/SS und MOA ID. Alle Versuche, Teile oder
- die kompletten IAIK Crypto Toolkits, die zusammen mit dem MOA
- Produktbündel ausgeliefert werden, für andere Zwecke als jenem
- für Applikationen im MOA Kontext zu verwenden, sind nicht erlaubt.
- Auch weitere Versuche, die sich auf die Entwicklung von Anwendungen,
- oder aber darüber hinaus auf die Schaffung eines eigenen Toolkits,
- oder die Aufnahme in ein weiters weiteres Toolkit beziehen, sind
- nicht erlaubt. Die hier beschriebene Runtime Lizenz ist nicht
- übertragbar auf weitere Vertragspartner des Kunden, Personen,
- Organisationen oder Unternehmen außerhalb der Organisation des
- Lizenznehmers.
-
-3. MOA SP/SS verwendet folgende weitere Bibliotheken, die allesamt
- freie Software und in dieser Distribution bereits enthalten
- sind. Es gelten jedoch unterschiedliche Lizenzbedingungen:
-
- * Die Produkte Xerces Java 2, Xalan Java 2, Axis, Commons
- und Log4J werden von der Apache Software Foundation zu den
- Bedingungen der Apache 2.0 Lizenz zur Verfügung gestellt.
- Eine Kopie dieser Lizenz finden Sie in der Datei
- "Apache-2.0.txt" im Verzeichnis "licenses" dieser
- Distribution.
-
- * Das Produkt Jaxen wird von The Werken Company zu den Bedin-
- gungen einer BSD-ähnlichen Lizenz zur Verfügung gestellt.
- Eine Kopie dieser Lizenz finden Sie in der Datei "Jaxen.txt"
- im Verzeichnis "licenses" dieser Distribution.
-
- * Das Produkt PostgreSQL JDBC Driver wird von PostgreSQL Global
- Development Group zu den Bedingungen einer BSD-ähnlichen
- Lizenz zur Verfügung gestellt. Eine Kopie dieser Lizenz finden
- Sie in der Datei "PostgreSQL-JDBC.txt" im Verzeichnis
- "licenses" dieser Distribution. \ No newline at end of file
diff --git a/spss.server/readme.src.txt b/spss.server/readme.src.txt
deleted file mode 100644
index 5880bbe1c..000000000
--- a/spss.server/readme.src.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-Willkommen bei der Entwicklung von von MOA SP/SS!
-
-Diese Distribution besteht aus vier Teilen:
-
- * Entwicklungsprojekt "common", bestehend aus dem Verzeichnis
- "common". Dieser Ordner stellt ein vollständiges Eclipse 3.0-
- Projekt dar. "common" enthält jene Teile von MOA SP/SS, die
- auch von anderen MOAs verwendet werden.
-
- * Entwicklungsprojekt "spss.server", bestehend aus dem Verzeich-
- nis "spss.server". Dieser Ordner stellt ein vollständiges
- Eclipse 3.0-Projekt dar. "spss.server" stellt das eigentliche
- Entwicklungsprojekt MOA SP/SS dar. Es benötigt als abhängiges
- Projekt "common".
-
- * Entwicklungsprojekt "spss.handbook", bestehend aus dem Ver-
- zeichnis "spss.handbook". Dieser Ordner stellt ein vollständiges
- Eclipse 3.0-Projekt dar. "spss.handbook" stellt das Handbuch
- inklusive Beispielen und Demo-Clients für API- und Webservice-
- Version von MOA SP/SS dar.
-
- * Build-Scripts für Apache Ant. Diese Scripts befinden sich im
- Verzeichnis "build". Eine Anleitung zur Bedienung der Build-
- Scripts ist in der Datei "README.txt" in diesem Verzeichis
- enthalten.
-
-BEVOR SIE STARTEN BEACHTEN SIE BITTE FOLGENDE HINWEISE ZUR
-LIZENSIERUNG VON MOA SP/SS SOWIE DER VON IHM VERWENDETEN
-BIBLIOTHEKEN:
-
-1. MOA SP/SS selbst ist freie Software und wird von Bundeskanzler-
- amt und Bundesministerium für Finanzen zu den Bedingungen der
- Apache 2.0 Lizenz zur Verfügung gestellt. Eine Kopie dieser
- Lizenz finden Sie in der Datei "Apache-2.0.txt" im Verzeichnis
- "spss.server/licenses" dieser Distribution.
-
-2. MOA SP/SS verwendet Kryptographie-Biliotheken, deren Rechte bei
- der Stiftung Secure Information and Communication Technologies
- (http://jcewww.iaik.at) liegen. Für diese Kryptographie-Biblio-
- theken besteht folgende Situation:
-
- * Organisationen der österreichischen Verwaltung wird eine
- kostenfreie Lizenz zur Nutzung der Bibliotheken eingeräumt.
- Die Bibliotheken können im verwaltungsinternen Bereich der
- Webseite der IKT-Stabsstelle heruntergeladen werden
- (http://www.cio.gv.at/iktintern/downloads/).
-
- * Andere Organisationen müssen eine Lizenz zur Nutzung der
- Bibliotheken bei der Stiftung SIC käuflich erwerben.
- Evaluierungsversionen können kostenlos von der Webseite von
- Stiftung SIC
- (http://jce.iaik.tugraz.at/download/evaluation/index.php)
- bezogen werden. Für die Lizensierung von Produktivversionen
- wenden Sie sich bitte an den Verkauf von Stiftung SIC
- (mailto:jce-sales@iaik.at).
-
-3. MOA SP/SS verwendet folgende weitere Bibliotheken, die allesamt
- freie Software und in dieser Distribution bereits enthalten
- sind. Es gelten jedoch unterschiedliche Lizenzbedingungen:
-
- * Die Produkte Xerces Java 2, Xalan Java 2, Axis, Commons
- und Log4J werden von der Apache Software Foundation zu den
- Bedingungen der Apache 2.0 Lizenz zur Verfügung gestellt.
- Eine Kopie dieser Lizenz finden Sie in der Datei
- "Apache-2.0.txt" im Verzeichnis "spss.server/licenses" dieser
- Distribution.
-
- * Das Produkt Jaxen wird von The Werken Company zu den Bedin-
- gungen einer BSD-ähnlichen Lizenz zur Verfügung gestellt.
- Eine Kopie dieser Lizenz finden Sie in der Datei "Jaxen.txt"
- im Verzeichnis "spss.server/licenses" dieser Distribution.
-
- * Das Produkt PostgreSQL JDBC Driver wird von PostgreSQL Global
- Development Group zu den Bedingungen einer BSD-ähnlichen
- Lizenz zur Verfügung gestellt. Eine Kopie dieser Lizenz finden
- Sie in der Datei "PostgreSQL-JDBC.txt" im Verzeichnis
- "spss.server/licenses" dieser Distribution. \ No newline at end of file
diff --git a/spss.server/readme.update.txt b/spss.server/readme.update.txt
deleted file mode 100644
index ce8658f3a..000000000
--- a/spss.server/readme.update.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-
-======================================================================
- Update einer bestehenden MOA-SPSS-Installation auf Version 1.3.1
-======================================================================
-
-Es gibt zwei Möglichkeiten (im Folgenden als "Update Variante A" und
-"Update Variante B" bezeichnet), das Update von MOA-SPSS auf Version
-1.3.1 durchzuführen. Update Variante A geht dabei den Weg über eine
-vorangestellte Neuinstallation, während Variante B direkt eine
-bestehende Installation aktualisiert.
-
-Folgende Begriffe werden verwendet:
-
-JAVA_HOME bezeichnet das Wurzelverzeichnis der JDK-Installation
-
-CATALINA_HOME bezeichnet das Wurzelverzeichnis der Tomcat-Installation
-
-MOA_SPSS_INST bezeichnet das Verzeichnis, in das Sie die Datei
-moa-spss-1.3.1.zip entpackt haben.
-
-
-=================
-Update Variante A
-=================
-
-1.) Erstellen Sie eine Sicherungskopie des kompletten Tomcat-Verzeichnisses
- Ihrer MOA-SPSS-Installation.
-
-2.) Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
- JAVA_HOME\jre\lib\ext, und löschen Sie diese Dateien danach.
-
-3.) Führen Sie eine Neuinstallation gemäß Handbuch durch.
-
-4.) Kopieren Sie etwaige Konfigurationsdateien, Trust-Profile und Key-Stores,
- die Sie aus Ihrer alten Installation beibehalten möchten, aus Ihrer
- Sicherungskopie in die entsprechenden Verzeichnisse der neuen
- Installation.
- Anmerkung: Diese Distribution enthält neue A-TRUST und E-CARD-Zertifikate.
- Falls Sie Ihre alten Trustprofile beibehalten wollen, gehen Sie wie unter
- Update Variante B, Punkt 9 beschrieben vor, um Ihre alten Trustprofile
- auf einen aktuellen Stand zu bringen.
-
-5.) Nur wenn alte Installation älter als Version 1.3.0:
- Falls Sie Ihre alte MOA-SP Konfigurationsdatei weiterverwenden wollen:
- Mit dem Wechsel auf Version 1.3.1 verwendet MOA SP ein neues Format für die
- XML-Konfigurationsdatei. Sie müssen die Konfigurationsdatei für MOA-SP aus
- Ihrer alten Installation auf das neue Format konvertieren.
- Details dazufinden Sie im MOA-SPSS-Installationshandbuch.
-
-
-=================
-Update Variante B
-=================
-
-1.) Erstellen Sie eine Sicherungskopie des kompletten Tomcat-Verzeichnisses
- Ihrer MOA-SPSS-Installation.
-
-2.) Entpacken Sie die Datei "moa-spss-1.3.1.zip" in das Verzeichnis MOA_SPSS_INST.
-
-3.) Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
- JAVA_HOME\jre\lib\ext und löschen Sie diese Dateien danach.
-
-4.) Falls Sie mit jdk1.3 oder niedriger arbeiten, kopieren Sie alle Dateien
- aus dem Verzeichnis MOA_SPSS_INST\ext13 in das Verzeichnis
- JAVA_HOME\jre\lib\ext.
- Falls Sie mit jdk1.4 oder höher arbeiten, kopieren Sie alle Dateien
- aus dem Verzeichnis MOA_SPSS_INST\ext14 in das Verzeichnis
- JAVA_HOME\jre\lib\ext.
-
-5.) Kopieren Sie die Dateien aus dem Verzeichnis MOA_SPSS_INST\endorsed
- in das Verzeichnis CATALINA_HOME\common\endorsed. Überschreiben Sie dabei
- etwaige gleichnamige Dateien.
-
-6.) Löschen Sie das Verzeichnis CATALINA_HOME\webapps\moa-spss.
-
-7.) Ersetzen Sie die Datei CATALINA_HOME\webapps\moa-spss.war durch die Datei
- MOA_SPSS_INST\moa-spss.war.
-
-8.) Löschen Sie das Verzeichnis CATALINA_HOME\work.
-
-9.) Update der Trust-Profile.
- Wenn Sie Ihre alten Trust-Profile durch die neuen ersetzen wollen, dann gehen
- Sie vor, wie in Punkt a). Wenn Sie Ihre eigenen Trust-Profile beibehalten wollen,
- dann gehen Sie vor, wie in Punkt b).
-
- a) Gehen Sie wie folgt vor, um die Trust-Profile auszutauschen:
-
- 1) Löschen Sie das Verzeichnis CATALINA_HOME\conf\moa-spss\trustProfiles.
- 2) Kopieren Sie das Verzeichnis MOA_SPSS_INST\conf\moa-spss\trustProfiles
- in das Verzeichnis CATALINA_HOME\conf\moa-spss.
-
- b) Falls Sie Ihre alten Trust-Profile beibehalten wollen, gehen Sie wie folgt vor,
- um die Profile auf den aktuellen Stand zu bringen:
-
- 1) Löschen Sie die Datei "C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der"
- aus jedem Trustprofil, in dem sie enthalten ist.
-
- 2) Löschen Sie die Datei "OCSP Responder 02-20051027-20101027.der" aus jedem
- Trustprofil, in dem sie enthalten ist.
-
- 7) Ergänzen Sie ihre Trustprofile durch alle Zertifikate aus den entsprechenden Profilen
- im Verzeichnis MOA_SPSS_INST\conf\moa-spss\trustprofiles, die nicht in Ihren
- Profilen enthalten sind. Am einfachsten ist es, wenn Sie den Inhalt der einzelnen Profile
- aus der Distribution (MOA_SPSS_INST\conf\moa-spss\trustprofiles) in die entsprechenden
- Profile Ihrer Installation (CATALINA_HOME\conf\moa-spss\trustprofiles) kopieren und
- dabei die vorhandenen gleichnamigen Zertifikate überschreiben), also z.B:
-
- Kopieren des Inhalts von
- MOA_SPSS_INST\conf\moa-spss\trustprofiles\certifiedSignature
- nach
- CATALINA_HOME\conf\moa-spss\trustprofiles\certifiedSignature
- usw.
-
-10.) Update des Cert-Stores.
- a) Kopieren Sie den Inhalt des Verzeichnisses MOA_SPSS_INST\conf\moa-spss\certstore
- in das Verzeichnis CATALINA_HOME\conf\moa-spss\certstore. Wenn Sie gefragt werden, ob Sie
- vorhandene Dateien oder Unterverzeichnisse überschreiben sollen, dann bejahen Sie das.
-
- b) Falls vorhanden, löschen Sie die Datei "890A4C8282E95EBB398685D9501486EF213941B5" aus dem
- Verzeichnis CATALINA_HOME\conf\moa-spss\certstore\10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D.
-
- c) Falls die Datei "E7340D1FB627D8917A9C0D23F21515C441BF1214" noch nicht im Verzeichnis
- CATALINA_HOME\conf\moa-spss\certstore\10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D
- enthalten ist, dann kopieren Sie diese Datei aus dem Verzeichnis
- MOA_ID_INST_AUTH\conf\moa-spss\certstore\10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D
- in das Verzeichnis
- CATALINA_HOME\conf\moa-spss\certstore\10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D.
-
-11.) Nur wenn alte Installation älter als Version 1.3.0:
- Mit dem Wechsel auf Version 1.3.0 verwendet MOA SP ein neues Format für die
- XML-Konfigurationsdatei. Sie müssen die Konfigurationsdatei für MOA-SP aus
- Ihrer alten Installation auf das neue Format konvertieren. Details dazu
- finden Sie im MOA-SPSS-Installationshandbuch.
-
-
-
-
diff --git a/spss.server/res/resources/properties/spss_messages_de.properties b/spss.server/res/resources/properties/spss_messages_de.properties
deleted file mode 100644
index 9f26af45d..000000000
--- a/spss.server/res/resources/properties/spss_messages_de.properties
+++ /dev/null
@@ -1,147 +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
-#
-
-1100=Fehler beim Validieren der Anfrage: {0}
-1101=Bei enveloping Datenobjekten muss entweder Content oder Reference übergeben werden
-1102=Bei detached Datenobjekten darf das Attribut Reference nicht leer sein
-1103=Ungültiger Wert für Attribut Structure im Element DataObjectInfo: {0}
-1104=Ungültiger Wert für DateTime: {0}
-1105=Ungültiger Wert für Attribut Index in Element CreateSignatureLocation: {0}
-1106=Interner Fehler beim Parsen der XML-Daten
-1107=Kein Kind-Element im Element XMLContent gefunden
-1108=Ungültiger Wert für dsig:Algorithm: {0}
-1109=XMLContent darf nur ein Kind-Element enthalten
-1110=Entweder Content oder Reference muss gesetzt sein
-1111=Reference muss gesetzt sein, wenn kein Content angegeben ist
-1112=Bei leerer Reference muss CreateSignatureEnvironment vorhanden sein
-1113=Der Endpunkt akzeptiert keine Anfragen vom Typ: {0}
-
-2200=Fehler beim Erzeugen der Antwort
-2201=Transformations-Algorithmus unbekannt: {0}
-2202=Kein XPath-Element für XPath-Transformation gefunden
-2203=TrustProfileID unbekannt: {0}
-2207=Ungültiges URI-Format: {0}
-2208=Fehler beim Öffnen des Datenobjekts (URI={0})
-2209=Fehler beim Parsen der XML-Daten
-2210=Fehler beim Lesen des Datenobjekts
-2211=Referenzierte Daten können nicht als XML interpretiert werden (URI={0})
-2212=Fehler beim Auswerten des XPath-Ausdrucks: {0}
-2213=Zugriff auf das Dateisystem verweigert (URI={0})
-2214=Ungültiges URL-Format: {0}
-2215=Kein Stylesheet für XSLT-Transformation gefunden
-2216=Kein XPath-Filter2 Element für XPath-Filter2-Transform gefunden
-2217=Kein InclusiveNamespaces Element für Exclusive Canonicalization Transform gefunden
-2218=Das Signature Environment enthält keine validen XML-Daten
-2219=Fehler beim Lesen des Signature Environment
-2220=Allgemeiner Fehler beim Erzeugen der Signatur [{0}]
-2221=Fehler bei der Behandlung des Schlüssels [{0}]
-2222=Fehler beim Erstellen des Manifests [{0}]
-2223=Fehler beim Erstellen der Referenz [{0}]
-2224=Hashwert nicht verfügbar [{0}]
-2225=Signier-Algorithmus wird nicht unterstützt [{0}]
-2226=Fehler beim Einbetten der Signatur [{0}]
-2227=Fehler beim Berechnen des Signaturwertes [{0}]
-2228=Fehler beim Behandeln der SignedProperties [{0}]
-2229=Signator-Zertifikat nicht verfügbar [{0}]
-2230=Fehler beim Auflösen eines Supplements [{0}]
-2231=Die Schlüsselgruppe ist nicht verfügbar
-2232=Die Schlüsselgruppe ist leer
-2233=Fehler beim Durchführen der Transformation [{0}]
-2234=CreateTransformsInfoProfileID nicht vorhanden (ID={0})
-2235=CreateSignatureEnvironment muss entweder Reference oder Content enthalten
-2236=CreateSignatureEnvironmentProfileID nicht vorhanden (ID={0})
-2237=Fehler beim Auflösen der internen Referenz (URI={0})
-2238=Fehler beim Auflösen des Transformationsparameters (URI={0})
-2240=Allgemeiner Fehler beim Verifizieren der Signatur [{0}]
-2241=Algorithmus wird nicht unterstützt [{0}]
-2242=Fehler beim Parsen der CMS Signatur [{0}]
-2243=Signator-Zertifikat nicht verfügbar [{0}]
-2244=Fehler beim Lesen der Signatur-Daten
-2245=Fehler beim Codieren des Signator-Zertifikats
-2246=Fehler beim Umwandeln des SubjectDN des Signator-Zertifikats nach RFC2253: {0}
-2247=Allgemeiner Fehler beim Verifizieren der Signatur [{0}]
-2248=Fehler beim Vorbereiten der Daten [{0}]
-2249=Das Attribut Signatories enthält einen ungültigen Index (Index={0})
-2262=Fehler beim Behandeln des Manifests [{0}]
-2263=Fehler beim Parsen der Properties [{0}]
-2264=Fehler beim Behandeln der Referenz [{0}]
-2265=Fehler beim Durchführen der Transformation [{0}]
-2266=Signatur ist kein dsig:Signature-Element
-2267=SupplementProfileID nicht vorhanden (ID={0})
-2268=VerifyTransformsInfoProfileID nicht vorhanden (ID={0})
-2269=Fehler beim Parsen der Transformation [{0}]
-2270=Fehler beim Decodieren des Hash-Wertes
-2271=Falsche Anzahl an ReferenceInfo Elementen in SignatureManfestCheckParams
-2280=Die Angabe XMLContent wird derzeit nicht unterstützt
-2281=XML-Supplement kann nicht serialisiert werden (Reference="{0}")
-
-2900=Interner Server-Fehler
-
-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
-9999=Nicht klassifizierter Fehler
-
-
-#
-# Server internal messages
-#
-
-init.00=Fehler beim Lesen der MOA SP/SS Konfiguration: das Service steht nicht zur Verfügung
-init.01=MOA SP/SS Konfiguration erfolgreich geladen
-init.02=Fehler beim Löschen der Archivdaten
-init.03=Fehler beim Aktivieren des IAIK-JCE/JSSE/JDK1.3 Workaround: SSL ist möglicherweise nicht verfügbar
-init.04=Fehler beim Initialisieren des Schema Pools
-
-config.00=Fehler beim Erstellen des KeyGroupMapping: KeyGroup mit id={0} unbekannt - die Erstellung des KeyGroupMapping wird fortgeführt
-config.01=Fehler in der Konfiguration: Wert für maximale Archivierungsdauer von Widerrufsinformationen (ArchiveDuration) nicht konfiguriert oder ungültig
-config.02=Fehler in der Konfiguration: {0} mit id={1}: falscher Profiltyp in Datei {2}
-config.03=Fehler in der Konfiguration: {0} mit id={1} konnte nicht geladen werden
-config.04=Fehler in der Konfiguration: {0} mit id={1} existiert bereits
-config.05=Umgebungsvariable {0} nicht gesetzt: benutze Default-Konfiguration
-config.06=Die MOA SP/SS Konfiguration wurde erfolgreich aktualisiert.
-config.07=Fehler in der Konfiguration: Reason code {0} unbekannt
-config.08=Fehler beim Konfigurieren der IAIK-Module
-config.09=Fehler beim Öffnen der Schlüssel-Datei {0}
-config.10=Fehler beim Einlesen der Konfiguration (siehe Log-Datei für Details)
-config.11=Fehler biem Erstellen der Konfiguration (siehe Log-Datei für Details)
-config.12=Fehler beim Einlesen des Profils
-config.13=Fehler beim Erstellen des CRLDistributionPoint: CAIssuerDN={0} ungültig
-config.14=Das Attribut {0} für das TrustProfile mit id={1} ist ungültig (Wert={2})
-config.15=Fehler beim Erstellen des TrustProfile id={0}: Name des Konfigurations-Verzeichnisses konnte nicht in eine URL umgewandet werden
-config.16=Fehler beim Erstellen von X509IssuerSerial (IssuerName={0}, SerialNumber={1})
-config.17=DigestAlgorithmName unbekannt (AlgorithmName={0})
-config.18=Lade Keystore: {0}
-config.19=Key ID={0}
-config.20=Fehler beim Aktualisieren der MOA SP/SS Konfiguration. Die bestehende Konfiguration wird beibehalten
-config.21=Lade Konfiguration von {0}
-config.22=Lade {0} mit id={1} von Datei {2}
-config.23=MOA SP/SS Konfiguration: {0} nicht gesetzt oder ungültiger Wert, verwende den Default-Wert: {1}
-config.25=Fehler in der Konfiguration: Das SoftwareKeyModule mit id={0} konnte nicht geladen werden, da die Datei {1} nicht existiert oder ein Verzeichnis bezeichnet
-config.26=Fehler beim Erstellen der KeyGroup mit id={0}: KeyModule mit id={1} unbekannt
-config.27=Fehler in der Konfiguration: Das Attribut {0} des TrustProfiles mit id={1} zeigt nicht auf ein existierendes Verzeichnis
-config.28=Einen detaillierten Fehlerbericht entnehmen Sie bitte der Log-Datei.
-config.29=Es sind folgende leichte Fehler aufgetreten:
-config.31=Fehler in der Konfiguration der KeyGroup mit id={0}: Der Schlüssel im KeyModule id={1} mit IssuerName={2} und SerialNumber={3} konnte nicht geladen werden
-config.32=Fehler in der Konfiguration: Verzeichnisangabe für den Zertifikatsspeicher ist ungültig ({0}).
-
-
-handler.00=Starte neue Transaktion: TID={0}, Service={1}
-handler.01=Aufruf von Adresse={0}
-handler.02=Client-Zertifikat: Subject={0}, Serial={1}, Issuer={2}
-handler.03=Client-Zertifikat nicht verfügbar
-handler.04=Anfrage erfolgreich abgearbeitet
-handler.05=Fehler beim Abarbeiten der Anfrage
-
-invoker.00=Das Signature Environment konnte nicht validierend geparst werden
-invoker.01=Keine passende Transformationskette gefunden (Index={0})
-invoker.02=Der Hashwert der Transformation stimmt nicht überein (Index={0})
-invoker.03=Signatorzertifikat aus Trustprofile mit id={0} konnte nicht geparst werden (Dateiname={1})
diff --git a/spss.server/res/resources/security/cacerts b/spss.server/res/resources/security/cacerts
deleted file mode 100644
index 6eeaba418..000000000
--- a/spss.server/res/resources/security/cacerts
+++ /dev/null
Binary files differ
diff --git a/spss.server/res/resources/tools/ConfigurationMapper.xsl b/spss.server/res/resources/tools/ConfigurationMapper.xsl
deleted file mode 100644
index fd47cbf84..000000000
--- a/spss.server/res/resources/tools/ConfigurationMapper.xsl
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#">
- <xsl:output encoding="UTF-8" indent="yes" method="xml"/>
- <xsl:template match="/">
- <xsl:apply-templates/>
- </xsl:template>
- <xsl:template match="cfg:MOAConfiguration">
- <xsl:comment>MOA SPSS 1.3 Configuration File created by MOA SPSS Configuration Mapper</xsl:comment>
- <cfg:MOAConfiguration>
- <xsl:if test="cfg:HardwareCryptoModule">
- <cfg:Common>
- <xsl:for-each select="cfg:HardwareCryptoModule">
- <cfg:HardwareCryptoModule>
- <cfg:Name>
- <xsl:value-of select="@name"/>
- </cfg:Name>
- <xsl:if test="@slotID">
- <cfg:SlotId>
- <xsl:value-of select="@slotID"/>
- </cfg:SlotId>
- </xsl:if>
- <cfg:UserPIN>
- <xsl:value-of select="@userPIN"/>
- </cfg:UserPIN>
- </cfg:HardwareCryptoModule>
- </xsl:for-each>
- </cfg:Common>
- </xsl:if>
- <xsl:if test="cfg:KeyGroup">
- <cfg:SignatureCreation>
- <cfg:KeyModules>
- <xsl:apply-templates select="cfg:HardwareKeyModule | cfg:SoftwareKeyModule"/>
- </cfg:KeyModules>
- <xsl:apply-templates select="cfg:KeyGroup"/>
- <xsl:apply-templates select="cfg:KeyGroupMapping"/>
- <cfg:XMLDSig>
- <cfg:CanonicalizationAlgorithm>
- <xsl:choose>
- <xsl:when test="cfg:CanonicalizationAlgorithm">
- <xsl:value-of select="cfg:CanonicalizationAlgorithm/@name"/>
- </xsl:when>
- <xsl:otherwise>http://www.w3.org/TR/2001/REC-xml-c14n-20010315</xsl:otherwise>
- </xsl:choose>
- </cfg:CanonicalizationAlgorithm>
- <cfg:DigestMethodAlgorithm>
- <xsl:choose>
- <xsl:when test="cfg:DigestMethodAlgorithm">
- <xsl:value-of select="cfg:DigestMethodAlgorithm/@name"/>
- </xsl:when>
- <xsl:otherwise>http://www.w3.org/2000/09/xmldsig#sha1</xsl:otherwise>
- </xsl:choose>
- </cfg:DigestMethodAlgorithm>
- </cfg:XMLDSig>
- <xsl:for-each select="cfg:CreateTransformsInfoProfile">
- <cfg:CreateTransformsInfoProfile>
- <xsl:apply-templates select="."/>
- </cfg:CreateTransformsInfoProfile>
- </xsl:for-each>
- <xsl:for-each select="cfg:CreateSignatureEnvironmentProfile">
- <cfg:CreateSignatureEnvironmentProfile>
- <xsl:apply-templates select="."/>
- </cfg:CreateSignatureEnvironmentProfile>
- </xsl:for-each>
- </cfg:SignatureCreation>
- </xsl:if>
- <xsl:if test="cfg:TrustProfile">
- <cfg:SignatureVerification>
- <xsl:call-template name="CertificateValidation"/>
- </cfg:SignatureVerification>
- </xsl:if>
- </cfg:MOAConfiguration>
- </xsl:template>
- <xsl:template match="cfg:SoftwareKeyModule">
- <cfg:SoftwareKeyModule>
- <cfg:Id>
- <xsl:value-of select="@id"/>
- </cfg:Id>
- <cfg:FileName>
- <xsl:value-of select="@filename"/>
- </cfg:FileName>
- <xsl:if test="@password">
- <cfg:Password>
- <xsl:value-of select="@password"/>
- </cfg:Password>
- </xsl:if>
- </cfg:SoftwareKeyModule>
- </xsl:template>
- <xsl:template match="cfg:HardwareKeyModule">
- <cfg:HardwareKeyModule>
- <cfg:Id>
- <xsl:value-of select="@id"/>
- </cfg:Id>
- <cfg:Name>
- <xsl:value-of select="@name"/>
- </cfg:Name>
- <xsl:if test="@slotID">
- <cfg:SlotId>
- <xsl:value-of select="@slotID"/>
- </cfg:SlotId>
- </xsl:if>
- <cfg:UserPIN>
- <xsl:value-of select="@userPIN"/>
- </cfg:UserPIN>
- </cfg:HardwareKeyModule>
- </xsl:template>
- <xsl:template match="cfg:KeyGroup">
- <cfg:KeyGroup>
- <cfg:Id>
- <xsl:value-of select="@id"/>
- </cfg:Id>
- <xsl:for-each select="cfg:Key">
- <cfg:Key>
- <cfg:KeyModuleId>
- <xsl:value-of select="cfg:KeyModuleID"/>
- </cfg:KeyModuleId>
- <cfg:KeyCertIssuerSerial>
- <dsig:X509IssuerName>
- <xsl:value-of select="cfg:KeyCertIssuerSerial/dsig:X509IssuerName"/>
- </dsig:X509IssuerName>
- <dsig:X509SerialNumber>
- <xsl:value-of select="cfg:KeyCertIssuerSerial/dsig:X509SerialNumber"/>
- </dsig:X509SerialNumber>
- </cfg:KeyCertIssuerSerial>
- </cfg:Key>
- </xsl:for-each>
- </cfg:KeyGroup>
- </xsl:template>
- <xsl:template match="cfg:KeyGroupMapping">
- <cfg:KeyGroupMapping>
- <xsl:if test="cfg:X509IssuerSerial">
- <cfg:CustomerId>
- <dsig:X509IssuerName>
- <xsl:value-of select="cfg:X509IssuerSerial/dsig:X509IssuerName"/>
- </dsig:X509IssuerName>
- <dsig:X509SerialNumber>
- <xsl:value-of select="cfg:X509IssuerSerial/dsig:X509SerialNumber"/>
- </dsig:X509SerialNumber>
- </cfg:CustomerId>
- </xsl:if>
- <xsl:for-each select="cfg:KeyGroup">
- <cfg:KeyGroupId>
- <xsl:value-of select="@id"/>
- </cfg:KeyGroupId>
- </xsl:for-each>
- </cfg:KeyGroupMapping>
- </xsl:template>
- <xsl:template match="cfg:CreateTransformsInfoProfile | cfg:CreateSignatureEnvironmentProfile | cfg:VerifyTransformsInfoProfile | cfg:SupplementProfile">
- <cfg:Id>
- <xsl:value-of select="@id"/>
- </cfg:Id>
- <cfg:Location>
- <xsl:value-of select="@filename"/>
- </cfg:Location>
- </xsl:template>
- <xsl:template name="CertificateValidation">
- <cfg:CertificateValidation>
- <cfg:PathConstruction>
- <cfg:AutoAddCertificates>
- <xsl:call-template name="GetGenericValue">
- <xsl:with-param name="GenericName" select="'autoAddCertificates'"/>
- <xsl:with-param name="DefaultValue" select="'true'"/>
- </xsl:call-template>
- </cfg:AutoAddCertificates>
- <cfg:UseAuthorityInformationAccess>
- <xsl:call-template name="GetGenericValue">
- <xsl:with-param name="GenericName" select="'useAuthorityInfoAccess'"/>
- <xsl:with-param name="DefaultValue" select="'true'"/>
- </xsl:call-template>
- </cfg:UseAuthorityInformationAccess>
- <cfg:CertificateStore>
- <cfg:DirectoryStore>
- <cfg:Location>
- <xsl:call-template name="GetGenericValue">
- <xsl:with-param name="GenericName" select="'DirectoryCertStoreParameters.RootDir'"/>
- <xsl:with-param name="DefaultValue" select="'certstore'"/>
- </xsl:call-template>
- </cfg:Location>
- </cfg:DirectoryStore>
- </cfg:CertificateStore>
- </cfg:PathConstruction>
- <cfg:PathValidation>
- <cfg:ChainingMode>
- <cfg:DefaultMode>
- <xsl:choose>
- <xsl:when test="cfg:ChainingModes/@systemDefaultMode">
- <xsl:value-of select="cfg:ChainingModes/@systemDefaultMode"/>
- </xsl:when>
- <xsl:otherwise>pkix</xsl:otherwise>
- </xsl:choose>
- </cfg:DefaultMode>
- <xsl:for-each select="cfg:ChainingModes/cfg:TrustAnchor">
- <cfg:TrustAnchor>
- <cfg:Identification>
- <dsig:X509IssuerName>
- <xsl:value-of select="dsig:X509IssuerName"/>
- </dsig:X509IssuerName>
- <dsig:X509SerialNumber>
- <xsl:value-of select="dsig:X509SerialNumber"/>
- </dsig:X509SerialNumber>
- </cfg:Identification>
- <cfg:Mode>
- <xsl:value-of select="@mode"/>
- </cfg:Mode>
- </cfg:TrustAnchor>
- </xsl:for-each>
- </cfg:ChainingMode>
- <xsl:for-each select="cfg:TrustProfile">
- <cfg:TrustProfile>
- <cfg:Id>
- <xsl:value-of select="@id"/>
- </cfg:Id>
- <cfg:TrustAnchorsLocation>
- <xsl:value-of select="@uri"/>
- </cfg:TrustAnchorsLocation>
- <xsl:if test="@signerCertsUri">
- <cfg:SignerCertsLocation>
- <xsl:value-of select="@signerCertsUri"/>
- </cfg:SignerCertsLocation>
- </xsl:if>
- </cfg:TrustProfile>
- </xsl:for-each>
- </cfg:PathValidation>
- <cfg:RevocationChecking>
- <cfg:EnableChecking>
- <xsl:call-template name="GetGenericValue">
- <xsl:with-param name="GenericName" select="'checkRevocation'"/>
- <xsl:with-param name="DefaultValue" select="'true'"/>
- </xsl:call-template>
- </cfg:EnableChecking>
- <cfg:MaxRevocationAge>
- <xsl:call-template name="GetGenericValue">
- <xsl:with-param name="GenericName" select="'maxRevocationAge'"/>
- <xsl:with-param name="DefaultValue" select="'0'"/>
- </xsl:call-template>
- </cfg:MaxRevocationAge>
- <cfg:ServiceOrder>
- <cfg:Service>CRL</cfg:Service>
- <cfg:Service>OCSP</cfg:Service>
- </cfg:ServiceOrder>
- <cfg:Archiving>
- <cfg:EnableArchiving>
- <xsl:call-template name="GetGenericValue">
- <xsl:with-param name="GenericName" select="'archiveRevocationInfo'"/>
- <xsl:with-param name="DefaultValue" select="'false'"/>
- </xsl:call-template>
- </cfg:EnableArchiving>
- <cfg:ArchiveDuration>
- <xsl:choose>
- <xsl:when test="cfg:CRLArchive/@duration">
- <xsl:value-of select="cfg:CRLArchive/@duration"/>
- </xsl:when>
- <xsl:otherwise>365</xsl:otherwise>
- </xsl:choose>
- </cfg:ArchiveDuration>
- <cfg:Archive>
- <cfg:DatabaseArchive>
- <cfg:JDBCURL>
- <xsl:call-template name="GetGenericValue">
- <xsl:with-param name="GenericName" select="'DataBaseArchiveParameter.JDBCUrl'"/>
- <xsl:with-param name="DefaultValue" select="'jdbc:url'"/>
- </xsl:call-template>
- </cfg:JDBCURL>
- <cfg:JDBCDriverClassName>
- <xsl:call-template name="GetGenericValue">
- <xsl:with-param name="GenericName" select="'DataBaseArchiveParameter.JDBCDriverClass'"/>
- <xsl:with-param name="DefaultValue" select="'fully.qualified.classname'"/>
- </xsl:call-template>
- </cfg:JDBCDriverClassName>
- </cfg:DatabaseArchive>
- </cfg:Archive>
- </cfg:Archiving>
- <xsl:for-each select="cfg:CRLDistributionPoint">
- <cfg:DistributionPoint>
- <cfg:CAIssuerDN>
- <xsl:value-of select="cfg:CAIssuerDN"/>
- </cfg:CAIssuerDN>
- <xsl:for-each select="cfg:DistributionPoint">
- <cfg:CRLDP>
- <cfg:Location>
- <xsl:value-of select="@uri"/>
- </cfg:Location>
- <xsl:if test="contains(@reasonCodes, 'all')">
- <cfg:ReasonCode>all</cfg:ReasonCode>
- </xsl:if>
- <xsl:if test="contains(@reasonCodes, 'unused')">
- <cfg:ReasonCode>unused</cfg:ReasonCode>
- </xsl:if>
- <xsl:if test="contains(@reasonCodes, 'keyCompromise')">
- <cfg:ReasonCode>keyCompromise</cfg:ReasonCode>
- </xsl:if>
- <xsl:if test="contains(@reasonCodes, 'cACompromise')">
- <cfg:ReasonCode>cACompromise</cfg:ReasonCode>
- </xsl:if>
- <xsl:if test="contains(@reasonCodes, 'affiliationChanged')">
- <cfg:ReasonCode>affiliationChanged</cfg:ReasonCode>
- </xsl:if>
- <xsl:if test="contains(@reasonCodes, 'superseded')">
- <cfg:ReasonCode>superseded</cfg:ReasonCode>
- </xsl:if>
- <xsl:if test="contains(@reasonCodes, 'cessationOfOperation')">
- <cfg:ReasonCode>cessationOfOperation</cfg:ReasonCode>
- </xsl:if>
- <xsl:if test="contains(@reasonCodes, 'certificateHold')">
- <cfg:ReasonCode>certificateHold</cfg:ReasonCode>
- </xsl:if>
- <xsl:if test="contains(@reasonCodes, 'privilegeWithdrawn')">
- <cfg:ReasonCode>privilegeWithdrawn</cfg:ReasonCode>
- </xsl:if>
- <xsl:if test="contains(@reasonCodes, 'aACompromise')">
- <cfg:ReasonCode>aACompromise</cfg:ReasonCode>
- </xsl:if>
- </cfg:CRLDP>
- </xsl:for-each>
- </cfg:DistributionPoint>
- </xsl:for-each>
- </cfg:RevocationChecking>
- </cfg:CertificateValidation>
- <xsl:for-each select="cfg:VerifyTransformsInfoProfile">
- <cfg:VerifyTransformsInfoProfile>
- <xsl:apply-templates select="."/>
- </cfg:VerifyTransformsInfoProfile>
- </xsl:for-each>
- <xsl:for-each select="cfg:SupplementProfile">
- <cfg:SupplementProfile>
- <xsl:apply-templates select="."/>
- </cfg:SupplementProfile>
- </xsl:for-each>
- </xsl:template>
- <xsl:template name="GetGenericValue">
- <xsl:param name="GenericName"/>
- <xsl:param name="DefaultValue"/>
- <xsl:choose>
- <xsl:when test="cfg:GenericConfiguration[@name=$GenericName]">
- <xsl:value-of select="cfg:GenericConfiguration[@name=$GenericName]/@value"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:if test="$DefaultValue != ''">
- <xsl:value-of select="$DefaultValue"/>
- </xsl:if>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.server/res/resources/wsdl/MOA-SPSS-1.3.wsdl b/spss.server/res/resources/wsdl/MOA-SPSS-1.3.wsdl
deleted file mode 100644
index cc7aec4dc..000000000
--- a/spss.server/res/resources/wsdl/MOA-SPSS-1.3.wsdl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Web Service Description for MOA SP/SS 1.3
--->
-<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: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">
- <import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.3.xsd"/>
- <message name="CreateXMLSignatureInput">
- <part name="body" element="moa:CreateXMLSignatureRequest"/>
- </message>
- <message name="CreateXMLSignatureOutput">
- <part name="body" element="moa:CreateXMLSignatureResponse"/>
- </message>
- <message name="VerifyCMSSignatureInput">
- <part name="body" element="moa:VerifyCMSSignatureRequest"/>
- </message>
- <message name="VerifyCMSSignatureOutput">
- <part name="body" element="moa:VerifyCMSSignatureResponse"/>
- </message>
- <message name="VerifyXMLSignatureInput">
- <part name="body" element="moa:VerifyXMLSignatureRequest"/>
- </message>
- <message name="VerifyXMLSignatureOutput">
- <part name="body" element="moa:VerifyXMLSignatureResponse"/>
- </message>
- <message name="MOAFault">
- <part name="body" element="moa:ErrorResponse"/>
- </message>
- <portType name="SignatureCreationPortType">
- <operation name="createXMLSignature">
- <input message="tns:CreateXMLSignatureInput"/>
- <output message="tns:CreateXMLSignatureOutput"/>
- <fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
- </portType>
- <portType name="SignatureVerificationPortType">
- <operation name="verifyCMSSignature">
- <input message="tns:VerifyCMSSignatureInput"/>
- <output message="tns:VerifyCMSSignatureOutput"/>
- <fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
- <operation name="verifyXMLSignature">
- <input message="tns:VerifyXMLSignatureInput"/>
- <output message="tns:VerifyXMLSignatureOutput"/>
- <fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
- </portType>
- <binding name="SignatureCreationBinding" type="tns:SignatureCreationPortType">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="createXMLSignature">
- <soap:operation soapAction="urn:CreateXMLSignatureAction"/>
- <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 use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </fault>
- </operation>
- </binding>
- <binding name="SignatureVerificationBinding" type="tns:SignatureVerificationPortType">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="verifyCMSSignature">
- <soap:operation soapAction="urn:VerifyCMSSignatureAction"/>
- <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 use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </fault>
- </operation>
- <operation name="verifyXMLSignature">
- <soap:operation soapAction="urn:VerifyXMLSignatureAction"/>
- <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 use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
- </fault>
- </operation>
- </binding>
- <service name="SignatureCreationService">
- <port name="SignatureCreationPort" binding="tns:SignatureCreationBinding">
- <!--
- Please note that the location URL must be adapted to the actual service URL.
- -->
- <soap:address location="http://localhost/moa-spss/services/SignatureCreation"/>
- </port>
- </service>
- <service name="SignatureVerificationService">
- <port name="SignatureVerificationPort" binding="tns:SignatureVerificationBinding">
- <!--
- Please note that the location URL must be adapted to the actual service URL.
- -->
- <soap:address location="http://localhost/moa-spss/services/SignatureVerification"/>
- </port>
- </service>
-</definitions>
diff --git a/spss.server/res/resources/wsdl/MOA-SPSS-1.3.xsd b/spss.server/res/resources/wsdl/MOA-SPSS-1.3.xsd
deleted file mode 100644
index 9c40d8153..000000000
--- a/spss.server/res/resources/wsdl/MOA-SPSS-1.3.xsd
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- MOA SP/SS 1.3 Schema
--->
-<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <!--########## Create XML Signature ###-->
- <!--### Create XML Signature Request ###-->
- <xsd:element name="CreateXMLSignatureRequest">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="CreateXMLSignatureRequestType"/>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="CreateXMLSignatureRequestType">
- <xsd:sequence>
- <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>
- <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="DataObjectInfo" maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="DataObjectInfoType">
- <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="CreateSignatureInfo" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>
- <xsd:choice>
- <xsd:annotation>
- <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>
- </xsd:annotation>
- <xsd:element ref="CreateSignatureEnvironmentProfile"/>
- <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>
- </xsd:choice>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <!--### Create XML Signature Response ###-->
- <xsd:complexType name="CreateXMLSignatureResponseType">
- <xsd:choice maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>
- </xsd:annotation>
- <xsd:element name="SignatureEnvironment">
- <xsd:annotation>
- <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:any namespace="##any" processContents="lax"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element ref="ErrorResponse"/>
- </xsd:choice>
- </xsd:complexType>
- <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>
- <!--########## Verify CMS Signature ###-->
- <!--### Verifiy CMS Signature Request ###-->
- <xsd:element name="VerifyCMSSignatureRequest">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="VerifyCMSSignatureRequestType">
- <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="VerifyCMSSignatureRequestType">
- <xsd:sequence>
- <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
- <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
- <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
- <xsd:element name="TrustProfileID" type="xsd:token">
- <xsd:annotation>
- <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <!--### Verify CMS Signature Response ###-->
- <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>
- <xsd:complexType name="VerifyCMSSignatureResponseType">
- <xsd:sequence maxOccurs="unbounded">
- <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
- <xsd:annotation>
- <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="SignatureCheck" type="CheckResultType"/>
- <xsd:element name="CertificateCheck" type="CheckResultType"/>
- </xsd:sequence>
- </xsd:complexType>
- <!--########## Verify XML Signature ###-->
- <!--### Verify XML Signature Request ###-->
- <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>
- <xsd:complexType name="VerifyXMLSignatureRequestType">
- <xsd:sequence>
- <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
- <xsd:element name="VerifySignatureInfo">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>
- <xsd:element name="VerifySignatureLocation" type="xsd:token"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element ref="SupplementProfile"/>
- <xsd:element name="SupplementProfileID" type="xsd:string"/>
- </xsd:choice>
- <xsd:element name="SignatureManifestCheckParams" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="ReturnHashInputData" minOccurs="0"/>
- <xsd:element name="TrustProfileID" type="xsd:token">
- <xsd:annotation>
- <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <!--### Verify XML Signature Response ###-->
- <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>
- <xsd:complexType name="VerifyXMLSignatureResponseType">
- <xsd:sequence>
- <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
- <xsd:annotation>
- <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="HashInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ReferenceInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
- <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
- <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="CertificateCheck" type="CheckResultType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="ProfileIdentifierType">
- <xsd:restriction base="xsd:token"/>
- </xsd:simpleType>
- <xsd:complexType name="InputDataType">
- <xsd:complexContent>
- <xsd:extension base="ContentExLocRefBaseType">
- <xsd:attribute name="PartOf" use="optional" default="SignedInfo">
- <xsd:simpleType>
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="SignedInfo"/>
- <xsd:enumeration value="XMLDSIGManifest"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="ReferringSigReference" type="xsd:nonNegativeInteger" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="MetaInfoType">
- <xsd:sequence>
- <xsd:element name="MimeType" type="MimeTypeType"/>
- <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>
- <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="FinalDataMetaInfoType">
- <xsd:complexContent>
- <xsd:extension base="MetaInfoType">
- <xsd:sequence>
- <xsd:element name="Type" type="xsd:anyURI" minOccurs="0"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="DataObjectInfoType">
- <xsd:sequence>
- <xsd:element name="DataObject">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="ContentOptionalRefType"/>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:choice>
- <xsd:annotation>
- <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>
- </xsd:annotation>
- <xsd:element ref="CreateTransformsInfoProfile"/>
- <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="Structure" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="detached"/>
- <xsd:enumeration value="enveloping"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:complexType name="TransformsInfoType">
- <xsd:sequence>
- <xsd:element ref="dsig:Transforms" minOccurs="0"/>
- <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="XMLDataObjectAssociationType">
- <xsd:sequence>
- <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
- <xsd:element name="Content" type="ContentRequiredRefType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CMSDataObjectOptionalMetaType">
- <xsd:sequence>
- <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
- <xsd:element name="Content" type="CMSContentBaseType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CMSContentBaseType">
- <xsd:complexContent>
- <xsd:restriction base="ContentOptionalRefType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- </xsd:choice>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="CheckResultType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ReferencesCheckResultType">
- <xsd:complexContent>
- <xsd:restriction base="CheckResultType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">
- <xsd:complexContent mixed="true">
- <xsd:restriction base="AnyChildrenType">
- <xsd:sequence>
- <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ManifestRefsCheckResultType">
- <xsd:complexContent>
- <xsd:restriction base="CheckResultType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
- <xsd:complexContent mixed="true">
- <xsd:restriction base="AnyChildrenType">
- <xsd:sequence>
- <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <!--########## Error Response ###-->
- <xsd:element name="ErrorResponse" type="ErrorResponseType">
- <xsd:annotation>
- <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:complexType name="ErrorResponseType">
- <xsd:sequence>
- <xsd:element name="ErrorCode" type="xsd:integer"/>
- <xsd:element name="Info" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- <!--########## Auxiliary Types ###-->
- <xsd:simpleType name="KeyIdentifierType">
- <xsd:restriction base="xsd:string"/>
- </xsd:simpleType>
- <xsd:simpleType name="KeyStorageType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Software"/>
- <xsd:enumeration value="Hardware"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:simpleType name="MimeTypeType">
- <xsd:restriction base="xsd:token"/>
- </xsd:simpleType>
- <xsd:complexType name="AnyChildrenType" mixed="true">
- <xsd:sequence>
- <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="XMLContentType" mixed="true">
- <xsd:complexContent mixed="true">
- <xsd:extension base="AnyChildrenType">
- <xsd:attribute ref="xml:space" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ContentBaseType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="XMLContentType"/>
- <xsd:element name="LocRefContent" type="xsd:anyURI"/>
- </xsd:choice>
- </xsd:complexType>
- <xsd:complexType name="ContentExLocRefBaseType">
- <xsd:complexContent>
- <xsd:restriction base="ContentBaseType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="XMLContentType"/>
- </xsd:choice>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ContentOptionalRefType">
- <xsd:complexContent>
- <xsd:extension base="ContentBaseType">
- <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ContentRequiredRefType">
- <xsd:complexContent>
- <xsd:restriction base="ContentOptionalRefType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="XMLContentType"/>
- <xsd:element name="LocRefContent" type="xsd:anyURI"/>
- </xsd:choice>
- <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="VerifyTransformsDataType">
- <xsd:choice maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>
- </xsd:annotation>
- <xsd:element ref="VerifyTransformsInfoProfile"/>
- <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- <xsd:element name="QualifiedCertificate"/>
- <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
- <xsd:complexType name="PublicAuthorityType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="SignatoriesType">
- <xsd:union memberTypes="AllSignatoriesType">
- <xsd:simpleType>
- <xsd:list itemType="xsd:positiveInteger"/>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
- <xsd:simpleType name="AllSignatoriesType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="all"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="CreateSignatureLocationType">
- <xsd:simpleContent>
- <xsd:extension base="xsd:token">
- <xsd:attribute name="Index" type="xsd: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.server/res/test/resources/config/log4j.properties b/spss.server/res/test/resources/config/log4j.properties
deleted file mode 100644
index c37455300..000000000
--- a/spss.server/res/test/resources/config/log4j.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# commons-logging setup
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-
-# Configure root logger and loggers for moa-spss
-log4j.rootLogger=debug, stdout
-
-# 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} | %20c | %10t | %m%n
diff --git a/spss.server/res/test/resources/config/moa.sp.noopts-config.xml b/spss.server/res/test/resources/config/moa.sp.noopts-config.xml
deleted file mode 100644
index 43374c81e..000000000
--- a/spss.server/res/test/resources/config/moa.sp.noopts-config.xml
+++ /dev/null
@@ -1,32 +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#">
- <SignatureVerification>
- <CertificateValidation>
- <PathConstruction>
- <AutoAddCertificates>false</AutoAddCertificates>
- <UseAuthorityInformationAccess>false</UseAuthorityInformationAccess>
- <CertificateStore>
- <DirectoryStore>
- <Location>certstore</Location>
- </DirectoryStore>
- </CertificateStore>
- </PathConstruction>
- <PathValidation>
- <ChainingMode>
- <DefaultMode>pkix</DefaultMode>
- </ChainingMode>
- <TrustProfile>
- <Id>TP1_Id</Id>
- <TrustAnchorsLocation>trustprofiles/tp1/anchors</TrustAnchorsLocation>
- </TrustProfile>
- </PathValidation>
- <RevocationChecking>
- <EnableChecking>false</EnableChecking>
- <MaxRevocationAge>10000</MaxRevocationAge>
- <Archiving>
- <EnableArchiving>false</EnableArchiving>
- </Archiving>
- </RevocationChecking>
- </CertificateValidation>
- </SignatureVerification>
-</MOAConfiguration>
diff --git a/spss.server/res/test/resources/config/moa.spss.complete-config.xml b/spss.server/res/test/resources/config/moa.spss.complete-config.xml
deleted file mode 100644
index 199aaa98c..000000000
--- a/spss.server/res/test/resources/config/moa.spss.complete-config.xml
+++ /dev/null
@@ -1,185 +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#">
- <Common>
- <HardwareCryptoModule>
- <Name>HWC1_Name</Name>
- <SlotId>HWC1_SlotId</SlotId>
- <UserPIN>HWC1_UserPIN</UserPIN>
- </HardwareCryptoModule>
- <HardwareCryptoModule>
- <Name>HWC2_Name</Name>
- <UserPIN>HWC2_UserPIN</UserPIN>
- </HardwareCryptoModule>
- </Common>
- <SignatureCreation>
- <KeyModules>
- <HardwareKeyModule>
- <Id>HWK1_Id</Id>
- <Name>HWK1_Name</Name>
- <SlotId>HWK1_SlotId</SlotId>
- <UserPIN>HWK1_UserPIN</UserPIN>
- </HardwareKeyModule>
- <HardwareKeyModule>
- <Id>HWK2_Id</Id>
- <Name>HWK2_Name</Name>
- <UserPIN>HWK2_UserPIN</UserPIN>
- </HardwareKeyModule>
- <SoftwareKeyModule>
- <Id>SWK1_Id</Id>
- <FileName>swk/SWK1_FileName.txt</FileName>
- <Password>SWK1_Password</Password>
- </SoftwareKeyModule>
- <SoftwareKeyModule>
- <Id>SWK2_Id</Id>
- <FileName>swk/SWK2_FileName.txt</FileName>
- </SoftwareKeyModule>
- </KeyModules>
- <KeyGroup>
- <Id>KG1_Id</Id>
- <Key>
- <KeyModuleId>HWK1_Id</KeyModuleId>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=HWK1_Issuer</dsig:X509IssuerName>
- <dsig:X509SerialNumber>0</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- <Key>
- <KeyModuleId>HWK2_Id</KeyModuleId>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=HWK2_Issuer</dsig:X509IssuerName>
- <dsig:X509SerialNumber>1</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroup>
- <Id>KG2_Id</Id>
- <Key>
- <KeyModuleId>SWK1_Id</KeyModuleId>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=SKW1_Issuer</dsig:X509IssuerName>
- <dsig:X509SerialNumber>2</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- <Key>
- <KeyModuleId>SWK2_Id</KeyModuleId>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=SKW2_Issuer</dsig:X509IssuerName>
- <dsig:X509SerialNumber>3</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroupMapping>
- <CustomerId>
- <dsig:X509IssuerName>CN=Customer1_Issuer</dsig:X509IssuerName>
- <dsig:X509SerialNumber>4</dsig:X509SerialNumber>
- </CustomerId>
- <KeyGroupId>KG1_Id</KeyGroupId>
- <KeyGroupId>KG2_Id</KeyGroupId>
- </KeyGroupMapping>
- <KeyGroupMapping>
- <KeyGroupId>KG1_Id</KeyGroupId>
- <KeyGroupId>KG2_Id</KeyGroupId>
- </KeyGroupMapping>
- <XMLDSig>
- <CanonicalizationAlgorithm>http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments</CanonicalizationAlgorithm>
- <DigestMethodAlgorithm>http://www.w3.org/2000/09/xmldsig#sha1</DigestMethodAlgorithm>
- </XMLDSig>
- <CreateTransformsInfoProfile>
- <Id>CTIP_1</Id>
- <Location>profiles/ctip/CTIP_1.xml</Location>
- </CreateTransformsInfoProfile>
- <CreateTransformsInfoProfile>
- <Id>CTIP_2</Id>
- <Location>e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/profiles/ctip/CTIP_2.xml</Location>
- </CreateTransformsInfoProfile>
- <CreateSignatureEnvironmentProfile>
- <Id>CSEP_1</Id>
- <Location>profiles/csep/CSEP_1.xml</Location>
- </CreateSignatureEnvironmentProfile>
- </SignatureCreation>
- <SignatureVerification>
- <CertificateValidation>
- <PathConstruction>
- <AutoAddCertificates>false</AutoAddCertificates>
- <UseAuthorityInformationAccess>false</UseAuthorityInformationAccess>
- <CertificateStore>
- <DirectoryStore>
- <Location>certstore_test</Location>
- </DirectoryStore>
- </CertificateStore>
- </PathConstruction>
- <PathValidation>
- <ChainingMode>
- <DefaultMode>pkix</DefaultMode>
- <TrustAnchor>
- <Identification>
- <dsig:X509IssuerName>CN=TA1_Issuer</dsig:X509IssuerName>
- <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
- </Identification>
- <Mode>chaining</Mode>
- </TrustAnchor>
- <TrustAnchor>
- <Identification>
- <dsig:X509IssuerName>CN=TA2_Issuer</dsig:X509IssuerName>
- <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
- </Identification>
- <Mode>pkix</Mode>
- </TrustAnchor>
- </ChainingMode>
- <TrustProfile>
- <Id>TP1_Id</Id>
- <TrustAnchorsLocation>trustprofiles/tp1/anchors</TrustAnchorsLocation>
- <SignerCertsLocation>trustprofiles/tp1/signercerts</SignerCertsLocation>
- </TrustProfile>
- <TrustProfile>
- <Id>TP2_Id</Id>
- <TrustAnchorsLocation>file:e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/trustprofiles/tp2/anchors</TrustAnchorsLocation>
- <SignerCertsLocation>file:e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/trustprofiles/tp2/signercerts</SignerCertsLocation>
- </TrustProfile>
- </PathValidation>
- <RevocationChecking>
- <EnableChecking>false</EnableChecking>
- <MaxRevocationAge>10000</MaxRevocationAge>
- <ServiceOrder>
- <Service>CRL</Service>
- <Service>OCSP</Service>
- </ServiceOrder>
- <Archiving>
- <EnableArchiving>false</EnableArchiving>
- <ArchiveDuration>730</ArchiveDuration>
- <Archive>
- <DatabaseArchive>
- <JDBCURL>jdbc://dummy</JDBCURL>
- <JDBCDriverClassName>fully.qualified.classname</JDBCDriverClassName>
- </DatabaseArchive>
- </Archive>
- </Archiving>
- <DistributionPoint>
- <CAIssuerDN>CN=DP1_Issuer</CAIssuerDN>
- <CRLDP>
- <Location>http://crl.myca.org</Location>
- </CRLDP>
- <CRLDP>
- <Location>http://crl.myotherca.org</Location>
- <ReasonCode>aACompromise</ReasonCode>
- <ReasonCode>affiliationChanged</ReasonCode>
- </CRLDP>
- </DistributionPoint>
- <DistributionPoint>
- <CAIssuerDN>CN=DP2_Issuer</CAIssuerDN>
- <OCSPDP>
- <Location>http://crl.yetanotherca.org</Location>
- </OCSPDP>
- </DistributionPoint>
- </RevocationChecking>
- </CertificateValidation>
- <VerifyTransformsInfoProfile>
- <Id>VTIP_1</Id>
- <Location>profiles/vtip/VTIP_1.xml</Location>
- </VerifyTransformsInfoProfile>
- <SupplementProfile>
- <Id>SP_1</Id>
- <Location>profiles/sp/SP_1.xml</Location>
- </SupplementProfile>
- </SignatureVerification>
-</MOAConfiguration>
diff --git a/spss.server/res/test/resources/config/moa.ss.noopts-config.xml b/spss.server/res/test/resources/config/moa.ss.noopts-config.xml
deleted file mode 100644
index 8ffe2b02b..000000000
--- a/spss.server/res/test/resources/config/moa.ss.noopts-config.xml
+++ /dev/null
@@ -1,31 +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#">
- <SignatureCreation>
- <KeyModules>
- <HardwareKeyModule>
- <Id>HWK1_Id</Id>
- <Name>HWK1_Name</Name>
- <SlotId>HWK1_SlotId</SlotId>
- <UserPIN>HWK1_UserPIN</UserPIN>
- </HardwareKeyModule>
- </KeyModules>
- <KeyGroup>
- <Id>KG1_Id</Id>
- <Key>
- <KeyModuleId>HWK1_Id</KeyModuleId>
- <KeyCertIssuerSerial>
- <dsig:X509IssuerName>CN=HWK1_Issuer</dsig:X509IssuerName>
- <dsig:X509SerialNumber>0</dsig:X509SerialNumber>
- </KeyCertIssuerSerial>
- </Key>
- </KeyGroup>
- <KeyGroupMapping>
- <CustomerId>
- <dsig:X509IssuerName>CN=Customer1_Issuer</dsig:X509IssuerName>
- <dsig:X509SerialNumber>4</dsig:X509SerialNumber>
- </CustomerId>
- <KeyGroupId>KG1_Id</KeyGroupId>
- </KeyGroupMapping>
- <XMLDSig></XMLDSig>
- </SignatureCreation>
-</MOAConfiguration>
diff --git a/spss.server/res/test/resources/config/profiles/csep/CSEP_1.xml b/spss.server/res/test/resources/config/profiles/csep/CSEP_1.xml
deleted file mode 100644
index c51d6beaf..000000000
--- a/spss.server/res/test/resources/config/profiles/csep/CSEP_1.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateSignatureEnvironmentProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <CreateSignatureLocation Index="0"/>
-</CreateSignatureEnvironmentProfile>
diff --git a/spss.server/res/test/resources/config/profiles/ctip/CTIP_1.xml b/spss.server/res/test/resources/config/profiles/ctip/CTIP_1.xml
deleted file mode 100644
index 4cc6d4f65..000000000
--- a/spss.server/res/test/resources/config/profiles/ctip/CTIP_1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
-</CreateTransformsInfoProfile>
diff --git a/spss.server/res/test/resources/config/profiles/ctip/CTIP_2.xml b/spss.server/res/test/resources/config/profiles/ctip/CTIP_2.xml
deleted file mode 100644
index 4cc6d4f65..000000000
--- a/spss.server/res/test/resources/config/profiles/ctip/CTIP_2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <CreateTransformsInfo>
- <FinalDataMetaInfo>
- <MimeType>text/plain</MimeType>
- </FinalDataMetaInfo>
- </CreateTransformsInfo>
-</CreateTransformsInfoProfile>
diff --git a/spss.server/res/test/resources/config/profiles/sp/SP_1.xml b/spss.server/res/test/resources/config/profiles/sp/SP_1.xml
deleted file mode 100644
index 7d69058d7..000000000
--- a/spss.server/res/test/resources/config/profiles/sp/SP_1.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SupplementProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
- <Content Reference="ref"/>
-</SupplementProfile>
diff --git a/spss.server/res/test/resources/config/profiles/vtip/VTIP_1.xml b/spss.server/res/test/resources/config/profiles/vtip/VTIP_1.xml
deleted file mode 100644
index f97c2a78a..000000000
--- a/spss.server/res/test/resources/config/profiles/vtip/VTIP_1.xml
+++ /dev/null
@@ -1,2 +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#"/>
diff --git a/spss.server/res/test/resources/config/swk/SWK1_FileName.txt b/spss.server/res/test/resources/config/swk/SWK1_FileName.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/spss.server/res/test/resources/config/swk/SWK1_FileName.txt
+++ /dev/null
diff --git a/spss.server/res/test/resources/config/swk/SWK2_FileName.txt b/spss.server/res/test/resources/config/swk/SWK2_FileName.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/spss.server/res/test/resources/config/swk/SWK2_FileName.txt
+++ /dev/null
diff --git a/spss.server/server-config.wsdd b/spss.server/server-config.wsdd
deleted file mode 100644
index fee506cb2..000000000
--- a/spss.server/server-config.wsdd
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Axis Deployment Descriptor for MOA SP/SS 1.2
--->
-<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"/>
- <handler name="MOAHandler" type="java:at.gv.egovernment.moa.spss.server.service.AxisHandler"/>
-
- <service name="SignatureCreation" provider="java:MSG">
- <namespace>http://reference.e-government.gv.at/namespace/moa/20020822#</namespace>
- <parameter name="allowedMethods" value="CreateXMLSignatureRequest"/>
- <parameter name="className" value="at.gv.egovernment.moa.spss.server.service.SignatureCreationService"/>
- <!-- enable this for deployment with Axis 1.1
- <wsdlFile>/resources/wsdl/MOA-SPSS-1.2.wsdl</wsdlFile>
- -->
- <requestFlow>
- <handler type="MOAHandler"/>
- </requestFlow>
- <responseFlow>
- <handler type="MOAHandler"/>
- </responseFlow>
- </service>
-
- <service name="SignatureVerification" provider="java:MSG">
- <namespace>http://reference.e-government.gv.at/namespace/moa/20020822#</namespace>
- <parameter name="allowedMethods" value="VerifyCMSSignatureRequest VerifyXMLSignatureRequest"/>
- <parameter name="className" value="at.gv.egovernment.moa.spss.server.service.SignatureVerificationService"/>
- <!-- enable this for deployment with Axis 1.1
- <wsdlFile>/resources/wsdl/MOA-SPSS-1.2.wsdl</wsdlFile>
- -->
- <requestFlow>
- <handler type="MOAHandler"/>
- </requestFlow>
- <responseFlow>
- <handler type="MOAHandler"/>
- </responseFlow>
- </service>
-
- <transport name="http">
- <requestFlow>
- <handler type="URLMapper"/>
- <handler type="HTTPAuthHandler"/>
- </requestFlow>
- </transport>
-
-</deployment>
diff --git a/spss.server/spec/MOA-SPSS-1.3.doc b/spss.server/spec/MOA-SPSS-1.3.doc
deleted file mode 100644
index fabc4248e..000000000
--- a/spss.server/spec/MOA-SPSS-1.3.doc
+++ /dev/null
Binary files differ
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/MOAApplicationException.java b/spss.server/src/at/gv/egovernment/moa/spss/MOAApplicationException.java
deleted file mode 100644
index 0d7abd1d3..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/MOAApplicationException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package at.gv.egovernment.moa.spss;
-/**
- * Base class of application specific MOA exceptions.
- *
- * Application exceptions are exceptions that originate from application
- * code (e.g. inconsistent data provided by the user, no permission to access
- * certain resources, etc.)
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class MOAApplicationException extends MOAException {
-
- /**
- * Create a new <code>MOAApplicationException</code>.
- *
- * @param messageId The identifier of the message associated with this
- * exception.
- * @param parameters Additional message parameters.
- */
- public MOAApplicationException(String messageId, Object[] parameters) {
- super(messageId, parameters);
- }
-
- /**
- * Create a new <code>MOAApplicationException</code>.
- *
- * @param messageId The identifier of the message associated with this
- * <code>MOAApplicationException</code>.
- * @param parameters Additional message parameters.
- * @param wrapped The exception wrapped by this
- * <code>MOAApplicationException</code>.
- */
- public MOAApplicationException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
- super(messageId, parameters, wrapped);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/MOAException.java b/spss.server/src/at/gv/egovernment/moa/spss/MOAException.java
deleted file mode 100644
index a102d256b..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/MOAException.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package at.gv.egovernment.moa.spss;
-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.util.Constants;
-
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * Base class of MOA specific exceptions.
- *
- * This class has the ability to wrap other exceptions which may be seen
- * as the root cause for this exception. A similar mechanism is in place
- * since JDK1.4 (see the <code>getClause()</code> method) but will not be used
- * because of required compatibility with JDK1.3.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class MOAException extends Exception {
- /** The message ID. */
- private String messageId;
- /** The wrapped <code>Throwable</code>. */
- private Throwable wrapped;
-
- /**
- * Create a <code>MOAException</code>.
- *
- * @param messageId The message ID of the message contained in the created
- * <code>MOAException</code>.
- * @param parameters The parameters needed to fill in the message arguments.
- */
- public MOAException(String messageId, Object[] parameters) {
- super(MessageProvider.getInstance().getMessage(messageId, parameters));
- this.messageId = messageId;
- }
-
- /**
- * Create a <code>MOAException</code>.
- *
- * @param messageId The message ID of the message contained in the created
- * <code>MOAException</code>.
- * @param parameters The parameters needed to fill in the message arguments.
- * @param wrapped The exception wrapped by the created
- * <code>MOAException</code>.
- */
- public MOAException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
-
- super(MessageProvider.getInstance().getMessage(messageId, parameters));
- this.messageId = messageId;
- this.wrapped = wrapped;
- }
-
- /**
- * Returns the message ID of this exception.
- *
- * @return The message ID as provided in the constructor.
- */
- public String getMessageId() {
- return messageId;
- }
-
- /**
- * Returns the exception wrapped by this <code>MOAException</code>.
- *
- * @return The exception wrapped by this exception. Possibly
- * <code>null</code>, if none was provided at construction time.
- */
- public Throwable getWrapped() {
- return wrapped;
- }
-
- /**
- * Convert this <code>MOAException</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(getMessage()));
- errorResponse.appendChild(errorCode);
- errorResponse.appendChild(info);
- return errorResponse;
- }
-
- /**
- * 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) {
- super.printStackTrace(s);
- if (getWrapped() != null) {
- s.print("Caused by: ");
- 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) {
- super.printStackTrace(s);
- if (getWrapped() != null) {
- s.print("Caused by: ");
- getWrapped().printStackTrace(s);
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/MOARuntimeException.java b/spss.server/src/at/gv/egovernment/moa/spss/MOARuntimeException.java
deleted file mode 100644
index 0ff175b50..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/MOARuntimeException.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package at.gv.egovernment.moa.spss;
-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.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Base class of MOA specific runtime exceptions.
- *
- * This class has the ability to wrap other exceptions which may be seen
- * as the root cause for this exception. A similar mechanism is in place
- * since JDK1.4 (see the <code>getClause()</code> method) but will not be used
- * because of required compatibility with JDK1.3.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class MOARuntimeException extends RuntimeException {
- /** The message ID. */
- private String messageId;
- /** The wrapped <code>Throwable</code>. */
- private Throwable wrapped;
-
- /**
- * Create a <code>MOAException</code>.
- *
- * @param messageId The message ID of the message contained in the created
- * <code>MOAException</code>.
- * @param parameters The parameters needed to fill in the message arguments.
- */
- public MOARuntimeException(String messageId, Object[] parameters) {
- super(MessageProvider.getInstance().getMessage(messageId, parameters));
- this.messageId = messageId;
- }
-
- /**
- * Create a <code>MOAException</code>.
- *
- * @param messageId The message ID of the message contained in the created
- * <code>MOAException</code>.
- * @param parameters The parameters needed to fill in the message arguments.
- * @param wrapped The exception wrapped by the created
- * <code>MOAException</code>.
- */
- public MOARuntimeException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
-
- super(MessageProvider.getInstance().getMessage(messageId, parameters));
- this.messageId = messageId;
- this.wrapped = wrapped;
- }
-
- /**
- * Returns the message ID of this exception.
- *
- * @return The message ID as provided in the constructor.
- */
- public String getMessageId() {
- return messageId;
- }
-
- /**
- * Returns the exception wrapped by this <code>MOARuntimeException</code>.
- *
- * @return The exception wrapped by this exception. Possibly
- * <code>null</code>, if none was provided at construction time.
- */
- public Throwable getWrapped() {
- return wrapped;
- }
-
- /**
- * Convert this <code>MOARuntimeException</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(getMessage()));
- errorResponse.appendChild(errorCode);
- errorResponse.appendChild(info);
- return errorResponse;
- }
-
- /**
- * 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) {
- super.printStackTrace(s);
- if (getWrapped() != null) {
- s.print("Caused by: ");
- 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) {
- super.printStackTrace(s);
- if (getWrapped() != null) {
- s.print("Caused by: ");
- getWrapped().printStackTrace(s);
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/MOASystemException.java b/spss.server/src/at/gv/egovernment/moa/spss/MOASystemException.java
deleted file mode 100644
index 5a49b6852..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/MOASystemException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package at.gv.egovernment.moa.spss;
-/**
- * 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
- * @version $Id$
- */
-public class MOASystemException extends MOAException {
-
- /**
- * Create a new <code>MOASystemException</code>.
- *
- * @param messageId The identifier of the message associated with this
- * exception.
- * @param parameters Additional message parameters.
- */
- public MOASystemException(String messageId, Object[] parameters) {
- super(messageId, parameters);
- }
-
- /**
- * Create a new <code>MOASystemException</code>.
- *
- * @param messageId The identifier of the message associated with this
- * <code>MOASystemException</code>.
- * @param parameters Additional message parameters.
- * @param wrapped The exception wrapped by this
- * <code>MOASystemException</code>.
- */
- public MOASystemException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
- super(messageId, parameters, wrapped);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/Configurator.java b/spss.server/src/at/gv/egovernment/moa/spss/api/Configurator.java
deleted file mode 100644
index a0efa8924..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/Configurator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.gv.egovernment.moa.spss.api;
-
-import org.apache.commons.discovery.tools.DiscoverClass;
-
-import at.gv.egovernment.moa.spss.MOAException;
-
-/**
- * Configures the SP/SS API.
- *
- * Also handles dynamic configuration updates.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class Configurator {
-
- /** The default implementation class. */
- private static final String DEFAULT_IMPLEMENTATION =
- "at.gv.egovernment.moa.spss.server.init.ConfiguratorImpl";
-
- /** The single instance of this class. */
- private static Configurator instance = null;
-
- public static synchronized Configurator getInstance() {
- if (instance == null) {
- try {
- DiscoverClass discover = new DiscoverClass();
- instance =
- (Configurator) discover.newInstance(
- Configurator.class,
- DEFAULT_IMPLEMENTATION);
- } catch (Exception e) {
- // this can not happen since we provide a valid default
- // implementation
- }
- }
- return instance;
- }
-
- /**
- * Initialize the SP/SS configuration.
- *
- * Only a single call to this method will have an effect. Use
- * <code>update()</code> for reflecting changes in the configuration instead.
- *
- * @throws MOAException An error occurred updating the SP/SS configuration.
- */
- public abstract void init() throws MOAException;
-
- /**
- * Update the SP/SS configuration.
- *
- * This will only have an effect after the system has been initialized once
- * using <code>init()</code>.
- *
- * @throws MOAException An error occurred updating the SP/SS configuration.
- */
- public abstract void update() throws MOAException;
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java
deleted file mode 100644
index e306127b3..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java
+++ /dev/null
@@ -1,1012 +0,0 @@
-package at.gv.egovernment.moa.spss.api;
-
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import org.apache.commons.discovery.tools.DiscoverClass;
-
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-import at.gv.egovernment.moa.spss.api.common.Transform;
-import at.gv.egovernment.moa.spss.api.common.X509IssuerSerial;
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-import at.gv.egovernment.moa.spss.api.common.XPathFilter;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResultInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResultInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.SignatureManifestCheckParams;
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile;
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
-/**
- * An abstract factory for creating MOA SP/SS API objects.
- *
- * Use <code>getInstance()</code> to get a concrete factory instance. Using
- * this instance, concrete MOA SP/SS API object can be created.
- *
- * @author Patrick Peck
- * @author Gregor Karlinger
- * @version $Id$
- */
-public abstract class SPSSFactory {
-
- /** The default implementation of this class. */
- private static final String DEFAULT_IMPLEMENTATION =
- "at.gv.egovernment.moa.spss.api.impl.SPSSFactoryImpl";
-
- /** The single instance of this class. */
- private static SPSSFactory instance = null;
-
- /**
- * Returns the single instance of this class.
- *
- * @return The single instance of this class.
- */
- public static synchronized SPSSFactory getInstance() {
- if (instance == null) {
- try {
- DiscoverClass discover = new DiscoverClass();
- instance =
- (SPSSFactory) discover.newInstance(
- SPSSFactory.class,
- DEFAULT_IMPLEMENTATION);
- } catch (Exception e) {
- // this can not happen since we provide a valid default
- // implementation
- }
- }
- return instance;
- }
-
- //
- // Factory methods for creating XML signatures
- //
-
- /**
- * Create a new <code>CreateXMLSignatureRequest</code> object.
- *
- * @param keyIdentifier The identifier for the key group to use for signing.
- * @param singleSignatureInfos A <code>List</code> of
- * <code>SingleSignatureInfo</code> objects containing information about a
- * single signature to be created.
- * @return The <code>CreateXMLSignatureRequest</code> containing the above
- * data.
- *
- * @pre keyIdentifier != null && keyIdentifier.length() > 0
- * @pre singleSignatureInfos != null
- * @pre forall Object o in singleSignatureInfos |
- * o instanceof at.gv.egovernment.moa.spss.api.common.SingleSignatureInfo
- * @post return != null
- */
- public abstract CreateXMLSignatureRequest createCreateXMLSignatureRequest(
- String keyIdentifier,
- List singleSignatureInfos);
-
- /**
- * Create a new <code>SingleSignatureInfo</code> object.
- *
- * @param dataObjectInfos The data objects that will be signed (including
- * transformations).
- * @param createSignatureInfo Information about the signature environment. May
- * be <code>null</code>.
- * @param securityLayerConform If <code>true</code>, a Security Layer conform
- * signature manifest is created, otherwise not.
- * @return The <code>SingleSignatureInfo</code> containing the above data.
- *
- * @pre dataObjectInfos != null && dataObjectInfos.size() > 0
- * @pre forall Object o in dataObjectInfos |
- * o instanceof at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo
- * @post return != null
- */
- public abstract SingleSignatureInfo createSingleSignatureInfo(
- List dataObjectInfos,
- CreateSignatureInfo createSignatureInfo, boolean securityLayerConform);
-
- /**
- * Create a new <code>DataObjectInfo</code> object.
- *
- * @param structure The type of signature to create.
- * @param childOfManifest If <code>true</code>, references will be returned
- * as children of an XMLDsig manifest. Otherwise, they will be returned as
- * children of the signature itself.
- * @param dataObject The data object that will be signed.
- * @param createTransformsInfoProfile Additional transformations to apply
- * to the data object.
- * @return The <code>DataObjectInfo</code> containing the above data.
- *
- * @pre DataObjectInfo.STRUCTURE_DETACHED.equals(structure) ||
- * DataObjectInfo.STRUCTURE_ENVELOPING.equals(structure)
- * @pre dataObject != null
- * @pre createTransformsInfoProfile != null
- * @post return != null
- */
- public abstract DataObjectInfo createDataObjectInfo(
- String structure,
- boolean childOfManifest,
- Content dataObject,
- CreateTransformsInfoProfile createTransformsInfoProfile);
-
- /**
- * Create a new <code>CreateTransformsInfoProfile</code> object containing a
- * reference to a locally stored profile.
- *
- * @param profileID The profile ID to resolve during signature creation.
- * @return The <code>CreateTransformsInfoProfile</code> containing the given
- * profile ID.
- *
- * @pre profileID != null && profileID.length() > 0
- * @post return != null
- */
- public abstract CreateTransformsInfoProfile createCreateTransformsInfoProfile(String profileID);
-
- /**
- * Create a new <code>CreateTransformsInfoProfile</code> object by providing
- * the profile data explicitly.
- *
- * @param transformsInfo The transformations to apply to the associated
- * data object.
- * @param supplements Supplemental information for the transformation. May be
- * <code>null</code>.
- * @return The <code>CreateTransformsInfoProfile</code> containing the above
- * data.
- *
- * @pre transformsInfo != null
- * @pre supplements != null implies
- * forall Object o in supplements |
- * o instanceof at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation
- * @post return != null
- */
- public abstract CreateTransformsInfoProfile createCreateTransformsInfoProfile(
- CreateTransformsInfo transformsInfo,
- List supplements);
-
- /**
- * Create a new <code>CreateTransformsInfo</code> object.
- *
- * @param transforms The <code>Transform</code>s to apply to the associated
- * data object. May be <code>null</code>.
- * @param finalDataMetaInfo Information about the type of the transformed
- * data.
- * @return The <code>CreateTransformsInfo</code> containing the above data.
- *
- * @pre transforms != null implies transforms.size > 0
- * @pre transforms != null implies
- * forall Object o in transforms |
- * o instanceof at.gv.egovernment.moa.spss.api.common.Transform
- * @pre finalDataMetaInfo != null
- * @post return != null
- */
- public abstract CreateTransformsInfo createCreateTransformsInfo(
- List transforms,
- MetaInfo finalDataMetaInfo);
-
- /**
- * Create a new <code>CreateSignatureInfo</code> object.
- *
- * @param createSignatureEnvironment The signature environment that will
- * contain the signature.
- * @param createSignatureEnvironmentProfile Additional information about
- * the signture environment.
- * @return The <code>CreateSignatureInfo</code> containing the above data.
- *
- * @pre createSignatureEnvironment != null
- * @pre createSignatureEnvironmentProfile != null
- * @post return != null
- */
- public abstract CreateSignatureInfo createCreateSignatureInfo(
- Content createSignatureEnvironment,
- CreateSignatureEnvironmentProfile createSignatureEnvironmentProfile);
-
- /**
- * Create a new <code>CreateSignatureEnvironmentProfile</code> object
- * containing a reference to a locally stored profile.
- *
- * @param profileID The profile ID to resolve during signature creation.
- * @return The <code>CreateSignatureEnvironmentProfile</code> containing
- * the given profile ID.
- *
- * @pre profileID != null && profileID.length() > 0
- * @post return != null
- */
- public abstract CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile(String profileID);
-
- /**
- * Create a new <code>CreateSignatureEnvironmentProfile</code> object by
- * providing the profile data explicitly.
- *
- * @param createSignatureLocation The location where the signature will be
- * inserted.
- * @param supplements Additional information about the signature environment.
- * @return The <code>CreateSignatureEnvironmentProfile</code> containing the
- * above data.
- *
- * @pre createSignatureLocation != null
- * @pre supplements != null
- * @pre forall Object o in supplements |
- * o instanceof at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation
- * @post return != null
- */
- public abstract CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile(
- CreateSignatureLocation createSignatureLocation,
- List supplements);
-
- /**
- * Create a new <code>CreateSignatureLocation</code> object.
- *
- * @param xPathExpression The XPath expression to select the signature
- * parent element within the signature environment.
- * @param index The index of the node, after which the signature will be
- * inserted.
- * @param namespaceDeclarations The namespace prefix to URI mapping to apply
- * while evaluating the XPath expression.
- * @return The <code>CreateSignatureLocation</code> containing the above data.
- *
- * @pre xPathExpression != null
- * @pre index >= 0
- * @pre namespaceDeclarations != null
- */
- public abstract CreateSignatureLocation createCreateSignatureLocation(
- String xPathExpression,
- int index,
- Map namespaceDeclarations);
-
- /**
- * Create a new <code>CreateXMLSignatureResponse</code> object.
- *
- * @param responseElements The elements of the response, either
- * <code>SignatureEnvironmentResponse</code> objects, or
- * <code>ErrorResponse</code> objects.
- * @return The new <code>CreateXMLSignatureResponse</code> containing the
- * above data.
- *
- * @pre responseElements != null && responseElements.size() > 0
- * @pre forall Object o in responseElements |
- * o instanceof at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureResponseElement
- * @post return != null
- */
- public abstract CreateXMLSignatureResponse createCreateXMLSignatureResponse(List responseElements);
-
- /**
- * Create a new <code>SignatureEnvironmentResponse</code> object.
- *
- * @param signatureEnvironment The signature environment containing the
- * signature.
- * @return The <code>SignatureEnvironmentResponse</code> containing the
- * <code>signatureEnvironment</code>.
- *
- * @pre signatureEnvironment != null
- * @post return != null
- */
- public abstract SignatureEnvironmentResponse createSignatureEnvironmentResponse(Element signatureEnvironment);
-
- /**
- * Create a new <code>ErrorResponse</code> object.
- *
- * @param code The numerical error code.
- * @param info Verbose error information.
- * @return The new <code>ErrorResponse</code> containing the above data.
- *
- * @pre code > 0
- * @pre info != null
- * @post return != null
- */
- public abstract ErrorResponse createErrorResponse(int code, String info);
-
- //
- // Factory methods for verifying CMS signatures
- //
-
- /**
- * Create a new <code>VerifyCMSSignatureRequest</code> object.
- *
- * @param signatories The indexes of the signatories whose signature is to
- * be verified.
- * @param dateTime The date for which the verification is to be performed.
- * May be <code>null</code>.
- * @param cmsSignature The CMS signature.
- * @param dataObject The signed data. May be <code>null</code>.
- * @param trustProfileID The ID of the trust profile containing the trusted
- * root certificates.
- * @return The <code>VerifyCMSSignatureRequest</code> containing the above
- * data.
- *
- * @pre signatories != null && signatories.length > 0
- * @pre signaturies != VerifyCMSSignatureRequest.ALL_SIGNATORIES implies
- * for (int i = 0; i < signatories.length; i++)
- * signatories[i] >= 1
- * @pre cmsSignature != null
- * @pre trustProfileID != null && trustProfileID.length() > 0
- * @post return != null
- */
- public abstract VerifyCMSSignatureRequest createVerifyCMSSignatureRequest(
- int[] signatories,
- Date dateTime,
- InputStream cmsSignature,
- CMSDataObject dataObject,
- String trustProfileID);
-
- /**
- * Create a new <code>CMSDataObject</code> object from data at a given URI.
- *
- * @param metaInfo Type information about the <code>CMSDataObject</code>.
- * May be <code>null</code>.
- * @param content The CMS content containing the data.
- * @return The new <code>CMSDataObject</code> containing the data.
- *
- * @pre referenceURI != null
- * @pre content != null
- * @post return != null
- */
- public abstract CMSDataObject createCMSDataObject(
- MetaInfo metaInfo,
- CMSContent content);
-
- /**
- * Create a new <code>CMSContent</code> object from the data contained at the
- * given URI.
- *
- * @param referenceURI The URI identifying the data. Must be resolvable.
- * @return The <code>CMSContent</code> containing a reference to the signed
- * data.
- *
- * @pre referenceURI != null
- * @post return != null
- */
- public abstract CMSContent createCMSContent(String referenceURI);
-
- /**
- * Create a new <code>CMSContent</code> object from a byte stream.
- *
- * @param binaryContent The byte stream containing the signed data.
- * @return The new <code>CMSContent</code> containing the data from the
- * byte stream.
- *
- * @pre binaryContent != null
- * @post return != null
- */
- public abstract CMSContent createCMSContent(InputStream binaryContent);
-
- /**
- * Create a new <code>VerifyCMSSignatureResponse</code> object.
- *
- * @param responseElements Verification information about each signature.
- * @return The new <code>VerifyCMSSignatureResponse</code> containing the
- * status of signature verification for each signature contained in the
- * request.
- *
- * @pre responseElements != null && responseElements.size() > 0
- * @pre forall Object o in responseElements |
- * o instanceof at.gv.egovernment.moa.spss.api.cmssign.VerifyCMSSignatureResponseElement
- * @post return != null
- */
- public abstract VerifyCMSSignatureResponse createVerifyCMSSignatureResponse(List responseElements);
-
- /**
- * Create a new <code>VerifyCMSSignatureResponseElement</code> object.
- *
- * @param signerInfo Information about the signer certificate.
- * @param signatureCheck Result of the singature value check.
- * @param certificateCheck Result of the certificate status check.
- * @return The new <code>VerifyCMSSignatureResponseElement</code> containing
- * the above data.
- *
- * @pre signerInfo != null && signatureCheck != null &&
- * certificateCheck != null
- * @post return != null
- */
- public abstract VerifyCMSSignatureResponseElement createVerifyCMSSignatureResponseElement(
- SignerInfo signerInfo,
- CheckResult signatureCheck,
- CheckResult certificateCheck);
-
- //
- // Factory methods for verifying XML signatures
- //
-
- /**
- * Create a new <code>VerifyXMLSignatureRequest</code> object.
- *
- * @param dateTime The date for which the verification is to be performed.
- * May be <code>null</code>.
- * @param verifySignatureInfo Information about the signature environment and
- * the location of the signature.
- * @param supplementProfiles Supplemental information for the signature
- * environment. May be <code>null</code>.
- * @param signatureManifestParams Additional information for checking the
- * signature manifest. May be <code>null</code>.
- * @param returnHashInputData If <code>true</code>, hash input data will
- * be returned in the response, otherwise not.
- * @param trustProfileID The ID of the trust profile containing the trusted
- * root certificates.
- * @return The new <code>VerifyXMLSignatureRequest</code> containing the
- * above data.
- *
- * @pre verifySignatureInfo != null
- * @pre supplementProfiles != null implies
- * forall Object o in supplementProfiles |
- * o instanceof at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile
- * @pre trustProfileID != null && trustProfileID.length() > 0
- * @post return != null
- */
- public abstract VerifyXMLSignatureRequest createVerifyXMLSignatureRequest(
- Date dateTime,
- VerifySignatureInfo verifySignatureInfo,
- List supplementProfiles,
- SignatureManifestCheckParams signatureManifestParams,
- boolean returnHashInputData,
- String trustProfileID);
-
- /**
- * Create a new <code>VerifySignatureInfo</code> object.
- *
- * @param verifySignatureEnvironment The signature environment containing
- * the signature to be verified.
- * @param verifySignatureLocation The location of the signature within the
- * signature environment.
- * @return The new <code>VerifySignatureInfo</code> containing the above data.
- *
- * @pre verifySignatureEnvironment != null
- * @pre verifySignatureLocation != null
- * @post return != null
- */
- public abstract VerifySignatureInfo createVerifySignatureInfo(
- Content verifySignatureEnvironment,
- VerifySignatureLocation verifySignatureLocation);
-
- /**
- * Create a new <code>VerifySignatureLocation</code> object.
- *
- * @param xPathExpression The XPath expression to select the signature
- * element within the signature environment.
- * @param namespaceDeclarations The namespace prefix to URI mapping to apply
- * while evaluating the XPath expression.
- * @return The new <code>VerifySignatureLocation</code> containing the above
- * data.
- *
- * @pre xPathExpression != null
- * @pre namespaceDeclarations != null
- * @post return != null
- */
- public abstract VerifySignatureLocation createVerifySignatureLocation(
- String xPathExpression,
- Map namespaceDeclarations);
-
- /**
- * Create a new <code>SupplementProfile</code> object containing a reference
- * to a locally stored profile.
- *
- * @param profileID The profile ID to resolve during signature verification.
- * @return The <code>SupplementProfile</code> containing the profile ID.
- *
- * @pre profileID != null && profileID.length() > 0
- * @post return != null
- */
- public abstract SupplementProfile createSupplementProfile(String profileID);
-
- /**
- * Create a new <code>SupplementProfile</code> object by providing the profile
- * data explicitly.
- *
- * @param supplementProfile The profile data.
- * @return The <code>SupplementProfile</code> containing the profile data.
- */
- public abstract SupplementProfile createSupplementProfile(XMLDataObjectAssociation supplementProfile);
-
- /**
- * Create a new <code>SignatureManifestCheckParams</code> object.
- *
- * @param referenceInfos Information for checking the validity of a
- * a reference.
- * @param returnReferenceInputData If <code>true</code>, the input data to
- * the calculation of reference digest values will be returned in the
- * response, otherwise not.
- * @return The <code>SignatureManifestCheckParams</code> containing the
- * above data.
- *
- * @pre referenceInfos != null && referenceInfos.size() > 0
- * @pre forall Object o in referenceInfos |
- * o instanceof at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo
- * @post return != null
- */
- public abstract SignatureManifestCheckParams createSignatureManifestCheckParams(
- List referenceInfos,
- boolean returnReferenceInputData);
-
- /**
- * Create a new <code>ReferenceInfo</code> object.
- *
- * @param verifyTransformsInfoProfiles The transformation profiles valid for
- * the associated reference.
- * @return The <code>ReferenceInfo</code> containing the transformation
- * profiles.
- *
- * @pre verifyTransformsInfoProfiles != null &&
- * verifyTransformsInfoProfiles.size() > 0
- * @pre forall Object o in verifyTransformsInfoProfiles |
- * o instanceof at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfile
- * @post return != null
- */
- public abstract ReferenceInfo createReferenceInfo(List verifyTransformsInfoProfiles);
-
- /**
- * Create a new <code>VerifyTransformsInfoProfile</code> object containing
- * a reference to a locally stored profile.
- *
- * @param profileID The profile ID to resolve during signature verification.
- * @return The <code>VerifyTransformsInfoProfile</code> containing the
- * given profile ID.
- *
- * @pre profileID != null && profileID.length() > 0
- * @post return != null
- */
- public abstract VerifyTransformsInfoProfile createVerifyTransformsInfoProfile(String profileID);
-
- /**
- * Create a new <code>VerifyTransformsInfoProfile</code> object by providing
- * the profile data explicitly.
- *
- * @param transforms A valid chain of transformations for the reference.
- * May be <code>null</code>.
- * @param transformParameters Additional transformation information.
- * @return The <code>VerifyTransformsInfoProfile</code> containing the above
- * data.
- *
- * @pre transforms != null implies
- * (transforms.size() > 0 &&
- * forall Object o in transforms | o instanceof Transform)
- * @pre transformParameters != null implies
- * forall Object o in transformParameters |
- * o instanceof at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter
- * @post return != null
- */
- public abstract VerifyTransformsInfoProfile createVerifyTransformsInfoProfile(
- List transforms,
- List transformParameters);
-
- /**
- * Create a new <code>TransformParameter</code> object with the data
- * contained at the given URI.
- *
- * @param URI The URI identifying the data. The URI will be resolved during
- * signature verification.
- * @return The <code>TransformParameter</code> containing the URI of the
- * data.
- *
- * @pre URI != null
- * @post return != null
- */
- public abstract TransformParameter createTransformParameter(String URI);
-
- /**
- * Creata a new <code>TransformParameter</code> object containing the
- * binary data.
- *
- * @param URI The URI identifying the data.
- * @param binaryData The binary data.
- * @return The <code>TransformParameter</code> containig the binary data.
- *
- * @pre URI != null
- * @pre binary != null
- * @post return != null
- */
- public abstract TransformParameter createTransformParameter(
- String URI,
- InputStream binaryData);
-
- /**
- * Create a new <code>TransformParameter</code> object containing the hash
- * value of the transformation data.
- *
- * @param URI The URI identifying the data. It will be resolved during
- * signature verification.
- * @param digestMethod The digest method used for calculating the digest
- * value.
- * @param digestValue The hash value of the transformation data.
- * @return The <code>TransformParameter</code> containing the above data.
- *
- * @pre URI != null
- * @pre digestMethod != null
- * @pre digestValue != null
- */
- public abstract TransformParameter createTransformParameter(
- String URI,
- String digestMethod,
- byte[] digestValue);
-
- /**
- * Create a new <code>VerifyXMLSignatureResponse</code> object.
- *
- * @param signerInfo Information about the signer certificate.
- * @param hashInputDatas The signed data objects. May be <code>null</code>.
- * @param referenceInputDatas The reference input data objects.
- * May be <code>null</code>.
- * @param signatureCheck Status information about the signature check.
- * @param signatureManifestCheck Status information about the signature
- * manifest check.
- * @param xmlDsigManifestChecks Status information about each XMLDsig manifest
- * check.
- * @param certificateCheck Status information about the signer certificate
- * check.
- * @return The <code>VerifyXMLSignatureResponse</code> containing the above
- * data.
- *
- * @pre signerInfo != null
- * @pre hashInputDatas != null implies
- * forall Object o in hashInputDatas |
- * o instanceof at.gv.egovernment.moa.spss.api.common.Content
- * @pre referenceInputDatas != null implies
- * forall Object o in referenceInputDatas |
- * o instanceof at.gv.egovernment.moa.spss.api.common.Content
- * @pre signatureCheck != null
- * @pre xmlDsigManifestChecks != null implies
- * forall Object o in xmlDsigManifestChecks |
- * o instanceof at.gv.egovernment.moa.spss.api.xmlverifyManifestRefsCheckResult
- * @pre certificateCheck != null
- * @post return != null
- */
- public abstract VerifyXMLSignatureResponse createVerifyXMLSignatureResponse(
- SignerInfo signerInfo,
- List hashInputDatas,
- List referenceInputDatas,
- ReferencesCheckResult signatureCheck,
- ReferencesCheckResult signatureManifestCheck,
- List xmlDsigManifestChecks,
- CheckResult certificateCheck);
-
- /**
- * Create a new <code>ReferencesCheckResult</code> object.
- *
- * @param code The status code.
- * @param info Additional information about the reference check.
- * @return The <code>ReferencesCheckResult</code> containing the above data.
- *
- * @pre code >= 0
- * @post return != null
- */
- public abstract ReferencesCheckResult createReferencesCheckResult(
- int code,
- ReferencesCheckResultInfo info);
-
- /**
- * Create a new <code>ReferencesCheckResultInfo</code> object.
- *
- * @param anyOtherInfo Arbitrary XML content describing the check result.
- * May be <code>null</code>.
- * @param failedReferences The indexes of the failed references. May be
- * <code>null</code>.
- * @return The <code>ReferencesCheckResultInfo</code> containing the above
- * data.
- *
- * @post return != null
- */
- public abstract ReferencesCheckResultInfo createReferencesCheckResultInfo(
- NodeList anyOtherInfo,
- int[] failedReferences);
-
- /**
- * Create a new <code>ManifestRefsCheckResult</code> object.
- *
- * @param code The status code.
- * @param info Additional information about the manifest check. May be
- * <code>null</code>.
- * @return The <code>ManifestRefsCheckResult</code> containing the above
- * data.
- *
- * @pre code >= 0
- * @post return != null
- */
- public abstract ManifestRefsCheckResult createManifestRefsCheckResult(
- int code,
- ManifestRefsCheckResultInfo info);
-
- /**
- * Create a new <code>ManifestRefsCheckResultInfo</code> object.
- *
- * @param anyOtherInfo Arbitrary XML content describing the check result.
- * May be <code>null</code>.
- * @param failedReferences The indexes of the failed references. May be
- * <code>null</code>.
- * @param referringSigReference The index of the reference in the signature.
- * @return The <code>ManifestRefsCheckResultInfo</code> containing the
- * above data.
- *
- * @pre referringSigReference > 0
- * @post return != null
- */
- public abstract ManifestRefsCheckResultInfo createManifestRefsCheckResultInfo(
- NodeList anyOtherInfo,
- int[] failedReferences,
- int referringSigReference);
-
- //
- // Factory methods for common objects
- //
-
- /**
- * Create a new <code>Content</code> object referencing data via a URI.
- *
- * @param referenceURI The URI pointing to the content.
- * @return The <code>Content</code> object containing the reference.
- *
- * @pre referenceURI != null && referenceURI.length() > 0
- * @post return != null
- */
- public abstract Content createContent(String referenceURI);
-
- /**
- * Create a new <code>Content</code> object containing binary data.
- *
- * @param binaryData An <code>InputStream</code> containing the binary data.
- * @param referenceURI An URI identifying the data. May be <code>null</code>.
- * @return The <code>Content</code> object containing the data.
- *
- * @pre binaryData != null
- * @post return != null
- */
- public abstract Content createContent(
- InputStream binaryData,
- String referenceURI);
-
- /**
- * Create a new <code>Content</code> object containing location reference data.
- *
- * @param locationReferenceURI a URI pointing to the actual remote location of the content.
- *
- * @param referenceURI An URI identifying the data. May be <code>null</code>.
- *
- * @return The <code>Content</code> object containing the data.
- *
- * @pre locationReferenceURI != null
- * @post return != null
- */
- public abstract Content createContent(
- String locationReferenceURI,
- String referenceURI);
-
- /**
- * Create a new <code>Content</code> object containing XML data.
- *
- * @param xmlData The XML data contained in the new <code>Content</code>.
- * @param referenceURI An URI identifying the data. May be <code>null</code>.
- * @return The <code>Content</code> object containing the data.
- *
- * @pre xmlData != null
- * @post return != null
- */
- public abstract Content createContent(NodeList xmlData, String referenceURI);
-
- /**
- * Create a new <code>XMLDataObjectAssociation</code> object.
- *
- * @param metaInfo Information about the content type. May be
- * <code>null</code>.
- * @param content The <code>Content</code> object containing the data.
- * @return The <code>XMLDataObjectAssociation</code> containing the above
- * data.
- *
- * @pre content != null
- * @pre content.getContentType() == Content.CONTENT_XML ||
- * content.getContentType() == Contetn.CONTENT_BINARY
- * @pre content.getReference() != null
- * @post return != null
- */
- public abstract XMLDataObjectAssociation createXMLDataObjectAssociation(
- MetaInfo metaInfo,
- Content content);
-
- /**
- * Create a new <code>MetaInfo</code> object.
- *
- * @param mimeType The MIME type part of the meta information.
- * @param description Descriptive meta information. May be <code>null</code>.
- * @param otherInfo XML meta information. May be <code>null</code>.
- * @param type Type information for XML signature creation. May be <code>null</code>.
- * @return The <code>MetaInfo</code> object containing the above data.
- *
- * @pre mimeType != null && mimeType.length() > 0
- * @pre otherInfo != null implies
- * forall Node n in otherInfo | n.getNodeType() == Node.ELEMENT
- */
- public abstract MetaInfo createMetaInfo(
- String mimeType,
- String description,
- NodeList otherInfo,
- String type);
-
- /**
- * Create a <code>CanonicalizationTransform</code> type of <code>Transform</code>.
- *
- * @param algorithmURI The algorithm URI of the canonicalization.
- * @return The created <code>CanonicalizationTransform</code> object.
- *
- * @pre CanonicalizationTransform.CANONICAL_XML.equals(algorithmURI) ||
- * CanonicalizationTransform.CANONICAL_XML_WITH_COMMENTS.equals(algorithmURI)
- * @post return != null
- */
- public abstract Transform createCanonicalizationTransform(String algorithmURI);
-
- /**
- * Create an <code>ExclusiveCanonicalizationTransform</code> type of
- * <code>Transform</code>.
- *
- * @param algorithmURI The algorithm URI of the exclusive canonicalization.
- * @param inclusiveNamespacePrefixes The prefixes of the namespaces to
- * treat according to canonical XML.
- * @return The new <code>ExclusiveCanonicalizationTransform</code>
- *
- * @pre ExclusiveCanonicalizationTransform.EXCLUSIVE_CANONICAL_XML.equals(algorithmURI) ||
- * ExclusiveCanonicalizationTransform.EXCLUSIVE_CANONICAL_XML_WITH_COMMENTS.equals(algorithmURI)
- * @pre inclusiveNamespacePrefixes != null
- * @pre forall Object o in inclusiveNamespacePrefixes | o instanceof String
- * @post return != null
- */
- public abstract Transform createExclusiveCanonicalizationTransform(
- String algorithmURI,
- List inclusiveNamespacePrefixes);
-
- /**
- * Create a <code>Base64Transform</code> type of <code>Transform</code>.
- *
- * @return A <code>Transform</code> denoting a Base64 decoding.
- *
- * @post return != null
- */
- public abstract Transform createBase64Transform();
-
- /**
- * Create a <code>EnvelopedSignatureTransform</code> type of
- * <code>Transform</code>.
- *
- * @return A <code>Transform</code> denoting an enveloped signature.
- *
- * @post return != null
- */
- public abstract Transform createEnvelopedSignatureTransform();
-
- /**
- * Create an <code>XSLTTransform</code> type of <code>Transform</code>.
- *
- * @param styleSheet The XSLT stylesheet contained in the
- * <code>Transform</code>.
- * @return A <code>Transform</code> containing the XSLT stylesheet.
- *
- * @post return != null
- */
- public abstract Transform createXSLTTransform(Element styleSheet);
-
- /**
- * Create an <code>XPathTransform</code> type of <code>Transform</code>.
- *
- * @param xPathExpression The XPath expression to use in the created
- * <code>Transform</code>.
- * @param namespaceDeclarations The namespace prefix to URI mapping to
- * apply on evaluation of the XPath expression.
- * @return The <code>XPathTransform</code> containing the above data.
- *
- * @pre xPathExpression != null
- * @pre namespaceDeclarations != null
- * @post return != null
- */
- public abstract Transform createXPathTransform(
- String xPathExpression,
- Map namespaceDeclarations);
-
- /**
- * Create a new <code>XPathFilter2Transform</code> type of
- * <code>Transform</code>.
- *
- * @param xPathFilters The filters contained in the newly created
- * <code>XPathFilter2Transform</code>.
- * @return The <code>XPathFilter2Transform</code> containing the given
- * filters.
- *
- * @pre xPathFilters != null &&
- * forall Object o in xPathFilters |
- * o instanceof at.gv.egovernment.moa.spss.api.common.XPathFilter
- * @post return != null
- */
- public abstract Transform createXPathFilter2Transform(List xPathFilters);
-
- /**
- * Create a new <code>XPathFilter</code> object.
- *
- * @param filterType The type of filter.
- * @param xPathExpression The XPath expression contained in this filter.
- * @param namespaceDeclarations The namespace prefix to URI mapping to apply
- * on evaluation of the XPath expression.
- * @return The <code>XPathFilter</code> containing the above data.
- *
- * @pre XPathFilter.SUBTRACT_TYPE.equals(filterType) ||
- * XPathFilter.INTERSECT_TYPE.equals(filterType) ||
- * XPathFilter.UNION_TYPE.equals(filterType)
- * @pre xPathExpression != null
- * @pre namespaceDeclarations != null
- * @post return != null
- */
- public abstract XPathFilter createXPathFilter(
- String filterType,
- String xPathExpression,
- Map namespaceDeclarations);
-
- /**
- * Create a new <code>CheckResult</code> object.
- *
- * @param code The check code.
- * @param info Verbose information about the check. May be <code>null</code>.
- * @return The <code>CheckResult</code> containing the above data.
- *
- * @pre code >= 0
- * @post return != null
- */
- public abstract CheckResult createCheckResult(int code, NodeList info);
-
- /**
- * Create a new <code>SignerInfo</code> object.
- *
- * @param signerCertificate The signer certificate in binary form.
- * @param qualifiedCertificate <code>true</code>, if the signer certificate is
- * a qualified certificate, otherwise <code>false</code>.
- * @param publicAuthority <code>true</code>, if the signer certificate is a
- * public authority certificate, otherwise <code>false</code>.
- * @param publicAuthorityID The identification of the public authority
- * (if <code>publicAuthority</code> is <code>true</code>). May be
- * <code>null</code>.
- * @return The <code>SignerInfo</code> containing the above data.
- *
- * @pre signerCertSubjectName != null
- * @pre signerCertIssuerSerial != null
- * @pre signerCertificate != null
- */
- public abstract SignerInfo createSignerInfo(
- X509Certificate signerCertificate,
- boolean qualifiedCertificate,
- boolean publicAuthority,
- String publicAuthorityID);
-
- /**
- * Create a new <code>X509IssuerSerial</code> object.
- *
- * @param issuerName The distinguished name of the issuer.
- * @param issuerSerial The certificate serial number.
- * @return The <code>X509IssuerSerial</code> containing the above data.
- *
- * @pre issuerName != null
- * @pre issuerSerial != null
- */
- public abstract X509IssuerSerial createX509IssuerSerial(
- String issuerName,
- BigInteger issuerSerial);
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureCreationService.java b/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureCreationService.java
deleted file mode 100644
index a84ca2a83..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureCreationService.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package at.gv.egovernment.moa.spss.api;
-
-import at.gv.egovernment.moa.spss.MOAException;
-
-import org.apache.commons.discovery.tools.DiscoverClass;
-
-
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-
-/**
- * Interface providing functions for signature creation.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class SignatureCreationService {
-
- /** The default implementation class. */
- private static final String DEFAULT_IMPLEMENTATION =
- "at.gv.egovernment.moa.spss.server.invoke.SignatureCreationServiceImpl";
-
- /** The single instance of this class. */
- private static SignatureCreationService instance = null;
-
- /**
- * Get an instance of the <code>SignatureCreationService</code>.
- *
- * @return A concrete instance of the <code>SignatureCreationService</code>.
- */
- public static synchronized SignatureCreationService getInstance() {
- if (instance == null) {
- try {
- DiscoverClass discover = new DiscoverClass();
- instance =
- (SignatureCreationService) discover.newInstance(
- SignatureCreationService.class,
- DEFAULT_IMPLEMENTATION);
- } catch (Exception e) {
- // this can not happen since we provide a valid default
- // implementation
- }
- }
- return instance;
- }
-
- /**
- * Create an XML signature.
- *
- * @param request Information on how to create the signature.
- * @return A <code>CreateXMLSignatureResponse</code> containing the
- * signature.
- * @throws MOAException Error in server side MOA module.
- */
- public abstract CreateXMLSignatureResponse createXMLSignature(CreateXMLSignatureRequest request)
- throws MOAException;
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java b/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java
deleted file mode 100644
index d0fcb029a..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/SignatureVerificationService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package at.gv.egovernment.moa.spss.api;
-
-import org.apache.commons.discovery.tools.DiscoverClass;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
-/**
- * Interface providing functions for verifying signatures.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class SignatureVerificationService {
-
- /** The default implementation class. */
- private static final String DEFAULT_IMPLEMENTATION =
- "at.gv.egovernment.moa.spss.server.invoke.SignatureVerificationServiceImpl";
-
- /** The single instance of this class. */
- private static SignatureVerificationService instance = null;
-
- /**
- * Get an instance of the <code>SignatureVerificationService</code>.
- *
- * @return A concrete instance of the
- * <code>SignatureVerificationService</code>.
- */
- public static synchronized SignatureVerificationService getInstance() {
- if (instance == null) {
- try {
- DiscoverClass discover = new DiscoverClass();
- instance =
- (SignatureVerificationService) discover.newInstance(
- SignatureVerificationService.class,
- DEFAULT_IMPLEMENTATION);
- } catch (Exception e) {
- // this can not happen since we provide a valid default
- // implementation
- }
- }
- return instance;
- }
-
- /**
- * Verify a CMS signature.
- *
- * @param request Detailed information on the verification that should be
- * performed.
- * @return A <code>VerifyCMSSignatureResponse</code> object that contains
- * information about the performed verification.
- * @throws MOAException Error in server side MOA module.
- */
- public abstract VerifyCMSSignatureResponse verifyCMSSignature(VerifyCMSSignatureRequest request)
- throws MOAException;
- /**
- * Verfiy an XML Signature.
- *
- * @param request information on the verification that should be performed.
- * @return A <code>VerifyXMLSignatureResponse</code> object that contains
- * information about the performed verification.
- * @throws MOAException Error in server side MOA module.
- */
- public abstract VerifyXMLSignatureResponse verifyXMLSignature(VerifyXMLSignatureRequest request)
- throws MOAException;
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContent.java b/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContent.java
deleted file mode 100644
index b4ecb3937..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.gv.egovernment.moa.spss.api.cmsverify;
-
-/**
- * Base class for objects containing CMS content.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CMSContent {
- /**
- * Indicates that this object contains a reference to the CMS content.
- */
- public static final int REFERENCE_CONTENT = 0;
- /**
- * Indicates that this object contains the CMS content explicitly.
- */
- public static final int EXPLICIT_CONTENT = 1;
-
- /**
- * Gets the type of the contained content.
- *
- * @return The type of content, either <code>REFERENCE_CONTENT</code> or
- * <code>EXPLICIT_CONTENT</code>.
- */
- public int getContentType();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentExcplicit.java b/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentExcplicit.java
deleted file mode 100644
index 58c2b0259..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentExcplicit.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.gv.egovernment.moa.spss.api.cmsverify;
-
-import java.io.InputStream;
-
-/**
- * Encapsulates binary CMS content.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CMSContentExcplicit extends CMSContent {
- /**
- * Gets the content as a stream.
- *
- * @return A stream containing the binary content.
- */
- public InputStream getBinaryContent();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentReference.java b/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentReference.java
deleted file mode 100644
index 7c4e6d913..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSContentReference.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package at.gv.egovernment.moa.spss.api.cmsverify;
-
-/**
- * Encapsulates CMS content that is referenced by an URI.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CMSContentReference extends CMSContent {
- /**
- * Gets the reference URI from wher the content can be retrieved.
- *
- * @return The reference URI.
- */
- public String getReference();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSDataObject.java b/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSDataObject.java
deleted file mode 100644
index 37f6fd396..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/CMSDataObject.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.cmsverify;
-
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-
-/**
- * A data object used for verification of CMS signatures.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CMSDataObject {
- /**
- * Gets the meta information of the content.
- *
- * @return An object containig the meta information.
- */
- public MetaInfo getMetaInfo();
- /**
- * Gets the actual content of the data object.
- *
- * @return The actual content.
- */
- public CMSContent getContent();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java b/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java
deleted file mode 100644
index 6d1f389af..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package at.gv.egovernment.moa.spss.api.cmsverify;
-
-import java.io.InputStream;
-import java.util.Date;
-
-/**
- * Object that encapsulates a request to verify a CMS signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface VerifyCMSSignatureRequest {
- /**
- * Indicates, that signature checks for all signatories must be returned.
- */
- public static int[] ALL_SIGNATORIES = new int[] { -1 };
- /**
- * Gets the positions of signatories whose signature must be verified.
- *
- * @return The positions of signatories.
- */
- public int[] getSignatories();
- /**
- * Gets the date and time for which the signature verification has to
- * be performed.
- *
- * @return Date and time for which the signature verification has
- * to be performed.
- */
- public Date getDateTime();
- /**
- * Gets the binary CMS signature.
- *
- * @return An <code>InputStream</code> from which the binary CMS signature
- * can be read.
- */
- public InputStream getCMSSignature();
- /**
- * Gets the data object necessary for the verification.
- *
- * @return The data object necessary for verification.
- */
- public CMSDataObject getDataObject();
- /**
- * Gets the profile ID of trusted certificates to be used for signature
- * verification.
- *
- * @return The profile ID of trusted certificates.
- */
- public String getTrustProfileId();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponse.java b/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponse.java
deleted file mode 100644
index 5f2e6d255..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponse.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.gv.egovernment.moa.spss.api.cmsverify;
-
-import java.util.List;
-
-
-/**
- * Object that encapsulates the response on a request to verify a CMS
- * signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface VerifyCMSSignatureResponse {
- /**
- * Gets the response elements.
- *
- * @return The response elements.
- */
- public List getResponseElements();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java b/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java
deleted file mode 100644
index 49ddb9419..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package at.gv.egovernment.moa.spss.api.cmsverify;
-
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-
-/**
- * Contains detailed information about the verification of a signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface VerifyCMSSignatureResponseElement {
- /**
- * Gets a SignerInfo element according to CMS.
- *
- * @return The SignerInfo element according to CMS.
- */
- public SignerInfo getSignerInfo();
- /**
- * Gets the result of the signature verification.
- *
- * @return The result of the signature verification.
- */
- public CheckResult getSignatureCheck();
- /**
- * Gets the result of the certificate verification.
- *
- * @return The result of the certificate verification.
- */
- public CheckResult getCertificateCheck();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Base64Transform.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/Base64Transform.java
deleted file mode 100644
index 94785727d..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Base64Transform.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-/**
- * A <code>Transform</code> performing a Base64 decoding.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface Base64Transform extends Transform {
- /** Algorithm URI of the Base64 <code>Transform</code> type. */
- public static final String BASE64_DECODING =
- "http://www.w3.org/2000/09/xmldsig#base64";
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java
deleted file mode 100644
index 352461e52..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/CanonicalizationTransform.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * A canonicalization type of <code>Transform</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface CanonicalizationTransform extends Transform {
- /** Algorithm URI of canonical XML. */
- public static final String CANONICAL_XML = Constants.C14N_URI;
- /** Algorithm URI of canonical XML with comments. */
- public static final String CANONICAL_XML_WITH_COMMENTS =
- Constants.C14N_WITH_COMMENTS_URI;
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/CheckResult.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/CheckResult.java
deleted file mode 100644
index 974483d82..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/CheckResult.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import org.w3c.dom.NodeList;
-
-/**
- * Object encapsulating the result of a signature verification.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CheckResult {
- /**
- * Gets the result code.
- *
- * @return The result code.
- */
- public int getCode();
- /**
- * Gets descriptive information.
- *
- * @return Descriptive information.
- */
- public NodeList getInfo();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java
deleted file mode 100644
index 0777c3d65..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Content.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-/**
- * Encapsulates content data.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @author Gregor Karlinger
- * @version $Id$
- */
-public interface Content {
-
- /**
- * Indicates that this object contains a URI reference to some content.
- */
- public static final int REFERENCE_CONTENT = 0;
-
- /**
- * Indicates that this object contains binary content.
- */
- public static final int BINARY_CONTENT = 1;
-
- /**
- * Indicates that this object contains XML content.
- */
- public static final int XML_CONTENT = 2;
-
- /**
- * Indicates that this object contains a location reference content.
- */
- public static final int LOCREF_CONTENT = 3;
-
- /**
- * Gets the type of content contained in this object.
- *
- * @return The type of content, one of <code>BINARY_CONTENT</code>, <code>XML_CONTENT</code>, <code>
- * REFERENCE_CONTENT</code> or <code>LOCREF_CONTENT</code>.
- */
- public int getContentType();
-
- /**
- * Gets the reference to the content data (a URI).
- *
- * @return The reference to the content data.
- */
- public String getReference();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentBinary.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentBinary.java
deleted file mode 100644
index 664afa406..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentBinary.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import java.io.InputStream;
-
-/**
- * Encapsulates binary content.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface ContentBinary extends Content {
- /**
- * Get the binary content.
- *
- * @return An <code>InputStream</code> from which the binary content can
- * be read.
- */
- public InputStream getBinaryContent();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java
deleted file mode 100644
index f640f2b92..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentLocRef.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-/**
- * Encapsulates location reference content.
- *
- * @author Gregor Karlinger
- * @version $Id$
- */
-public interface ContentLocRef extends Content
-{
- /**
- * Gets the location reference URI pointing to the actual remote location of the content.
- *
- * @return the location reference URI.
- */
- public String getLocationReferenceURI();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentReference.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentReference.java
deleted file mode 100644
index c10f0c2f8..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentReference.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-/**
- * Content containing a reference to content data.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface ContentReference extends Content {
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentXML.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentXML.java
deleted file mode 100644
index ad5930452..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ContentXML.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import org.w3c.dom.NodeList;
-
-/**
- * Encapsulates arbitrary XML content.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface ContentXML extends Content {
- /**
- * Gets the XML content stored in this object.
- *
- * @return The XML content.
- */
- public NodeList getXMLContent();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ElementSelector.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/ElementSelector.java
deleted file mode 100644
index 862cb84da..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ElementSelector.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import java.util.Map;
-
-/**
- * A class containing data for selecting single elements using an XPath
- * expression.
- *
- * Derived classes are used to point to the <code>CreateSignatureLocation</code>
- * and the <code>VerifySignatureLocation</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface ElementSelector {
- /**
- * Gets the XPath expression pointing to a single element.
- *
- * @return The XPath expression to select the signature parent element.
- */
- public String getXPathExpression();
- /**
- * Gets the namespace prefix to URI mapping to use when evaluating the XPath.
- *
- * @return The namespace prefix to URI mapping.
- */
- public Map getNamespaceDeclarations();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/EnvelopedSignatureTransform.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/EnvelopedSignatureTransform.java
deleted file mode 100644
index f951e35c0..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/EnvelopedSignatureTransform.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-/**
- * An enveloped signature type of <code>Transform</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface EnvelopedSignatureTransform extends Transform {
- /**
- * Algorithm URI of the enveloped signature type of <code>Transform</code>.
- */
- public static final String ENVELOPED_SIGNATURE =
- "http://www.w3.org/2000/09/xmldsig#enveloped-signature";
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java
deleted file mode 100644
index 369270259..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/ExclusiveCanonicalizationTransform.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import java.util.List;
-
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * An exclusive canonicalization type of <code>Transform</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface ExclusiveCanonicalizationTransform extends Transform {
- /** Algorithm URI of exclusive canonical XML. */
- public static final String EXCLUSIVE_CANONICAL_XML = Constants.EXC_C14N_URI;
- /** Algorithm URI of exclusive canonical XML with comments. */
- public static final String EXCLUSIVE_CANONICAL_XML_WITH_COMMENTS =
- Constants.EXC_C14N_WITH_COMMENTS_URI;
-
- /**
- * Sets the namespace prefixes that are handled in the same manner as in
- * canonical XML.
- *
- * @return The inclusive namespace prefixes.
- */
- public List getInclusiveNamespacePrefixes();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/InputData.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/InputData.java
deleted file mode 100644
index 3dcb95843..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/InputData.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-/**
- * Interface specifying accessors for two attributes needed for returning
- * <code>HashInputData</code> and <code>ReferenceInputData</code> information
- * as part of <code>VerifyXMLSignatureResponse</code>.
- *
- * @author Gregor Karlinger
- *
- * @version $Id$
- */
-public interface InputData extends Content
-{
- /**
- * Possible value returned by {@link getPartOf}.
- */
- public static String CONTAINER_SIGNEDINFO_ = "SignedInfo";
-
- /**
- * Possible value returned by {@link getPartOf}.
- */
- public static String CONTAINER_XMLDSIGMANIFEST_ = "XMLDSIGManifest";
-
- /**
- * Value returned by {link getReferringReferenceNumber}, signalling that the
- * attribute is not used.
- */
- public static int REFERER_NONE_ = -1;
-
- /**
- * Returns a <code>String</code> signalling what kind of container the
- * XMLDSIG <code>Reference</code> this <code>InputData</code> belongs
- * to is part of.
- *
- * @return the kind of container.
- */
- public String getPartOf();
-
- /**
- * If this <code>InputData</code> belongs to an XMLDSIG <code>Reference</code>
- * being part of either a XMLDSIGManifest or a SignatureManifest, this method
- * returns a positive int value signalling the particular <code>Reference</code>
- * of the XMLDSIG <code>SignedInfo</code> referring to the XMLDSIGManifest or
- * SignatureManifest respectively.
- */
- public int getReferringReferenceNumber();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java
deleted file mode 100644
index 56a1793af..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import org.w3c.dom.NodeList;
-
-/**
- * Object encapsulating descriptive meta information.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface MetaInfo {
- /**
- * Gets the mime type of the associated object.
- *
- * @return The mimetype of the associated object.
- */
- public String getMimeType();
- /**
- * Gets the descriptive information (URI).
- *
- * @return URI referencing the descriptive information.
- */
- public String getDescription();
- /**
- * Gets the elemental informations.
- *
- * @return The elemental informations.
- */
- public NodeList getAnyElements();
- /**
- * Gets the XML signature creation type information of the associated object.
- *
- * @return the XML signature creation type information of the associated object.
- */
- public String getType();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/SignerInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/SignerInfo.java
deleted file mode 100644
index c3b4aaadc..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/SignerInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import java.security.cert.X509Certificate;
-
-
-/**
- * Contains information about the signer.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface SignerInfo {
- /**
- * Gets the signer certificate.
- *
- * @return The signer certificate.
- */
- public X509Certificate getSignerCertificate();
- /**
- * Checks, whether the certificate contained in this object is qualified.
- *
- * @return <code>true</code>, if the certificate is qualified, otherwise
- * <code>false</code>.
- */
- public boolean isQualifiedCertificate();
- /**
- * Checks, whether the certificate contained in this object is a
- * public authority certificate.
- *
- * @return <code>true</code>, if the certificate is a public authority
- * certificate, otherwise <code>false</code>.
- */
- public boolean isPublicAuthority();
- /**
- * Gets the public authority ID, if the certificate contained in this
- * object is from a public authority.
- *
- * @return The public authority ID.
- */
- public String getPublicAuhtorityID();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Transform.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/Transform.java
deleted file mode 100644
index 49a4e7c35..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/Transform.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-/**
- * Base class for XMLDsig <code>Transform</code> elements.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface Transform {
- /**
- * Gets the algorithm URI of this <code>Transform</code>.
- *
- * @return The algorithm URI of this <code>Transform</code>.
- */
- public String getAlgorithmURI();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/X509IssuerSerial.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/X509IssuerSerial.java
deleted file mode 100644
index d2ea88968..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/X509IssuerSerial.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import java.math.BigInteger;
-
-/**
- * Contains an X.509 issuer distinguished name/serial number pair.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface X509IssuerSerial {
- /**
- * Gets the issuer distinguished name.
- *
- * @return The issuer distinguished name.
- */
- public String getX509IssuerName();
- /**
- * Gets the issuer serial number.
- *
- * @return The issuer serial number.
- */
- public BigInteger getX509SerialNumber();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java
deleted file mode 100644
index e1e034222..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-
-/**
- * Object encapsulating arbitrary content and optional descriptive meta
- * information.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface XMLDataObjectAssociation {
- /**
- * Gets descriptive meta information.
- *
- * @return The descriptive meta information.
- */
- public MetaInfo getMetaInfo();
- /**
- * Gets the actual content.
- *
- * @return The content of this association.
- */
- public Content getContent();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter.java
deleted file mode 100644
index 247776ce0..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import java.util.Map;
-
-/**
- * An XPath expression set operation.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface XPathFilter {
- /** Subtract this filter's node set from the resulting node set. */
- public static final String SUBTRACT_TYPE = "subtract";
- /** Intersect this filter's node set with the resulting node set. */
- public static final String INTERSECT_TYPE = "intersect";
- /** Compute the union of this filter's node set and the resulting node set. */
- public static final String UNION_TYPE = "union";
-
- /**
- * Gets the type of this <code>XPathFilter</code>.
- *
- * @return The type of this <code>XPathFilter</code>.
- */
- public String getFilterType();
- /**
- * Gets the XPath expression for selecting the nodes.
- *
- * @return The XPath expression for selecting the nodes.
- */
- public String getXPathExpression();
- /**
- * Gets The namespace prefix to URI mapping used during evaluation of the
- * XPath expression.
- *
- * @return The namespace prefix to URI mapping.
- */
- public Map getNamespaceDeclarations();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter2Transform.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter2Transform.java
deleted file mode 100644
index 335d37dbf..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathFilter2Transform.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import java.util.List;
-
-/**
- * An XPath type of <code>Transform</code> containing multiple filters for
- * performing set operations on XPath selections.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface XPathFilter2Transform extends Transform {
- /** Algorithm URI for the XPath Filter2 <code>Transform</code>. */
- public static final String XPATH_FILTER2 =
- "http://www.w3.org/2002/06/xmldsig-filter2";
-
- /**
- * Gets the <code>XPathFilter</code>s contained in this
- * <code>XPathFilter2Transform</code>.
- *
- * @return The <code>XPathFilter</code>s.
- */
- public List getFilters();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathTransform.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathTransform.java
deleted file mode 100644
index f1cc1a2bc..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XPathTransform.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import java.util.Map;
-
-/**
- * A <code>Transform</code> performing an XPath selection.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface XPathTransform extends Transform {
- /** Algorithm URI of the XPath <code>Transform</code>. */
- public static final String XPATH =
- "http://www.w3.org/TR/1999/REC-xpath-19991116";
-
- /**
- * Gets the XPath expression used for selection.
- *
- * @return The XPath expression used for selection.
- */
- public String getXPathExpression();
- /**
- * Gets The namespace prefix to URI mapping used during evaluation of the
- * XPath expression.
- *
- * @return The namespace prefix to URI mapping.
- */
- public Map getNamespaceDeclarations();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XSLTTransform.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/XSLTTransform.java
deleted file mode 100644
index 7f44bb060..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/XSLTTransform.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package at.gv.egovernment.moa.spss.api.common;
-
-import org.w3c.dom.Element;
-
-/**
- * A <code>Transform</code> containing an XSLT stylesheet.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface XSLTTransform extends Transform {
- /** Algorithm URI for the XSLT type of <code>Transform</code>. */
- public static final String XSLT =
- "http://www.w3.org/TR/1999/REC-xslt-19991116";
-
- /**
- * Gets the XSLT stylesheet element used for the transformation.
- *
- * @return The XSLT stylesheet element used for the transformation.
- */
- public Element getStylesheet();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/Base64TransformImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/Base64TransformImpl.java
deleted file mode 100644
index 4af075da2..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/Base64TransformImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.Base64Transform;
-
-/**
- * Default implementation of <code>Base64Transform</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class Base64TransformImpl
- extends TransformImpl
- implements Base64Transform {
-
- /**
- * Create a new <code>Base64TransformImpl</code> object.
- */
- public Base64TransformImpl() {
- setAlgorithmURI(BASE64_DECODING);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentExplicitImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentExplicitImpl.java
deleted file mode 100644
index dd700cf21..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentExplicitImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.io.InputStream;
-
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContentExcplicit;
-
-/**
- * Default implementation of <code>CMSContentExplicit</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CMSContentExplicitImpl implements CMSContentExcplicit {
-
- /** The binary content, as a stream. */
- private InputStream binaryContent;
-
- /**
- * Sets the binary content as a stream.
- *
- * @param content The binary content as a stream.
- */
- public void setBinaryContent(InputStream content) {
- this.binaryContent = content;
- }
-
- public InputStream getBinaryContent() {
- return binaryContent;
- }
-
- /**
- * Gets the type of content.
- *
- * @return EXPLICIT_CONTENT
- */
- public int getContentType() {
- return EXPLICIT_CONTENT;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentReferenceImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentReferenceImpl.java
deleted file mode 100644
index f9c080a0d..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSContentReferenceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContentReference;
-
-/**
- * Default implementation of <code>CMSContentReference</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CMSContentReferenceImpl implements CMSContentReference {
-
- /** The reference pointing to the actual data. */
- private String reference;
-
- /**
- * Sets the reference URI.
- *
- * @param referenceURI The URI pointing to the content data.
- */
- public void setReference(String referenceURI) {
- this.reference = referenceURI;
- }
-
- public String getReference() {
- return reference;
- }
-
- /**
- * Gets the content type.
- *
- * @return REFERENCE_CONTENT
- */
- public int getContentType() {
- return REFERENCE_CONTENT;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java
deleted file mode 100644
index 6eec4e847..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-
-/**
- * Default implementation of <code>CMLSDataObject</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CMSDataObjectImpl implements CMSDataObject {
-
- /** The <code>MetaInfo</code> associated with the CMS data object. */
- private MetaInfo metaInfo;
- /** The <code>CMSContent</code> contained in this data object. */
- private CMSContent cmsContent;
-
- /**
- * Sets the meta information associated with the CMS data object.
- *
- * @param metaInfo The meta information.
- */
- public void setMetaInfo(MetaInfo metaInfo) {
- this.metaInfo = metaInfo;
- }
-
- public MetaInfo getMetaInfo() {
- return metaInfo;
- }
-
- /**
- * Sets the data of this <code>CMSDataObject</code>.
- *
- * @param cmsContent The actual data of this <code>CMSDataObject</code>.
- */
- public void setContent(CMSContent cmsContent) {
- this.cmsContent = cmsContent;
- }
-
- public CMSContent getContent() {
- return cmsContent;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CanonicalizationTransformImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CanonicalizationTransformImpl.java
deleted file mode 100644
index cf446d1b4..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CanonicalizationTransformImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.CanonicalizationTransform;
-
-/**
- * Default implementation of <code>CanonicalizationTransform</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CanonicalizationTransformImpl
- extends TransformImpl
- implements CanonicalizationTransform {
-
- /**
- * Create a new <code>CanonicalizationTransformImpl</code> object.
- *
- * @param algorithmURI Algorithm URI of the canonicalization
- * <code>Transform</code> type.
- */
- public CanonicalizationTransformImpl(String algorithmURI) {
- setAlgorithmURI(algorithmURI);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CheckResultImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CheckResultImpl.java
deleted file mode 100644
index 2acb12e51..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CheckResultImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-
-/**
- * Default implementation of <code>CheckResult</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CheckResultImpl implements CheckResult {
- /** The result code. */
- private int code;
-
- /** Additional information. */
- private NodeList info;
-
- /**
- * Sets a result code.
- *
- * @param code The result code.
- */
- public void setCode(int code) {
- this.code = code;
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.CheckResult#getCode()
- */
- public int getCode() {
- return code;
- }
-
- /**
- * Sets a descriptive information.
- *
- * @param info The descriptive information.
- */
- public void setInfo(NodeList info) {
- this.info = info;
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.CheckResult#getInfo()
- */
- public NodeList getInfo() {
- return info;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java
deleted file mode 100644
index bbed6bf8b..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.io.InputStream;
-
-import at.gv.egovernment.moa.spss.api.common.ContentBinary;
-
-/**
- * Default implementation of <code>ContentBinary</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class ContentBinaryImpl extends ContentImpl implements ContentBinary {
-
- /** The binary content as a stream. */
- private InputStream binaryContent;
-
- /**
- * Sets the binary content as a stream.
- *
- * @param binaryContent The binary content as a stream.
- */
- public void setBinaryContent(InputStream binaryContent) {
- this.binaryContent = binaryContent;
- }
-
- public InputStream getBinaryContent() {
- return binaryContent;
- }
-
- /**
- * Gets the type of content.
- *
- * @return BINARY_CONTENT
- */
- public int getContentType() {
- return BINARY_CONTENT;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentImpl.java
deleted file mode 100644
index 7f331d2cd..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.Content;
-
-/**
- * Default base class for <code>Content</code> implementations.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class ContentImpl implements Content {
- /** The reference pointing to the content data. */
- private String reference;
-
- /**
- * Sets the reference pointing to the content data.
- *
- * @param referenceURI The URI of the content data.
- */
- public void setReference(String referenceURI) {
- this.reference = referenceURI;
- }
-
- public String getReference() {
- return reference;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java
deleted file mode 100644
index 902f7bd72..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentLocRefImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.ContentLocRef;
-
-/**
- * Default implementation of <code>ContentLocRef</code>.
- *
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class ContentLocRefImpl extends ContentImpl implements ContentLocRef
-{
- /**
- * The location reference URI pointing to the actual remote location of the content.
- */
- private String locationReferenceURI_;
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.ContentLocRef#getLocationReference()
- */
- public String getLocationReferenceURI()
- {
- return locationReferenceURI_;
- }
-
- /**
- * Sets the location reference URI pointing to the actual remote location of the content.
- *
- * @param locationReferenceURI the location reference URI.
- */
- public void setLocationReferenceURI(String locationReferenceURI)
- {
- locationReferenceURI_ = locationReferenceURI;
- }
-
- /**
- * Gets the type of content.
- *
- * @return LOCREF_CONTENT.
- */
- public int getContentType() {
- return LOCREF_CONTENT;
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentReferenceImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentReferenceImpl.java
deleted file mode 100644
index 50609aa0e..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentReferenceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.ContentReference;
-
-/**
- * Default implementation of <code>ContentReference</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ContentReferenceImpl
- extends ContentImpl
- implements ContentReference {
-
- /**
- * Gets the type of content.
- *
- * @return REFERENCE_CONTENT
- */
- public int getContentType() {
- return REFERENCE_CONTENT;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentXMLImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentXMLImpl.java
deleted file mode 100644
index c03f5edde..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ContentXMLImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.spss.api.common.ContentXML;
-
-/**
- * Default implementation of <code>ContentXML</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class ContentXMLImpl extends ContentImpl implements ContentXML {
-
- /** The nodes making up the XML content. */
- private NodeList xmlContent;
-
- /**
- * Sets the nodes making up the XML content.
- *
- * @param xmlContent The XML content.
- */
- public void setXMLContent(NodeList xmlContent) {
- this.xmlContent = xmlContent;
- }
-
- public NodeList getXMLContent() {
- return xmlContent;
- }
-
- /**
- * Gets the type of content.
- *
- * @return XML_CONTENT
- */
- public int getContentType() {
- return XML_CONTENT;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java
deleted file mode 100644
index 22e4cd61d..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureLocation;
-
-/**
- * Default implementation of
- * <codeCreateSignatureEnvironmentProfileExplicit</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CreateSignatureEnvironmentProfileExplicitImpl
- implements CreateSignatureEnvironmentProfileExplicit {
-
- /** The insertion location of the signature to be created. */
- private CreateSignatureLocation createSignatureLocation;
-
- /** Supplemental information for evaluating the signature environment. */
- private List supplements;
-
- /**
- * Sets the insertion location of the signature to be created.
- *
- * @param createSignatureLocation The insertion location of the signature to
- * be created.
- */
- public void setCreateSignatureLocation(CreateSignatureLocation createSignatureLocation) {
- this.createSignatureLocation = createSignatureLocation;
- }
-
- public CreateSignatureLocation getCreateSignatureLocation() {
- return createSignatureLocation;
- }
-
- /**
- * Sets the supplemental information for evaluating the signature
- * environment.
- *
- * @param supplements The supplemental information.
- */
- public void setSupplements(List supplements) {
- this.supplements =
- supplements != null
- ? Collections.unmodifiableList(new ArrayList(supplements))
- : null;
- }
-
- public List getSupplements() {
- return supplements;
- }
-
- /**
- * Gets the type of profile.
- *
- * @return EXPLICIT_CREATESIGNATUREENVIRONMENTPROFILE
- */
- public int getCreateSignatureEnvironmentProfileType() {
- return EXPLICIT_CREATESIGNATUREENVIRONMENTPROFILE;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileIDImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileIDImpl.java
deleted file mode 100644
index 1c7dc6439..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileIDImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfileID;
-
-/**
- * Default implementation of <code>CreateSignatureEnvironmentProfileID</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CreateSignatureEnvironmentProfileIDImpl
- implements CreateSignatureEnvironmentProfileID {
-
- /** The profile ID. */
- private String createSignatureEnvironmentProfileID;
-
- /**
- * Sets the profile ID.
- *
- * @param profileID The profile ID.
- */
- public void setCreateSignatureEnvironmentProfileID(String profileID) {
- this.createSignatureEnvironmentProfileID = profileID;
- }
-
- public String getCreateSignatureEnvironmentProfileID() {
- return createSignatureEnvironmentProfileID;
- }
-
- /**
- * Gets the type of profile.
- *
- * @return ID_CREATESIGNATUREENVIRONMENTPROFILE
- */
- public int getCreateSignatureEnvironmentProfileType() {
- return ID_CREATESIGNATUREENVIRONMENTPROFILE;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureInfoImpl.java
deleted file mode 100644
index 097af7fff..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureInfoImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureInfo;
-
-/**
- * Default implementation of <code>CreateSignatureInfo</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CreateSignatureInfoImpl implements CreateSignatureInfo {
-
- /** The signature environment that will contain the newly created
- * signature. */
- private Content createSignatureEnvironment;
-
- /** Additional information about the signature environment. */
- private CreateSignatureEnvironmentProfile createSignatureEnvironmentProfile;
-
- /**
- * Sets the signature environment that will contain the newly created
- * signature.
- *
- * @param createSignatureEnvironment The signature environment.
- */
- public void setCreateSignatureEnvironment(Content createSignatureEnvironment) {
- this.createSignatureEnvironment = createSignatureEnvironment;
- }
-
- public Content getCreateSignatureEnvironment() {
- return createSignatureEnvironment;
- }
-
- /**
- * Sets the signature environment profile containing additional information
- * about the signature environment.
- *
- * @param profile The signature environment profile.
- */
- public void setCreateSignatureEnvironmentProfile(CreateSignatureEnvironmentProfile profile) {
- this.createSignatureEnvironmentProfile = profile;
- }
-
- public CreateSignatureEnvironmentProfile getCreateSignatureEnvironmentProfile() {
- return createSignatureEnvironmentProfile;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureLocationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureLocationImpl.java
deleted file mode 100644
index c0b36f505..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateSignatureLocationImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureLocation;
-
-/**
- * Default implementation of <code>CreateSignatureLocation</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CreateSignatureLocationImpl
- extends ElementSelectorImpl
- implements CreateSignatureLocation {
-
- /** The index of the newly created signature. */
- private int index;
-
- /**
- * Sets the index of the newly created signature.
- *
- * @param index The index of the newly created signature.
- */
- public void setIndex(int index) {
- this.index = index;
- }
-
- public int getIndex() {
- return index;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoImpl.java
deleted file mode 100644
index ff4108248..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfo;
-
-/**
- * Default implementation of <code>CreateTransformsInfo</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CreateTransformsInfoImpl implements CreateTransformsInfo {
- /** The dsig:Transforms. */
- private List transforms;
- /** Meta information about the data resulting from the transforms. */
- private MetaInfo finalDataMetaInfo;
-
- /**
- * Sets the transforms.
- *
- * @param transforms The transforms.
- */
- public void setTransforms(List transforms) {
- this.transforms =
- transforms != null
- ? Collections.unmodifiableList(new ArrayList(transforms))
- : null;
- }
-
- public List getTransforms() {
- return transforms;
- }
-
- /**
- * Sets the meta information about the data resulting from the transforms.
- *
- * @param finalDataMetaInfo The meta information.
- */
- public void setFinalDataMetaInfo(MetaInfo finalDataMetaInfo) {
- this.finalDataMetaInfo = finalDataMetaInfo;
- }
-
- public MetaInfo getFinalDataMetaInfo() {
- return finalDataMetaInfo;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileExplicitImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileExplicitImpl.java
deleted file mode 100644
index 508b6c083..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileExplicitImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileExplicit;
-
-/**
- * Default implementation of <code>CreateTransformsInfoProfileExplicit</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CreateTransformsInfoProfileExplicitImpl
- implements CreateTransformsInfoProfileExplicit {
-
- /** Transformation information. */
- private CreateTransformsInfo transformsInfo;
- /** Additional data for the transformations. */
- private List supplements = new ArrayList();
-
- /**
- * Sets the transformation information.
- *
- * @param transformsInfo The transformation information.
- */
- public void setCreateTransformsInfo(CreateTransformsInfo transformsInfo) {
- this.transformsInfo = transformsInfo;
- }
-
- public CreateTransformsInfo getCreateTransformsInfo() {
- return transformsInfo;
- }
-
- /**
- * Sets the additional data for the transformations.
- *
- * @param supplements The additional data.
- */
- public void setSupplements(List supplements) {
- this.supplements =
- supplements != null
- ? Collections.unmodifiableList(new ArrayList(supplements))
- : null;
- }
-
- public List getSupplements() {
- return supplements;
- }
-
- /**
- * Gets the type of profile.
- *
- * @return EXPLICIT_CREATETRANSFORMSINFOPROFILE
- */
- public int getCreateTransformsInfoProfileType() {
- return EXPLICIT_CREATETRANSFORMSINFOPROFILE;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileIDImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileIDImpl.java
deleted file mode 100644
index 5cd1fcc48..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateTransformsInfoProfileIDImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileID;
-
-/**
- * Default implementation of <code>CreateTransformsInfoProfileID</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CreateTransformsInfoProfileIDImpl
- implements CreateTransformsInfoProfileID {
-
- /** The profile ID. */
- private String createTransformsID;
-
- /**
- * Sets the profile ID.
- * @param createTransformsID The profile ID.
- */
- public void setCreateTransformsInfoProfileID(String createTransformsID) {
- this.createTransformsID = createTransformsID;
- }
-
- public String getCreateTransformsInfoProfileID() {
- return createTransformsID;
- }
-
- /**
- * Gets the type of profile.
- *
- * @return ID_CREATETRANSFORMSINFOPROFILE
- */
- public int getCreateTransformsInfoProfileType() {
- return ID_CREATETRANSFORMSINFOPROFILE;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java
deleted file mode 100644
index 08f94cc31..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-
-/**
- * Default implementation of <code>CreateXMLSignatureRequest</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CreateXMLSignatureRequestImpl
- implements CreateXMLSignatureRequest {
-
- /** The identifier for selecting the private keys for creating the signature.*/
- private String keyIdentifier;
- /** Information for creating a single signature. */
- private List singleSignatureInfos = new ArrayList();
-
- /**
- * Sets the identifier for selecting the private keys for creating the
- * signature.
- *
- * @param keyIdentifier The identifier for selecting the private keys.
- */
- public void setKeyIdentifier(String keyIdentifier) {
- this.keyIdentifier = keyIdentifier;
- }
-
- public String getKeyIdentifier() {
- return keyIdentifier;
- }
-
- /**
- * Sets the information for creating single signatures.
- *
- * @param singleSignaureInfos The information for creating single signatures.
- */
- public void setSingleSignatureInfos(List singleSignaureInfos) {
- this.singleSignatureInfos =
- singleSignaureInfos != null
- ? Collections.unmodifiableList(new ArrayList(singleSignaureInfos))
- : null;
- }
-
- public List getSingleSignatureInfos() {
- return singleSignatureInfos;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureResponseImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureResponseImpl.java
deleted file mode 100644
index 590258e30..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureResponseImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-
-/**
- * Default implementation of <code>CreateXMLSignatureResponse</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class CreateXMLSignatureResponseImpl
- implements CreateXMLSignatureResponse {
-
- /** The elements contained in the response. */
- private List responseElements = new ArrayList();
-
- /**
- * Sets the elements contained in the response.
- *
- * @param responseElements The response elements.
- */
- public void setResponseElements(List responseElements) {
- this.responseElements =
- responseElements != null
- ? Collections.unmodifiableList(new ArrayList(responseElements))
- : null;
- }
-
- public List getResponseElements() {
- return responseElements;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/DataObjectInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/DataObjectInfoImpl.java
deleted file mode 100644
index 8ab2241de..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/DataObjectInfoImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
-
-/**
- * Default implementation of <code>DataObjectInfo</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class DataObjectInfoImpl implements DataObjectInfo {
- /** The signature structure type. */
- private String stucture;
- /** Whether a reference will be placed in the signature itself or in the
- * manifest */
- private boolean childOfManifest;
- /** The data object to be signed. */
- private Content dataObject;
- /** The profile containing additional information for the transformations. */
- private CreateTransformsInfoProfile createTransformsInfoProfile;
-
- /**
- * Sets the signature structure type.
- *
- * @param structure The signature structure type.
- */
- public void setStructure(String structure) {
- this.stucture = structure;
- }
-
- public String getStructure() {
- return stucture;
- }
-
- /**
- * Sets whether a reference will be placed in the signature itself or in the
- * manifest.
- *
- * @param childOfManifest Whether to put the reference in the signature of
- * in the manifest.
- */
- public void setChildOfManifest(boolean childOfManifest) {
- this.childOfManifest = childOfManifest;
- }
-
- public boolean isChildOfManifest() {
- return childOfManifest;
- }
-
- /**
- * Sets the data object to be signed.
- *
- * @param dataObject The data object to be signed.
- */
- public void setDataObject(Content dataObject) {
- this.dataObject = dataObject;
- }
-
- public Content getDataObject() {
- return dataObject;
- }
-
- /**
- * Sets additional information for the transformations.
- *
- * @param profile The profile containing additional information for the
- * transformations.
- */
- public void setCreateTransformsInfoProfile(CreateTransformsInfoProfile profile) {
- this.createTransformsInfoProfile = profile;
- }
-
- public CreateTransformsInfoProfile getCreateTransformsInfoProfile() {
- return createTransformsInfoProfile;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ElementSelectorImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ElementSelectorImpl.java
deleted file mode 100644
index e460bd584..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ElementSelectorImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import at.gv.egovernment.moa.spss.api.common.ElementSelector;
-
-/**
- * Default implementation of <code>ElementSelector</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class ElementSelectorImpl implements ElementSelector {
- /** The XPath expression pointing to the element. */
- private String xPathExpression;
- /** The namespace declarations to apply for evaluating the XPath */
- private Map namespaceDeclarations = new HashMap();
-
- /**
- * Sets the XPath expression pointing to the element.
- *
- * @param xPathExpression XPath expression pointing to the element.
- */
- public void setXPathExpression(String xPathExpression) {
- this.xPathExpression = xPathExpression;
- }
-
- public String getXPathExpression() {
- return xPathExpression;
- }
-
- /**
- * Sets namespace declarations to apply for evaluating the XPath.
- *
- * @param namespaceDeclarations The namespace declarations to apply for
- * evaluating the XPath.
- */
- public void setNamespaceDeclarations(Map namespaceDeclarations) {
- this.namespaceDeclarations = namespaceDeclarations;
- }
-
- public Map getNamespaceDeclarations() {
- return namespaceDeclarations;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/EnvelopedSignatureTransformImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/EnvelopedSignatureTransformImpl.java
deleted file mode 100644
index a1be3d86a..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/EnvelopedSignatureTransformImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.EnvelopedSignatureTransform;
-
-/**
- * Default implementation of <code>EnvelopedSignatureTransform</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class EnvelopedSignatureTransformImpl
- extends TransformImpl
- implements EnvelopedSignatureTransform {
-
- /**
- * Create a <code>EnvelopedSignatureTransformImpl</code>.
- */
- public EnvelopedSignatureTransformImpl() {
- setAlgorithmURI(ENVELOPED_SIGNATURE);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ErrorResponseImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ErrorResponseImpl.java
deleted file mode 100644
index d7047ab44..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ErrorResponseImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse;
-
-/**
- * Default implementation of <code>ErrorResponse</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class ErrorResponseImpl implements ErrorResponse {
- /** The error code. */
- private int code;
- /** Verbose error message. */
- private String info;
-
- /**
- * Sets the error code.
- *
- * @param code The error code.
- */
- public void setErrorCode(int code) {
- this.code = code;
- }
-
- public int getErrorCode() {
- return code;
- }
-
- /**
- * Sets the verbose error information.
- *
- * @param info The verbose error information.
- */
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getInfo() {
- return info;
- }
-
- /**
- * Gets the response type.
- *
- * @return ERROR_RESPONSE
- */
- public int getResponseType() {
- return ERROR_RESPONSE;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ExclusiveCanonicalizationTransformImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ExclusiveCanonicalizationTransformImpl.java
deleted file mode 100644
index bf21c8634..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ExclusiveCanonicalizationTransformImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.common.ExclusiveCanonicalizationTransform;
-
-/**
- * Default implementation of <code>ExclusiveCanonicalizationTransform</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ExclusiveCanonicalizationTransformImpl
- extends TransformImpl
- implements ExclusiveCanonicalizationTransform {
-
- /** The namespaces to treat according to canonical XML. */
- private List inclusiveNamespacePrefixes;
-
- /**
- * Create a <code>ExclusiveCanonicalizationTransformImpl</code> object.
- *
- * @param algorithmURI The algorithm URI identifying the transformation
- * algorithm.
- */
- public ExclusiveCanonicalizationTransformImpl(String algorithmURI) {
- setAlgorithmURI(algorithmURI);
- }
-
- /**
- * Sets the namespaces to treat according to canonical XML.
- * @param inclusiveNamespacePrefixes The namespaces to treat according to
- * canonical XML.
- */
- public void setInclusiveNamespacePrefixes(List inclusiveNamespacePrefixes) {
- this.inclusiveNamespacePrefixes =
- inclusiveNamespacePrefixes != null
- ? Collections.unmodifiableList(new ArrayList(inclusiveNamespacePrefixes))
- : null;
- }
-
- public List getInclusiveNamespacePrefixes() {
- return inclusiveNamespacePrefixes;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataBinaryImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataBinaryImpl.java
deleted file mode 100644
index 42d61559e..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataBinaryImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.io.InputStream;
-
-import at.gv.egovernment.moa.spss.MOARuntimeException;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.ContentBinary;
-import at.gv.egovernment.moa.spss.api.common.InputData;
-
-/**
- * Content wrapper decorating a binary content with two additional attributes
- * needed for returning <code>HashInputData</code> and <code>ReferenceInputData
- * </code> information as part of <code>VerifyXMLSignatureResponse</code>.
- *
- * @author Gregor Karlinger
- *
- * @version $Id$
- */
-public class InputDataBinaryImpl implements ContentBinary, InputData
-{
- /**
- * The wrapped <code>Content</code>.
- */
- protected ContentBinary wrapped_;
-
- /**
- * This attribute signals what kind of container the XMLDSIG <code>Reference</code>
- * this <code>InputData</code> belongs to is part of.
- */
- protected String partOf_;
-
- /**
- * If this <code>InputData</code> belongs to an XMLDSIG <code>Reference</code>
- * being part of either a XMLDSIGManifest or a SignatureManifest, this attribute
- * (a positive int) signals the particular <code>Reference</code> of the XMLDSIG
- * <code>SignedInfo</code> referring to the XMLDSIGManifest or SignatureManifest
- * respectively.
- */
- protected int referringReferenceNumber_;
-
- /**
- * Creates a new instance.
- *
- * @param wrapped The wrapped <code>Content</code>. Must be of type {@link Content#BINARY_CONTENT}.
- *
- * @param partOf see {@link InputData}
- *
- * @param referringReferenceNumber see {@link InputData}
- */
- public InputDataBinaryImpl(Content wrapped, String partOf, int referringReferenceNumber) throws MOARuntimeException
- {
- if (wrapped.getContentType() != Content.BINARY_CONTENT) throw new MOARuntimeException("9901", null);
-
- wrapped_ = (ContentBinary) wrapped;
- partOf_ = partOf;
- referringReferenceNumber_ = referringReferenceNumber;
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.Content#getContentType()
- */
- public int getContentType()
- {
- return wrapped_.getContentType();
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.Content#getReference()
- */
- public String getReference()
- {
- return wrapped_.getReference();
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.ContentBinary#getBinaryContent()
- */
- public InputStream getBinaryContent()
- {
- return wrapped_.getBinaryContent();
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.InputData#getPartOf()
- */
- public String getPartOf()
- {
- return partOf_;
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.InputData#getReferringReferenceNumber()
- */
- public int getReferringReferenceNumber()
- {
- return referringReferenceNumber_;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataXMLImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataXMLImpl.java
deleted file mode 100644
index 029a402f5..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/InputDataXMLImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.spss.MOARuntimeException;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.ContentXML;
-import at.gv.egovernment.moa.spss.api.common.InputData;
-
-/**
- * Content wrapper decorating an XML content with two additional attributes
- * needed for returning <code>HashInputData</code> and <code>ReferenceInputData
- * </code> information as part of <code>VerifyXMLSignatureResponse</code>.
- *
- * @author Gregor Karlinger
- *
- * @version $Id$
- */
-public class InputDataXMLImpl implements ContentXML, InputData
-{
- /**
- * The wrapped <code>ContentXML</code>.
- */
- protected ContentXML wrapped_;
-
- /**
- * This attribute signals what kind of container the XMLDSIG <code>Reference</code>
- * this <code>InputData</code> belongs to is part of.
- */
- protected String partOf_;
-
- /**
- * If this <code>InputData</code> belongs to an XMLDSIG <code>Reference</code>
- * being part of either a XMLDSIGManifest or a SignatureManifest, this attribute
- * (a positive int) signals the particular <code>Reference</code> of the XMLDSIG
- * <code>SignedInfo</code> referring to the XMLDSIGManifest or SignatureManifest
- * respectively.
- */
- protected int referringReferenceNumber_;
-
- /**
- * Creates a new instance.
- *
- * @param wrapped The wrapped <code>ContentBinary</code>. Must be of type {@link Content#XML_CONTENT}.
- *
- * @param partOf see {@link InputData}
- *
- * @param referringReferenceNumber see {@link InputData}
- */
- public InputDataXMLImpl(Content wrapped, String partOf, int referringReferenceNumber)
- {
- if (wrapped.getContentType() != Content.XML_CONTENT) throw new MOARuntimeException("9901", null);
-
- wrapped_ = (ContentXML) wrapped;
- partOf_ = partOf;
- referringReferenceNumber_ = referringReferenceNumber;
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.Content#getContentType()
- */
- public int getContentType()
- {
- return wrapped_.getContentType();
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.Content#getReference()
- */
- public String getReference()
- {
- return wrapped_.getReference();
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.ContentXML#getXMLContent()
- */
- public NodeList getXMLContent()
- {
- return wrapped_.getXMLContent();
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.InputData#getPartOf()
- */
- public String getPartOf()
- {
- return partOf_;
- }
-
- /**
- * @see at.gv.egovernment.moa.spss.api.common.InputData#getReferringReferenceNumber()
- */
- public int getReferringReferenceNumber()
- {
- return referringReferenceNumber_;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultImpl.java
deleted file mode 100644
index 9174e3a46..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResultInfo;
-
-/**
- * Default implementation of <code>ManifestRefsCheckResult</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class ManifestRefsCheckResultImpl implements ManifestRefsCheckResult {
- /** The numerical check code. */
- private int code;
- /** Additional information about the check. */
- private ManifestRefsCheckResultInfo info;
-
- /**
- * Sets the check code.
- *
- * @param code A numerical representation of the result of the manifest check.
- */
- public void setCode(int code) {
- this.code = code;
- }
-
- public int getCode() {
- return code;
- }
-
- /**
- * Sets a reference to the manifest.
- *
- * @param info The reference to the manifest.
- */
- public void setInfo(ManifestRefsCheckResultInfo info) {
- this.info = info;
- }
-
- public ManifestRefsCheckResultInfo getInfo() {
- return info;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultInfoImpl.java
deleted file mode 100644
index 0071a14f3..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ManifestRefsCheckResultInfoImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResultInfo;
-
-/**
- * Default implementation of <code>ManifestRefsCheckResultInfo</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class ManifestRefsCheckResultInfoImpl
- extends ReferencesCheckResultInfoImpl
- implements ManifestRefsCheckResultInfo {
-
- /** The position of the signature reference containing the reference to the
- * manifest being described by this object.*/
- private int referringSignatureReference;
-
- /**
- * Sets the position of the signature reference containing the reference to
- * the manifest being described by this object.
- * @param referringSignatureReference The position of the signature reference.
- */
- public void setReferringSignatureReference(int referringSignatureReference) {
- this.referringSignatureReference = referringSignatureReference;
- }
-
- public int getReferringSignatureReference() {
- return referringSignatureReference;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java
deleted file mode 100644
index 93aceb033..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-
-/**
- * Default implementation of <code>MetaInfo</code>.
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class MetaInfoImpl implements MetaInfo {
- /** Information about the MIME type. */
- private String mimeType;
- /** URI pointing to a description of the content. */
- private String description;
- /** Descriptive XML content. */
- private NodeList anyElements;
- /** Type information for XML signature creation */
- private String type;
-
- /**
- * Sets the MIME type.
- *
- * @param mimeType The MIME type to set.
- */
- public void setMimeType(String mimeType) {
- this.mimeType = mimeType;
- }
-
- public String getMimeType() {
- return mimeType;
- }
-
- /**
- * Sets the URI pointing to a description of the content.
- *
- * @param description The URI pointing to a description of the content.
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets descriptive XML content.
- *
- * @param anyElements The elements to set.
- */
- public void setAnyElements(NodeList anyElements) {
- this.anyElements = anyElements;
- }
-
- public NodeList getAnyElements() {
- return anyElements;
- }
-
- /**
- * Sets the XML signature creation type information.
- *
- * @param type the XML signature creation type information to set.
- */
- public void setType(String type) {
- this.type = type;
- }
-
- public String getType() {
- return type;
- }
-
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferenceInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferenceInfoImpl.java
deleted file mode 100644
index 923a4bce1..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferenceInfoImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
-
-/**
- * Default implementation of <code>ReferenceInfo</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class ReferenceInfoImpl implements ReferenceInfo {
- /** Profile containing the transforms allowed in the signature. */
- private List verifyTransformsInfoProfiles;
-
- /**
- * Sets the transforms profile used for verifying the transforms contained
- * in the signature.
- *
- * @param verifyTransformsInfoProfiles The profiles containing the transforms
- * allowed in the signature.
- */
- public void setVerifyTransformsInfoProfiles(List verifyTransformsInfoProfiles) {
- this.verifyTransformsInfoProfiles =
- verifyTransformsInfoProfiles != null
- ? Collections.unmodifiableList(
- new ArrayList(verifyTransformsInfoProfiles))
- : null;
- }
-
- public List getVerifyTransformsInfoProfiles() {
- return verifyTransformsInfoProfiles;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultImpl.java
deleted file mode 100644
index 6bb4d30ac..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResultInfo;
-
-/**
- * Default implementation of <code>ReferencesCheckResult</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ReferencesCheckResultImpl implements ReferencesCheckResult {
- /** The check code. */
- private int code;
- /** Additional information about the reference check. */
- private ReferencesCheckResultInfo info;
-
- /**
- * Sets the check code.
- *
- * @param code A numerical representation of the result of the reference
- * check.
- */
- public void setCode(int code) {
- this.code = code;
- }
-
- public int getCode() {
- return code;
- }
-
- /**
- * Sets additional information about the reference check.
- *
- * @param manifestRefsCheckResultInfo Additional information about the
- * reference check.
- */
- public void setInfo(ReferencesCheckResultInfo manifestRefsCheckResultInfo) {
- this.info = manifestRefsCheckResultInfo;
- }
-
- public ReferencesCheckResultInfo getInfo() {
- return info;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultInfoImpl.java
deleted file mode 100644
index a21b417ae..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/ReferencesCheckResultInfoImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResultInfo;
-
-/**
- * Default implementation of <code>ReferencesCheckResultInfo</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ReferencesCheckResultInfoImpl
- implements ReferencesCheckResultInfo {
-
- /** Additional information about the references check. */
- private NodeList anyOtherInfo;
- /** The indexes of the failed references. */
- private int[] failedReferences = new int[0];
-
- /**
- * Sets additional information about the references check.
- * @param anyOtherInfo Additional information about the references check.
- */
- public void setAnyOtherInfo(NodeList anyOtherInfo) {
- this.anyOtherInfo = anyOtherInfo;
- }
-
- public NodeList getAnyOtherInfo() {
- return anyOtherInfo;
- }
-
- /**
- * Sets the indexes of the failed references.
- *
- * @param failedReferences The indexes of the failed references.
- */
- public void setFailedReferences(int[] failedReferences) {
- this.failedReferences = failedReferences;
- }
-
- public int[] getFailedReferences() {
- return failedReferences;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
deleted file mode 100644
index bf15bf37e..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
+++ /dev/null
@@ -1,568 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-import at.gv.egovernment.moa.spss.api.common.Transform;
-import at.gv.egovernment.moa.spss.api.common.X509IssuerSerial;
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-import at.gv.egovernment.moa.spss.api.common.XPathFilter;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResultInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResultInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.SignatureManifestCheckParams;
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile;
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
-/**
- * Default implementation of <code>SPSSFactory</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class SPSSFactoryImpl extends SPSSFactory {
-
- public CreateXMLSignatureRequest createCreateXMLSignatureRequest(
- String keyIdentifier,
- List singleSignatureInfos) {
- CreateXMLSignatureRequestImpl createXMLSignatureRequest =
- new CreateXMLSignatureRequestImpl();
- createXMLSignatureRequest.setKeyIdentifier(keyIdentifier);
- createXMLSignatureRequest.setSingleSignatureInfos(singleSignatureInfos);
- return createXMLSignatureRequest;
- }
-
- public SingleSignatureInfo createSingleSignatureInfo(
- List dataObjectInfos,
- CreateSignatureInfo createSignatureInfo,
- boolean securityLayerConform) {
- SingleSignatureInfoImpl singleSignatureInfo = new SingleSignatureInfoImpl();
- singleSignatureInfo.setDataObjectInfos(dataObjectInfos);
- singleSignatureInfo.setCreateSignatureInfo(createSignatureInfo);
- singleSignatureInfo.setSecurityLayerConform(securityLayerConform);
- return singleSignatureInfo;
- }
- public DataObjectInfo createDataObjectInfo(
- String structure,
- boolean childOfManifest,
- Content dataObject,
- CreateTransformsInfoProfile createTransformsInfoProfile) {
- DataObjectInfoImpl dataObjectInfo = new DataObjectInfoImpl();
- dataObjectInfo.setStructure(structure);
- dataObjectInfo.setChildOfManifest(childOfManifest);
- dataObjectInfo.setDataObject(dataObject);
- dataObjectInfo.setCreateTransformsInfoProfile(createTransformsInfoProfile);
- return dataObjectInfo;
- }
-
- public CreateTransformsInfoProfile createCreateTransformsInfoProfile(String profileID) {
-
- CreateTransformsInfoProfileIDImpl createTransformsInfoProfile =
- new CreateTransformsInfoProfileIDImpl();
- createTransformsInfoProfile.setCreateTransformsInfoProfileID(profileID);
- return createTransformsInfoProfile;
- }
-
- public CreateTransformsInfoProfile createCreateTransformsInfoProfile(
- CreateTransformsInfo transformsInfo,
- List supplements) {
- CreateTransformsInfoProfileExplicitImpl createTransformsInfoProfile =
- new CreateTransformsInfoProfileExplicitImpl();
- createTransformsInfoProfile.setCreateTransformsInfo(transformsInfo);
- createTransformsInfoProfile.setSupplements(supplements);
- return createTransformsInfoProfile;
- }
-
- public CreateTransformsInfo createCreateTransformsInfo(
- List transforms,
- MetaInfo finalDataMetaInfo) {
- CreateTransformsInfoImpl createTransformsInfo =
- new CreateTransformsInfoImpl();
-
- createTransformsInfo.setTransforms(transforms);
- createTransformsInfo.setFinalDataMetaInfo(finalDataMetaInfo);
- return createTransformsInfo;
- }
-
- public CreateSignatureInfo createCreateSignatureInfo(
- Content createSignatureEnvironment,
- CreateSignatureEnvironmentProfile createSignatureEnvironmentProfile) {
- CreateSignatureInfoImpl createSignatureInfo = new CreateSignatureInfoImpl();
- createSignatureInfo.setCreateSignatureEnvironment(
- createSignatureEnvironment);
- createSignatureInfo.setCreateSignatureEnvironmentProfile(
- createSignatureEnvironmentProfile);
- return createSignatureInfo;
- }
-
- public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile(
- CreateSignatureLocation createSignatureLocation,
- List supplements) {
- CreateSignatureEnvironmentProfileExplicitImpl createSignatureEnvironmentProfile =
- new CreateSignatureEnvironmentProfileExplicitImpl();
- createSignatureEnvironmentProfile.setCreateSignatureLocation(
- createSignatureLocation);
- createSignatureEnvironmentProfile.setSupplements(supplements);
- return createSignatureEnvironmentProfile;
- }
-
- public CreateSignatureLocation createCreateSignatureLocation(
- String signatureLocationXPath,
- int signatureLocationIndex,
- Map namespaceDeclarations) {
- CreateSignatureLocationImpl createSignatureLocation =
- new CreateSignatureLocationImpl();
- createSignatureLocation.setIndex(signatureLocationIndex);
- createSignatureLocation.setNamespaceDeclarations(namespaceDeclarations);
- createSignatureLocation.setXPathExpression(signatureLocationXPath);
- return createSignatureLocation;
- }
-
- public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile(String profileID) {
- CreateSignatureEnvironmentProfileIDImpl createSignatureEnvironmentProfile =
- new CreateSignatureEnvironmentProfileIDImpl();
- createSignatureEnvironmentProfile.setCreateSignatureEnvironmentProfileID(
- profileID);
- return createSignatureEnvironmentProfile;
- }
-
- public CreateXMLSignatureResponse createCreateXMLSignatureResponse(List responseElements) {
- CreateXMLSignatureResponseImpl createXMLSignatureResponse =
- new CreateXMLSignatureResponseImpl();
- createXMLSignatureResponse.setResponseElements(responseElements);
- return createXMLSignatureResponse;
- }
-
- public SignatureEnvironmentResponse createSignatureEnvironmentResponse(Element signatureEnvironment) {
- SignatureEnvironmentResponseImpl signatureEnvironmentResponse =
- new SignatureEnvironmentResponseImpl();
- signatureEnvironmentResponse.setSignatureEnvironment(signatureEnvironment);
- return signatureEnvironmentResponse;
- }
-
- public ErrorResponse createErrorResponse(int code, String info) {
- ErrorResponseImpl errorResponse = new ErrorResponseImpl();
- errorResponse.setErrorCode(code);
- errorResponse.setInfo(info);
- return errorResponse;
- }
-
- public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest(
- int[] signatories,
- Date dateTime,
- InputStream cmsSignature,
- CMSDataObject dataObject,
- String trustProfileID) {
- VerifyCMSSignatureRequestImpl verifyCMSSignatureRequest =
- new VerifyCMSSignatureRequestImpl();
- verifyCMSSignatureRequest.setDateTime(dateTime);
- verifyCMSSignatureRequest.setCMSSignature(cmsSignature);
- verifyCMSSignatureRequest.setDataObject(dataObject);
- verifyCMSSignatureRequest.setTrustProfileId(trustProfileID);
- verifyCMSSignatureRequest.setSignatories(signatories);
- return verifyCMSSignatureRequest;
- }
-
- public CMSDataObject createCMSDataObject(
- MetaInfo metaInfo,
- CMSContent content) {
-
- CMSDataObjectImpl cmsDataObject = new CMSDataObjectImpl();
- cmsDataObject.setMetaInfo(metaInfo);
- cmsDataObject.setContent(content);
-
- return cmsDataObject;
- }
-
- public CMSContent createCMSContent(InputStream binaryContent) {
- CMSContentExplicitImpl cmsContent = new CMSContentExplicitImpl();
-
- cmsContent.setBinaryContent(binaryContent);
- return cmsContent;
- }
-
- public CMSContent createCMSContent(String referenceURI) {
- CMSContentReferenceImpl cmsContent = new CMSContentReferenceImpl();
-
- cmsContent.setReference(referenceURI);
- return cmsContent;
- }
-
-
- public CMSDataObject createCMSDataObject(
- MetaInfo metaInfo,
- String referenceURI) {
- CMSDataObjectImpl cmsDataObject = new CMSDataObjectImpl();
- CMSContentReferenceImpl cmsContent = new CMSContentReferenceImpl();
- cmsDataObject.setMetaInfo(metaInfo);
- cmsContent.setReference(referenceURI);
- return cmsDataObject;
- }
-
- public VerifyCMSSignatureResponse createVerifyCMSSignatureResponse(List responseElements) {
- VerifyCMSSinatureResponseImpl verifyCMSSignatureResponse =
- new VerifyCMSSinatureResponseImpl();
- verifyCMSSignatureResponse.setResponseElements(responseElements);
- return verifyCMSSignatureResponse;
- }
-
- public VerifyCMSSignatureResponseElement createVerifyCMSSignatureResponseElement(
- SignerInfo signerInfo,
- CheckResult signatureCheck,
- CheckResult certificateCheck) {
- VerifyCMSSignatureResponseElementImpl verifyCMSSignatureResponseElement =
- new VerifyCMSSignatureResponseElementImpl();
- verifyCMSSignatureResponseElement.setSignerInfo(signerInfo);
- verifyCMSSignatureResponseElement.setSignatureCheck(signatureCheck);
- verifyCMSSignatureResponseElement.setCertificateCheck(certificateCheck);
- return verifyCMSSignatureResponseElement;
- }
-
- public VerifyXMLSignatureRequest createVerifyXMLSignatureRequest(
- Date dateTime,
- VerifySignatureInfo verifySignatureInfo,
- List supplementProfiles,
- SignatureManifestCheckParams signatureManifestParams,
- boolean returnHashInputData,
- String trustProfileID) {
- VerifyXMLSignatureRequestImpl verifyXMLSignatureRequest =
- new VerifyXMLSignatureRequestImpl();
- verifyXMLSignatureRequest.setDateTime(dateTime);
- verifyXMLSignatureRequest.setSignatureInfo(verifySignatureInfo);
- verifyXMLSignatureRequest.setSupplementProfiles(supplementProfiles);
- verifyXMLSignatureRequest.setSignatureManifestCheckParams(
- signatureManifestParams);
- verifyXMLSignatureRequest.setReturnHashInputData(returnHashInputData);
- verifyXMLSignatureRequest.setTrustProfileId(trustProfileID);
- return verifyXMLSignatureRequest;
- }
-
- public VerifySignatureInfo createVerifySignatureInfo(
- Content verifySignatureEnvironment,
- VerifySignatureLocation verifySignatureLocation) {
- VerifySignatureInfoImpl verifySignatureInfo = new VerifySignatureInfoImpl();
- verifySignatureInfo.setVerifySignatureEnvironment(
- verifySignatureEnvironment);
- verifySignatureInfo.setVerifySignatureLocation(verifySignatureLocation);
- return verifySignatureInfo;
- }
-
- public VerifySignatureLocation createVerifySignatureLocation(
- String xPathExpression,
- Map namespaceDeclarations) {
- VerifySignatureLocationImpl verifySignatureLocation =
- new VerifySignatureLocationImpl();
- verifySignatureLocation.setXPathExpression(xPathExpression);
- verifySignatureLocation.setNamespaceDeclarations(namespaceDeclarations);
- return verifySignatureLocation;
- }
-
- public SupplementProfile createSupplementProfile(String profileID) {
- SupplementProfileIDImpl supplementProfileID = new SupplementProfileIDImpl();
- supplementProfileID.setSupplementProfileID(profileID);
- return supplementProfileID;
- }
-
- public SupplementProfile createSupplementProfile(XMLDataObjectAssociation supplementProfile) {
- SupplementProfileExplicitImpl supplementProfileExplicit =
- new SupplementProfileExplicitImpl();
- supplementProfileExplicit.setSupplementProfile(supplementProfile);
- return supplementProfileExplicit;
- }
-
- public SignatureManifestCheckParams createSignatureManifestCheckParams(
- List referenceInfos,
- boolean returnReferenceInputData) {
- SignatureManifestCheckParamsImpl signatureManifestCheckParams =
- new SignatureManifestCheckParamsImpl();
- signatureManifestCheckParams.setReferenceInfos(referenceInfos);
- signatureManifestCheckParams.setReturnReferenceInputData(
- returnReferenceInputData);
- return signatureManifestCheckParams;
- }
-
- public ReferenceInfo createReferenceInfo(List verifyTransformsInfoProfiles) {
- ReferenceInfoImpl referenceInfo = new ReferenceInfoImpl();
- referenceInfo.setVerifyTransformsInfoProfiles(verifyTransformsInfoProfiles);
- return referenceInfo;
- }
-
- public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile(
- List transforms,
- List transformParameters) {
- VerifyTransformsInfoProfileExplicitImpl verifyTransformsInfoProfile =
- new VerifyTransformsInfoProfileExplicitImpl();
-
- verifyTransformsInfoProfile.setTransforms(transforms);
- verifyTransformsInfoProfile.setTransformParameters(transformParameters);
-
- return verifyTransformsInfoProfile;
- }
-
- public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile(String profileID) {
- VerifyTransformsInfoProfileIDImpl verifyTransformsInfoProfile =
- new VerifyTransformsInfoProfileIDImpl();
- verifyTransformsInfoProfile.setVerifyTransformsInfoProfileID(profileID);
- return verifyTransformsInfoProfile;
- }
-
-
- public TransformParameter createTransformParameter(String URI, String digestMethod, byte[] digestValue) {
- TransformPatameterHashImpl transformParameter =
- new TransformPatameterHashImpl();
- transformParameter.setURI(URI);
- transformParameter.setDigestMethod(digestMethod);
- transformParameter.setDigestValue(digestValue);
- return transformParameter;
- }
-
- public TransformParameter createTransformParameter(
- String URI,
- InputStream binaryData) {
- TransformParameterBinaryImpl transformParameter =
- new TransformParameterBinaryImpl();
- transformParameter.setURI(URI);
- transformParameter.setBinaryContent(binaryData);
- return transformParameter;
- }
-
- public TransformParameter createTransformParameter(String URI) {
- TransformParameterURIImpl transformParameter =
- new TransformParameterURIImpl();
- transformParameter.setURI(URI);
- return transformParameter;
- }
-
- public VerifyXMLSignatureResponse createVerifyXMLSignatureResponse(
- SignerInfo signerInfo,
- List hashInputDatas,
- List referenceInputDatas,
- ReferencesCheckResult signatureCheck,
- ReferencesCheckResult signatureManifestCheck,
- List xmlDsigManifestChecks,
- CheckResult certificateCheck) {
- VerifyXMLSignatureResponseImpl verifyXMLSignatureResponse =
- new VerifyXMLSignatureResponseImpl();
- verifyXMLSignatureResponse.setSignerInfo(signerInfo);
- verifyXMLSignatureResponse.setHashInputDatas(hashInputDatas);
- verifyXMLSignatureResponse.setReferenceInputDatas(referenceInputDatas);
- verifyXMLSignatureResponse.setSignatureCheck(signatureCheck);
- verifyXMLSignatureResponse.setSignatureManifestCheck(
- signatureManifestCheck);
- verifyXMLSignatureResponse.setXMLDsigManifestChecks(xmlDsigManifestChecks);
- verifyXMLSignatureResponse.setCertificateCheck(certificateCheck);
- return verifyXMLSignatureResponse;
- }
-
- public ReferencesCheckResult createReferencesCheckResult(
- int code,
- ReferencesCheckResultInfo info) {
- ReferencesCheckResultImpl referencesCheckResult =
- new ReferencesCheckResultImpl();
- referencesCheckResult.setCode(code);
- referencesCheckResult.setInfo(info);
- return referencesCheckResult;
- }
-
- public ReferencesCheckResultInfo createReferencesCheckResultInfo(
- NodeList anyOtherInfo,
- int[] failedReferences) {
- ReferencesCheckResultInfoImpl referencesCheckResultInfo =
- new ReferencesCheckResultInfoImpl();
- referencesCheckResultInfo.setAnyOtherInfo(anyOtherInfo);
- referencesCheckResultInfo.setFailedReferences(failedReferences);
- return referencesCheckResultInfo;
- }
-
- public ManifestRefsCheckResult createManifestRefsCheckResult(
- int code,
- ManifestRefsCheckResultInfo info) {
- ManifestRefsCheckResultImpl manifestRefsCheckResult =
- new ManifestRefsCheckResultImpl();
- manifestRefsCheckResult.setCode(code);
- manifestRefsCheckResult.setInfo(info);
- return manifestRefsCheckResult;
- }
-
- public ManifestRefsCheckResultInfo createManifestRefsCheckResultInfo(
- NodeList anyOtherInfo,
- int[] failedReferences,
- int referringSigReference) {
- ManifestRefsCheckResultInfoImpl manifestRefsCheckResultInfo =
- new ManifestRefsCheckResultInfoImpl();
- manifestRefsCheckResultInfo.setAnyOtherInfo(anyOtherInfo);
- manifestRefsCheckResultInfo.setReferringSignatureReference(
- referringSigReference);
- manifestRefsCheckResultInfo.setFailedReferences(failedReferences);
- return manifestRefsCheckResultInfo;
- }
-
- public Content createContent(InputStream binaryData, String referenceURI) {
- ContentBinaryImpl content = new ContentBinaryImpl();
- content.setBinaryContent(binaryData);
- content.setReference(referenceURI);
- return content;
- }
-
- public Content createContent(String locationReferenceURI, String referenceURI) {
- ContentLocRefImpl content = new ContentLocRefImpl();
- content.setLocationReferenceURI(locationReferenceURI);
- content.setReference(referenceURI);
- return content;
- }
-
- public Content createContent(String referenceURI) {
- ContentReferenceImpl content = new ContentReferenceImpl();
- content.setReference(referenceURI);
- return content;
- }
-
- public Content createContent(NodeList xmlData, String referenceURI) {
- ContentXMLImpl content = new ContentXMLImpl();
- content.setXMLContent(xmlData);
- content.setReference(referenceURI);
- return content;
- }
-
- public XMLDataObjectAssociation createXMLDataObjectAssociation(
- MetaInfo metaInfo,
- Content xmlContent) {
- XMLDataObjectAssociationImpl xmlDataObjectAssociation =
- new XMLDataObjectAssociationImpl();
- xmlDataObjectAssociation.setMetaInfo(metaInfo);
- xmlDataObjectAssociation.setContent(xmlContent);
- return xmlDataObjectAssociation;
- }
-
- public MetaInfo createMetaInfo(
- String mimeType,
- String description,
- NodeList otherInfo,
- String type) {
- MetaInfoImpl metaInfo = new MetaInfoImpl();
- metaInfo.setMimeType(mimeType);
- metaInfo.setDescription(description);
- metaInfo.setAnyElements(otherInfo);
- metaInfo.setType(type);
- return metaInfo;
- }
-
- public Transform createCanonicalizationTransform(String algorithmURI) {
- CanonicalizationTransformImpl transform = new CanonicalizationTransformImpl(algorithmURI);
- return transform;
- }
-
- public Transform createExclusiveCanonicalizationTransform(String algorithmURI, List inclusiveNamespacePrefixes) {
- ExclusiveCanonicalizationTransformImpl transform = new ExclusiveCanonicalizationTransformImpl(algorithmURI);
- transform.setInclusiveNamespacePrefixes(inclusiveNamespacePrefixes);
- return transform;
- }
-
- public Transform createBase64Transform() {
- Base64TransformImpl transform = new Base64TransformImpl();
- return transform;
- }
-
- public Transform createEnvelopedSignatureTransform() {
- EnvelopedSignatureTransformImpl transform =
- new EnvelopedSignatureTransformImpl();
- return transform;
- }
-
- public Transform createXSLTTransform(Element styleSheet) {
- XSLTransformImpl transform = new XSLTransformImpl();
- transform.setStylesheet(styleSheet);
- return transform;
- }
-
- public Transform createXPathTransform(
- String xPathExpression,
- Map namespaceDeclarations) {
- XPathTransformImpl transform = new XPathTransformImpl();
- transform.setXPathExpression(xPathExpression);
- transform.setNamespaceDelcarations(namespaceDeclarations);
- return transform;
- }
-
- public Transform createXPathFilter2Transform(List xPathFilters) {
- XPathFilter2TransformImpl transform = new XPathFilter2TransformImpl();
- transform.setFilters(xPathFilters);
- return transform;
- }
-
- public XPathFilter createXPathFilter(
- String filterType,
- String xPathExpression,
- Map namespaceDeclarations) {
- XPathFilterImpl xPathFilter = new XPathFilterImpl();
- xPathFilter.setFilterType(filterType);
- xPathFilter.setXPathExpression(xPathExpression);
- xPathFilter.setNamespaceDelcarations(namespaceDeclarations);
- return xPathFilter;
- }
-
- public CheckResult createCheckResult(int code, NodeList info) {
- CheckResultImpl checkResult = new CheckResultImpl();
- checkResult.setCode(code);
- checkResult.setInfo(info);
- return checkResult;
- }
-
- public SignerInfo createSignerInfo(
- X509Certificate signerCertificate,
- boolean qualifiedCertificate,
- boolean publicAuthority,
- String publicAuthorityID) {
- SignerInfoImpl signerInfo = new SignerInfoImpl();
- signerInfo.setSignerCertificate(signerCertificate);
- signerInfo.setQualifiedCertificate(qualifiedCertificate);
- signerInfo.setPublicAuthority(publicAuthority);
- signerInfo.setPublicAuhtorityID(publicAuthorityID);
- return signerInfo;
- }
-
- public X509IssuerSerial createX509IssuerSerial(
- String issuerName,
- BigInteger serialNumber) {
- X509IssuerSerialImpl x509IssuerSerial = new X509IssuerSerialImpl();
- x509IssuerSerial.setX509IssuerName(issuerName);
- x509IssuerSerial.setX509SerialNumber(serialNumber);
- return x509IssuerSerial;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureEnvironmentResponseImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureEnvironmentResponseImpl.java
deleted file mode 100644
index 57d30ad3b..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureEnvironmentResponseImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
-
-/**
- * Default implementation of <code>SignatureEnvironmentResponse</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class SignatureEnvironmentResponseImpl
- implements SignatureEnvironmentResponse {
-
- /** The signature environment containing the XML signature. */
- private Element signatureEnvironment;
-
- /**
- * Sets the XML structure which contains the signature.
- *
- * @param signatureEnvironment A general XML structure containing the signature.
- */
- public void setSignatureEnvironment(Element signatureEnvironment) {
- this.signatureEnvironment = signatureEnvironment;
- }
-
- public Element getSignatureEnvironment() {
- return signatureEnvironment;
- }
-
- /**
- * Gets the type of <code>CreateXMLSignatureResponseElement</code>.
- *
- * @return SIGNATURE_ENVIRONMENT_RESPONSE
- */
- public int getResponseType() {
- return SIGNATURE_ENVIRONMENT_RESPONSE;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureManifestCheckParamsImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureManifestCheckParamsImpl.java
deleted file mode 100644
index 5924f8447..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignatureManifestCheckParamsImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.SignatureManifestCheckParams;
-
-/**
- * Default implementation of <code>SignatureManifestCheckParams</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class SignatureManifestCheckParamsImpl
- implements SignatureManifestCheckParams {
-
- /** Referential information. */
- private List referenceInfos;
- /** Whether to return the signature source data. */
- private boolean returnReferenceInputData = true;
-
- /**
- * Sets the referantial information.
- *
- * @param referenceInfos The referential information.
- */
- public void setReferenceInfos(List referenceInfos) {
- this.referenceInfos =
- referenceInfos != null
- ? Collections.unmodifiableList(new ArrayList(referenceInfos))
- : null;
- }
-
- public List getReferenceInfos() {
- return referenceInfos;
- }
-
- /**
- * Sets whether to return signature source data.
- *
- * @param returnReferenceInputData Whether to return signature source data.
- */
- public void setReturnReferenceInputData(boolean returnReferenceInputData) {
- this.returnReferenceInputData = returnReferenceInputData;
- }
-
- public boolean getReturnReferenceInputData() {
- return returnReferenceInputData;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignerInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignerInfoImpl.java
deleted file mode 100644
index 277f1a008..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SignerInfoImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.security.cert.X509Certificate;
-
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-
-/**
- * Default implementation of <code>SignerInfo</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class SignerInfoImpl implements SignerInfo {
-
- /** The signer certificate. */
- private X509Certificate signerCertificate;
- /** Determines, whether <code>signerCertificate</code> is a qualified
- * certificate. */
- private boolean qualifiedCertificate;
- /** Determines, whether <code>signerCertificate</code> is from a public
- * authority. */
- private boolean publicAuthority;
- /** The public authority ID of the <code>signerCertificate</code>. */
- private String publicAuthorityID;
-
- /**
- * Sets the signer certificate.
- *
- * @param signerCertificate The signer certificate.
- */
- public void setSignerCertificate(X509Certificate signerCertificate) {
- this.signerCertificate = signerCertificate;
- }
-
- public X509Certificate getSignerCertificate() {
- return signerCertificate;
- }
-
- /**
- * Sets, whether the certificate contained in this object is qualified or not.
- *
- * @param qualifiedCertificate Is <code>true</code>, if the certificate is
- * qualified, otherwise <code>false</code>.
- */
- public void setQualifiedCertificate(boolean qualifiedCertificate) {
- this.qualifiedCertificate = qualifiedCertificate;
- }
-
- public boolean isQualifiedCertificate() {
- return qualifiedCertificate;
- }
-
- /**
- * Sets, whether the certificate contained in this object is an
- * e-government certificate or not.
- *
- * @param publicAuthority Is <code>true</code>, if the certificate is
- * public authority certificate, otherwise <code>false</code>.
- */
- public void setPublicAuthority(boolean publicAuthority) {
- this.publicAuthority = publicAuthority;
- }
-
- public boolean isPublicAuthority() {
- return publicAuthority;
- }
-
- /**
- * Sets the public authority ID of the signer certificate.
- *
- * @param publicAuhtorityID The public authority ID of the signer certificate.
- */
- public void setPublicAuhtorityID(String publicAuhtorityID) {
- this.publicAuthorityID = publicAuhtorityID;
- }
-
- public String getPublicAuhtorityID() {
- return publicAuthorityID;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SingleSignatureInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SingleSignatureInfoImpl.java
deleted file mode 100644
index b50a65c68..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SingleSignatureInfoImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
-
-/**
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class SingleSignatureInfoImpl implements SingleSignatureInfo {
-
- private List dataObjectInfos = new ArrayList();
-
- private CreateSignatureInfo createSignatureInfo;
-
- private boolean securityLayerConform = true;
-
- public void setDataObjectInfos(List dataObjectInfos) {
- this.dataObjectInfos =
- dataObjectInfos != null
- ? Collections.unmodifiableList(new ArrayList(dataObjectInfos))
- : null;
- }
-
- public List getDataObjectInfos() {
- return dataObjectInfos;
- }
-
- public void setCreateSignatureInfo(CreateSignatureInfo createSignatureInfo) {
- this.createSignatureInfo = createSignatureInfo;
- }
-
- public CreateSignatureInfo getCreateSignatureInfo() {
- return createSignatureInfo;
- }
-
- public void setSecurityLayerConform(boolean securityLayerConform) {
- this.securityLayerConform = securityLayerConform;
- }
-
- public boolean isSecurityLayerConform() {
- return securityLayerConform;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileExplicitImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileExplicitImpl.java
deleted file mode 100644
index 78723fec2..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileExplicitImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfileExplicit;
-
-/**
- * Default implementation of <code>SupplementProfileExplicit</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class SupplementProfileExplicitImpl implements SupplementProfileExplicit {
-
- /** Supplemental information for verifying a signature. */
- private XMLDataObjectAssociation supplement;
-
- /**
- * Sets the supplemental information for verifying a signature.
- *
- * @param supplement The supplemental information for verifying a signature.
- */
- public void setSupplementProfile(XMLDataObjectAssociation supplement) {
- this.supplement = supplement;
- }
-
- public XMLDataObjectAssociation getSupplementProfile() {
- return supplement;
- }
-
- /**
- * Gets the type of <code>SupplementProfile</code>.
- *
- * @return EXPLICIT_SUPPLEMENTPROFILE
- */
- public int getSupplementProfileType() {
- return EXPLICIT_SUPPLEMENTPROFILE;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileIDImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileIDImpl.java
deleted file mode 100644
index 320827fad..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SupplementProfileIDImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfileID;
-
-/**
- * Default implementation of <code>SupplementProfileID</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class SupplementProfileIDImpl implements SupplementProfileID {
- /** The profile ID. */
- private String profileID;
-
- /**
- * Sets the <code>SupplementProfile</code> profile ID.
- *
- * @param profileID The profile ID.
- */
- public void setSupplementProfileID(String profileID) {
- this.profileID = profileID;
- }
-
- public String getSupplementProfileID() {
- return profileID;
- }
-
- /**
- * Gets the type of <code>SupplementProfile</code>.
- *
- * @return ID_SUPPLEMENTPROFILE
- */
- public int getSupplementProfileType() {
- return ID_SUPPLEMENTPROFILE;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformImpl.java
deleted file mode 100644
index 51c7a543f..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.Transform;
-
-/**
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class TransformImpl implements Transform {
- /** The URI identifying the transformation algorithm. */
- private String algorithmURI;
-
- /**
- * Sets the URI identifying the transformation algorithm.
- *
- * @param algorithmURI The URI identifying the transformation algorithm.
- */
- public void setAlgorithmURI(String algorithmURI) {
- this.algorithmURI = algorithmURI;
- }
-
- public String getAlgorithmURI() {
- return algorithmURI;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterBinaryImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterBinaryImpl.java
deleted file mode 100644
index 2901fb1bb..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterBinaryImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.io.InputStream;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameterBinary;
-
-/**
- * Default implementation of <code>TransformParameterBinary</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class TransformParameterBinaryImpl
- extends TransformParameterImpl
- implements TransformParameterBinary {
-
- /** The binary content as a stream. */
- private InputStream binaryContent;
-
- /**
- * Sets the binary content as a stream.
- *
- * @param binaryContent The binary content as a stream.
- */
- public void setBinaryContent(InputStream binaryContent) {
- this.binaryContent = binaryContent;
- }
-
- public InputStream getBinaryContent() {
- return binaryContent;
- }
-
- /**
- * Gets the <code>TransformParameter</code> type.
- *
- * @return BINARY_TRANSFORMPARAMETER
- */
- public int getTransformParameterType() {
- return BINARY_TRANSFORMPARAMETER;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterImpl.java
deleted file mode 100644
index 9fe60638e..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-/**
- * Default base implementation of <code>TransformParameter</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class TransformParameterImpl {
- /** An URI identifying the <code>TransformParameter</code>. */
- private String uri;
-
- /**
- * Sets the URI identifying the <code>TransformParameter</code>.
- * @param uri The URI identifying the <code>TransformParameter</code>.
- */
- public void setURI(String uri) {
- this.uri = uri;
- }
-
- public String getURI() {
- return uri;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterURIImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterURIImpl.java
deleted file mode 100644
index 25449504c..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformParameterURIImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameterURI;
-
-/**
- * Default implementation of <code>TransformParameterURI</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class TransformParameterURIImpl
- extends TransformParameterImpl
- implements TransformParameterURI {
-
- /**
- * Gets the type of <code>TransformParameter</code>.
- *
- * @return URI_TRANSFORMPARAMETER
- */
- public int getTransformParameterType() {
- return URI_TRANSFORMPARAMETER;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformPatameterHashImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformPatameterHashImpl.java
deleted file mode 100644
index a7843e68c..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/TransformPatameterHashImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameterHash;
-
-/**
- * Default implementation of <code>TransformParameterHash</code>
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class TransformPatameterHashImpl
- extends TransformParameterImpl
- implements TransformParameterHash {
-
- /** The method used to calculate the digest value. */
- private String digestMethod;
- /** The digest value. */
- private byte[] digestValue;
-
- /**
- * Sets method used to calculate the digest value.
- * @param digestMethod The method used to calculate the digest value.
- */
- public void setDigestMethod(String digestMethod) {
- this.digestMethod = digestMethod;
- }
-
- public String getDigestMethod() {
- return digestMethod;
- }
-
- /**
- * Sets the digest value.
- *
- * @param digestValue The digest value.
- */
- public void setDigestValue(byte[] digestValue) {
- this.digestValue = digestValue;
- }
-
- public byte[] getDigestValue() {
- return digestValue;
- }
-
- /**
- * Gets the type of <code>TransformParameter</code>.
- *
- * @return HASH_TRANSFORMPARAMETER
- */
- public int getTransformParameterType() {
- return HASH_TRANSFORMPARAMETER;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
deleted file mode 100644
index a3c37aaef..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.io.InputStream;
-import java.util.Date;
-
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-
-/**
- * Default implementation of <code>VerifyCMSSignatureRequest</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifyCMSSignatureRequestImpl
- implements VerifyCMSSignatureRequest {
-
- /** The indexes of the signatories whose signature should be verified. */
- private int[] signatories;
- /** The profile ID of trusted certificates. */
- private String trustProfileId;
- /** The data object necessary for signature verification. */
- private CMSDataObject dataObject;
- /** The CMS signature to verify. */
- private InputStream cmsSignature;
- /** The date for which to verify the signature. */
- private Date dateTime;
-
- /**
- * Sets the indexes of the signatories whose signature should be verified.
- *
- * @param signatories The indexes of the signatories whose signature should be
- * verified.
- */
- public void setSignatories(int[] signatories) {
- this.signatories = signatories;
- }
-
- public int[] getSignatories() {
- return signatories;
- }
-
- /**
- * Sets the date for which to verify the signature.
- *
- * @param dateTime The date for which to verify the signature.
- */
- public void setDateTime(Date dateTime) {
- this.dateTime = dateTime;
- }
-
- public Date getDateTime() {
- return dateTime;
- }
-
- /**
- * Sets the CMS signature to verify.
- * @param signature The CMS signature to verify.
- */
- public void setCMSSignature(InputStream signature) {
- this.cmsSignature = signature;
-
- }
-
- public InputStream getCMSSignature() {
- return cmsSignature;
- }
-
- /**
- * Sets the data object necessary for signature verification.
- * @param dataObject The data object necessary for signature verification.
- */
- public void setDataObject(CMSDataObject dataObject) {
- this.dataObject = dataObject;
- }
-
- public CMSDataObject getDataObject() {
- return dataObject;
- }
-
- /**
- * Sets the profile ID of trusted certificates.
- * @param trustProfileId The profile ID of trusted certificates.
- */
- public void setTrustProfileId(String trustProfileId) {
- this.trustProfileId = trustProfileId;
- }
-
- public String getTrustProfileId() {
- return trustProfileId;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
deleted file mode 100644
index 40dc04683..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-
-/**
- * Default implementation of <code>VerifyCMSSignatureResponseElement</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifyCMSSignatureResponseElementImpl
- implements VerifyCMSSignatureResponseElement {
-
- /** Information about the signer certificate. */
- private SignerInfo signerInfo;
- /** Information about the signature check. */
- private CheckResult signatureCheck;
- /** Information about the certificate check. */
- private CheckResult certificateCheck;
-
- /**
- * Sets a SignerInfo element according to CMS.
- *
- * @param signerInfo The SignerInfo element according to CMS.
- */
- public void setSignerInfo(SignerInfo signerInfo) {
- this.signerInfo = signerInfo;
- }
-
- public SignerInfo getSignerInfo() {
- return signerInfo;
- }
-
- /**
- * Sets a result of the signature verification.
- *
- * @param signatureCheck The result of the signature verification.
- */
- public void setSignatureCheck(CheckResult signatureCheck) {
- this.signatureCheck = signatureCheck;
- }
-
- public CheckResult getSignatureCheck() {
- return signatureCheck;
- }
-
- /**
- * Sets a result of the certificate verification.
- *
- * @param certificateCheck The result of the certificate verification.
- */
- public void setCertificateCheck(CheckResult certificateCheck) {
- this.certificateCheck = certificateCheck;
- }
-
- public CheckResult getCertificateCheck() {
- return certificateCheck;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSinatureResponseImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSinatureResponseImpl.java
deleted file mode 100644
index f258380e0..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSinatureResponseImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-
-/**
- * Default implementation of <code>VerifyCMSSignatureResponse</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifyCMSSinatureResponseImpl
- implements VerifyCMSSignatureResponse {
-
- /** The elements contained in the response. */
- private List responseElements;
-
- /**
- * Sets the elements contained in the response.
- *
- * @param responseElements The elements contained in the response.
- */
- public void setResponseElements(List responseElements) {
- this.responseElements =
- responseElements != null
- ? Collections.unmodifiableList(new ArrayList(responseElements))
- : null;
- }
-
- public List getResponseElements() {
- return responseElements;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureInfoImpl.java
deleted file mode 100644
index 2653e2fd2..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureInfoImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
-
-/**
- * Default implementation of <code>VerifySignatureInfo</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifySignatureInfoImpl implements VerifySignatureInfo {
- /** The location of the signature to be verified. */
- private VerifySignatureLocation verifySignatureLocation;
- /** The environment containing the signature to be verified. */
- private Content verifySignatureEnvironment;
-
- /**
- * Sets the location of the signature to be verified.
- *
- * @param verifySignatureLocation The location of the signature to be
- * verified.
- */
- public void setVerifySignatureLocation(VerifySignatureLocation verifySignatureLocation) {
- this.verifySignatureLocation = verifySignatureLocation;
- }
-
- public VerifySignatureLocation getVerifySignatureLocation() {
- return verifySignatureLocation;
- }
-
- /**
- * Sets the signature environment containing the signature to be verified.
- *
- * @param verifySignatureEnvironment The signature environment containing the
- * signature to be verified.
- */
- public void setVerifySignatureEnvironment(Content verifySignatureEnvironment) {
- this.verifySignatureEnvironment = verifySignatureEnvironment;
- }
-
- public Content getVerifySignatureEnvironment() {
- return verifySignatureEnvironment;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureLocationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureLocationImpl.java
deleted file mode 100644
index 933e42987..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifySignatureLocationImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
-
-/**
- * Default implementation of <code>VerifySignatureLocation</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifySignatureLocationImpl
- extends ElementSelectorImpl
- implements VerifySignatureLocation {
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java
deleted file mode 100644
index 594f9c246..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
-
-/**
- * Default implementation of <codeReferenceInfo</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifyTransformsDataImpl implements ReferenceInfo {
- /** Information about the transformations contained in the signature. */
- private List verifyTransformsInfoProfiles;
-
- /**
- * Sets the information about the transformations contained in the signature.
- *
- * @param verifyTransformsInfoProfiles The profiles containing transformation
- * information.
- */
- public void setVerifyTransformsInfoProfiles(List verifyTransformsInfoProfiles) {
- this.verifyTransformsInfoProfiles =
- verifyTransformsInfoProfiles != null
- ? Collections.unmodifiableList(
- new ArrayList(verifyTransformsInfoProfiles))
- : null;
- }
-
- public List getVerifyTransformsInfoProfiles() {
- return verifyTransformsInfoProfiles;
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileExplicitImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileExplicitImpl.java
deleted file mode 100644
index d9a864499..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileExplicitImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfileExplicit;
-
-/**
- * Default implementation of <code>VerifyTransformsInfoProfileExplicit</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifyTransformsInfoProfileExplicitImpl
- implements VerifyTransformsInfoProfileExplicit {
-
- /** The transforms contained in this profile. */
- private List transforms;
- /** Additional information for the transforms. */
- private List transformParameters = new ArrayList();
-
- /**
- * Sets the transforms contained in this profile.
- *
- * @param transforms The transforms contained in this profile.
- */
- public void setTransforms(List transforms) {
- this.transforms =
- transforms != null
- ? Collections.unmodifiableList(new ArrayList(transforms))
- : null;
- }
-
- public List getTransforms() {
- return transforms;
- }
-
- /**
- * Sets additional information for the transforms.
- *
- * @param transformParameters Additional information for the transforms.
- */
- public void setTransformParameters(List transformParameters) {
- this.transformParameters = new ArrayList(transformParameters);
- }
-
- public List getTransformParameters() {
- return transformParameters;
- }
-
- /**
- * Gets the type of <code>VerifyTransformsInfoProfile</code>.
- *
- * @return EXPLICIT_VERIFYTRANSFORMSINFOPROFILE
- */
- public int getVerifyTransformsInfoProfileType() {
- return EXPLICIT_VERIFYTRANSFORMSINFOPROFILE;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileIDImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileIDImpl.java
deleted file mode 100644
index fb1f10cea..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsInfoProfileIDImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfileID;
-
-/**
- * Default implementation of <code>VerifyTransformsInfoProfileID</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifyTransformsInfoProfileIDImpl implements VerifyTransformsInfoProfileID {
-
- /** The profile ID. */
- private String verifyTransformsInfoProfileID;
-
- /**
- * Sets the profile ID.
- *
- * @param profileID The profile ID.
- */
- public void setVerifyTransformsInfoProfileID(String profileID) {
- this.verifyTransformsInfoProfileID = profileID;
- }
-
- public String getVerifyTransformsInfoProfileID() {
- return verifyTransformsInfoProfileID;
- }
-
- /**
- * Gets the type of <code>VerifyTransformsInfoProfile</code>.
- *
- * @return ID_VERIFYTRANSFORMSINFOPROFILE
- */
- public int getVerifyTransformsInfoProfileType() {
- return ID_VERIFYTRANSFORMSINFOPROFILE;
- }
-
-} \ No newline at end of file
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java
deleted file mode 100644
index 26d7def4c..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureRequestImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.xmlverify.SignatureManifestCheckParams;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-
-/**
- * Default implementation of <code>VerifyXMLSignatureRequest</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifyXMLSignatureRequestImpl
- implements VerifyXMLSignatureRequest {
- /** Date and time for signature verification. */
- private Date dateTime;
- /** The signature to be verified. */
- private VerifySignatureInfo verifySignatureInfo;
- /** Supplemental information about the singature. */
- private List supplementProfiles;
- /** Additional parameters for checking the signature manifest. */
- private SignatureManifestCheckParams signatureManifestCheckParams;
- /** Whether to return the hash input data. */
- private boolean returnHashInputData;
- /** The profile ID of the trust profile containing the trusted certificates.
- */
- private String trustProfileId;
-
- /**
- * Sets the date and time for signature verification.
- *
- * @param dateTime The date and time for signature verification.
- */
- public void setDateTime(Date dateTime) {
- this.dateTime = dateTime;
- }
-
- public Date getDateTime() {
- return dateTime;
- }
-
- /**
- * Sets the signature to be verified.
- *
- * @param signatureInfo The signature to be verified.
- */
- public void setSignatureInfo(VerifySignatureInfo signatureInfo) {
- this.verifySignatureInfo = signatureInfo;
- }
-
- public VerifySignatureInfo getSignatureInfo() {
- return verifySignatureInfo;
- }
-
- /**
- * Sets supplemental information about the singature.
- * @param supplementProfiles
- */
- public void setSupplementProfiles(List supplementProfiles) {
- this.supplementProfiles =
- supplementProfiles != null
- ? Collections.unmodifiableList(new ArrayList(supplementProfiles))
- : null;
- }
-
- public List getSupplementProfiles() {
- return supplementProfiles;
- }
-
- /**
- * Sets supplemental information about the singature.
- * @param params Supplemental information about the singature.
- */
- public void setSignatureManifestCheckParams(SignatureManifestCheckParams params) {
- this.signatureManifestCheckParams = params;
- }
-
- public SignatureManifestCheckParams getSignatureManifestCheckParams() {
- return signatureManifestCheckParams;
- }
-
- /**
- * Sets whether to return hash input data.
- *
- * @param returnSignedData Whether to return hash input data.
- */
- public void setReturnHashInputData(boolean returnSignedData) {
- this.returnHashInputData = returnSignedData;
- }
-
- public boolean getReturnHashInputData() {
- return returnHashInputData;
- }
-
- /**
- * Sets the profile ID of trusted certificates.
- *
- * @param trustProfileId The profile ID of trusted certificates.
- */
- public void setTrustProfileId(String trustProfileId) {
- this.trustProfileId = trustProfileId;
- }
-
- public String getTrustProfileId() {
- return trustProfileId;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
deleted file mode 100644
index 989dbfb4a..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
-/**
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class VerifyXMLSignatureResponseImpl
- implements VerifyXMLSignatureResponse {
-
- /** Information about the signer certificate. */
- private SignerInfo signerInfo;
-
- /**
- * The hash input data objects. The list consists of {@link at.gv.egovernment.moa.spss.api.common.InputData}s.
- * */
- private List hashInputDatas = new ArrayList();
-
- /**
- * The reference input data objects. The list consists of {@link at.gv.egovernment.moa.spss.api.common.InputData}s.
- * */
- private List referenceInputDatas = new ArrayList();
-
- /** Information about the signature check. */
- private ReferencesCheckResult signatureCheck;
- /** Information about the signature manifest check. */
- private ReferencesCheckResult signatureManifestCheck;
- /** Information about the XMLDsig manifest check. */
- private List xmlDsigManifestChecks = new ArrayList();
- /** Information about the certificate check. */
- private CheckResult certificateCheck;
-
- /**
- * Sets information about the signer certificate.
- *
- * @param signerInfo Information about the signer certificate.
- */
- public void setSignerInfo(SignerInfo signerInfo) {
- this.signerInfo = signerInfo;
- }
-
- public SignerInfo getSignerInfo() {
- return signerInfo;
- }
-
- /**
- * Sets data signed by the signatory.
- *
- * @param hashInputDatas The signed datas.
- */
- public void setHashInputDatas(List hashInputDatas) {
- this.hashInputDatas =
- hashInputDatas != null
- ? Collections.unmodifiableList(new ArrayList(hashInputDatas))
- : null;
- }
-
- public List getHashInputDatas() {
- return hashInputDatas;
- }
-
- /**
- * Sets the source data elements.
- *
- * @param referenceInputDatas The source data elements.
- */
- public void setReferenceInputDatas(List referenceInputDatas) {
- this.referenceInputDatas =
- referenceInputDatas != null
- ? Collections.unmodifiableList(new ArrayList(referenceInputDatas))
- : null;
- }
-
- public List getReferenceInputDatas() {
- return referenceInputDatas;
- }
-
- /**
- * Sets the result of the signature verification.
- *
- * @param signatureCheck The result of the signature verification.
- */
- public void setSignatureCheck(ReferencesCheckResult signatureCheck) {
- this.signatureCheck = signatureCheck;
- }
-
- public ReferencesCheckResult getSignatureCheck() {
- return signatureCheck;
- }
-
- /**
- * Sets the result of the signature manifest verification.
- *
- * @param signatureManifestCheck The result of the signature manifest verification.
- */
- public void setSignatureManifestCheck(ReferencesCheckResult signatureManifestCheck) {
- this.signatureManifestCheck = signatureManifestCheck;
- }
-
- public ReferencesCheckResult getSignatureManifestCheck() {
- return signatureManifestCheck;
- }
-
- /**
- * Sets the result of the certification verification.
- *
- * @param certificateCheck The result of the certificate verification.
- */
- public void setCertificateCheck(CheckResult certificateCheck) {
- this.certificateCheck = certificateCheck;
- }
-
- public CheckResult getCertificateCheck() {
- return certificateCheck;
- }
-
- /**
- * Sets the XMLDSigManifestChecks.
- *
- * @param xmlDsigManifestChecks The XMLDSigManifestChecks.
- */
- public void setXMLDsigManifestChecks(List xmlDsigManifestChecks) {
- this.xmlDsigManifestChecks =
- xmlDsigManifestChecks != null
- ? Collections.unmodifiableList(new ArrayList(xmlDsigManifestChecks))
- : null;
- }
-
- public List getXMLDsigManifestChecks() {
- return xmlDsigManifestChecks;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/X509IssuerSerialImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/X509IssuerSerialImpl.java
deleted file mode 100644
index e6d644fd9..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/X509IssuerSerialImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.math.BigInteger;
-
-import at.gv.egovernment.moa.spss.api.common.X509IssuerSerial;
-
-/**
- * Default implementation of <code>X509IssuerSerial</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class X509IssuerSerialImpl implements X509IssuerSerial {
- /** The certificate serial number. */
- private BigInteger x509SerialNumber;
- /** The certificate issuer DN. */
- private String x509IssuerName;
-
- /**
- * Sets the issuer distinguished name.
- *
- * @param x509IssuerName The issuer distinguished name.
- */
- public void setX509IssuerName(String x509IssuerName) {
- this.x509IssuerName = x509IssuerName;
- }
-
- public String getX509IssuerName() {
- return x509IssuerName;
- }
-
- /**
- * Sets the certificate serial number.
- *
- * @param x509SerialNumber The issuer serial number.
- */
- public void setX509SerialNumber(BigInteger x509SerialNumber) {
- this.x509SerialNumber = x509SerialNumber;
- }
-
- public BigInteger getX509SerialNumber() {
- return x509SerialNumber;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XMLDataObjectAssociationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XMLDataObjectAssociationImpl.java
deleted file mode 100644
index b603c3367..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XMLDataObjectAssociationImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-
-/**
- * Default implementation of <code>XMLDataObjectAssociation</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class XMLDataObjectAssociationImpl implements XMLDataObjectAssociation {
-
- /** Meta information about the <code>Content</code> object. */
- private MetaInfo metaInfo;
- /** The actual data contained in this object. */
- private Content content;
-
- /**
- * Sets meta information about the <code>Content</code> object.
- * @param metaInfo Meta information about the <code>Content</code> object.
- */
- public void setMetaInfo(MetaInfo metaInfo) {
- this.metaInfo = metaInfo;
- }
-
- public MetaInfo getMetaInfo() {
- return metaInfo;
- }
-
- /**
- * Sets the actual data contained in this object.
- *
- * @param content The actual data contained in this object.
- */
- public void setContent(Content content) {
- this.content = content;
- }
-
- public Content getContent() {
- return content;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilter2TransformImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilter2TransformImpl.java
deleted file mode 100644
index a96a8f161..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilter2TransformImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.common.XPathFilter2Transform;
-
-/**
- * Default implementation of <code>XPathFilter2Transform</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class XPathFilter2TransformImpl
- extends TransformImpl
- implements XPathFilter2Transform {
-
- /** The XPath filters. */
- private List filters;
-
- /**
- * Create a new <code>XPathFilter2TransformImpl</code> object.
- */
- public XPathFilter2TransformImpl() {
- setAlgorithmURI(XPATH_FILTER2);
- }
-
- /**
- * Sets the XPath filters contained in this
- * <code>XPathFilter2Transform</code>.
- *
- * @param filters The XPath filters contained in this
- * <code>XPathFilter2Transform</code>.
- */
- public void setFilters(List filters) {
- this.filters = new ArrayList(filters);
- }
-
- public List getFilters() {
- return filters;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilterImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilterImpl.java
deleted file mode 100644
index 72d91bc58..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathFilterImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import at.gv.egovernment.moa.spss.api.common.XPathFilter;
-
-/**
- * Default implementation of <code>XPathFilter</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class XPathFilterImpl implements XPathFilter {
- /** The type of filter. */
- private String filterType;
- /** The XPath expression of the filter. */
- private String xPathExpression;
- /** The namespace prefix to URI mapping to while evaluating the XPath
- * expression. */
- private Map namespaceDeclarations = new HashMap();
-
- /**
- * Sets the type of filter.
- *
- * @param filterType The type of filter.
- */
- public void setFilterType(String filterType) {
- this.filterType = filterType;
- }
-
- public String getFilterType() {
- return filterType;
- }
-
- /**
- * Sets the XPath expression of the filter.
- *
- * @param xPathExpression The XPath expression of the filter.
- */
- public void setXPathExpression(String xPathExpression) {
- this.xPathExpression = xPathExpression;
- }
-
- public String getXPathExpression() {
- return xPathExpression;
- }
-
- /**
- * Sets the namespace prefix to URI mapping to while evaluating the XPath
- * expression.
- *
- * @param namespaceDeclarations The namespace prefix to URI mapping to while
- * evaluating the XPath expression.
- */
- public void setNamespaceDelcarations(Map namespaceDeclarations) {
- this.namespaceDeclarations = namespaceDeclarations;
- }
-
- public Map getNamespaceDeclarations() {
- return namespaceDeclarations;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathTransformImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathTransformImpl.java
deleted file mode 100644
index 1c9817ecc..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XPathTransformImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import at.gv.egovernment.moa.spss.api.common.XPathTransform;
-
-/**
- * Default implementation of <code>XPathTransform</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class XPathTransformImpl
- extends TransformImpl
- implements XPathTransform {
-
- /** The XPath expression to evaluate. */
- private String xPathExpression;
- /** The namespace prefix to URI mapping to while evaluating the XPath
- * expression. */
- private Map namespaceDeclarations = new HashMap();
-
- /**
- * Create a new <code>XPathTransformImpl</code> object.
- */
- public XPathTransformImpl() {
- setAlgorithmURI(XPATH);
- }
-
- /**
- * Sets the XPath expression to evaluate.
- *
- * @param xPathExpression The XPath expression to evaluate.
- */
- public void setXPathExpression(String xPathExpression) {
- this.xPathExpression = xPathExpression;
- }
-
- public String getXPathExpression() {
- return xPathExpression;
- }
-
- /**
- * Sets the namespace prefix to URI mapping to while evaluating the XPath
- * expression.
- *
- * @param namespaceDeclarations The namespace prefix to URI mapping to while
- * evaluating the XPath expression.
- */
- public void setNamespaceDelcarations(Map namespaceDeclarations) {
- this.namespaceDeclarations = namespaceDeclarations;
- }
-
- public Map getNamespaceDeclarations() {
- return namespaceDeclarations;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XSLTransformImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XSLTransformImpl.java
deleted file mode 100644
index c6ddc0fd6..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/XSLTransformImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package at.gv.egovernment.moa.spss.api.impl;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.api.common.XSLTTransform;
-
-/**
- * Default implementation of <code>XSLTTransform</code>.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class XSLTransformImpl extends TransformImpl implements XSLTTransform {
- /** The XSLT stylesheet to apply. */
- private Element styleSheet;
-
- /**
- * Create a new <code>XSLTransformImpl</code> object.
- */
- public XSLTransformImpl() {
- setAlgorithmURI(XSLT);
- }
-
- /**
- * Sets the XSLT stylesheet to apply.
- *
- * @param styleSheet The XSLT stylesheet to apply.
- */
- public void setStylesheet(Element styleSheet) {
- this.styleSheet = styleSheet;
- }
-
- public Element getStylesheet() {
- return styleSheet;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java
deleted file mode 100644
index 319d3ac9d..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParser.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.traversal.NodeIterator;
-
-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;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
-
-/**
- * A parser to parse <code>CreateXMLSignatureRequest</code> DOM trees into
- * <code>CreateXMLSignatureRequest</code> API objects.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CreateXMLSignatureRequestParser {
-
- //
- // XPath expresssions to select elements in the CreateXMLSignatureRequest
- //
- private static final String MOA = Constants.MOA_PREFIX + ":";
- private static final String KEY_IDENTIFIER_XPATH =
- "/" + MOA + "CreateXMLSignatureRequest/" + MOA + "KeyIdentifier";
- private static final String SINGLE_SIGNATURE_INFO_XPATH =
- "/" + MOA + "CreateXMLSignatureRequest/" + MOA + "SingleSignatureInfo";
- private static final String DATA_OBJECT_INFO_XPATH = MOA + "DataObjectInfo";
- private static final String DATA_OBJECT_XPATH = MOA + "DataObject";
- private static final String CREATE_SIGNATURE_INFO_XPATH =
- MOA + "CreateSignatureInfo";
- private static final String CREATE_TRANSFORMS_INFO_PROFILE_XPATH =
- (MOA + "CreateTransformsInfoProfile | ")
- + (MOA + "CreateTransformsInfoProfileID");
- private static final String CREATE_SIGNATURE_ENVIRONMENT_XPATH =
- MOA + "CreateSignatureEnvironment";
- private static final String CREATE_SIGNATURE_ENVIRONMENT_PROFILE_XPATH =
- (MOA + "CreateSignatureEnvironmentProfile | ")
- + (MOA + "CreateSignatureEnvironmentProfileID");
- private static final String SL_CONFORM_ATTR_NAME = "SecurityLayerConformity";
-
- /** The factory to create API objects. */
- private SPSSFactory factory;
-
- /**
- * Create a new <code>CreateXMLSignatureRequestParser</code>.
- */
- public CreateXMLSignatureRequestParser() {
- this.factory = SPSSFactory.getInstance();
- }
-
- /**
- * Parse a <code>CreateXMLSignatureRequest</code> DOM element, as defined
- * by the MOA schema.
- *
- * @param requestElem The <code>CreateXMLSignatureRequest</code> to parse. The
- * request must have been successfully parsed against the schema for this
- * method to succeed.
- * @return A <code>CreateXMLSignatureRequest</code> API object containing
- * the data from the DOM element.
- * @throws MOAApplicationException An error occurred parsing the request.
- */
- public CreateXMLSignatureRequest parse(Element requestElem)
- throws MOAApplicationException {
-
- List singleSignatureInfos = parseSingleSignatureInfos(requestElem);
- String keyIdentifier =
- XPathUtils.getElementValue(requestElem, KEY_IDENTIFIER_XPATH, null);
-
- return factory.createCreateXMLSignatureRequest(
- keyIdentifier,
- singleSignatureInfos);
- }
-
- /**
- * Parse all <code>SingleSignatureInfo</code> elements of the
- * <code>CreateXMLSignatureRequest</code>.
- *
- * @param requestElem The <code>CreateXMLSignatureRequest</code> to parse.
- * @return A <code>List</code> of <code>SingleSignatureInfo</code> API
- * objects.
- * @throws MOAApplicationException An error occurred parsing on of the
- * <code>SingleSignatureInfo</code> elements.
- */
- private List parseSingleSignatureInfos(Element requestElem)
- throws MOAApplicationException {
-
- List singleSignatureInfos = new ArrayList();
- NodeIterator sigInfoElems =
- XPathUtils.selectNodeIterator(requestElem, SINGLE_SIGNATURE_INFO_XPATH);
- Element sigInfoElem;
-
- while ((sigInfoElem = (Element) sigInfoElems.nextNode()) != null) {
- singleSignatureInfos.add(parseSingleSignatureInfo(sigInfoElem));
- }
-
- return singleSignatureInfos;
- }
-
- /**
- * Parse a <code>SingleSignatureInfo</code> DOM element.
- *
- * @param sigInfoElem The <code>SingleSignatureInfo</code> DOM element to
- * parse.
- * @return A <code>SingleSignatureInfo</code> API object containing the
- * information of <code>sigInfoElem</code>.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>SingleSignatureInfo</code>.
- */
- private SingleSignatureInfo parseSingleSignatureInfo(Element sigInfoElem)
- throws MOAApplicationException {
-
- List dataObjectInfos = parseDataObjectInfos(sigInfoElem);
- CreateSignatureInfo createSignatureInfo =
- parseCreateSignatureInfo(sigInfoElem);
- boolean securityLayerConform;
-
- if (sigInfoElem.hasAttribute(SL_CONFORM_ATTR_NAME)) {
- securityLayerConform =
- BoolUtils.valueOf(sigInfoElem.getAttribute(SL_CONFORM_ATTR_NAME));
- } else {
- securityLayerConform = true;
- }
-
- return factory.createSingleSignatureInfo(
- dataObjectInfos,
- createSignatureInfo,
- securityLayerConform);
- }
-
- /**
- * Parse the <code>DataObjectInfo</code> DOM elements contained in the given
- * <code>SingleSignatureInfo</code> DOM element.
- *
- * @param sigInfoElem The <code>SingleSignatureInfo</code> DOM element
- * whose <code>DataObjectInfo</code>s to parse.
- * @return A <code>List</code> of <code>DataObjectInfo</code> API objects
- * containing the data from the <code>DataObjectInfo</code> DOM elements.
- * @throws MOAApplicationException An error occurred parsing one of the
- * <code>DataObjectInfo</code>s.
- */
- private List parseDataObjectInfos(Element sigInfoElem)
- throws MOAApplicationException {
-
- List dataObjectInfos = new ArrayList();
- NodeIterator dataObjInfoElems =
- XPathUtils.selectNodeIterator(sigInfoElem, DATA_OBJECT_INFO_XPATH);
- Element dataObjInfoElem;
-
- while ((dataObjInfoElem = (Element) dataObjInfoElems.nextNode()) != null) {
- dataObjectInfos.add(parseDataObjectInfo(dataObjInfoElem));
- }
- return dataObjectInfos;
- }
-
- /**
- * Parse a <code>DataObjectInfo</code> DOM element.
- *
- * @param dataObjInfoElem The <code>DataObjectInfo</code> DOM element to
- * parse.
- * @return A <code>DataObjectInfo</code> API element containing the data
- * from <code>dataObjInfoElem</code>.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>DataObjectInfo</code>.
- */
- private DataObjectInfo parseDataObjectInfo(Element dataObjInfoElem)
- throws MOAApplicationException {
-
- String structure = dataObjInfoElem.getAttribute("Structure");
- Element dataObjectElem =
- (Element) XPathUtils.selectSingleNode(dataObjInfoElem, DATA_OBJECT_XPATH);
- Content dataObject = RequestParserUtils.parseContent(dataObjectElem);
- CreateTransformsInfoProfile createTransformsInfoProfile =
- parseCreateTransformsInfoProfile(dataObjInfoElem);
- boolean childOfManifest;
-
- if (dataObjInfoElem.hasAttribute("ChildOfManifest")) {
- childOfManifest =
- BoolUtils.valueOf(dataObjInfoElem.getAttribute("ChildOfManifest"));
- } else {
- childOfManifest = false;
- }
-
- return factory.createDataObjectInfo(
- structure,
- childOfManifest,
- dataObject,
- createTransformsInfoProfile);
- }
-
- /**
- * Parse a <code>CreateTransformsInfoProfile</code> DOM element.
- *
- * @param dataObjInfoElem The <code>DataObjectInfo</code> DOM element
- * containing the <code>CreateTransformsInfoProfile</code>.
- * @return The <code>CreateTransformsInfoProfile</code> API object containing
- * the profile found in <code>dataObjInfoElem</code>.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>CreateTransformsInfoProfile</code>.
- */
- private CreateTransformsInfoProfile parseCreateTransformsInfoProfile(Element dataObjInfoElem)
- throws MOAApplicationException {
-
- Element profileElem =
- (Element) XPathUtils.selectSingleNode(
- dataObjInfoElem,
- CREATE_TRANSFORMS_INFO_PROFILE_XPATH);
-
- if ("CreateTransformsInfoProfile".equals(profileElem.getLocalName())) {
- ProfileParser profileParser = new ProfileParser();
- return profileParser.parseCreateTransformsInfoProfile(profileElem);
-
- } else {
- String profileID = DOMUtils.getText(profileElem);
- return factory.createCreateTransformsInfoProfile(profileID);
- }
- }
-
- /**
- * Parse the <code>CreateSignatureInfo</code> DOM element contained in
- * a <code>SingleSignatureInfo</code>.
- *
- * @param sigInfoElem The <code>SingleSignatureInfo</code> DOM element
- * containing the <code>CreateSignatureInfo</code> to be parsed.
- * @return A <code>CreateSignatureInfo</code> API object containing the
- * data from the <code>CreateSignatureInfo</code> DOM element, or
- * <code>null</code>, if none was found.
- */
- private CreateSignatureInfo parseCreateSignatureInfo(Element sigInfoElem) {
- Element createInfoElem =
- (Element) XPathUtils.selectSingleNode(
- sigInfoElem,
- CREATE_SIGNATURE_INFO_XPATH);
-
- if (createInfoElem != null) {
- Element environmentElem =
- (Element) XPathUtils.selectSingleNode(
- createInfoElem,
- CREATE_SIGNATURE_ENVIRONMENT_XPATH);
- Content environment = RequestParserUtils.parseContent(environmentElem);
- CreateSignatureEnvironmentProfile environmentProfile =
- parseCreateSignatureEnvironmentProfile(createInfoElem);
-
- return factory.createCreateSignatureInfo(environment, environmentProfile);
- } else {
- return null;
- }
- }
-
- /**
- * Parse the <code>CreateSignatureEnvironmentProfile</code> contained in
- * the given <code>CreateSignatureInfo</code> DOM element.
- *
- * @param createInfoElem <code>CreateSignatureInfo</code> DOM element to
- * parse.
- * @return The <code>CreateSignatureEnvironmentProfile</code> contained
- * in the given <code>CreateSignatureInfo</code> DOM element..
- */
- private CreateSignatureEnvironmentProfile parseCreateSignatureEnvironmentProfile(Element createInfoElem) {
- Element profileElem =
- (Element) XPathUtils.selectSingleNode(
- createInfoElem,
- CREATE_SIGNATURE_ENVIRONMENT_PROFILE_XPATH);
-
- if ("CreateSignatureEnvironmentProfile"
- .equals(profileElem.getLocalName())) {
- ProfileParser profileParser = new ProfileParser();
- return profileParser.parseCreateSignatureEnvironmentProfile(profileElem);
- } else {
- String profileID = DOMUtils.getText(profileElem);
- return factory.createCreateSignatureEnvironmentProfile(profileID);
- }
- }
-
-} \ No newline at end of file
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java
deleted file mode 100644
index eec9c4882..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureResponseBuilder.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.util.Iterator;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import at.gv.egovernment.moa.util.Constants;
-
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponseElement;
-import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
-
-/**
- * Convert a <code>CreateXMLSignatureResponse</code> API object into its
- * XML representation, according to the MOA XML schema.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CreateXMLSignatureResponseBuilder {
- private static final String MOA_NS_URI = Constants.MOA_NS_URI;
-
- /** The XML document containing the response element. */
- private Document responseDoc;
- /** The response <code>CreateXMLSignatureResponse</code> DOM element. */
- private Element responseElem;
-
- /**
- * Create a new <code>CreateXMLSignatureResponseBuilder</code>:
- *
- * @throws MOASystemException An error occurred setting up the resulting
- * XML document.
- */
- public CreateXMLSignatureResponseBuilder() throws MOASystemException {
- responseDoc =
- ResponseBuilderUtils.createResponse("CreateXMLSignatureResponse");
- responseElem = responseDoc.getDocumentElement();
- }
-
- /**
- * Build a document containing a <code>CreateXMLSignatureResponse</code>
- * DOM element being the XML representation of the given
- * <code>CreateXMLSignatureResponse</code> API object.
- *
- * @param response The <code>CreateXMLSignatureResponse</code> to convert
- * to XML.
- * @return A document containing the <code>CreateXMLSignatureResponse</code>
- * DOM element.
- */
- public Document build(CreateXMLSignatureResponse response) {
- Iterator iter;
-
- for (iter = response.getResponseElements().iterator(); iter.hasNext();) {
- CreateXMLSignatureResponseElement responseElement =
- (CreateXMLSignatureResponseElement) iter.next();
-
- switch (responseElement.getResponseType()) {
- case CreateXMLSignatureResponseElement.SIGNATURE_ENVIRONMENT_RESPONSE :
- SignatureEnvironmentResponse envResponse =
- (SignatureEnvironmentResponse) responseElement;
- addSignatureEnvironment(envResponse);
- break;
-
- case CreateXMLSignatureResponseElement.ERROR_RESPONSE :
- ErrorResponse errorResponse = (ErrorResponse) responseElement;
- addErrorResponse(errorResponse);
- break;
- }
-
- }
-
- return responseDoc;
- }
-
- /**
- * Add a <code>SignatureEnvironment</code> element to the response.
- *
- * @param envResponse The content to put under the
- * <code>SignatureEnvironment</code> element. This should either be a
- * <code>dsig:Signature</code> element (in case of a detached signature) or
- * the signature environment containing the signature (in case of
- * an enveloping signature).
- */
- private void addSignatureEnvironment(SignatureEnvironmentResponse envResponse) {
- Element content = envResponse.getSignatureEnvironment();
- Node importedSignature = responseDoc.importNode(content, true);
- Element signatureEnvironment =
- responseDoc.createElementNS(MOA_NS_URI, "SignatureEnvironment");
- signatureEnvironment.appendChild(importedSignature);
- responseElem.appendChild(signatureEnvironment);
- }
-
- /**
- * Add a <code>ErrorResponse</code> element to the response.
- *
- * @param errorResponse The API object containing the information to put into
- * the <code>ErrorResponse</code> DOM element.
- */
- private void addErrorResponse(ErrorResponse errorResponse) {
- Element errorElem =
- responseDoc.createElementNS(MOA_NS_URI, "ErrorResponse");
- Element errorCodeElem =
- responseDoc.createElementNS(MOA_NS_URI, "ErrorCode");
- Element infoElem = responseDoc.createElementNS(MOA_NS_URI, "Info");
- String errorCodeStr = Integer.toString(errorResponse.getErrorCode());
-
- errorCodeElem.appendChild(responseDoc.createTextNode(errorCodeStr));
- errorElem.appendChild(errorCodeElem);
- infoElem.appendChild(responseDoc.createTextNode(errorResponse.getInfo()));
- errorElem.appendChild(errorCodeElem);
- errorElem.appendChild(infoElem);
- responseElem.appendChild(errorElem);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java
deleted file mode 100644
index 66c08e0ab..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ProfileParser.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.traversal.NodeIterator;
-
-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 at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile;
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfile;
-
-/**
- * Parse the various profile elements contained in the MOA web service requests
- * and given as separate files in the MOA configuration.
- *
- * The profiles parsed must be schema valid according to the MOA XML schema.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ProfileParser {
-
- //
- // XPath expressions to select parts of the profiles
- //
- private static final String MOA = Constants.MOA_PREFIX + ":";
- private static final String DSIG = Constants.DSIG_PREFIX + ":";
- private static final String CREATE_TRANSFORMS_XPATH =
- MOA + "CreateTransformsInfo/" + DSIG + "Transforms";
- private static final String FINAL_DATA_META_INFO_XPATH =
- MOA + "CreateTransformsInfo/" + MOA + "FinalDataMetaInfo";
- private static final String CREATE_SIGNATURE_LOCATION_XPATH =
- MOA + "CreateSignatureLocation";
- private static final String SUPPLEMENT_XPATH = MOA + "Supplement";
- private static final String VERIFY_TRANSFORMS_XPATH = DSIG + "Transforms";
- private static final String TRANSFORM_PARAMETER_XPATH =
- MOA + "TransformParameter";
- private static final String TRANSFORM_PARAMETER_CONTENT_XPATH =
- MOA + "Base64Content | " + MOA + "Hash";
- private static final String DIGEST_METHOD_XPATH = DSIG + "DigestMethod";
- private static final String DIGEST_VALUE_XPATH = DSIG + "DigestValue";
-
- /** The factory used to create API objects. */
- private SPSSFactory factory = SPSSFactory.getInstance();
-
- /**
- * Parse a <code>CreateTransformsInfoProfile</code> DOM element.
- *
- * @param profileElem The <code>CreateTransformsInfoProfile</code> element
- * to parse.
- * @return The <code>CreateTransformsInfoProfile</code> API object containing
- * the data from the <code>profileElem</code>.
- * @throws MOAApplicationException An error occurred parsing the DOM element.
- */
- public CreateTransformsInfoProfile parseCreateTransformsInfoProfile(Element profileElem)
- throws MOAApplicationException {
- CreateTransformsInfo createTransformsInfo =
- parseCreateTransformsInfo(profileElem);
- List supplements = parseSupplements(profileElem);
-
- return factory.createCreateTransformsInfoProfile(
- createTransformsInfo,
- supplements);
- }
-
- /**
- * Parse the <code>CreateTransformsInfo</code> DOM element contained in a
- * <code>CreateTransformsInfoProfile</code>.
- *
- * @param profileElem The <code>CreateTransformsInfoProfile</code> DOM
- * element containing the <code>CreateTransformsInfo</code>.
- * @return The <code>CreateTransformsInfo</code> API object containinig the
- * data from the <code>CreateTransformsInfo</code> DOM element.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>CreateTransformsInfo</code> DOM element.
- */
- private CreateTransformsInfo parseCreateTransformsInfo(Element profileElem)
- throws MOAApplicationException {
-
- Element transformsElem =
- (Element) XPathUtils.selectSingleNode(
- profileElem,
- CREATE_TRANSFORMS_XPATH);
- Element metaInfoElem =
- (Element) XPathUtils.selectSingleNode(
- profileElem,
- FINAL_DATA_META_INFO_XPATH);
- MetaInfo finalDataMetaInfo;
- List transforms;
-
- // parse the dsig:Transforms
- if (transformsElem != null) {
- TransformParser transformsParser = new TransformParser();
- transforms = transformsParser.parseTransforms(transformsElem);
- } else {
- transforms = null;
- }
-
- // parse the meta info
- finalDataMetaInfo = RequestParserUtils.parseMetaInfo(metaInfoElem);
-
- return factory.createCreateTransformsInfo(transforms, finalDataMetaInfo);
- }
-
- /**
- * Parse a <code>CreateSignatureEnvironmentProfile</code> DOM element.
- *
- * @param profileElem The <code>CreateSignatureEnvironmentProfile</code>
- * DOM element to parse.
- * @return The <code>CreateSignatureEnvironmentProfile</code> API object
- * containing the data from the <code>profileElem</code>.
- */
- public CreateSignatureEnvironmentProfile parseCreateSignatureEnvironmentProfile(Element profileElem) {
- CreateSignatureLocation createSignatureLocation =
- parseCreateSignatureLocation(profileElem);
- List supplements = parseSupplements(profileElem);
-
- return factory.createCreateSignatureEnvironmentProfile(
- createSignatureLocation,
- supplements);
- }
-
- /**
- * Parse a <code>CreateSignatureLocation</code> DOM element contained in
- * a <code>CreateSignatureEnvironmentProfile</code>.
- *
- * @param profileElem The <code>CreateSignatureEnvironmentProfile</code> DOM
- * element containing the <code>CreateSignatureLocation</code>.
- * @return The <code>CreateSignatureLocation</code> API object containing
- * the data from the <code>CreateSignatureLocation</code> DOM element.
- */
- private CreateSignatureLocation parseCreateSignatureLocation(Element profileElem) {
- Element locationElem =
- (Element) XPathUtils.selectSingleNode(
- profileElem,
- CREATE_SIGNATURE_LOCATION_XPATH);
- String xPathExpression = DOMUtils.getText(locationElem);
- Map namespaceDeclarations = DOMUtils.getNamespaceDeclarations(locationElem);
- String indexStr = locationElem.getAttribute("Index");
- int index = Integer.parseInt(indexStr);
-
- return factory.createCreateSignatureLocation(
- xPathExpression,
- index,
- namespaceDeclarations);
- }
-
- /**
- * Parse all <code>Supplement</code> DOM elements contained in a given
- * parent DOM element.
- *
- * @param supplementsParentElem The DOM element being the parent of the
- * <code>Supplement</code>s.
- * @return A <code>List</code> of <code>Supplement</code> API objects
- * containing the data from the <code>Supplement</code> DOM elements.
- */
- private List parseSupplements(Element supplementsParentElem) {
- List supplements = new ArrayList();
- NodeIterator supplementElems =
- XPathUtils.selectNodeIterator(supplementsParentElem, SUPPLEMENT_XPATH);
- Element supplementElem;
-
- while ((supplementElem = (Element) supplementElems.nextNode()) != null) {
- XMLDataObjectAssociation supplement =
- RequestParserUtils.parseXMLDataObjectAssociation(supplementElem);
- supplements.add(supplement);
- }
- return supplements;
- }
-
- /**
- * Parse a <code>SupplementProfile</code> DOM element.
- *
- * @param profileElem The <code>SupplementProfile</code> DOM element to parse.
- * @return The <code>SupplementProfile</code> API object containing the
- * data from the <code>SupplementProfile</code> DOM element.
- */
- public SupplementProfile parseSupplementProfile(Element profileElem) {
- XMLDataObjectAssociation supplementProfile =
- RequestParserUtils.parseXMLDataObjectAssociation(profileElem);
-
- return factory.createSupplementProfile(supplementProfile);
- }
-
- /**
- * Parse a <code>VerifyTransformsInfoProfile</code> DOM element.
- *
- * @param profileElem The <code>VerifyTransformsInfoProfile</code> DOM
- * element to parse.
- * @return A <code>VerifyTransformsInfoProfile</code> API object containing
- * the information from the <code>VerifyTransformsInfoProfile</code> DOM
- * element.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>VerifyTransformsInfoProfile</code>.
- */
- public VerifyTransformsInfoProfile parseVerifyTransformsInfoProfile(Element profileElem)
- throws MOAApplicationException {
- Element transformsElem =
- (Element) XPathUtils.selectSingleNode(
- profileElem,
- VERIFY_TRANSFORMS_XPATH);
- List transforms = null;
- NodeIterator paramElems =
- XPathUtils.selectNodeIterator(profileElem, TRANSFORM_PARAMETER_XPATH);
- Element paramElem;
- List transformParameters = new ArrayList();
-
- // parse the dsig:Transforms
- if (transformsElem != null) {
- TransformParser transformsParser = new TransformParser();
- transforms = transformsParser.parseTransforms(transformsElem);
- }
-
- // parse the TransformParameter elements
- while ((paramElem = (Element) paramElems.nextNode()) != null) {
- transformParameters.add(parseTransformParameter(paramElem));
- }
-
- return factory.createVerifyTransformsInfoProfile(
- transforms,
- transformParameters);
- }
-
- /**
- * Parse a <code>TransformParameter</code> DOM element.
- *
- * @param paramElem The <code>TransformParameter</code> DOM element to
- * parse.
- * @return The <code>TransformParameter</code> API object containing the
- * information from the <code>TransformParameter</code> DOM element.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>TransformParameter</code> DOM element.
- */
- private TransformParameter parseTransformParameter(Element paramElem)
- throws MOAApplicationException {
- String uri = paramElem.getAttribute("URI");
- Element contentElem =
- (Element) XPathUtils.selectSingleNode(
- paramElem,
- TRANSFORM_PARAMETER_CONTENT_XPATH);
-
- if (contentElem == null) {
- return factory.createTransformParameter(uri);
- } else if ("Base64Content".equals(contentElem.getLocalName())) {
- String base64Str = DOMUtils.getText(contentElem);
- InputStream binaryContent = Base64Utils.decodeToStream(base64Str, true);
-
- return factory.createTransformParameter(uri, binaryContent);
- } else { // "Hash".equals(contentElem.getLocalName())
- String digestMethodStr =
- XPathUtils.getElementValue(contentElem, DIGEST_METHOD_XPATH, "");
- String digestValueStr =
- XPathUtils.getElementValue(contentElem, DIGEST_VALUE_XPATH, "");
- byte[] digestValue = null;
-
- try {
- digestValue = Base64Utils.decode(digestValueStr, true);
- } catch (IOException e) {
- throw new MOAApplicationException("2270", null);
- }
- return factory.createTransformParameter(
- uri,
- digestMethodStr,
- digestValue);
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
deleted file mode 100644
index 9e8c7d0e2..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.text.ParseException;
-import java.util.Date;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-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.DateTimeUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-
-/**
- * Utility methods for parsing XML requests definied in the MOA XML schema.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class RequestParserUtils {
- //
- // XPath expressions for parsing parts of a request
- //
- private static final String MOA = Constants.MOA_PREFIX + ":";
- private static final String REFERENCE_ATTR_NAME = "Reference";
- private static final String MIME_TYPE_XPATH = MOA + "MimeType";
- private static final String DESCRIPTION_XPATH = MOA + "Description";
- private static final String TYPE_XPATH = MOA + "Type";
- private static final String XML_ASSOC_CONTENT_XPATH = MOA + "Content";
- private static final String CONTENT_XPATH =
- MOA + "Base64Content | " + MOA + "XMLContent |" + MOA + "LocRefContent";
- private static final String ANY_OTHER_XPATH =
- "*[namespace-uri() != \"" + Constants.MOA_NS_URI + "\"]";
-
- /**
- * Parse a <code>XMLDataObjectAssociationType</code> kind of DOM element.
- *
- * @param assocElem The <code>XMLDataObjectAssociationType</code> kind of
- * DOM elmeent to parse.
- * @return The <code>XMLDataObjectAssociation</code> API object containing
- * the data from the <code>XMLDataObjectAssociationType</code> DOM element.
- */
- public static XMLDataObjectAssociation parseXMLDataObjectAssociation(Element assocElem) {
- SPSSFactory factory = SPSSFactory.getInstance();
- MetaInfo metaInfo = parseMetaInfo(assocElem);
- Element contentElem =
- (Element) XPathUtils.selectSingleNode(assocElem, XML_ASSOC_CONTENT_XPATH);
- Content content = parseContent(contentElem);
-
- return factory.createXMLDataObjectAssociation(metaInfo, content);
- }
-
- /**
- * Parse a <code>MetaInfoType</code> kind of DOM element.
- *
- * @param metaInfoElem The <code>MetaInfoType</code> kind of DOM element.
- * @return The <code>MetaInfo</code> API object containing the data from
- * the <code>metaInfoElem</code>.
- */
- public static MetaInfo parseMetaInfo(Element metaInfoElem) {
- SPSSFactory factory = SPSSFactory.getInstance();
- String mimeType =
- XPathUtils.getElementValue(metaInfoElem, MIME_TYPE_XPATH, null);
- String description =
- XPathUtils.getElementValue(metaInfoElem, DESCRIPTION_XPATH, null);
- NodeList anyOther =
- XPathUtils.selectNodeList(metaInfoElem, ANY_OTHER_XPATH);
- String type =
- XPathUtils.getElementValue(metaInfoElem, TYPE_XPATH, null);
-
- return factory.createMetaInfo(mimeType, description, anyOther, type);
- }
-
- /**
- * Parse a <code>ContentOptionalRefType</code> or
- * <code>ContentRequiredRefType</code> kind of DOM element.
- * @param contentParentElem The DOM element being the parent of the
- * content element.
- * @return The <code>Content</code> API object containing the data from
- * the given DOM element.
- */
- public static Content parseContent(Element contentParentElem) {
- SPSSFactory factory = SPSSFactory.getInstance();
- String referenceURI =
- contentParentElem.hasAttribute(REFERENCE_ATTR_NAME)
- ? contentParentElem.getAttribute(REFERENCE_ATTR_NAME)
- : null;
- Element contentElem =
- (Element) XPathUtils.selectSingleNode(contentParentElem, CONTENT_XPATH);
-
- if (contentElem == null) {
- return factory.createContent(referenceURI);
- }
-
- if ("Base64Content".equals(contentElem.getLocalName())) {
- String base64String = DOMUtils.getText(contentElem);
- return factory.createContent(
- Base64Utils.decodeToStream(base64String, true),
- referenceURI);
- } else if ("LocRefContent".equals(contentElem.getLocalName())) {
- String locationReferenceURI = DOMUtils.getText(contentElem);
- return factory.createContent(
- locationReferenceURI,
- referenceURI);
- } else { // "XMLContent".equals(contentElem.getLocalName())
- return factory.createContent(
- contentElem.getChildNodes(),
- referenceURI);
- }
- }
-
- /**
- * Get the signing time from a Verfiy(CMS|XML)SignatureRequest.
- *
- * @param requestElem A <code>Verify(CMS|XML)SignatureRequest</code> DOM
- * element.
- * @param dateTimeXPath The XPath to lookup the <code>DateTime</code> element
- * within the request.
- * @return Date The date and time corresponding to the <code>DateTime</code>
- * element in the request. If no <code>DateTime</code> element exists in the
- * request, <code>null</code> is returned.
- * @throws MOAApplicationException An error occurred during a parsing the
- * <code>DateTime</code> element or creating the return value.
- */
- public static Date parseDateTime(Element requestElem, String dateTimeXPath)
- throws MOAApplicationException {
-
- Element dateTimeElem;
- String dateTimeText;
-
- // select the DateTime element
- dateTimeElem =
- (Element) XPathUtils.selectSingleNode(requestElem, dateTimeXPath);
-
- // parse a date from the element value
- if (dateTimeElem != null) {
- dateTimeText = DOMUtils.getText(dateTimeElem);
- try {
- return DateTimeUtils.parseDateTime(dateTimeText);
- } catch (ParseException e) {
- throw new MOAApplicationException(
- "1104",
- new Object[] { dateTimeText });
- }
- } else {
- return null;
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
deleted file mode 100644
index 44134a70c..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.io.IOException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-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 org.w3c.dom.NodeList;
-
-import iaik.utils.RFC2253NameParser;
-import iaik.utils.RFC2253NameParserException;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-
-/**
- * Utility methods used by the verious <code>ResponseBuilder</code> classes.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-class ResponseBuilderUtils {
- //
- // shortcuts to various XML namespace constants
- //
- private static final String MOA_NS_URI = Constants.MOA_NS_URI;
- private static final String DSIG = Constants.DSIG_PREFIX + ":";
- private static final String DSIG_NS_URI = Constants.DSIG_NS_URI;
- private static final String XMLNS_NS_URI = Constants.XMLNS_NS_URI;
-
- /**
- * Create a response element with all the namespaces set.
- *
- * @param responseName The name of the response root element.
- * @return A DOM document containing the response root element and predefined
- * MOA, DSIG and XML namespace declarations.
- * @throws MOASystemException An error building the response document.
- */
- public static Document createResponse(String responseName)
- throws MOASystemException {
-
- try {
- DocumentBuilder docBuilder =
- DocumentBuilderFactory.newInstance().newDocumentBuilder();
- DOMImplementation impl = docBuilder.getDOMImplementation();
- Document response;
- Element root;
- String attrValue;
-
- response = impl.createDocument(MOA_NS_URI, responseName, null);
- root = response.getDocumentElement();
-
- // add namespace prefix declarations
- root.setAttributeNS(XMLNS_NS_URI, "xmlns", MOA_NS_URI);
- attrValue = "xmlns:" + Constants.DSIG_PREFIX;
- root.setAttributeNS(XMLNS_NS_URI, attrValue, DSIG_NS_URI);
-
- return response;
- } catch (ParserConfigurationException e) {
- throw new MOASystemException("2200", null, e);
- }
- }
-
- /**
- * Add a <code>SignerInfo</code> element to the response.
- *
- * @param response The response document, in order to create new elements in
- * it.
- * @param root The root element into which the <code>SignerInfo</code> element
- * will be inserted.
- * @param cert The signer certificate to add.
- * @param isQualified Indicates, whether <code>cert</code> is a qualified
- * certificate.
- * @param isPublicAuthority Indicates, whether <code>cert</code> is
- * certificate owned by a public authority.
- * @param publicAuthorityID Information about the public authority owning
- * <code>cert</code>. Must not be <code>null</code>, if
- * <code>isPublicAuthority ! = null</code>.
- * @throws MOAApplicationException An error occurred reading data from the
- * certificate.
- */
- public static void addSignerInfo(
- Document response,
- Element root,
- X509Certificate cert,
- boolean isQualified,
- boolean isPublicAuthority,
- String publicAuthorityID)
- throws MOAApplicationException {
-
- Element signerInfoElem = response.createElementNS(MOA_NS_URI, "SignerInfo");
- Element x509DataElem =
- response.createElementNS(DSIG_NS_URI, DSIG + "X509Data");
- Element x509IssuerSerialElem =
- response.createElementNS(DSIG_NS_URI, DSIG + "X509IssuerSerial");
- Element x509IssuerElem =
- response.createElementNS(DSIG_NS_URI, DSIG + "X509IssuerName");
- String issuer = cert.getIssuerDN().getName();
- Element x509SerialNumberElem =
- response.createElementNS(DSIG_NS_URI, DSIG + "X509SerialNumber");
- String serialNumber = cert.getSerialNumber().toString();
- Element x509SubjectNameElem =
- response.createElementNS(DSIG_NS_URI, DSIG + "X509SubjectName");
- Element x509CertificateElem =
- response.createElementNS(DSIG_NS_URI, DSIG + "X509Certificate");
- Element qualifiedCertificateElem =
- isQualified
- ? response.createElementNS(MOA_NS_URI, "QualifiedCertificate")
- : null;
- Element publicAuthorityElem =
- isPublicAuthority
- ? response.createElementNS(MOA_NS_URI, "PublicAuthority")
- : null;
- Element codeElem =
- publicAuthorityID != null
- ? response.createElementNS(MOA_NS_URI, "Code")
- : null;
-
- // fill in text
- x509IssuerElem.appendChild(response.createTextNode(issuer));
- x509SerialNumberElem.appendChild(response.createTextNode(serialNumber));
- try {
- RFC2253NameParser parser =
- new RFC2253NameParser(cert.getSubjectDN().getName());
- String subjectRfc2253 = parser.parse().getRFC2253String();
- x509SubjectNameElem.appendChild(response.createTextNode(subjectRfc2253));
- } catch (RFC2253NameParserException e) {
- x509SubjectNameElem.appendChild(
- response.createTextNode(cert.getSubjectDN().getName()));
- }
- try {
- x509CertificateElem.appendChild(
- response.createTextNode(Base64Utils.encode(cert.getEncoded())));
- } catch (CertificateEncodingException e) {
- throw new MOAApplicationException("2245", null, e);
- } catch (IOException e) {
- throw new MOAApplicationException("2245", null, e);
- }
-
- // build structure
- x509DataElem.appendChild(x509SubjectNameElem);
- x509IssuerSerialElem.appendChild(x509IssuerElem);
- x509IssuerSerialElem.appendChild(x509SerialNumberElem);
- x509DataElem.appendChild(x509IssuerSerialElem);
- x509DataElem.appendChild(x509CertificateElem);
- if (isQualified) {
- x509DataElem.appendChild(qualifiedCertificateElem);
- }
- if (isPublicAuthority) {
- x509DataElem.appendChild(publicAuthorityElem);
- if (publicAuthorityID != null) {
- codeElem.appendChild(response.createTextNode(publicAuthorityID));
- publicAuthorityElem.appendChild(codeElem);
- }
- }
- signerInfoElem.appendChild(x509DataElem);
- root.appendChild(signerInfoElem);
- }
-
- /**
- * Add an element containing <code>Code</code> and <code>Info</code>
- * subelements.
- *
- * @param response The response document, in order to create new elements in
- * it.
- * @param root The root element into which to insert the newly created
- * element.
- * @param elementName The name of the newly created element.
- * @param code The content of the <code>Code</code> subelement.
- * @param info The content of the <code>Info</code> subelement.
- */
- public static void addCodeInfoElement(
- Document response,
- Element root,
- String elementName,
- int code,
- NodeList info) {
-
- Element codeInfoElem = response.createElementNS(MOA_NS_URI, elementName);
- Element codeElem = response.createElementNS(MOA_NS_URI, "Code");
- Element infoElem;
- int i;
-
- codeElem.appendChild(response.createTextNode(Integer.toString(code)));
- codeInfoElem.appendChild(codeElem);
- if (info != null) {
- infoElem = response.createElementNS(MOA_NS_URI, "Info");
-
- for (i = 0; i < info.getLength(); i++) {
- infoElem.appendChild(info.item(i).cloneNode(true));
- }
- codeInfoElem.appendChild(infoElem);
- }
- root.appendChild(codeInfoElem);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java
deleted file mode 100644
index 2d01f2a0f..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/TransformParser.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.traversal.NodeIterator;
-
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.common.Base64Transform;
-import at.gv.egovernment.moa.spss.api.common.CanonicalizationTransform;
-import at.gv.egovernment.moa.spss.api.common.EnvelopedSignatureTransform;
-import at.gv.egovernment.moa.spss.api.common.ExclusiveCanonicalizationTransform;
-import at.gv.egovernment.moa.spss.api.common.Transform;
-import at.gv.egovernment.moa.spss.api.common.XPathFilter;
-import at.gv.egovernment.moa.spss.api.common.XPathFilter2Transform;
-import at.gv.egovernment.moa.spss.api.common.XPathTransform;
-import at.gv.egovernment.moa.spss.api.common.XSLTTransform;
-
-/**
- * A parser to parse XMLDsig <code>Transform</code> DOM elements into their
- * MOA SPSS API representation.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class TransformParser {
- //
- // XPath expressions for selecting information from the DOM tree
- //
- private static final String DSIG = Constants.DSIG_PREFIX + ":";
- private static final String DSIG_FILTER2 =
- Constants.DSIG_FILTER2_PREFIX + ":";
- private static final String XSLT = Constants.XSLT_PREFIX + ":";
- private static final String EC = Constants.DSIG_EC_PREFIX + ":";
- private static final String TRANSFORM_XPATH = DSIG + "Transform";
- private static final String XPATH_XPATH = DSIG + "XPath";
- private static final String XSLT_ELEMENT_XPATH = XSLT + "stylesheet";
- private static final String XPATH2_XPATH =
- (DSIG_FILTER2 + "XPath[@Filter=\"intersect\"] | ")
- + (DSIG_FILTER2 + "XPath[@Filter=\"subtract\"] | ")
- + (DSIG_FILTER2 + "XPath[@Filter=\"union\"]");
- private static final String INCLUSIVE_NAMESPACES_XPATH =
- EC + "InclusiveNamespaces";
-
- /**
- * The <code>SPSSFactory</code> to use for creating new API objects.
- */
- private SPSSFactory factory = SPSSFactory.getInstance();
-
- /**
- * Parse an XMLDsig <code>Transforms</code> DOM element.
- *
- * @param transformsElem The <code>Transforms</code> DOM element to parse.
- * @return A <code>List</code> of <code>Transform</code> API objects
- * containing the data from the individual <code>Transform</code> DOM
- * elements.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>Transforms</code> DOM element.
- */
- public List parseTransforms(Element transformsElem)
- throws MOAApplicationException {
- List transforms = new ArrayList();
- NodeIterator transformElems =
- XPathUtils.selectNodeIterator(transformsElem, TRANSFORM_XPATH);
- Element transformElem;
- Transform transform;
-
- while ((transformElem = (Element) transformElems.nextNode()) != null) {
- transform = parseTransform(transformElem);
- transforms.add(transform);
- }
-
- return transforms;
- }
-
- /**
- * Parse an XMLDsig <code>Transform</code> DOM element.
- *
- * @param transformElem <code>Transform</code> DOM element to parse.
- * @return The <code>Transform</code> API object containing the data
- * from the <code>Transform</code> DOM element.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>Transform</code> DOM element.
- */
- public Transform parseTransform(Element transformElem)
- throws MOAApplicationException {
-
- String algorithmUri = transformElem.getAttribute("Algorithm");
-
- if (CanonicalizationTransform.CANONICAL_XML.equals(algorithmUri)
- || CanonicalizationTransform.CANONICAL_XML_WITH_COMMENTS.equals(
- algorithmUri)) {
- return factory.createCanonicalizationTransform(algorithmUri);
- } else if (
- ExclusiveCanonicalizationTransform.EXCLUSIVE_CANONICAL_XML.equals(
- algorithmUri)
- || ExclusiveCanonicalizationTransform
- .EXCLUSIVE_CANONICAL_XML_WITH_COMMENTS
- .equals(
- algorithmUri)) {
- return parseExclusiveC14nTransform(algorithmUri, transformElem);
- } else if (Base64Transform.BASE64_DECODING.equals(algorithmUri)) {
- return factory.createBase64Transform();
- } else if (
- EnvelopedSignatureTransform.ENVELOPED_SIGNATURE.equals(algorithmUri)) {
- return factory.createEnvelopedSignatureTransform();
- } else if (XPathTransform.XPATH.equals(algorithmUri)) {
- return parseXPathTransform(transformElem);
- } else if (XPathFilter2Transform.XPATH_FILTER2.equals(algorithmUri)) {
- return parseXPathFilter2Transform(transformElem);
- } else if (XSLTTransform.XSLT.equals(algorithmUri)) {
- return parseXSLTTransform(transformElem);
- } else {
- throw new MOAApplicationException("1108", new Object[] { algorithmUri });
- }
- }
-
- /**
- * Parse an exclusive canonicalization type of transform.
- *
- * @param algorithmUri The algorithm URI of the canonicalization algorithm.
- * @param transformElem The <code>Transform</code> DOM element to parse.
- * @return An <code>ExclusiveCanonicalizationTransform</code> API object
- * containing the data from the <code>transformElem</code>.
- */
- private Transform parseExclusiveC14nTransform(
- String algorithmUri,
- Element transformElem)
- {
-
- Element inclusiveNamespacesElem =
- (Element) XPathUtils.selectSingleNode(
- transformElem,
- INCLUSIVE_NAMESPACES_XPATH);
-
- List inclusiveNamespaces = new ArrayList();
- if (inclusiveNamespacesElem != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(inclusiveNamespacesElem.getAttribute("PrefixList"));
- while (tokenizer.hasMoreTokens())
- {
- inclusiveNamespaces.add(tokenizer.nextToken());
- }
- }
- return factory.createExclusiveCanonicalizationTransform(
- algorithmUri,
- inclusiveNamespaces);
- }
-
- /**
- * Parse an <code>XPath</code> type of <code>Transform</code>.
- *
- * @param transformElem The <code>Transform</code> DOM element to parse.
- * @return The <code>Transform</code> API object representation of the
- * <code>Transform</code> DOM element.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>Transform</code> DOM element.
- */
- private Transform parseXPathTransform(Element transformElem)
- throws MOAApplicationException {
- Element xPathElem =
- (Element) XPathUtils.selectSingleNode(transformElem, XPATH_XPATH);
- Map nsDecls;
-
- if (xPathElem == null) {
- throw new MOAApplicationException("2202", null);
- }
-
- nsDecls = DOMUtils.getNamespaceDeclarations(xPathElem);
- nsDecls.remove("");
-
- return factory.createXPathTransform(DOMUtils.getText(xPathElem), nsDecls);
- }
-
- /**
- * Parse an <code>XPathFilter2</code> type of <code>Transform</code>.
- *
- * @param transformElem The <code>Transform</code> DOM element to parse.
- * @return The <code>Transform</code> API object representation of the
- * <code>Transform</code> DOM element.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>Transform</code> DOM element.
- */
- private Transform parseXPathFilter2Transform(Element transformElem)
- throws MOAApplicationException {
- List filters = new ArrayList();
- NodeIterator iter =
- XPathUtils.selectNodeIterator(transformElem, XPATH2_XPATH);
- Element filterElem;
-
- while ((filterElem = (Element) iter.nextNode()) != null) {
- String filterAttr = filterElem.getAttribute("Filter");
- String filterType;
- String expression;
- Map nsDecls;
-
- if (filterAttr.equals("intersect")) {
- filterType = XPathFilter.INTERSECT_TYPE;
- } else if (filterAttr.equals("subtract")) {
- filterType = XPathFilter.SUBTRACT_TYPE;
- } else {
- filterType = XPathFilter.UNION_TYPE;
- }
-
- expression = DOMUtils.getText(filterElem);
- nsDecls = DOMUtils.getNamespaceDeclarations(filterElem);
- nsDecls.remove("");
- filters.add(factory.createXPathFilter(filterType, expression, nsDecls));
- }
- if (filters.size() == 0) {
- throw new MOAApplicationException("2216", null);
- }
-
- return factory.createXPathFilter2Transform(filters);
- }
-
- /**
- * Parse an <code>XSLT</code> type of <code>Transform</code>.
- *
- * @param transformElem The <code>Transform</code> DOM element to parse.
- * @return The <code>Transform</code> API object representation of the
- * <code>Transform</code> DOM element.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>Transform</code> DOM element.
- */
- private Transform parseXSLTTransform(Element transformElem)
- throws MOAApplicationException {
- Element xsltElem =
- (Element) XPathUtils.selectSingleNode(transformElem, XSLT_ELEMENT_XPATH);
-
- if (xsltElem == null) {
- throw new MOAApplicationException("2215", null);
- }
-
- return factory.createXSLTTransform(xsltElem);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
deleted file mode 100644
index 74d14b7cc..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.CollectionUtils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-
-/**
- * A parser to parse <code>VerifyCMSSignatureRequest</code> DOM trees into
- * <code>VerifyCMSSignatureRequest</code> API objects.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class VerifyCMSSignatureRequestParser {
-
- //
- // XPath expressions for selecting parts of the DOM message
- //
- private static final String MOA = Constants.MOA_PREFIX + ":";
- private static final String DATE_TIME_XPATH = MOA + "DateTime";
- private static final String CMS_SIGNATURE_XPATH = MOA + "CMSSignature";
- private static final String TRUST_PROFILE_ID_XPATH = MOA + "TrustProfileID";
- private static final String DATA_OBJECT_XPATH = MOA + "DataObject";
- private static final String META_INFO_XPATH = MOA + "MetaInfo";
- private static final String CONTENT_XPATH = MOA + "Content";
- private static final String BASE64_CONTENT_XPATH = MOA + "Base64Content";
-
- /** The <code>SPSSFactory</code> for creating new API objects. */
- private SPSSFactory factory = SPSSFactory.getInstance();
-
- /**
- * Parse a <code>VerifyCMSSignatureRequest</code> DOM element, as defined
- * by the MOA schema.
- *
- * @param requestElem The <code>VerifyCMSSignatureRequest</code> to parse. The
- * request must have been successfully parsed against the schema for this
- * method to succeed.
- * @return A <code>VerifyCMSSignatureRequest</code> API objects containing
- * the data from the DOM element.
- * @throws MOAApplicationException An error occurred parsing the request.
- */
- public VerifyCMSSignatureRequest parse(Element requestElem)
- throws MOAApplicationException {
-
- int[] signatories = parseSignatories(requestElem);
- Date dateTime =
- RequestParserUtils.parseDateTime(requestElem, DATE_TIME_XPATH);
- String cmsSignatureStr =
- XPathUtils.getElementValue(requestElem, CMS_SIGNATURE_XPATH, "");
- CMSDataObject dataObject = parseDataObject(requestElem);
- String trustProfileID =
- XPathUtils.getElementValue(requestElem, TRUST_PROFILE_ID_XPATH, null);
- InputStream cmsSignature =
- Base64Utils.decodeToStream(cmsSignatureStr, true);
-
- return factory.createVerifyCMSSignatureRequest(
- signatories,
- dateTime,
- cmsSignature,
- dataObject,
- trustProfileID);
- }
-
- /**
- * Parse the <code>Signatories</code> attribute contained in the
- * <code>VerifyCMSSignatureRequest</code> DOM element.
- *
- * @param requestElem The <code>VerifyCMSSignatureRequest</code> DOM element.
- * @return The signatories contained in the given
- * <code>VerifyCMSSignatureRequest</code> DOM element.
- */
- private int[] parseSignatories(Element requestElem) {
- String signatoriesStr = requestElem.getAttribute("Signatories");
-
- if ("all".equals(signatoriesStr)) {
- return VerifyCMSSignatureRequest.ALL_SIGNATORIES;
- } else {
- StringTokenizer tokenizer = new StringTokenizer(signatoriesStr);
- List signatoriesList = new ArrayList();
- int[] signatories;
-
- // put the signatories into a List
- while (tokenizer.hasMoreTokens()) {
- try {
- signatoriesList.add(new Integer(tokenizer.nextToken()));
- } catch (NumberFormatException e) {
- // this cannot occur if the request has been validated
- }
- }
-
- // convert the List into an int array
- signatories = CollectionUtils.toIntArray(signatoriesList);
-
- return signatories;
- }
- }
-
- /**
- * Parse a the <code>DataObject</code> DOM element contained in a given
- * <code>VerifyCMSSignatureRequest</code> DOM element.
- *
- * @param requestElem The <code>VerifyCMSSignatureRequest</code> DOM element
- * to parse.
- * @return The <code>CMSDataObject</code> API object containing the data
- * from the <code>DataObject</code> DOM element.
- */
- private CMSDataObject parseDataObject(Element requestElem) {
- Element dataObjectElem =
- (Element) XPathUtils.selectSingleNode(requestElem, DATA_OBJECT_XPATH);
-
- if (dataObjectElem != null) {
- Element metaInfoElem =
- (Element) XPathUtils.selectSingleNode(dataObjectElem, META_INFO_XPATH);
- MetaInfo metaInfo = null;
- Element contentElem =
- (Element) XPathUtils.selectSingleNode(dataObjectElem, CONTENT_XPATH);
- CMSContent content = parseContent(contentElem);
-
- if (metaInfoElem != null) {
- metaInfo = RequestParserUtils.parseMetaInfo(metaInfoElem);
- }
-
- return factory.createCMSDataObject(metaInfo, content);
- } else {
- return null;
- }
-
- }
-
- /**
- * Parse the content contained in a <code>CMSContentBaseType</code> kind of
- * DOM element.
- *
- * @param contentElem The <code>CMSContentBaseType</code> kind of element to
- * parse.
- * @return A <code>CMSDataObject</code> API object containing the data
- * from the given DOM element.
- */
- private CMSContent parseContent(Element contentElem) {
- Element base64ContentElem =
- (Element) XPathUtils.selectSingleNode(contentElem, BASE64_CONTENT_XPATH);
-
- if (base64ContentElem != null) {
- String base64Str = DOMUtils.getText(base64ContentElem);
- InputStream binaryContent = Base64Utils.decodeToStream(base64Str, true);
- return factory.createCMSContent(binaryContent);
- } else {
- return factory.createCMSContent(
- contentElem.getAttribute("Reference"));
- }
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
deleted file mode 100644
index 3fc8f223d..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureResponseBuilder.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.util.Iterator;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-
-/**
- * Convert a <code>VerifyCMSSignatureResponse</code> API object into its
- * XML representation, according to the MOA XML schema.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class VerifyCMSSignatureResponseBuilder {
- /** The XML document containing the response element. */
- private Document responseDoc;
- /** The response <code>VerifyCMSSignatureResponse</code> DOM element. */
- private Element responseElem;
-
- /**
- * Create a new <code>VerifyCMSSignatureResponseBuilder</code>:
- *
- * @throws MOASystemException An error occurred setting up the resulting
- * XML document.
- */
- public VerifyCMSSignatureResponseBuilder() throws MOASystemException {
- responseDoc =
- ResponseBuilderUtils.createResponse("VerifyCMSSignatureResponse");
- responseElem = responseDoc.getDocumentElement();
- }
-
- /**
- * Build a document containing a <code>VerifyCMSSignatureResponse</code>
- * DOM element being the XML representation of the given
- * <code>VerifyCMSSignatureResponse</code> API object.
- *
- * @param response The <code>VerifyCMSSignatureResponse</code> to convert
- * to XML.
- * @return A document containing the <code>VerifyCMSSignatureResponse</code>
- * DOM element.
- * @throws MOAApplicationException An error occurred building the response.
- */
- public Document build(VerifyCMSSignatureResponse response)
- throws MOAApplicationException {
-
- Iterator iter;
-
- for (iter = response.getResponseElements().iterator(); iter.hasNext();) {
- VerifyCMSSignatureResponseElement responseElement =
- (VerifyCMSSignatureResponseElement) iter.next();
- addResponseElement(responseElement);
- }
-
- return responseDoc;
- }
-
- /**
- * Add an element to the response.
- *
- * @param responseElement The element to add to the response.
- * @throws MOAApplicationException An error occurred adding the element.
- */
- private void addResponseElement(VerifyCMSSignatureResponseElement responseElement)
- throws MOAApplicationException {
-
- SignerInfo signerInfo = responseElement.getSignerInfo();
- CheckResult signatureCheck = responseElement.getSignatureCheck();
- CheckResult certCheck = responseElement.getCertificateCheck();
-
- ResponseBuilderUtils.addSignerInfo(
- responseDoc,
- responseElem,
- signerInfo.getSignerCertificate(),
- signerInfo.isQualifiedCertificate(),
- signerInfo.isPublicAuthority(),
- signerInfo.getPublicAuhtorityID());
-
- ResponseBuilderUtils.addCodeInfoElement(
- responseDoc,
- responseElem,
- "SignatureCheck",
- signatureCheck.getCode(),
- signatureCheck.getInfo());
-
- ResponseBuilderUtils.addCodeInfoElement(
- responseDoc,
- responseElem,
- "CertificateCheck",
- certCheck.getCode(),
- certCheck.getInfo());
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java
deleted file mode 100644
index e736af522..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParser.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.traversal.NodeIterator;
-
-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;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.SignatureManifestCheckParams;
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-
-/**
- * @author Patrick Peck
- * @version $Id$
- */
-public class VerifyXMLSignatureRequestParser {
-
- //
- // XPath expressions for parsing parts of the request
- //
- private static final String MOA = Constants.MOA_PREFIX + ":";
- private static final String DATE_TIME_XPATH = MOA + "DateTime";
- private static final String RETURN_HASH_INPUT_DATA_XPATH =
- MOA + "ReturnHashInputData";
- private static final String TRUST_PROFILE_ID_XPATH = MOA + "TrustProfileID";
- private static final String VERIFY_SIGNATURE_ENVIRONMENT_XPATH =
- MOA + "VerifySignatureInfo/" + MOA + "VerifySignatureEnvironment";
- private static final String VERIFY_SIGNATURE_LOCATION_XPATH =
- MOA + "VerifySignatureInfo/" + MOA + "VerifySignatureLocation";
- private static final String SUPPLEMENT_PROFILE_XPATH =
- MOA + "SupplementProfile | " + MOA + "SupplementProfileID";
- private static final String SIGNATURE_MANIFEST_CHECK_PARAMS_XPATH =
- MOA + "SignatureManifestCheckParams";
- private static final String VERIFY_TRANSFORMS_INFO_PROFILE_XPATH =
- (MOA + "VerifyTransformsInfoProfile | ")
- + (MOA + "VerifyTransformsInfoProfileID");
- private static final String REFERENCE_INFO_XPATH = MOA + "ReferenceInfo";
-
- /** The <code>SPSSFactory</code> for creating new API objects. */
- private SPSSFactory factory = SPSSFactory.getInstance();
-
-
- /**
- * Parse a <code>VerifyXMLSignatureRequest</code> DOM element, as defined
- * by the MOA schema.
- *
- * @param requestElem The <code>VerifyXMLSignatureRequest</code> to parse. The
- * request must have been successfully parsed against the schema for this
- * method to succeed.
- * @return A <code>VerifyXMLSignatureRequest</code> API object containing
- * the data from the DOM element.
- * @throws MOAApplicationException An error occurred parsing the request.
- */
- public VerifyXMLSignatureRequest parse(Element requestElem)
- throws MOAApplicationException {
-
- Date dateTime =
- RequestParserUtils.parseDateTime(requestElem, DATE_TIME_XPATH);
- VerifySignatureInfo verifySignatureInfo =
- parseVerifySignatureInfo(requestElem);
- List supplementProfiles = parseSupplementProfiles(requestElem);
- SignatureManifestCheckParams signatureManifestCheckParams =
- parseSignatureManifestCheckParams(requestElem);
- boolean returnHashInputData =
- XPathUtils.selectSingleNode(requestElem, RETURN_HASH_INPUT_DATA_XPATH)
- != null;
- String trustProfileID =
- XPathUtils.getElementValue(requestElem, TRUST_PROFILE_ID_XPATH, null);
-
- return factory.createVerifyXMLSignatureRequest(
- dateTime,
- verifySignatureInfo,
- supplementProfiles,
- signatureManifestCheckParams,
- returnHashInputData,
- trustProfileID);
- }
-
- /**
- * Parse the <code>VerifySignatureInfo</code> DOM element contained in
- * the <code>VerifyXMLSignatureRequest</code> DOM element.
- *
- * @param requestElem The <code>VerifyXMLSignatureRequest</code> DOM element
- * containing the <code>VerifySignatureInfo</code> DOM element.
- * @return The <code>VerifySignatureInfo</code> API object containing the
- * data from the DOM element.
- */
- private VerifySignatureInfo parseVerifySignatureInfo(Element requestElem) {
- Element verifySignatureEnvironmentElem =
- (Element) XPathUtils.selectSingleNode(
- requestElem,
- VERIFY_SIGNATURE_ENVIRONMENT_XPATH);
- Content verifySignatureEnvironment =
- RequestParserUtils.parseContent(verifySignatureEnvironmentElem);
- VerifySignatureLocation verifySignatureLocation =
- parseVerifySignatureLocation(requestElem);
-
- return factory.createVerifySignatureInfo(
- verifySignatureEnvironment,
- verifySignatureLocation);
- }
-
- /**
- * Parse the <code>VerifySignatureLocation</code> DOM element contained
- * in the given <code>VerifyXMLSignatureRequest</code> DOM element.
- *
- * @param requestElem The <code>VerifyXMLSignatureRequst</code> DOM element.
- * @return The <code>VerifySignatureLocation</code> API object containing the
- * data from the DOM element.
- */
- private VerifySignatureLocation parseVerifySignatureLocation(Element requestElem) {
- Element locationElem =
- (Element) XPathUtils.selectSingleNode(
- requestElem,
- VERIFY_SIGNATURE_LOCATION_XPATH);
- String xPathExpression = DOMUtils.getText(locationElem);
- Map namespaceDeclarations = DOMUtils.getNamespaceDeclarations(locationElem);
-
- return factory.createVerifySignatureLocation(
- xPathExpression,
- namespaceDeclarations);
- }
-
- /**
- * Parse the supplement profiles contained in the given
- * <code>VerifyXMLSignatureRequest</code> DOM element.
- *
- * @param requestElem The <code>VerifyXMLSignatureRequest</code> DOM element.
- * @return A <code>List</code> of <code>SupplementProfile</code> API objects
- * containing the data from the <code>SupplementProfile</code> DOM elements.
- */
- private List parseSupplementProfiles(Element requestElem) {
- List supplementProfiles = new ArrayList();
- NodeIterator profileElems =
- XPathUtils.selectNodeIterator(requestElem, SUPPLEMENT_PROFILE_XPATH);
- Element profileElem;
-
- while ((profileElem = (Element) profileElems.nextNode()) != null) {
- SupplementProfile profile;
-
- if ("SupplementProfile".equals(profileElem.getLocalName())) {
- ProfileParser profileParser = new ProfileParser();
- profile = profileParser.parseSupplementProfile(profileElem);
- } else {
- String profileID = DOMUtils.getText(profileElem);
- profile = factory.createSupplementProfile(profileID);
- }
- supplementProfiles.add(profile);
- }
- return supplementProfiles;
- }
-
- /**
- * Parse the <code>SignatureManifestCheckParams</code> DOM element contained
- * in the given <code>VerifyXMLSignatureRequest</code> DOM element.
- * @param requestElem The <code>VerifyXMLSignatureRequest</code> DOM element.
- * @return The <code>SignatureManifestCheckParams</code> API object containing
- * the data from the <code>SignatureManifestCheckParams</code> DOM element.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>SignatureManifestCheckParams</code> DOM element.
- */
- private SignatureManifestCheckParams parseSignatureManifestCheckParams(Element requestElem)
- throws MOAApplicationException {
- Element paramsElem =
- (Element) XPathUtils.selectSingleNode(
- requestElem,
- SIGNATURE_MANIFEST_CHECK_PARAMS_XPATH);
-
- if (paramsElem != null) {
- String returnReferenceInputDataStr =
- paramsElem.getAttribute("ReturnReferenceInputData");
- boolean returnReferencInputData =
- BoolUtils.valueOf(returnReferenceInputDataStr);
- List referenceInfos = parseReferenceInfos(paramsElem);
-
- return factory.createSignatureManifestCheckParams(
- referenceInfos,
- returnReferencInputData);
- } else {
- return null;
- }
- }
-
- /**
- * Parse the <code>ReferenceInfo</code> DOM elements contained in a
- * <code>SignatureManifestCheckParams</code> DOM element.
- *
- * @param paramsElem The <code>SignatureManifestCheckParams</code> DOM element
- * containing the <code>ReferenceInfo</code> DOM elements.
- * @return A <code>List</code> of <code>RefernceInfo</code> API objects
- * containing the data from the <code>ReferenceInfo</code> DOM elements.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>ReferenceInfo</code> DOM elements.
- */
- private List parseReferenceInfos(Element paramsElem)
- throws MOAApplicationException {
-
- List referenceInfos = new ArrayList();
- NodeIterator refInfoElems =
- XPathUtils.selectNodeIterator(paramsElem, REFERENCE_INFO_XPATH);
- Element refInfoElem;
-
- while ((refInfoElem = (Element) refInfoElems.nextNode()) != null) {
- ReferenceInfo referenceInfo = parseReferenceInfo(refInfoElem);
-
- referenceInfos.add(referenceInfo);
- }
-
- return referenceInfos;
- }
-
- /**
- * Parse a <code>ReferenceInfo</code> DOM element.
- *
- * @param refInfoElem The <code>ReferenceInfo</code> DOM element to parse.
- * @return The <code>ReferenceInfo</code> API object containing the data
- * from the given <code>ReferenceInfo</code> DOM element.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>ReferenceInfo</code> DOM element.
- */
- private ReferenceInfo parseReferenceInfo(Element refInfoElem)
- throws MOAApplicationException {
- List profiles = parseVerifyTransformsInfoProfiles(refInfoElem);
- return factory.createReferenceInfo(profiles);
- }
-
- /**
- * Parse the <code>VerifyTransformsInfoProfile</code> DOM elements contained
- * in a <code>ReferenceInfo</code> DOM element.
- *
- * @param refInfoElem <code>ReferenceInfo</code> DOM element containing
- * the <code>VerifyTransformsInfoProfile</code> DOM elements.
- * @return A <code>List</code> of <code>VerifyTransformsInfoProfile</code>
- * API objects containing the profile data.
- * @throws MOAApplicationException An error occurred building the
- * <code>VerifyTransformsInfoProfile</code>s.
- */
- private List parseVerifyTransformsInfoProfiles(Element refInfoElem)
- throws MOAApplicationException {
-
- List profiles = new ArrayList();
- NodeIterator profileElems =
- XPathUtils.selectNodeIterator(
- refInfoElem,
- VERIFY_TRANSFORMS_INFO_PROFILE_XPATH);
- Element profileElem;
-
- while ((profileElem = (Element) profileElems.nextNode()) != null) {
- if ("VerifyTransformsInfoProfile".equals(profileElem.getLocalName())) {
- ProfileParser profileParser = new ProfileParser();
- profiles.add(
- profileParser.parseVerifyTransformsInfoProfile(profileElem));
- } else {
- String profileID = DOMUtils.getText(profileElem);
- profiles.add(factory.createVerifyTransformsInfoProfile(profileID));
- }
- }
- return profiles;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
deleted file mode 100644
index 960d9571d..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
+++ /dev/null
@@ -1,310 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.ContentBinary;
-import at.gv.egovernment.moa.spss.api.common.ContentXML;
-import at.gv.egovernment.moa.spss.api.common.InputData;
-import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
-/**
- * Convert a <code>VerifyXMLSignatureResponse</code> API object into its
- * XML representation, according to the MOA XML schema.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class VerifyXMLSignatureResponseBuilder {
- private static final String MOA_NS_URI = Constants.MOA_NS_URI;
-
- /** The XML document containing the response element. */
- private Document responseDoc;
- /** The response <code>VerifyXMLSignatureResponse</code> DOM element. */
- private Element responseElem;
-
- /**
- * Create a new <code>VerifyXMLSignatureResponseBuilder</code>:
- *
- * @throws MOASystemException An error occurred setting up the resulting
- * XML document.
- */
- public VerifyXMLSignatureResponseBuilder() throws MOASystemException {
- responseDoc =
- ResponseBuilderUtils.createResponse("VerifyXMLSignatureResponse");
- responseElem = responseDoc.getDocumentElement();
- }
-
- /**
- * Build a document containing a <code>VerifyXMLSignatureResponse</code>
- * DOM element being the XML representation of the given
- * <code>VerifyXMLSignatureResponse</code> API object.
- *
- * @param response The <code>VerifyXMLSignatureResponse</code> to convert
- * to XML.
- * @return A document containing the <code>VerifyXMLSignatureResponse</code>
- * DOM element.
- * @throws MOAApplicationException An error occurred building the response.
- */
- public Document build(VerifyXMLSignatureResponse response)
- throws MOAApplicationException {
-
- Iterator iter;
- List responseData;
-
- // add the SignerInfo
- ResponseBuilderUtils.addSignerInfo(
- responseDoc,
- responseElem,
- response.getSignerInfo().getSignerCertificate(),
- response.getSignerInfo().isQualifiedCertificate(),
- response.getSignerInfo().isPublicAuthority(),
- response.getSignerInfo().getPublicAuhtorityID());
-
- // add HashInputData elements
- responseData = response.getHashInputDatas();
- if (responseData != null && !responseData.isEmpty()) {
- for (iter = responseData.iterator(); iter.hasNext();) {
- InputData inputData = (InputData) iter.next();
- addContent("HashInputData", inputData);
- }
- }
-
- // add ReferenceInputData elements
- responseData = response.getReferenceInputDatas();
- if (responseData != null && !responseData.isEmpty()) {
- for (iter = responseData.iterator(); iter.hasNext();) {
- InputData inputData = (InputData) iter.next();
- addContent("ReferenceInputData", inputData);
- }
- }
-
- // add the SignatureCheck
- addReferencesCheckResult("SignatureCheck", response.getSignatureCheck());
-
- // add the SignatureManifestCheck
- if (response.getSignatureManifestCheck() != null) {
- addReferencesCheckResult(
- "SignatureManifestCheck",
- response.getSignatureManifestCheck());
- }
-
- // add the XMLDsigManifestChecks
- responseData = response.getXMLDsigManifestChecks();
- if (responseData != null && !responseData.isEmpty()) {
- for (iter = responseData.iterator(); iter.hasNext();) {
- ManifestRefsCheckResult checkResult =
- (ManifestRefsCheckResult) iter.next();
- addManifestRefsCheckResult("XMLDSIGManifestCheck", checkResult);
- }
- }
-
- // add the CertificateCheck
- ResponseBuilderUtils.addCodeInfoElement(
- responseDoc,
- responseElem,
- "CertificateCheck",
- response.getCertificateCheck().getCode(),
- response.getCertificateCheck().getInfo());
-
- return responseDoc;
- }
-
- /**
- * Add an element of type <code>ContentBaseType</code> to the response.
- *
- * @param elementName The name of the element.
- *
- * @param inputData The <code>InputData</code> to add. Based on the type of
- *
- * the <code>InputData</code>, either a <code>Base64Content</code> element
- * or a <code>XMLContent</code> subelement will be added. An <code>
- * InputDataBinaryImpl</code> will be added as a <code>Base64Content</code>
- * child element. An<code>InputDataXMLImpl</code> will be added as <code>
- * XMLContent</code> child element.
- *
- * @throws MOAApplicationException An error occurred adding the content.
- */
- private void addContent(String elementName, InputData inputData)
- throws MOAApplicationException {
-
- Element contentElem = responseDoc.createElementNS(MOA_NS_URI, elementName);
-
- contentElem.setAttributeNS(null, "PartOf", inputData.getPartOf());
- if (inputData.getReferringReferenceNumber() != InputData.REFERER_NONE_)
- contentElem.setAttributeNS(
- null,
- "ReferringSigReference",
- Integer.toString(inputData.getReferringReferenceNumber()));
-
- switch (inputData.getContentType()) {
- case Content.XML_CONTENT :
- ContentXML contentXml = (ContentXML) inputData;
- NodeList nodes = contentXml.getXMLContent();
- Element xmlElem;
- int i;
-
- xmlElem = responseDoc.createElementNS(MOA_NS_URI, "XMLContent");
- //xmlElem.setAttributeNS(XML_NS_URI, "xml:space", "preserve");
- xmlElem.setAttribute("xml:space", "preserve");
-
- for (i = 0; i < nodes.getLength(); i++) {
- xmlElem.appendChild(responseDoc.importNode(nodes.item(i), true));
- }
- contentElem.appendChild(xmlElem);
- responseElem.appendChild(contentElem);
- break;
- case Content.BINARY_CONTENT :
- Element binaryElem =
- responseDoc.createElementNS(MOA_NS_URI, "Base64Content");
- ContentBinary contentBinary = (ContentBinary) inputData;
- String base64Str;
-
- try {
- base64Str = Base64Utils.encode(contentBinary.getBinaryContent());
- } catch (IOException e) {
- throw new MOAApplicationException("2200", null, e);
- }
- binaryElem.appendChild(responseDoc.createTextNode(base64Str));
- contentElem.appendChild(binaryElem);
- responseElem.appendChild(contentElem);
- break;
- }
- }
-
- /**
- * Add a <code>ReferencesCheckResult</code> to the response.
- *
- * @param elementName The DOM element name to use.
- * @param checkResult The <code>ReferencesCheckResult</code> to add.
- */
- private void addReferencesCheckResult(
- String elementName,
- ReferencesCheckResult checkResult) {
-
- NodeList info = null;
-
- if (checkResult.getInfo() != null) {
- DocumentFragment fragment = responseDoc.createDocumentFragment();
- NodeList anyOtherInfo = checkResult.getInfo().getAnyOtherInfo();
- int[] failedReferences = checkResult.getInfo().getFailedReferences();
-
- if (anyOtherInfo != null) {
- addAnyOtherInfo(fragment, checkResult.getInfo().getAnyOtherInfo());
- }
-
- if (failedReferences != null) {
- addFailedReferences(fragment, failedReferences);
- }
-
- info = fragment.getChildNodes();
- }
-
- ResponseBuilderUtils.addCodeInfoElement(
- responseDoc,
- responseElem,
- elementName,
- checkResult.getCode(),
- info);
- }
-
-
- /**
- * Add a <code>ManifestRefsCheckResult</code> to the response.
- *
- * @param elementName The DOM element name to use.
- * @param checkResult The <code>ManifestRefsCheckResult</code> to add.
- */
- private void addManifestRefsCheckResult(
- String elementName,
- ManifestRefsCheckResult checkResult) {
-
- DocumentFragment fragment = responseDoc.createDocumentFragment();
- NodeList anyOtherInfo = checkResult.getInfo().getAnyOtherInfo();
- int[] failedReferences = checkResult.getInfo().getFailedReferences();
- Element referringSigRefElem;
- String referringSigRefStr;
-
- // add any other elements
- if (anyOtherInfo != null) {
- addAnyOtherInfo(fragment, checkResult.getInfo().getAnyOtherInfo());
- }
-
- // add the failed references
- if (failedReferences != null) {
- addFailedReferences(fragment, failedReferences);
- }
-
- // add the ReferringSigReference
- referringSigRefElem =
- responseDoc.createElementNS(MOA_NS_URI, "ReferringSigReference");
- referringSigRefStr =
- Integer.toString(checkResult.getInfo().getReferringSignatureReference());
- referringSigRefElem.appendChild(
- responseDoc.createTextNode(referringSigRefStr));
- fragment.appendChild(referringSigRefElem);
-
- // add XMLDSIGManifestCheckResult to the response
- ResponseBuilderUtils.addCodeInfoElement(
- responseDoc,
- responseElem,
- elementName,
- checkResult.getCode(),
- fragment.getChildNodes());
- }
-
- /**
- * Add arbitrary XML content to a DOM <code>DocumentFragment</code>.
- *
- * @param fragment The fragment to add the XML content to.
- * @param anyOtherInfo The XML content to add.
- */
- private void addAnyOtherInfo(
- DocumentFragment fragment,
- NodeList anyOtherInfo) {
-
- int i;
-
- for (i = 0; i < anyOtherInfo.getLength(); i++) {
- fragment.appendChild(responseDoc.importNode(anyOtherInfo.item(i), true));
- }
- }
-
- /**
- * Add the failed references as <code>FailedReference</code> DOM elements to
- * the fragment.
- *
- * @param fragment The DOM document fragment to add the
- * <code>FailedReference</code> elements to.
- * @param failedReferences The indexes of the failed references.
- */
- private void addFailedReferences(
- DocumentFragment fragment,
- int[] failedReferences) {
- Element failedReferenceElem;
- int i;
-
- for (i = 0; i < failedReferences.length; i++) {
- failedReferenceElem =
- responseDoc.createElementNS(MOA_NS_URI, "FailedReference");
- failedReferenceElem.appendChild(
- responseDoc.createTextNode(Integer.toString(failedReferences[i])));
- fragment.appendChild(failedReferenceElem);
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfile.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfile.java
deleted file mode 100644
index 425c410ad..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfile.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-/**
- * Base class for signature environment profile data used in XML signature
- * creation.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface CreateSignatureEnvironmentProfile {
- /**
- * Indicates that the profile data is given explicitly.
- */
- public static int EXPLICIT_CREATESIGNATUREENVIRONMENTPROFILE = 0;
- /**
- * Indicates that the profile data is stored in the configuration and resolved
- * using an ID.
- */
- public static int ID_CREATESIGNATUREENVIRONMENTPROFILE = 1;
-
- /**
- * Gets the type of this object.
- *
- * @return The type of <code>CreateSignatureEnvironmentProfile</code> denoted
- * by this object. Either
- * <code>EXPLICIT_CREATESIGNATUREENVIRONMENTPROFILE</code> or
- * <code>ID_CREATESIGNATUREENVIRONMENTPROFILE</code>.
- */
- public int getCreateSignatureEnvironmentProfileType();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileExplicit.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileExplicit.java
deleted file mode 100644
index 6aebd102b..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileExplicit.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import java.util.List;
-
-/**
- * A <code>CreateSignatureEnvironmentProfile</code> containing the profile
- * data explicitly.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface CreateSignatureEnvironmentProfileExplicit
- extends CreateSignatureEnvironmentProfile {
-
- /**
- * Gets the location and index of where to insert the signature into the
- * signature environment.
- *
- * @return The location and index of the signature in the signature
- * environment.
- */
- public CreateSignatureLocation getCreateSignatureLocation();
- /**
- * Gets the supplemental information.
- *
- * @return The supplemental information.
- */
- public List getSupplements();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileID.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileID.java
deleted file mode 100644
index 1c0d87adc..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureEnvironmentProfileID.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-/**
- * A <code>CreateSignatureEnvironmentProfile</code> containing a profile ID
- * pointing to locally stored profile data.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface CreateSignatureEnvironmentProfileID
- extends CreateSignatureEnvironmentProfile {
-
- /**
- * Gets the profile ID.
- *
- * @return The profile ID.
- */
- public String getCreateSignatureEnvironmentProfileID();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureInfo.java
deleted file mode 100644
index 5ceae4d0a..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureInfo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import at.gv.egovernment.moa.spss.api.common.Content;
-
-/**
- * Encapsulates a signature object used during signature creation.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CreateSignatureInfo {
- /**
- * Gets the XML structure where the signature will be inserted.
- *
- * @return The XML structure where the signature will be inserted.
- */
- public Content getCreateSignatureEnvironment();
- /**
- * Gets the supplemental data for the signature environment.
- *
- * @return The supplemental data for the signature envoronment.
- */
- public CreateSignatureEnvironmentProfile getCreateSignatureEnvironmentProfile();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureLocation.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureLocation.java
deleted file mode 100644
index 81374ceaa..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateSignatureLocation.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import at.gv.egovernment.moa.spss.api.common.ElementSelector;
-
-/**
- * Specifies where to insert the newly created signature.
- *
- * An XPath expression is used to select the signature parent element. An
- * additional index specifies the node index after which to insert the
- * signature into the parent element.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface CreateSignatureLocation extends ElementSelector {
- /**
- * Gets the node index, after which the signature will be inserted into the
- * parent elemen.
- *
- * @return The index of the node after which the signature will be inserted.
- */
- public int getIndex();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfo.java
deleted file mode 100644
index 94152434e..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-
-/**
- * Encapsulates information used for the transformation of the data object.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CreateTransformsInfo {
- /**
- * Gets the XMLDSig transforms.
- *
- * @return A <code>List</code> of <code>Transform</code> objects.
- */
- public List getTransforms();
- /**
- * Gets meta information about the data resulting from the transformation.
- *
- * @return Meta information about the resulting data.
- */
- public MetaInfo getFinalDataMetaInfo();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfile.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfile.java
deleted file mode 100644
index 40acfd317..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfile.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-/**
- * Base class for transformation informations used in signature creation.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CreateTransformsInfoProfile {
- /**
- * Indicates transformation information given explicitly.
- */
- public static final int EXPLICIT_CREATETRANSFORMSINFOPROFILE = 0;
- /**
- * Indicates transformation information given as an ID.
- */
- public static final int ID_CREATETRANSFORMSINFOPROFILE = 1;
-
- /**
- * Gets the type of profile information this object contains.
- *
- * @return The type of transformation information, either
- * <code>EXPLICIT_CREATETRANSFORMSINFOPROFILE</code> or
- * <code>ID_CREATETRANSFORMSINFOPROFILE</code>.
- */
- public int getCreateTransformsInfoProfileType();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileExplicit.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileExplicit.java
deleted file mode 100644
index aeb74445f..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileExplicit.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import java.util.List;
-
-/**
- * Encapsulates explicit transformation informations.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CreateTransformsInfoProfileExplicit
- extends CreateTransformsInfoProfile {
- /**
- * Gets the transformation information of the data object.
- *
- * @return Transformation information of the data object.
- */
- public CreateTransformsInfo getCreateTransformsInfo();
- /**
- * Gets the supplemental information.
- *
- * @return The supplemental information.
- */
- public List getSupplements();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileID.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileID.java
deleted file mode 100644
index 3631ead29..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateTransformsInfoProfileID.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-/**
- * Encapsulates transformation information given via an identifier.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CreateTransformsInfoProfileID
- extends CreateTransformsInfoProfile {
- /**
- * Gets the ID of the transformation.
- *
- * @return The transformation profile ID.
- */
- public String getCreateTransformsInfoProfileID();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureRequest.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureRequest.java
deleted file mode 100644
index b8157fdfb..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureRequest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import java.util.List;
-
-
-/**
- * Object that encapsulates a request to create an XML Signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CreateXMLSignatureRequest {
- /**
- * Gets the identifier for the keys to be used for the signature.
- *
- * @return The identifier for the keys to be used.
- */
- public String getKeyIdentifier();
- /**
- * Gets the information of the singleSignatureInfo elements.
- *
- * @return The information of singleSignatureInfo elements.
- */
- public List getSingleSignatureInfos();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponse.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponse.java
deleted file mode 100644
index 6bf54e6a5..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponse.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import java.util.List;
-
-/**
- * Object that encapsulates the response on to a
- * <code>CreateXMLSignatureRequest</code> to create an XML signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CreateXMLSignatureResponse {
- /**
- * Gets the response elements.
- *
- * @return The response elements.
- */
- public List getResponseElements();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponseElement.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponseElement.java
deleted file mode 100644
index 2162d82fd..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/CreateXMLSignatureResponseElement.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-/**
- * Base class for <code>SignatureEnvironmentResponse</code> and
- * <code>ErrorResponse</code> elements in a
- * <code>CreateXMLSignatureResponse</code>.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface CreateXMLSignatureResponseElement {
- /**
- * Indicates that this object contains a <code>SignatureEnvironment</code>.
- */
- public static final int SIGNATURE_ENVIRONMENT_RESPONSE = 0;
- /**
- * Indicates that this objet contains an <code>ErrorResponse</code>.
- */
- public static final int ERROR_RESPONSE = 1;
-
- /**
- * Gets the type of response object.
- *
- * @return The type of response object, either
- * <code>SIGNATURE_ENVIRONMENT_RESPONSE</code> or <code>ERROR_RESPONSE</code>.
- */
- public int getResponseType();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/DataObjectInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/DataObjectInfo.java
deleted file mode 100644
index 43d49c587..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/DataObjectInfo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import at.gv.egovernment.moa.spss.api.common.Content;
-
-/**
- * Encapsulates information required to create a single signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface DataObjectInfo {
- /**
- * Indicates that a detached signature will be created.
- */
- public static final String STRUCTURE_DETACHED = "detached";
- /**
- * Indicates that an enveloping signature will be created.
- */
- public static final String STRUCTURE_ENVELOPING = "enveloping";
-
- /**
- * Gets the structure of the signature.
- *
- * @return The structure of the signature.
- */
- public String getStructure();
- /**
- * Checks whether a refercence will be placed in the signature itself or
- * in the manifest.
- *
- * @return <code>true</code> if a reference will be placed in the manifest,
- * <code>false</code> if it will be placed in the signature.
- */
- public boolean isChildOfManifest();
- /**
- * Gets information related to a single data object.
- *
- * @return Information related to a single data object.
- */
- public Content getDataObject();
- /**
- * Gets information for the transformation of the data object.
- *
- * @return The transformation information.
- */
- public CreateTransformsInfoProfile getCreateTransformsInfoProfile();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/ErrorResponse.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/ErrorResponse.java
deleted file mode 100644
index 30fa4fb52..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/ErrorResponse.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-
-/**
- * Object containing detailed error information.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface ErrorResponse extends CreateXMLSignatureResponseElement {
- /**
- * Gets the error code.
- *
- * @return The error code.
- */
- public int getErrorCode();
- /**
- * Gets verbose error information.
- *
- * @return Verbose error information.
- */
- public String getInfo();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SignatureEnvironmentResponse.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SignatureEnvironmentResponse.java
deleted file mode 100644
index 449349a68..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SignatureEnvironmentResponse.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import org.w3c.dom.Element;
-
-/**
- * Contains the signature if the signature creation was successful.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface SignatureEnvironmentResponse
- extends CreateXMLSignatureResponseElement {
- /**
- * Gets the XML structure which contains the signature.
- *
- * @return A general XML structure containing the signature.
- */
- public Element getSignatureEnvironment();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SingleSignatureInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SingleSignatureInfo.java
deleted file mode 100644
index 9c74c5157..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlsign/SingleSignatureInfo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlsign;
-
-import java.util.List;
-
-/**
- * Encapsulates data to create a single signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface SingleSignatureInfo {
- /**
- * Gets the dataObjectInfo information.
- *
- * @return The dataObjectInfo information.
- */
- public List getDataObjectInfos();
- /**
- * Gets the signature object.
- *
- * @return The signature object used during signature creation.
- */
- public CreateSignatureInfo getCreateSignatureInfo();
- /**
- * Check whether a Security Layer conform signature manifest will be created.
- *
- * @return <code>true</code>, if a Security Layer conform signature manifest
- * will be created, <code>false</code> otherwise.
- */
- public boolean isSecurityLayerConform();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResult.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResult.java
deleted file mode 100644
index 1984ba349..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResult.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-
-/**
- * Contains the results of manifest checks according to XMLDsig.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface ManifestRefsCheckResult {
- /**
- * Gets the check code.
- *
- * @return A numerical representation of the result of the manifest check.
- */
- public int getCode();
- /**
- * Gets the reference to the manifest.
- *
- * @return The reference to the manifest.
- */
- public ManifestRefsCheckResultInfo getInfo();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResultInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResultInfo.java
deleted file mode 100644
index 258840162..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ManifestRefsCheckResultInfo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-
-/**
- * Encapsulates information referring to the manifest of the check.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface ManifestRefsCheckResultInfo extends ReferencesCheckResultInfo {
- /**
- * Gets the position of the signature reference containing the
- * reference to the manifest being described by this object.
- *
- * @return The position of the signature reference.
- */
- public int getReferringSignatureReference();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferenceInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferenceInfo.java
deleted file mode 100644
index 4c644583b..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferenceInfo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import java.util.List;
-
-/**
- * Contains transformation parameters which are locally available.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface ReferenceInfo {
- /**
- * Gets the transformation info.
- *
- * @return The transformation info.
- */
- public List getVerifyTransformsInfoProfiles();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResult.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResult.java
deleted file mode 100644
index 7b5488613..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResult.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-/**
- * Contains information about the verification status of references contained
- * in the signature.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface ReferencesCheckResult {
- /**
- * Gets the check code.
- *
- * @return A numerical representation of the result of the reference check.
- */
- public int getCode();
- /**
- * Gets the additional information about the result.
- *
- * @return Additional information about the result.
- */
- public ReferencesCheckResultInfo getInfo();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResultInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResultInfo.java
deleted file mode 100644
index be21b61c2..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/ReferencesCheckResultInfo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import org.w3c.dom.NodeList;
-
-/**
- * Additional information contained in a <code>ReferencesCheckResult</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface ReferencesCheckResultInfo {
- /**
- * Gets the additional info of the failed <code>dsig:reference</code> element.
- *
- * @return The info elements.
- */
- public NodeList getAnyOtherInfo();
- /**
- * Gets the positions of the failed signature references containing the
- * references to the manifests being described by this object.
- *
- * @return The positions of the failed signature references.
- */
- public int[] getFailedReferences();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SignatureManifestCheckParams.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SignatureManifestCheckParams.java
deleted file mode 100644
index 8f0efacf3..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SignatureManifestCheckParams.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import java.util.List;
-
-/**
- * Contains parameters used to check the signature manifest.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface SignatureManifestCheckParams {
- /**
- * Gets the referential information.
- *
- * @return The referential information.
- */
- public List getReferenceInfos();
- /**
- * Gets information on whether signature source data should be returned.
- *
- * @return <code>true</code>, if signature source data should be returned,
- * otherwise <code>false</code>.
- */
- public boolean getReturnReferenceInputData();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfile.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfile.java
deleted file mode 100644
index 569e691ca..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfile.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-/**
- * Base class for supplementary information.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface SupplementProfile {
- /**
- * Indicates that this object contains explicit supplementary information.
- */
- public static final int EXPLICIT_SUPPLEMENTPROFILE = 0;
- /**
- * Indicates that this object contains a profile id where supplementary
- * information can be found.
- */
- public static final int ID_SUPPLEMENTPROFILE = 1;
-
- /**
- * Gets the type of supplementary information contained in this object.
- *
- * @return The type of supplementary information contained in this object,
- * either <code>EXPLICIT_SUPPLEMENT</code> or <code>ID_SUPPLEMENT</code>.
- */
- public int getSupplementProfileType();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileExplicit.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileExplicit.java
deleted file mode 100644
index 7dd37a2d1..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileExplicit.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-
-/**
- * Encapsulates explicit supplementary information.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface SupplementProfileExplicit extends SupplementProfile {
- /**
- * Gets the supplemental object.
- *
- * @return The supplemental object.
- */
- public XMLDataObjectAssociation getSupplementProfile();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileID.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileID.java
deleted file mode 100644
index 5b5083be9..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/SupplementProfileID.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-/**
- * Encapsulates supplementary information stored in a profile.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface SupplementProfileID extends SupplementProfile {
- /**
- * Gets the id of the profile where the supplementary information can be
- * found.
- *
- * @return The profile id.
- */
- public String getSupplementProfileID();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameter.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameter.java
deleted file mode 100644
index 3e173e0cd..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-/**
- * Object encapsulating transform parameters either as a URI, binary or
- * hashed.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface TransformParameter {
- /**
- * Indicates that this object contains a transform parameter given as
- * a URI.
- */
- public static final int URI_TRANSFORMPARAMETER = 0;
- /**
- * Indicates that this object contains binary transform parameter.
- */
- public static final int BINARY_TRANSFORMPARAMETER = 1;
- /**
- * Indicatest that this object contains a binary hash of the transform
- * parameter.
- */
- public static final int HASH_TRANSFORMPARAMETER = 2;
-
- /**
- * Gets the type of transform parameter contained in this object.
- *
- * @return The type of transform parameter, being one of
- * <code>URI_TRANSFORMPARAMETER</code>, <code>BINARY_TRANSFORMPARAMETER</code>
- * or <code>HASH_TRANSFORMPARAMETER</code>.
- */
- public int getTransformParameterType();
- /**
- * Gets the transform parameter URI.
- *
- * @return The transform parameter URI.
- */
- public String getURI();}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterBinary.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterBinary.java
deleted file mode 100644
index 600227dfd..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterBinary.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import java.io.InputStream;
-
-/**
- * Encapsulates a binary transform parameter.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface TransformParameterBinary extends TransformParameter {
- /**
- * Gets the binary transform parameter.
- *
- * @return An <code>InputStream</code> from which the binary content can
- * be read.
- */
- public InputStream getBinaryContent();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterHash.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterHash.java
deleted file mode 100644
index ec45ea4f4..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterHash.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-
-/**
- * Contains a hash of the transform parameter.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface TransformParameterHash extends TransformParameter {
- /**
- * Gets the method used for calculating the digest value.
- *
- * @return The digest method.
- */
- public String getDigestMethod();
- /**
- * Gets the binary hash of the transform parameter.
- *
- * @return A binary representation of the hash.
- */
- public byte[] getDigestValue();
-
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterURI.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterURI.java
deleted file mode 100644
index 4a6f0a58f..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/TransformParameterURI.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-/**
- * Encapsulates a transform parameter given as a URI.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface TransformParameterURI extends TransformParameter {
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureInfo.java
deleted file mode 100644
index 386651c47..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureInfo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import at.gv.egovernment.moa.spss.api.common.Content;
-
-/**
- * Encapsulates a signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface VerifySignatureInfo {
- /**
- * Gets the content of the <code>VerifySignatureEnvironment</code> element.
- *
- * @return A <code>MOAElement</code> containing the
- * <code>VerifySignatureEnvironment</code> in a DOM-like structure.
- */
- public Content getVerifySignatureEnvironment();
- /**
- * Gets the location of the signature.
- *
- * @return The location of the signature within the signature environment.
- */
- public VerifySignatureLocation getVerifySignatureLocation();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureLocation.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureLocation.java
deleted file mode 100644
index f05e3e889..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifySignatureLocation.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import at.gv.egovernment.moa.spss.api.common.ElementSelector;
-
-/**
- * Specifies where to find the signature to be verified.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public interface VerifySignatureLocation extends ElementSelector {
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfile.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfile.java
deleted file mode 100644
index 909fc58a2..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfile.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-/**
- * Object for explicitly specifying a transformation path.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface VerifyTransformsInfoProfile {
- /**
- * Indicates that this object contains the transformation path explicitly.
- */
- public static final int EXPLICIT_VERIFYTRANSFORMSINFOPROFILE = 0;
- /**
- * Indicatest that this object contains a transformation info id.
- */
- public static final int ID_VERIFYTRANSFORMSINFOPROFILE = 1;
-
- /**
- * Gets the type of transformation information contained in this object.
- *
- * @return The type of transformation information, either
- * <code>EXPLICIT_VERIFYTRANSFORMSINFOPROFILE</code> or
- * <code>ID_VERIFYTRANSFORMSINFOPROFILE</code>.
- */
- public int getVerifyTransformsInfoProfileType();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileExplicit.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileExplicit.java
deleted file mode 100644
index ff19683da..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileExplicit.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import java.util.List;
-
-/**
- * Encapsulates explicit transformation information.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface VerifyTransformsInfoProfileExplicit extends VerifyTransformsInfoProfile {
- /**
- * Gets the XMLDSig transforms element.
- *
- * @return The <code>List</code> of <code>Transform</code>s.
- */
- public List getTransforms();
- /**
- * Gets the transformation parameters.
- *
- * @return The transformation parameters.
- */
- public List getTransformParameters();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileID.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileID.java
deleted file mode 100644
index 0df3664da..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyTransformsInfoProfileID.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-/**
- * Encapsulates transformation info id for signature verification.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface VerifyTransformsInfoProfileID extends VerifyTransformsInfoProfile {
- /**
- * Gets the identifier referencing the transformation info.
- *
- * @return The identifier referencing the transformation info.
- */
- public String getVerifyTransformsInfoProfileID();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java
deleted file mode 100644
index eb71f500b..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureRequest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * Object that encapsulates a request to verify an XML signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface VerifyXMLSignatureRequest {
- /**
- * Gets the date and time for which the signature verification has to
- * be performed.
- *
- * @return Date and time for which the signature verification has
- * to be performed.
- */
- public Date getDateTime();
- /**
- * Gets the signature to be verified.
- *
- * @return The signature to be verified.
- */
- public VerifySignatureInfo getSignatureInfo();
- /**
- * Gets the supplemental information.
- *
- * @return The supplemental information.
- */
- public List getSupplementProfiles();
- /**
- * Gets parameters for Security Layer signature verification.
- *
- * @return Parameters for Security Layer signature verification.
- */
- public SignatureManifestCheckParams getSignatureManifestCheckParams();
- /**
- * Checks, whether actually signed data shall be returned.
- *
- * @return <code>true</code>, if signed data will be returned,
- * otherwise <code>false</code>.
- */
- public boolean getReturnHashInputData();
- /**
- * Gets the profile id of the set of trusted certificates to be used for
- * signature verification.
- *
- * @return The id of the trusted certificates.
- */
- public String getTrustProfileId();
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java
deleted file mode 100644
index 14ac71e67..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlverify/VerifyXMLSignatureResponse.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.gv.egovernment.moa.spss.api.xmlverify;
-
-import java.util.List;
-
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-
-/**
- * Object that encapsulates the response on a request to verify an XML
- * signature.
- *
- * @author Patrick Peck
- * @author Stephan Grill
- * @version $Id$
- */
-public interface VerifyXMLSignatureResponse {
- /**
- * Gets a <code>SignerInfo</code> element according to XMLDSig.
- *
- * @return A <code>SignerInfo</code> element according to XMLDSig.
- */
- public SignerInfo getSignerInfo();
- /**
- * Gets datas signed by the signatory.
- *
- * @return The signed datas.
- */
- public List getHashInputDatas();
- /**
- * Gets source datas elements.
- *
- * @return The source datas elements.
- */
- public List getReferenceInputDatas();
- /**
- * Gets the result of the signature verification.
- *
- * @return The result of the signature verification.
- */
- public ReferencesCheckResult getSignatureCheck();
- /**
- * Gets the result of the signature manifest verification.
- *
- * @return The result of the signature manifest verification.
- */
- public ReferencesCheckResult getSignatureManifestCheck();
- /**
- * Gets XMLDSigManifestCheck elements.
- *
- * @return The XMLDSigManifestCheck elements.
- */
- public List getXMLDsigManifestChecks();
- /**
- * Gets the result of the certification verification.
- *
- * @return The result of the certificate verification.
- */
- public CheckResult getCertificateCheck();
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/overview.htm b/spss.server/src/at/gv/egovernment/moa/spss/overview.htm
deleted file mode 100644
index 9b17bbf91..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/overview.htm
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-MOA SP/SS API documentation overview.
-
-
-<h2>Using the MOA SP/SS API</h2>
-
-<h3>Invoking the services</h3>
-In general, invoking the MOA SP/SS API involves the following steps:
-<ol>
-<li>Set the <code>moa.spss.server.configuration</code> system property to point
-to the main MOA SP/SS configuration file. This needs to be done only once per
-JVM instance. You may also call
-{@link at.gv.egovernment.moa.spss.api.Configurator#init} at this point to
-pre-initialize MOA SP/SS (if not, it is done automatically upon service
-invocation).</li>
-<li>Create an instance of the service to be used
-({@link at.gv.egovernment.moa.spss.api.SignatureCreationService} or
-{@link at.gv.egovernment.moa.spss.api.SignatureVerificationService}),
-via its <code>getInstance()</code> method.</li>
-<li>Create an instance of the
-{@link at.gv.egovernment.moa.spss.api.SPSSFactory}, via its
-{@link at.gv.egovernment.moa.spss.api.SPSSFactory#getInstance} method.</li>
-<li>Use the <code>create...</code> methods of the <code>SPSSFactory</code> to
-create the desired {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest},
-{@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest} or
-{@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest} object.
-</li>
-<li>Call one of the service methods:
-{@link at.gv.egovernment.moa.spss.api.SignatureCreationService#createXMLSignature(at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest) <code>createXMLSignature()</code>},
-{@link at.gv.egovernment.moa.spss.api.SignatureVerificationService#verifyCMSSignature(at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest) <code>verifyCMSSignature()</code>} or
-{@link at.gv.egovernment.moa.spss.api.SignatureVerificationService#verifyXMLSignature(at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest) <code>verifyXMLSignature()</code>}.
-</li>
-<li>Analyze the result of the service call, given as a
-{@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse},
-{@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse} or
-{@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse}.
-In case of an error, a {@link at.gv.egovernment.moa.spss.MOAException}
-is thrown by the service. Please be aware that errors during signature creation
-are reported as part of a <code>CreateXMLSignatureResponse</code>.
-</ol>
-
-<h3>Creating MOA SP/SS API objects</h3>
-<p>
-Invoking the MOA SP/SS API <code>Service</code> classes involves creating
-a <code>Request</code> object using the {@link at.gv.egovernment.moa.spss.api.SPSSFactory SPSSFactory}.
-Object creation using the <code>SPSSFactory</code> is always bottom-up, meaning
-that in order to create an object all of its components must have been created
-before.
-</p>
-<p>
-The names of the MOA SP/SS API classes have been chosen to correspond to the
-MOA SP/SS schema elements. The structure of the classes (i.e., their fields)
-also corresponds to the structure of the respective MOA SP/SS schema elements.
-However, a few classes escape this naming convention, mainly because the
-corresponding schema elements contain <code>xsd:choice</code> components:
-<ul>
-<li>The various <code>Profile</code> classes have subclasses called
-<code>ProfileID</code> and <code>ProfileExplicit</code>
-(e.g., {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileID} and
-{@link at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileExplicit}),
-so that the profile can be given either as an ID (which is to be resolved from the
-MOA SP/SS configuration) or explicitly.</li>
-<li>The classes {@link at.gv.egovernment.moa.spss.api.common.Content},
-{@link at.gv.egovernment.moa.spss.api.cmsverify.CMSContent} and
-{@link at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter} have
-subclasses specifying the type of content they actually contain. E.g.,
-{@link at.gv.egovernment.moa.spss.api.common.ContentBinary} will contain
-a byte stream.</li>
-</ul>
-
-</p>
-<p>
-For clarity, the MOA SP/SS API classes have been organized in several packages
-listed in the following table:
-</p>
-
-<table border=1 cellspacing=0 cellpadding=5>
-<tr>
- <td>Package</td><td>Purpose</td>
-</tr>
-<tr>
- <td>{@link at.gv.egovernment.moa.spss.api.xmlsign}</td>
- <td>Components of the {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest} and
- {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse}</td>
-</tr>
-<tr>
- <td>{@link at.gv.egovernment.moa.spss.api.cmsverify}</td>
- <td>Components of the
- {@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest} and
- {@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse}</td>
-</tr>
-<tr>
- <td>{@link at.gv.egovernment.moa.spss.api.xmlverify}</td>
- <td>Components of the
- {@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest} and
- {@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse}</td>
-</tr>
-<tr>
- <td>{@link at.gv.egovernment.moa.spss.api.common}</td>
- <td>Common components used across the classes of the above packages</td>
-</tr>
-</table>
-
-<h3>Converting MOA SP/SS API objects to and from DOM trees</h3>
-The package {@link at.gv.egovernment.moa.spss.api.xmlbind} contains helper
-classes to:
-<ul>
-<li>Parse a DOM tree containing a <code>CreateXMLSignatureRequest</code>,
-<code>VerifyCMSSignatureRequest</code> or
-<code>VerifyCMSSignatureRequest</code> into its respective MOA SP/SS API object
-representation. For example, to parse a <code>CreateXMLSignatureRequest</code>
-DOM tree, the {@link at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureRequestParser#parse(org.w3c.dom.Element) CreateXMLSignatureRequestParser.parse()}
-method can be used. <br />
-<b>Note:</b> The DOM tree of the request must be derived from a schema valid
-XML document. Otherwise, unexpected behaviour will almost certainly result.</li>
-<li>Build a <code>CreateXMLSignatureResponse</code>,
-<code>VerifyCMSSignatureResponse</code> or a
-<code>VerifyXMLSignatureResponse</code> DOM tree from the respective MOA SP/SS
-API object. For example, to build a <code>VerifyXMLSignatureResponse</code>
-DOM tree, the {@link at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureResponseBuilder#build(at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse) VerifyXMLSignatureResponseBuilder.build()}
-can be used.<br />
-<b>Note:</b>The serialized DOM tree will be schema valid.
-</li>
-</ul>
-The DOM trees can easily be read from and written to XML byte streams using
-the methods in the {@link at.gv.egovernment.moa.util.DOMUtils} class.
-<br />
-
-<h3>Utilities and Logging</h3>
-<p> The packages {@link at.gv.egovernment.moa.util} and
-{@link at.gv.egovernment.moa.spss.util} contain utility classes developed for
-the MOA SP/SS implementation. Since the classes contained in these packages are
-tailored towards the MOA SP/SS implementation, they are far from being complete
-in the sense of providing a utility class library. Therefore, they may or may
-not prove useful in the context of your application. Their interfaces may also
-change in future releases.
-</p>
-
-<p>The package {@link at.gv.egovernment.moa.logging} contains classes for
-logging messages to the MOA SP/SS log hierarchy via the
-{@link at.gv.egovernment.moa.logging.Logger} class.
-</p>
-
-<h3>Related Documentation</h3>
-
-See also the <a href="../moa_spss/sp-anwendung.htm#API">API example</a> in the
-MOA SP/SS documentation.
-
-</body>
-</html> \ No newline at end of file
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
deleted file mode 100644
index bd78012ef..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-import iaik.pki.revocation.RevocationSourceTypes;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * A class representing a CRL distribution point.
- *
- * @author Sven Aigner
- * @author Patrick Peck
- * @version $Id$
- */
-public class CRLDistributionPoint
- extends DistributionPoint
- implements iaik.pki.revocation.CRLDistributionPoint
-{
-
- private static Map RC_MAPPING = new HashMap();
-
- static {
-
- // create the mapping between reason code strings and their integer values
- RC_MAPPING.put(
- "unused",
- new Integer(iaik.asn1.structures.DistributionPoint.unused));
- RC_MAPPING.put(
- "keyCompromise",
- new Integer(iaik.asn1.structures.DistributionPoint.keyCompromise));
- RC_MAPPING.put(
- "cACompromise",
- new Integer(iaik.asn1.structures.DistributionPoint.cACompromise));
- RC_MAPPING.put(
- "affiliationChanged",
- new Integer(iaik.asn1.structures.DistributionPoint.affiliationChanged));
- RC_MAPPING.put(
- "superseded",
- new Integer(iaik.asn1.structures.DistributionPoint.superseded));
- RC_MAPPING.put(
- "cessationOfOperation",
- new Integer(iaik.asn1.structures.DistributionPoint.cessationOfOperation));
- RC_MAPPING.put(
- "certificateHold",
- new Integer(iaik.asn1.structures.DistributionPoint.certificateHold));
- RC_MAPPING.put(
- "privilegeWithdrawn",
- new Integer(iaik.asn1.structures.DistributionPoint.privilegeWithdrawn));
- RC_MAPPING.put(
- "aACompromise",
- new Integer(iaik.asn1.structures.DistributionPoint.aACompromise));
- }
-
- /**
- * The name of the CA issuing the CRL referred to by this DP.
- */
- private String issuerName_;
-
- /**
- * The reason codes applicable for the distribution point.
- */
- private int reasonCodes;
-
- /**
- * Create a <code>CRLDistributionPoint</code>.
- *
- * @param issuerName The name of the CA issuing the CRL referred to by this DP.
- *
- * @param uri The URI of the distribution point.
- *
- * @param reasonCodeStr A list of reason codes (a space-separated enumeration).
- */
- public CRLDistributionPoint(String issuerName, String uri, String reasonCodeStr)
- {
- super(uri);
- issuerName_ = issuerName;
- this.reasonCodes = extractReasonCodes(reasonCodeStr);
- }
-
- /**
- * @see DistributionPoint#getType()
- */
- public String getType()
- {
- return RevocationSourceTypes.CRL;
- }
-
- /**
- * Convert a list of reason codes provided as a <code>String</code> to a
- * binary representation.
- *
- * @param reasonCodeStr A <code>String</code> containing a blank-separated,
- * textual representation of reason codes.
- * @return int A binary representation of reason codes.
- * @see iaik.asn1.structures.DistributionPoint
- */
- private int extractReasonCodes(String reasonCodeStr) {
- int codes = 0;
- StringTokenizer tokenizer = new StringTokenizer(reasonCodeStr);
- String token;
- Integer reasonCode;
-
- while (tokenizer.hasMoreTokens()) {
- token = tokenizer.nextToken();
- reasonCode = (Integer) RC_MAPPING.get(token);
- if (reasonCode != null) {
- codes |= reasonCode.intValue();
- } else {
- MessageProvider msg = MessageProvider.getInstance();
- Logger.warn(
- new LogMsg(msg.getMessage("config.07", new Object[] { token })));
- }
- }
-
- // If reasonCodeStr is empty, set all possible reason codes
- if (codes == 0) codes =
- iaik.asn1.structures.DistributionPoint.unused |
- iaik.asn1.structures.DistributionPoint.keyCompromise |
- iaik.asn1.structures.DistributionPoint.cACompromise |
- iaik.asn1.structures.DistributionPoint.affiliationChanged |
- iaik.asn1.structures.DistributionPoint.superseded |
- iaik.asn1.structures.DistributionPoint.cessationOfOperation |
- iaik.asn1.structures.DistributionPoint.certificateHold |
- iaik.asn1.structures.DistributionPoint.privilegeWithdrawn |
- iaik.asn1.structures.DistributionPoint.aACompromise;
-
- return codes;
- }
-
- /**
- * Return a binary representation of the reason codes of this distribution
- * point.
- *
- * @return The binary representation of the reason codes.
- */
- public int getReasonCodes() {
- return reasonCodes;
- }
-
- /**
- * Return a <code>String</code> representation of this distribution point.
- *
- * @return The <code>String</code> representation of this distribution point.
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "(DistributionPoint - "
- + ("URI<" + getUri())
- + ("> REASONCODES<" + getReasonCodes() + ">)");
- }
-
- /**
- * @see iaik.pki.revocation.CRLDistributionPoint#getIssuerName()
- */
- public String getIssuerName()
- {
- return issuerName_;
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java
deleted file mode 100644
index f2b847053..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-import at.gv.egovernment.moa.spss.MOASystemException;
-
-/**
- * Exception signalling an error in the configuration.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ConfigurationException extends MOASystemException {
-
- /**
- * Create a <code>ConfigurationException</code>.
- *
- * @see at.gv.egovernment.moa.spss.server.MOAException#MOAException(String, Object[])
- */
- public ConfigurationException(String messageId, Object[] parameters) {
- super(messageId, parameters);
- }
-
- /**
- * Create a <code>ConfigurationException</code>.
- * @see at.gv.egovernment.moa.spss.server.MOAException#MOAException(String, Object[], Throwable)
- */
- public ConfigurationException(
- String messageId,
- Object[] parameters,
- Throwable wrapped) {
-
- super(messageId, parameters, wrapped);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
deleted file mode 100644
index 09f114d54..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ /dev/null
@@ -1,1239 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.net.MalformedURLException;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.traversal.NodeIterator;
-
-import org.xml.sax.SAXException;
-
-import iaik.ixsil.exceptions.URIException;
-import iaik.ixsil.util.URI;
-import iaik.pki.pathvalidation.ChainingModes;
-import iaik.pki.revocation.RevocationSourceTypes;
-import iaik.utils.RFC2253NameParser;
-import iaik.utils.RFC2253NameParserException;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * A class that builds configuration data from a DOM based representation.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ConfigurationPartsBuilder {
-
- //
- // XPath namespace prefix shortcuts
- //
-
- private static final String CONF = Constants.MOA_CONFIG_PREFIX + ":";
- private static final String DSIG = Constants.DSIG_PREFIX + ":";
-
- //
- // chaining mode constants appearing in the configuration file
- //
-
- private static final String CM_CHAINING = "chaining";
- private static final String CM_PKIX = "pkix";
-
- //
- // XPath expressions to select certain parts of the configuration
- //
-
- private static final String ROOT = "/" + CONF + "MOAConfiguration/";
-
- private static final String DIGEST_METHOD_XPATH =
- ROOT + CONF + "SignatureCreation/"
- + CONF + "XMLDSig/"
- + CONF + "DigestMethodAlgorithm";
- private static final String C14N_ALGORITHM_XPATH =
- ROOT + CONF + "SignatureCreation/"
- + CONF + "XMLDSig/"
- + CONF + "CanonicalizationAlgorithm";
- private static final String HARDWARE_CRYPTO_MODULE_XPATH =
- ROOT + CONF + "Common/"
- + CONF + "HardwareCryptoModule";
- private static final String HARDWARE_KEY_XPATH =
- ROOT + CONF + "SignatureCreation/"
- + CONF + "KeyModules/"
- + CONF + "HardwareKeyModule";
- private static final String SOFTWARE_KEY_XPATH =
- ROOT + CONF + "SignatureCreation/"
- + CONF + "KeyModules/"
- + CONF + "SoftwareKeyModule";
- private static final String KEYGROUP_XPATH =
- ROOT + CONF + "SignatureCreation/"
- + CONF + "KeyGroup";
- private static final String KEYGROUP_MAPPING_XPATH =
- ROOT + CONF + "SignatureCreation/"
- + CONF + "KeyGroupMapping";
- private static final String ISSUER_XPATH =
- DSIG + "X509IssuerName";
- private static final String SERIAL_XPATH =
- DSIG + "X509SerialNumber";
- private static final String CERTSTORE_LOCATION_XPATH =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "PathConstruction/"
- + CONF + "CertificateStore/"
- + CONF + "DirectoryStore/"
- + CONF + "Location";
- private static final String AUTO_ADD_CERTIFICATES_XPATH_ =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "PathConstruction/"
- + CONF + "AutoAddCertificates";
- private static final String USE_AUTHORITY_INFO_ACCESS_XPATH_ =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "PathConstruction/"
- + CONF + "UseAuthorityInformationAccess";
- private static final String CHAINING_MODES_XPATH =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "PathValidation/"
- + CONF + "ChainingMode";
- private static final String CHAINING_MODES_DEFAULT_XPATH =
- CHAINING_MODES_XPATH + "/"
- + CONF + "DefaultMode";
- private static final String TRUST_ANCHOR_XPATH =
- CHAINING_MODES_XPATH + "/"
- + CONF + "TrustAnchor";
- private static final String TRUST_PROFILE_XPATH =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "PathValidation/"
- + CONF + "TrustProfile";
- private static final String DISTRIBUTION_POINTS_XPATH =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "RevocationChecking/"
- + CONF + "DistributionPoint";
- private static final String ENABLE_REVOCATION_CHECKING_XPATH_ =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "RevocationChecking/"
- + CONF + "EnableChecking";
- private static final String MAX_REVOCATION_AGE_XPATH_ =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "RevocationChecking/"
- + CONF + "MaxRevocationAge";
- private static final String REVOCATION_SERVICEORDER_XPATH_ =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "RevocationChecking/"
- + CONF + "ServiceOrder/"
- + CONF + "Service";
- private static final String ENABLE_ARCHIVING_XPATH =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "RevocationChecking/"
- + CONF + "Archiving/"
- + CONF + "EnableArchiving";
- private static final String CRL_ARCHIVE_DURATION_XPATH =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "RevocationChecking/"
- + CONF + "Archiving/"
- + CONF + "ArchiveDuration";
- private static final String ACHIVE_JDBC_URL_ =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "RevocationChecking/"
- + CONF + "Archiving/"
- + CONF + "Archive/"
- + CONF + "DatabaseArchive/"
- + CONF + "JDBCURL";
- private static final String ACHIVE_JDBC_DRIVER_CLASS_ =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "CertificateValidation/"
- + CONF + "RevocationChecking/"
- + CONF + "Archiving/"
- + CONF + "Archive/"
- + CONF + "DatabaseArchive/"
- + CONF + "JDBCDriverClassName";
- private static final String CREATE_TRANSFORMS_INFO_PROFILE_XPATH =
- ROOT + CONF + "SignatureCreation/"
- + CONF + "CreateTransformsInfoProfile";
- private static final String CREATE_SIGNATURE_ENVIRONMENT_PROFILE_XPATH =
- ROOT + CONF + "SignatureCreation/"
- + CONF + "CreateSignatureEnvironmentProfile";
- private static final String VERIFY_TRANSFORMS_INFO_PROFILE_XPATH =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "VerifyTransformsInfoProfile";
- private static final String SUPPLEMENT_PROFILE_XPATH =
- ROOT + CONF + "SignatureVerification/"
- + CONF + "SupplementProfile";
-
- //
- // default values for configuration parameters
- //
-
- /** The accepted canonicalization algorithm URIs, as an array */
- private static final String[] ACCEPTED_C14N_ALGORITHMS_ARRAY =
- {
- Constants.C14N_URI,
- Constants.C14N_WITH_COMMENTS_URI,
- Constants.EXC_C14N_URI,
- Constants.EXC_C14N_WITH_COMMENTS_URI };
-
- /** The accepted canonicalization algorithm URIs, as a Set */
- private static final Set ACCEPTED_C14N_ALGORITHMS =
- new HashSet(Arrays.asList(ACCEPTED_C14N_ALGORITHMS_ARRAY));
-
- /** Default canonicalization algorithm, if none/illegal has been configured */
- private static final String C14N_ALGORITHM_DEFAULT = Constants.C14N_URI;
-
- /** The accepted digest method algorithm URIs, as an array */
- private static final String[] ACCEPTED_DIGEST_ALGORITHMS_ARRAY =
- { Constants.SHA1_URI };
-
- /** The accepted digest method algorithm URIs, as a Set */
- private static final Set ACCEPTED_DIGEST_ALGORITHMS =
- new HashSet(Arrays.asList(ACCEPTED_DIGEST_ALGORITHMS_ARRAY));
-
- /** Default digest algorithm URI, if none/illegal has been configured */
- private static final String DIGEST_ALGORITHM_DEFAULT = Constants.SHA1_URI;
-
- /** The root element of the MOA configuration */
- private Element configElem;
-
- /**
- * The directory containing the underlying configuration file.
- */
- private File configRoot_;
-
- /** Whether any warnings were encountered building the configuration. */
- private List warnings = new ArrayList();
-
- /**
- * Create a new <code>ConfigurationPartsBuilder</code>.
- *
- * @param configElem The root element of the MOA configuration.
- *
- * @param configRoot The directory containing the underlying configuration file.
- */
- public ConfigurationPartsBuilder(Element configElem, File configRoot)
- {
- this.configElem = configElem;
- configRoot_ = configRoot;
- }
-
- /**
- * Returns the root element of the MOA configuration.
- *
- * @return The root element of the MOA configuration.
- */
- public Element getConfigElem() {
- return configElem;
- }
-
- /**
- * Returns the directory containing the underlying configuration file.
- *
- * @return the directory containing the underlying configuration file.
- */
- public File getConfigRoot()
- {
- return configRoot_;
- }
-
- /**
- * Returns the warnings encountered during building the configuration.
- *
- * @return A <code>List</code> of <code>String</code>s, containing the
- * warning messages.
- */
- public List getWarnings() {
- return warnings;
- }
-
- /**
- * Returns the digest method algorithm name.
- *
- * @return The digest method algorithm name from the configuration.
- */
- public String getDigestMethodAlgorithmName()
- {
- String digestMethod = getElementValue(getConfigElem(), DIGEST_METHOD_XPATH, null);
-
- if (digestMethod == null || !ACCEPTED_DIGEST_ALGORITHMS.contains(digestMethod))
- {
- info(
- "config.23",
- new Object[] { "DigestMethodAlgorithm", DIGEST_ALGORITHM_DEFAULT });
- digestMethod = DIGEST_ALGORITHM_DEFAULT;
- }
-
- return digestMethod;
- }
-
- /**
- * Returns the canonicalization algorithm name.
- *
- * @return The canonicalization algorithm name from the configuration.
- */
- public String getCanonicalizationAlgorithmName()
- {
- String c14nAlgorithm = getElementValue(getConfigElem(), C14N_ALGORITHM_XPATH, null);
-
- if (c14nAlgorithm == null || !ACCEPTED_C14N_ALGORITHMS.contains(c14nAlgorithm))
- {
- info(
- "config.23",
- new Object[] { "CanonicalizationAlgorithm", C14N_ALGORITHM_DEFAULT });
- c14nAlgorithm = C14N_ALGORITHM_DEFAULT;
- }
-
- return c14nAlgorithm;
- }
-
- /**
- * Build the configured hardware crypto modules.
- *
- * @return The hardware crypto modules from the configuration.
- */
- public List buildHardwareCryptoModules()
- {
- List modules = new ArrayList();
- NodeIterator modIter = XPathUtils.selectNodeIterator(
- getConfigElem(),
- HARDWARE_CRYPTO_MODULE_XPATH);
-
- Element modElem;
- while ((modElem = (Element) modIter.nextNode()) != null) {
- String name = getElementValue(modElem, CONF + "Name", null);
- String slotId = getElementValue(modElem, CONF + "SlotId", null);
- String userPIN = getElementValue(modElem, CONF + "UserPIN", null);
- HardwareCryptoModule module = new HardwareCryptoModule(name, slotId, userPIN);
- modules.add(module);
- }
-
- return modules;
- }
-
- /**
- * Build the configured hardware keys.
- *
- * @param The keyModules that the configuration already knows about. To
- * prevent multiple key modules with the same ID.
- * @return The hardware keys contained in the configuration.
- */
- public List buildHardwareKeyModules(List keyModules)
- {
- Set existingIds = toIdSet(keyModules);
- List hardwareKeys = new ArrayList();
- NodeIterator hkIter =
- XPathUtils.selectNodeIterator(getConfigElem(), HARDWARE_KEY_XPATH);
- Element keyElem;
-
- while ((keyElem = (Element) hkIter.nextNode()) != null)
- {
- String id = getElementValue(keyElem, CONF + "Id", null);
- String name = getElementValue(keyElem, CONF + "Name", null);
- String slotId = getElementValue(keyElem, CONF + "SlotId", null);
- String userPIN = getElementValue(keyElem, CONF + "UserPIN", null);
-
- if (existingIds.contains(id))
- {
- warn(
- "config.04",
- new Object[] { "Hardware- oder SoftwareKeyModule", id });
- }
- else
- {
- KeyModule key = new HardwareKeyModule(id, name, slotId, userPIN);
- hardwareKeys.add(key);
- existingIds.add(id);
- }
-
- }
-
- return hardwareKeys;
- }
-
- /**
- * Build the configured software keys.
- *
- * @param The keyModules that the configuration already knows about. To
- * prevent multiple key modules with the same ID.
- *
- * @return The software keys contained in the configuration.
- */
- public List buildSoftwareKeyModules(List keyModules)
- {
- Set existingIds = toIdSet(keyModules);
- List softwareKeys = new ArrayList();
- NodeIterator skIter =
- XPathUtils.selectNodeIterator(getConfigElem(), SOFTWARE_KEY_XPATH);
-
- Element keyElem;
- while ((keyElem = (Element) skIter.nextNode()) != null)
- {
- String id = getElementValue(keyElem, CONF + "Id", null);
- String fileName = getElementValue(keyElem, CONF + "FileName", null);
- String passWord = getElementValue(keyElem, CONF + "Password", null);
-
- if (existingIds.contains(id))
- {
- warn(
- "config.04",
- new Object[] { "Hardware- oder SoftwareKeyModule", id });
- }
- else
- {
- File keyFile;
- KeyModule key;
-
- // make keyFile absolute
- keyFile = new File(fileName);
- if (!keyFile.isAbsolute()) {
- keyFile = new File(configRoot_, fileName);
- }
-
- // check for existence
- if (!keyFile.exists() || keyFile.isDirectory()) {
- warn("config.25", new Object[] { id, keyFile.getAbsolutePath()});
- } else {
- // create a new key module
- key = new SoftwareKeyModule(id, keyFile.getAbsolutePath(), passWord);
- softwareKeys.add(key);
- existingIds.add(id);
- }
- }
- }
-
- return softwareKeys;
- }
-
- /**
- * Build the key group configuration.
- *
- * @param keyModules The <code>KeyModule</code>s that the configuration
- * knows about. Used to check for errors in the configuration.
- * @return The mapping between key group IDs and key groups.
- */
- public Map buildKeyGroups(List keyModules)
- {
- Set keyModuleIds = toIdSet(keyModules);
- Map keyGroups = new HashMap();
- NodeIterator kgIter;
- Element keyGroupElem;
-
- // select all KeyGroup elements and build the KeyGroup objects from them
- kgIter = XPathUtils.selectNodeIterator(getConfigElem(), KEYGROUP_XPATH);
- while ((keyGroupElem = (Element) kgIter.nextNode()) != null)
- {
- String keyGroupId = getElementValue(keyGroupElem, CONF + "Id", null);
- Set keyGroupEntries =
- buildKeyGroupEntries(keyGroupId, keyModuleIds, keyGroupElem);
- KeyGroup keyGroup = new KeyGroup(keyGroupId, keyGroupEntries);
-
- if (keyGroups.containsKey(keyGroupId))
- {
- warn("config.04", new Object[] { "KeyGroup", keyGroupId });
- }
- else
- {
- keyGroups.put(keyGroup.getId(), keyGroup);
- }
- }
-
- return keyGroups;
- }
-
- /**
- * Return the set of IDs contained in the given <code>KeyModule</code>s.
- *
- * @param keyModules The <code>KeyModule</code>s from which to extract the
- * IDs.
- * @return The IDs from the given <code>KeyModule</code>s.
- */
- private Set toIdSet(List keyModules) {
- Set ids = new HashSet();
- Iterator iter;
-
- for (iter = keyModules.iterator(); iter.hasNext();) {
- KeyModule keyModule = (KeyModule) iter.next();
- ids.add(keyModule.getId());
- }
-
- return ids;
- }
-
- /**
- * Build the key entries belonging to a key group.
- *
- * @param keyGroupId The ID of the key group we are building here. Passed
- * for logging purposes.
- * @param keyModuleIds The IDs of the <code>HardwareKeyModule</code>s and
- * <code>SoftwareKeyModule</code>s that exist in the configuration.
- * @param keyGroupElem The <code>KeyGroup</code> DOM element to parse.
- * @return A <code>Set</code> of <code>KeyGroupEntry</code> objects.
- */
- private Set buildKeyGroupEntries(
- String keyGroupId,
- Set keyModuleIds,
- Element keyGroupElem) {
-
- Set entries = new HashSet();
- NodeIterator keyEntryIter;
- Element keyEntryElem;
-
- // select all Key elements and put them into the Map
- keyEntryIter = XPathUtils.selectNodeIterator(keyGroupElem, CONF + "Key");
- while ((keyEntryElem = (Element) keyEntryIter.nextNode()) != null)
- {
- String keyModuleId = getElementValue(keyEntryElem, CONF + "KeyModuleId", "");
- Element keyCertElem = (Element) XPathUtils.selectSingleNode(keyEntryElem, CONF + "KeyCertIssuerSerial");
- IssuerAndSerial issuerSerial = buildIssuerAndSerial(keyCertElem);
-
- if (!keyModuleIds.contains(keyModuleId)) {
- warn("config.26", new Object[] { keyGroupId, keyModuleId });
- } else if (issuerSerial != null) {
- KeyGroupEntry entry = new KeyGroupEntry(keyModuleId, issuerSerial);
- entries.add(entry);
- }
- }
- return entries;
- }
-
- /**
- * Build the key group mapping.
- *
- * @param keyGroups The available key groups.
- * @param anonymous The <code>IssuerAndSerial</code> to be used for key group
- * mappings not protected by a certificate.
- * @return The key group mapping.
- */
- public Map buildKeyGroupMappings(Map keyGroups, IssuerAndSerial anonymous) {
- Map mappings = new HashMap();
- NodeIterator mappingIter;
- Element mappingElem;
-
- // select all KeyGroupMapping elements
- mappingIter =
- XPathUtils.selectNodeIterator(getConfigElem(), KEYGROUP_MAPPING_XPATH);
-
- // build the mapping for each KeyGroupMapping element
- while ((mappingElem = (Element) mappingIter.nextNode()) != null)
- {
- Element issuerSerialElem = (Element) XPathUtils.selectSingleNode(mappingElem, CONF + "CustomerId");
-
- // build the IssuerAndSerial who has access to the key groups
- IssuerAndSerial issuerAndSerial;
- if (issuerSerialElem != null)
- {
- issuerAndSerial = buildIssuerAndSerial(issuerSerialElem);
- }
- else
- {
- // IssuerSerial element: the keygroup is generally available
- issuerAndSerial = anonymous;
- }
-
- // add the key groups to the mappings
- if (issuerAndSerial != null) {
- Map groups = (Map) mappings.get(issuerAndSerial);
- NodeIterator keyGroupIter;
- Element keyGroupElem;
-
- if (groups == null)
- {
- // no mapping exist -> build one
- groups = new HashMap();
- mappings.put(issuerAndSerial, groups);
- }
-
- // select the available key groups and add them to the mapping
- keyGroupIter = XPathUtils.selectNodeIterator(mappingElem, CONF + "KeyGroupId");
- while ((keyGroupElem = (Element) keyGroupIter.nextNode()) != null)
- {
- String keyGroupId = getElementValue(keyGroupElem, ".", null);
- KeyGroup keyGroup = (KeyGroup) keyGroups.get(keyGroupId);
-
- if (keyGroup != null)
- {
- groups.put(keyGroupId, keyGroup);
- } else
- {
- warn("config.00", new Object[] { keyGroupId });
- }
- }
- }
- }
-
- return mappings;
- }
-
- /**
- * Returns the default chaining mode from the configuration.
- *
- * @return The default chaining mode.
- */
- public String getDefaultChainingMode()
- {
- String defaultChaining = getElementValue(
- getConfigElem(),
- CHAINING_MODES_DEFAULT_XPATH,
- CM_PKIX);
-
- 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(
- (Element)XPathUtils.selectSingleNode(trustAnchorElem, CONF + "Identification"));
- String mode = getElementValue(trustAnchorElem, CONF + "Mode", null);
-
- 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 = getElementValue(root, ISSUER_XPATH, null);
- String serial = 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.16", new Object[] { issuer, serial }, e);
- return null;
- } catch (NumberFormatException e) {
- warn("config.16", 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.PKIX_MODE;
- }
- }
-
- /**
- * Build the distribution points mapping.
- *
- * @return The mapping from certificate authorities to distribution points.
- */
- public Map buildDistributionPoints()
- {
- Map dPs = new HashMap();
- NodeIterator dPIter;
- Element dPElem;
-
- // select all DistributionPoint elements
- dPIter = XPathUtils.selectNodeIterator(getConfigElem(), DISTRIBUTION_POINTS_XPATH);
-
- // build the mapping of CA name to distribution points
- while ((dPElem = (Element) dPIter.nextNode()) != null) {
- String caIssuerDNText = getElementValue(dPElem, CONF + "CAIssuerDN", "");
- RFC2253NameParser nameParser = new RFC2253NameParser(caIssuerDNText);
- NodeIterator cRLDPIter = XPathUtils.selectNodeIterator(dPElem, CONF + "CRLDP");
- NodeIterator oCSPDPPIter = XPathUtils.selectNodeIterator(dPElem, CONF + "OCSPDP");
-
- try
- {
- String caIssuerDN = nameParser.parse().getName();
-
- // check, if a mapping exists or make a new mapping
- Set dPsForCA = (Set) dPs.get(caIssuerDN);
- if (dPsForCA == null)
- {
- dPsForCA = new HashSet();
- dPs.put(caIssuerDN, dPsForCA);
- }
-
- // add the CRL distribution points of this CA to the set
- Element cRLDPElem;
- while ((cRLDPElem = (Element) cRLDPIter.nextNode()) != null)
- {
- CRLDistributionPoint cRLDP = (CRLDistributionPoint) buildDistributionPoint(cRLDPElem, caIssuerDN);
- dPsForCA.add(cRLDP);
- }
-
- // add the OCSP distribution points of this CA to the set
- Element oCSPPElem;
- while ((oCSPPElem = (Element) oCSPDPPIter.nextNode()) != null)
- {
- OCSPDistributionPoint oCSPDP = (OCSPDistributionPoint) buildDistributionPoint(oCSPPElem, null);
- dPsForCA.add(oCSPDP);
- }
-}
- catch (RFC2253NameParserException e)
- {
- warn("config.13", new Object[] { caIssuerDNText }, e);
- }
-
- }
-
- return dPs;
- }
-
- /**
- * Build a distribution point from the DOM representation.
- *
- * @param dpElem The root element of the distribution point.
- *
- * @param issuerName The name of the CA issuing the CRL referred to by this DP, or <code>null</code>
- * if this DP refers to an OCSP responder.
- *
- * @return The distribution point.
- */
- private DistributionPoint buildDistributionPoint(Element dpElem, String issuerName)
- {
- String uri = getElementValue(dpElem, CONF + "Location", null);
-
- if ("CRLDP".equals(dpElem.getLocalName()))
- {
- NodeIterator reasonCodesIter = XPathUtils.selectNodeIterator(dpElem, CONF + "ReasonCode");
- Element reasonCodeElem;
- StringBuffer reasonCodesSB = new StringBuffer();
- while ((reasonCodeElem = (Element)reasonCodesIter.nextNode()) != null)
- {
- if (reasonCodesSB.length() > 0) reasonCodesSB.append(" ");
- reasonCodesSB.append(getElementValue(reasonCodeElem, ".", "").trim());
- }
- return new CRLDistributionPoint(issuerName, uri, reasonCodesSB.toString());
- }
- else
- {
- return new OCSPDistributionPoint(uri);
- }
- }
-
- /**
- * Return the CRL archive duration.
- *
- * @return The value of the CRL archive duration setting from the configuration, or <code>0</code> if
- * no value is set in the configuration.
- */
- public int getRevocationArchiveDuration()
- {
- String archiveDuration = getElementValue(getConfigElem(), CRL_ARCHIVE_DURATION_XPATH, null);
- try
- {
- return Integer.parseInt(archiveDuration);
- }
- catch (NumberFormatException e)
- {
- warn("config.01", null);
- return 365;
- }
- }
-
- /**
- * Build the <code>CreateTransformsInfoProfile</code>s.
- *
- * @return The mapping from profile ID to profile.
- */
- public Map buildCreateTransformsInfoProfiles()
- {
- return loadProfiles(CREATE_TRANSFORMS_INFO_PROFILE_XPATH, "CreateTransformsInfoProfile");
- }
-
- /**
- * Build the <code>CreateSignatureEnvironmentProfile</code>s.
- *
- * @return The mapping from profile ID to profile.
- */
- public Map buildCreateSignatureEnvironmentProfiles()
- {
- return loadProfiles(CREATE_SIGNATURE_ENVIRONMENT_PROFILE_XPATH, "CreateSignatureEnvironmentProfile");
- }
-
- /**
- * Build the <code>VerifyTransformsInfoProfile</code>s.
- *
- * @return The mapping from profile ID to profile.
- */
- public Map buildVerifyTransformsInfoProfiles()
- {
- return loadProfiles(VERIFY_TRANSFORMS_INFO_PROFILE_XPATH, "VerifyTransformsInfoProfile");
- }
-
- /**
- * Build the <code>SupplementProfile</code>s.
- *
- * @return The mapping from profile ID to profile.
- */
- public Map buildSupplementProfiles()
- {
- return loadProfiles(SUPPLEMENT_PROFILE_XPATH, "SupplementProfile");
- }
-
- /**
- * Load a profile mapping.
- *
- * @param xpath The XPath to select the profiles from the configuration.
- *
- * @param profileRoot The name of the profile root element.
- *
- * @return Map The profile ID to profile mapping.
- */
- private Map loadProfiles(String xpath, String profileRoot)
- {
- Map profiles = new HashMap();
- NodeIterator profileIter = XPathUtils.selectNodeIterator(getConfigElem(), xpath);
- Element profileElem;
-
- while ((profileElem = (Element) profileIter.nextNode()) != null)
- {
- String id = getElementValue(profileElem, CONF + "Id", null);
- String fileName = getElementValue(profileElem, CONF + "Location", null);
-
- if (profiles.containsKey(id))
- {
- warn("config.04", new Object[] { profileRoot, id });
- }
- else
- {
- try
- {
- File profileFile = new File(fileName);
-
- // make profileFile absolute
- if (!profileFile.isAbsolute()) profileFile = new File(configRoot_, fileName);
-
- // load the profile
- info("config.22", new Object[] { profileRoot, id, profileFile.getAbsoluteFile()});
- Element profile = loadProfile(profileFile);
-
- if (profile.getTagName().equals(profileRoot))
- {
- profiles.put(id, profile);
- }
- else
- {
- warn("config.02", new Object[] { profileRoot, id, fileName });
- }
- } catch (ConfigurationException e) {
- warn("config.03", new Object[] { profileRoot, id });
- }
- }
- }
-
- return profiles;
- }
-
- /**
- * Load a profile from a file.
- *
- * @param root The absolute directory path of the main configuration file.
- * @param profileFile The file containing the profile.
- * @return The profile in its DOM representation.
- * @throws ConfigurationException An error occurred loading the profile.
- */
- private Element loadProfile(File profileFile) throws ConfigurationException {
-
- Element profile;
-
- try {
- profile = parseXml(new FileInputStream(profileFile));
- } catch (Exception e) {
- throw new ConfigurationException("config.12", null, e);
- }
-
- return profile;
- }
-
- /**
- * Bulid the trust profile mapping.
- *
- * @return The profile ID to profile mapping.
- */
- public Map buildTrustProfiles()
- {
- Map trustProfiles = new HashMap();
- NodeIterator profileIter = XPathUtils.selectNodeIterator(getConfigElem(), TRUST_PROFILE_XPATH);
- Element profileElem;
-
- while ((profileElem = (Element) profileIter.nextNode()) != null)
- {
- String id = getElementValue(profileElem, CONF + "Id", null);
- String trustAnchorsLocStr = getElementValue(profileElem, CONF + "TrustAnchorsLocation", null);
- String signerCertsLocStr = getElementValue(profileElem, CONF + "SignerCertsLocation", null);
-
- URI trustAnchorsLocURI = null;
- try
- {
- trustAnchorsLocURI = new URI(trustAnchorsLocStr);
- if (!trustAnchorsLocURI.isAbsolute()) { // make it absolute to the config file
- trustAnchorsLocURI = new URI(configRoot_.toURL() + trustAnchorsLocStr);
- }
- }
- catch (URIException e) {
- warn("config.14", new Object[] { "uri", id, trustAnchorsLocStr }, e);
- continue;
- }
- catch (MalformedURLException e)
- {
- warn("config.15", new Object[] {id}, e);
- continue;
- }
-
- File profileDir = new File(trustAnchorsLocURI.getPath());
- if (!profileDir.exists() || !profileDir.isDirectory()) {
- warn("config.27", new Object[] { "uri", id });
- continue;
- }
-
- if (trustProfiles.containsKey(id)) {
- warn("config.04", new Object[] { "TrustProfile", id });
- continue;
- }
-
- URI signerCertsLocURI = null;
- if (signerCertsLocStr != null && !"".equals(signerCertsLocStr))
- {
- try
- {
- signerCertsLocURI = new URI(signerCertsLocStr);
- if (!signerCertsLocURI.isAbsolute()) signerCertsLocURI = new URI(configRoot_.toURL() + signerCertsLocStr);
-
- File signerCertsDir = new File(signerCertsLocURI.getPath());
- if (!signerCertsDir.exists() || !signerCertsDir.isDirectory()) {
- warn("config.27", new Object[] { "signerCertsUri", id });
- continue;
- }
- }
- catch (URIException e) {
- warn("config.14", new Object[] { "signerCertsUri", id, trustAnchorsLocStr }, e);
- continue;
- }
- catch (MalformedURLException e) {
- warn("config.15", new Object[] {id}, e);
- continue;
- }
- }
-
- signerCertsLocStr = (signerCertsLocURI != null) ? signerCertsLocURI.toString() : null;
- TrustProfile profile = new TrustProfile(id, trustAnchorsLocURI.toString(), signerCertsLocStr);
- trustProfiles.put(id, profile);
- }
-
- return trustProfiles;
- }
-
- /**
- * Returns the location of the certificate store.
- *
- * @return the location of the certificate store.
- */
- public String getCertStoreLocation()
- {
- String certStoreLocStr = getElementValue(getConfigElem(), CERTSTORE_LOCATION_XPATH, null);
- File certStoreLocFile;
-
- // No value specified in configuration file: Set it to a reasonable (absolute) default
- if (certStoreLocStr == null)
- return new File(configRoot_, "certstore").getAbsolutePath();
-
- // Make cert store location an absolute value
- certStoreLocFile = new File(certStoreLocStr);
- if (!certStoreLocFile.isAbsolute())
- {
- certStoreLocFile = new File(configRoot_, certStoreLocStr);
- }
-
- // Check if cert store location exists, eventually try to create it
- if (!certStoreLocFile.isDirectory())
- {
- boolean created = false;
- try
- {
- created = certStoreLocFile.mkdirs();
- }
- finally
- {
- if (!created)
- {
- warn("config.32", new Object[] { certStoreLocFile.getAbsolutePath() });
- }
- }
- }
-
- return certStoreLocFile.getAbsolutePath();
- }
-
- //
- // various utility methods
- //
-
- /**
- * Parse a configuration XML file.
- *
- * @param inputStream The stream from which to read the XML data.
- * @return The DOM representation of the XML data.
- * @throws ParserConfigurationException XML parser not configured properly.
- * @throws SAXException An error parsing the XML file.
- * @throws IOException An error reading the stream.
- */
- private static Element parseXml(InputStream inputStream)
- throws ParserConfigurationException, SAXException, IOException {
- return DOMUtils
- .parseDocument(inputStream, true, Constants.ALL_SCHEMA_LOCATIONS, null)
- .getDocumentElement();
- }
-
- /**
- * Return the value of an element located by an XPath.
- *
- * @param root The root element from which to evaluate the <code>xpath</code>.
- * @param xpath The XPath pointing to the element.
- * @param def The default value, if no element can be found with the given
- * <code>xpath</code>.
- * @return The element value or <code>def</code>, if the element cannot be
- * found.
- */
- private 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 an attribute located by an XPath.
- *
- * @param root The root element from which to evaluate the <code>xpath</code>.
- * @param xpath The XPath pointing to the attribute.
- * @param def The default value, if no attribute can be found with the given
- * <code>xpath</code>.
- * @return The element value or <code>def</code>, if the attribute cannot be
- * found.
- */
- private String getAttributeValue(Element root, String xpath, String def) {
- Attr attr = (Attr) XPathUtils.selectSingleNode(root, xpath);
- return attr != null ? attr.getValue() : def;
- }
-
- /**
- * Log an info message.
- *
- * @param messageId The message ID.
- * @param parameters Additional parameters for the message.
- * @see at.gv.egovernment.moa.spss.server.util.MessageProvider
- */
- private static void info(String messageId, Object[] parameters) {
- MessageProvider msg = MessageProvider.getInstance();
- Logger.info(new LogMsg(msg.getMessage(messageId, parameters)));
- }
-
- /**
- * Log a warning.
- *
- * @param messageId The message ID.
- * @param args Additional parameters for the message.
- * @see at.gv.egovernment.moa.spss.server.util.MessageProvider
- */
- private void warn(String messageId, Object[] args) {
- MessageProvider msg = MessageProvider.getInstance();
- String txt = msg.getMessage(messageId, args);
-
- Logger.warn(new LogMsg(txt));
- warnings.add(txt);
- }
-
- /**
- * Log a warning.
- *
- * @param messageId The message ID.
- * @param args Additional parameters for the message.
- * @param t An exception being the cause of the warning.
- * @see at.gv.egovernment.moa.spss.server.util.MessageProvider
- */
- private void warn(String messageId, Object[] args, Throwable t) {
- MessageProvider msg = MessageProvider.getInstance();
- String txt = msg.getMessage(messageId, args);
-
- Logger.warn(new LogMsg(txt), t);
- warnings.add(txt);
- }
-
- /**
- * Returns whether revocation information should be archived.
- *
- * @return whether revocation information should be archived.
- */
- public boolean getEnableRevocationArchiving()
- {
- String enableArchiving = getElementValue(getConfigElem(), ENABLE_ARCHIVING_XPATH, null);
- return Boolean.valueOf(enableArchiving).booleanValue();
- }
-
- /**
- * Returns the JDBC URL for the revocation archive database.
- *
- * @return the JDBC URL for the revocation archive database, or <code>null</code, if the corresponding
- * parameter is not set in the configuration.
- */
- public String getRevocationArchiveJDBCURL()
- {
- String jDBCURL = getElementValue(getConfigElem(), ACHIVE_JDBC_URL_, null);
- return jDBCURL;
- }
-
- /**
- * Returns the JDBC driver class name for the revocation archive database.
- *
- * @return the JDBC driver class name for the revocation archive database, or <code>null</code,
- * if the corresponding parameter is not set in the configuration.
- */
- public String getRevocationArchiveJDBCDriverClass()
- {
- String jDBCDriverClass = getElementValue(getConfigElem(), ACHIVE_JDBC_DRIVER_CLASS_, null);
- return jDBCDriverClass;
- }
-
- /**
- * Returns whether revocation information should be archived.
- */
- public boolean getEnableRevocationChecking()
- {
- String enableChecking = getElementValue(getConfigElem(), ENABLE_REVOCATION_CHECKING_XPATH_, null);
- return Boolean.valueOf(enableChecking).booleanValue();
- }
-
- /**
- * Returns the maximum age of a revocation information for considering it
- * still as valid.
- *
- * @return the maximum age of a revocation information for considering it
- * still as valid.
- */
- public long getMaxRevocationAge()
- {
- String maxRevocationAge = getElementValue(getConfigElem(), MAX_REVOCATION_AGE_XPATH_, null);
- if (maxRevocationAge == null) return 0;
- return Long.valueOf(maxRevocationAge).longValue();
- }
-
- /**
- * Returns the service order for revocation checking.
- *
- * @return the service order for revocation checking. Valid array entries are
- * {@link evocationSourceTypes#OCSP} and {@link RevocationSourceTypes#CRL}.
- * An empty array will be returned if no service order is specified in the
- * configuration.
- */
- public String[] getServiceOrder()
- {
- ArrayList list = new ArrayList();
- NodeIterator serviceIter = XPathUtils.selectNodeIterator(getConfigElem(), REVOCATION_SERVICEORDER_XPATH_);
- Element currentServiceNode;
- while ((currentServiceNode = (Element)serviceIter.nextNode()) != null)
- {
- list.add(getElementValue(currentServiceNode, ".", null));
- }
- Object[] serviceOrder = list.toArray();
- String[] returnValue = new String[serviceOrder.length];
- for (int i = 0; i < serviceOrder.length; i++)
- {
- if (((String)serviceOrder[i]).equalsIgnoreCase(RevocationSourceTypes.CRL)) {
- returnValue[i] = RevocationSourceTypes.CRL;
- } else if (((String)serviceOrder[i]).equalsIgnoreCase(RevocationSourceTypes.OCSP)) {
- returnValue[i] = RevocationSourceTypes.OCSP;
- }
-
- }
- return returnValue;
- }
-
- /**
- * Returns whether the certificate extension Authority Info Access should
- * be used during certificate path construction.
- *
- * @return whether the certificate extension Authority Info Access should
- * be used during certificate path construction.
- */
- public boolean getUseAuthorityInfoAccess()
- {
- String useAIA = getElementValue(getConfigElem(), USE_AUTHORITY_INFO_ACCESS_XPATH_, null);
- return Boolean.valueOf(useAIA).booleanValue();
- }
-
- /**
- * Returns whether certificates found during certificate path construction
- * should be added to the certificate store.
- *
- * @return whether certificates found during certificate path construction
- * should be added to the certificate store.
- */
- public boolean getAutoAddCertificates()
- {
- String autoAdd = getElementValue(getConfigElem(), AUTO_ADD_CERTIFICATES_XPATH_, null);
- return Boolean.valueOf(autoAdd).booleanValue();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
deleted file mode 100644
index e48835286..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
+++ /dev/null
@@ -1,689 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.URL;
-import java.security.Principal;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.w3c.dom.Element;
-
-import iaik.asn1.structures.Name;
-import iaik.pki.revocation.RevocationSourceTypes;
-import iaik.utils.RFC2253NameParser;
-import iaik.utils.RFC2253NameParserException;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * A class providing access to the MOA configuration data.
- *
- * <p>Configuration data is read from an XML file, whose location is given by
- * the <code>moa.spss.server.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>ConfigurationProvider</code> all the time. During the
- * processing of a web service request, the current
- * <code>TransactionContext</code> should be used to obtain the
- * <code>ConfigurationProvider</code> local to that request.</p>
- *
- * @author Patrick Peck
- * @author Sven Aigner
- * @version $Id$
- */
-public class ConfigurationProvider
-{
- /**
- * The name of the system property which contains the file name of the
- * configuration file.
- */
- public static final String CONFIG_PROPERTY_NAME =
- "moa.spss.server.configuration";
-
- /**
- * A fake <code>IssuerAndSerial</code> object for storing KeyGroup information
- * accessible by all clients.
- */
- private static final IssuerAndSerial ANONYMOUS_ISSUER_SERIAL =
- new IssuerAndSerial(new Name(), new BigInteger("0"));
-
- /** Singleton instance. <code>null</code>, if none has been created. */
- private static ConfigurationProvider instance;
-
- //
- // configuration data
- //
-
- /** The warnings generated when building the configuration. */
- private List warnings = new ArrayList();
-
- /** The default digest method algorithm name */
- private String digestMethodAlgorithmName;
-
- /** The default canonicalization algorithm name */
- private String canonicalizationAlgorithmName;
-
- /**
- * A <code>List</code> of <code>HardwareCryptoModule</code> objects for
- * configuring hardware modules.
- */
- private List hardwareCryptoModules;
-
- /**
- * A <code>List</code> of <code>HardwareKey</code> objects containing the
- * configuration data for hardware keys.
- */
- private List hardwareKeyModules;
-
- /**
- * A <code>List</code> of <code>SoftwareKey</code> objects containing the
- * configuration data for software keys.
- */
- private List softwareKeyModules;
-
- /**
- * A <code>Map</code> which contains a KeyGroupId (a <code>String</code>) to
- * KeyGroup mapping.
- */
- private Map keyGroups;
-
- /**
- * A <code>Map</code> which contains the <code>IssuerAndSerial</code> to
- * <code>KeyGroup</code> mapping.
- */
- private Map keyGroupMappings;
-
- /** The default chaining mode. */
- private String defaultChainingMode;
-
- /**
- * A <code>Map</code> which contains the <code>IssuerAndSerial</code> to
- * chaining mode (a <code>String</code>) mapping.
- */
- private Map chainingModes;
-
- /**
- * A <code>Map</code> which contains the CAIssuerDN (a <code>String</code>)
- * to distribution points (a <code>Set</code> of
- * <code>DistributionPoint</code>s) mapping.
- */
- private Map distributionPoints;
-
- /**
- * The CRL archive duration.
- */
- private int cRLArchiveDuration;
-
- /**
- * Indicates whether revocation information should be archived.
- */
- private boolean enableRevocationArchiving_;
-
- /**
- * The location of the certificate store.
- */
- private String certStoreLocation_;
-
- /**
- * A <code>Map</code> which contains a mapping from
- * CreateSignatureEnvironmentProfile Ids (<code>String</code>) to
- * CreateSignatureEnvironmentProfile elements (an <code>Element</code>).
- */
- private Map createSignatureEnvironmentProfiles;
-
- /**
- * A <code>Map</code> which contains a mapping from
- * CreateTransformsInfoProfile Ids (<code>String</code>) to
- * CreateTransformsInfoProfile elements (an <code>Element</code>).
- */
- private Map createTransformsInfoProfiles;
-
- /**
- * A <code>Map</code> which contains a mapping from
- * VerifyTransformsInfoProfile Ids (<code>String</code>) to
- * VerifyTransformsInfoProfile elements (an <code>Element</code>).
- */
- private Map verifyTransformsInfoProfiles;
-
- /**
- * A <code>Map</code> which contains a mapping from
- * SupplementProfile Ids (<code>String</code>) to SupplementProfile elements
- * (an <code>Element</code>).
- */
- private Map supplementProfiles;
-
- /**
- * A <code>Map</code> which contains a TrustProfile Id (a <code>String</code>
- * to trust profile (a <code>TrustProfile</code>) mapping.
- */
- private Map trustProfiles;
-
- /**
- * The JDBC URL for the revocation archive database.
- */
- private String revocationArchiveJDBCURL_;
-
- /**
- * The JDBC driver class name for the revocation archive database.
- */
- private String revocationArchiveJDBCDriverClass_;
-
- /**
- * Indicates whether revocation checking should be done.
- */
- private boolean enableRevocationChecking_;
-
- /**
- * The maximum age of a revocation information for considering it still as valid.
- */
- private long maxRevocationAge_;
-
- /**
- * The service order for revocation checking.
- */
- private String[] serviceOrder_;
-
- /**
- * Indicates whether certificates found during certificate path construction
- * should be added to the certificate store.
- */
- private boolean autoAddCertificates_;
-
- /**
- * Indicates whether the certificate extension Authority Info Access should
- * be used during certificate path construction.
- */
- private boolean useAuthorityInfoAccess_;
-
- /**
- * Return the single instance of configuration data.
- *
- * @return MOAConfigurationProvider The current configuration data.
- * @throws ConfigurationException Failure to load the configuration data.
- */
- public static synchronized ConfigurationProvider getInstance()
- throws ConfigurationException {
-
- if (instance == null) {
- reload();
- }
- return instance;
- }
-
- /**
- * Reload the configuration data and set it if successful.
- *
- * @return MOAConfigurationProvider The loaded configuration data.
- * @throws ConfigurationException Failure to load the configuration data.
- */
- public static synchronized ConfigurationProvider reload()
- throws ConfigurationException {
- String fileName = System.getProperty(CONFIG_PROPERTY_NAME);
-
- if (fileName == null) {
- // find out where we are running and use the configuration provided
- // under WEB-INF/conf/moa-spss/MOA-SPSSConfiguration
- URL url = ConfigurationProvider.class.getResource("/");
- fileName =
- new File(url.getPath()).getParent()
- + "/conf/moa-spss/MOA-SPSSConfiguration.xml";
- info("config.05", new Object[] { CONFIG_PROPERTY_NAME });
- }
-
- instance = new ConfigurationProvider(fileName);
- return instance;
- }
-
- /**
- * Constructor for ConfigurationProvider.
- *
- * @param fileName The name of the configuration file.
- * @throws ConfigurationException An error occurred loading the configuration.
- */
- public ConfigurationProvider(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;
- File configFile;
- File configRoot;
- Element configElem;
- ConfigurationPartsBuilder builder;
- List allKeyModules;
-
-
- // load the main config file
- try {
- configFile = new File(fileName);
- configRoot = new File(configFile.getParent());
- info("config.21", new Object[] { configFile.getAbsoluteFile()});
- stream = new FileInputStream(fileName);
- configElem = DOMUtils.parseXmlValidating(new FileInputStream(fileName));
- } catch (Throwable t) {
- throw new ConfigurationException("config.10", null, t);
- }
-
- // build the internal datastructures
- try {
- builder = new ConfigurationPartsBuilder(configElem, configRoot);
- digestMethodAlgorithmName = builder.getDigestMethodAlgorithmName();
- canonicalizationAlgorithmName =
- builder.getCanonicalizationAlgorithmName();
- hardwareCryptoModules = builder.buildHardwareCryptoModules();
- hardwareKeyModules =
- builder.buildHardwareKeyModules(Collections.EMPTY_LIST);
- softwareKeyModules =
- builder.buildSoftwareKeyModules(hardwareKeyModules);
- allKeyModules = new ArrayList(hardwareKeyModules);
- allKeyModules.addAll(softwareKeyModules);
- keyGroups = builder.buildKeyGroups(allKeyModules);
- keyGroupMappings =
- builder.buildKeyGroupMappings(keyGroups, ANONYMOUS_ISSUER_SERIAL);
- defaultChainingMode = builder.getDefaultChainingMode();
- chainingModes = builder.buildChainingModes();
- useAuthorityInfoAccess_ = builder.getUseAuthorityInfoAccess();
- autoAddCertificates_ = builder.getAutoAddCertificates();
- trustProfiles = builder.buildTrustProfiles();
- distributionPoints = builder.buildDistributionPoints();
- enableRevocationChecking_ = builder.getEnableRevocationChecking();
- maxRevocationAge_ = builder.getMaxRevocationAge();
- serviceOrder_ = builder.getServiceOrder();
- enableRevocationArchiving_ = builder.getEnableRevocationArchiving();
- cRLArchiveDuration = builder.getRevocationArchiveDuration();
- revocationArchiveJDBCURL_ = builder.getRevocationArchiveJDBCURL();
- revocationArchiveJDBCDriverClass_ = builder.getRevocationArchiveJDBCDriverClass();
- certStoreLocation_ = builder.getCertStoreLocation();
- createTransformsInfoProfiles = builder.buildCreateTransformsInfoProfiles();
- createSignatureEnvironmentProfiles = builder.buildCreateSignatureEnvironmentProfiles();
- verifyTransformsInfoProfiles = builder.buildVerifyTransformsInfoProfiles();
- supplementProfiles = builder.buildSupplementProfiles();
- warnings = new ArrayList(builder.getWarnings());
- } catch (Throwable t) {
- throw new ConfigurationException("config.11", null, t);
- } finally {
- try {
- if (stream != null) {
- stream.close();
- }
- } catch (IOException e) {
- // don't complain about this
- }
- }
- }
-
- /**
- * Returns the warnings encountered during building the configuration.
- *
- * @return A <code>List</code> of <code>String</code>s, containing the
- * warning messages.
- */
- public List getWarnings() {
- return warnings;
- }
-
- /**
- * Return the name of the digest algorithm used during signature creation.
- *
- * @return The digest method algorithm name, or an empty <code>String</code>,
- * if none has been configured.
- */
- public String getDigestMethodAlgorithmName() {
- return digestMethodAlgorithmName;
- }
-
- /**
- * Return the name of the canonicalization algorithm used during signature
- * creation.
- *
- * @return The canonicalization algorithm name, or an empty
- * <code>String</code> if none has been configured.
- */
- public String getCanonicalizationAlgorithmName() {
- return canonicalizationAlgorithmName;
- }
-
- /**
- * Return the configured hardware crypto modules.
- *
- * @return A <code>List</code> of <code>HardwareCryptoModule</code> objects
- * containing the hardware crypto module configurations.
- */
- public List getHardwareCryptoModules() {
- return hardwareCryptoModules;
- }
-
- /**
- * Return the hardware key modules configuration.
- *
- * @return A <code>List</code> of <code>HardwareKeyModule</code> objects
- * containing the configuration of the hardware key modules.
- */
- public List getHardwareKeyModules() {
- return hardwareKeyModules;
- }
-
- /**
- * Return the software key module configuration.
- *
- * @return A <code>List</code> of <code>SoftwareKeyModule</code> objects
- * containing the configuration of the software key modules.
- */
- public List getSoftwareKeyModules() {
- return softwareKeyModules;
- }
-
- /**
- * Return the key group mapping.
- *
- * @return A mapping from key group ID (a <code>String</code>) to
- * <code>KeyGroup</code> mapping.
- */
- public Map getKeyGroups() {
- return keyGroups;
- }
-
- /**
- * Return the set of <code>KeyGroupEntry</code>s of a given key group, which a
- * client (identified by an issuer/serial pair) may access.
- *
- * @param issuer The issuer of the client certificate.
- * @param serial The serial number of the client certificate.
- * @param keyGroupId The ID of the key group.
- * @return A <code>Set</code> of all the <code>KeyGroupEntry</code>s in the
- * given key group, if the user may access them. Returns <code>null</code>, if
- * the user may not access the given key group or if the key group does not
- * exist.
- */
- public Set getKeyGroupEntries(
- Principal issuer,
- BigInteger serial,
- String keyGroupId) {
-
- IssuerAndSerial issuerAndSerial;
- Map mapping;
-
- if (issuer == null && serial == null) {
- issuerAndSerial = ANONYMOUS_ISSUER_SERIAL;
- } else {
- issuerAndSerial = new IssuerAndSerial(issuer, serial);
- }
-
- mapping = (Map) keyGroupMappings.get(issuerAndSerial);
- if (mapping != null) {
- KeyGroup keyGroup = (KeyGroup) mapping.get(keyGroupId);
-
- if (keyGroup != null) {
- return keyGroup.getKeyGroupEntries();
- }
- }
-
- // If no key group is available for a client identified by a certificate,
- // try to find a key group in the anonymous key group mapping
- if (issuer != null || serial != null)
- {
- mapping = (Map) keyGroupMappings.get(ANONYMOUS_ISSUER_SERIAL);
- if (mapping != null)
- {
- KeyGroup keyGroup = (KeyGroup) mapping.get(keyGroupId);
- if (keyGroup != null) return keyGroup.getKeyGroupEntries();
- }
- }
-
- return null;
- }
-
- /**
- * 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;
- }
-
- /**
- * Return the distribution points for a given CA.
- *
- * @param cert The certificate for which the distribution points should be
- * looked up. The issuer information is used to perform the lookup.
- *
- * @return A <code>Set</code> of <code>DistributionPoint</code> objects. The
- * set will be empty, if no distribution points have been configured
- * for this certificate.
- */
- public Set getDistributionPoints(X509Certificate cert)
- {
- try {
- RFC2253NameParser nameParser =
- new RFC2253NameParser(cert.getIssuerDN().toString());
- String caIssuerDN = nameParser.parse().getName();
- Set dps = (Set) distributionPoints.get(caIssuerDN);
-
- if (dps == null) {
- return Collections.EMPTY_SET;
- }
- return dps;
- } catch (RFC2253NameParserException e) {
- return Collections.EMPTY_SET;
- }
- }
-
- /**
- * Return the CRL archive duration.
- *
- * @return The duration of how long to keep CRL archive entries (measured in
- * days).
- */
- public int getCRLArchiveDuration() {
- return cRLArchiveDuration;
- }
-
- /**
- * Returns whether revocation information should be archived.
- *
- * @return whether revocation information should be archived.
- */
- public boolean getEnableRevocationArchiving()
- {
- return enableRevocationArchiving_;
- }
-
- /**
- * Returns the location of the certificate store.
- *
- * @return the location of the certificate store.
- */
- public String getCertStoreLocation()
- {
- return certStoreLocation_;
- }
-
- /**
- * Return a <code>CreateTransformsInfoProfile</code> with the given ID.
- *
- * @param id The <code>CreateTransformsInfoProfile</code> ID.
- * @return The <code>CreateTransformsInfoProfile</code> with the given
- * ID or <code>null</code>, if none exists.
- */
- public Element getCreateTransformsInfoProfile(String id) {
- return (Element) createTransformsInfoProfiles.get(id);
- }
-
- /**
- * Return a <code>CreateSignatureEnvironmentProfile</code> with the given ID.
- *
- * @param id The <code>CreateSignatureEnvironmentProfile</code> ID.
- * @return The <code>CreateSignatureEnvironmentProfile</code> with the given
- * ID or <code>null</code>, if none exists.
- */
- public Element getCreateSignatureEnvironmentProfile(String id) {
- return (Element) createSignatureEnvironmentProfiles.get(id);
- }
-
- /**
- * Return a <code>VerifyTransformsInfoProfile</code> with the given ID.
- *
- * @param id The <code>VerifyTransformsInfoProfile</code> ID.
- * @return The <code>VerifyTransformsInfoProfile</code> with the given ID or
- * <code>null</code>, if none exists.
- */
- public Element getVerifyTransformsInfoProfile(String id) {
- return (Element) verifyTransformsInfoProfiles.get(id);
- }
-
- /**
- * Return a <code>SupplementProfile</code> with the given ID.
- *
- * @param id The <code>SupplementProfile</code> ID.
- * @return The <code>SupplementProfile</code> with the given ID or
- * <code>null</code>, if none exists.
- */
- public Element getSupplementProfile(String id) {
- return (Element) supplementProfiles.get(id);
- }
-
- /**
- * Return a <code>TrustProfile</code> with the given ID.
- *
- * @param id The <code>TrustProfile</code> ID.
- * @return The <code>TrustProfile</code> with the given ID or
- * <code>null</code>, if none exists.
- */
- public TrustProfile getTrustProfile(String id) {
- return (TrustProfile) trustProfiles.get(id);
- }
-
- /**
- * Log a warning.
- *
- * @param messageId The message ID.
- * @param parameters Additional parameters for the message.
- * @see at.gv.egovernment.moa.spss.server.util.MessageProvider
- */
- private static void info(String messageId, Object[] parameters) {
- MessageProvider msg = MessageProvider.getInstance();
- Logger.info(new LogMsg(msg.getMessage(messageId, parameters)));
- }
-
- /**
- * Log a warning.
- *
- * @param messageId The message ID.
- * @param args Additional parameters for the message.
- * @see at.gv.egovernment.moa.spss.server.util.MessageProvider
- */
- private void warn(String messageId, Object[] args) {
- MessageProvider msg = MessageProvider.getInstance();
- String txt = msg.getMessage(messageId, args);
-
- Logger.warn(new LogMsg(txt));
- warnings.add(txt);
- }
-
- /**
- * Returns the JDBC URL for the revocation archive database.
- *
- * @return the JDBC URL for the revocation archive database.
- */
- public String getRevocationArchiveJDBCURL()
- {
- return revocationArchiveJDBCURL_;
- }
-
- /**
- * Returns the JDBC driver class name for the revocation archive database.
- *
- * @return the JDBC driver class name for the revocation archive database.
- */
- public String getRevocationArchiveJDBCDriverClass()
- {
- return revocationArchiveJDBCDriverClass_;
- }
-
- /**
- * Returns whether revocation checking should be done.
- *
- * @return whether revocation checking should be done.
- */
- public boolean getEnableRevocationChecking()
- {
- return enableRevocationChecking_;
- }
-
- /**
- * Returns the maximum age of a revocation information for considering it
- * still as valid.
- *
- * @return the maximum age of a revocation information for considering it
- * still as valid.
- */
- public long getMaxRevocationAge()
- {
- return maxRevocationAge_;
- }
-
- /**
- * Returns the service order for revocation checking.
- *
- * @return the service order for revocation checking. Valid array entries are
- * {@link evocationSourceTypes#OCSP} and {@link RevocationSourceTypes#CRL}.
- */
- public String[] getServiceOrder()
- {
- return serviceOrder_;
- }
-
- /**
- * Returns whether certificates found during certificate path construction
- * should be added to the certificate store.
- *
- * @return whether certificates found during certificate path construction
- * should be added to the certificate store.
- */
- public boolean getAutoAddCertificates()
- {
- return autoAddCertificates_;
- }
-
- /**
- * Returns whether the certificate extension Authority Info Access should
- * be used during certificate path construction.
- *
- * @return whether the certificate extension Authority Info Access should
- * be used during certificate path construction.
- */
- public boolean getUseAuthorityInfoAccess()
- {
- return useAuthorityInfoAccess_;
- }
-
-} \ No newline at end of file
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/DistributionPoint.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/DistributionPoint.java
deleted file mode 100644
index 5c0646449..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/DistributionPoint.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-/**
- * Abstract base class for distribution points.
- *
- * @author Gregor Karlinger
- * @version $Id$
- * */
-public abstract class DistributionPoint implements iaik.pki.revocation.DistributionPoint
-{
- /**
- * The distribution point URI.
- */
- private String uri_;
-
- /**
- * Create a <code>DistributionPoint</code> with a URI.
- *
- * @param uri The URI of the distribution point.
- */
- public DistributionPoint(String uri)
- {
- uri_ = uri;
- }
-
- /**
- * @see iaik.pki.revocation.DistributionPoint#getType()
- */
- public abstract String getType();
-
- /**
- * @see iaik.pki.revocation.DistributionPoint#getUri()
- */
- public String getUri()
- {
- return uri_;
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareCryptoModule.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareCryptoModule.java
deleted file mode 100644
index 62e8d63a6..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareCryptoModule.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-/**
- * Contains configuration data for a hardware crypto module.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class HardwareCryptoModule {
- /** The name of the module. */
- private String name;
- /** The slod ID of the module. */
- private String slotID;
- /** The user PIN of the module. */
- private String userPIN;
-
- /**
- * Create a new <code>HardwareCryptoModule</code>.
- *
- * @param name The name of this <code>HardwareCryptoModule</code>.
- * @param slotID The slot ID of this <code>HardwareCryptoModule</code>.
- * @param userPIN The user PIN to access this
- * <code>HardwareCryptoModule</code>.
- */
- public HardwareCryptoModule(String name, String slotID, String userPIN) {
- this.name = name;
- this.slotID = slotID;
- this.userPIN = userPIN;
- }
-
- /**
- * Returns the name of this <code>HardwareCryptoModule</code>.
- *
- * @return The name of this <code>HardwareCryptoModule</code>.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns the slot ID of this <code>HardwareCryptoModule</code>.
- *
- * @return The slot ID.
- */
- public String getSlotID() {
- return slotID;
- }
-
-
- /**
- * Returns the user PIN of this <code>HardwareCryptoModule</code>.
- *
- * @return The user PIN used to access the module.
- */
- public String getUserPIN() {
- return userPIN;
- }
-
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareKeyModule.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareKeyModule.java
deleted file mode 100644
index 622c8d110..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/HardwareKeyModule.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-/**
- * A class that contains information about a hardware key module.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class HardwareKeyModule extends KeyModule {
- /** The name of the module. */
- private String name;
- /** The slod ID of the module. */
- private String slotID;
- /** The user PIN of the module. */
- private String userPIN;
-
- /**
- * Create a new <code>HardwareKey</code>.
- *
- * @param id The key module ID.
- * @param name The name of the key.
- * @param slotID The slot ID of the key within the hardware module. May be
- * <code>null</code>.
- * @param userPIN The user PIN to access the key.
- */
- public HardwareKeyModule(String id, String name, String slotID, String userPIN) {
- super(id);
- this.name = name;
- this.slotID = slotID;
- this.userPIN = userPIN;
- }
-
- /**
- * Return the name of this <code>HardwareKey</code>.
- *
- * @return The name of this <code>HardwareKey</code>.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Return the slot ID of this <code>HardwareKey</code>.
- *
- * @return The slot ID of this <code>HardwareKey</code>.
- */
- public String getSlotID() {
- return slotID;
- }
-
- /**
- * Return the user PIN to access this <code>HardwareKey</code>.
- *
- * @return The user PIN to access this <code>HardwareKey</code>.
- */
- public String getUserPIN() {
- return userPIN;
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/IssuerAndSerial.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/IssuerAndSerial.java
deleted file mode 100644
index 9d9262785..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/IssuerAndSerial.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-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.
- *
- * The issuer is contained as an RFC2253 encoded <code>String</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class IssuerAndSerial {
-
- /** The issuer distinguished name. */
- private String issuerDN;
- /** The certificate serial number. */
- 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.
- *
- * @param other The object to compare this <code>IssuerAndSerial</code> to.
- * @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/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroup.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroup.java
deleted file mode 100644
index 5fd108e1a..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroup.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * A collection of <code>KeyGroupEntry</code>s with its own ID.
- *
- * @author Sven Aigner
- * @author Patrick Peck
- * @version $Id$
- */
-public class KeyGroup {
-
- /** The keys belonging to this key group. */
- private Set keyGroupEntries;
- /** The key group ID. */
- private String id;
-
- /**
- * Create a <code>KeyGroup</code>.
- *
- * @param id The ID of this <code>KeyGroup</code>.
- * @param keyGroupEntries The keys belonging to this <code>KeyGroup</code>.
- */
- public KeyGroup(String id, Set keyGroupEntries) {
- this.id = id;
- this.keyGroupEntries = keyGroupEntries;
- }
-
- /**
- * Return the <code>KeyEntry</code>s contained in this <code>KeyGroup</code>.
- *
- * @return The <code>KeyEntry</code>s contained in this <code>KeyGroup</code>.
- */
- public Set getKeyGroupEntries() {
- return keyGroupEntries;
- }
-
- /**
- * Return the ID of this <code>KeyGroup</code>.
- *
- * @return The <code>KeyGroup</code> ID.
- */
- public String getId() {
- return id;
- }
-
- /**
- * Return a <code>String</code> representation of this <code>KeyGroup</code>.
- *
- * @return The <code>String</code> representation.
- * @see java.lang.Object#toString()
- */
- public String toString() {
- StringBuffer sb = new StringBuffer();
- Iterator i;
-
- if (getKeyGroupEntries() != null) {
- i = getKeyGroupEntries().iterator();
-
- while (i.hasNext()) {
- sb.append(" " + i.next());
- }
- }
- return "(KeyGroup - ID:" + id + " " + sb.toString() + ")";
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroupEntry.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroupEntry.java
deleted file mode 100644
index 2e39d6aa3..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyGroupEntry.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-import java.math.BigInteger;
-
-/**
- * A class containing information about an entry in a key group.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class KeyGroupEntry {
- /** The module ID of the key. */
- private String moduleID;
- /** The issuer DN of the certificate identifying the key. */
- private String issuerDN;
- /** The serial number of the certificate identifying the key. */
- private BigInteger serialNumber;
-
- /**
- * Create a new <code>KeyGroupEntry</code>.
- *
- * @param moduleID The key module ID to which this entry belongs to.
- * @param issuerAndSerial The issuer and serial number which uniquely
- * identifies a certificate within the key module.
- */
- public KeyGroupEntry(String moduleID, IssuerAndSerial issuerAndSerial) {
- this.moduleID = moduleID;
- this.issuerDN = issuerAndSerial.getIssuerDN();
- this.serialNumber = issuerAndSerial.getSerial();
- }
-
- /**
- * Create a new <code>KeyGroupEntry</code>.
- *
- * @param moduleID The key module ID to which this entry belongs to.
- * @param issuerDN The isser DN of the certificate within the key module.
- * @param serialNumber The serial number of the certificate within the key
- * module.
- */
- public KeyGroupEntry(
- String moduleID,
- String issuerDN,
- BigInteger serialNumber) {
- this.moduleID = moduleID;
- this.issuerDN = issuerDN;
- this.serialNumber = serialNumber;
- }
-
- /**
- * Return the key module ID to which this <code>KeyGroupEntry</code> belongs
- * to.
- *
- * @return The key module ID.
- */
- public String getModuleID() {
- return moduleID;
- }
-
- /**
- * Return the issuer DN of this <code>KeyGroupEntry</code> for identifying the
- * certificate within the key module.
- *
- * @return The issuer DN of the certificate.
- */
- public String getIssuerDN() {
- return issuerDN;
- }
-
- /**
- * Return the serial number of this <code>KeyGroupEntry</code> for identifying
- * the certificate within the key module.
- *
- * @return The serial number of the certificate.
- */
- public BigInteger getSerialNumber() {
- return serialNumber;
- }
-
- /**
- * Compare this <code>KeyGroupEntry</code> to another.
- *
- * @param other The <code>KeyGroupEntry</code> to compare to.
- * @return <code>true</code>, if module ID, isser DN and serial number of
- * <code>other</code> match the ones contained in this object, otherwise
- * <code>false</code>.
- * @see java.lang.Object#equals(Object)
- */
- public boolean equals(Object other) {
- if (other instanceof KeyGroupEntry) {
- KeyGroupEntry entry = (KeyGroupEntry) other;
- return getModuleID().equals(entry.getModuleID())
- && getIssuerDN().equals(entry.getIssuerDN())
- && getSerialNumber().equals(entry.getSerialNumber());
- }
- return false;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return getModuleID().hashCode()
- ^ getIssuerDN().hashCode()
- ^ getSerialNumber().hashCode();
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyModule.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyModule.java
deleted file mode 100644
index 412516d82..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/KeyModule.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-/**
- * A class that contains information about a key module.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class KeyModule {
-
- /** The key module ID. */
- private String id;
-
- /**
- * Create a <code>Key</code> object.
- *
- * @param id The key module ID.
- */
- public KeyModule(String id) {
- this.id = id;
- }
-
- /**
- * Return the key ID.
- *
- * @return The key ID.
- */
- public String getId() {
- return id;
- }
-
- /**
- * Return a <code>String</code> representation of this <code>Key</code>.
- *
- * @return The <code>String</code> representation.
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "(Key - Id<" + id + ">)";
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/OCSPDistributionPoint.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/OCSPDistributionPoint.java
deleted file mode 100644
index e4509ac97..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/OCSPDistributionPoint.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-import iaik.pki.revocation.RevocationSourceTypes;
-
-/**
- * A class representing a CRL distribution point.
- *
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class OCSPDistributionPoint
- extends DistributionPoint
- implements iaik.pki.revocation.DistributionPoint
-{
- /**
- * Create a <code>OCSPDistributionPoint</code> with a URI.
- *
- * @param uri The URI of the ocsp distribution point.
- */
- public OCSPDistributionPoint(String uri)
- {
- super(uri);
- }
-
- /**
- * @see iaik.pki.revocation.DistributionPoint#getType()
- */
- public String getType()
- {
- return RevocationSourceTypes.OCSP;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/SoftwareKeyModule.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/SoftwareKeyModule.java
deleted file mode 100644
index 479e98ca5..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/SoftwareKeyModule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-/**
- * A class containing information about a software key, stored in PKCS12 format.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class SoftwareKeyModule extends KeyModule {
- /** The name of the file containing the keys. */
- private String fileName;
- /** The password for accessing the file. */
- private String passWord;
-
- /**
- * Create a new <code>SoftwareKey</code>.
- *
- * @param id The key ID.
- * @param fileName The name of the PKCS12 keystore file containing the key.
- * @param passWord The password to access the keystore file.
- */
- public SoftwareKeyModule(String id, String fileName, String passWord) {
- super(id);
- this.fileName = fileName;
- this.passWord = passWord;
- }
-
- /**
- * Return the name of the PKCS12 keystore file containing this
- * <code>SoftwareKey</code>.
- *
- * @return The name of the PKCS12 keystore file.
- */
- public String getFileName() {
- return fileName;
- }
-
- /**
- * Return the password to access the keystore file.
- *
- * @return The password to access the keystore file.
- */
- public String getPassWord() {
- return passWord;
- }
-
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/TrustProfile.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/TrustProfile.java
deleted file mode 100644
index 929d5ce2b..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/TrustProfile.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package at.gv.egovernment.moa.spss.server.config;
-
-/**
- * Information about a trust profile.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class TrustProfile {
- /** The ID of the trust profile. */
- private String id;
- /** The URI giving the location of the trust profile. */
- private String uri;
- /** The URI giving the location of the allowed signer certificates. */
- private String signerCertsUri;
-
- /**
- * Create a <code>TrustProfile</code>.
- *
- * @param id The ID of the <code>TrustProfile</code> to create.
- * @param uri The URI of the <code>TrustProfile</code> to create.
- * @param signerCertsUri The URI of the location of the allowed signer
- * certificates of the <code>TrustProfile</code> to create.
- */
- public TrustProfile(String id, String uri, String signerCertsUri) {
- this.id = id;
- this.uri = uri;
- this.signerCertsUri = signerCertsUri;
- }
-
- /**
- * Return the ID of this <code>TrustProfile</code>.
- *
- * @return The <code>TrustProfile</code> ID.
- */
- public String getId() {
- return id;
- }
-
- /**
- * Return the URI of this <code>TrustProfile</code>.
- *
- * @return The URI of <code>TrustProfile</code>.
- */
- public String getUri() {
- return uri;
- }
-
- /**
- * Return the URI giving the location of the allowed signer certificates
- * of this <code>TrustProfile</code>.
- *
- * @return The URI of <code>TrustProfile</code>.
- */
- public String getSignerCertsUri() {
- return signerCertsUri;
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java
deleted file mode 100644
index eaee58d3f..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.cmsverify;
-
-import iaik.pki.PKIProfile;
-import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile;
-
-/**
- * An implementation of the <code>CMSSignatureVerificationProfile</code>
- * interface.
- *
- * @see iaik.server.modules.cmsverify.CMSSignatureVerificationProfile
- * @author Patrick Peck
- * @version $Id$
- */
-public class CMSSignatureVerificationProfileImpl
- implements CMSSignatureVerificationProfile {
-
- /** The profile for validating the certificate. */
- private PKIProfile certificateValidationProfile;
-
- /**
- * @see iaik.server.modules.cmsverify.CMSSignatureVerificationProfile#getCertificateValidationProfile()
- */
- public PKIProfile getCertificateValidationProfile() {
- return certificateValidationProfile;
- }
-
- /**
- * Sets the profile for validating the signer certificate.
- *
- * @param certificateValidationProfile The certificate validation profile to
- * set.
- */
- public void setCertificateValidationProfile(PKIProfile certificateValidationProfile) {
- this.certificateValidationProfile = certificateValidationProfile;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractKeyModuleConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractKeyModuleConfigurationImpl.java
deleted file mode 100644
index 713891714..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractKeyModuleConfigurationImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import iaik.server.modules.keys.KeyModuleConfiguration;
-
-/**
- * Base implementation class for the <code>KeyModuleConfiguration</code>
- * interface and the interfaces derived from it.
- *
- * @see iaik.server.modules.keys.KeyModuleConfiguration
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class AbstractKeyModuleConfigurationImpl
- implements KeyModuleConfiguration {
-
- /** The module ID. */
- private String moduleID;
-
- /**
- * Creata new <code>AbstractKeyModuleConfigurationImpl</code>.
- *
- * @param moduleID The key module ID of this
- * <code>KeyModuleConfiguration</code>.
- */
- public AbstractKeyModuleConfigurationImpl(String moduleID) {
- this.moduleID = moduleID;
- }
-
- /**
- * @see iaik.server.modules.keys.KeyModuleConfiguration#getModuleID()
- */
- public String getModuleID() {
- return moduleID;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractObservableConfiguration.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractObservableConfiguration.java
deleted file mode 100644
index ac4286701..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/AbstractObservableConfiguration.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import iaik.servertools.observer.NotificationData;
-import iaik.servertools.observer.Observable;
-import iaik.servertools.observer.Observer;
-
-/**
- * A base class for observable configuration data.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class AbstractObservableConfiguration implements Observable {
-
- /** The observers registered with this <code>Observable</code>. */
- private List observers = new ArrayList();
-
- /**
- * @see iaik.utils.observer.Observable#addObserver(iaik.utils.observer.Observer)
- */
- public void addObserver(Observer observer) {
- observers.add(observer);
- }
-
- /**
- * @see iaik.utils.observer.Observable#removeObserver(iaik.utils.observer.Observer)
- */
- public boolean removeObserver(Observer observer) {
- return observers.remove(observer);
- }
-
- /**
- * @see iaik.utils.observer.Observable#notify(iaik.utils.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/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java
deleted file mode 100644
index bf56d437c..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ArchiveConfigurationImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import iaik.pki.store.revocation.archive.ArchiveConfiguration;
-import iaik.pki.store.revocation.archive.ArchiveParameter;
-import iaik.pki.store.revocation.archive.ArchiveTypes;
-
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.util.Enumeration;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-
-/**
- * An implementation of the <code>ArchiveConfiguration</code> interface
- * using configuration data provided by the MOA configuration file.
- *
- * @see iaik.pki.store.revocation.archive.ArchiveConfiguration
- * @author Patrick Peck
- * @version $Id$
- */
-public class ArchiveConfigurationImpl
- extends AbstractObservableConfiguration
- implements ArchiveConfiguration {
-
- /** The configuration parameters of the archive. */
- private ArchiveParameter archiveParameters;
-
- /**
- * Create a new <code>ArchiveConfigurationImpl</code>.
- *
- * @param config The MOA configuration from which the configuration data is being read.
- */
- public ArchiveConfigurationImpl(ConfigurationProvider config)
- {
- String jdbcUrl = config.getRevocationArchiveJDBCURL();
- this.archiveParameters = new DataBaseArchiveParameterImpl(jdbcUrl);
-
- // Register JDBC driver class
- if (jdbcUrl != null)
- {
- String jdbcDriverClass = config.getRevocationArchiveJDBCDriverClass();
- try
- {
- Class.forName(jdbcDriverClass);
- }
- catch (ClassNotFoundException e)
- {
- // TODO 20030709 GK Improve exception handling
- throw new RuntimeException("JDBC driver class \"" + jdbcDriverClass + " could not be found.");
- }
-
- Enumeration regDrivers = DriverManager.getDrivers();
- boolean isRegistered = false;
- while (regDrivers.hasMoreElements())
- {
- Object currentDriver = regDrivers.nextElement();
- if (jdbcDriverClass.equals(currentDriver.getClass().getName())) isRegistered = true;
- }
- if (!isRegistered)
- {
- // Workaround for a driver which does not register itselve at invocation of Class.forName(drvname)
- try
- {
- DriverManager.registerDriver((Driver)Class.forName(jdbcDriverClass).newInstance());
- }
- catch (Exception e)
- {
- // TODO 20030709 GK Improve exception handling
- throw new RuntimeException("Registering JDBC driver \"" + jdbcDriverClass + " failed.");
- }
- }
- }
- }
-
- /**
- * Return the type of archive.
- *
- * This will always return <code>ArchiveTypes.DATABASE</code>.
- * @return <code>ArchiveTypes.DATABASE</code>.
- * @see iaik.pki.store.revocation.archive.ArchiveConfiguration#getType()
- */
- public String getType() {
- return ArchiveTypes.DATABASE;
- }
-
- /**
- * Return the <code>ArchiveParameters</code> describing this
- * <code>ArchiveConfiguration</code>.
- *
- * @return The archive parameters.
- * @see iaik.pki.store.revocation.archive.ArchiveConfiguration#getArchiveParameters()
- */
- public ArchiveParameter getArchiveParameters() {
- return archiveParameters;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
deleted file mode 100644
index c8a454e9f..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import iaik.logging.TransactionId;
-import iaik.pki.revocation.RevocationSourceTypes;
-import iaik.pki.store.revocation.RevocationInfoRetriever;
-import iaik.pki.store.revocation.RevocationSource;
-import iaik.pki.store.revocation.RevocationStoreException;
-import iaik.servertools.ldap.Handler;
-
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLStreamHandler;
-import java.util.Collection;
-
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * A customized implementation of {@link iaik.pki.store.revocation.RevocationInfoRetriever}. Will be used
- * instead of the default implementation {@link iaik.pki.store.revocation.CRLRetriever} to overcome a
- * classloader problem in connection with the {@link java.net.URL} class in a Tomcat deployment environment.
- *
- * @author Gregor Karlinger
- * @version $$
- */
-public class CRLRetriever implements RevocationInfoRetriever
-{
- public void update(RevocationSource source, Collection supplementalRequestData, TransactionId tid)
- throws RevocationStoreException
- {
- if (source == null)
- {
- throw new NullPointerException("RevocationSource parameter mustn't be null.");
- }
- Logger.info("Downloading crl from " + source.getUri());
- if (!source.getType().equals(RevocationSourceTypes.CRL))
- {
- throw new RevocationStoreException(
- source.getType() + " not supported",
- null,
- getClass().getName() + ":1");
- }
- try
- {
- URL crlUrl;
- try
- {
- crlUrl = new URL(source.getUri());
- }
- catch (MalformedURLException e)
- {
- // Workaround for classloader problem with deployment in Tomcat 4.1
- URLStreamHandler handler = new Handler();
- crlUrl = new URL(null, source.getUri(), handler);
- }
-
- InputStream crlInputStream = crlUrl.openStream();
- source.readFrom(crlInputStream, tid);
- crlInputStream.close();
- }
- catch (Exception iox)
- {
- Logger.warn("Cannot retrieve crl", iox);
- throw new RevocationStoreException("Cannot retrieve CRL", iox, getClass().getName() + ":1");
- }
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
deleted file mode 100644
index e6e084e11..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import iaik.pki.store.certstore.CertStoreConfiguration;
-import iaik.pki.store.certstore.CertStoreParameters;
-import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-
-/**
- * An implementation of the <code>CertStoreConfiguration</code> interface based
- * on MOA configuration data.
- *
- * @see iaik.pki.store.certstore.CertStoreConfiguration
- * @author Patrick Peck
- * @version $Id$
- */
-public class CertStoreConfigurationImpl
- extends AbstractObservableConfiguration
- implements CertStoreConfiguration {
-
- /** The configuration parameters of the <code>CertStore</code>. */
- private CertStoreParameters[] parameters;
-
- /**
- * Create a new <code>CertStoreConfigurationImpl</code>.
- *
- * @param config The MOA configuration from which the configuration data is
- * being read.
- */
- public CertStoreConfigurationImpl(ConfigurationProvider config)
- {
- String certStoreRoot = config.getCertStoreLocation();
-
- DirectoryCertStoreParameters dirParameters = new DirectoryCertStoreParametersImpl(
- "MOA Directory CertStore",
- certStoreRoot,
- true,
- false);
-
- parameters = new CertStoreParameters[] { dirParameters };
- }
-
- /**
- * @see iaik.pki.store.certstore.CertStoreConfiguration#getParameters()
- */
- public CertStoreParameters[] getParameters() {
- return parameters;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImpl.java
deleted file mode 100644
index 7aa4cbe4b..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import iaik.logging.LoggerConfig;
-import iaik.pki.PKIConfiguration;
-import iaik.server.ConfigurationData;
-
-import at.gv.egovernment.moa.spss.server.config.HardwareCryptoModule;
-import at.gv.egovernment.moa.spss.server.config.HardwareKeyModule;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.config.SoftwareKeyModule;
-
-/**
- * An implementation of the <code>ConfigurationData</code> interface using
- * MOA configuration data.
- *
- * @see iaik.server.ConfigurationData
- * @author Patrick Peck
- * @version $Id$
- */
-public class ConfigurationDataImpl implements ConfigurationData {
- /** PKI configuration data. */
- private PKIConfiguration pkiConfiguration;
- /** Crypto modules configuration data. */
- private List cryptoModuleConfigurations;
- /** Key modules configuration data. */
- private List keyModuleConfigurations;
- /** Logging configuration data. */
- private LoggerConfig loggerConfig;
-
- /**
- * Create a new <code>ConfigurationDataImpl</code>.
- *
- * @param config The underlying MOA configuration data.
- */
- public ConfigurationDataImpl(ConfigurationProvider config) {
- this.pkiConfiguration = new PKIConfigurationImpl(config);
- this.cryptoModuleConfigurations = buildCryptoModuleConfigurations(config);
- this.keyModuleConfigurations = buildKeyModuleConfigurations(config);
- this.loggerConfig = new LoggerConfigImpl();
- }
-
- /**
- * Build the list of <code>CryptoModuleConfiguration</code>s.
- *
- * @param config The underlying MOA configuration data.
- * @return The list of <code>CryptoModuleConfiguration</code>s configured in
- * the MOA configuration.
- */
- private List buildCryptoModuleConfigurations(ConfigurationProvider config) {
- List modules = new ArrayList();
- Iterator iter = config.getHardwareCryptoModules().iterator();
-
- while (iter.hasNext()) {
- HardwareCryptoModule module = (HardwareCryptoModule) iter.next();
- modules.add(new HardwareCryptoModuleConfigurationImpl(module));
- }
-
- return modules;
- }
-
- /**
- * Build the list of <code>KeyModuleConfiguration</code>s.
- *
- * @param config The underlying MOA configuration data.
- * @return The list of <code>KeyModuleConfiguration</code>s configured in the
- * MOA configuration.
- */
- private List buildKeyModuleConfigurations(ConfigurationProvider config) {
- List keys = new ArrayList();
- Iterator iter;
-
- // add the hardware keys
- iter = config.getHardwareKeyModules().iterator();
- while (iter.hasNext()) {
- HardwareKeyModule key = (HardwareKeyModule) iter.next();
- keys.add(new HardwareKeyModuleConfigurationImpl(key));
- }
-
- // add the software keys
- iter = config.getSoftwareKeyModules().iterator();
- while (iter.hasNext()) {
- SoftwareKeyModule key = (SoftwareKeyModule) iter.next();
- keys.add(new SoftwareKeyModuleConfigurationImpl(key));
- }
-
- return keys;
- }
-
- /**
- * @see iaik.server.ConfigurationData#getPKIConfiguration()
- */
- public PKIConfiguration getPKIConfiguration() {
- return pkiConfiguration;
- }
-
- /**
- * @see iaik.server.ConfigurationData#getCryptoModuleConfigurations()
- */
- public List getCryptoModuleConfigurations() {
- return cryptoModuleConfigurations;
- }
-
- /**
- * @see iaik.server.ConfigurationData#getKeyModuleConfigurations()
- */
- public List getKeyModuleConfigurations() {
- return keyModuleConfigurations;
- }
-
- /**
- * @see iaik.server.ConfigurationData#getLoggerConfig()
- */
- public LoggerConfig getLoggerConfig() {
- return loggerConfig;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java
deleted file mode 100644
index d67523944..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import iaik.pki.store.revocation.archive.db.DataBaseArchiveParameter;
-
-/**
- * An implementation of the <code>DataBaseArchiveParameter</code> interface.
- *
- * @see iaik.pki.store.revocation.archive.db.DataBaseArchiveParameter
- * @author Patrick Peck
- * @version $Id$
- */
-public class DataBaseArchiveParameterImpl implements DataBaseArchiveParameter {
-
- /** The JDBC URL for accessing the archive. */
- private String jDBCUrl;
-
- /**
- * Create a new <code>DataBaseArchiveParameterImpl</code>.
- *
- * @param jDBCUrl The JDBC URL of the archive.
- */
- public DataBaseArchiveParameterImpl(String jDBCUrl) {
- this.jDBCUrl = jDBCUrl;
- }
-
- /**
- * @see iaik.pki.store.revocation.archive.db.DataBaseArchiveParameter#getJDBCUrl()
- */
- public String getJDBCUrl() {
- return jDBCUrl;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DirectoryCertStoreParametersImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DirectoryCertStoreParametersImpl.java
deleted file mode 100644
index 2b00d6766..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/DirectoryCertStoreParametersImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import iaik.pki.store.certstore.CertStoreTypes;
-import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
-
-/**
- * An implementation of the <code>DirectoryCertStoreParameters</code> interface.
- *
- * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters
- * @author Patrick Peck
- * @version $Id$
- */
-public class DirectoryCertStoreParametersImpl
- implements DirectoryCertStoreParameters {
-
- /** The root directory of the <code>CertStore</code>. */
- private String rootDirectory;
- /** Whether a new directory may be created. */
- private boolean createNew;
- /** The <code>CertStore</code> ID. */
- private String id;
- /** Whether the <code>CertStore</code> is read-only. */
- private boolean readOnly;
-
- /**
- * Create a new <code>DirectoryCertStoreParameterImpl</code>.
- *
- * @param id The <code>CertStore</code> ID.
- * @param rootDirectory The root directory of the <code>CertStore</code>.
- * @param createNew Whether a new directory may be created.
- * @param readOnly Whether the <code>CertStore</code> is read-only.
- */
- public DirectoryCertStoreParametersImpl(
- String id,
- String rootDirectory,
- boolean createNew,
- boolean readOnly) {
-
- this.id = id;
- this.rootDirectory = rootDirectory;
- this.createNew = createNew;
- this.readOnly = readOnly;
- }
-
- /**
- * @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 createNew;
- }
-
- /**
- * @see iaik.pki.store.certstore.CertStoreParameters#getId()
- */
- public String getId() {
- return id;
- }
-
- /**
- * @see iaik.pki.store.certstore.CertStoreParameters#isReadOnly()
- */
- public boolean isReadOnly() {
- return readOnly;
- }
-
- /**
- * @return <code>CertStoreTypes.DIRECTORY</code>
- * @see iaik.pki.store.certstore.CertStoreParameters#getType()
- */
- public String getType() {
- return CertStoreTypes.DIRECTORY;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareCryptoModuleConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareCryptoModuleConfigurationImpl.java
deleted file mode 100644
index 3c8f4c002..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareCryptoModuleConfigurationImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import iaik.server.modules.crypto.HardwareCryptoModuleConfiguration;
-
-import at.gv.egovernment.moa.spss.server.config.HardwareCryptoModule;
-
-/**
- * An implementation of the <code>HardwareCryptoModuleConfiguration</code>
- * wrapping a <code>HardwareCryptoModule</code> from the MOA configuration.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class HardwareCryptoModuleConfigurationImpl
- implements HardwareCryptoModuleConfiguration {
-
- /** The wrapped <code>HardwareCryptoModule</code>. */
- private HardwareCryptoModule module;
-
- /**
- * Create a new <code>HardwareCryptoModuleConfigurationImpl</code>.
- *
- * @param module The <code>HardwareCryptoModule</code> from the underlying MOA
- * configuration.
- */
- public HardwareCryptoModuleConfigurationImpl(HardwareCryptoModule module) {
- this.module = module;
- }
-
- /**
- * @see iaik.server.modules.crypto.HardwareCryptoModuleConfiguration#getModuleName()
- */
- public String getModuleName() {
- return module.getName();
- }
-
- /**
- * @see iaik.server.modules.crypto.HardwareCryptoModuleConfiguration#getSlotID()
- */
- public String getSlotID() {
- return module.getSlotID();
- }
-
- /**
- * @see iaik.server.modules.crypto.HardwareCryptoModuleConfiguration#getUserPIN()
- */
- public char[] getUserPIN() {
- return module.getUserPIN().toCharArray();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareKeyModuleConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareKeyModuleConfigurationImpl.java
deleted file mode 100644
index d905588c6..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/HardwareKeyModuleConfigurationImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import iaik.server.modules.keys.HardwareKeyModuleConfiguration;
-
-import at.gv.egovernment.moa.spss.server.config.HardwareKeyModule;
-
-/**
- * An implementation of the <code>HardwareKeyModuleConfiguration</code>
- * interface wrapping a <code>HardwareKeyModule</code> from the MOA
- * configuration.
- *
- * @see iaik.server.modules.keys.HardwareKeyModuleConfiguration
- * @author Patrick Peck
- * @version $Id$
- */
-public class HardwareKeyModuleConfigurationImpl
- extends AbstractKeyModuleConfigurationImpl
- implements HardwareKeyModuleConfiguration {
-
- /** The wrapped <code>HardwareKeyModule</code>. */
- private HardwareKeyModule keyModule;
-
- /**
- * Create a new <code>HardwareKeyModuleConfigurationImpl</code>.
- *
- * @param keyModule The <code>HardwareKeyModule</code> from the underlying
- * MOA configuration.
- */
- public HardwareKeyModuleConfigurationImpl(HardwareKeyModule keyModule) {
- super(keyModule.getId());
- this.keyModule = keyModule;
- }
-
- /**
- * @see iaik.server.modules.keys.HardwareKeyModuleConfiguration#getModuleName()
- */
- public String getModuleName() {
- return keyModule.getName();
- }
-
- /**
- * @see iaik.server.modules.keys.HardwareKeyModuleConfiguration#getSlotID()
- */
- public String getSlotID() {
- return keyModule.getSlotID();
- }
-
- /**
- * @see iaik.server.modules.keys.HardwareKeyModuleConfiguration#getUserPIN()
- */
- public char[] getUserPIN() {
- return keyModule.getUserPIN().toCharArray();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
deleted file mode 100644
index 2508b7946..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import iaik.pki.revocation.RevocationSourceTypes;
-import iaik.pki.store.revocation.RevocationFactory;
-import iaik.pki.store.revocation.RevocationSourceStore;
-import iaik.pki.store.truststore.TrustStoreFactory;
-import iaik.server.ConfigurationData;
-import iaik.server.Configurator;
-import iaik.server.modules.keys.KeyEntryID;
-import iaik.server.modules.keys.KeyModule;
-import iaik.server.modules.keys.KeyModuleFactory;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.config.KeyGroup;
-import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry;
-import at.gv.egovernment.moa.spss.server.logging.TransactionId;
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * A class responsible for configuring the IAIK MOA modules.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class IaikConfigurator {
-
- /** The warnings encountered during configuration. */
- private List warnings = new ArrayList();
-
- /**
- * Configure the IAIK MOA subsystem.
- *
- *
- * @param moaConfig The underlying MOA configuration.
- * @throws ConfigurationException An error occurred configuring the IAIK
- * MOA subsystem.
- */
- public void configure(ConfigurationProvider moaConfig)
- throws ConfigurationException {
- ConfigurationData configData = new ConfigurationDataImpl(moaConfig);
-
- warnings = new ArrayList();
-
- try {
- TransactionId transId = new TransactionId("IaikConfigurator");
- Configurator.init(configData, transId);
-
- // Set customized CRL retriever to overcome a classloader problem when MOA is deployed in Tomcat
- RevocationSourceStore rss = RevocationFactory.getInstance(transId).getRevocationSourceStore();
- rss.setRetriever(new CRLRetriever(), RevocationSourceTypes.CRL);
- if ((moaConfig.getSoftwareKeyModules().size() > 0) || (moaConfig.getHardwareKeyModules().size() > 0)) {
- dumpKeyEntryIDs();
- }
- checkKeyGroupConfig(moaConfig);
- TrustStoreFactory.reset();
- } catch (iaik.server.ConfigurationException e) {
- throw new ConfigurationException("config.08", null, e);
- } catch (Throwable t) {
- throw new ConfigurationException("config.08", null, t);
- }
- }
-
- /**
- * Return the warnings encountered during configuration.
- *
- * @return The warnings.
- */
- public List getWarnings() {
- return warnings;
- }
-
- /**
- * Dump all <code>KeyEntryID</code>s contained in the configured
- * <code>KeyModule</code>s to the log file.
- */
- private void dumpKeyEntryIDs() {
- MessageProvider msg = MessageProvider.getInstance();
- KeyModule module = KeyModuleFactory.getInstance(new TransactionId("dump"));
- Set keyEntryIds = module.getPrivateKeyEntryIDs();
- Iterator iter;
-
- for (iter = keyEntryIds.iterator(); iter.hasNext();) {
- KeyEntryID keyEntryId = (KeyEntryID) iter.next();
- Logger.info(
- new LogMsg(msg.getMessage("config.19", new Object[] { keyEntryId })));
- }
- }
-
- /**
- * Check that each key group entry in each key group can be resolved to a
- * KeyEntryID.
- *
- * Logs a warning for each key group entry that cannot be resolved.
- *
- * @param moaConfig The MOA configuration to check.
- */
- private void checkKeyGroupConfig(ConfigurationProvider moaConfig) {
- Map keyGroups = moaConfig.getKeyGroups();
- Iterator iter;
-
- for (iter = keyGroups.values().iterator(); iter.hasNext();) {
- KeyGroup keyGroup = (KeyGroup) iter.next();
- Set keyGroupEntries = keyGroup.getKeyGroupEntries();
- Iterator kgIter;
-
- for (kgIter = keyGroupEntries.iterator(); kgIter.hasNext();) {
- KeyGroupEntry entry = (KeyGroupEntry) kgIter.next();
-
- if (!findKeyEntryID(entry)) {
- warn(
- "config.31",
- new Object[] {
- keyGroup.getId(),
- entry.getModuleID(),
- entry.getIssuerDN(),
- entry.getSerialNumber()});
- }
- }
- }
- }
-
- /**
- * Find out that a certain KeyGroupEntry could be resolved to a KeyEntryID
- * by the Configurator.
- *
- * @param keyGroupEntry The key group entry to find.
- * @return <code>true</code>, if the <code>keyGroupEntry</code> could be
- * resolved to a <code>KeyEntryID</code>; otherwise <code>false</code>.
- */
- private boolean findKeyEntryID(KeyGroupEntry keyGroupEntry) {
- KeyModule module = KeyModuleFactory.getInstance(new TransactionId("check"));
- Set keyEntryIDs = module.getPrivateKeyEntryIDs();
- Iterator iter;
-
- for (iter = keyEntryIDs.iterator(); iter.hasNext();) {
- KeyEntryID entry = (KeyEntryID) iter.next();
-
- if (entry.getCertificateIssuer().equals(keyGroupEntry.getIssuerDN())
- && entry.getCertificateSerialNumber().equals(
- keyGroupEntry.getSerialNumber())
- && entry.getModuleID().equals(keyGroupEntry.getModuleID())) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Log a warning.
- *
- * @param messageId The message ID.
- * @param args Additional parameters for the message.
- * @see at.gv.egovernment.moa.spss.server.util.MessageProvider
- */
- private void warn(String messageId, Object[] args) {
- MessageProvider msg = MessageProvider.getInstance();
- String txt = msg.getMessage(messageId, args);
-
- Logger.warn(new LogMsg(txt));
- warnings.add(txt);
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java
deleted file mode 100644
index 9679e8d18..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/LoggerConfigImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import java.util.Properties;
-
-import iaik.logging.LogConfigurationException;
-import iaik.logging.LoggerConfig;
-
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
-/**
- * Default implementation of the <code>LoggerConfig</code> interface.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class LoggerConfigImpl implements LoggerConfig {
-
- /** The implementation of iaik.logging.LogFactory. */
- private static final String DEFAULT_IMPLEMENTATION =
- "at.gv.egovernment.moa.spss.server.logging.IaikLogFactory";
-
- public String getFactory() {
- return DEFAULT_IMPLEMENTATION;
- }
-
- public Properties getProperties() throws LogConfigurationException {
- return new Properties();
- }
-
- public String getNodeId() {
- return LoggingContextManager.getInstance().getLoggingContext().getNodeID();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java
deleted file mode 100644
index 1c42cc4af..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/PKIConfigurationImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-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;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-
-/**
- * An implementation of the <code>PKIConfiguration</code> interface using data
- * from the MOA configuration.
- *
- * @see iaik.pki.PKIConfiguration
- * @author Patrick Peck
- * @version $Id$
- */
-public class PKIConfigurationImpl implements PKIConfiguration {
- /** The <code>CertStore</code> configuration. */
- private CertStoreConfiguration certStoreConfiguration;
- /** The revocation checking configuration. */
- private RevocationConfiguration revocationConfiguration;
- /** The revocation archive configuration. */
- private ArchiveConfiguration archiveConfiguration;
- /** The certificate validation configuration. */
- private ValidationConfiguration validationConfiguration;
-
- /**
- * Create a new <code>PKIConfigurationImpl</code>.
- *
- * @param config The underlying MOA configuration which will be used to build
- * the configuration data contained in this object.
- */
- public PKIConfigurationImpl(ConfigurationProvider config) {
-
- this.certStoreConfiguration = new CertStoreConfigurationImpl(config);
- this.revocationConfiguration = new RevocationConfigurationImpl(config);
-
- boolean archiveInfo = config.getEnableRevocationArchiving();
- if (archiveInfo)
- {
- this.archiveConfiguration = new ArchiveConfigurationImpl(config);
- }
- else
- {
- this.archiveConfiguration = null;
- }
-
- this.validationConfiguration = new ValidationConfigurationImpl(config);
- }
-
- /**
- * @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 archiveConfiguration;
- }
-
- /**
- * @see iaik.pki.PKIConfiguration#getValidationConfiguration()
- */
- public ValidationConfiguration getValidationConfiguration() {
- return validationConfiguration;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
deleted file mode 100644
index bccb04a09..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import iaik.pki.revocation.RevocationConfiguration;
-
-import java.security.cert.X509Certificate;
-import java.util.Date;
-import java.util.Set;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-
-/**
- * An implementation of the <code>RevocationConfiguration</code> interface using
- * MOA configuration data.
- *
- * @see iaik.pki.revocation.RevocationConfiguration
- * @author Patrick Peck
- * @version $Id$
- */
-public class RevocationConfigurationImpl
- extends AbstractObservableConfiguration
- implements RevocationConfiguration {
-
- /** The <code>ConfigurationProvider</code> to read the configuration data
- * from. */
- private ConfigurationProvider config;
-
- /**
- * Create a new <code>RevocationConfigurationImpl</code>.
- *
- * @param config The underlying MOA configuration containing the configuration
- * data.
- */
- public RevocationConfigurationImpl(ConfigurationProvider config) {
- this.config = config;
- }
-
- /**
- * @see iaik.pki.revocation.RevocationConfiguration#getAlternativeDistributionPoints
- */
- public Set getAlternativeDistributionPoints(X509Certificate cert, X509Certificate issuer, Date date)
- {
- return config.getDistributionPoints(cert);
- }
-
- /**
- * @see iaik.pki.revocation.RevocationConfiguration#archiveRevocationInfo(java.lang.String, java.lang.String)
- */
- public boolean archiveRevocationInfo(String type, String uri)
- {
- return config.getEnableRevocationArchiving();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java
deleted file mode 100644
index 343f096ef..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/SoftwareKeyModuleConfigurationImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-import iaik.server.modules.keys.ConfigurationException;
-import iaik.server.modules.keys.SoftwareKeyModuleConfiguration;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-
-import at.gv.egovernment.moa.spss.server.config.SoftwareKeyModule;
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * An implementation of the <code>SoftwareKeyModuleConfiguration</code> wrapping
- * a <code>SoftwareKeyModule</code> from the MOA configuration.
- *
- * @see iaik.server.modules.keys.SoftwareKeyModuleConfiguration
- * @author Patrick Peck
- * @version $Id$
- */
-public class SoftwareKeyModuleConfigurationImpl
- extends AbstractKeyModuleConfigurationImpl
- implements SoftwareKeyModuleConfiguration {
-
- /** The wrapped <code>SoftwareKeyModule</code>. */
- private SoftwareKeyModule keyModule;
-
- /**
- * Create a new <code>SoftwareKeyModuleConfigurationImpl</code>.
- *
- * @param keyModule The <code>SoftwareKeyModule</code> from the underlying MOA
- * configuration.
- */
- public SoftwareKeyModuleConfigurationImpl(SoftwareKeyModule keyModule) {
- super(keyModule.getId());
- this.keyModule = keyModule;
- }
-
- /**
- * @see iaik.server.modules.keys.SoftwareKeyModuleConfiguration#getKeyStoreTypeName()
- */
- public String getKeyStoreTypeName() {
- return KEY_STORE_TYPE_NAME_PKCS12;
- }
-
- /**
- * @see iaik.server.modules.keys.SoftwareKeyModuleConfiguration#getKeyStoreAsStream()
- */
- public InputStream getKeyStoreAsStream() {
- MessageProvider msg = MessageProvider.getInstance();
-
- try {
- String message =
- msg.getMessage("config.18", new Object[] { keyModule.getFileName()});
- Logger.info(new LogMsg(message));
- return new FileInputStream(keyModule.getFileName());
- } catch (FileNotFoundException e) {
- String message =
- msg.getMessage("config.09", new Object[] { keyModule.getFileName()});
-
- throw new ConfigurationException(message, e, null);
- }
- }
-
- /**
- * @see iaik.server.modules.keys.SoftwareKeyModuleConfiguration#getKeyStoreAuthenticationData()
- */
- public char[] getKeyStoreAuthenticationData() {
- return keyModule.getPassWord().toCharArray();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ValidationConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ValidationConfigurationImpl.java
deleted file mode 100644
index f6fbad215..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/ValidationConfigurationImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.config;
-
-import java.security.cert.X509Certificate;
-import java.security.spec.AlgorithmParameterSpec;
-
-import iaik.pki.pathvalidation.ValidationConfiguration;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-
-/**
- * An implementation of the <code>ValidationConfiguration</code> interface using
- * MOA configuration data.
- *
- * @see iaik.pki.pathvalidation.ValidationConfiguration
- * @author Patrick Peck
- * @version $Id$
- */
-public class ValidationConfigurationImpl
- extends AbstractObservableConfiguration
- implements ValidationConfiguration {
-
- /** The <code>ConfigurationProvider</code> to read the configuration data
- * from. */
- private ConfigurationProvider config;
-
- /**
- * Create a new <code>ValidationConfigurationImpl</code>.
- *
- * @param config The underlying MOA configuration data.
- */
- public ValidationConfigurationImpl(ConfigurationProvider config) {
- this.config = config;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationConfiguration#getChainingMode(java.security.cert.X509Certificate)
- */
- public String getChainingMode(X509Certificate cert) {
- return config.getChainingMode(cert);
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationConfiguration#getPublicKeyParamsAsSpec(java.security.cert.X509Certificate)
- */
- public AlgorithmParameterSpec getPublicKeyParamsAsSpec(X509Certificate cert) {
- return null;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationConfiguration#getPublicKeyParamsAsCert(java.security.cert.X509Certificate)
- */
- public X509Certificate getPublicKeyParamsAsCert(X509Certificate cert) {
- return null;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java
deleted file mode 100644
index 76f03ae07..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/PKIProfileImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.pki;
-
-import iaik.pki.PKIProfile;
-import iaik.pki.pathvalidation.ValidationProfile;
-import iaik.pki.revocation.RevocationProfile;
-import iaik.pki.store.truststore.TrustStoreProfile;
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.iaik.pki.pathvalidation.ValidationProfileImpl;
-import at.gv.egovernment.moa.spss.server.iaik.pki.revocation.RevocationProfileImpl;
-import at.gv.egovernment.moa.spss.server.iaik.pki.store.truststore.TrustStoreProfileImpl;
-
-/**
- * Implementation of the <code>PKIProfile</code> interface containing
- * information needed for certificate path validation. It uses configuration
- * data from the MOA configuration.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class PKIProfileImpl implements PKIProfile {
-
- /** Profile information for revocation checking. */
- private RevocationProfile revocationProfile;
- /** Profile information about the trust profile to use. */
- private TrustStoreProfile trustStoreProfile;
- /** Profile information about the certificate validation. */
- private ValidationProfile validationProfile;
- /** The <code>ConfigurationProvider</code> to read the MOA configuration data
- * from. */
- private ConfigurationProvider config;
-
- /**
- * Create a new <code>PKIProfileImpl</code>.
- *
- * @param config The MOA configuration providing configuration data about
- * certificate path validation.
- * @param trustProfileID The trust profile ID denoting the location of the
- * trust store.
- * @throws MOAApplicationException An error occurred building the profile.
- */
- public PKIProfileImpl(ConfigurationProvider config, String trustProfileID)
- throws MOAApplicationException {
-
- this.config = config;
- setRevocationProfile(new RevocationProfileImpl(config));
- setTrustStoreProfile(new TrustStoreProfileImpl(config, trustProfileID));
- setValidationProfile(new ValidationProfileImpl(config));
- }
-
- /**
- * @see iaik.pki.PKIProfile#autoAddCertificates()
- */
- public boolean autoAddCertificates()
- {
- return useAuthorityInfoAccess() ? true : config.getAutoAddCertificates();
- }
-
- /**
- * @see iaik.pki.PKIProfile#getRevocationProfile()
- */
- public RevocationProfile getRevocationProfile() {
- return revocationProfile;
- }
-
- /**
- * Sets the <code>RevocationProfile</code>.
- *
- * @param revocationProfile The <code>RevocationProfile</code> used for
- * revocation checking.
- */
- protected void setRevocationProfile(RevocationProfile revocationProfile) {
- this.revocationProfile = revocationProfile;
- }
-
- /**
- * @see iaik.pki.PKIProfile#getTrustStoreProfile()
- */
- public TrustStoreProfile getTrustStoreProfile() {
- return trustStoreProfile;
- }
-
- /**
- * Sets the <code>TrustStoreProfile</code>.
- *
- * @param trustStoreProfile The <code>TrustStoreProfile</code>.
- */
- protected void setTrustStoreProfile(TrustStoreProfile trustStoreProfile) {
- this.trustStoreProfile = trustStoreProfile;
- }
-
- /**
- * @see iaik.pki.PKIProfile#getValidationProfile()
- */
- public ValidationProfile getValidationProfile() {
- return validationProfile;
- }
-
- /**
- * Sets the <code>ValidationProfile</code>.
- *
- * @param validationProfile The <code>ValidationProfile</code> to set.
- */
- protected void setValidationProfile(ValidationProfile validationProfile) {
- this.validationProfile = validationProfile;
- }
-
- /**
- * @see iaik.pki.PKIProfile#useAuthorityInfoAccess()
- */
- public boolean useAuthorityInfoAccess()
- {
- return config.getUseAuthorityInfoAccess();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/pathvalidation/ValidationProfileImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/pathvalidation/ValidationProfileImpl.java
deleted file mode 100644
index a4d7ea7fa..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/pathvalidation/ValidationProfileImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.pki.pathvalidation;
-
-import iaik.pki.pathvalidation.ValidationProfile;
-
-import java.util.Collections;
-import java.util.Set;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-
-/**
- * An implementation of the <code>ValidationProfile</code> interface providing
- * information about certificat path validation.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ValidationProfileImpl implements ValidationProfile {
-
- /** The <code>ConfigurationProvider</code> to read the configuration data
- * from. */
- private ConfigurationProvider config;
- private boolean initialAnyPolicyInhibit;
- private boolean initialExplicitPolicy;
- private boolean initialPolicyMappingInhibit;
- private Set initialPolicySet;
- private boolean nameConstraintsProcessing;
- private boolean policyProcessing;
-
- /**
- * Create a new <code>ValidationProfileImpl</code> object.
- *
- * This objects's fields are preset to the following values:
- *
- * <ul>
- * <li><code>initialAnyPolicyInhibit = true</code></li>
- * <li><code>initialExplicitPoliy = true</code></li>
- * <li><code>initialPolicyMappingInhibit = true</code></li>
- * <li><code>initialPolicySet = empty</code></li>
- * <li><code>policyProcessing = false</code></li>
- * <li><code>nameConstraintsProcessing = false</code></li>
- * <li><code>revocationChecking = false</code></li>
- * </ul>
- *
- * @param config MOA configuration data for additional configuration
- * information (currently unused).
- */
- public ValidationProfileImpl(ConfigurationProvider config) {
- this.config = config;
- initialAnyPolicyInhibit = true;
- initialExplicitPolicy = true;
- initialPolicyMappingInhibit = true;
- initialPolicySet = Collections.EMPTY_SET;
- policyProcessing = false;
- nameConstraintsProcessing = false;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getInitialAnyPolicyInhibit()
- */
- public boolean getInitialAnyPolicyInhibit() {
- return initialAnyPolicyInhibit;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getInitialExplicitPolicy()
- */
- public boolean getInitialExplicitPolicy() {
- return initialExplicitPolicy;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getInitialPolicyMappingInhibit()
- */
- public boolean getInitialPolicyMappingInhibit() {
- return initialPolicyMappingInhibit;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getInitialPolicySet()
- */
- public Set getInitialPolicySet() {
- return initialPolicySet;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getPolicyProcessing()
- */
- public boolean getPolicyProcessing() {
- return policyProcessing;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getNameConstraintsProcessing()
- */
- public boolean getNameConstraintsProcessing() {
- return nameConstraintsProcessing;
- }
-
- /**
- * @see iaik.pki.pathvalidation.ValidationProfile#getRevocationChecking()
- */
- public boolean getRevocationChecking()
- {
- return config.getEnableRevocationChecking();
- }
-
-} \ No newline at end of file
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/revocation/RevocationProfileImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/revocation/RevocationProfileImpl.java
deleted file mode 100644
index c8809b0d8..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/revocation/RevocationProfileImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.pki.revocation;
-
-import java.security.cert.X509Certificate;
-
-import iaik.pki.revocation.RevocationProfile;
-import iaik.pki.revocation.RevocationSourceTypes;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-
-/**
- * An implementation of the <code>RevocationProfile</code> interface providing
- * information about revocation status checking, based on MOA configuration
- * data.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class RevocationProfileImpl implements RevocationProfile {
- /** The default service order. */
- private static final String[] DEFAULT_SERVICE_ORDER =
- { RevocationSourceTypes.CRL, RevocationSourceTypes.OCSP };
- /** The <code>ConfigurationProvider</code> to read the MOA configuration data
- * from. */
- private ConfigurationProvider config;
- /** The OCSP request hash algorithm. Currently only "SHA" is supported. */
- private static final String oCSPRequestHashAlgorithm = "SHA";
-
- /**
- * Create a new <code>RevocationProfileImpl</code>.
- *
- * @param config The MOA configuration data.
- */
- public RevocationProfileImpl(ConfigurationProvider config) {
- this.config = config;
- // currently only "SHA" is supported
-// this.oCSPRequestHashAlgorithm = "";
- }
-
- /**
- * @see iaik.pki.revocation.RevocationProfile#getMaxRevocationAge(String)
- */
- public long getMaxRevocationAge(String distributionPointUri)
- {
- return config.getMaxRevocationAge();
- }
-
- /**
- * @see iaik.pki.revocation.RevocationProfile#getOCSPRequestHashAlgorithm()
- */
- public String getOCSPRequestHashAlgorithm() {
- return oCSPRequestHashAlgorithm;
- }
-
- /**
- * @see iaik.pki.revocation.RevocationProfile#getPreferredServiceOrder(java.security.cert.X509Certificate)
- */
- public String[] getPreferredServiceOrder(X509Certificate cert)
- {
- String[] serviceOrder = config.getServiceOrder();
- if (serviceOrder == null || serviceOrder.length == 0) return DEFAULT_SERVICE_ORDER;
- return serviceOrder;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java
deleted file mode 100644
index 37ded77e6..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.pki.store.truststore;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import iaik.pki.store.truststore.TrustStoreProfile;
-import iaik.pki.store.truststore.TrustStoreTypes;
-import iaik.servertools.observer.NotificationData;
-import iaik.servertools.observer.Observer;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.config.TrustProfile;
-
-/**
- * An implementation of the <code>TrustStoreProfile</code> interface, using data
- * from the MOA configuration.
- *
- * @see iaik.pki.store.truststore.TrustStoreProfile
- * @author Patrick Peck
- * @version $Id$
- */
-public class TrustStoreProfileImpl implements TrustStoreProfile {
-
- /** The observers of this profile. */
- private List observers = new ArrayList();
-
- /**
- * The trust profile identifier.
- */
- private String id_;
-
- /** The type of the trust profile. */
- private String type;
- /** The URI of the trust profile.*/
- private String URI;
-
- /**
- * Create a new <code>TrustStoreProfileImpl</code>.
- *
- * @param config The MOA configuration data, from which trust store
- * configuration data is read.
- * @param trustProfileId The trust profile id on which this
- * <code>TrustStoreProfile</code> is based.
- * @throws MOAApplicationException The <code>trustProfileId</code> could not
- * be found in the MOA configuration.
- */
- public TrustStoreProfileImpl(
- ConfigurationProvider config,
- String trustProfileId)
- throws MOAApplicationException {
-
- TrustProfile tp = (TrustProfile) config.getTrustProfile(trustProfileId);
- if (tp != null)
- {
- id_ = trustProfileId;
- setURI(tp.getUri());
- setType(TrustStoreTypes.DIRECTORY);
- }
- else
- {
- throw new MOAApplicationException("2203", new Object[] { trustProfileId });
- }
- }
-
- /**
- * @see iaik.pki.store.truststore.TrustStoreProfile#getType()
- */
- public String getType() {
- return type;
- }
-
- /**
- * Sets the the trust store type.
- *
- * @param type The trust store type to set.
- */
- protected void setType(String type) {
- this.type = type;
- }
-
- /**
- * @see iaik.pki.store.truststore.TrustStoreProfile#getURI()
- */
- public String getURI() {
- return URI;
- }
-
- /**
- * Sets the trust store URI.
- *
- * @param URI The trust store URI to set.
- */
- protected void setURI(String URI) {
- this.URI = URI;
- }
-
- //
- // Methods of iaik.utils.observer.Observable interface
- //
-
- /**
- * @see iaik.utils.observer.Observable#addObserver(Observer)
- */
- public void addObserver(Observer observer) {
- observers.add(observer);
- }
-
- /**
- * @see iaik.utils.observer.Observable#removeObserver(Observer)
- */
- public boolean removeObserver(Observer observer) {
- return observers.remove(observer);
- }
-
- /**
- * @see iaik.utils.observer.Observable#notify(NotificationData)
- */
- public void notify(NotificationData notificationData) {
- for (Iterator iter = observers.iterator(); iter.hasNext();) {
- Observer observer = (Observer) iter.next();
- observer.notify(notificationData);
- }
- }
-
- /**
- * @see iaik.pki.store.truststore.TrustStoreProfile#getId()
- */
- public String getId()
- {
- return id_;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/Base64TransformationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/Base64TransformationImpl.java
deleted file mode 100644
index e076fe1eb..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/Base64TransformationImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import iaik.server.modules.xml.Base64Transformation;
-
-/**
- * An implementation of the <code>Base64Transformation</code>
- * <code>Transformation</code> type.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class Base64TransformationImpl
- extends TransformationImpl
- implements Base64Transformation {
-
- /**
- * Create a new <code>Base64TransformationImpl</code>.
- *
- * @see java.lang.Object#Object()
- */
- public Base64TransformationImpl() {
- setAlgorithmURI(Base64Transformation.BASE64_DECODING);
- }
-
- /**
- * Compare this <code>Base64Transformation</code> to another.
- *
- * @param other The object to compare this<code>Base64Transformation</code>
- * to.
- * @return <code>true</code>, if <code>other</code> is a
- * <code>Base64Transformation</code> and the algorithm URIs match, otherwise
- * <code>false</code>.
- * @see java.lang.Object#equals(Object)
- */
- public boolean equals(Object other) {
- if (other instanceof Base64Transformation) {
- Base64Transformation transform = (Base64Transformation) other;
- return getAlgorithmURI().equals(transform.getAlgorithmURI());
- }
- return false;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteArrayDataObjectImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteArrayDataObjectImpl.java
deleted file mode 100644
index 921b10cb6..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteArrayDataObjectImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import iaik.server.modules.xml.BinaryDataObject;
-
-/**
- * A <code>BinaryDataObject</code> encapsulating Base64 data.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ByteArrayDataObjectImpl
- extends DataObjectImpl
- implements BinaryDataObject {
-
- /** The binary data contained in this <code>BinaryDataObject</code>. */
- private byte[] bytes;
-
- /**
- * Create a new <code>ByteArrayDataObjectImpl</code>.
- *
- * @param bytes The binary data contained in this
- * <code>BinaryDataObject</code>.
- */
- public ByteArrayDataObjectImpl(byte[] bytes) {
- setBytes(bytes);
- }
-
- /**
- * Set the Base64 data.
- *
- * @param bytes The binary data contained in this
- * <code>BinaryDataObject</code>.
- */
- public void setBytes(byte[] bytes) {
- this.bytes = bytes;
- }
-
- /**
- * Return the binary data encoded in the Base64 <code>String</code> as a
- * stream.
- *
- * @return The binary data contained in this object, as a
- * <code>InputStream</code>. Repeated calls to this function will return a
- * new stream to the Base64 data.
- * @see iaik.server.modules.xml.BinaryDataObject#getInputStream()
- */
- public InputStream getInputStream() {
- return new ByteArrayInputStream(bytes);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteStreamDataObjectImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteStreamDataObjectImpl.java
deleted file mode 100644
index ce400e61a..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ByteStreamDataObjectImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import java.io.InputStream;
-
-import iaik.server.modules.xml.BinaryDataObject;
-
-/**
- * A <code>BinaryDataObject</code> encapsulating binary data from a stream.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ByteStreamDataObjectImpl
- extends DataObjectImpl
- implements BinaryDataObject {
-
- /** The <code>InputStream</code> containing the binary data. */
- private InputStream inputStream;
-
- /**
- * Create a new <code>ByteStreamDataObjectImpl</code>.
- *
- * @param inputStream The stream from which to read the binary data.
- */
- public ByteStreamDataObjectImpl(InputStream inputStream) {
- setInputStream(inputStream);
- }
-
- /**
- * Set the input stream from which to read the binary data.
- *
- * @param inputStream The input stream from which to read the binary data.
- */
- public void setInputStream(InputStream inputStream) {
- this.inputStream = inputStream;
- }
-
- /**
- * Return the binary data from this object as a stream.
- *
- * @return The stream containing the binary data. Calling this function
- * repeatedly will always return the same <code>InputStream</code>.
- * @see iaik.server.modules.xml.BinaryDataObject#getInputStream()
- */
- public InputStream getInputStream() {
- return inputStream;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/CanonicalizationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/CanonicalizationImpl.java
deleted file mode 100644
index a597b214d..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/CanonicalizationImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import iaik.server.modules.xml.Canonicalization;
-
-/**
- * An implementation of the <code>CanonicalizationTransform</code>
- * <code>Transformation</code> type.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CanonicalizationImpl
- extends TransformationImpl
- implements Canonicalization {
-
- /**
- * Create a new <code>CanonicalizationTransformImpl</code> object.
- *
- * @param algorithmURI The canonicalization algorithm URI.
- */
- public CanonicalizationImpl(String algorithmURI) {
- setAlgorithmURI(algorithmURI);
- }
-
- /**
- * Compare this object to another <code>Canonicalization</code>.
- *
- * @param other The object to compare this
- * <code>Canonicalization</code> to.
- * @return <code>true</code>, if <code>other</code> is a
- * <code>Canonicalization</code> and the algorithm URIs match, otherwise
- * <code>false</code>.
- * @see java.lang.Object#equals(Object)
- */
- public boolean equals(Object other) {
- if (other instanceof Canonicalization) {
- Canonicalization c14n = (Canonicalization) other;
- return getAlgorithmURI().equals(c14n.getAlgorithmURI());
- }
- return false;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/DataObjectImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/DataObjectImpl.java
deleted file mode 100644
index 875d82613..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/DataObjectImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import iaik.server.modules.xml.DataObject;
-
-/**
- * Abstract base implementation for the classes derived from
- * <code>DataObject</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class DataObjectImpl implements DataObject {
-
- /** The MIME type of the data object. */
- private String mimeType;
- /** The refernce ID. */
- private String referenceID;
- /** The URI of the type. */
- private String typeURI;
- /** The URI identifying the data. */
- private String URI;
-
- /**
- * @see iaik.server.modules.xml.DataObject#getMimeType()
- */
- public String getMimeType() {
- return mimeType;
- }
-
- /**
- * Set the mime type.
- *
- * @param mimeType The mime type to set.
- */
- public void setMimeType(String mimeType) {
- this.mimeType = mimeType;
- }
-
- /**
- * @see iaik.server.modules.xml.DataObject#getReferenceID()
- */
- public String getReferenceID() {
- return referenceID;
- }
-
- /**
- * Set the reference ID.
- *
- * @param referenceID The reference ID.
- */
- public void setReferenceID(String referenceID) {
- this.referenceID = referenceID;
- }
-
- /**
- * @see iaik.server.modules.xml.DataObject#getTypeURI()
- */
- public String getTypeURI() {
- return typeURI;
- }
-
- /**
- * Set the type URI.
- *
- * @param typeURI The type URI.
- */
- public void setTypeURI(String typeURI) {
- this.typeURI = typeURI;
- }
-
- /**
- * @see iaik.server.modules.xml.DataObject#getURI()
- */
- public String getURI() {
- return URI;
- }
-
- /**
- * Set the URI.
- *
- * @param URI The URI.
- */
- public void setURI(String URI) {
- this.URI = URI;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/EnvelopedSignatureTransformationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/EnvelopedSignatureTransformationImpl.java
deleted file mode 100644
index 41a47d0a1..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/EnvelopedSignatureTransformationImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import iaik.server.modules.xml.EnvelopedSignatureTransformation;
-
-/**
- * An implementation of the <code>EnvelopedSignatureTransformation</code>
- * <code>Transformation</code> type.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class EnvelopedSignatureTransformationImpl
- extends TransformationImpl
- implements EnvelopedSignatureTransformation {
-
- /**
- * Create a new <code>EnvelopedSignatureTransformationImpl</code>.
- */
- public EnvelopedSignatureTransformationImpl() {
- setAlgorithmURI(EnvelopedSignatureTransformation.ENVELOPED_SIGNATURE);
- }
-
- /**
- * Compare this object to another <code>EnvelopedSignatureTransformation</code>.
- *
- * @param other The object to compare this
- * <code>EnvelopedSignatureTransformation</code> to.
- * @return <code>true</code>, if <code>other</code> is a
- * <code>EnvelopedSignatureTransformation</code>, otherwise
- * <code>false</code>.
- * @see java.lang.Object#equals(Object)
- */
- public boolean equals(Object other) {
- if (other instanceof EnvelopedSignatureTransformation) {
- EnvelopedSignatureTransformation transform =
- (EnvelopedSignatureTransformation) other;
- return getAlgorithmURI().equals(transform.getAlgorithmURI());
- }
- return false;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java
deleted file mode 100644
index b38fbe128..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/ExclusiveCanonicalizationImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import java.util.List;
-
-import iaik.server.modules.xml.ExclusiveCanonicalization;
-
-/**
- * An implementation of the <code>ExclusiveCanonicalization</code> type
- * of <code>Transformation</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ExclusiveCanonicalizationImpl
- extends TransformationImpl
- implements ExclusiveCanonicalization {
-
- /** The prefixes of the namespaces to treat according to canonical XML. */
- private List inclusiveNamespacePrefixes;
-
- /**
- * Create a new <code>ExclusiveCanonicalizationImpl</code> object.
- *
- * @param algorithmURI The exclusive canonicalization algorithm URI.
- * @param inclusiveNamespacePrefixes The namespace prefixes to be processed
- * according to canonical XML.
- */
- public ExclusiveCanonicalizationImpl(
- String algorithmURI,
- List inclusiveNamespacePrefixes) {
- setAlgorithmURI(algorithmURI);
- setInclusiveNamespacePrefixes(inclusiveNamespacePrefixes);
- }
-
- /**
- * Sets the namespace prefixes to be processed according to canonical XML.
- *
- * @param inclusiveNamespacePrefixes The prefixes of the namespaces to treat
- * according to canonical XML.
- */
- protected void setInclusiveNamespacePrefixes(List inclusiveNamespacePrefixes) {
- this.inclusiveNamespacePrefixes = inclusiveNamespacePrefixes;
- }
-
- /**
- * @see iaik.server.modules.xml.ExclusiveCanonicalization#getInclusiveNamespacePrefixes()
- */
- public List getInclusiveNamespacePrefixes() {
- return inclusiveNamespacePrefixes;
- }
-
- /**
- * Compare this object to another <code>CanonicalizationTransform</code>.
- *
- * @param other The object to compare this
- * <code>ExclusiveCanonicalization</code> to.
- * @return <code>true</code>, if <code>other</code> is a
- * <code>ExclusiveCanonicalization</code> and the algorithm URIs match,
- * otherwise <code>false</code>.
- * @see java.lang.Object#equals(Object)
- */
- public boolean equals(Object other) {
- if (other instanceof ExclusiveCanonicalization) {
- ExclusiveCanonicalization eC14n =
- (ExclusiveCanonicalization) other;
- boolean algURIEquals = getAlgorithmURI().equals(eC14n.getAlgorithmURI());
- boolean inclNSPrefs =
- (getInclusiveNamespacePrefixes() == null || getInclusiveNamespacePrefixes().isEmpty())
- ? eC14n.getInclusiveNamespacePrefixes() == null || eC14n.getInclusiveNamespacePrefixes().isEmpty()
- : getInclusiveNamespacePrefixes().equals(eC14n.getInclusiveNamespacePrefixes());
- return algURIEquals && inclNSPrefs;
- }
- return false;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/SigningTimeImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/SigningTimeImpl.java
deleted file mode 100644
index 19ca3dadf..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/SigningTimeImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import java.util.Date;
-
-import iaik.server.modules.xml.SigningTime;
-
-/**
- * An implementation of the <code>SigningTime</code> <code>Property</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class SigningTimeImpl implements SigningTime {
-
- /** The signing time. */
- private Date signingTime;
-
- /**
- * Create a new <code>SigningTimeImpl</code>.
- *
- * @param signingTime The signing time.
- */
- public SigningTimeImpl(Date signingTime) {
- this.signingTime = signingTime;
- }
-
- /**
- * @see iaik.server.modules.xml.SigningTime#getSigningTime()
- */
- public Date getSigningTime() {
- return signingTime;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/TransformationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/TransformationImpl.java
deleted file mode 100644
index 59a414b69..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/TransformationImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import iaik.server.modules.xml.Transformation;
-
-/**
- * Base implementation class for <code>Transformation</code> derived classes.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public abstract class TransformationImpl implements Transformation {
-
- /** The algorithm URI identifying the transformation algorithm. */
- private String algorithmURI;
-
- /**
- * @see iaik.server.modules.xml.Transformation#getAlgorithmURI()
- */
- public String getAlgorithmURI() {
- return algorithmURI;
- }
-
- /**
- * Sets the algorithm URI.
- *
- * @param algorithmURI The algorithm URI to set.
- */
- protected void setAlgorithmURI(String algorithmURI) {
- this.algorithmURI = algorithmURI;
- }
-
- /**
- * Returns the hash code of the algorithm URI. Should be overridden if a
- * transformation distinguishes itself from others by more than just the
- * algorithm URI.
- *
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return getAlgorithmURI().hashCode();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLDataObjectImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLDataObjectImpl.java
deleted file mode 100644
index bc31d694e..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLDataObjectImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import org.w3c.dom.Element;
-
-import iaik.server.modules.xml.XMLDataObject;
-
-/**
- * A <code>DataObject</code> containing a single DOM element.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLDataObjectImpl
- extends DataObjectImpl
- implements XMLDataObject {
-
- /** The XML data contained in this <code>XMLDataObject</code>. */
- private Element element;
-
- /**
- * Create a new <code>XMLDataObjectImpl</code>.
- *
- * @param element The DOM element contained in this
- * <code>XMLDataObject</code>.
- */
- public XMLDataObjectImpl(Element element) {
- setElement(element);
- }
-
- /**
- * @see iaik.server.modules.xml.XMLDataObject#getElement()
- */
- public Element getElement() {
- return element;
- }
-
- /**
- * Set the DOM element contained in this <code>XMLDataObject</code>.
- *
- * @param element The DOM element to set.
- */
- public void setElement(Element element) {
- this.element = element;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLNodeListDataObjectImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLNodeListDataObjectImpl.java
deleted file mode 100644
index c855a922a..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLNodeListDataObjectImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import org.w3c.dom.NodeList;
-
-import iaik.server.modules.xml.XMLNodeListDataObject;
-
-/**
- * A <code>DataObject</code> containing a list of DOM nodes.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLNodeListDataObjectImpl
- extends DataObjectImpl
- implements XMLNodeListDataObject {
-
- /** The nodes contained in this <code>XMLNodeListDataObject</code>. */
- private NodeList nodeList;
-
- /**
- * Create a new <code>XMLNodeListDataObjectImpl</code>.
- *
- * @param nodeList The list of DOM nodes contained in this
- * <code>XMLNodeListDataObject</code>.
- */
- public XMLNodeListDataObjectImpl(NodeList nodeList) {
- setNodeList(nodeList);
- }
-
- /**
- * Set the list of DOM nodes contained in this
- * <code>XMLNodeListDataObject</code>.
- *
- * @param nodeList The list of DOM nodes to set.
- */
- public void setNodeList(NodeList nodeList) {
- this.nodeList = nodeList;
- }
-
- /**
- * @see iaik.server.modules.xml.XMLNodeListDataObject#getNodeList()
- */
- public NodeList getNodeList() {
- return nodeList;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLSignatureImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLSignatureImpl.java
deleted file mode 100644
index 4fca907f3..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XMLSignatureImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import org.w3c.dom.Element;
-
-import iaik.server.modules.xml.XMLSignature;
-
-/**
- * An object containing an XMLDsig signature in the form of a
- * <code>dsig:Signature</code> DOM element.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureImpl implements XMLSignature {
- /** The signature DOM element. */
- private Element element;
-
- /**
- * Create a new <code>XMLSignatureImpl</code>.
- *
- * @param element The <code>dsig:Signature</code> DOM element.
- */
- public XMLSignatureImpl(Element element) {
- setElement(element);
- }
-
- /**
- * Set the <code>dsig:Signature</code> DOM element.
- *
- * @param element The <code>dsig:Signature</code> element to set.
- */
- public void setElement(Element element) {
- this.element = element;
- }
-
- /**
- * @see iaik.server.modules.xml.XMLSignature#getElement()
- */
- public Element getElement() {
- return element;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2FilterImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2FilterImpl.java
deleted file mode 100644
index 034d4b653..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2FilterImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import java.util.Map;
-
-import iaik.server.modules.xml.XPath2Transformation;
-import iaik.server.modules.xml.XPath2Transformation.XPath2Filter;
-
-/**
- * An object encapsulating an XPath-Filter2 expression.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XPath2FilterImpl implements XPath2Filter {
-
- /** The type of this filter. */
- private String filterType;
- /** The XPath expression of this filter. */
- private String xPathExpression;
- /** The namespace prefix to URI mapping to use for evaluating the XPath. */
- private Map namespaceDeclarations;
-
- /**
- * Create a new <code>XPath2FilterImpl</code> object.
- *
- * @param filterType The type of filter. Must be one of the filter type
- * constants declared in <code>iaik.server.modules.xml.XPath2Transformation.XPath2Filter</code>
- * @param xPathExpression The XPath expression belonging to this filter.
- * @param namespaceDeclarations The namespace declarations visible for this
- * XPath2Filter.
- */
- public XPath2FilterImpl(
- String filterType,
- String xPathExpression,
- Map namespaceDeclarations) {
-
- setFilterType(filterType);
- setXPathExpression(xPathExpression);
- setNamespaceDeclarations(namespaceDeclarations);
- }
-
- /**
- * @see iaik.server.modules.xml.XPath2Transformation.XPath2Filter#getFilterType()
- */
- public String getFilterType() {
- return filterType;
- }
-
- /**
- * Set the filter type.
- *
- * @param filterType The filter type to set.
- */
- protected void setFilterType(String filterType) {
- this.filterType = filterType;
- }
-
- /**
- * @see iaik.server.modules.xml.XPath2Transformation.XPath2Filter#getXPathExpression()
- */
- public String getXPathExpression() {
- return xPathExpression;
- }
-
- /**
- * Set the XPath expression.
- *
- * @param xPathExpression The XPath expression to set.
- */
- protected void setXPathExpression(String xPathExpression) {
- this.xPathExpression = xPathExpression;
- }
-
- /**
- * @see iaik.server.modules.xml.XPath2Transformation.XPath2Filter#getNamespaceDeclarations()
- */
- public Map getNamespaceDeclarations() {
- return namespaceDeclarations;
- }
-
- /**
- * Set the namespace declarations.
- *
- * @param namespaceDeclarations The mapping between namespace prefixes and
- * their associated URI.
- */
- protected void setNamespaceDeclarations(Map namespaceDeclarations) {
- this.namespaceDeclarations = namespaceDeclarations;
- }
-
- /**
- * Compare this object to another.
- *
- * @param other The object to compare this <code>XPath2Filter</code> to.
- * @return <code>true</code>, if <code>other</code> is a
- * <code>XPath2Filter</code> and the filter types match and the XPath
- * expressions match. Otherwise <code>false</code> is returned.
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object other) {
- if (other instanceof XPath2Transformation.XPath2Filter) {
- XPath2Filter filter = (XPath2Transformation.XPath2Filter) other;
- return getFilterType().equals(filter.getFilterType())
- && getXPathExpression().equals(filter.getXPathExpression());
- }
- return false;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return getXPathExpression().hashCode() * 31 + getFilterType().hashCode();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2TransformationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2TransformationImpl.java
deleted file mode 100644
index c7496c2cd..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPath2TransformationImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import iaik.server.modules.xml.XPath2Transformation;
-
-/**
- * An object encapsulating a <code>Transformation</code> containing several
- * XPath-Filter2 expressions.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XPath2TransformationImpl
- extends TransformationImpl
- implements XPath2Transformation {
-
- /** The filters contained in this <code>XPath2Transformation</code> */
- private List xPathFilters = new ArrayList();
-
- /**
- * Create a new <code>XPath2TransformationImpl</code>.
- *
- * The list of XPath-Filter2 expression is initially empty.
- */
- public XPath2TransformationImpl() {
- setAlgorithmURI(XPath2Transformation.XPATH2);
- }
-
- /**
- * @see iaik.server.modules.xml.XPath2Transformation#getXPathFilters()
- */
- public List getXPathFilters() {
- return xPathFilters;
- }
-
- /**
- * Add an XPath-Filter2 expression to the list of filters.
- *
- * @param filter The filter to add.
- */
- public void addXPathFilter(XPath2Filter filter) {
- xPathFilters.add(filter);
- }
-
- /**
- * Compare this <code>XPath2Transformation</code> to another.
- *
- * @param other The object to compare this
- * <code>XPath2Transformation</code> to.
- * @return <code>true</code>, if <code>other</code> is an
- * <code>XPath2Transformation</code> and <code>getXPathFilters()</code> equals
- * <code>other.getXPathFilters()</code>. Otherwise <code>false</code> is
- * returned.
- * @see java.lang.Object#equals(Object)
- */
- public boolean equals(Object other) {
- if (other instanceof XPath2Transformation) {
- XPath2Transformation transform = (XPath2Transformation) other;
-
- return getXPathFilters().equals(transform.getXPathFilters());
- }
- return false;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- Iterator iter = getXPathFilters().iterator();
- int hashCode = 0;
-
- while (iter.hasNext()) {
- hashCode ^= iter.next().hashCode();
- }
-
- return hashCode;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPathTransformationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPathTransformationImpl.java
deleted file mode 100644
index ccedbadb2..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XPathTransformationImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import java.util.Map;
-
-import iaik.server.modules.xml.XPathTransformation;
-
-/**
- * A <code>Transformation</code> containing an XPath expression.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XPathTransformationImpl
- extends TransformationImpl
- implements XPathTransformation {
-
- /** The XPath expression. */
- private String xPathExpression;
- /** The namespace prefix to URI mapping to use for XPath evaluation. */
- private Map namespaceDeclarations;
-
- /**
- * Create a new <code>XPathTransformationImpl</code>.
- *
- * The namespace declarations are initialized empty.
- *
- * @param xPathExpression The XPath expression this object will contain.
- * @param namespaceDeclarations The namespace declarations visible for this
- * XPath.
- */
- public XPathTransformationImpl(
- String xPathExpression,
- Map namespaceDeclarations) {
-
- setAlgorithmURI(XPathTransformation.XPATH);
- setXPathExpression(xPathExpression);
- setNamespaceDeclarations(namespaceDeclarations);
- }
-
- /**
- * Set the XPath expression.
- *
- * @param xPathExpression The XPath expression.
- */
- protected void setXPathExpression(String xPathExpression) {
- this.xPathExpression = xPathExpression;
- }
-
- /**
- * @see iaik.server.modules.xml.XPathTransformation#getXPathExpression()
- */
- public String getXPathExpression() {
- return xPathExpression;
- }
-
- /**
- * @see iaik.server.modules.xml.XPathTransformation#getNamespaceDeclarations()
- */
- public Map getNamespaceDeclarations() {
- return namespaceDeclarations;
- }
-
- /**
- * Set the namespace declarations.
- *
- * @param namespaceDeclarations The mapping between namespace prefixes and
- * their associated URI.
- */
- protected void setNamespaceDeclarations(Map namespaceDeclarations) {
- this.namespaceDeclarations = namespaceDeclarations;
- }
-
- /**
- * Compare this <code>XPathTransformation</code> to another.
- *
- * @param other The object to compare this
- * <code>XPathTransformation</code> to.
- * @return <code>true</code>, if <code>other</code> is an
- * <code>XPathTransformation</code> and if this object contains the same XPath
- * expression as <code>other</code>. Otherwise <code>false</code> is returned.
- * @see java.lang.Object#equals(Object)
- */
- public boolean equals(Object other) {
- if (other instanceof XPathTransformation) {
- XPathTransformation transform = (XPathTransformation) other;
- return getXPathExpression().equals(transform.getXPathExpression());
- }
- return false;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return getXPathExpression().hashCode();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
deleted file mode 100644
index d38da650b..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import iaik.ixsil.algorithms.CanonicalizationAlgorithm;
-import iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXML;
-import iaik.ixsil.exceptions.AlgorithmException;
-import iaik.server.modules.xml.XSLTTransformation;
-
-import at.gv.egovernment.moa.util.NodeListAdapter;
-import at.gv.egovernment.moa.util.StreamUtils;
-import at.gv.egovernment.moa.util.XPathException;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-
-/**
- * A <code>Transformation</code> containing an XSLT transformation.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XSLTTransformationImpl
- extends TransformationImpl
- implements XSLTTransformation {
-
- /** The XSLT stylesheet. */
- private Element styleSheetElement;
- /** The hash code of the canonicalized stylesheet. If calculated, this value
- * should be != 0. */
- private int hashCode;
-
- /**
- * Create a new <code>XSLTTransformationImpl</code> object.
- *
- * @param styleSheetElement The XSLT stylesheet element.
- */
- public XSLTTransformationImpl(Element styleSheetElement) {
- setAlgorithmURI(XSLTTransformation.XSLT);
- setStyleSheetElement(styleSheetElement);
- }
-
- /**
- * Set the XSLT stylesheet element.
- *
- * @param styleSheetElement The XSLT stylesheet element to set.
- */
- protected void setStyleSheetElement(Element styleSheetElement) {
- this.styleSheetElement = styleSheetElement;
- this.hashCode = 0;
- }
-
- /**
- * @see iaik.server.modules.xml.XSLTTransformation#getStylesheetElement()
- */
- public Element getStylesheetElement() {
- return styleSheetElement;
- }
-
- /**
- * Compare this <code>XSLTTransformation</code> to another.
- *
- * @param other The object to compare this
- * <code>XSLTTransformation</code> to.
- * @return <code>true</code>, if <code>other</code> is an
- * <code>XSLTTransformation</code> and if the canonicalized representations of
- * the stylesheets contained in <code>this</code> and <code>other</code>
- * match. Otherwise, <code>false</code> is returned.
- * @see java.lang.Object#equals(Object)
- */
- public boolean equals(Object other) {
- if (other instanceof XSLTTransformation) {
- XSLTTransformation xslt = (XSLTTransformation) other;
-
- return compareElements(
- getStylesheetElement(),
- xslt.getStylesheetElement());
- }
- return false;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- if (hashCode == 0) {
- hashCode = calculateHashCode(getStylesheetElement());
- }
- return hashCode;
- }
-
- /**
- * Calculate the hash code for a DOM element by canonicalizing it.
- *
- * @param element The DOM element for which the hash code is to be calculated.
- * @return int The hash code, or <code>0</code>, if it could not be
- * calculated.
- */
- private static int calculateHashCode(Element element) {
- try {
- InputStream is = canonicalize(element);
- byte[] buf = new byte[256];
- int hashCode = 1;
- int length;
- int i;
-
- while ((length = is.read(buf)) > 0) {
- for (i = 0; i < length; i++) {
- hashCode += buf[i] * 31 + i;
- }
- }
- is.close();
- return hashCode;
- } catch (AlgorithmException e) {
- return 0;
- } catch (IOException e) {
- return 0;
- }
- }
-
- /**
- * Compare two DOM elements by canonicalizing their contents and comparing the
- * resulting byte stream.
- *
- * @param elem1 The 1st element to compare.
- * @param elem2 The 2nd element to compare.
- * @return boolean <code>true</code>, if the elements are considered equal
- * after canonicalization. Otherwise <code>false</code> is returned.
- */
- private static boolean compareElements(Element elem1, Element elem2) {
- try {
- InputStream is1 = canonicalize(elem1);
- InputStream is2 = canonicalize(elem2);
- return StreamUtils.compareStreams(is1, is2);
- } catch (AlgorithmException e) {
- return false;
- } catch (IOException e) {
- return false;
- }
- }
-
- /**
- * Canonicalize a DOM element.
- *
- * @param element The element to canonicalize.
- * @return InputStream A stream with the canonicalized data.
- * @throws AlgorithmException An error occurred canonicalizing the element.
- */
- private static InputStream canonicalize(Element element)
- throws AlgorithmException {
- CanonicalizationAlgorithm c14n =
- new CanonicalizationAlgorithmImplExclusiveCanonicalXML();
- NodeList nodeList;
-
- try {
- nodeList = XPathUtils.selectNodeList(element, XPathUtils.ALL_NODES_XPATH);
- } catch (XPathException e) {
- nodeList = new NodeListAdapter(Collections.EMPTY_LIST);
- }
- c14n.setInput(nodeList);
- return c14n.canonicalize();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/DataObjectTreatmentImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/DataObjectTreatmentImpl.java
deleted file mode 100644
index a14b83b7d..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/DataObjectTreatmentImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xmlsign;
-
-import java.util.List;
-
-import iaik.server.modules.xmlsign.DataObjectTreatment;
-
-import at.gv.egovernment.moa.spss.server.util.IdGenerator;
-
-/**
- * An object encapsulating how to treat an associated <code>DataObject</code>
- * when creating a signature.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class DataObjectTreatmentImpl implements DataObjectTreatment {
- /** The final content MIME type. */
- private String finalContentType;
- /** The name of the hash algorithm. */
- private String hashAlgorithmName;
- /** This transformations to apply to the associated data object. */
- private List transformationList;
- /** Supplemental information for the transformations. */
- private List transformationSupplements;
- /** Whether to include the associated data object in the signature. */
- private boolean includedInSignature;
- /** Whether to include the associated data object in the manifest. */
- private boolean referenceInManifest;
- /** The object ID generator. */
- private IdGenerator objIdGen;
-
- /**
- * Create a new <code>DataObjectTreatmentImpl</code>.
- *
- * @param objIdGen The <code>IdGenerator</code> for unique object IDs.
- */
- public DataObjectTreatmentImpl(IdGenerator objIdGen) {
- this.objIdGen = objIdGen;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.DataObjectTreatment#getFinalContentType()
- */
- public String getFinalContentType() {
- return finalContentType;
- }
-
- /**
- * Sets the final content type.
- *
- * @param finalContentType The final content type to set (a MIME-type type of
- * <code>String</code>).
- */
- public void setFinalContentType(String finalContentType) {
- this.finalContentType = finalContentType;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.DataObjectTreatment#getHashAlgorithmName()
- */
- public String getHashAlgorithmName() {
- return hashAlgorithmName;
- }
-
- /**
- * Sets the hash algorithm name.
- *
- * @param hashAlgorithmName The hash algorithm name to set.
- */
- public void setHashAlgorithmName(String hashAlgorithmName) {
- this.hashAlgorithmName = hashAlgorithmName;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.DataObjectTreatment#isIncludedInSignature()
- */
- public boolean isIncludedInSignature() {
- return includedInSignature;
- }
-
- /**
- * Sets whether the associated <code>DataObject</code> is to be included in
- * the signature.
- *
- * @param includedInSignature If <code>true</code>, the associated
- * <code>DataObject</code> will be included in the signature, otherwise not.
- */
- public void setIncludedInSignature(boolean includedInSignature) {
- this.includedInSignature = includedInSignature;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.DataObjectTreatment#isReferenceInManifest()
- */
- public boolean isReferenceInManifest() {
- return referenceInManifest;
- }
-
- /**
- * Sets whether the associated <code>DataObject</code> is
- * to be included in the <code>dsig:Manifest</code>.
- *
- * @param referenceInManifest If <code>true</code>, the associated
- * <code>DataObject</code> will be included in the manifest, otherwise not.
- */
- public void setReferenceInManifest(boolean referenceInManifest) {
- this.referenceInManifest = referenceInManifest;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.DataObjectTreatment#getTransformationList()
- */
- public List getTransformationList() {
- return transformationList;
- }
-
- /**
- * Set the list of transformations for the associated <code>DataObject</code>.
- *
- * @param transformationList The transformations to set.
- */
- public void setTransformationList(List transformationList) {
- this.transformationList = transformationList;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.DataObjectTreatment#getTransformationSupplements()
- */
- public List getTransformationSupplements() {
- return transformationSupplements;
- }
-
- /**
- * Sets the transformation supplements for the associated
- * <code>DataObject</code>.
- *
- * @param transformationSupplements The transformation supplements to set.
- */
- public void setTransformationSupplements(List transformationSupplements) {
- this.transformationSupplements = transformationSupplements;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.DataObjectTreatment#getDsigDataObjectID()
- */
- public String getDsigDataObjectID() {
- return objIdGen.uniqueId();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java
deleted file mode 100644
index fb3ff4931..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureCreationProfileImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xmlsign;
-
-import java.util.List;
-import java.util.Set;
-
-import iaik.server.modules.algorithms.SignatureAlgorithms;
-import iaik.server.modules.keys.AlgorithmUnavailableException;
-import iaik.server.modules.keys.KeyEntryID;
-import iaik.server.modules.keys.KeyModule;
-import iaik.server.modules.keys.KeyModuleFactory;
-import iaik.server.modules.keys.UnknownKeyException;
-import iaik.server.modules.xml.Canonicalization;
-import iaik.server.modules.xmlsign.XMLSignatureCreationProfile;
-import iaik.server.modules.xmlsign.XMLSignatureInsertionLocation;
-
-import at.gv.egovernment.moa.spss.server.logging.TransactionId;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.server.util.IdGenerator;
-
-/**
- * An object providing auxiliary information for creating an XML signature.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureCreationProfileImpl
- implements XMLSignatureCreationProfile {
-
- /** The transformations to apply to a data object. */
- private List dataObjectTreatmentList;
- /** The set of keys available to the signing process. */
- private Set keySet;
- /** The type URI of the signature manifest. */
- private String securityLayerManifestTypeURI;
- /** Whether the created signature is to be Security Layer conform. */
- private boolean securityLayerConform;
- /** Where to insert the signature into the signature environment. */
- private XMLSignatureInsertionLocation signatureInsertionLocation;
- /** The signature structur type. */
- private String signatureStructureType;
- /** The type of <code>Canonicalization</code> to use for the signed info. */
- private Canonicalization signedInfoCanonicalization;
- /** Properties to be signed during signature creation. */
- private List signedProperties;
- /** The ID generator for signature IDs. */
- private IdGenerator signatureIDGenerator;
- /** The ID generator for manifst IDs. */
- private IdGenerator manifestIDGenerator;
- /** The ID generator for XMLDsig manifest IDs. */
- private IdGenerator dsigManifestIDGenerator;
- /** The ID generator for signed property IDs. */
- private IdGenerator propertyIDGenerator;
-
- /**
- * Create a new <code>XMLSignatureCreationProfileImpl</code>.
- *
- * @param createProfileCount Provides external information about the
- * number of calls to the signature creation module, using the same request.
- * @param reservedIDs The set of IDs that must not be used while generating
- * new IDs.
- */
- public XMLSignatureCreationProfileImpl(
- int createProfileCount,
- Set reservedIDs) {
- signatureIDGenerator =
- new IdGenerator("signature-" + createProfileCount, reservedIDs);
- manifestIDGenerator =
- new IdGenerator("manifest-" + createProfileCount, reservedIDs);
- dsigManifestIDGenerator =
- new IdGenerator("dsig-manifest-" + createProfileCount, reservedIDs);
- propertyIDGenerator =
- new IdGenerator("etsi-signed-" + createProfileCount, reservedIDs);
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getDataObjectTreatmentList()
- */
- public List getDataObjectTreatmentList() {
- return dataObjectTreatmentList;
- }
-
- /**
- * Sets the list of <code>DataObjectTreatment</code>s.
- *
- * @param dataObjectTreatmentList The <code>DataObjectTreatment</code>s to
- * set.
- */
- public void setDataObjectTreatmentList(List dataObjectTreatmentList) {
- this.dataObjectTreatmentList = dataObjectTreatmentList;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getKeySet()
- */
- public Set getKeySet() {
- return keySet;
- }
-
- /**
- * Set the set of <code>KeyEntryID</code>s which may be used for signature
- * creation.
- *
- * @param keySet The set of <code>KeyEntryID</code>s to set.
- */
- public void setKeySet(Set keySet) {
- this.keySet = keySet;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getSecurityLayerManifestTypeURI()
- */
- public String getSecurityLayerManifestTypeURI() {
- return securityLayerManifestTypeURI;
- }
-
- /**
- * Set the SecurityLayerManifestTypeURI.
- *
- * @param securityLayerManifestTypeURI The SecurityLayerManifestTypeURI to
- * set.
- */
- public void setSecurityLayerManifestTypeURI(String securityLayerManifestTypeURI) {
- this.securityLayerManifestTypeURI = securityLayerManifestTypeURI;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getSignatureAlgorithmName(KeyEntryID)
- */
- public String getSignatureAlgorithmName(KeyEntryID selectedKeyID)
- throws AlgorithmUnavailableException {
-
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- TransactionId tid = new TransactionId(context.getTransactionID());
- KeyModule module = KeyModuleFactory.getInstance(tid);
- Set algorithms;
-
- try {
- algorithms = module.getSupportedSignatureAlgorithms(selectedKeyID);
- } catch (UnknownKeyException e) {
- throw new AlgorithmUnavailableException(
- "Unknown key entry: " + selectedKeyID,
- e,
- null);
- }
-
- if (algorithms.contains(SignatureAlgorithms.MD2_WITH_RSA) // TODO retournierten Algorithmus abhängig von der Schlüssellänge machen (bei längeren Schlüsseln SHA256 statt SHA1)
- || algorithms.contains(SignatureAlgorithms.MD5_WITH_RSA)
- || algorithms.contains(SignatureAlgorithms.RIPEMD128_WITH_RSA)
- || algorithms.contains(SignatureAlgorithms.RIPEMD160_WITH_RSA)
- || algorithms.contains(SignatureAlgorithms.SHA1_WITH_RSA)
- || algorithms.contains(SignatureAlgorithms.SHA256_WITH_RSA)) {
-
- return SignatureAlgorithms.SHA1_WITH_RSA;
- } else if (
- algorithms.contains(SignatureAlgorithms.ECDSA)) {
- return SignatureAlgorithms.ECDSA;
- } else if (
- algorithms.contains(SignatureAlgorithms.DSA)) {
- return SignatureAlgorithms.DSA;
- } else {
- throw new AlgorithmUnavailableException(
- "No algorithm for key entry: " + selectedKeyID,
- null,
- null);
- }
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getSignatureInsertionLocation()
- */
- public XMLSignatureInsertionLocation getSignatureInsertionLocation() {
- return signatureInsertionLocation;
- }
-
- /**
- * Set the location where the signature is to be inserted into the signature
- * parent.
- *
- * @param signatureInsertionLocation The location to set.
- */
- public void setSignatureInsertionLocation(XMLSignatureInsertionLocation signatureInsertionLocation) {
- this.signatureInsertionLocation = signatureInsertionLocation;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getSignatureStructureType()
- */
- public String getSignatureStructureType() {
- return signatureStructureType;
- }
-
- /**
- * Set the signature structure type.
- * @param signatureStructureType The signature structure type to set.
- */
- public void setSignatureStructureType(String signatureStructureType) {
- this.signatureStructureType = signatureStructureType;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getSignedInfoCanonicalization()
- */
- public Canonicalization getSignedInfoCanonicalization() {
- return signedInfoCanonicalization;
- }
-
- /**
- * Sets the canonicalization method to use for the SignedInfo object.
- *
- * @param signedInfoCanonicalization The canonicalization method to set.
- */
- public void setSignedInfoCanonicalization(Canonicalization signedInfoCanonicalization) {
- this.signedInfoCanonicalization = signedInfoCanonicalization;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getSignedProperties()
- */
- public List getSignedProperties() {
- return signedProperties;
- }
-
- /**
- * Set the signed properties.
- *
- * @param signedProperties The signed properties to set.
- */
- public void setSignedProperties(List signedProperties) {
- this.signedProperties = signedProperties;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#isSecurityLayerConform()
- */
- public boolean isSecurityLayerConform() {
- return securityLayerConform;
- }
-
- /**
- * Sets the security layer conformity.
- *
- * @param securityLayerConform <code>true</code>, if the created signature
- * is to be conform to the Security Layer specification.
- */
- public void setSecurityLayerConform(boolean securityLayerConform) {
- this.securityLayerConform = securityLayerConform;
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getSignatureID()
- */
- public String getSignatureID() {
- return signatureIDGenerator.uniqueId();
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getSecurityLayerManifestID()
- */
- public String getSecurityLayerManifestID() {
- return manifestIDGenerator.uniqueId();
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getDsigManifestID()
- */
- public String getDsigManifestID() {
- return dsigManifestIDGenerator.uniqueId();
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureCreationProfile#getSignedPropertiesID()
- */
- public String getSignedPropertiesID() {
- return propertyIDGenerator.uniqueId();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureInsertionLocationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureInsertionLocationImpl.java
deleted file mode 100644
index d55f61303..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlsign/XMLSignatureInsertionLocationImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xmlsign;
-
-import iaik.server.modules.xmlsign.XMLSignatureInsertionLocation;
-
-/**
- * An object giving the location of where the signature will be
- * inserted into the parent element.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureInsertionLocationImpl
- implements XMLSignatureInsertionLocation {
-
- /** Where to put the signature into the signature parent element. */
- private int signatureChildIndex;
-
- /**
- * Create a new <code>XMLSignatureInsertLocationImpl</code>.
- *
- * @param signatureChildIndex The position index at which to append the
- * signature to the parent element.
- */
- public XMLSignatureInsertionLocationImpl(int signatureChildIndex) {
- setSignatureChildIndex(signatureChildIndex);
- }
-
- /**
- * @see iaik.server.modules.xmlsign.XMLSignatureInsertionLocation#getSignatureChildIndex()
- */
- public int getSignatureChildIndex() {
- return signatureChildIndex;
- }
-
- /**
- * Sets the position index at which to append the signature to the parent
- * element.
- *
- * @param signatureChildIndex The position index to set.
- */
- public void setSignatureChildIndex(int signatureChildIndex) {
- this.signatureChildIndex = signatureChildIndex;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlverify/XMLSignatureVerificationProfileImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlverify/XMLSignatureVerificationProfileImpl.java
deleted file mode 100644
index 216596dc3..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/xmlverify/XMLSignatureVerificationProfileImpl.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package at.gv.egovernment.moa.spss.server.iaik.xmlverify;
-
-import java.util.List;
-
-import iaik.pki.PKIProfile;
-import iaik.server.modules.xmlverify.XMLSignatureVerificationProfile;
-
-/**
- * An object providing auxiliary information for verifying an XML signature.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureVerificationProfileImpl
- implements XMLSignatureVerificationProfile {
-
- /** Whether to check the Security Layer manifest. */
- private boolean checkSecurityLayerManifest;
- /** Whether to check the XMLDsig manifest. */
- private boolean checkXMLDsigManifests;
- /** The profile for validating the signer certificate. */
- private PKIProfile certificateValidationProfile;
- /** Supplements for the transformations. */
- private List transformationSupplements;
- /** Whether to include hash input data in the response. */
- private boolean includeHashInputData;
- /** Whether to include reference input data in the response. */
- private boolean includeReferenceInputData;
-
- /**
- * @see iaik.server.modules.xmlverify.XMLSignatureVerificationProfile#checkSecurityLayerManifest()
- */
- public boolean checkSecurityLayerManifest() {
- return checkSecurityLayerManifest;
- }
-
- /**
- * Set whether to check the references in the Security Layer manifest.
- *
- * @param checkSecurityLayerManifest <code>true</code>, if the references
- * in the Security Layer manifest must be checked.
- */
- public void setCheckSecurityLayerManifest(boolean checkSecurityLayerManifest) {
- this.checkSecurityLayerManifest = checkSecurityLayerManifest;
- }
-
- /**
- * @see iaik.server.modules.xmlverify.XMLSignatureVerificationProfile#checkXMLDsigManifests()
- */
- public boolean checkXMLDsigManifests() {
- return checkXMLDsigManifests;
- }
-
- /**
- * Sets whether to check the references of all XML Dsig manifests.
- *
- * @param checkXMLDSigManifests <code>true</code>, if the references in the
- * XML Dsig manifest must be checked.
- */
- public void setCheckXMLDsigManifests(boolean checkXMLDSigManifests) {
- this.checkXMLDsigManifests = checkXMLDSigManifests;
- }
-
- /**
- * @see iaik.server.modules.xmlverify.XMLSignatureVerificationProfile#getCertificateValidationProfile()
- */
- public PKIProfile getCertificateValidationProfile() {
- return certificateValidationProfile;
- }
-
- /**
- * Sets the profile for validating the signer certificate.
- *
- * @param certificateValidationProfile The certificate validation profile to
- * set.
- */
- public void setCertificateValidationProfile(PKIProfile certificateValidationProfile) {
- this.certificateValidationProfile = certificateValidationProfile;
- }
-
- /**
- * @see iaik.server.modules.xmlverify.XMLSignatureVerificationProfile#getTransformationSupplements()
- */
- public List getTransformationSupplements() {
- return transformationSupplements;
- }
-
- /**
- * Sets the transformation supplements.
- *
- * @param transformationSupplements The transformation supplements to set.
- */
- public void setTransformationSupplements(List transformationSupplements) {
- this.transformationSupplements = transformationSupplements;
- }
-
- /**
- * @see iaik.server.modules.xmlverify.XMLSignatureVerificationProfile#includeHashInputData()
- */
- public boolean includeHashInputData() {
- return includeHashInputData;
- }
-
- /**
- * Set whether to include the hash input data in the result.
- *
- * @param includeHashInputData If <code>true</code>, the hash input data
- * will be returned in the result.
- */
- public void setIncludeHashInputData(boolean includeHashInputData) {
- this.includeHashInputData = includeHashInputData;
- }
-
- /**
- * @see iaik.server.modules.xmlverify.XMLSignatureVerificationProfile#includeReferenceInputData()
- */
- public boolean includeReferenceInputData() {
- return includeReferenceInputData;
- }
-
- /**
- * Set whether to include the reference input data in the result.
- *
- * @param includeReferenceInputData If <code>true</code>, the reference
- * input data will be included in the result.
- */
- public void setIncludeReferenceInputData(boolean includeReferenceInputData) {
- this.includeReferenceInputData = includeReferenceInputData;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
deleted file mode 100644
index caf17db66..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package at.gv.egovernment.moa.spss.server.init;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.api.Configurator;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
-
-/**
- * Default implementation of <code>Configurator</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ConfiguratorImpl extends Configurator {
- /** whether the configuration has been initialized */
- private boolean initialized = false;
-
- public void init() throws MOAException {
- if (!initialized) {
- SystemInitializer.init();
- initialized = true;
- }
- }
-
- public void update() throws MOAException {
- if (!initialized) {
- return;
- }
-
- try {
- // reconfigure the system
- ConfigurationProvider config = ConfigurationProvider.reload();
- new IaikConfigurator().configure(config);
- } catch (MOAException e) {
- throw e;
- } catch (Throwable t) {
- throw new ConfigurationException("", null, t);
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/spss.server/src/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
deleted file mode 100644
index f968778d7..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package at.gv.egovernment.moa.spss.server.init;
-
-import java.io.IOException;
-import java.security.Security;
-
-import javax.net.ssl.SSLSocketFactory;
-
-import iaik.ixsil.init.IXSILInit;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-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.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
-import at.gv.egovernment.moa.spss.server.logging.IaikLog;
-import at.gv.egovernment.moa.spss.server.service.RevocationArchiveCleaner;
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * MOA SP/SS web service initialization.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class SystemInitializer {
- /** Interval between archive cleanups in seconds */
- private static final long ARCHIVE_CLEANUP_INTERVAL = 60 * 60; // 1h
- /** The MOA SP/SS logging hierarchy. */
- private static final String LOGGING_HIERARCHY = "moa.spss.server";
- /** Whether XML schema grammars have been initialized. */
- private static boolean grammarsInitialized = false;
-
- /**
- * Initialize the MOA SP/SS webservice.
- */
- public static void init() {
- MessageProvider msg = MessageProvider.getInstance();
- ClassLoader cl = SystemInitializer.class.getClassLoader();
- Thread archiveCleaner;
-
- // set up the MOA SPSS logging hierarchy
- Logger.setHierarchy(LOGGING_HIERARCHY);
-
- // set up a logging context for logging the startup
- LoggingContextManager.getInstance().setLoggingContext(
- new LoggingContext("startup"));
-
- // 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)
- try {
- cl.loadClass("javax.security.cert.Certificate"); // from jcert.jar
- } catch (ClassNotFoundException e) {
- Logger.warn(msg.getMessage("init.03", null), e);
- }
-
- // set up SUN JSSE SSL
- Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
- System.setProperty(
- "java.protocol.handler.pkgs",
- "com.sun.net.ssl.internal.www.protocol");
- SSLSocketFactory.getDefault();
-
- // initialize preparsed Xerces grammar pool for faster XML
- // parsing/validating
- try {
- if (!grammarsInitialized) {
- Class clazz = SystemInitializer.class;
- // preparse XML schema
- DOMUtils.addSchemaToPool(
- clazz.getResourceAsStream(Constants.XML_SCHEMA_LOCATION),
- Constants.XML_NS_URI);
- // preparse XMLDsig Filter2 schema
- DOMUtils.addSchemaToPool(
- clazz.getResourceAsStream(Constants.DSIG_FILTER2_SCHEMA_LOCATION),
- Constants.DSIG_FILTER2_NS_URI);
- // preparse XMLDsig schema
- DOMUtils.addSchemaToPool(
- clazz.getResourceAsStream(Constants.DSIG_SCHEMA_LOCATION),
- Constants.DSIG_NS_URI);
- // preparse MOA schema
- DOMUtils.addSchemaToPool(
- clazz.getResourceAsStream(Constants.MOA_SCHEMA_LOCATION),
- Constants.MOA_NS_URI);
- grammarsInitialized = true;
- }
- } catch (IOException e) {
- Logger.warn(new LogMsg(msg.getMessage("init.04", null)), e);
- }
-
- // initialize configuration
- try {
- ConfigurationProvider config = ConfigurationProvider.getInstance();
- new IaikConfigurator().configure(config);
- Logger.info(new LogMsg(msg.getMessage("init.01", null)));
- } catch (MOAException e) {
- Logger.fatal(new LogMsg(msg.getMessage("init.00", null)), e);
- }
-
- // set IXSIL debug output
- IXSILInit.setPrintDebugLog(
- Logger.isDebugEnabled(IaikLog.IAIK_LOG_HIERARCHY));
-
- // start the archive cleanup thread
- archiveCleaner =
- new Thread(new RevocationArchiveCleaner(ARCHIVE_CLEANUP_INTERVAL));
- archiveCleaner.setName("RevocationArchiveCleaner");
- archiveCleaner.setDaemon(true);
- archiveCleaner.setPriority(Thread.MIN_PRIORITY);
- archiveCleaner.start();
-
- // unset the startup logging context
- LoggingContextManager.getInstance().setLoggingContext(null);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
deleted file mode 100644
index f7a322d11..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import iaik.IAIKException;
-import iaik.IAIKRuntimeException;
-import iaik.server.modules.cmsverify.CMSSignatureVerificationModule;
-import iaik.server.modules.cmsverify.CMSSignatureVerificationModuleFactory;
-import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile;
-import iaik.server.modules.cmsverify.CMSSignatureVerificationResult;
-
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContent;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContentExcplicit;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContentReference;
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.server.logging.IaikLog;
-import at.gv.egovernment.moa.spss.server.logging.TransactionId;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-
-/**
- * A class providing an interface to the
- * <code>CMSSignatureVerificationModule</code>.
- *
- * This class performs the invocation of the
- * <code>iaik.server.modules.cmsverify.CMSSignatureVerificationModule</code>
- * from a <code>VerifyCMSSignatureRequest</code>. The result of the invocation
- * is integrated into a <code>VerifyCMSSignatureResponse</code> returned.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CMSSignatureVerificationInvoker {
-
- /** The single instance of this class. */
- private static CMSSignatureVerificationInvoker instance = null;
-
- /**
- * Return the only instance of this class.
- *
- * @return The only instance of this class.
- */
- public static synchronized CMSSignatureVerificationInvoker getInstance() {
- if (instance == null) {
- instance = new CMSSignatureVerificationInvoker();
- }
- return instance;
- }
-
- /**
- * Create a new <code>CMSSignatureVerificationInvoker</code>.
- *
- * Protected to disallow multiple instances.
- */
- protected CMSSignatureVerificationInvoker() {
- }
-
- /**
- * Verify a CMS signature.
- *
- * @param request The <code>VerifyCMSSignatureRequest</code> containing the
- * CMS signature, as well as additional data needed for verification.
- * @return Element A <code>VerifyCMSSignatureResponse</code> containing the
- * answer to the <code>VerifyCMSSignatureRequest</code>.
- * @throws MOAException An error occurred while processing the request.
- */
- public VerifyCMSSignatureResponse verifyCMSSignature(VerifyCMSSignatureRequest request)
- throws MOAException {
- CMSSignatureVerificationProfileFactory profileFactory =
- new CMSSignatureVerificationProfileFactory(request);
- VerifyCMSSignatureResponseBuilder responseBuilder =
- new VerifyCMSSignatureResponseBuilder();
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- LoggingContext loggingCtx =
- LoggingContextManager.getInstance().getLoggingContext();
- InputStream signature;
- InputStream signedContent = null;
- CMSSignatureVerificationProfile profile;
- Date signingTime;
- List results;
- CMSSignatureVerificationResult result;
- int[] signatories;
- InputStream input;
- byte[] buf = new byte[256];
-
- // get the signature
- signature = request.getCMSSignature();
-
- try {
- // get the signed content
- signedContent = getSignedContent(request);
-
- // build the profile
- profile = profileFactory.createProfile();
-
- // get the signing time
- signingTime = request.getDateTime();
-
- // verify the signature
- CMSSignatureVerificationModule module =
- CMSSignatureVerificationModuleFactory.getInstance();
-
- module.setLog(new IaikLog(loggingCtx.getNodeID()));
-
- module.init(
- signature,
- signedContent,
- profile,
- new TransactionId(context.getTransactionID()));
- input = module.getInputStream();
-
- while (input.read(buf) > 0);
- results = module.verifySignature(signingTime);
- } catch (IAIKException e) {
- MOAException moaException = IaikExceptionMapper.getInstance().map(e);
- throw moaException;
- } catch (IAIKRuntimeException e) {
- MOAException moaException = IaikExceptionMapper.getInstance().map(e);
- throw moaException;
- } catch (IOException e) {
- throw new MOAApplicationException("2244", null, e);
- } catch (MOAException e)
- {
- throw e;
- }
- finally
- {
- try
- {
- if (signedContent != null) signedContent.close();
- }
- catch (Throwable t)
- {
- // Intentionally do nothing here
- }
- }
-
- // build the response: for each signatory add the result to the response
- signatories = request.getSignatories();
- if (signatories == VerifyCMSSignatureRequest.ALL_SIGNATORIES) {
- Iterator resultIter;
-
- for (resultIter = results.iterator(); resultIter.hasNext();) {
- result = (CMSSignatureVerificationResult) resultIter.next();
- responseBuilder.addResult(result);
- }
- } else {
- int i;
-
- for (i = 0; i < signatories.length; i++) {
- int sigIndex = signatories[i] - 1;
-
- try {
- result =
- (CMSSignatureVerificationResult) results.get(signatories[i] - 1);
- responseBuilder.addResult(result);
- } catch (IndexOutOfBoundsException e) {
- throw new MOAApplicationException(
- "2249",
- new Object[] { new Integer(sigIndex)});
- }
- }
- }
-
- return responseBuilder.getResponse();
- }
-
- /**
- * Get the signed content contained either in the request itself or given as a
- * reference to external data.
- *
- * @param request The <code>VerifyCMSSignatureRequest</code> containing the
- * signed content (or the reference to the signed content).
- * @return InputStream A stream providing the signed content data, or
- * <code>null</code> if no signed content was provided with the request.
- * @throws MOAApplicationException An error occurred building the stream.
- */
- private InputStream getSignedContent(VerifyCMSSignatureRequest request)
- throws MOAApplicationException {
-
- CMSDataObject dataObj;
- CMSContent content;
-
- // select the Content element
- dataObj = request.getDataObject();
- if (dataObj == null) {
- return null;
- }
- content = dataObj.getContent();
-
- // build the content data
- switch (content.getContentType()) {
- case CMSContent.EXPLICIT_CONTENT :
- return ((CMSContentExcplicit) content).getBinaryContent();
- case CMSContent.REFERENCE_CONTENT :
- String reference = ((CMSContentReference) content).getReference();
- if (!"".equals(reference)) {
- ExternalURIResolver resolver = new ExternalURIResolver();
- return resolver.resolve(reference);
- } else {
- return null;
- }
- default :
- return null;
- }
-
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java
deleted file mode 100644
index 442921850..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.iaik.cmsverify.CMSSignatureVerificationProfileImpl;
-import at.gv.egovernment.moa.spss.server.iaik.pki.PKIProfileImpl;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-
-/**
- * A factory to create a <code>CMSSignatureVerificationProfile</code> from a
- * <code>VerifyCMSSignatureRequest</code> and the current MOA configuration
- * data.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CMSSignatureVerificationProfileFactory {
-
- /** The <code>VerifyCMSSignatureRequest</code> to draw profile data from. */
- private VerifyCMSSignatureRequest request;
-
- /**
- * Create a new <code>CMSSignatureVerificationProfileFactory</code>.
- *
- * @param request The <code>VerifyCMSSignatureRequest</code> to draw profile
- * data from.
- */
- public CMSSignatureVerificationProfileFactory(VerifyCMSSignatureRequest request) {
- this.request = request;
- }
-
- /**
- * Create a <code>CMSSignatureVerificationProfile</code> from the given
- * request and the current MOA configuration.
- *
- * @return The <code>CMSSignatureVerificationProfile</code> for the
- * <code>request</code>, based on the current configuration.
- * @throws MOAException An error occurred creating the profile.
- */
- public CMSSignatureVerificationProfile createProfile()
- throws MOAException {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- CMSSignatureVerificationProfileImpl profile =
- new CMSSignatureVerificationProfileImpl();
- String trustProfileID;
-
- // set the certificate validation profile
- trustProfileID = request.getTrustProfileId();
- profile.setCertificateValidationProfile(
- new PKIProfileImpl(config, trustProfileID));
-
- return profile;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CreateXMLSignatureResponseBuilder.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CreateXMLSignatureResponseBuilder.java
deleted file mode 100644
index 6302cadfd..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/CreateXMLSignatureResponseBuilder.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.ErrorResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.SignatureEnvironmentResponse;
-
-/**
- * A class to build a <code>CreateXMLSignatureResponse</code>.
- *
- * <p>The methods <code>addSignature()</code> and <code>addError()</code> may be
- * called in any combination to add <code>SignatureEnvironment</code> and
- * <code>ErrorResponse</code> elements to the response. One of these functions
- * must be called at least once to produce a
- * <code>CreateXMLSignatureResponse</code>.</p>
- *
- * <p>The <code>getResponseElement()</code> method then returns the
- * <code>CreateXMLSignatureResponse</code> built so far.</p>
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CreateXMLSignatureResponseBuilder {
-
- /** The <code>SPSSFactory</code> for creating API objects. */
- private SPSSFactory factory = SPSSFactory.getInstance();
- /** The elements to add to the response. */
- private List responseElements = new ArrayList();
-
- /**
- * Get the <code>CreateXMLSignatureResponse</code> built so far.
- *
- * @return The <code>CreateXMLSignatureResponse</code> built so far.
- */
- public CreateXMLSignatureResponse getResponse() {
- return factory.createCreateXMLSignatureResponse(responseElements);
- }
-
- /**
- * Add a <code>SignatureEnvironment</code> element to the response.
- *
- * @param signatureEnvironment The content to put under the
- * <code>SignatureEnvironment</code> element. This should either be a
- * <code>dsig:Signature</code> element (in case of a detached signature) or
- * the signature environment containing the signature (in case of
- * an enveloping signature).
- */
- public void addSignatureEnvironment(Element signatureEnvironment) {
- SignatureEnvironmentResponse responseElement =
- factory.createSignatureEnvironmentResponse(signatureEnvironment);
- responseElements.add(responseElement);
- }
-
- /**
- * Add a <code>ErrorResponse</code> element to the response.
- *
- * @param errorCode The error code.
- * @param info Additional information about the error.
- */
- public void addError(String errorCode, String info) {
- ErrorResponse errorResponse =
- factory.createErrorResponse(Integer.parseInt(errorCode), info);
- responseElements.add(errorResponse);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
deleted file mode 100644
index 1386d5c2d..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
+++ /dev/null
@@ -1,892 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.xml.sax.EntityResolver;
-import org.xml.sax.SAXException;
-
-import iaik.ixsil.util.URI;
-import iaik.ixsil.util.XPointerReferenceResolver;
-import iaik.server.modules.xml.DataObject;
-import iaik.server.modules.xml.XMLDataObject;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-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;
-import at.gv.egovernment.moa.util.StreamUtils;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.ContentBinary;
-import at.gv.egovernment.moa.spss.api.common.ContentLocRef;
-import at.gv.egovernment.moa.spss.api.common.ContentXML;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter;
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameterBinary;
-import at.gv.egovernment.moa.spss.server.iaik.xml.ByteArrayDataObjectImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.ByteStreamDataObjectImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.DataObjectImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XMLDataObjectImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XMLNodeListDataObjectImpl;
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * A class to create <code>DataObject</code>s contained in different
- * locations of the MOA XML request format.
- *
- * @author Patrick Peck
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class DataObjectFactory {
-
- /** The single instance of this class. */
- private static DataObjectFactory instance = null;
-
- /**
- * Return the only instance of this class.
- *
- * @return The only instance of this class.
- */
- public static synchronized DataObjectFactory getInstance() {
- if (instance == null) {
- instance = new DataObjectFactory();
- }
- return instance;
- }
-
- /**
- * Create a new <code>DataObjectFactory</code>.
- *
- * Protected to disallow multiple instances.
- */
- protected DataObjectFactory() {
- }
-
- /**
- * Return the signature environment, i.e., the root element of the
- * document, into which the signature will be inserted (if created) or which
- * contains the signature (if verified).
- *
- * @param content The <code>Content</code> object containing the signature
- * environment.
- * @param supplements Additional schema or DTD information.
- * @return The signature environment or <code>null</code>, if no
- * signature environment exists.
- * @throws MOASystemException A system error occurred building the signature
- * environment (see message for details).
- * @throws MOAApplicationException An error occurred building the signature
- * environment (see message for details).
- */
- public XMLDataObject createSignatureEnvironment(
- Content content,
- List supplements)
- throws MOASystemException, MOAApplicationException {
-
- String reference = content.getReference();
- EntityResolver entityResolver;
- byte[] contentBytes;
-
- // check for content and reference not being set at the same time
- checkAllowContentAndReference(content, false);
-
- // build the EntityResolver for validating parsing
- if (supplements == null || supplements.isEmpty()) {
- entityResolver = new MOAEntityResolver();
- } else {
- EntityResolverChain chain = new EntityResolverChain();
-
- chain.addEntityResolver(buildSupplementEntityResolver(supplements));
- chain.addEntityResolver(new MOAEntityResolver());
- entityResolver = chain;
- }
-
- // convert the content into a byte array
- try {
- switch (content.getContentType()) {
- case Content.BINARY_CONTENT :
- {
- InputStream is = ((ContentBinary) content).getBinaryContent();
- contentBytes = StreamUtils.readStream(is);
- break;
- }
- case Content.LOCREF_CONTENT:
- {
- ExternalURIResolver uriResolver = new ExternalURIResolver();
- String locRefURI = ((ContentLocRef) content).getLocationReferenceURI();
- InputStream is = null;
- try
- {
- is = uriResolver.resolve(locRefURI);
- contentBytes = StreamUtils.readStream(is);
- }
- catch (MOAApplicationException e)
- {
- throw new MOAApplicationException("3203", new Object[]{reference, locRefURI}, e);
- }
- finally
- {
- closeInputStream(is);
- }
- break;
- }
- case Content.REFERENCE_CONTENT :
- {
- ExternalURIResolver uriResolver = new ExternalURIResolver();
- InputStream is = null;
- try
- {
- is = uriResolver.resolve(reference);
- contentBytes = StreamUtils.readStream(is);
- }
- catch (Exception e)
- {
- throw e;
- }
- finally
- {
- closeInputStream(is);
- }
- break;
- }
- case Content.XML_CONTENT :
- {
- Element element =
- checkForSingleElement(((ContentXML) content).getXMLContent());
- contentBytes = DOMUtils.serializeNode(element, "UTF-8");
- break;
- }
- default :
- contentBytes = null; // this will not happen
- }
- } catch (MOAApplicationException e) {
- throw e;
- } catch (Exception e) {
- throw new MOAApplicationException("2219", null);
- }
-
- // try to parse validating
- try {
- ByteArrayInputStream is = new ByteArrayInputStream(contentBytes);
- Document doc =
- DOMUtils.parseDocument(
- is,
- true,
- Constants.ALL_SCHEMA_LOCATIONS,
- null,
- entityResolver,
- new MOAErrorHandler());
-
- return new XMLDataObjectImpl(doc.getDocumentElement());
- } catch (Exception e) {
- // never mind, we'll try non-validating
- MessageProvider msg = MessageProvider.getInstance();
- Logger.info(new LogMsg(msg.getMessage("invoker.00", null)));
- }
-
- // try to parse non-validating
- try {
- ByteArrayInputStream is = new ByteArrayInputStream(contentBytes);
- Document doc = DOMUtils.parseDocument(is, false, null, null);
- return new XMLDataObjectImpl(doc.getDocumentElement());
- } catch (Exception e) {
- throw new MOAApplicationException("2218", null);
- }
- }
-
- /**
- * Create an <code>XMLDataObject</code> from the given signature environment.
- *
- * @param signatureEnvironment The signature environment contained in the
- * result.
- * @param uri The URI identifying the data. This must be either the empty
- * URI, an URI starting with <code>"#xpointer"</code>, <code>"#xmlns"</code>
- * or <code>"#element"</code>; or an URI starting with <code>"#"</code> and
- * followed by an element ID.
- * @param referenceID The reference ID to set for the data object.
- * @return A data object containing the signature environment.
- */
- public DataObject createFromSignatureEnvironment(
- Element signatureEnvironment,
- String uri,
- String referenceID)
- throws MOAApplicationException {
-
- DataObjectImpl dataObject = null;
-
- if ("".equals(uri)) {
- dataObject = new XMLDataObjectImpl(signatureEnvironment);
- } else if (
- uri.startsWith("#xpointer")
- || uri.startsWith("#xmlns")
- || uri.startsWith("#element")) {
- try {
- XPointerReferenceResolver resolver = new XPointerReferenceResolver();
- URI uriObj = new URI(uri);
- NodeList nodes =
- resolver.resolveForest(
- uriObj,
- signatureEnvironment.getOwnerDocument(),
- null);
- dataObject = new XMLNodeListDataObjectImpl(nodes);
- } catch (Exception e) {
- throw new MOAApplicationException("2237", new Object[] { uri });
- }
- } else if (uri.startsWith("#")) {
- String id = uri.substring(1);
- Element refElem =
- signatureEnvironment.getOwnerDocument().getElementById(id);
-
- if (refElem == null) {
- throw new MOAApplicationException("2237", new Object[] { id });
- }
- dataObject = new XMLDataObjectImpl(refElem);
- }
-
- dataObject.setReferenceID(referenceID);
- dataObject.setURI(uri);
-
- return dataObject;
- }
-
- /**
- * Build a <code>StreamEntityResolver</code> from a <code>List</code> of
- * supplements.
- *
- * @param supplements The supplements, given as
- * <code>XMLDataObjectAssociation</code>s.
- * @return A <code>StreamEntityResolver</code> mapping the supplements by
- * their reference URI to an <code>InputStream</code> of their respective
- * content.
- */
- private static StreamEntityResolver buildSupplementEntityResolver(List supplements)
- throws MOAApplicationException
- {
- Map entities = new HashMap();
- Iterator iter;
-
- for (iter = supplements.iterator(); iter.hasNext();) {
- XMLDataObjectAssociation supplement =
- (XMLDataObjectAssociation) iter.next();
- Content content = supplement.getContent();
- String reference = content.getReference();
-
- switch (content.getContentType()) {
- case Content.BINARY_CONTENT :
- {
- entities.put(reference, ((ContentBinary) content).getBinaryContent());
- break;
- }
- case Content.LOCREF_CONTENT:
- {
- ExternalURIResolver uriResolver = new ExternalURIResolver();
- String locRefURI = ((ContentLocRef) content).getLocationReferenceURI();
- InputStream contentIS = null;
- InputStream uriStream = null;
- try
- {
- uriStream = uriResolver.resolve(locRefURI);
- byte[] contentBytes = StreamUtils.readStream(uriStream);
- contentIS = new ByteArrayInputStream(contentBytes);
- }
- catch (Exception e)
- {
- throw new MOAApplicationException("3202", new Object[]{reference, locRefURI}, e);
- }
- finally
- {
- closeInputStream(uriStream);
- }
- entities.put(reference, contentIS);
- break;
- }
- case Content.XML_CONTENT :
- {
- // serialize the first element node that is found in the supplement
- // and make it available as a stream
- NodeList nodes = ((ContentXML) content).getXMLContent();
- int i = 0;
-
- // find the first element node
- while (i < nodes.getLength()
- && nodes.item(i).getNodeType() != Node.ELEMENT_NODE)
- i++;
-
- // serialize the node
- if (i < nodes.getLength()) {
- try
- {
- byte[] serialized = DOMUtils.serializeNode(nodes.item(i), "UTF-8");
- entities.put(reference, new ByteArrayInputStream(serialized));
- }
- catch (Exception e)
- {
- throw new MOAApplicationException("2281", new Object[]{reference}, e);
- }
- }
- break;
- }
- }
- }
-
- return new StreamEntityResolver(entities);
- }
-
- /**
- * Create a <code>DataObject</code> from a <code>Content</code> object.
- *
- * @param content The <code>Content</code> object containing the data.
- * @param finalDataMetaInfo The meta information corresponding with <code>content</code>.
- * @param referenceID The reference ID to set in the resulting
- * <code>DataObject</code>. May be <code>null</code>.
- * @param allowContentAndReference If <code>true</code>, then
- * <code>content</code> is allowed to contain both a <code>Reference</code>
- * attribute and content. Otherwise, either a <code>Reference</code>
- * attribute or content must be set.
- * @param binaryAsXml If <code>true</code>, a content child given as
- * <code>Base64Content</code> must contain XML data.
- * @param xmlAsNodeList If <code>true</code>, the children of a
- * <code>XMLContent</code> child element are returned as a
- * <code>XMLNodeListDataObject</code>. Otherwise, <code>XMLContent</code> may
- * only contain a single child node, which must be an element and which is
- * returned as an <code>XMLDataObject</code>.
- * @param referenceAsXml If <code>true</code>, then content loaded from the
- * URI given as the <code>Reference</code> attribute must be XML data.
- * If <code>false</code>, an attempt is made to parse the data as XML and
- * return an <code>XMLDataObject</code> but if this fails, a
- * <code>BinaryDataObject</code> is returned containing a byte stream to the
- * data.
- * @return A <code>DataObject</code> representing the data in
- * <code>content</code>. If <code>base64AsXml==true</code> and
- * <code>xmlAsNodeList==false</code> and <code>referenceAsXml==true</code>,
- * then the result can safely be cast to an <code>XMLDataObject</code>.
- * @throws MOASystemException An error indicating an internal problem. See the
- * wrapped exception for details.
- * @throws MOAApplicationException An error occurred handling the content
- * (probably while opening a reference or parsing the data). See the wrapped
- * exception for details.
- */
- public DataObject createFromContentOptionalRefType(
- Content content,
- MetaInfo finalDataMetaInfo,
- String referenceID,
- boolean allowContentAndReference,
- boolean binaryAsXml,
- boolean xmlAsNodeList,
- boolean referenceAsXml)
- throws MOASystemException, MOAApplicationException {
-
- String reference = content.getReference();
- DataObjectImpl dataObject = null;
-
- checkAllowContentAndReference(content, allowContentAndReference);
-
- // ok, build the data object; use content first, if available
- switch (content.getContentType())
- {
- case Content.XML_CONTENT :
- {
- ContentXML contentXml = (ContentXML) content;
- dataObject = createFromXmlContent(contentXml, xmlAsNodeList);
- break;
- }
- case Content.BINARY_CONTENT :
- {
- ContentBinary contentBinary = (ContentBinary) content;
- dataObject = createFromBinaryContent(contentBinary, binaryAsXml, false);
- break;
- }
- case Content.LOCREF_CONTENT :
- {
- String locRefURI = ((ContentLocRef) content).getLocationReferenceURI();
- try
- {
- dataObject = createFromURIImpl(locRefURI, referenceAsXml);
- }
- catch (MOAApplicationException e)
- {
- throw new MOAApplicationException("3201", new Object[]{reference, locRefURI}, e);
- }
- break;
- }
- case Content.REFERENCE_CONTENT :
- {
- dataObject = createFromURIImpl(reference, referenceAsXml);
- break;
- }
- }
-
- // set URI and reference ID
- dataObject.setURI(reference);
- dataObject.setReferenceID(referenceID);
-
- // set Type gathered from corresponding meta information
- dataObject.setTypeURI(finalDataMetaInfo.getType());
-
- return dataObject;
- }
-
- /**
- * Check, if content and reference URIs are allowed in the content an throw
- * an exception if an illegal combination of the two occurs.
- *
- * @param content The <code>Content</code> to check.
- * @param allowContentAndReference Whether explicit content and a reference
- * are allowed at the same time.
- * @throws MOAApplicationException If <code>allowContentAndRefernece</code>
- * is <code>false</code> and both explicit content and reference are set,
- * an exception is thrown.
- */
- private static void checkAllowContentAndReference(
- Content content,
- boolean allowContentAndReference)
- throws MOAApplicationException {
- String reference = content.getReference();
-
- // check for content and reference not being set
- if (content.getContentType() == Content.REFERENCE_CONTENT
- && reference == null) {
- String errorCode = allowContentAndReference ? "1111" : "1110";
- throw new MOAApplicationException(errorCode, null);
- }
-
- // if we only allow either content or reference being set at once, check
- if (!allowContentAndReference
- && (content.getContentType() != Content.REFERENCE_CONTENT)
- && (reference != null)) {
- throw new MOAApplicationException("1110", null);
- }
- }
-
- /**
- * Create a <code>DataObject</code> from a
- * <code>XMLDataObjectAssociation</code> object.
- *
- * @param xmlDataObjAssoc The <code>XMLDataObjectAssociation</code> object.
- * @param xmlContentAllowed Whether the content contained in the
- * <code>xmlDataObjAssoc</code> is allowed to be of type
- * <code>XML_CONTENT</code>.
- * @param binaryContentRepeatable If binary content must be provided as a
- * <code>DataObject</code> that can be read multiple times.
- * @return A <code>DataObject</code> representing the data in
- * <code>xmlDataObjAssoc</code>.
- * @throws MOASystemException An error indicating an internal problem. See the
- * wrapped exception for details.
- * @throws MOAApplicationException An error occurred handling the content
- * (probably while parsing the data). See the wrapped exception for details.
- */
- public DataObject createFromXmlDataObjectAssociation(
- XMLDataObjectAssociation xmlDataObjAssoc,
- boolean xmlContentAllowed,
- boolean binaryContentRepeatable)
- throws MOASystemException, MOAApplicationException {
-
- Content content = xmlDataObjAssoc.getContent();
- MetaInfo metaInfo = xmlDataObjAssoc.getMetaInfo();
- String mimeType = metaInfo != null ? metaInfo.getMimeType() : null;
- DataObjectImpl dataObject = null;
-
- switch (content.getContentType())
- {
- case Content.XML_CONTENT :
- {
- if (xmlContentAllowed)
- {
- dataObject = createFromXmlContent((ContentXML) content, true);
- }
- else
- {
- throw new MOAApplicationException("2280", null);
- }
- break;
- }
- case Content.BINARY_CONTENT :
- {
- dataObject = createFromBinaryContent(
- (ContentBinary) content,
- false,
- binaryContentRepeatable);
- break;
- }
- case Content.LOCREF_CONTENT :
- {
- String locRefURI = ((ContentLocRef) content).getLocationReferenceURI();
- try
- {
- dataObject = createFromURIImpl(locRefURI, false);
- }
- catch (MOAApplicationException e)
- {
- throw new MOAApplicationException("3201", new Object[]{content.getReference(), locRefURI}, e);
- }
- break;
- }
- }
-
- dataObject.setURI(content.getReference());
- dataObject.setMimeType(mimeType);
- return dataObject;
- }
-
- /**
- * Create a <code>DataObject</code> from a <code>TransformParameter</code>
- * object.
- *
- * @param transformParameter The <code>TransformParameter</code> object
- * containing the data.
- * @return A <code>DataObject</code> representing the data in
- * <code>root</code>.
- * @throws MOASystemException An error indicating an internal problem. See the
- * wrapped exception for details.
- * @throws MOAApplicationException An error occurred handling the content
- * (probably while opening a reference or parsing the data). See the wrapped
- * exception for details.
- */
- public DataObject createFromTransformParameter(TransformParameter transformParameter)
- throws MOASystemException, MOAApplicationException {
-
- DataObjectImpl dataObject;
-
- switch (transformParameter.getTransformParameterType()) {
- case TransformParameter.BINARY_TRANSFORMPARAMETER :
- TransformParameterBinary tpBinary =
- (TransformParameterBinary) transformParameter;
-
- try {
- //dataObject = new ByteArrayDataObjectImpl(Base64Utils.encode(tpBinary.getBinaryContent()));
- dataObject =
- new ByteArrayDataObjectImpl(
- StreamUtils.readStream(tpBinary.getBinaryContent()));
- } catch (Exception e) {
- return null;
- }
- //dataObject = new ByteStreamDataObjectImpl(tpBinary.getBinaryContent());
- break;
- default :
- // resolve uri and build the content
- ExternalURIResolver resolver = new ExternalURIResolver();
- InputStream is = resolver.resolve(transformParameter.getURI());
- ByteArrayInputStream bis;
- try
- {
- bis = new ByteArrayInputStream(StreamUtils.readStream(is));
- }
- catch (IOException e)
- {
- throw new MOAApplicationException("2238", new Object[] {transformParameter.getURI()}, e);
- }
- finally
- {
- closeInputStream(is);
- }
- String contentType = resolver.getContentType();
- dataObject = new ByteStreamDataObjectImpl(bis);
- dataObject.setMimeType(contentType);
- break;
- }
-
- dataObject.setURI(transformParameter.getURI());
-
- return dataObject;
- }
-
- /**
- * Create a <code>DataObject</code> from data located at the given URI.
- *
- * @param uri The <code>URI</code> where the data is located. This method uses
- * an <code>ExternalURIResolver</code> to resolve URIs.
- * @param asXml If <code>true</code>, a <code>DataObject</code> is only
- * returned, if the content consists of XML data. If it does not consist of
- * XML data, an <code>MOAApplicationException</code> will be thrown. If this
- * parameter is <code>false</code> and the content consists of XML data, this
- * method will still attempt to parse it.
- * @return The <code>DataObject</code> contained at the URI.
- * @throws MOASystemException A system error parsing the XML content.
- * @throws MOAApplicationException An error occurred on opening, reading or
- * parsing the data behind the URI.
- */
- public DataObject createFromURI(String uri, boolean asXml)
- throws MOASystemException, MOAApplicationException {
- return createFromURIImpl(uri, asXml);
- }
-
- /**
- * Create a <code>DataObject</code> from data located at the given URI.
- *
- * @param uri The <code>URI</code> where the data is located. This method uses
- * an <code>ExternalURIResolver</code> to resolve URIs.
- * @param asXml If <code>true</code>, a <code>DataObject</code> is only
- * returned, if the content consists of XML data. If it does not consist of
- * XML data, an <code>MOAApplicationException</code> will be thrown. If this
- * parameter is <code>false</code> and the content type is detected as being
- * XML data, this method will still attemt to parse it.
- * @return The <code>DataObject</code> contained at the URI.
- * @throws MOASystemException A system error parsing the XML content.
- * @throws MOAApplicationException An error occurred on opening, reading or
- * parsing the data behind the URI.
- */
- private DataObjectImpl createFromURIImpl(String uri, boolean asXml)
- throws MOASystemException, MOAApplicationException {
-
- ExternalURIResolver resolver = new ExternalURIResolver();
- InputStream is = resolver.resolve(uri);
- String contentType = resolver.getContentType();
- DataObjectImpl dataObject;
-
- // read the content
- if (contentType != null && contentTypeIsXml(contentType)) {
- Document doc;
-
- if (asXml) {
- try {
- // try parsing non-validating: this has to succeed or we
- // bail out by throwing an exception
- is = resolver.resolve(uri);
- doc = DOMUtils.parseDocument(is, false, null, null);
- dataObject = new XMLDataObjectImpl(doc.getDocumentElement());
- } catch (ParserConfigurationException e) {
- throw new MOASystemException("1106", null, e);
- } catch (SAXException e) {
- throw new MOAApplicationException("2209", null, e);
- } catch (IOException e) {
- throw new MOAApplicationException("2210", null, e);
- }
- finally
- {
- closeInputStream(is);
- }
- } else {
- try {
- // try parsing non-validating: need not succeed
- is = resolver.resolve(uri);
- doc = DOMUtils.parseDocument(is, false, null, null);
- closeInputStream(is);
- dataObject = new XMLDataObjectImpl(doc.getDocumentElement());
- } catch (Exception e) {
- // this is the last chance: return the data as a byte stream
- is = resolver.resolve(uri);
- ByteArrayInputStream bis;
- try
- {
- bis = new ByteArrayInputStream(StreamUtils.readStream(is));
- dataObject = new ByteStreamDataObjectImpl(bis);
- }
- catch (IOException e1)
- {
- throw new MOAApplicationException("2210", new Object[] { uri }, e1);
- }
- finally
- {
- closeInputStream(is);
- }
- }
- }
- }
- else if (asXml)
- {
- // if we need XML data, we're in the wrong place here
- closeInputStream(is);
- throw new MOAApplicationException("2211", new Object[] { uri });
- }
- else
- {
- // content is binary: make it available as a binary input stream
- ByteArrayInputStream bis;
- try
- {
- bis = new ByteArrayInputStream(StreamUtils.readStream(is));
- }
- catch (IOException e)
- {
- throw new MOAApplicationException("2210", null, e);
- }
- finally
- {
- closeInputStream(is);
- }
- dataObject = new ByteStreamDataObjectImpl(bis);
- }
-
- dataObject.setMimeType(contentType);
- dataObject.setURI(uri);
-
- return dataObject;
- }
-
- /**
- * Savely closes the specified input stream.
- *
- * @param is The input stream to be closed.
- */
- private static void closeInputStream(InputStream is)
- {
- try
- {
- if (is != null) is.close();
- }
- catch (Throwable t)
- {
- // Intentionally do nothing here
- }
- }
-
- /**
- * Determine whether the content type is XML.
- *
- * Content types recognized as XML start with <code>text/xml</code> and
- * <code>application/xml</code>.
- *
- * @param contentType The content MIME type.
- * @return boolean If <code>true</code>, the content type is XML, otherwise
- * not.
- */
- private static boolean contentTypeIsXml(String contentType) {
- return contentType.startsWith("text/xml")
- || (contentType.startsWith("application/xml"));
- }
-
- /**
- * Create a <code>DataObject</code> from a <code>ContentXML</code> object.
- *
- * @param xmlContent The <code>ContentXML</code> object from
- * which the <code>DataObject</code> is to be built.
- * @param xmlAsNodeList If <code>true</code>, the children of
- * <code>xmlContent</code> are returned as a
- * <code>XMLNodeListDataObject</code>. Otherwise,
- * <code>xmlContent</code> may only contain a single child node, which must be
- * an element and which is returned as an <code>XMLDataObject</code>.
- * @return A <code>DataObject</code> representing the XML content in
- * <code>xmlContent</code>.
- * @throws MOAApplicationException If <code>xmlAsNodeList</code> is
- * <code>false</code> and <code>xmlContent</code> does not have a single child
- * element.
- */
- private DataObjectImpl createFromXmlContent(
- ContentXML xmlContent,
- boolean xmlAsNodeList)
- throws MOAApplicationException {
-
- DataObjectImpl dataObject;
-
- if (xmlAsNodeList) {
- dataObject = new XMLNodeListDataObjectImpl(xmlContent.getXMLContent());
- } else {
- NodeList nodes = xmlContent.getXMLContent();
- Element element = checkForSingleElement(nodes);
-
- // build the XMLDataObject
- dataObject = new XMLDataObjectImpl(element);
- }
- return dataObject;
- }
-
- /**
- * Check, that the given <code>NodeList</code> contains a single DOM element
- * node and return it, otherwise throw an exception.
- *
- * @param nodes The <code>NodeList</code> to check for a single element.
- * @return The single element contained in <code>nodes</code>.
- * @throws MOAApplicationException Thrown, if <code>nodes</code> does not
- * contain exactly 1 element node.
- */
- private Element checkForSingleElement(NodeList nodes)
- throws MOAApplicationException {
-
- Element element = null;
- int i;
-
- // check for a single element node
- for (i = 0; i < nodes.getLength(); i++) {
- if (nodes.item(i).getNodeType() == Node.ELEMENT_NODE) {
- if (element == null) {
- element = (Element) nodes.item(i);
- } else {
- throw new MOAApplicationException("1109", null);
- }
- }
- }
-
- // return the element node
- if (element == null) {
- throw new MOAApplicationException("1107", null);
- } else {
- return element;
- }
- }
-
- /**
- * Create a <code>DataObject</code> from a <code>ContentBinary</code> object.
- *
- * @param binaryContent The <code>ContentBinary</code> object containing the
- * data.
- * @param asXml If <code>true</code>, <code>binaryContent</code> must
- * contain XML data. Otherwise, a <code>BinaryDataObject</code> will be
- * returned containing a byte stream to the decoded Base64 data.
- * @param repeatable If multiple calls to <code>getInputStream()</code> must
- * repeatedly return the content of the data object.
- * @return A <code>DataObject</code> representing the content contained in
- * <code>binaryContent</code>.
- * @throws MOASystemException An error indicating an internal problem. See the
- * wrapped exception for details.
- * @throws MOAApplicationException An error occurred handling the content
- * (probably while parsing the data). See the wrapped exception for details.
- */
- private DataObjectImpl createFromBinaryContent(
- ContentBinary binaryContent,
- boolean asXml,
- boolean repeatable)
- throws MOASystemException, MOAApplicationException {
-
- InputStream byteStream = binaryContent.getBinaryContent();
- DataObjectImpl dataObject;
-
- if (asXml) {
- Document doc;
-
- try {
- doc = DOMUtils.parseDocument(byteStream, false, null, null);
- dataObject = new XMLDataObjectImpl(doc.getDocumentElement());
- } catch (ParserConfigurationException e) {
- throw new MOASystemException("1106", null, e);
- } catch (SAXException e) {
- throw new MOAApplicationException("2209", null, e);
- } catch (IOException e) {
- throw new MOAApplicationException("2210", null, e);
- }
- } else {
- if (repeatable) {
- try {
- dataObject =
- new ByteArrayDataObjectImpl(StreamUtils.readStream(byteStream));
- } catch (IOException e) {
- throw new MOAApplicationException("2210", null);
- }
- } else {
- dataObject = new ByteStreamDataObjectImpl(byteStream);
- }
- }
-
- return dataObject;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ExternalURIResolver.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ExternalURIResolver.java
deleted file mode 100644
index 806b76409..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ExternalURIResolver.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import iaik.ixsil.exceptions.URIException;
-import iaik.ixsil.util.URI;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-
-/**
- * Resolve external URIs and provide them as a stream.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ExternalURIResolver {
-
- /** The MIME type of the content currently resolved. */
- private String contentType;
-
- /**
- * Return a stream to data at the given URI.
- *
- * This method will try to open an <code>URLConnection</code> to the given
- * URI. Access to the file system is disallowed.
- *
- * @param uriStr The URI to resolve.
- * @return InputStream The data contained at the URI.
- * @throws MOAApplicationException An error occurred resolving the URI (e.g.,
- * the URI is syntactically incorrect or the stream could not be opened).
- */
- public InputStream resolve(String uriStr) throws MOAApplicationException {
- URI uri;
- URL url;
- URLConnection connection;
- InputStream is;
-
- // build the URI
- try {
- uri = new URI(uriStr);
- } catch (URIException e) {
- throw new MOAApplicationException("2207", new Object[] { uriStr });
- }
-
- // disallow access to local file system
- if ("".equals(uri.getScheme()) || "file".equals(uri.getScheme())) {
- throw new MOAApplicationException("2213", new Object[] { uriStr });
- }
-
- // convert URI to URL
- try {
- // create the URL
- url = new URL(uriStr);
- } catch (MalformedURLException e) {
- throw new MOAApplicationException("2214", new Object[] { uriStr });
- }
-
- // build the URLConnection
- try {
- connection = url.openConnection();
- if ("http".equals(url.getProtocol())) {
- HttpURLConnection httpConnection = (HttpURLConnection) connection;
-
- httpConnection.connect();
- if (httpConnection.getResponseCode() != HttpURLConnection.HTTP_OK) {
- throw new MOAApplicationException("2208", new Object[] { uri });
- }
- } else if ("https".equals(url.getProtocol())) {
- /*
- * this doesn't work because of some interaction between the IAIK
- * JCE and Sun JSSE that results in an "Invalid AVA format" exception
- */
-
- /*
- HttpsURLConnection httpsConnection = (HttpsURLConnection) connection;
- InputStream trustStore =
- getClass().getResourceAsStream(DEFAULT_TRUST_STORE);
- SSLSocketFactory factory =
- SSLUtils.getSSLSocketFactory("jks", trustStore, "changeit");
- httpsConnection.setSSLSocketFactory(factory);
- httpsConnection.connect();
- if (httpConnection.getResponseCode() != HttpURLConnection.HTTP_OK) {
- throw new MOAApplicationException("2208", new Object[] { uri });
- }
- */
- connection.connect();
- } else {
- connection.connect();
- }
- is = connection.getInputStream();
- } catch (IOException e) {
- throw new MOAApplicationException("2208", new Object[] { uri }, e);
- } /*catch (GeneralSecurityException e) {
- throw new MOAApplicationException("2208", new Object[] { uri }, e);
- }*/
-
- // set the content type
- setContentType(connection.getContentType());
-
- return is;
- }
-
- /**
- * Set the content type of the data at the URI.
- *
- * @param contentType The content type to set.
- */
- protected void setContentType(String contentType) {
- this.contentType = contentType;
- }
-
- /**
- * Return the content type of the data detected at the URI from the previous
- * call of <code>resolve()</code>.
- *
- * @return String The content type.
- */
- public String getContentType() {
- return contentType;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java
deleted file mode 100644
index 60f573e5a..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/IaikExceptionMapper.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Map;
-
-import iaik.IAIKException;
-import iaik.IAIKRuntimeException;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-
-
-/**
- * Map an exception from the <code>iaik</code> namespace to a
- * <code>MOAException</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class IaikExceptionMapper {
-
- /** The argument classes for <code>MOAException</code>s. */
- private static final Class[] CONSTRUCTOR_ARGS =
- new Class[] { String.class, Object[].class, Throwable.class };
- /** The exception mapping, as an array. */
- private static final Object[][] MESSAGES =
- {
- { iaik.IAIKException.class, "9900", MOASystemException.class },
- { iaik.IAIKRuntimeException.class, "9901", MOASystemException.class },
- { iaik.server.modules.xmlsign.XMLSignatureCreationException.class, "2220", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.XMLSignatureCreationRuntimeException.class, "2220", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.InvalidKeyException.class, "2221", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.ManifestException.class, "2222", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.ReferenceException.class, "2223", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.HashUnavailableException.class, "2224", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.SignatureAlgorithmException.class, "2225", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.SignatureEmbeddingException.class, "2226", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.SignatureValueException.class, "2227", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.SignedPropertyException.class, "2228", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.SignerCertificateUnavailableException.class, "2229", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.SupplementException.class, "2230", MOAApplicationException.class },
- { iaik.server.modules.xmlsign.TransformationException.class, "2233", MOAApplicationException.class },
- { iaik.server.modules.cmsverify.CMSSignatureVerificationException.class, "2240", MOAApplicationException.class },
- { iaik.server.modules.cmsverify.CMSSignatureVerificationRuntimeException.class, "2240", MOAApplicationException.class },
- { iaik.server.modules.cmsverify.AlgorithmNotSupportedException.class, "2241", MOAApplicationException.class },
- { iaik.server.modules.cmsverify.CMSSignatureParsingException.class, "2242", MOAApplicationException.class },
- { iaik.server.modules.cmsverify.SignerCertificateUnavailableException.class, "2243", MOAApplicationException.class },
- { iaik.server.modules.cmsverify.CMSSignatureVerificationRuntimeException.class, "2247", MOAApplicationException.class },
- { iaik.server.modules.cmsverify.InitException.class, "2248", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.XMLSignatureVerificationException.class, "2240", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.XMLSignatureVerificationRuntimeException.class, "2240", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.AlgorithmNotSupportedException.class, "2241", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.ManifestException.class, "2262", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.PropertiesException.class, "2263", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.ReferenceException.class, "2264", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.HashUnavailableException.class, "2224", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.SignerCertificateUnavailableException.class, "2243", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.SupplementException.class, "2230", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.TransformationException.class, "2265", MOAApplicationException.class },
- { iaik.server.modules.xmlverify.TransformationParsingException.class, "2269", MOAApplicationException.class }
- };
-
- /** The single instance of this class. */
- private static IaikExceptionMapper instance;
- /** The exception mapping, as a <code>Map</code> for fast lookup. */
- private Map messages = new HashMap();
-
- /**
- * Get the single instance of this class.
- *
- * @return The single instance of this class.
- */
- public static synchronized IaikExceptionMapper getInstance() {
- if (instance == null) {
- instance = new IaikExceptionMapper();
- }
- return instance;
- }
-
- /**
- * Create a new <code>IaikExceptionMapper</code>.
- *
- * Protected to disallow multple instances.
- */
- protected IaikExceptionMapper() {
- registerMessages();
- }
-
- /**
- * Build the complete <code>IAIKException</code> to message code mapping.
- */
- protected void registerMessages() {
- int i;
-
- for (i = 0; i < MESSAGES.length; i++) {
- registerMessage(
- (Class) MESSAGES[i][0],
- (String) MESSAGES[i][1],
- (Class) MESSAGES[i][2]);
- }
- }
-
- /**
- * Register a single <code>IAIKException</code> to message mapping.
- *
- * @param iaikExceptionClass An exception from the <code>iaik</code> package.
- * @param messageId The corresponding error message id.
- * @param moaExceptionClass The type of <code>MOAException</code> that the
- * <code>IAIKException</code> is mapped to (usually
- * <code>MOAApplicationException</code> or <code>MOASystemException</code>).
- */
- protected void registerMessage(
- Class iaikExceptionClass,
- String messageId,
- Class moaExceptionClass) {
-
- messages.put(
- iaikExceptionClass,
- new ExceptionMappingInfo(messageId, moaExceptionClass));
- }
-
- /**
- * Map an <code>IAIKException</code> to a <code>MOAException</code>.
- *
- * @param iaikException The <code>IAIKException</code> to map.
- * @return A <code>MOAException</code> containing the message for the
- * given <code>IAIKException</code>.
- */
- public MOAException map(IAIKException iaikException) {
- return mapImpl(iaikException);
- }
-
- /**
- * Map an <code>IAIKRuntimeException</code> to a <code>MOAException</code>.
- *
- * @param iaikException The <code>IAIKException</code> to map.
- * @return A <code>MOAException</code> containing the message for the
- * given <code>IAIKRuntimeException</code>.
- */
- public MOAException map(IAIKRuntimeException iaikException) {
- return mapImpl(iaikException);
- }
-
- /**
- * Map an <code>IAIKException</code> or <code>IAIKRuntimeException</code> to a
- * <code>MOAException</code>.
- *
- * @param iaikException The <code>IAIKException</code> or
- * <code>IAIKRuntimeException</code> to map.
- * @return A <code>MOAException</code> containing the message for the
- * given <code>IAIKRuntimeException</code>.
- */
- private MOAException mapImpl(Exception iaikException) {
- MOAException moaException = createMoaException(iaikException);
-
- if (moaException == null) {
- return new MOASystemException("9999", null, iaikException);
- }
- return moaException;
- }
-
- /**
- * Create a <code>MOAException</code> from a given <code>IAIKException</code>
- * by looking it up in the mapping.
- *
- * @param iaikException The <code>IAIKException</code> to map.
- * @return A <code>MOAException</code> with an error code corresponding to
- * the given <code>IAIKException</code>. Returns <code>null</code>, if no
- * mapping could be found.
- */
- protected MOAException createMoaException(Exception iaikException) {
- ExceptionMappingInfo info = lookupMessage(iaikException.getClass());
- Constructor constructor;
-
- if (info == null) {
- return null;
- }
-
- // instantiate the proper MOAException and return it
- try {
- constructor =
- info.getMoaExceptionClass().getConstructor(CONSTRUCTOR_ARGS);
- return (MOAException) constructor.newInstance(
- new Object[] {
- info.getMessageId(),
- new Object[] { iaikException.getMessage()},
- iaikException });
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- * Recursively look up the message associated with an
- * <code>IAIKException</code>.
- *
- * This method walks up the exception inheritance hierarchy until it finds a
- * mapping.
- *
- * @param iaikExceptionClass The <code>IAIKException</code> to look up.
- * @return Information about the message id and
- * <code>MOAException</code> class that the <code>iaikExceptionClass</code>
- * maps to. If no mapping could be found, <code>null</code> is returned.
- */
- protected ExceptionMappingInfo lookupMessage(Class iaikExceptionClass) {
- ExceptionMappingInfo info;
-
- // break if
- if (iaikExceptionClass.equals(Exception.class)) {
- return null;
- }
-
- // look up the exception class
- info = (ExceptionMappingInfo) messages.get(iaikExceptionClass);
- if (info == null) {
- return lookupMessage(iaikExceptionClass.getSuperclass());
- }
- return info;
- }
-
-}
-
-/**
- * A class containing a mapping from an error message ID to a
- * <code>MOAException</code> class.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-class ExceptionMappingInfo {
- /** The message ID. */
- private String messageId;
- /** The <code>MOAException</code> class. */
- private Class moaExceptionClass;
-
- /**
- * Create a new <code>ExceptionMappingInfo</code>.
- *
- * @param messageId The message ID.
- * @param moaExceptionClass The <code>MOAException</code> class.
- */
- public ExceptionMappingInfo(String messageId, Class moaExceptionClass) {
- this.messageId = messageId;
- this.moaExceptionClass = moaExceptionClass;
- }
-
- /**
- * Return the message ID.
- *
- * @return The message ID.
- */
- public String getMessageId() {
- return messageId;
- }
-
- /**
- * Returns the <code>MOAException</code> class that the message ID maps to.
- *
- * @return The <code>MOAException</code> class.
- */
- public Class getMoaExceptionClass() {
- return moaExceptionClass;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java
deleted file mode 100644
index 0c3b45539..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/InvokerUtils.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.util.XPathException;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.common.ElementSelector;
-
-/**
- * Utility methods for invoking the IAIK MOA modules.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class InvokerUtils {
-
- /**
- * Select the signature parent element.
- *
- * @param root The root DOM element which contains the signature parent
- * element somewhere in its subtree.
- * @param location The <code>ElementSelector</code> containing the XPath
- * expression to select the signature parent element from the document.
- * It is also contains the namespace prefix to URI mapping.
- * @return Element The signature parent element.
- * @throws MOAApplicationException An error occurred evaluating the
- * <code>location</code>.
- */
- public static Element evaluateSignatureLocation(
- Element root,
- ElementSelector location)
- throws MOAApplicationException {
-
- NodeList nodes;
-
- try {
- nodes =
- XPathUtils.selectNodeList(
- root,
- location.getNamespaceDeclarations(),
- location.getXPathExpression());
- } catch (XPathException e) {
- throw new MOAApplicationException(
- "2212",
- new Object[] { location.getXPathExpression()},
- e);
- }
-
- if (nodes.getLength() != 1
- || !(nodes.item(0).getNodeType() == Node.ELEMENT_NODE)) {
- throw new MOAApplicationException(
- "2212",
- new Object[] { location.getXPathExpression()});
- }
- return (Element) nodes.item(0);
- }
-
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ProfileMapper.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ProfileMapper.java
deleted file mode 100644
index 158a3ddb5..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ProfileMapper.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.xmlbind.ProfileParser;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfileID;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileID;
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfile;
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfileID;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfile;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfileID;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-
-/**
- * Map ProfileID objects to their explicit represantation.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ProfileMapper {
-
- /** The parser to parse the profiles. */
- private static ProfileParser profileParser = new ProfileParser();
-
- /**
- * Map a <code>CreateTransformsInfoProfile</code> to a
- * <code>CreateTransformsInfoProfileExplicit</code>.
- *
- * @param profile The profile object to map.
- * @param config The MOA configuration to use for looking up the profile.
- * @return <code>profile</code>, if the given profile is of type
- * <code>EXPLICIT_CREATETRANSFORMSINFOPROFILE</code>, otherwise the profile
- * that is looked up and parsed from the configuration.
- * @throws MOAApplicationException An error occurred parsing the profile.
- */
- public static CreateTransformsInfoProfileExplicit mapCreateTransformsInfoProfile(
- CreateTransformsInfoProfile profile,
- ConfigurationProvider config)
- throws MOAApplicationException {
-
- switch (profile.getCreateTransformsInfoProfileType()) {
- case CreateTransformsInfoProfile.EXPLICIT_CREATETRANSFORMSINFOPROFILE :
- return (CreateTransformsInfoProfileExplicit) profile;
-
- case CreateTransformsInfoProfile.ID_CREATETRANSFORMSINFOPROFILE :
- CreateTransformsInfoProfileID profileIdObj =
- (CreateTransformsInfoProfileID) profile;
- String profileID = profileIdObj.getCreateTransformsInfoProfileID();
- Element profileElem = config.getCreateTransformsInfoProfile(profileID);
-
- if (profileElem == null) {
- throw new MOAApplicationException("2234", new Object[] { profileID });
- }
-
- return (
- CreateTransformsInfoProfileExplicit) profileParser
- .parseCreateTransformsInfoProfile(
- profileElem);
- }
- return null; // this will not happen
- }
-
- /**
- * Map a <code>CreateSignatureEnvironmentProfile</code> to a
- * <code>CreateSignatureEnvironmentProfileExplicit</code>.
- *
- * @param profile The profile object to map.
- * @param config The MOA configuration to use for looking up the profile.
- * @return <code>profile</code>, if the given profile is of type
- * <code>EXPLICIT_CREATESIGNATUREENVIRONMENTPROFILE</code>, otherwise the
- * profile that is looked up and parsed from the configuration.
- * @throws MOAApplicationException An error occurred parsing the profile.
- */
- public static CreateSignatureEnvironmentProfileExplicit mapCreateSignatureEnvironmentProfile(
- CreateSignatureEnvironmentProfile profile,
- ConfigurationProvider config)
- throws MOAApplicationException {
-
- switch (profile.getCreateSignatureEnvironmentProfileType()) {
- case CreateSignatureEnvironmentProfile
- .EXPLICIT_CREATESIGNATUREENVIRONMENTPROFILE :
-
- return (CreateSignatureEnvironmentProfileExplicit) profile;
-
- case CreateSignatureEnvironmentProfile
- .ID_CREATESIGNATUREENVIRONMENTPROFILE :
-
- CreateSignatureEnvironmentProfileID profileIdObj =
- (CreateSignatureEnvironmentProfileID) profile;
- String profileID =
- profileIdObj.getCreateSignatureEnvironmentProfileID();
- Element profileElem =
- config.getCreateSignatureEnvironmentProfile(profileID);
-
- if (profileElem == null) {
- throw new MOAApplicationException("2236", new Object[] { profileID });
- }
-
- return (
- CreateSignatureEnvironmentProfileExplicit) profileParser
- .parseCreateSignatureEnvironmentProfile(
- profileElem);
-
- }
- return null;
-
- }
-
- /**
- * Map a <code>List</code> of <code>SupplementProfile</code>s to their
- * explicit representation.
- *
- * @param profiles The profiles to map.
- * @param config The MOA configuration to use for looking up profiles.
- * @return The mapped profiles.
- * @throws MOAApplicationException An error occurred mapping one of the
- * profiles.
- */
- public static List mapSupplementProfiles(
- List profiles,
- ConfigurationProvider config)
- throws MOAApplicationException {
-
- List mappedProfiles = new ArrayList();
- Iterator iter;
-
- for (iter = profiles.iterator(); iter.hasNext();) {
- SupplementProfile profile = (SupplementProfile) iter.next();
- mappedProfiles.add(mapSupplementProfile(profile, config));
- }
-
- return mappedProfiles;
- }
-
- /**
- * Map a <code>SupplementProfile</code> to a
- * <code>SupplementProfileExplicit</code>.
- *
- * @param profile The profile object to map.
- * @param config The MOA configuration to use for looking up the profile.
- * @return <code>profile</code>, if the given profile is of type
- * <code>EXPLICIT_SUPPLEMENTPROFILE</code>, otherwise the
- * profile that is looked up and parsed from the configuration.
- * @throws MOAApplicationException An error occurred parsing the profile.
- */
- public static SupplementProfileExplicit mapSupplementProfile(
- SupplementProfile profile,
- ConfigurationProvider config)
- throws MOAApplicationException {
-
- switch (profile.getSupplementProfileType()) {
- case SupplementProfile.EXPLICIT_SUPPLEMENTPROFILE :
- return (SupplementProfileExplicit) profile;
-
- case SupplementProfile.ID_SUPPLEMENTPROFILE :
- SupplementProfileID profileIdObj = (SupplementProfileID) profile;
- String profileID = profileIdObj.getSupplementProfileID();
- Element profileElem = config.getSupplementProfile(profileID);
-
- if (profileElem == null) {
- throw new MOAApplicationException("2267", new Object[] { profileID });
- }
-
- return (
- SupplementProfileExplicit) profileParser.parseSupplementProfile(
- profileElem);
- }
-
- return null;
- }
-
- /**
- * Map a <code>List</code> of <code>VerifyTransformsInfoProfile</code>s to
- * their explicit representation.
- *
- * @param profiles The profiles to map.
- * @param config The MOA configuration to use for looking up profiles.
- * @return The mapped profiles.
- * @throws MOAApplicationException An error occurred mapping one of the
- * profiles.
- */
- public static List mapVerifyTransformsInfoProfiles(
- List profiles,
- ConfigurationProvider config)
- throws MOAApplicationException {
-
- List mappedProfiles = new ArrayList();
- Iterator iter;
-
- for (iter = profiles.iterator(); iter.hasNext();) {
- VerifyTransformsInfoProfile profile =
- (VerifyTransformsInfoProfile) iter.next();
- mappedProfiles.add(mapVerifyTransformsInfoProfile(profile, config));
- }
-
- return mappedProfiles;
- }
-
- /**
- * Map a <code>VerifyTransformsInfoProfile</code> to a
- * <code>VerifyTransformsInfoProfileExplicit</code>.
- *
- * @param profile The profile object to map.
- * @param config The MOA configuration to use for looking up the profile.
- * @return <code>profile</code>, if the given profile is of type
- * <code>EXPLICIT_VERIFYTRANSFORMSINFOPROFILE</code>, otherwise the
- * profile that is looked up and parsed from the configuration.
- * @throws MOAApplicationException An error occurred parsing the profile.
- */
- public static VerifyTransformsInfoProfileExplicit mapVerifyTransformsInfoProfile(
- VerifyTransformsInfoProfile profile,
- ConfigurationProvider config)
- throws MOAApplicationException {
-
- switch (profile.getVerifyTransformsInfoProfileType()) {
- case VerifyTransformsInfoProfile.EXPLICIT_VERIFYTRANSFORMSINFOPROFILE :
- return (VerifyTransformsInfoProfileExplicit) profile;
-
- case VerifyTransformsInfoProfile.ID_VERIFYTRANSFORMSINFOPROFILE :
- VerifyTransformsInfoProfileID profileIdObj =
- (VerifyTransformsInfoProfileID) profile;
- String profileID = profileIdObj.getVerifyTransformsInfoProfileID();
- Element profileElem =
- config.getVerifyTransformsInfoProfile(profileID);
-
- if (profileElem == null) {
- throw new MOAApplicationException("2268", new Object[] { profileID });
- }
-
- return (
- VerifyTransformsInfoProfileExplicit) profileParser
- .parseVerifyTransformsInfoProfile(
- profileElem);
- }
-
- return null;
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java
deleted file mode 100644
index 11f05a2f1..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/ServiceContextUtils.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-
-/**
- * A utility class for setting up and tearing down thread-local context
- * information needed for calling the <code>Invoker</code> classes.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ServiceContextUtils {
-
- /**
- * Set up the thread-local context information needed for calling the various
- * <code>Invoker</code> classes.
- *
- * @throws ConfigurationException An error occurred setting up the
- * configuration in the <code>TransactionContext</code>.
- */
- public static void setUpContexts() throws ConfigurationException {
- TransactionContextManager txMgr = TransactionContextManager.getInstance();
- LoggingContextManager logMgr = LoggingContextManager.getInstance();
- String transactionID = Thread.currentThread().getName();
-
- if (txMgr.getTransactionContext() == null) {
- TransactionContext ctx = new TransactionContext(transactionID, null, ConfigurationProvider.getInstance());
- txMgr.setTransactionContext(ctx);
- }
-
- if (logMgr.getLoggingContext() == null) {
- LoggingContext ctx = new LoggingContext(transactionID);
- logMgr.setLoggingContext(ctx);
- }
- }
-
- /**
- * Tear down thread-local context information.
- */
- public static void tearDownContexts() {
- TransactionContextManager.getInstance().setTransactionContext(null);
- LoggingContextManager.getInstance().setLoggingContext(null);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureCreationServiceImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureCreationServiceImpl.java
deleted file mode 100644
index dc5ceb21e..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureCreationServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.util.Collections;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.api.Configurator;
-import at.gv.egovernment.moa.spss.api.SignatureCreationService;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-
-/**
- * An implementation of the <code>SignatureCreationService</code>, using
- * the <code>XMLSignatureCreationInvoker</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class SignatureCreationServiceImpl extends SignatureCreationService {
-
- /**
- * Create an XML signature.
- *
- * @param request The <code>CreateXMLSignatureRequest</code> containing
- * information about the signature(s) to create.
- * @return The created signature(s).
- * @throws MOAException An error occurred creating the signature(s).
- */
- public CreateXMLSignatureResponse createXMLSignature(CreateXMLSignatureRequest request)
- throws MOAException {
-
- XMLSignatureCreationInvoker invoker =
- XMLSignatureCreationInvoker.getInstance();
- CreateXMLSignatureResponse response;
-
- try {
- Configurator.getInstance().init();
- ServiceContextUtils.setUpContexts();
- response = invoker.createXMLSignature(request, Collections.EMPTY_SET);
- return response;
- } finally {
- ServiceContextUtils.tearDownContexts();
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureVerificationServiceImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureVerificationServiceImpl.java
deleted file mode 100644
index 94cdea5d9..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/SignatureVerificationServiceImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.api.Configurator;
-import at.gv.egovernment.moa.spss.api.SignatureVerificationService;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-
-/**
- * An implementation of the <code>SignatureVerificationService</code> using
- * the <code>XMLSignatureVerificationInvoker</code> and the
- * <code>CMSSignatureVerificationInvoker</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class SignatureVerificationServiceImpl
- extends SignatureVerificationService {
-
- /**
- * Verify a CMS signature.
- *
- * @param request The <code>VerifyCMSSignatureRequest</code> containing
- * information about the signature verification.
- * @return The result of the signature verification.
- * @throws MOAException An error occurred during signature verification.
- */
- public VerifyCMSSignatureResponse verifyCMSSignature(VerifyCMSSignatureRequest request)
- throws MOAException {
-
- CMSSignatureVerificationInvoker invoker =
- CMSSignatureVerificationInvoker.getInstance();
- VerifyCMSSignatureResponse response;
-
- try {
- Configurator.getInstance().init();
- ServiceContextUtils.setUpContexts();
- response = invoker.verifyCMSSignature(request);
- return response;
- } finally {
- ServiceContextUtils.tearDownContexts();
- }
- }
-
- /**
- * Verify an XML signature.
- *
- * @param request The <code>VerifyXMLSignatureRequest</code> containinig
- * information about the signature verification.
- * @return The result of the signature verification.
- * @throws MOAException An error occurred during signature verification.
- */
- public VerifyXMLSignatureResponse verifyXMLSignature(VerifyXMLSignatureRequest request)
- throws MOAException {
-
- XMLSignatureVerificationInvoker invoker =
- XMLSignatureVerificationInvoker.getInstance();
- VerifyXMLSignatureResponse response;
-
- try {
- Configurator.getInstance().init();
- ServiceContextUtils.setUpContexts();
- response = invoker.verifyXMLSignature(request);
- return response;
- } finally {
- ServiceContextUtils.tearDownContexts();
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/TransformationFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/TransformationFactory.java
deleted file mode 100644
index 9984a95a5..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/TransformationFactory.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import iaik.server.modules.xml.Base64Transformation;
-import iaik.server.modules.xml.Canonicalization;
-import iaik.server.modules.xml.EnvelopedSignatureTransformation;
-import iaik.server.modules.xml.Transformation;
-import iaik.server.modules.xml.XPath2Transformation;
-import iaik.server.modules.xml.XPathTransformation;
-import iaik.server.modules.xml.XSLTTransformation;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.common.ExclusiveCanonicalizationTransform;
-import at.gv.egovernment.moa.spss.api.common.Transform;
-import at.gv.egovernment.moa.spss.api.common.XPathFilter;
-import at.gv.egovernment.moa.spss.api.common.XPathFilter2Transform;
-import at.gv.egovernment.moa.spss.api.common.XPathTransform;
-import at.gv.egovernment.moa.spss.api.common.XSLTTransform;
-import at.gv.egovernment.moa.spss.server.iaik.xml.Base64TransformationImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.CanonicalizationImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.EnvelopedSignatureTransformationImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.ExclusiveCanonicalizationImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XPath2FilterImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XPath2TransformationImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XPathTransformationImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XSLTTransformationImpl;
-
-/**
- * A factory to create <code>Transformation</code> objects from
- * <code>Transform</code> objects.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class TransformationFactory {
-
-
- /** The single instance of this class. */
- private static TransformationFactory instance = null;
-
- /** Maps <code>XPathFilter</code> filter types to
- * <code>XPath2Transformation</code> filter types. */
- private static Map FILTER_TYPE_MAPPING;
-
- static {
- FILTER_TYPE_MAPPING = new HashMap();
-
- FILTER_TYPE_MAPPING.put(
- XPathFilter.INTERSECT_TYPE,
- XPath2Transformation.XPath2Filter.INTERSECTION);
- FILTER_TYPE_MAPPING.put(
- XPathFilter.SUBTRACT_TYPE,
- XPath2Transformation.XPath2Filter.SUBTRACTION);
- FILTER_TYPE_MAPPING.put(
- XPathFilter.UNION_TYPE,
- XPath2Transformation.XPath2Filter.UNION);
- }
-
- /**
- * Get the single instance of the factory.
- *
- * @return TransformationFactory The single instance.
- */
- public static synchronized TransformationFactory getInstance() {
- if (instance == null) {
- instance = new TransformationFactory();
- }
- return instance;
- }
-
- /**
- * Create a new <code>TransformationFactory</code>.
- *
- * Protected to disallow multiple instances.
- */
- protected TransformationFactory() {
- }
-
- /**
- * Create a <code>Transformation</code> based on a
- * <code>Transform</code> object.
- *
- * @param transform The <code>Transform</code> object to extract
- * transformation data from.
- * @return The transformation contained in the <code>transform</code>
- * object.
- * @throws MOAApplicationException An error occured creating the
- * <code>Transformation</code>. See exception message for details.
- */
- public Transformation createTransformation(Transform transform)
- throws MOAApplicationException {
- String algorithmUri = transform.getAlgorithmURI();
-
- if (Canonicalization.CANONICAL_XML.equals(algorithmUri)
- || Canonicalization.CANONICAL_XML_WITH_COMMENTS.equals(algorithmUri)) {
- return createC14nTransformation(algorithmUri);
- } else if (
- Canonicalization.EXCLUSIVE_CANONICAL_XML.equals(algorithmUri)
- || Canonicalization.EXCLUSIVE_CANONICAL_XML_WITH_COMMENTS.equals(
- algorithmUri)) {
-
- return createExclusiveC14nTransformation(
- (ExclusiveCanonicalizationTransform) transform);
-
- } else if (Base64Transformation.ALL.contains(algorithmUri)) {
- return createBase64Transformation();
- } else if (EnvelopedSignatureTransformation.ALL.contains(algorithmUri)) {
- return createEnvelopedSignatureTransformation();
- } else if (XPathTransformation.ALL.contains(algorithmUri)) {
- return createXPathTransformation((XPathTransform) transform);
- } else if (XPath2Transformation.ALL.contains(algorithmUri)) {
- return createXPath2Transformation((XPathFilter2Transform) transform);
- } else if (XSLTTransformation.ALL.contains(algorithmUri)) {
- return createXSLTTransformation((XSLTTransform) transform);
- } else {
- throw new MOAApplicationException("1108", new Object[] { algorithmUri });
- }
- }
-
- /**
- * Create a <code>List</code> of <code>Transformation</code>s from a
- * <code>List</code> of <code>Transform</code>s.
- *
- * @param transforms The <code>List</code> containing the
- * <code>Transform</code>s.
- * @return The <code>List</code> of <code>Transformation</code>s corresponding
- * to the <code>transforms</code>.
- * @throws MOAApplicationException An error occurred building one of the
- * transformations. See exception message for details.
- */
- public List createTransformationList(List transforms)
- throws MOAApplicationException {
- List transformationList = new ArrayList();
- Iterator trIter;
-
- for (trIter = transforms.iterator(); trIter.hasNext();) {
- Transform transform = (Transform) trIter.next();
- transformationList.add(createTransformation(transform));
- }
-
- return transformationList;
- }
-
- /**
- * Create a <code>Canonicalization</code>.
- *
- * @param algorithmUri The algorithm URI of the canonicalization.
- * @return The <code>Canonicalization</code>.
- */
- private Transformation createC14nTransformation(String algorithmUri) {
- return new CanonicalizationImpl(algorithmUri);
- }
-
- /**
- * Create a <code>ExclusiveCanonicalization</code>.
- *
- * @param transform The <code>ExclusiveCanonicalizationTransform</code>
- * containing the transformation data.
- * @return The <code>ExclusiveCanonicalization</code>.
- */
- private Transformation createExclusiveC14nTransformation(ExclusiveCanonicalizationTransform transform) {
- return new ExclusiveCanonicalizationImpl(
- transform.getAlgorithmURI(),
- transform.getInclusiveNamespacePrefixes());
- }
-
- /**
- * Create a <code>Base64Transformation</code>.
- *
- * @return The <code></code>
- */
- private Transformation createBase64Transformation() {
- return new Base64TransformationImpl();
- }
-
- /**
- * Create an <code>EnvelopedSignatureTransformation</code>.
- *
- * @return An <code>EnvelopedSignatureTransformation</code>.
- */
- private Transformation createEnvelopedSignatureTransformation() {
- return new EnvelopedSignatureTransformationImpl();
- }
-
- /**
- * Create an <code>XPathTransformation</code>.
- *
- * @param transform The <code>Transform</code> object containing the
- * XPath transformation.
- * @return An <code>XPathTransformation</code> corresponding the
- * transformation given in <code>transform</code>.
- * @throws MOAApplicationException An error occurred creating the
- * <code>Transformation</code>.
- */
- private Transformation createXPathTransformation(XPathTransform transform)
- throws MOAApplicationException {
-
- return new XPathTransformationImpl(
- transform.getXPathExpression(),
- transform.getNamespaceDeclarations());
- }
-
- /**
- * Create an <code>XPath2Transformation</code>.
- *
- * @param transform The <code>Transform</code> object containing the
- * XPath filter transformation.
- * @return An <code>XPath2Transformation</code> corresponding the
- * transformation given in <code>transform</code>.
- * @throws MOAApplicationException An error occurred creating the
- * <code>Transformation</code>.
- */
- private Transformation createXPath2Transformation(XPathFilter2Transform transform)
- throws MOAApplicationException {
-
- XPath2TransformationImpl xpath2 = new XPath2TransformationImpl();
- Iterator iter;
-
- for (iter = transform.getFilters().iterator(); iter.hasNext();) {
- XPathFilter filter = (XPathFilter) iter.next();
- String mappedFilterType =
- (String) FILTER_TYPE_MAPPING.get(filter.getFilterType());
- XPath2FilterImpl mappedFilter =
- new XPath2FilterImpl(
- mappedFilterType,
- filter.getXPathExpression(),
- filter.getNamespaceDeclarations());
- xpath2.addXPathFilter(mappedFilter);
- }
-
- if (xpath2.getXPathFilters().size() == 0) {
- throw new MOAApplicationException("2216", null);
- }
-
- return xpath2;
- }
-
- /**
- * Create an <code>XSLTTransformation</code>.
- *
- * @param transform The <code>Transform</code> containing the XSLT stylesheet.
- * @return An <code>XSLTTransformation</code> corresponding the transformation
- * given in <code>transform</code>.
- * @throws MOAApplicationException An error occurred creating the
- * <code>Transformation</code>.
- */
- private Transformation createXSLTTransformation(XSLTTransform transform)
- throws MOAApplicationException {
-
- return new XSLTTransformationImpl(transform.getStylesheet());
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
deleted file mode 100644
index 55e2e1505..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-
-import iaik.server.modules.cmsverify.CMSSignatureVerificationResult;
-import iaik.server.modules.cmsverify.CertificateValidationResult;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-
-/**
- * A class to build a <code>VerifyCMSSignatureResponse</code> object.
- *
- * <p>Via subsequent calls to <code>addResult()</code> a number of results from
- * a CMS signature verification can be added to the response.</p>
- *
- * <p>The <code>getResponseElement()</code> method then returns the
- * <code>VerifyCMSSignatureResponse</code> built so far.</p>
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class VerifyCMSSignatureResponseBuilder {
- /** The <code>SPSSFactory</code> for creating API objects. */
- private SPSSFactory factory = SPSSFactory.getInstance();
- /** The elements making up the response. */
- private List responseElements = new ArrayList();
-
- /**
- * Get the <code>VerifyCMSSignatureResponse</code> built so far.
- *
- * @return The <code>VerifyCMSSignatureResponse</code> built so far.
- */
- public VerifyCMSSignatureResponse getResponse() {
- return factory.createVerifyCMSSignatureResponse(responseElements);
- }
-
- /**
- * Add a verification result to the response.
- *
- * @param result The result to add.
- * @throws MOAApplicationException An error occurred adding the result.
- */
- public void addResult(CMSSignatureVerificationResult result)
- throws MOAApplicationException {
-
- CertificateValidationResult certResult =
- result.getCertificateValidationResult();
- int signatureCheckCode =
- result.getSignatureValueVerificationCode().intValue();
- int certificateCheckCode = certResult.getValidationResultCode().intValue();
- VerifyCMSSignatureResponseElement responseElement;
- SignerInfo signerInfo;
- CheckResult signatureCheck;
- CheckResult certificateCheck;
-
- // add SignerInfo element
- signerInfo =
- factory.createSignerInfo(
- (X509Certificate) certResult.getCertificateChain().get(0),
- certResult.isQualifiedCertificate(),
- certResult.isPublicAuthorityCertificate(),
- certResult.getPublicAuthorityID());
-
- // add SignatureCheck element
- signatureCheck = factory.createCheckResult(signatureCheckCode, null);
-
- // add CertificateCheck element
- certificateCheck = factory.createCheckResult(certificateCheckCode, null);
-
- // build the response element
- responseElement =
- factory.createVerifyCMSSignatureResponseElement(
- signerInfo,
- signatureCheck,
- certificateCheck);
- responseElements.add(responseElement);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
deleted file mode 100644
index d6f58a560..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
+++ /dev/null
@@ -1,437 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import iaik.ixsil.algorithms.CanonicalizationAlgorithm;
-import iaik.ixsil.algorithms.CanonicalizationAlgorithmImplExclusiveCanonicalXMLWithComments;
-import iaik.server.modules.xml.BinaryDataObject;
-import iaik.server.modules.xml.DataObject;
-import iaik.server.modules.xml.XMLDataObject;
-import iaik.server.modules.xml.XMLNodeListDataObject;
-import iaik.server.modules.xmlverify.CertificateValidationResult;
-import iaik.server.modules.xmlverify.DsigManifest;
-import iaik.server.modules.xmlverify.HashUnavailableException;
-import iaik.server.modules.xmlverify.ReferenceData;
-import iaik.server.modules.xmlverify.ReferenceInfo;
-import iaik.server.modules.xmlverify.SecurityLayerManifest;
-import iaik.server.modules.xmlverify.XMLSignatureVerificationProfile;
-import iaik.server.modules.xmlverify.XMLSignatureVerificationResult;
-import iaik.x509.X509Certificate;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.NodeList;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.InputData;
-import at.gv.egovernment.moa.spss.api.common.SignerInfo;
-import at.gv.egovernment.moa.spss.api.impl.InputDataBinaryImpl;
-import at.gv.egovernment.moa.spss.api.impl.InputDataXMLImpl;
-import at.gv.egovernment.moa.spss.api.xmlverify.ManifestRefsCheckResultInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResultInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.util.CollectionUtils;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.NodeListAdapter;
-
-/**
- * A class to build a <code>VerifyXMLSignatureResponse</code> object.
- *
- * <p>Via a call to <code>addResult()</code> the only result of the
- * signature verification must be added.</p>
- *
- * <p>The <code>getResponseElement()</code> method then returns the
- * <code>VerifyXMLSignatureResponse</code> built so far.</p>
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class VerifyXMLSignatureResponseBuilder {
-
- /** The <code>SPSSFactory</code> for creating API objects. */
- private SPSSFactory factory = SPSSFactory.getInstance();
-
- /** Information about the signer certificate. */
- private SignerInfo signerInfo;
- /** The hash input data. */
- private List hashInputDatas;
- /** The reference input data. */
- private List referenceInputDatas;
- /** The result of the signature check. */
- private ReferencesCheckResult signatureCheck;
- /** The result of the signature manifest check. */
- private ReferencesCheckResult signatureManifestCheck;
- /** The result of the XMLDsig manifest check. */
- private List xmlDsigManifestChecks;
- /** The result of the certificate check. */
- private CheckResult certificateCheck;
-
- /**
- * Get the <code>VerifyMLSignatureResponse</code> built so far.
- *
- * @return The <code>VerifyXMLSignatureResponse</code> built so far.
- */
- public VerifyXMLSignatureResponse getResponse() {
- return factory.createVerifyXMLSignatureResponse(
- signerInfo,
- hashInputDatas,
- referenceInputDatas,
- signatureCheck,
- signatureManifestCheck,
- xmlDsigManifestChecks,
- certificateCheck);
- }
-
- /**
- * Sets the verification result to the response.
- *
- * This method must be called exactly once to ensure a valid
- * <code>VerifyXMLSignatureResponse</code>.
- *
- * @param result The result to set for the response.
- * @param profile The profile used for verifying the signature.
- * @param transformsSignatureManifestCheck The overall result for the signature
- * manifest check.
- * @param certificateCheck The overall result for the certificate check.
- * @throws MOAApplicationException An error occurred adding the result.
- */
- public void setResult(
- XMLSignatureVerificationResult result,
- XMLSignatureVerificationProfile profile,
- ReferencesCheckResult transformsSignatureManifestCheck,
- CheckResult certificateCheck)
- throws MOAApplicationException {
-
- CertificateValidationResult certResult =
- result.getCertificateValidationResult();
- List referenceDataList;
- ReferenceData referenceData;
- List dsigManifestList;
- ReferencesCheckResultInfo checkResultInfo;
- int[] failedReferences;
- Iterator iter;
-
- // create the SignerInfo;
- signerInfo =
- factory.createSignerInfo(
- (X509Certificate) certResult.getCertificateChain().get(0),
- certResult.isQualifiedCertificate(),
- certResult.isPublicAuthorityCertificate(),
- certResult.getPublicAuthorityID());
-
- // Create HashInputData Content objects
- referenceDataList = result.getReferenceDataList();
- if (profile.includeHashInputData()) {
- hashInputDatas = new ArrayList();
-
- // Include SignedInfo references
- addHashInputDatas(
- hashInputDatas,
- referenceDataList,
- InputData.CONTAINER_SIGNEDINFO_,
- InputData.REFERER_NONE_);
-
- // Include XMLDSIGManifest references
- List xMLDSIGManifests = result.getDsigManifestList();
- for (iter = xMLDSIGManifests.iterator(); iter.hasNext();)
- {
- DsigManifest currentMF = (DsigManifest) iter.next();
- List xMLDSIGMFReferenceDataList = currentMF.getReferenceDataList();
- addHashInputDatas(
- hashInputDatas,
- xMLDSIGMFReferenceDataList,
- InputData.CONTAINER_XMLDSIGMANIFEST_,
- currentMF.getReferringReferenceInfo().getReferenceIndex());
- }
- }
-
- // Create the ReferenceInputData Content objects
- if (profile.includeReferenceInputData()) {
- referenceInputDatas = new ArrayList();
-
- // Include SignedInfo references
- addReferenceInputDatas(
- referenceInputDatas,
- referenceDataList,
- InputData.CONTAINER_SIGNEDINFO_,
- InputData.REFERER_NONE_);
-
- // Include XMLDSIGManifest references
- List xMLDSIGManifests = result.getDsigManifestList();
- for (iter = xMLDSIGManifests.iterator(); iter.hasNext();)
- {
- DsigManifest currentMF = (DsigManifest) iter.next();
- List xMLDSIGMFReferenceDataList = currentMF.getReferenceDataList();
- addReferenceInputDatas(
- referenceInputDatas,
- xMLDSIGMFReferenceDataList,
- InputData.CONTAINER_XMLDSIGMANIFEST_,
- currentMF.getReferringReferenceInfo().getReferenceIndex());
- }
- }
-
- // create the signature check
- failedReferences = buildFailedReferences(result.getReferenceDataList());
- checkResultInfo =
- failedReferences != null
- ? factory.createReferencesCheckResultInfo(null, failedReferences)
- : null;
- signatureCheck =
- factory.createReferencesCheckResult(
- result.getSignatureValueVerificationCode().intValue(),
- checkResultInfo);
-
- // create the signature manifest check
- if (profile.checkSecurityLayerManifest())
- {
- if (transformsSignatureManifestCheck.getCode() == 1)
- {
- // checking the transforms failed
- signatureManifestCheck = transformsSignatureManifestCheck;
- }
- else if (result.isSecurityLayerManifestRequired())
- {
- if (!result.containsSecurityLayerManifest())
- {
- // required security layer manifest is missing in signature
- signatureManifestCheck = factory.createReferencesCheckResult(2, null);
- }
- else
- {
- // security layer manifest exists, so we have to check its validity
- SecurityLayerManifest slManifest = result.getSecurityLayerManifest();
- int verificationResult = slManifest.getManifestVerificationResult().intValue();
-
- if (SecurityLayerManifest.CODE_MANIFEST_VALID.intValue() == verificationResult)
- {
- // security layer manifest exists and is free of errors
- signatureManifestCheck = factory.createReferencesCheckResult(0, null);
- }
- else
- {
- // security layer manifest exists, but has errors
- failedReferences = buildFailedReferences(slManifest.getReferenceDataList());
- checkResultInfo = (failedReferences != null)
- ? factory.createReferencesCheckResultInfo(null, failedReferences)
- : null;
- if (SecurityLayerManifest.CODE_MANIFEST_INCOMPLETE.intValue() == verificationResult)
- {
- signatureManifestCheck = factory.createReferencesCheckResult(3, checkResultInfo);
- }
- else if (SecurityLayerManifest.CODE_REFERENCE_HASH_INVALID.intValue() == verificationResult)
- {
- signatureManifestCheck = factory.createReferencesCheckResult(4, checkResultInfo);
- }
- else
- {
- // Should not happen
- throw new RuntimeException("Unexpected result from security layer manifest verification.");
- }
- }
- }
- }
- else
- {
- // no security layer manifest is required, so the signature manifest check is ok
- signatureManifestCheck = factory.createReferencesCheckResult(0, null);
- }
- }
-
- // create the xmlDsigManifestCheck
- if (profile.checkXMLDsigManifests()) {
- xmlDsigManifestChecks = new ArrayList();
- dsigManifestList = result.getDsigManifestList();
- for (iter = dsigManifestList.iterator(); iter.hasNext();) {
- DsigManifest dsigManifest = (DsigManifest) iter.next();
- int refIndex =
- dsigManifest.getReferringReferenceInfo().getReferenceIndex();
- ManifestRefsCheckResultInfo manifestCheckResultInfo;
-
- failedReferences =
- buildFailedReferences(dsigManifest.getReferenceDataList());
- manifestCheckResultInfo =
- factory.createManifestRefsCheckResultInfo(
- null,
- failedReferences,
- refIndex);
- xmlDsigManifestChecks.add(
- factory.createManifestRefsCheckResult(
- dsigManifest.getManifestVerificationResult().intValue(),
- manifestCheckResultInfo));
- }
- }
-
- // create the certificate check
- this.certificateCheck = certificateCheck;
- }
-
- /**
- * Adds {@link InputData} entries to the specified <code>inputDatas</code> list. The content of the entry will
- * be created from {@link ReferenceData#getHashInputData()}.
- *
- * @param inputDatas The list to be amended.
- *
- * @param referenceDataList The list of {@link ReferenceData} objects to be investigated.
- *
- * @param containerType The type of container of the {@link InputData} objects to be created.
- *
- * @param refererNumber The number of the referring reference for the {@link InputData} objects to be created.
- *
- * @throws MOAApplicationException if creating an {@link InputData} fails.
- */
- private void addHashInputDatas(List inputDatas, List referenceDataList, String containerType, int refererNumber)
- throws MOAApplicationException
- {
- for (Iterator iter = referenceDataList.iterator(); iter.hasNext();)
- {
- ReferenceData referenceData = (ReferenceData) iter.next();
- inputDatas.add(buildInputData(
- referenceData.getHashInputData(),
- containerType,
- refererNumber));
- }
- }
-
- /**
- * Adds {@link InputData} entries to the specified <code>inputDatas</code> list. The content of the entry will
- * be created from {@link ReferenceData#getReferenceInputData()}.
- *
- * @param inputDatas The list to be amended.
- *
- * @param referenceDataList The list of {@link ReferenceData} objects to be investigated.
- *
- * @param containerType The type of container of the {@link InputData} objects to be created.
- *
- * @param refererNumber The number of the referring reference for the {@link InputData} objects to be created.
- *
- * @throws MOAApplicationException if creating an {@link InputData} fails.
- */
- private void addReferenceInputDatas(List inputDatas, List referenceDataList, String containerType, int refererNumber)
- throws MOAApplicationException
- {
- for (Iterator iter = referenceDataList.iterator(); iter.hasNext();)
- {
- ReferenceData referenceData = (ReferenceData) iter.next();
- inputDatas.add(buildInputData(
- referenceData.getReferenceInputData(),
- containerType,
- refererNumber));
- }
- }
-
- /**
- * Build a <code>InputDataBinaryImpl</code> or an <code>InputDataXMLImpl</code>
- * object from the given <code>DataObject</code> and the given attributes.
- *
- * @param dataObject The <code>DataObject</code> from which to build the result.
- * Based on the type of this parameter, the type of the result will either be
- * <code>InputDataBinaryImpl</code> or <code>InputDataXMLImpl</code>.
- *
- * @param partof see {@link InputData}
- *
- * @param referringReferenceNumber see {@link InputData}
- *
- * @return The corresponinding input data implementation.
- *
- * @throws MOAApplicationException An error occurred creating the result.
- */
- private Content buildInputData(DataObject dataObject, String partOf, int referringReferenceNumber)
- throws MOAApplicationException {
-
- if (dataObject instanceof BinaryDataObject) {
- BinaryDataObject binaryData = (BinaryDataObject) dataObject;
- return new InputDataBinaryImpl(
- factory.createContent(binaryData.getInputStream(), null),
- partOf,
- referringReferenceNumber);
- } else if (dataObject instanceof XMLDataObject) {
- XMLDataObject xmlData = (XMLDataObject) dataObject;
- List nodes = new ArrayList();
-
- nodes.add(xmlData.getElement());
- return new InputDataXMLImpl(
- factory.createContent(new NodeListAdapter(nodes), null),
- partOf,
- referringReferenceNumber);
- } else { // dataObject instanceof XMLNodeListDataObject
- // if the data in the NodeList can be converted back to valid XML,
- // write it as XMLContent; otherwise, write it as Base64Content
- XMLNodeListDataObject nodeData = (XMLNodeListDataObject) dataObject;
- NodeList nodes = nodeData.getNodeList();
-
- if (DOMUtils.checkAttributeParentsInNodeList(nodes)) {
- // insert as XMLContent
- try {
- DocumentFragment fragment = DOMUtils.nodeList2DocumentFragment(nodes);
-
- return new InputDataXMLImpl(
- factory.createContent(fragment.getChildNodes(), null),
- partOf,
- referringReferenceNumber);
- } catch (Exception e) {
- // not successful -> fall through to the Base64Content
- }
- }
-
- // insert canonicalized NodeList as binary content
- try {
- CanonicalizationAlgorithm c14n =
- new CanonicalizationAlgorithmImplExclusiveCanonicalXMLWithComments();
- InputStream is;
-
- c14n.setInput(nodes);
- is = c14n.canonicalize();
- return new InputDataBinaryImpl(
- factory.createContent(is, null),
- partOf,
- referringReferenceNumber);
- } catch (Exception e) {
- throw new MOAApplicationException("2200", null);
- }
- }
- }
-
- /**
- * Build the failed references.
- *
- * Failed references are references for which the <code>isHashValid()</code>
- * method returns <code>false</code>.
- *
- * @param refInfos A <code>List</code> containing the
- * <code>ReferenceInfo</code> objects to be checked.
- * @return The indexes of the failed references.
- */
- private int[] buildFailedReferences(List refInfos) {
- List failedReferencesList = new ArrayList();
- int i;
-
- // find out the failed references
- for (i = 0; i < refInfos.size(); i++) {
- ReferenceInfo refInfo = (ReferenceInfo) refInfos.get(i);
-
- try {
- if (refInfo.isHashCalculated() && !refInfo.isHashValid()) {
- failedReferencesList.add(new Integer(i + 1));
- }
- } catch (HashUnavailableException e) {
- // nothing to do here because we called refInfo.isHashCalculated first
- }
- }
-
- // convert to an int array
- if (failedReferencesList.isEmpty()) {
- return null;
- } else {
- int[] failedReferences = CollectionUtils.toIntArray(failedReferencesList);
-
- return failedReferences;
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java
deleted file mode 100644
index fd207ddea..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvoker.java
+++ /dev/null
@@ -1,545 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import iaik.IAIKException;
-import iaik.IAIKRuntimeException;
-import iaik.server.modules.xml.DataObject;
-import iaik.server.modules.xml.XMLDataObject;
-import iaik.server.modules.xml.XMLSignature;
-import iaik.server.modules.xmlsign.XMLSignatureCreationModule;
-import iaik.server.modules.xmlsign.XMLSignatureCreationModuleFactory;
-import iaik.server.modules.xmlsign.XMLSignatureCreationProfile;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-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.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XMLDataObjectImpl;
-import at.gv.egovernment.moa.spss.server.logging.IaikLog;
-import at.gv.egovernment.moa.spss.server.logging.TransactionId;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.server.util.IdGenerator;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * A class providing an API based interface to the
- * <code>XMLSignatureCreationModule</code>.
- *
- * This class performs the invocation of the
- * <code>iaik.server.modules.xmlsign.XMLSignatureCreationModule</code> from a
- * <code>CreateXMLSignatureRequest</code> given as an API object. The result of
- * the invocation is integrated into a <code>CreateXMLSignatureResponse</code>
- * and returned.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureCreationInvoker {
-
- /** The single instance of this class. */
- private static XMLSignatureCreationInvoker instance = null;
-
- /**
- * Get the only instance of this class.
- *
- * @return The only instance of this class.
- */
- public static synchronized XMLSignatureCreationInvoker getInstance() {
- if (instance == null) {
- instance = new XMLSignatureCreationInvoker();
- }
- return instance;
- }
-
- /**
- * Create a new <code>XMLSignatureCreationInvoker</code>.
- *
- * Protected to disallow multiple instances.
- */
- protected XMLSignatureCreationInvoker() {
- }
-
- /**
- * Process the <code>CreateXMLSignatureRequest<code> message and invoke the
- * <code>XMLSignatureCreationModule</code> for every
- * <code>SingleSignatureInfo</code> contained in the request.
- *
- * @param request A <code>CreateXMLSignatureRequest<code> API object
- * containing the information for creating the signature(s).
- * @param reserved A <code>Set</code> of reserved object IDs.
- *
- * @return A <code>CreateXMLSignatureResponse</code> API object containing
- * the created signature(s). The response contains either a
- * <code>SignatureEnvironment</code> or a <code>ErrorResponse</code>
- * for each <code>SingleSignatureInfo</code> in the request.
- * @throws MOAException An error occurred during signature creation.
- */
- public CreateXMLSignatureResponse createXMLSignature(
- CreateXMLSignatureRequest request,
- Set reserved)
- throws MOAException {
-
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- LoggingContext loggingCtx =
- LoggingContextManager.getInstance().getLoggingContext();
- reserved = new HashSet(reserved);
- XMLSignatureCreationProfileFactory profileFactory =
- new XMLSignatureCreationProfileFactory(request, reserved);
- CreateXMLSignatureResponseBuilder responseBuilder =
- new CreateXMLSignatureResponseBuilder();
- int createCount = 1;
- IdGenerator refIdGen;
- XMLSignatureCreationModule module;
- Iterator singleSignatureInfoIter;
-
- // create the XMLSignatureCreationModule and configure it
- module = XMLSignatureCreationModuleFactory.getInstance();
- module.setLog(new IaikLog(loggingCtx.getNodeID()));
-
- // select the SingleSignatureInfo elements
- singleSignatureInfoIter = request.getSingleSignatureInfos().iterator();
-
- // iterate over all the SingleSignatureInfo elements in the request
- while (singleSignatureInfoIter.hasNext()) {
- SingleSignatureInfo singleSignatureInfo =
- (SingleSignatureInfo) singleSignatureInfoIter.next();
- CreateSignatureInfo createSignatureInfo;
- List dataObjectList;
- XMLSignatureCreationProfile profile;
- XMLDataObject signatureEnvironment;
- XMLDataObject signatureParent;
- XMLSignature signature;
- List additionalSignedProperties;
- Node signatureEnvironmentParent = null;
- Element requestElement = null;
-
- try {
-
- // build the signature environment
- createSignatureInfo = singleSignatureInfo.getCreateSignatureInfo();
- if (createSignatureInfo != null) {
- DataObjectFactory dataObjFactory = DataObjectFactory.getInstance();
-
- signatureEnvironment =
- dataObjFactory.createSignatureEnvironment(
- createSignatureInfo.getCreateSignatureEnvironment(),
- getCreateSignatureEnvironmentProfileSupplements(singleSignatureInfo));
- } else {
- signatureEnvironment = null;
- }
-
- HashSet sigInfoReservedIDs = new HashSet();
- if (signatureEnvironment != null)
- {
- // Find Id attributes of existing XML signatures in signature environment
- HashMap nSMap = new HashMap();
- String dsp = Constants.DSIG_PREFIX;
- nSMap.put(dsp, Constants.DSIG_NS_URI);
- String xPathExpr = "//" + dsp + ":Signature/@Id | //" + dsp + ":Reference/@Id | //"
- + dsp + ":Object/@Id | //" + dsp + ":Manifest/@Id";
- NodeList idAttrs = XPathUtils.selectNodeList(signatureEnvironment.getElement(), nSMap, xPathExpr);
-
- // Add found Id attributes to set of reserved IDs
- for (int i = 0; i < idAttrs.getLength(); i++) sigInfoReservedIDs.add(idAttrs.item(i).getNodeValue());
- }
-
- // create the reference id generator
- HashSet allReservedIDs = new HashSet(reserved);
- allReservedIDs.addAll(sigInfoReservedIDs);
- refIdGen = new IdGenerator("reference-" + createCount++, allReservedIDs);
-
- // build the list of DataObjects
- List createTransformsProfiles = profileFactory.getCreateTransformsInfoProfiles(singleSignatureInfo);
- dataObjectList =
- buildDataObjectList(
- singleSignatureInfo,
- createTransformsProfiles,
- signatureEnvironment,
- refIdGen);
-
- // build the XMLSignatureCreationProfile
- profile = profileFactory.createProfile(singleSignatureInfo, sigInfoReservedIDs);
-
- // build the additionalSignedProperties
- additionalSignedProperties = buildAdditionalSignedProperties();
-
- // build the signatureParentElement
- if (signatureEnvironment != null) {
- signatureParent =
- buildSignatureParentElement(
- signatureEnvironment.getElement(),
- singleSignatureInfo);
- } else {
- signatureParent = null;
- }
-
- // make the signature environment the root of the document, if it is
- // not a separate document anyway; this is done to assure that
- // canonicalization of the signature environment contains the correct
- // namespace declarations
- if (signatureEnvironment != null) {
- Document requestDoc =
- signatureEnvironment.getElement().getOwnerDocument();
- requestElement = requestDoc.getDocumentElement();
- if (requestElement != signatureEnvironment.getElement()) {
- signatureEnvironmentParent =
- signatureEnvironment.getElement().getParentNode();
- requestElement.getOwnerDocument().replaceChild(
- signatureEnvironment.getElement(),
- requestElement);
- }
- }
-
- try {
- // create the signature
- signature =
- module.createSignature(
- dataObjectList,
- profile,
- additionalSignedProperties,
- signatureParent,
- new TransactionId(context.getTransactionID()));
-
- // insert the result into the response
- if (signatureParent != null) {
- responseBuilder.addSignatureEnvironment(
- signatureEnvironment.getElement());
- } else {
- responseBuilder.addSignatureEnvironment(signature.getElement());
- }
-
- } catch (IAIKException e) {
- MOAException moaException = IaikExceptionMapper.getInstance().map(e);
-
- responseBuilder.addError(
- moaException.getMessageId(),
- moaException.getMessage());
- Logger.warn(moaException.getMessage(), e);
- } catch (IAIKRuntimeException e) {
- MOAException moaException = IaikExceptionMapper.getInstance().map(e);
-
- responseBuilder.addError(
- moaException.getMessageId(),
- moaException.getMessage());
- Logger.warn(moaException.getMessage(), e);
- }
-
- // swap back in the request as root document
- if (signatureEnvironment != null) {
- if (requestElement != signatureEnvironment.getElement()) {
- requestElement.getOwnerDocument().replaceChild(
- requestElement,
- signatureEnvironment.getElement());
- signatureEnvironmentParent.appendChild(
- signatureEnvironment.getElement());
- }
- }
-
- } catch (MOAException e) {
- responseBuilder.addError(e.getMessageId(), e.getMessage());
- Logger.warn(e.getMessage(), e);
- }
-
- }
-
- return responseBuilder.getResponse();
- }
-
- /**
- * Build the list of <code>DataObject</code>s from the given
- * <code>SingleSignatureInfo</code> object.
- *
- * <p>
- * Only the following cases of <code>DataObject</code>s are
- * valid in case of an enveloping signature:
- *
- * <ul>
- * <li><code>Reference == null && Content != null</code>: The
- * <code>Content</code> will be used in the <code>DataObject</code>.</li>
- * <li><code>Reference != null && Content == null</code>: Resolve the
- * <code>Reference</code> and use it as <code>DataObject</code>.
- * Set the <code>Reference</code> in the <code>DataObject</code> as well.</li>
- * </ul>
- * </p>
- *
- * <p>
- * Only the following cases of <code>DataObject</code>s are valid in case
- * of a detached signature:
- *
- * <ul>
- * <li><code>Reference != null && Content == null</code>: Resolve the
- * <code>Reference</code> and use it as <code>DataObject</code>.
- * Set the <code>Reference</code> in the <code>DataObject</code> as well.</li>
- * <li><code>Reference != null && Content != null</code>: The
- * <code>Content</code> will be used in the <code>DataObject</code>.
- * Set the <code>Reference</code> in the <code>DataObject</code> as well.</li>
- * </ul>
- * </p>
- *
- * <p>
- * All other cases will lead to an error.
- * </p>
- *
- * @param singleSignatureInfo The <code>SingleSignatureInfo</code> object
- * containing the <code>DataObjectInfo</code> objects.
- * @param createTransformsProfiles A list of objects of type {@link CreateTransformsInfoProfileExplicit},
- * each representing the transforms info profile information for the corresponding <code>DataObject</code>.
- * @param signatureEnvironment The
- * @param idGen The ID generator for <code>DataObject</code> references.
- * @return The <code>List</code> of <code>DataObject</code>s contained in the
- * given <code>singleSignatureInfo</code>.
- * @throws MOASystemException A system error occurred building the data
- * objects.
- * @throws MOAApplicationException An error occurred building the data
- * objects.
- */
- private List buildDataObjectList(
- SingleSignatureInfo singleSignatureInfo,
- List createTransformsProfiles,
- XMLDataObject signatureEnvironment,
- IdGenerator idGen)
- throws MOASystemException, MOAApplicationException {
-
- List dataObjInfos = singleSignatureInfo.getDataObjectInfos();
- List dataObjects = new ArrayList();
- Iterator dtIter;
- Iterator ctpIter = createTransformsProfiles.iterator();
-
- for (dtIter = dataObjInfos.iterator(); dtIter.hasNext();)
- {
- DataObjectInfo dataObjInfo = (DataObjectInfo) dtIter.next();
- String structure = dataObjInfo.getStructure();
-
- CreateTransformsInfoProfileExplicit transformsProfile =
- (CreateTransformsInfoProfileExplicit) ctpIter.next();
- MetaInfo finalDataMetaInfo = transformsProfile.getCreateTransformsInfo().getFinalDataMetaInfo();
-
- if (DataObjectInfo.STRUCTURE_ENVELOPING.equals(structure)) {
- dataObjects.add(
- buildEnvelopingDataObject(
- dataObjInfo.getDataObject(),
- finalDataMetaInfo,
- idGen.uniqueId()));
- } else if (DataObjectInfo.STRUCTURE_DETACHED.equals(structure)) {
- dataObjects.add(
- buildDetachedDataObject(
- dataObjInfo.getDataObject(),
- finalDataMetaInfo,
- signatureEnvironment,
- idGen.uniqueId()));
- } else {
- throw new MOAApplicationException("1103", new Object[] { structure });
- }
- }
-
- return dataObjects;
-
- }
-
- /**
- * Build a <code>DataObject</code> to be used in an enveloping
- * signature.
- *
- * @param content The <code>Content</code> object containing the data object.
- * <code>ContentOptionalRefType</code>.
- * @param finalDataMetaInfo The meta information corresponding with <code>content</code>.
- * @param referenceID The reference ID to use in the signature for the
- * <code>DataObject</code> created.
- * @return The <code>DataObject</code> representing the data contained in
- * <code>dataObjectElem</code>.
- * @throws MOAApplicationException An error occurred during the creation of
- * the <code>DataObject</code>.
- * @throws MOASystemException A system error occurred during the creation of
- * the <code>DataObject</code>.
- */
- private DataObject buildEnvelopingDataObject(
- Content content,
- MetaInfo finalDataMetaInfo,
- String referenceID)
- throws MOASystemException, MOAApplicationException {
-
- DataObjectFactory factory = DataObjectFactory.getInstance();
- DataObject dataObject;
-
- dataObject =
- factory.createFromContentOptionalRefType(
- content,
- finalDataMetaInfo,
- referenceID,
- false,
- false,
- true,
- false);
-
- return dataObject;
- }
-
- /**
- * Build a <code>DataObject</code> to be used in a detached signature.
- *
- * @param content The <code>Content</code> object containing an the data.
- * @param finalDataMetaInfo The meta information corresponding with <code>content</code>.
- * @param signatureEnvironment The signature environment where the signature
- * will be inserted.
- * @param referenceID The reference ID to use in the signature for the
- * <code>DataObject</code> created.
- * @return The <code>DataObject</code> representing the data contained in
- * <code>dataObjectElem</code>.
- * @throws MOAApplicationException An error occurred during the creation of
- * the <code>DataObject</code>.
- * @throws MOASystemException A system error occurred during the creation of
- * the <code>DataObject</code>.
- */
- private DataObject buildDetachedDataObject(
- Content content,
- MetaInfo finalDataMetaInfo,
- XMLDataObject signatureEnvironment,
- String referenceID)
- throws MOASystemException, MOAApplicationException {
-
- String reference = content.getReference();
- DataObjectFactory factory = DataObjectFactory.getInstance();
- DataObject dataObject;
-
- if (reference == null) {
- throw new MOAApplicationException("1102", null);
- } else if ("".equals(reference) || reference.startsWith("#")) {
- dataObject =
- factory.createFromSignatureEnvironment(
- signatureEnvironment.getElement(),
- reference,
- referenceID);
- } else {
- dataObject =
- factory.createFromContentOptionalRefType(
- content,
- finalDataMetaInfo,
- referenceID,
- true,
- false,
- true,
- false);
- }
- return dataObject;
- }
-
- /**
- * Build the signature parent element.
- *
- * @param signatureEnvironment The signature environment containing the
- * document in which to insert the signature.
- * @param singleSignatureInfo The <code>SingleSignatureInfo</code>
- * containing the signature parent element.
- * @return An <code>XMLDataObject</code> containing the signature parent
- * element or <code>null</code>, if the <code>CreateSignatureInfo</code> is
- * <code>null</code>.
- * @throws MOAApplicationException An error occurred during the creation of
- * the signature parent.
- */
- private XMLDataObject buildSignatureParentElement(
- Element signatureEnvironment,
- SingleSignatureInfo singleSignatureInfo)
- throws MOAApplicationException {
-
- CreateSignatureInfo createInfo =
- singleSignatureInfo.getCreateSignatureInfo();
-
- // evaluate the CreateSignatureLocation
- if (createInfo != null) {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- CreateSignatureEnvironmentProfileExplicit createProfile =
- ProfileMapper.mapCreateSignatureEnvironmentProfile(
- createInfo.getCreateSignatureEnvironmentProfile(),
- config);
- CreateSignatureLocation location =
- createProfile.getCreateSignatureLocation();
- Element signatureParent =
- InvokerUtils.evaluateSignatureLocation(signatureEnvironment, location);
-
- return new XMLDataObjectImpl(signatureParent);
- } else {
- return null;
- }
- }
-
- /**
- * Get the supplements contained in the
- * <code>CreateSignatureEnvironmentProfile</code> of the given
- * <code>SingleSignatureInfo</code>.
- *
- * @param singleSigInfo The <code>SingleSignatureInfo</code> from which
- * to extract the supplements.
- * @return A <code>List</code> of <code>XMLDataObjectAssociation</code>s
- * or <code>null</code>, if the <code>singleSigInfo</code> does not contain
- * supplements.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>CreateSignatureEnvironmentProfile</code>.
- */
- private List getCreateSignatureEnvironmentProfileSupplements(SingleSignatureInfo singleSigInfo)
- throws MOAApplicationException {
- CreateSignatureInfo sigInfo = singleSigInfo.getCreateSignatureInfo();
-
- if (sigInfo != null) {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- CreateSignatureEnvironmentProfileExplicit profile =
- ProfileMapper.mapCreateSignatureEnvironmentProfile(
- sigInfo.getCreateSignatureEnvironmentProfile(),
- config);
- List supplements = profile.getSupplements();
-
- return supplements;
- }
- return null;
- }
-
- /**
- * Build the list of additional signed properties.
- *
- * Based on the generic configuration setting
- * <code>ConfigurationProvider.TEST_SIGNING_TIME_PROPERTY</code>, a
- * constant <code>SigningTime</code> will be added to the properties.
- *
- * @return The <code>List</code> of additional signed properties.
- */
- private List buildAdditionalSignedProperties() {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- List additionalSignedProperties = Collections.EMPTY_LIST;
-
- return additionalSignedProperties;
- }
-
-} \ No newline at end of file
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
deleted file mode 100644
index 7ac971da8..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
+++ /dev/null
@@ -1,455 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import iaik.server.modules.algorithms.HashAlgorithms;
-import iaik.server.modules.keys.KeyEntryID;
-import iaik.server.modules.keys.KeyModule;
-import iaik.server.modules.keys.KeyModuleFactory;
-import iaik.server.modules.xmlsign.SignatureStructureTypes;
-import iaik.server.modules.xmlsign.XMLSignatureCreationProfile;
-import iaik.server.modules.xmlsign.XMLSignatureInsertionLocation;
-
-import java.math.BigInteger;
-import java.security.Principal;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry;
-import at.gv.egovernment.moa.spss.server.iaik.xml.CanonicalizationImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xmlsign.DataObjectTreatmentImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xmlsign.XMLSignatureCreationProfileImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xmlsign.XMLSignatureInsertionLocationImpl;
-import at.gv.egovernment.moa.spss.server.logging.TransactionId;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.server.util.IdGenerator;
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * A factory to create <code>XMLSignatureCreationProfile</code>s from a
- * <code>CreateXMLSignatureRequest</code>, based on the current MOA
- * configuration.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureCreationProfileFactory {
-
- private static Map HASH_ALGORITHM_MAPPING;
-
- static {
- HASH_ALGORITHM_MAPPING = new HashMap();
- HASH_ALGORITHM_MAPPING.put(Constants.SHA1_URI, HashAlgorithms.SHA1);
- }
-
- /** The <code>CreateXMLSignatureRequest</code> for which to create the
- * profile.*/
- private CreateXMLSignatureRequest request;
- /** How many profiles have been created based on the same request. */
- private int createProfileCount;
- /** The <code>Set</code> of reserved object IDs.*/
- private Set reserved;
-
- /**
- * Create a new <code>XMLSignatureCreationProfileFactory</code>.
- *
- * @param request The request for which to create profiles.
- * @param reserved The <code>Set</code> of reserved object IDs. IDs will
- * be added during signature creation.
- */
- public XMLSignatureCreationProfileFactory(
- CreateXMLSignatureRequest request,
- Set reserved) {
- this.request = request;
- this.reserved = reserved;
- createProfileCount = 1;
- }
-
- /**
- * Create a <code>XMLSignatureCreationProfile</code> for the given
- * <code>SingleSignatureInfo</code> object..
- *
- * @param singleSignatureInfo The <code>SingleSignatureInfo</code> object
- * containing information about the creation of a signature.
- * @param sigInfoReservedIDs The <code>Set</code> of reserved ID attribue values
- * for the particular <code>singleSignatureInfo</code>.
- * @return The <code>XMLSignatureCreationProfile</code> containing additional
- * information for creating an XML signature.
- * @throws MOASystemException A system error occurred during creation of the
- * profile. See message for details
- * @throws MOAApplicationException An application error occurred during
- * creation of the profile. See message for details.
- */
- public XMLSignatureCreationProfile createProfile(SingleSignatureInfo singleSignatureInfo,
- Set sigInfoReservedIDs) throws MOASystemException, MOAApplicationException {
-
- HashSet allReservedIDs = new HashSet(reserved);
- allReservedIDs.addAll(sigInfoReservedIDs);
-
- XMLSignatureCreationProfileImpl profile =
- new XMLSignatureCreationProfileImpl(createProfileCount, allReservedIDs);
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- CanonicalizationImpl canonicalization;
- List dataObjectTreatmentList;
- String keyGroupID;
- Set keySet;
- List transformationSupplements;
- List createTransformsProfiles;
-
- // build the transformation supplements
- createTransformsProfiles =
- getCreateTransformsInfoProfiles(singleSignatureInfo);
- transformationSupplements =
- buildTransformationSupplements(createTransformsProfiles);
-
- // build and set the data object treatment list
- dataObjectTreatmentList =
- buildDataObjectTreatmentList(
- singleSignatureInfo,
- createTransformsProfiles,
- transformationSupplements,
- allReservedIDs);
- profile.setDataObjectTreatmentList(dataObjectTreatmentList);
-
- // set the key set
- keyGroupID = request.getKeyIdentifier();
- keySet = buildKeySet(keyGroupID);
- if (keySet == null) {
- throw new MOAApplicationException("2231", null);
- } else if (keySet.size() == 0) {
- throw new MOAApplicationException("2232", null);
- }
- profile.setKeySet(keySet);
-
- // set the Security Layer manifest algorithm name
- profile.setSecurityLayerManifestTypeURI(Constants.SL_MANIFEST_TYPE_URI);
-
- // set the structure type
- if (singleSignatureInfo.getCreateSignatureInfo() != null) {
- profile.setSignatureStructureType(SignatureStructureTypes.ENVELOPED);
- } else {
- profile.setSignatureStructureType(SignatureStructureTypes.DETACHED);
- }
-
- // set insertion location
- profile.setSignatureInsertionLocation(
- getSignatureInsertionLocationIndex(singleSignatureInfo));
-
- // set the canonicalization algorithm
- canonicalization =
- new CanonicalizationImpl(config.getCanonicalizationAlgorithmName());
- profile.setSignedInfoCanonicalization(canonicalization);
-
- // set the signed properties
- profile.setSignedProperties(Collections.EMPTY_LIST);
-
- // set security layer conformity
- profile.setSecurityLayerConform(
- singleSignatureInfo.isSecurityLayerConform());
-
- // update the createProfileCount
- createProfileCount++;
-
- return profile;
- }
-
- /**
- * Get the <code>List</code> of all <code>CreateTransformsInfoProfile</code>s
- * contained in all the <code>DataObjectInfo</code>s of the given
- * <code>SingleSignatureInfo</code>.
- *
- * @param singleSignatureInfo The <code>SingleSignatureInfo</code> object from
- * which to extract the <code>CreateTransformsInfoProfile</code>s.
- * @return All <code>CreateTransformsInfoProfile</code>s of all
- * <code>DataObjectInfo</code>s of <code>singleSignatureInfo</code>.
- * @throws MOAApplicationException An error occurred creating one of the
- * profiles.
- */
- List getCreateTransformsInfoProfiles(SingleSignatureInfo singleSignatureInfo)
- throws MOAApplicationException {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- List dataObjInfos = singleSignatureInfo.getDataObjectInfos();
- List profiles = new ArrayList();
- Iterator dtIter;
-
- for (dtIter = dataObjInfos.iterator(); dtIter.hasNext();) {
- DataObjectInfo dataObjInfo = (DataObjectInfo) dtIter.next();
- CreateTransformsInfoProfileExplicit profile =
- ProfileMapper.mapCreateTransformsInfoProfile(
- dataObjInfo.getCreateTransformsInfoProfile(),
- config);
- profiles.add(profile);
- }
-
- return profiles;
- }
-
- /**
- * Build the <code>List</code> of transformation supplements contained in a
- * <code>SingleSignatureInfo</code> object.
- *
- * @param createTransformsInfoProfiles The
- * <code>CreateTransformsInfoProfile</code> object from which to extract the
- * transformation supplements.
- * @return A <code>List</code> of <code>DataObject</code>s containing the
- * transformation supplements.
- * @throws MOASystemException A system error occurred creating one of the
- * transformation supplements.
- * @throws MOAApplicationException An error occurred creating one of the
- * transformation supplements.
- */
- private List buildTransformationSupplements(List createTransformsInfoProfiles)
- throws MOASystemException, MOAApplicationException {
-
- List transformationSupplements = new ArrayList();
- DataObjectFactory factory = DataObjectFactory.getInstance();
- Iterator iter;
-
- for (iter = createTransformsInfoProfiles.iterator(); iter.hasNext();) {
- CreateTransformsInfoProfileExplicit profile =
- (CreateTransformsInfoProfileExplicit) iter.next();
- List supplements = profile.getSupplements();
-
- if (supplements != null) {
- Iterator supplIter;
-
- for (supplIter = supplements.iterator(); supplIter.hasNext();) {
- XMLDataObjectAssociation supplement =
- (XMLDataObjectAssociation) supplIter.next();
-
- transformationSupplements.add(
- factory.createFromXmlDataObjectAssociation(
- supplement,
- false,
- true));
- }
- }
- }
-
- return transformationSupplements;
- }
-
- /**
- * Build the <code>List</code> of <code>DataObjectTreatment</code>s for the
- * given <code>SingleSignatureInfo</code> object..
- *
- * @param singleSignatureInfo The <code>SingleSignatureInfo</code> object
- * from which to exctract the <code>CreateTransformsInfoProfile</code>s
- * containing the data for the <code>DataObjectTreatment</code>s.
- * @param createTransformsInfoProfiles The
- * <code>CreateTransformsInfoProfile</code>s contained in the
- * <code>singleSignatureInfo</code>.
- * @param transformationSupplements Additional parameters for
- * transformations contained in <code>DataObjectTreatment</code>s.
- * @param reservedIDs The <code>Set</code> of reserved object IDs.
- * @return A <code>List</code> of <code>DataObjectTreatment</code> objects.
- * @throws MOAApplicationException An error occurred building one of the
- * <code>DataObjectTreatment</code>s.
- * @throws MOASystemException A system error occurred building one of the
- * <code>DataObjectTreatment</code>s.
- */
- private List buildDataObjectTreatmentList(
- SingleSignatureInfo singleSignatureInfo,
- List createTransformsInfoProfiles,
- List transformationSupplements,
- Set reservedIDs)
- throws MOASystemException, MOAApplicationException {
-
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- List treatments = new ArrayList();
- List dataObjInfos = singleSignatureInfo.getDataObjectInfos();
- int dataObjectTreatmentCount = 1;
- String hashAlgorithmName;
- Iterator dtIter;
- Iterator prIter;
-
- prIter = createTransformsInfoProfiles.iterator();
- for (dtIter = dataObjInfos.iterator(); dtIter.hasNext();) {
- CreateTransformsInfoProfileExplicit profile =
- (CreateTransformsInfoProfileExplicit) prIter.next();
- DataObjectInfo dataObjInfo = (DataObjectInfo) dtIter.next();
- IdGenerator objIdGen =
- new IdGenerator(
- ("signed-data-" + createProfileCount)
- + ("-" + dataObjectTreatmentCount++),
- reservedIDs);
- DataObjectTreatmentImpl treatment = new DataObjectTreatmentImpl(objIdGen);
-
- treatment.setFinalContentType(
- profile.getCreateTransformsInfo().getFinalDataMetaInfo().getMimeType());
- treatment.setTransformationList(buildTransformationList(profile));
- treatment.setReferenceInManifest(dataObjInfo.isChildOfManifest());
-
- hashAlgorithmName =
- (String) HASH_ALGORITHM_MAPPING.get(
- config.getDigestMethodAlgorithmName());
- if (hashAlgorithmName == null) {
- error(
- "config.17",
- new Object[] { config.getDigestMethodAlgorithmName()});
- throw new MOASystemException("2900", null);
- }
-
- treatment.setHashAlgorithmName(hashAlgorithmName);
- treatment.setIncludedInSignature(
- DataObjectInfo.STRUCTURE_ENVELOPING.equals(dataObjInfo.getStructure()));
- treatment.setTransformationSupplements(transformationSupplements);
-
- treatments.add(treatment);
-
- }
-
- return treatments;
- }
-
- /**
- * Build the <code>List</code> of transformations contained in a
- * <code>CreateTransformsInfoProfile</code> object.
- *
- * @param profile The <code>CreateTransformsInfoProfile</code> object
- * from which to extract the <code>Transform</code>s.
- * @return A <code>List</code> of <code>Transformation</code>s contained in
- * the given <code>CreateTransformsInfoProfile</code>.
- * @throws MOAApplicationException An error occurred building one of the
- * <code>Transformation</code>s.
- */
- private List buildTransformationList(CreateTransformsInfoProfileExplicit profile)
- throws MOAApplicationException {
-
- TransformationFactory factory = TransformationFactory.getInstance();
- List transforms = profile.getCreateTransformsInfo().getTransforms();
-
- return transforms != null
- ? factory.createTransformationList(transforms)
- : Collections.EMPTY_LIST;
- }
-
- /**
- * Build the set of <code>KeyEntryID</code>s available to the given
- * <code>keyGroupID</code>.
- *
- * @param keyGroupID The keygroup ID for which the available keys should be
- * returned.
- * @return The <code>Set</code> of <code>KeyEntryID</code>s
- * identifying the available keys.
- */
- private Set buildKeySet(String keyGroupID) {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- Set keyGroupEntries;
-
- // get the KeyGroup entries from the configuration
- if (context.getClientCertificate() != null) {
- X509Certificate cert = context.getClientCertificate()[0];
- Principal issuer = cert.getIssuerDN();
- BigInteger serialNumber = cert.getSerialNumber();
-
- keyGroupEntries =
- config.getKeyGroupEntries(issuer, serialNumber, keyGroupID);
- } else {
- keyGroupEntries = config.getKeyGroupEntries(null, null, keyGroupID);
- }
-
- // map the KeyGroup entries to a set of KeyEntryIDs
- if (keyGroupEntries == null) {
- return null;
- } else if (keyGroupEntries.size() == 0) {
- return Collections.EMPTY_SET;
- } else {
- KeyModule module =
- KeyModuleFactory.getInstance(
- new TransactionId(context.getTransactionID()));
- Set keyEntryIDs = module.getPrivateKeyEntryIDs();
- Set keySet = new HashSet();
- Iterator iter;
-
- // filter out the keys that do not exist in the IAIK configuration
- // by walking through the key entries and checking if the exist in the
- // keyGroupEntries
- for (iter = keyEntryIDs.iterator(); iter.hasNext();) {
- KeyEntryID entryID = (KeyEntryID) iter.next();
- KeyGroupEntry entry =
- new KeyGroupEntry(
- entryID.getModuleID(),
- entryID.getCertificateIssuer(),
- entryID.getCertificateSerialNumber());
- if (keyGroupEntries.contains(entry)) {
- keySet.add(entryID);
- }
- }
- return keySet;
- }
- }
-
- /**
- * Get the signature location index where the signature will be inserted into
- * the signature parent element.
- *
- * @param singleSignatureInfo The <code>SingleSignatureInfo</code> object
- * containing the <code>CreateSignatureLocation</code>.
- * @return The index at which to insert the signature into the signature
- * environment.
- * @throws MOAApplicationException An error occurred parsing the
- * <code>CreateSignatureEnvironmentProfile</code>.
- */
- private XMLSignatureInsertionLocation getSignatureInsertionLocationIndex(SingleSignatureInfo singleSignatureInfo)
- throws MOAApplicationException {
-
- CreateSignatureInfo createInfo =
- singleSignatureInfo.getCreateSignatureInfo();
-
- if (createInfo != null) {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- CreateSignatureEnvironmentProfileExplicit profile =
- ProfileMapper.mapCreateSignatureEnvironmentProfile(
- createInfo.getCreateSignatureEnvironmentProfile(),
- config);
- int index = profile.getCreateSignatureLocation().getIndex();
-
- return new XMLSignatureInsertionLocationImpl(index);
- } else {
- return new XMLSignatureInsertionLocationImpl(0);
- }
- }
-
- /**
- * Utility function to issue an error message to the log.
- *
- * @param messageId The ID of the message to log.
- * @param parameters Additional message parameters.
- */
- private static void error(String messageId, Object[] parameters) {
- MessageProvider msg = MessageProvider.getInstance();
-
- Logger.error(new LogMsg(msg.getMessage(messageId, parameters)));
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
deleted file mode 100644
index 4642593eb..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
+++ /dev/null
@@ -1,675 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import iaik.IAIKException;
-import iaik.IAIKRuntimeException;
-import iaik.ixsil.exceptions.URIException;
-import iaik.ixsil.util.URI;
-import iaik.server.modules.xml.DataObject;
-import iaik.server.modules.xml.XMLDataObject;
-import iaik.server.modules.xml.XMLSignature;
-import iaik.server.modules.xmlsign.XMLConstants;
-import iaik.server.modules.xmlverify.DsigManifest;
-import iaik.server.modules.xmlverify.ReferenceData;
-import iaik.server.modules.xmlverify.SecurityLayerManifest;
-import iaik.server.modules.xmlverify.XMLSignatureVerificationModule;
-import iaik.server.modules.xmlverify.XMLSignatureVerificationModuleFactory;
-import iaik.server.modules.xmlverify.XMLSignatureVerificationProfile;
-import iaik.server.modules.xmlverify.XMLSignatureVerificationResult;
-import iaik.x509.X509Certificate;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-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.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.common.CheckResult;
-import at.gv.egovernment.moa.spss.api.common.XMLDataObjectAssociation;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResultInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.SupplementProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter;
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameterHash;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.config.TrustProfile;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XMLSignatureImpl;
-import at.gv.egovernment.moa.spss.server.logging.IaikLog;
-import at.gv.egovernment.moa.spss.server.logging.TransactionId;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.CollectionUtils;
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * A class providing a DOM based interface to the
- * <code>XMLSignatureVerificationModule</code>.
- *
- * This class performs the invocation of the
- * <code>iaik.server.modules.xmlverify.XMLSignatureVerificationModule</code>
- * from a <code>VerifyXMLSignatureRequest</code> given as a DOM element. The
- * result of the invocation is integrated into a
- * <code>VerifyXMLSignatureResponse</code> and returned.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureVerificationInvoker {
-
- /** The single instance of this class. */
- private static XMLSignatureVerificationInvoker instance = null;
-
- private static Set FILTERED_REF_TYPES;
-
- static {
- FILTERED_REF_TYPES = new HashSet();
- FILTERED_REF_TYPES.add(DsigManifest.XML_DSIG_MANIFEST_TYPE);
- FILTERED_REF_TYPES.add(SecurityLayerManifest.SECURITY_LAYER_MANIFEST_TYPE);
- FILTERED_REF_TYPES.add(
- SecurityLayerManifest.SECURITY_LAYER_MANIFEST_TYPE_OLD);
- FILTERED_REF_TYPES.add(
- XMLConstants.NAMESPACE_ETSI_STRING + "SignedProperties");
- }
-
- /**
- * Get the single instance of this class.
- *
- * @return The single instance of this class.
- */
- public static synchronized XMLSignatureVerificationInvoker getInstance() {
- if (instance == null) {
- instance = new XMLSignatureVerificationInvoker();
- }
- return instance;
- }
-
- /**
- * Create a new <code>XMLSignatureCreationInvoker</code>.
- *
- * Protected to disallow multiple instances.
- */
- protected XMLSignatureVerificationInvoker() {
- }
-
- /**
- * Process the <code>VerifyXMLSignatureRequest<code> message and invoke the
- * <code>XMLSignatureVerificationModule</code>.
- *
- * @param request A <code>VerifyXMLSignatureRequest<code> API object
- * containing the data for verifying an XML signature.
- * @return A <code>VerifyXMLSignatureResponse</code> containing the
- * answert to the <code>VerifyXMLSignatureRequest</code>.
- * MOA schema definition.
- * @throws MOAException An error occurred during signature verification.
- */
- public VerifyXMLSignatureResponse verifyXMLSignature(VerifyXMLSignatureRequest request)
- throws MOAException {
-
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- LoggingContext loggingCtx =
- LoggingContextManager.getInstance().getLoggingContext();
- XMLSignatureVerificationProfileFactory profileFactory =
- new XMLSignatureVerificationProfileFactory(request);
- VerifyXMLSignatureResponseBuilder responseBuilder =
- new VerifyXMLSignatureResponseBuilder();
- XMLSignatureVerificationResult result;
- XMLSignatureVerificationProfile profile;
- ReferencesCheckResult signatureManifestCheck;
- DataObjectFactory dataObjFactory;
- XMLDataObject signatureEnvironment;
- Node signatureEnvironmentParent = null;
- Element requestElement = null;
- XMLSignature xmlSignature;
- Date signingTime;
- List supplements;
- List dataObjectList;
-
- // get the supplements
- supplements = getSupplements(request);
-
- // build XMLSignature
- dataObjFactory = DataObjectFactory.getInstance();
- signatureEnvironment =
- dataObjFactory.createSignatureEnvironment(
- request.getSignatureInfo().getVerifySignatureEnvironment(),
- supplements);
- xmlSignature = buildXMLSignature(signatureEnvironment, request);
-
- // build the list of DataObjects
- dataObjectList = buildDataObjectList(supplements);
-
- // build profile
- profile = profileFactory.createProfile();
-
- // get the signingTime
- signingTime = request.getDateTime();
-
- // make the signature environment the root of the document, if it is not a
- // separate document anyway; this is done to assure that canonicalization
- // of the signature environment contains the correct namespace declarations
- requestElement =
- signatureEnvironment.getElement().getOwnerDocument().getDocumentElement();
- if (requestElement != signatureEnvironment.getElement()) {
- signatureEnvironmentParent =
- signatureEnvironment.getElement().getParentNode();
- requestElement.getOwnerDocument().replaceChild(
- signatureEnvironment.getElement(),
- requestElement);
- }
-
- // verify the signature
- try {
- XMLSignatureVerificationModule module =
- XMLSignatureVerificationModuleFactory.getInstance();
-
- module.setLog(new IaikLog(loggingCtx.getNodeID()));
-
- result =
- module.verifySignature(
- xmlSignature,
- dataObjectList,
- profile,
- signingTime,
- new TransactionId(context.getTransactionID()));
- } catch (IAIKException e) {
- MOAException moaException = IaikExceptionMapper.getInstance().map(e);
- throw moaException;
- } catch (IAIKRuntimeException e) {
- MOAException moaException = IaikExceptionMapper.getInstance().map(e);
- throw moaException;
- }
-
- // swap back in the request as root document
- if (requestElement != signatureEnvironment.getElement()) {
- requestElement.getOwnerDocument().replaceChild(
- requestElement,
- signatureEnvironment.getElement());
- signatureEnvironmentParent.appendChild(signatureEnvironment.getElement());
- }
-
- // check the result
- signatureManifestCheck =
- validateSignatureManifest(request, result, profile);
-
- // Check if signer certificate is in trust profile's allowed signer certificates pool
- TrustProfile trustProfile = context.getConfiguration().getTrustProfile(request.getTrustProfileId());
- CheckResult certificateCheck = validateSignerCertificate(result, trustProfile);
-
- // build the response
- responseBuilder.setResult(result, profile, signatureManifestCheck, certificateCheck);
-
- return responseBuilder.getResponse();
- }
-
- /**
- * Checks if the signer certificate matches one of the allowed signer certificates specified
- * in the provided <code>trustProfile</code>.
- *
- * @param result The result produced by the <code>XMLSignatureVerificationModule</code>.
- *
- * @param trustProfile The trust profile the signer certificate is validated against.
- *
- * @return The overal result of the certificate validation for the signer certificate.
- *
- * @throws MOAException if one of the signer certificates specified in the <code>trustProfile</code>
- * cannot be read from the file system.
- */
- private CheckResult validateSignerCertificate(XMLSignatureVerificationResult result, TrustProfile trustProfile)
- throws MOAException
- {
- MessageProvider msg = MessageProvider.getInstance();
-
- int resultCode = result.getCertificateValidationResult().getValidationResultCode().intValue();
- if (resultCode == 0 && trustProfile.getSignerCertsUri() != null)
- {
- X509Certificate signerCertificate = (X509Certificate) result.getCertificateValidationResult().getCertificateChain().get(0);
-
- File signerCertsDir = null;
- try
- {
- signerCertsDir = new File(new URI(trustProfile.getSignerCertsUri()).getPath());
- }
- catch (URIException e)
- {
- throw new MOASystemException("2900", null, e); // Should not happen, already checked at loading the MOA configuration
- }
-
- File[] files = signerCertsDir.listFiles();
- if (files == null) resultCode = 1;
- int i;
- for (i = 0; i < files.length; i++)
- {
- if (!files[i].isDirectory())
- {
- FileInputStream currentFIS = null;
- try
- {
- currentFIS = new FileInputStream(files[i]);
- }
- catch (FileNotFoundException e) {
- throw new MOASystemException("2900", null, e);
- }
-
- try
- {
- X509Certificate currentCert = new X509Certificate(currentFIS);
- currentFIS.close();
- if (currentCert.equals(signerCertificate)) break;
- }
- catch (Exception e)
- {
- // Simply ignore file if it cannot be interpreted as certificate
- String logMsg = msg.getMessage("invoker.03", new Object[]{trustProfile.getId(), files[i].getName()});
- Logger.warn(logMsg);
- try
- {
- currentFIS.close();
- }
- catch (IOException e1) {
- // If clean-up fails, do nothing
- }
- }
- }
- }
- if (i >= files.length)
- {
- resultCode = 1; // No signer certificate from the trustprofile pool matches the actual signer certificate
- }
- }
-
- SPSSFactory factory = SPSSFactory.getInstance();
- return factory.createCheckResult(resultCode, null);
- }
-
- /**
- * Select the <code>dsig:Signature</code> DOM element within the signature
- * environment.
- *
- * @param signatureEnvironment The signature environment containing the
- * <code>dsig:Signature</code>.
- * @param request The <code>VerifyXMLSignatureRequest</code> containing the
- * signature environment.
- * @return The <code>dsig:Signature</code> element wrapped in a
- * <code>XMLSignature</code> object.
- * @throws MOAApplicationException An error occurred locating the
- * <code>dsig:Signature</code>.
- */
- private XMLSignature buildXMLSignature(
- XMLDataObject signatureEnvironment,
- VerifyXMLSignatureRequest request)
- throws MOAApplicationException {
-
- VerifySignatureLocation signatureLocation =
- request.getSignatureInfo().getVerifySignatureLocation();
- Element signatureParent;
-
- // evaluate the VerifySignatureLocation to get the signature parent
- signatureParent =
- InvokerUtils.evaluateSignatureLocation(
- signatureEnvironment.getElement(),
- signatureLocation);
-
- // check for signatureParent to be a dsig:Signature element
- if (!"Signature".equals(signatureParent.getLocalName())
- || !Constants.DSIG_NS_URI.equals(signatureParent.getNamespaceURI())) {
- throw new MOAApplicationException("2266", null);
- }
-
- return new XMLSignatureImpl(signatureParent);
- }
-
- /**
- * Build the supplemental data objects contained in the
- * <code>VerifyXMLSignatureRequest</code>.
- *
- * @param supplements A <code>List</code> of
- * <code>XMLDataObjectAssociation</code>s containing the supplement data.
- * @return A <code>List</code> of <code>DataObject</code>s representing the
- * supplemental data objects.
- * @throws MOASystemException A system error occurred building one of the data
- * objects.
- * @throws MOAApplicationException An error occurred building one of the data
- * objects.
- */
- private List buildDataObjectList(List supplements)
- throws MOASystemException, MOAApplicationException {
- List dataObjectList = new ArrayList();
-
- DataObjectFactory factory = DataObjectFactory.getInstance();
- DataObject dataObject;
- Iterator iter;
-
- if (supplements != null) {
- for (iter = supplements.iterator(); iter.hasNext();) {
- XMLDataObjectAssociation supplement =
- (XMLDataObjectAssociation) iter.next();
- dataObject =
- factory.createFromXmlDataObjectAssociation(supplement, true, false);
- dataObjectList.add(dataObject);
- }
- }
-
- return dataObjectList;
-
- }
-
- /**
- * Get the supplemental data contained in the
- * <code>VerifyXMLSignatureRequest</code>.
- *
- * @param request The <code>VerifyXMLSignatureRequest</code> containing the
- * supplemental data.
- * @return A <code>List</code> of <code>XMLDataObjectAssociation</code>
- * objects containing the supplemental data.
- * @throws MOAApplicationException An error occurred resolving one of the
- * supplement profiles.
- */
- private List getSupplements(VerifyXMLSignatureRequest request)
- throws MOAApplicationException {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- List supplementProfiles = request.getSupplementProfiles();
-
- List supplements = new ArrayList();
-
- if (supplementProfiles != null) {
-
- List mappedProfiles =
- ProfileMapper.mapSupplementProfiles(supplementProfiles, config);
- Iterator iter;
-
- for (iter = mappedProfiles.iterator(); iter.hasNext();) {
- SupplementProfileExplicit profile =
- (SupplementProfileExplicit) iter.next();
- supplements.add(profile.getSupplementProfile());
- }
-
- }
- return supplements;
- }
-
- /**
- * Perform additional validations of the
- * <code>XMLSignatureVerificationResult</code>.
- *
- * <p> In particular, it is verified that:
- * <ul>
- * <li>Each <code>ReferenceData</code> object contains transformation
- * chain that matches one of the <code>Transforms</code> given in the
- * corresponding <code>SignatureManifestCheckParams/ReferenceInfo</code></li>
- * <li>The hash values of the <code>TransformParameter</code>s are valid.
- * </li>
- * </ul>
- * </p>
- *
- * @param request The <code>VerifyXMLSignatureRequest</code> containing the
- * signature to verify.
- * @param result The result produced by
- * <code>XMLSignatureVerificationModule</code>.
- * @param profile The profile used for validating the <code>request</code>.
- * @return The result of additional validations of the signature manifest.
- * @throws MOAApplicationException Post-validation of the
- * <code>XMLSignatureVerificaitonResult</code> failed.
- */
- private ReferencesCheckResult validateSignatureManifest(
- VerifyXMLSignatureRequest request,
- XMLSignatureVerificationResult result,
- XMLSignatureVerificationProfile profile)
- throws MOAApplicationException {
-
- SPSSFactory factory = SPSSFactory.getInstance();
- MessageProvider msg = MessageProvider.getInstance();
-
- // validate that each ReferenceData object contains transforms specified
- // in the corresponding SignatureManifestCheckParams/ReferenceInfo
- if (request.getSignatureManifestCheckParams() != null) {
- List refInfos =
- request.getSignatureManifestCheckParams().getReferenceInfos();
- List refDatas = filterReferenceInfos(result.getReferenceDataList());
- List failedReferencesList = new ArrayList();
- Iterator refInfoIter;
- Iterator refDataIter;
-
- if (refInfos.size() != refDatas.size()) {
- return factory.createReferencesCheckResult(1, null);
- }
-
- refInfoIter = refInfos.iterator();
- refDataIter =
- filterReferenceInfos(result.getReferenceDataList()).iterator();
-
- while (refInfoIter.hasNext()) {
- ReferenceInfo refInfo = (ReferenceInfo) refInfoIter.next();
- ReferenceData refData = (ReferenceData) refDataIter.next();
- List transforms = buildTransformsList(refInfo);
- boolean found = false;
- Iterator trIter;
-
- for (trIter = transforms.iterator(); trIter.hasNext() && !found;) {
- found = trIter.next().equals(refData.getTransformationList());
- }
-
- if (!found) {
- Integer refIndex = new Integer(refData.getReferenceIndex());
- String logMsg =
- msg.getMessage("invoker.01", new Object[] { refIndex });
-
- failedReferencesList.add(refIndex);
- Logger.debug(new LogMsg(logMsg));
- }
- }
-
- if (!failedReferencesList.isEmpty()) {
- // at least one reference failed - return their indexes and check code 1
- int[] failedReferences =
- CollectionUtils.toIntArray(failedReferencesList);
- ReferencesCheckResultInfo checkInfo =
- factory.createReferencesCheckResultInfo(null, failedReferences);
-
- return factory.createReferencesCheckResult(1, checkInfo);
- }
- }
-
- // validate the hashes contained in all the ReferenceInfo objects of the
- // security layer manifest
- if (request.getSignatureManifestCheckParams() != null
- && result.containsSecurityLayerManifest()) {
- Map hashValues = buildTransformParameterHashValues(request);
- Set transformParameterURIs =
- buildTransformParameterURIs(profile.getTransformationSupplements());
- List referenceInfoList =
- result.getSecurityLayerManifest().getReferenceDataList();
- Iterator refIter;
-
- for (refIter = referenceInfoList.iterator(); refIter.hasNext();) {
- iaik.server.modules.xmlverify.ReferenceInfo ref =
- (iaik.server.modules.xmlverify.ReferenceInfo) refIter.next();
- byte[] hash = (byte[]) hashValues.get(ref.getURI());
-
- if (!transformParameterURIs.contains(ref.getURI())
- || (hash != null && !Arrays.equals(hash, ref.getHashValue()))) {
-
- // the transform parameter doesn't exist or the hashs do not match
- // return the index of the failed reference and check code 1
- int[] failedReferences = new int[] { ref.getReferenceIndex()};
- ReferencesCheckResultInfo checkInfo =
- factory.createReferencesCheckResultInfo(null, failedReferences);
- String logMsg =
- msg.getMessage(
- "invoker.02",
- new Object[] { new Integer(ref.getReferenceIndex())});
-
- Logger.debug(new LogMsg(logMsg));
-
- return factory.createReferencesCheckResult(1, checkInfo);
- }
- }
- }
-
- return factory.createReferencesCheckResult(0, null);
- }
-
- /**
- * Get all <code>Transform</code>s contained in all the
- * <code>VerifyTransformsInfoProfile</code>s of the given
- * <code>ReferenceInfo</code>.
- *
- * @param refInfo The <code>ReferenceInfo</code> object containing
- * the transformations.
- * @return A <code>List</code> of <code>List</code>s. Each of the
- * <code>List</code>s contains <code>Transformation</code> objects.
- * @throws MOAApplicationException An error occurred building one of the
- * <code>Transformation</code>s.
- */
- private List buildTransformsList(ReferenceInfo refInfo)
- throws MOAApplicationException {
-
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- List profiles = refInfo.getVerifyTransformsInfoProfiles();
- List mappedProfiles =
- ProfileMapper.mapVerifyTransformsInfoProfiles(profiles, config);
- List transformsList = new ArrayList();
- TransformationFactory factory = TransformationFactory.getInstance();
- Iterator iter;
-
- for (iter = mappedProfiles.iterator(); iter.hasNext();) {
- VerifyTransformsInfoProfileExplicit profile =
- (VerifyTransformsInfoProfileExplicit) iter.next();
- List transforms = profile.getTransforms();
-
- if (transforms != null) {
- transformsList.add(factory.createTransformationList(transforms));
- }
- }
-
- return transformsList;
- }
-
- /**
- * Build the <code>Set</code> of all <code>TransformParameter</code> URIs.
- *
- * @param transformParameters The <code>List</code> of
- * <code>TransformParameter</code>s, as provided to the verification.
- * @return The <code>Set</code> of all <code>TransformParameter</code> URIs.
- */
- private Set buildTransformParameterURIs(List transformParameters) {
- Set uris = new HashSet();
- Iterator iter;
-
- for (iter = transformParameters.iterator(); iter.hasNext();) {
- DataObject transformParameter = (DataObject) iter.next();
- uris.add(transformParameter.getURI());
- }
-
- return uris;
- }
-
- /**
- * Build a mapping between <code>TransformParameter</code> URIs (a
- * <code>String</code> and <code>dsig:HashValue</code> (a
- * <code>byte[]</code>).
- *
- * @param request The <code>VerifyXMLSignatureRequest</code>.
- * @return Map The resulting mapping.
- * @throws MOAApplicationException An error occurred accessing one of
- * the profiles.
- */
- private Map buildTransformParameterHashValues(VerifyXMLSignatureRequest request)
- throws MOAApplicationException {
-
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- Map hashValues = new HashMap();
- List refInfos =
- request.getSignatureManifestCheckParams().getReferenceInfos();
- Iterator refIter;
-
- for (refIter = refInfos.iterator(); refIter.hasNext();) {
- ReferenceInfo refInfo = (ReferenceInfo) refIter.next();
- List profiles = refInfo.getVerifyTransformsInfoProfiles();
- List mappedProfiles =
- ProfileMapper.mapVerifyTransformsInfoProfiles(profiles, config);
- Iterator prIter;
-
- for (prIter = mappedProfiles.iterator(); prIter.hasNext();) {
- VerifyTransformsInfoProfileExplicit profile =
- (VerifyTransformsInfoProfileExplicit) prIter.next();
- List trParameters = profile.getTransformParameters();
- Iterator trIter;
-
- for (trIter = trParameters.iterator(); trIter.hasNext();) {
- TransformParameter transformParameter =
- (TransformParameter) trIter.next();
- String uri = transformParameter.getURI();
-
- if (transformParameter.getTransformParameterType()
- == TransformParameter.HASH_TRANSFORMPARAMETER) {
- hashValues.put(
- uri,
- ((TransformParameterHash) transformParameter).getDigestValue());
- }
-
- }
- }
- }
- return hashValues;
- }
-
- /**
- * Filter the <code>ReferenceInfo</code>s returned by the
- * <code>VerifyXMLSignatureResult</code> for comparison with the
- * <code>ReferenceInfo</code> elements in the request.
- *
- * @param referenceInfos The <code>ReferenceInfo</code>s from the
- * <code>VerifyXMLSignatureResult</code>.
- * @return A <code>List</code> of all <code>ReferenceInfo</code>s whose type
- * is not a XMLDsig manifest, Security Layer manifest, or ETSI signed
- * property.
- */
- private List filterReferenceInfos(List referenceInfos) {
- List filtered = new ArrayList();
- Iterator iter;
-
- for (iter = referenceInfos.iterator(); iter.hasNext();) {
- iaik.server.modules.xmlverify.ReferenceInfo refInfo =
- (iaik.server.modules.xmlverify.ReferenceInfo) iter.next();
- String refType = refInfo.getReferenceType();
-
- if (refType == null || !FILTERED_REF_TYPES.contains(refType)) {
- filtered.add(refInfo);
- }
- }
-
- return filtered;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationProfileFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationProfileFactory.java
deleted file mode 100644
index 5df13a337..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationProfileFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package at.gv.egovernment.moa.spss.server.invoke;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import iaik.server.modules.xmlverify.XMLSignatureVerificationProfile;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.SignatureManifestCheckParams;
-import at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.iaik.pki.PKIProfileImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xmlverify.XMLSignatureVerificationProfileImpl;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-
-/**
- * A factory to create a <code>XMLSignatureVerificationProfile</code> from a
- * <code>VerifyXMLSignatureRequest</code>, based on the current MOA
- * configuration.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureVerificationProfileFactory {
-
- /** The <code>VerifyXMLSignatureRequest</code> for which to create profile
- * information. */
- private VerifyXMLSignatureRequest request;
-
- /**
- * Create a new <code>XMLSignatureVerificationProfileFactory</code>.
- *
- * @param request The <code>VerifyXMLSignatureRequest</code> to extract
- * profile data from.
- */
- public XMLSignatureVerificationProfileFactory(VerifyXMLSignatureRequest request) {
- this.request = request;
- }
-
- /**
- * Create a <code>XMLSignatureCreationProfile</code> from the
- * <code>VerifyXMLSignaturesRequest</code> and the current MOA configuration.
- *
- * @return The <code>XMLSignatureVerificationProfile</code> containing
- * additional information for verifying an XML signature.
- * @throws MOASystemException A system error occurred building the profile.
- * @throws MOAApplicationException An error occurred building the profile.
- */
- public XMLSignatureVerificationProfile createProfile()
- throws MOASystemException, MOAApplicationException {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- XMLSignatureVerificationProfileImpl profile =
- new XMLSignatureVerificationProfileImpl();
- SignatureManifestCheckParams checkParams;
- String trustProfileID;
-
- // set whether to check XMLDsig manifests
- profile.setCheckXMLDsigManifests(true);
-
- // set the certificate validation profile
- trustProfileID = request.getTrustProfileId();
- profile.setCertificateValidationProfile(
- new PKIProfileImpl(config, trustProfileID));
-
- // set whether hash input data is to be included
- profile.setIncludeHashInputData(request.getReturnHashInputData());
-
- // set the security layer manifest check parameters
- // and transformation supplements (if present)
- checkParams = request.getSignatureManifestCheckParams();
- profile.setCheckSecurityLayerManifest(true);
- profile.setIncludeReferenceInputData(checkParams != null ? checkParams.getReturnReferenceInputData() : false);
- if (checkParams != null) {
- List transformationSupplements;
- transformationSupplements = buildTransformationSupplements();
- profile.setTransformationSupplements(transformationSupplements);
- } else {
- profile.setTransformationSupplements(Collections.EMPTY_LIST);
- }
-
- return profile;
- }
-
- /**
- * Build supplemental data objects used in the transformations.
- *
- * @return A <code>List</code> of <code>DataObject</code>s providing
- * supplemental data to the transformations.
- * @throws MOASystemException A system error occurred building one of the
- * transformations.
- * @throws MOAApplicationException An error occurred building one of the
- * transformations.
- */
- public List buildTransformationSupplements()
- throws MOASystemException, MOAApplicationException {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ConfigurationProvider config = context.getConfiguration();
- SignatureManifestCheckParams checkParams =
- request.getSignatureManifestCheckParams();
- List transformsProfiles = new ArrayList();
- List transformationSupplements = new ArrayList();
- DataObjectFactory factory = DataObjectFactory.getInstance();
- List refInfos = checkParams.getReferenceInfos();
- Iterator refIter;
- Iterator prIter;
- Iterator trIter;
-
- // build the list of all VerifyTransformsInfoProfiles in all ReferenceInfos
- refInfos = checkParams.getReferenceInfos();
- for (refIter = refInfos.iterator(); refIter.hasNext();) {
- ReferenceInfo refInfo = (ReferenceInfo) refIter.next();
- List profiles = refInfo.getVerifyTransformsInfoProfiles();
-
- transformsProfiles.addAll(
- ProfileMapper.mapVerifyTransformsInfoProfiles(profiles, config));
- }
-
- // build the DataObjects
- for (prIter = transformsProfiles.iterator(); prIter.hasNext();) {
- VerifyTransformsInfoProfileExplicit profile =
- (VerifyTransformsInfoProfileExplicit) prIter.next();
- List transformParameters = profile.getTransformParameters();
-
- for (trIter = transformParameters.iterator(); trIter.hasNext();) {
- TransformParameter trParam = (TransformParameter) trIter.next();
- transformationSupplements.add(
- factory.createFromTransformParameter(trParam));
- }
- }
-
- return transformationSupplements;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLog.java b/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
deleted file mode 100644
index 068fab5ca..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package at.gv.egovernment.moa.spss.server.logging;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import iaik.logging.TransactionId;
-
-/**
- * An implementation of the <code>iaik.logging.Log</code>
- * interface that is based on Jakarta Commons-Logging.
- *
- * @author Fatemeh Philippi
- * @version $Id$
- */
-public class IaikLog implements iaik.logging.Log {
- /** The hierarchy to log all IAIK output to. */
- public static final String IAIK_LOG_HIERARCHY = "iaik.server";
- /** The commons-loggin <code>Log</code> to use for logging the messages. */
- private static Log log = LogFactory.getLog(IAIK_LOG_HIERARCHY);
- /** The node ID to use. */
- private String nodeId;
-
- /**
- * Create a new <code>IaikLog</code>.
- *
- * @param nodeId The node ID for this <code>Log</code> object.
- */
- public IaikLog(String nodeId) {
- this.nodeId = nodeId;
- }
-
- /**
- * @see iaik.logging.Log#isDebugEnabled()
- */
- public boolean isDebugEnabled() {
- return log.isDebugEnabled();
- }
-
- /**
- * @see iaik.logging.Log#debug(TransactionId, Object, Throwable)
- */
- public void debug(TransactionId transactionId, Object message, Throwable t) {
- IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
- log.debug(msg, t);
- }
-
- /**
- * @see iaik.logging.Log#isInfoEnabled()
- */
- public boolean isInfoEnabled() {
- return log.isInfoEnabled();
- }
-
- /**
- * @see iaik.logging.Log#info(TransactionId, Object, Throwable)
- */
- public void info(TransactionId transactionId, Object message, Throwable t) {
- IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
- log.info(msg, t);
- }
-
- /**
- * @see iaik.logging.Log#isWarnEnabled()
- */
- public boolean isWarnEnabled() {
- return log.isWarnEnabled();
- }
-
- /**
- * @see iaik.logging.Log#warn(TransactionId, Object, Throwable)
- */
- public void warn(TransactionId transactionId, Object message, Throwable t) {
- IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
- log.warn(msg, t);
- }
-
- /**
- * @see iaik.logging.Log#isErrorEnabled()
- */
- public boolean isErrorEnabled() {
- return log.isErrorEnabled();
- }
-
- /**
- * @see iaik.logging.Log#error(TransactionId, Object, Throwable)
- */
- public void error(TransactionId transactionId, Object message, Throwable t) {
- IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
- log.error(msg, t);
- }
-
- /**
- * @see iaik.logging.Log#isFatalEnabled()
- */
- public boolean isFatalEnabled() {
- return log.isFatalEnabled();
- }
-
- /**
- * @see iaik.logging.Log#fatal(TransactionId, Object, Throwable)
- */
- public void fatal(TransactionId transactionId, Object message, Throwable t) {
- IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
- log.fatal(msg, t);
- }
-
- /**
- * @see iaik.logging.Log#setNodeId(String)
- */
- public void setNodeId(String nodeId) {
- this.nodeId = nodeId;
- }
-
- /**
- * @see iaik.logging.Log#getNodeId()
- */
- public String getNodeId() {
- return nodeId;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
deleted file mode 100644
index a0e4def86..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package at.gv.egovernment.moa.spss.server.logging;
-
-import iaik.logging.Log;
-import iaik.logging.LogConfigurationException;
-import iaik.logging.LogFactory;
-
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
-/**
- * An implementation of the <code>iaik.logging.LogFactory</code> abstract
- * class to log messages to the MOA logging subsystem.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class IaikLogFactory extends LogFactory {
-
- public Log getInstance(Class clazz) throws LogConfigurationException {
- return getInstanceImpl();
- }
-
- public Log getInstance(String name) throws LogConfigurationException {
- return getInstanceImpl();
- }
-
- /**
- * Return an instance of <code>iaik.logging.Log</code>.
- *
- * @return The <code>iaik.logging.Log</code> object to log messages to.
- */
- private Log getInstanceImpl() {
- String nodeID =
- LoggingContextManager.getInstance().getLoggingContext().getNodeID();
-
- return new IaikLog(nodeID);
- }
-
- public void release() {
- // we do not hold any resources
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java b/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java
deleted file mode 100644
index 75fb388a9..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package at.gv.egovernment.moa.spss.server.logging;
-
-import iaik.logging.TransactionId;
-
-/**
- * A unified message type to log messages from the IAIK subsystem.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class IaikLogMsg {
-
- /** The transaction ID of this message. */
- private TransactionId transactionId;
- /** The node ID of this message. */
- private String nodeId;
- /** The message to log. */
- private Object message;
-
- /**
- * Create a <code>IaikLogMsg</code> object.
- *
- * @param transactionId The transaction id of the transaction which
- * generated this log message. May be <code>null</code>.
- * @param nodeId The node id where this message was generated. May be
- * <code>null</code>.
- * @param message The actual message to log. May be <code>null</code>.
- */
- public IaikLogMsg(TransactionId transactionId, String nodeId, Object message) {
- this.transactionId = transactionId;
- this.nodeId = nodeId;
- 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();
-
- msg.append("TID=");
- msg.append(transactionId != null ? transactionId.getLogID() : "<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/spss.server/src/at/gv/egovernment/moa/spss/server/logging/TransactionId.java b/spss.server/src/at/gv/egovernment/moa/spss/server/logging/TransactionId.java
deleted file mode 100644
index 9e0239464..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/TransactionId.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.gv.egovernment.moa.spss.server.logging;
-
-/**
- * An implementation of the <code>iaik.logging.TransactionId</code> interface.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class TransactionId implements iaik.logging.TransactionId {
-
- /** The String representation for logging the transaction ID. */
- private String logID;
-
- /**
- * Create a <code>TransactionId</code> object.
- *
- * @param logID The transaction id as it should be presented to the logging
- * subsystem.
- */
- public TransactionId(String logID) {
- this.logID = logID;
- }
-
- /**
- * @see iaik.logging.TransactionId#getLogID()
- */
- public String getLogID() {
- return logID;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return getLogID();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java b/spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
deleted file mode 100644
index 64bbb8dbe..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package at.gv.egovernment.moa.spss.server.service;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.cert.X509Certificate;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import org.apache.axis.AxisFault;
-import org.apache.axis.MessageContext;
-import org.apache.axis.handlers.BasicHandler;
-import org.apache.axis.transport.http.HTTPConstants;
-import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.XMLUtils;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-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.MOASystemException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionIDGenerator;
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * An handler that is invoked on each web service request and performs some
- * central message handling.
- *
- * Mainly sets up the <code>TransactionContext</code> for the current
- * transaction (i.e. web service request).
- *
- * @author Patrick Peck
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class AxisHandler extends BasicHandler {
-
- /** The resource names of the messages to load. */
- private static final String MOA_SPSS_WSDL_RESOURCE_ = "/resources/wsdl/MOA-SPSS-1.2.wsdl";
-
- /** The property name for accessing the HTTP request. */
- private static final String REQUEST_PROPERTY = HTTPConstants.MC_HTTP_SERVLETREQUEST;
-
- /** The property name for accessing the X509 client certificate chain. */
- private static final String X509_CERTIFICATE_PROPERTY = "javax.servlet.request.X509Certificate";
-
- /** The property name for accessing the SOAP action header. */
- private static final String SOAP_ACTION_HEADER = "soapaction";
-
- /**
- * Handle an invocation of this handler.
- *
- * @param msgContext Information about this request/response.
- * @throws AxisFault An error occurred during processing of the request.
- * @see org.apache.axis.Handler#invoke(MessageContext)
- */
- public void invoke(MessageContext msgContext) throws AxisFault {
- if (!msgContext.getPastPivot()) {
- handleRequest(msgContext);
- } else {
- handleResponse(msgContext);
- }
- }
-
- /**
- * This method is called by <code>invoke</code> to handle incoming requests.
- *
- * @param msgContext The context as provided to <code>invoke</code>.
- * @throws AxisFault An error occurred during processing of the request.
- */
- private void handleRequest(MessageContext msgContext) throws AxisFault {
- try {
- // generate a unique transaction id and build the TransactionContext
- // for this request
- HttpServletRequest request =
- (HttpServletRequest) msgContext.getProperty(REQUEST_PROPERTY);
-
- X509Certificate[] clientCert =
- (X509Certificate[]) request.getAttribute(X509_CERTIFICATE_PROPERTY);
-
- ConfigurationProvider configuration =
- ConfigurationProvider.getInstance();
-
- TransactionContext context =
- new TransactionContext(
- TransactionIDGenerator.nextID(),
- clientCert,
- configuration);
-
- context.setRequestName((String) request.getHeader(SOAP_ACTION_HEADER));
-
- setUpContexts(context);
-
- // log some information about the request
- info(
- "handler.00",
- new Object[] {
- context.getTransactionID(),
- msgContext.getTargetService()});
- info("handler.01", new Object[] { request.getRemoteAddr()});
- if (clientCert != null) {
- info(
- "handler.02",
- new Object[] {
- clientCert[0].getSubjectDN(),
- clientCert[0].getSerialNumber(),
- clientCert[0].getIssuerDN()});
-
- } else {
- info("handler.03", null);
- }
- if (Logger.isDebugEnabled()) {
- String msg = msgContext.getCurrentMessage().getSOAPPartAsString();
- Logger.debug(new LogMsg(msg));
- }
- } catch (MOASystemException e) {
- MOASystemException se = new MOASystemException("2900", null, e);
- AxisFault fault = AxisFault.makeFault(se);
- fault.setFaultDetail(new Element[] { se.toErrorResponse()});
- throw fault;
- } catch (Throwable t) {
- MOASystemException e = new MOASystemException("2900", null, t);
- AxisFault fault = AxisFault.makeFault(e);
- fault.setFaultDetail(new Element[] { e.toErrorResponse()});
- throw fault;
- }
- }
-
- /**
- * This method is called by <code>invoke</code> to handle outgoing
- * responses.
- *
- * @param msgContext The context as provided to <code>invoke</code>.
- * @throws AxisFault An error occurred during processing of the response.
- */
- private void handleResponse(MessageContext msgContext) throws AxisFault {
- info("handler.04", null);
- if (Logger.isDebugEnabled()) {
- String msg = msgContext.getCurrentMessage().getSOAPPartAsString();
- Logger.debug(new LogMsg(msg));
- }
- tearDownContexts();
- }
-
- /**
- * Called, when the processing of the web service fails.
- *
- * @param msgContext Information about the current request.
- * @see org.apache.axis.Handler#onFault(org.apache.axis.MessageContext)
- */
- public void onFault(MessageContext msgContext) {
- info("handler.05", null);
- tearDownContexts();
- }
-
- /**
- * Set up the thread-local contexts (<code>TransactionContext</code> and
- * <code>LoggingContext</code>).
- *
- * @param context The <code>TransactionContext</code> to set for the current
- * request.
- */
- private void setUpContexts(TransactionContext context) {
- // set the transaction context in the TransactionContextManager
- TransactionContextManager tcm = TransactionContextManager.getInstance();
- tcm.setTransactionContext(context);
-
- // set the logging context in the LoggingContextManager
- LoggingContextManager lcm = LoggingContextManager.getInstance();
- LoggingContext lc = new LoggingContext(context.getTransactionID());
- lcm.setLoggingContext(lc);
- }
-
- /**
- * Tear down the thread-local contexts.
- */
- private void tearDownContexts() {
- // unset the transaction context
- TransactionContextManager tcm = TransactionContextManager.getInstance();
- tcm.setTransactionContext(null);
-
- // unset the logging context
- LoggingContextManager lcm = LoggingContextManager.getInstance();
- lcm.setLoggingContext(null);
- }
-
- /**
- * Generate the WSDL into the <code>msgContext</code>.
- *
- * The code of this method is more or less copied from the
- * <code>org.apache.axis.handlers.soap.SOAPService</code> class contained in
- * the 1.1 release of Axis to allow for a missing <code>wsdlFile</code> (so
- * that a resource by the same name is searched for in the classpath). The
- * implementation of this method should be obsolete if Axis 1.1 or higher is
- * used.
- *
- * @param msgContext The <code>MessageContext</code> that will contain the
- * WSDL description of the current web service.
- * @throws AxisFault An error occurred producing the WSDL.
- */
- public void generateWSDL(MessageContext msgContext) throws AxisFault {
- InputStream instream = null;
-
- try {
- String filename = MOA_SPSS_WSDL_RESOURCE_;
- File file = new File(filename);
- if (file.exists()) {
- //if this resolves to a file, load it
- instream = new FileInputStream(filename);
- } else {
- //else load a named resource in our classloader.
- instream = this.getClass().getResourceAsStream(filename);
- if (instream == null) {
- String errorText = Messages.getMessage("wsdlFileMissing", filename);
- throw new AxisFault(errorText);
- }
- }
- Document doc = XMLUtils.newDocument(instream);
- msgContext.setProperty("WSDL", doc);
- } catch (Exception e) {
- throw AxisFault.makeFault(e);
- } finally {
- if (instream != null) {
- try {
- instream.close();
- } catch (IOException e) {
- // ok to do nothing here
- }
- }
- }
- }
-
- /**
- * Utility function to issue an info message to the log.
- *
- * @param messageId The ID of the message to log.
- * @param parameters Additional message parameters.
- */
- private static void info(String messageId, Object[] parameters) {
- MessageProvider msg = MessageProvider.getInstance();
-
- Logger.info(new LogMsg(msg.getMessage(messageId, parameters)));
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java b/spss.server/src/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
deleted file mode 100644
index 7783ed3f6..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package at.gv.egovernment.moa.spss.server.service;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-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;
-import at.gv.egovernment.moa.spss.server.init.*;
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * A servlet to initialize and update the MOA configuration.
- *
- * @author Fatemeh Philippi
- * @author Patrick Peck
- * @version $Id$
- */
-public class ConfigurationServlet extends HttpServlet {
- /** The document type of the HTML to generate. */
- 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 {
-
- MessageProvider msg = MessageProvider.getInstance();
- PrintWriter out;
-
- // set up a logging context for logging the reconfiguration
- LoggingContextManager.getInstance().setLoggingContext(
- new LoggingContext("configuration update"));
-
- 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 {
- // reconfigure the system
- ConfigurationProvider config = ConfigurationProvider.reload();
- IaikConfigurator iaikConfigurator = new IaikConfigurator();
-
- iaikConfigurator.configure(config);
-
- // print a status message
- out.println("<p><b>" + msg.getMessage("config.06", null) + "</b></p>");
- Logger.info(new LogMsg(msg.getMessage("config.06", null)));
-
- if (!config.getWarnings().isEmpty()) {
- // print the warnings
- List allWarnings = new ArrayList();
- Iterator iter;
-
- allWarnings.addAll(config.getWarnings());
- allWarnings.addAll(iaikConfigurator.getWarnings());
-
- out.println("<p><b>" + msg.getMessage("config.29", null) + "</b></p>");
- for (iter = allWarnings.iterator(); iter.hasNext();) {
- out.println(iter.next() + "<br />");
- }
- out.println("<p><b>" + msg.getMessage("config.28", null) + "</b></p>");
- }
-
- } catch (Throwable t) {
- out.println("<p><b>" + msg.getMessage("config.20", null) + "</b></p>");
- out.println("<p><b>" + msg.getMessage("config.28", null) + "</b></p>");
- Logger.warn(new LogMsg(msg.getMessage("config.20", null)), t);
- }
- out.println("</body>");
-
- out.flush();
- out.close();
-
- // tear down the logging context
- LoggingContextManager.getInstance().setLoggingContext(null);
- }
-
- /**
- * 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);
- }
-
- /**
- * Perform some initial initialization tasks for the MOA web services
- * application.
- *
- * Does an initial load of the MOA configuration to test if a working web
- * service can be provided.
- *
- * @see javax.servlet.GenericServlet#init()
- */
- public void init() throws ServletException {
- SystemInitializer.init();
- }
-
-} \ No newline at end of file
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java b/spss.server/src/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java
deleted file mode 100644
index 26d79dbd8..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/RevocationArchiveCleaner.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package at.gv.egovernment.moa.spss.server.service;
-
-import iaik.pki.revocation.RevocationSourceTypes;
-import iaik.pki.store.revocation.archive.Archive;
-import iaik.pki.store.revocation.archive.ArchiveFactory;
-
-import java.util.Date;
-
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.logging.TransactionId;
-import at.gv.egovernment.moa.spss.util.MessageProvider;
-
-/**
- * A <code>Runnable</code> for periodically cleaning up the revocation archive.
- * @author Patrick Peck
- * @version $Id$
- */
-public class RevocationArchiveCleaner implements Runnable {
-
- /** The inverval between two clean-ups of the revocation archive. */
- private long archiveCleanupInterval;
-
- /**
- * Create a new <code>RevocationArchiveCleaner</code>.
- *
- * @param archiveCleanupInterval The interval between two clean-ups of the
- * revocation archive.
- */
- public RevocationArchiveCleaner(long archiveCleanupInterval) {
- this.archiveCleanupInterval = archiveCleanupInterval;
- }
-
- /**
- * Run the <code>RevocationArchiveCleaner</code> in its own
- * <code>Thread</code>.
- */
- public void run() {
- while (true) {
- try {
- ConfigurationProvider config = ConfigurationProvider.getInstance();
- boolean enableArchiving = config.getEnableRevocationArchiving();
-
- if (enableArchiving)
- {
- Archive archive = ArchiveFactory.getInstance().getArchive();
- long archiveDurationMillis =
- (long) config.getCRLArchiveDuration() * 86400000;
-
- // delete old archive data
- if (archiveDurationMillis > 0) {
- Date olderThan =
- new Date(System.currentTimeMillis() - archiveDurationMillis);
-
- archive.deleteOldArchiveEntries(
- RevocationSourceTypes.CRL,
- olderThan,
- new TransactionId("RevocationArchiveCleaner"));
- }
- }
-
- } catch (Exception e) {
- MessageProvider msg = MessageProvider.getInstance();
- Logger.error(new LogMsg(msg.getMessage("init.02", null)), e);
- }
-
- // sleep
- try {
- Thread.sleep(archiveCleanupInterval * 1000);
- } catch (InterruptedException e) {
- // ok to do nothing here
- }
-
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java b/spss.server/src/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
deleted file mode 100644
index 4224f5665..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/ServiceUtils.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package at.gv.egovernment.moa.spss.server.service;
-
-import java.io.ByteArrayInputStream;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-
-/**
- * Helper methods for the Service classes.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ServiceUtils {
-
- /**
- * Schema-validate a request.
- *
- * @param request The request to validate.
- * @throws MOAApplicationException An error occurred validating the requst.
- */
- public static void validateRequest(Element[] request)
- throws MOAApplicationException {
-
- // validate the request
- try {
- DOMUtils.validateElement(
- request[0],
- Constants.ALL_SCHEMA_LOCATIONS,
- null);
- } catch (Exception e) {
- throw new MOAApplicationException(
- "1100",
- new Object[] { e.getMessage()},
- e);
- }
- }
-
- /**
- * Reparse the request with schema-validation turned on so that ID references
- * are resolved.
- *
- * @param request The request to reparse.
- * @return The reparsed request.
- * @throws MOAApplicationException An error occurred parsing the request.
- */
- public static Element reparseRequest(Element request)
- throws MOAApplicationException {
-
- try {
- byte[] requestBytes = DOMUtils.serializeNode(request, "UTF-8");
- Document validatedRequest =
- DOMUtils.parseDocument(
- new ByteArrayInputStream(requestBytes),
- true,
- Constants.ALL_SCHEMA_LOCATIONS,
- null);
- return validatedRequest.getDocumentElement();
- } catch (Exception e) {
- throw new MOAApplicationException(
- "1100",
- new Object[] { e.getMessage()},
- e);
- }
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java b/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
deleted file mode 100644
index 70dd3129c..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package at.gv.egovernment.moa.spss.server.service;
-
-import java.util.Collections;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis.AxisFault;
-import org.apache.axis.i18n.Messages;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureRequestParser;
-import at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureResponseBuilder;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureCreationInvoker;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.StreamUtils;
-
-/**
- * The service endpoint for the <code>SignatureCreation</code> web service.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class SignatureCreationService {
-
- /**
- * Handle a <code>CreateXMLSignatureRequest</code>.
- *
- * @param request The <code>CreateXMLSignatureRequest</code> to work on
- * (contained in the 0th element of the array).
- * @return A <code>CreateXMLSignatureResponse</code> as the only element of
- * the <code>Element</code> array.
- * @throws AxisFault An error occurred during handling of the message.
- */
- public Element[] CreateXMLSignatureRequest(Element[] request)
- throws AxisFault {
- XMLSignatureCreationInvoker invoker =
- XMLSignatureCreationInvoker.getInstance();
- Element[] response = new Element[1];
-
- // check that we have a CreateXMLSignatureRequest; if not, create an
- // AxisFault, just like the org.apache.axis.providers.java.MsgProvider
- if (!Constants.MOA_SPSS_CREATE_XML_REQUEST.equals(request[0].getLocalName()) ||
- !Constants.MOA_NS_URI.equals(request[0].getNamespaceURI()))
- {
- QName qname =
- new QName(request[0].getNamespaceURI(), request[0].getLocalName());
- throw new AxisFault(
- Messages.getMessage("noOperationForQName", qname.toString())); // TODO GK Operation name does not make it into the error repsonse
- }
-
- // handle the request
- try {
- // create a parser and builder for binding API objects to/from XML
- CreateXMLSignatureRequestParser requestParser =
- new CreateXMLSignatureRequestParser();
- CreateXMLSignatureResponseBuilder responseBuilder =
- new CreateXMLSignatureResponseBuilder();
- Element reparsedReq;
- CreateXMLSignatureRequest requestObj;
- CreateXMLSignatureResponse responseObj;
-
- // validate the request
- reparsedReq = ServiceUtils.reparseRequest(request[0]);
-
- // convert to API objects
- requestObj = requestParser.parse(reparsedReq);
-
- // invoke the core logic
- responseObj =
- invoker.createXMLSignature(requestObj, Collections.EMPTY_SET);
-
- // map back to XML
- response[0] = responseBuilder.build(responseObj).getDocumentElement();
-
- } catch (MOAException e) {
- AxisFault fault = AxisFault.makeFault(e);
- fault.setFaultDetail(new Element[] { e.toErrorResponse()});
- Logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
- + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
- throw fault;
- } catch (Throwable t) {
- MOASystemException e = new MOASystemException("2900", null, t);
- AxisFault fault = AxisFault.makeFault(e);
- fault.setFaultDetail(new Element[] { e.toErrorResponse()});
- Logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:"
- + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
- throw fault;
- }
-
- return response;
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java b/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
deleted file mode 100644
index 1b15a197f..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package at.gv.egovernment.moa.spss.server.service;
-
-import org.w3c.dom.Element;
-
-import org.apache.axis.AxisFault;
-
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureRequestParser;
-import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureResponseBuilder;
-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;
-import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
-import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker;
-import at.gv.egovernment.moa.util.StreamUtils;
-
-/**
- * The service endpoint for the <code>SignatureVerification</code> web service.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class SignatureVerificationService {
-
- /**
- * Handle a <code>VerifyCMSSignatureRequest</code>.
- *
- * @param request The <code>VerifyCMSSignatureRequest</code> to work on
- * (contained in the 0th element of the array).
- * @return A <code>VerifyCMSSignatureResponse</code> as the only element of
- * the <code>Element</code> array.
- * @throws AxisFault An error occurred during handling of the message.
- */
- public Element[] VerifyCMSSignatureRequest(Element[] request)
- throws AxisFault {
- CMSSignatureVerificationInvoker invoker =
- CMSSignatureVerificationInvoker.getInstance();
- Element[] response = new Element[1];
-
- try {
- // create a parser and builder for binding API objects to/from XML
- VerifyCMSSignatureRequestParser requestParser =
- new VerifyCMSSignatureRequestParser();
- VerifyCMSSignatureResponseBuilder responseBuilder =
- new VerifyCMSSignatureResponseBuilder();
- Element reparsedReq;
- VerifyCMSSignatureRequest requestObj;
- VerifyCMSSignatureResponse responseObj;
-
- // validate the request
- reparsedReq = ServiceUtils.reparseRequest(request[0]);
-
- // convert to API objects
- requestObj = requestParser.parse(reparsedReq);
-
- // invoke the core logic
- responseObj = invoker.verifyCMSSignature(requestObj);
-
- // map back to XML
- response[0] = responseBuilder.build(responseObj).getDocumentElement();
-
- } catch (MOAException e) {
- AxisFault fault = AxisFault.makeFault(e);
- fault.setFaultDetail(new Element[] { e.toErrorResponse()});
- Logger.debug("Anfrage zur Signaturpruefung wurde nicht erfolgreich beendet:"
- + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
- throw fault;
- } catch (Throwable t) {
- MOASystemException e = new MOASystemException("2900", null, t);
- AxisFault fault = AxisFault.makeFault(e);
- fault.setFaultDetail(new Element[] { e.toErrorResponse()});
- Logger.debug("Anfrage zur Signaturpruefung wurde nicht erfolgreich beendet:"
- + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
- throw fault;
- }
-
- return response;
- }
-
- /**
- * Handle a <code>VerifyXMLSignatureRequest</code>.
- *
- * @param request The <code>VerifyXMLSignatureRequest</code> to work on
- * (contained in the 0th element of the array).
- * @return A <code>VerifyXMLSignatureResponse</code> as the only element of
- * the <code>Element</code> array.
- * @throws AxisFault An error occurred during handling of the message.
- */
- public Element[] VerifyXMLSignatureRequest(Element[] request)
- throws AxisFault {
- XMLSignatureVerificationInvoker invoker =
- XMLSignatureVerificationInvoker.getInstance();
- Element[] response = new Element[1];
-
- try {
- // create a parser and builder for binding API objects to/from XML
- VerifyXMLSignatureRequestParser requestParser =
- new VerifyXMLSignatureRequestParser();
- VerifyXMLSignatureResponseBuilder responseBuilder =
- new VerifyXMLSignatureResponseBuilder();
- Element reparsedReq;
- VerifyXMLSignatureRequest requestObj;
- VerifyXMLSignatureResponse responseObj;
-
- // validate the request
- reparsedReq = ServiceUtils.reparseRequest(request[0]);
-
- // convert to API objects
- requestObj = requestParser.parse(reparsedReq);
-
- // invoke the core logic
- responseObj = invoker.verifyXMLSignature(requestObj);
-
- // map back to XML
- response[0] = responseBuilder.build(responseObj).getDocumentElement();
-
- } catch (MOAException e) {
- AxisFault fault = AxisFault.makeFault(e);
- fault.setFaultDetail(new Element[] { e.toErrorResponse()});
- Logger.debug("Anfrage zur Signaturpruefung wurde nicht erfolgreich beendet:"
- + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
- throw fault;
- } catch (Throwable t) {
- MOASystemException e = new MOASystemException("2900", null, t);
- AxisFault fault = AxisFault.makeFault(e);
- fault.setFaultDetail(new Element[] { e.toErrorResponse()});
- Logger.debug("Anfrage zur Signaturpruefung wurde nicht erfolgreich beendet:"
- + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e));
- throw fault;
- }
-
- return response;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/tools/CertTool.java b/spss.server/src/at/gv/egovernment/moa/spss/server/tools/CertTool.java
deleted file mode 100644
index 9fe17eae2..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/tools/CertTool.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package at.gv.egovernment.moa.spss.server.tools;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.security.cert.CertificateException;
-
-import iaik.asn1.structures.Name;
-import iaik.pki.store.certstore.CertStoreException;
-import iaik.pki.store.certstore.CertStoreTypes;
-import iaik.pki.store.certstore.directory.DirectoryCertStore;
-import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
-import iaik.pki.store.certstore.directory.DirectoryStoreException;
-import iaik.security.ecc.provider.ECCProvider;
-import iaik.security.provider.IAIK;
-import iaik.utils.RFC2253NameParserException;
-import iaik.x509.X509Certificate;
-
-/**
- * A tool to support X509 certificate handling for configuring the MOA SP/SS
- * service.
- *
- * This class provides functions for:
- * <ul>
- * <li>printing certificate information</li>
- * <li>adding certificates to the cert store</li>
- * </ul>
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CertTool {
-
- /** Error message if the DN cannot be parsed according to RFC2253. */
- private static final String ILLEGAL_RFC2253_NAME =
- "Kein gültiger RFC2253-Name";
-
- /**
- * Main entry point of the tool.
- *
- * @param args The command line arguments. A single argument is expected,
- * which is the file name of the X509 certificate to inspect.
- */
- public static void main(String args[]) {
- CertTool certTool = new CertTool();
-
- if (args.length == 2 && "-info".equals(args[0])) {
- initProviders();
- certTool.printCertInfo(args[1], System.out);
- } else if (args.length == 3 && "-add".equals(args[0])) {
- initProviders();
- certTool.addCertToCertStore(args[1], args[2]);
- } else {
- certTool.printUsage(System.err);
- }
- }
-
- /**
- * Init the JCE providers, depending on the JDK used.
- *
- * Adds the IAIK JCE and IAIK ECC providers.
- */
- private static void initProviders() {
- if (System.getProperty("java.version").startsWith("1.3")) {
- IAIK.addAsProvider();
- } else {
- IAIK.addAsJDK14Provider();
- }
- ECCProvider.addAsProvider();
- }
-
- /**
- * Print the information about the certificate.
- *
- * This method will output information about the Subject DN, the Issuer DN and
- * the serial number of the certificate.
- *
- * @param certFile The name of the certificate file to inspect.
- * @param out The stream to print the information to.
- */
- public void printCertInfo(String certFile, PrintStream out) {
- try {
- InputStream is = new BufferedInputStream(new FileInputStream(certFile));
- X509Certificate cert = new X509Certificate(is);
- String issuerDN;
- String serial;
- String subjectDN;
-
- try {
- subjectDN = ((Name) (cert.getSubjectDN())).getRFC2253String();
- } catch (RFC2253NameParserException e) {
- subjectDN = ILLEGAL_RFC2253_NAME;
- }
-
- try {
- issuerDN = ((Name) (cert.getIssuerDN())).getRFC2253String();
- } catch (RFC2253NameParserException e) {
- issuerDN = ILLEGAL_RFC2253_NAME;
- }
-
- serial = cert.getSerialNumber().toString();
-
- out.println("SubjectDN (RFC2253): " + subjectDN);
- out.println("IssuerDN (RFC2253) : " + issuerDN);
- out.println("Serial Number : " + serial);
- } catch (FileNotFoundException e) {
- System.err.println("Zertifikat nicht gefunden: " + certFile);
- } catch (IOException e) {
- System.err.println(
- "I/O Fehler beim Lesen des Zertifikats: " + e.getMessage());
- } catch (CertificateException e) {
- System.err.println(
- "Fehler beim Lesen des Zertifikats: " + e.getMessage());
- } catch (Throwable t) {
- System.err.println("Allgemeiner Fehler: " + t.getMessage());
- }
- }
-
- /**
- * Add a certificate to a directory certificate store.
- *
- * @param certFile The certificate to add.
- * @param certStoreRoot The root directory of the certificate store.
- */
- public void addCertToCertStore(String certFile, String certStoreRoot) {
- try {
- // read the certificate
- InputStream is = new BufferedInputStream(new FileInputStream(certFile));
- X509Certificate cert = new X509Certificate(is);
-
- // initialize the DirectoryCertStore
- DirectoryCertStore certStore =
- new DirectoryCertStore(
- new SimpleDirectoryCertStoreParameters(certStoreRoot),
- null);
-
- certStore.storeCertificate(cert, null);
-
- System.out.println("\nDas Zertifikat wurde erfolreich hinzugefügt.\n");
-
- } catch (FileNotFoundException e) {
- System.err.println("Zertifikat nicht gefunden: " + certFile);
- } catch (IOException e) {
- System.err.println(
- "I/O Fehler beim Lesen des Zertifikats: " + e.getMessage());
- } catch (CertificateException e) {
- System.err.println(
- "Fehler beim Lesen des Zertifikats: " + e.getMessage());
- } catch (DirectoryStoreException e) {
- System.err.println(
- "Fehler beim Öffnen des Zertifikatsspeichers: " + e.getMessage());
- } catch (CertStoreException e) {
- System.err.println(
- "Fehler beim Hinzufügen des Zertifikats: " + e.getMessage());
- } catch (Throwable t) {
- System.err.println("Allgemeiner Fehler: " + t.getMessage());
- t.printStackTrace();
- }
- }
-
- /**
- * Print tool usage.
- *
- * @param out The <code>PrintStream</code> to print to.
- */
- private void printUsage(PrintStream out) {
- out.println("\nCerttool-Syntax:\n");
- out.println("-info <X509 Zertifikatsdatei");
- out.println();
- out.println("-add <X509 Zertifikatsdatei> <Zertifikatsspeicher>");
- out.println("\n");
- }
-
-}
-
-/**
- * Simple implementation of the <code>DirectoryCertStoreParameters</code>
- * interface intelligent enough for setting up a simple
- * <code>DirectoryCertStore</code> in the <code>CertTool</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-class SimpleDirectoryCertStoreParameters
- implements DirectoryCertStoreParameters {
-
- /** The cert store root directory. */
- private String rootDirectory;
-
- /**
- * Create a new <code>SimpleDirectoryCertStoreParameters</code> object.
- *
- * @param rootDirectory The root directory of the cert store.
- */
- public SimpleDirectoryCertStoreParameters(String rootDirectory) {
- this.rootDirectory = rootDirectory;
- }
-
- /**
- * @return <code>&quot;MOA Directory CertStore&quot;</code>
- * @see iaik.pki.store.certstore.CertStoreParameters#getId()
- */
- public String getId() {
- return "MOA Directory CertStore";
- }
-
- /**
- * @return CertStoreTypes.DIRECTORY
- * @see iaik.pki.store.certstore.CertStoreParameters#getType()
- */
- public String getType() {
- return CertStoreTypes.DIRECTORY;
- }
-
- /**
- * @return <code>false</code>
- * @see iaik.pki.store.certstore.CertStoreParameters#isReadOnly()
- */
- public boolean isReadOnly() {
- return false;
- }
-
- /**
- * @return <code>false</code>
- * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#createNew()
- */
- public boolean createNew() {
- return false;
- }
-
- /**
- * @return The root directory given at construction time.
- * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#getRootDirectory()
- */
- public String getRootDirectory() {
- return rootDirectory;
- }
-
-} \ No newline at end of file
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java b/spss.server/src/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
deleted file mode 100644
index d5c3b48c1..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package at.gv.egovernment.moa.spss.server.tools;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-/**
- * A tool for converting a MOA SPSS Version 1.0 configuration file into
- * a Version 1.3 configuration file.
- *
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class ConfigTool
-{
- public static void main(String[] args)
- {
- if (args == null || args.length != 2)
- {
- System.out.println("Usage: ConfigTool <MOA.SPSS.1-0.ConfigFile.xml> <MOA.SPSS.1-3.ConfigFile.xml>");
- System.out.println(" <MOA.SPSS.1-0.ConfigFile.xml> ... Old config file to be transformed");
- System.out.println(" <MOA.SPSS.1-3.ConfigFile.xml> ... New config file resulting from the transform");
- System.exit(-1);
- }
-
- try
- {
- TransformerFactory tFactory = TransformerFactory.newInstance();
- Transformer transformer = tFactory.newTransformer(new StreamSource(
- ConfigTool.class.getResourceAsStream("/resources/tools/ConfigurationMapper.xsl")));
- transformer.transform(new StreamSource(args[0]), new StreamResult(new FileOutputStream(args[1])));
-
- System.out.println("Successfully mapped configuration file.");
- }
- catch (TransformerConfigurationException e)
- {
- System.err.println("An error occurred during mapping the configuration file:");
- System.err.println(" Cannot initialize XSLT transform.");
- System.err.println(" " + e.getMessage());
- }
- catch (FileNotFoundException e)
- {
- System.err.println("An error occurred during mapping the configuration file:");
- System.err.println(" There is a problem with the filename for the new configuration file.");
- System.err.println(" " + e.getMessage());
- }
- catch (TransformerException e)
- {
- System.err.println("An error occurred during mapping the configuration file:");
- System.err.println(" " + e.getMessage());
- }
- }
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java b/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
deleted file mode 100644
index 407dbd4e9..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package at.gv.egovernment.moa.spss.server.transaction;
-
-import java.security.cert.X509Certificate;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-
-/**
- * Contains information about the current request.
- *
- * @author Stefan Knirsch
- * @author Patrick Peck
- */
-public class TransactionContext {
-
- /** The client certificate. */
- private X509Certificate[] clientCertificate = null;
- /** The transaction ID. */
- private String transactionID = null;
- /** The name of the request. */
- private String requestName = null;
- /** The configuration to use throughout the request. */
- private ConfigurationProvider configuration = null;
-
- /**
- * Create a <code>TransactionContext</code> object.
- *
- * @param transactionID A unique ID for this <code>TransactionContext</code>.
- * @param clientCertificate The client certificate chain.
- * @param configuration The MOA configuration to use for this transaction.
- */
- public TransactionContext(
- String transactionID,
- X509Certificate[] clientCertificate,
- ConfigurationProvider configuration) {
-
- this.transactionID = transactionID;
- this.clientCertificate = clientCertificate;
- this.configuration = configuration;
- }
-
- /**
- * Returns the client certificate.
- *
- * @return The client certificate chain, if SSL client authentication has been
- * configured in the web server and has been used by the client. The 0th
- * element of the array contains the client certificate. <code>null</code>
- * otherwise.
- */
- public X509Certificate[] getClientCertificate() {
- return clientCertificate;
- }
-
- /**
- * Returns the unique transaction ID.
- *
- * @return The transaction ID.
- */
- public String getTransactionID() {
- return transactionID;
- }
-
- /**
- * Returns the name of the request.
- *
- * @return The name of the request.
- */
- public String getRequestName() {
- return requestName;
- }
-
- /**
- * Sets the name of the request.
- *
- * @param requestName The request name to set.
- */
- public void setRequestName(String requestName) {
- this.requestName = requestName;
- }
-
- /**
- * Returns the <code>ConfigurationProvider</code> associated with this
- * transaction.
- *
- * @return The ConfigurationProvider associated with this transaction.
- */
- public ConfigurationProvider getConfiguration() {
- return configuration;
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContextManager.java b/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContextManager.java
deleted file mode 100644
index 13127c3ae..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionContextManager.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package at.gv.egovernment.moa.spss.server.transaction;
-
-/**
- * Provides each thread with an instance of <code>TransactionContext</code>.
- *
- * The single instance of the <code>TransactionContextManager</code> should be
- * used to access contextual information for each web service transaction, e.g.
- * the transaction ID, MOA configuration, client certificate, etc.
- *
- * @author Stefan Knirsch
- * @author Patrick Peck
- */
-public class TransactionContextManager {
-
- /** The single instance of <code>TransactionContextManager</code> */
- private static TransactionContextManager instance = null;
-
- /** Contains a single <code>TransactionContext</code> for each thread. */
- private ThreadLocal context = null;
-
- /**
- * Get the single instance of <code>TransactionContextManager</code>.
- *
- * @return The single instanc of <code>TransactionContextManager</code>.
- */
- public static synchronized TransactionContextManager getInstance() {
- if (instance == null) {
- instance = new TransactionContextManager();
- }
- return instance;
- }
-
- /**
- * Creates a new <code>TransactionContextManager</code>.
- *
- * Protected to disallow direct instantiation.
- */
- protected TransactionContextManager() {
- context = new ThreadLocal();
- }
-
- /**
- * Set the <code>TransactionContext</code> for the current thread.
- *
- * @param txContext The <code>TransactionContext</code> for this thread.
- */
- public void setTransactionContext(TransactionContext txContext) {
- context.set(txContext);
- }
-
- /**
- * Get the <code>TransactionContext</code> for the current thread.
- *
- * @return The <code>TransactionContext</code> for the current thread or
- * <code>null</code>, if none has been set (or if this method is being invoked
- * outside the bounds of a transaction).
- */
- public TransactionContext getTransactionContext() {
- return (TransactionContext) context.get();
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionIDGenerator.java b/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionIDGenerator.java
deleted file mode 100644
index 6eb07defe..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/transaction/TransactionIDGenerator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package at.gv.egovernment.moa.spss.server.transaction;
-
-
-/**
- * A generator for unique transaction IDs.
- *
- * <p>The transaction IDs are of the form "<base>-<counter>", where:
- * <ul>
- * <li><code>base</code> is initialized with the system time when this class is
- * being loaded</li>
- * <li><code>counter</code> is incremented sequentially on each call to
- * <code>nextID()</code></li>
- * </ul>
- * </p>
- *
- * <p> Assuming that it is highly unlikely that MOA servers are started at
- * exactly the same time instant, the mechanism provided by this class should
- * guarantee unique transaction IDs across multiple restarts and/or instances of
- * the server.</p>
- *
- * @author Patrick Peck
- * @author Stefan Knirsch
- */
-public class TransactionIDGenerator {
-
- /** Request sequence number. */
- private static long counter = 0;
- /** The base value to which to append the sequence number. */
- private static String base = null;
-
- /**
- * Set up the initial base value.
- */
- static {
- synchronized (TransactionIDGenerator.class) {
- base = Long.toString(System.currentTimeMillis());
- }
- }
-
- /**
- * Returns the next transaction ID.
- *
- * @return The next transaction ID.
- */
- public static synchronized String nextID() {
- counter++;
-
- return (base + "-" + counter);
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/util/IdGenerator.java b/spss.server/src/at/gv/egovernment/moa/spss/server/util/IdGenerator.java
deleted file mode 100644
index 2dfd22140..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/util/IdGenerator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package at.gv.egovernment.moa.spss.server.util;
-
-import java.util.Set;
-
-/**
- * Generate unique ID values for various objects in the response.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class IdGenerator {
- /** The base value to append the counter to. */
- private String base;
- /** The <code>Set</code> of reserved ID values. */
- private Set reserved;
- /** The sequence number. */
- private int count;
-
- /**
- * Create a new <code>IdGenerator</code>.
- *
- * @param base A base value to append the IDs to. The creator of this object
- * should provide a base value, so that appending the counter leads to unique
- * IDs.
- * @param reserved The <code>Set</code> of reserved IDs. A call to
- * <code>uniqueId()</code> will respect the reserved IDs.
- */
- public IdGenerator(String base, Set reserved) {
- this.base = base;
- this.reserved = reserved;
- count = 1;
- }
-
- /**
- * Create the next ID value in the sequence.
- *
- * @return The next ID value in the sequence.
- */
- protected String nextId() {
- return base + "-" + count++;
- }
-
- /**
- * Create the next unique ID value which is unique in the reserved ID set.
- *
- * The created ID is added to the set of reserved IDs.
- *
- * @return The next ID value.
- */
- public String uniqueId() {
- String nextId;
-
- while (reserved.contains(nextId = nextId()));
-
- reserved.add(nextId);
-
- return nextId;
-
- }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/util/MessageProvider.java b/spss.server/src/at/gv/egovernment/moa/spss/util/MessageProvider.java
deleted file mode 100644
index a6f6c1d4a..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/util/MessageProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package at.gv.egovernment.moa.spss.util;
-
-import java.util.Locale;
-
-import at.gv.egovernment.moa.util.Messages;
-
-/**
- * Singleton wrapper around a <code>Messages</code> object.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class MessageProvider {
-
- /** The resource names of the messages to load. */
- private static final String[] DEFAULT_MESSAGE_RESOURCES =
- { "resources/properties/spss_messages" };
- /** The corresponding message locales. */
- 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 the <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/spss_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/spss.server/src/test/at/gv/egovernment/moa/spss/AllTests.java b/spss.server/src/test/at/gv/egovernment/moa/spss/AllTests.java
deleted file mode 100644
index c670b5e55..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/AllTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package test.at.gv.egovernment.moa.spss;
-
-import test.at.gv.egovernment.moa.spss.server.iaik.config.ConfigurationDataImplTest;
-import test.at.gv.egovernment.moa.spss.server.iaik.config.IaikConfiguratorTest;
-import test.at.gv.egovernment.moa.spss.server.tools.CertToolTest;
-
-import junit.awtui.TestRunner;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Test suite for all unit tests.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
-
- suite.addTestSuite(test.at.gv.egovernment.moa.spss.server.config.AllTests.class);
- suite.addTestSuite(ConfigurationDataImplTest.class);
- suite.addTestSuite(IaikConfiguratorTest.class);
- suite.addTest(
- test.at.gv.egovernment.moa.spss.server.invoke.AllTests.suite());
- suite.addTest(test.at.gv.egovernment.moa.spss.api.xmlbind.AllTests.suite());
- suite.addTestSuite(CertToolTest.class);
-
- return suite;
- }
-
- public static void main(String[] args) {
- try {
- TestRunner.run(AllTests.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/SPSSTestCase.java b/spss.server/src/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
deleted file mode 100644
index a585e30a0..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/SPSSTestCase.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package test.at.gv.egovernment.moa.spss;
-
-import java.security.Security;
-
-import test.at.gv.egovernment.moa.MOATestCase;
-
-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.util.MessageProvider;
-
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-
-/**
- * Base class for MOA test cases.
- *
- * Provides some utility functions.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class SPSSTestCase extends MOATestCase {
-
- protected static final String TESTDATA_ROOT = "data/test/";
-
- /**
- * Constructor for MOATestCase.
- * @param arg0
- */
- public SPSSTestCase(String name) {
- super(name);
- }
-
- /**
- * Set up a transaction context with a test configuration.
- */
- protected void setUpTransactionContext() throws Exception {
- System.setProperty(
- ConfigurationProvider.CONFIG_PROPERTY_NAME,
- "data/test/conf/moa-spss/MOA-SPSSConfiguration.xml");
- ConfigurationProvider config = ConfigurationProvider.getInstance();
- TransactionContext context = new TransactionContext("test", null, config);
- TransactionContextManager.getInstance().setTransactionContext(context);
- }
-
- protected void setUpLoggingContext() throws Exception {
- LoggingContext context = new LoggingContext("test");
- LoggingContextManager.getInstance().setLoggingContext(context);
- }
-
- /**
- * Configure the IAIK modules with the current configuration.
- *
- * A <code>TransactionContext</code> must have been set up before.
- */
- protected void setUpIaikConfiguration() throws Exception {
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
- ClassLoader cl = getClass().getClassLoader();
- MessageProvider msg = MessageProvider.getInstance();
-
- try {
- cl.loadClass("javax.security.cert.Certificate"); // from jcert.jar
- } catch (ClassNotFoundException e) {
- Logger.warn(msg.getMessage("init.03", null), e);
- }
-
- new IaikConfigurator().configure(context.getConfiguration());
- }
-
- protected void setUpSSL() 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");
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java b/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java
deleted file mode 100644
index 28f79729e..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package test.at.gv.egovernment.moa.spss.api.xmlbind;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Runs all tests in this package.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite();
-
- suite.addTestSuite(CreateXMLSignatureRequestParserTest.class);
- suite.addTestSuite(TransformParserTest.class);
- suite.addTestSuite(VerifyCMSSignatureRequestParserTest.class);
- suite.addTestSuite(VerifyXMLSignatureRequestParserTest.class);
-
- return suite;
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java
deleted file mode 100644
index 7ce705b01..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package test.at.gv.egovernment.moa.spss.api.xmlbind;
-
-import org.w3c.dom.Element;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureRequestParser;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureEnvironmentProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.DataObjectInfo;
-import at.gv.egovernment.moa.spss.api.xmlsign.SingleSignatureInfo;
-
-/**
- * Test the <code>CreateXMLSignatureRequestParser</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CreateXMLSignatureRequestParserTest extends SPSSTestCase {
- private static final String TESTDATA_BASE =
- TESTDATA_ROOT + "xml/CreateXMLSignature/";
-
- private CreateXMLSignatureRequestParser requestParser;
-
- public CreateXMLSignatureRequestParserTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- requestParser = new CreateXMLSignatureRequestParser();
- }
-
- public void testParse() throws Exception {
- Element requestElem =
- parseXml(TESTDATA_BASE + "TestGeneratorCX2.001.Req.xml")
- .getDocumentElement();
- CreateXMLSignatureRequest request = requestParser.parse(requestElem);
- SingleSignatureInfo sigInfo;
- DataObjectInfo dataObjInfo;
- CreateTransformsInfoProfileExplicit transProfile;
- CreateSignatureEnvironmentProfileExplicit envProfile;
-
- assertNotNull(request);
- assertEquals("PKCS12RSAKey1", request.getKeyIdentifier());
- assertEquals(1, request.getSingleSignatureInfos().size());
-
- sigInfo = (SingleSignatureInfo) request.getSingleSignatureInfos().get(0);
- assertEquals(1, sigInfo.getDataObjectInfos().size());
- assertFalse(sigInfo.isSecurityLayerConform());
-
- dataObjInfo = (DataObjectInfo) sigInfo.getDataObjectInfos().get(0);
- assertNotNull(dataObjInfo.getDataObject());
-
- transProfile =
- (CreateTransformsInfoProfileExplicit) dataObjInfo
- .getCreateTransformsInfoProfile();
- assertNotNull(
- transProfile.getCreateTransformsInfo().getFinalDataMetaInfo());
-
- envProfile =
- (CreateSignatureEnvironmentProfileExplicit) sigInfo
- .getCreateSignatureInfo()
- .getCreateSignatureEnvironmentProfile();
- assertEquals(
- "//data:Document",
- envProfile.getCreateSignatureLocation().getXPathExpression());
- assertEquals(0, envProfile.getCreateSignatureLocation().getIndex());
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java
deleted file mode 100644
index f580f86bc..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package test.at.gv.egovernment.moa.spss.api.xmlbind;
-
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.spss.api.common.CanonicalizationTransform;
-import at.gv.egovernment.moa.spss.api.common.EnvelopedSignatureTransform;
-import at.gv.egovernment.moa.spss.api.common.ExclusiveCanonicalizationTransform;
-import at.gv.egovernment.moa.spss.api.common.XPathFilter2Transform;
-import at.gv.egovernment.moa.spss.api.common.XPathTransform;
-import at.gv.egovernment.moa.spss.api.common.XSLTTransform;
-import at.gv.egovernment.moa.spss.api.xmlbind.TransformParser;
-
-/**
- * Test the <code>TransformParser</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class TransformParserTest extends SPSSTestCase {
- private static String TESTDATA_BASE = TESTDATA_ROOT + "xml/dsigTransform/";
-
- private TransformParser transformParser;
-
- public TransformParserTest(String name) {
- super(name);
- }
-
- protected void setUp() {
- transformParser = new TransformParser();
- }
-
- public void testParseTransforms() throws Exception {
- Element transformsElem =
- parseXml(TESTDATA_BASE + "transforms.xml").getDocumentElement();
- List transforms = transformParser.parseTransforms(transformsElem);
-
- assertNotNull(transforms);
- assertEquals(3, transforms.size());
-
- }
-
- public void testParseCanonicalizationTransform() throws Exception {
- Element transformElem =
- parseXml(TESTDATA_BASE + "canonicalization.xml").getDocumentElement();
- CanonicalizationTransform transform =
- (CanonicalizationTransform) transformParser.parseTransform(transformElem);
-
- assertNotNull(transform);
- assertEquals(
- CanonicalizationTransform.CANONICAL_XML,
- transform.getAlgorithmURI());
- }
-
- public void testParseExclCanonicalizationTransform() throws Exception {
- Element transformElem =
- parseXml(TESTDATA_BASE + "exclusiveCanonicalization.xml")
- .getDocumentElement();
- ExclusiveCanonicalizationTransform transform =
- (ExclusiveCanonicalizationTransform) transformParser.parseTransform(
- transformElem);
-
- assertNotNull(transform);
- assertEquals(
- ExclusiveCanonicalizationTransform.EXCLUSIVE_CANONICAL_XML,
- transform.getAlgorithmURI());
- assertEquals(3, transform.getInclusiveNamespacePrefixes().size());
- }
-
- public void testParseEnvelopedTransform() throws Exception {
- Element transformElem =
- parseXml(TESTDATA_BASE + "enveloped.xml").getDocumentElement();
- EnvelopedSignatureTransform transform =
- (EnvelopedSignatureTransform) transformParser.parseTransform(
- transformElem);
-
- assertNotNull(transform);
- }
-
- public void testParseXPathTransform() throws Exception {
- Element transformElem =
- parseXml(TESTDATA_BASE + "xpath.xml").getDocumentElement();
- XPathTransform transform =
- (XPathTransform) transformParser.parseTransform(transformElem);
-
- assertNotNull(transform);
- assertEquals("//ToBeSigned/Data", transform.getXPathExpression());
- assertEquals(1, transform.getNamespaceDeclarations().size());
- }
-
- public void testParseXPathFilter2Transform() throws Exception {
- Element transformElem =
- parseXml(TESTDATA_BASE + "xpath2.xml").getDocumentElement();
- XPathFilter2Transform transform =
- (XPathFilter2Transform) transformParser.parseTransform(transformElem);
-
- assertNotNull(transform);
- assertEquals(3, transform.getFilters().size());
- }
-
- public void testParseXSLTTransform() throws Exception {
- Element transformElem =
- parseXml(TESTDATA_BASE + "xslt.xml").getDocumentElement();
- XSLTTransform transform =
- (XSLTTransform) transformParser.parseTransform(transformElem);
-
- assertNotNull(transform);
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
deleted file mode 100644
index 4be7667eb..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package test.at.gv.egovernment.moa.spss.api.xmlbind;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.util.DateTimeUtils;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.spss.api.cmsverify.CMSContentExcplicit;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.common.MetaInfo;
-import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureRequestParser;
-
-/**
- * Test the <code>VerifyCMSSignatureRequestParserTest</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class VerifyCMSSignatureRequestParserTest extends SPSSTestCase {
- private static String TESTDATA_BASE =
- TESTDATA_ROOT + "xml/VerifyCMSSignature/";
-
- private VerifyCMSSignatureRequestParser requestParser;
-
- public VerifyCMSSignatureRequestParserTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- requestParser = new VerifyCMSSignatureRequestParser();
- }
-
- public void testParse() throws Exception {
- Element requestElem =
- parseXml(TESTDATA_BASE + "TestGeneratorVC0.001.Req.xml")
- .getDocumentElement();
- VerifyCMSSignatureRequest request = requestParser.parse(requestElem);
- MetaInfo metaInfo;
- CMSContentExcplicit content;
-
- assertNotNull(request);
- assertEquals(1, request.getSignatories()[0]);
- assertEquals(
- DateTimeUtils.parseDateTime("2003-04-04T09:30:47-05:00"),
- request.getDateTime());
- assertNotNull(request.getCMSSignature());
- assertNotNull(request.getDataObject());
- assertEquals("TrustProfile1", request.getTrustProfileId());
-
- metaInfo = request.getDataObject().getMetaInfo();
- assertNotNull(metaInfo);
- assertEquals("text/plain", metaInfo.getMimeType());
- assertEquals("http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt", metaInfo.getDescription());
-
- content = (CMSContentExcplicit) request.getDataObject().getContent();
- assertNotNull(content.getBinaryContent());
-
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
deleted file mode 100644
index 3b8e8b00e..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package test.at.gv.egovernment.moa.spss.api.xmlbind;
-
-import org.w3c.dom.Element;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.util.DateTimeUtils;
-
-import at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureRequestParser;
-import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.SignatureManifestCheckParams;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyTransformsInfoProfileExplicit;
-import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest;
-
-/**
- * Test the <code>VerifyXMLSignatureRequestParserTest</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class VerifyXMLSignatureRequestParserTest extends SPSSTestCase {
- private static String TESTDATA_BASE =
- TESTDATA_ROOT + "xml/VerifyXMLSignature/";
-
- private VerifyXMLSignatureRequestParser parser;
-
- public VerifyXMLSignatureRequestParserTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- parser = new VerifyXMLSignatureRequestParser();
- }
-
- public void testParse() throws Exception {
- Element requestElem =
- parseXml(TESTDATA_BASE + "TestGeneratorVX.201.Req.xml")
- .getDocumentElement();
- VerifyXMLSignatureRequest request = parser.parse(requestElem);
- VerifySignatureInfo verifySignatureInfo;
- VerifySignatureLocation verifyLocation;
- SignatureManifestCheckParams checkParams;
- ReferenceInfo refInfo;
- VerifyTransformsInfoProfileExplicit transformsProfile;
-
- assertNotNull(request);
- assertEquals(
- DateTimeUtils.parseDateTime("2003-04-01T12:53:57+01:00"),
- request.getDateTime());
- assertFalse(request.getReturnHashInputData());
- assertEquals("TrustProfile1", request.getTrustProfileId());
-
- verifySignatureInfo = request.getSignatureInfo();
- assertNotNull(verifySignatureInfo);
- assertNotNull(verifySignatureInfo.getVerifySignatureEnvironment());
-
- verifyLocation = verifySignatureInfo.getVerifySignatureLocation();
- assertNotNull(verifyLocation);
- assertEquals("//dsig:Signature", verifyLocation.getXPathExpression());
- assertEquals(3, verifyLocation.getNamespaceDeclarations().size());
-
- checkParams = request.getSignatureManifestCheckParams();
- assertNotNull(checkParams);
- assertEquals(true, checkParams.getReturnReferenceInputData());
- assertEquals(1, checkParams.getReferenceInfos().size());
-
- refInfo = (ReferenceInfo) checkParams.getReferenceInfos().get(0);
- assertEquals(1, refInfo.getVerifyTransformsInfoProfiles().size());
-
- transformsProfile =
- (VerifyTransformsInfoProfileExplicit) refInfo
- .getVerifyTransformsInfoProfiles()
- .get(0);
- assertEquals(1, transformsProfile.getTransforms().size());
- assertEquals(1, transformsProfile.getTransformParameters().size());
-
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/AllTests.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/AllTests.java
deleted file mode 100644
index 131f38c19..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/AllTests.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.config;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class AllTests
-{
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- suite.addTestSuite(ConfigurationProviderTest1.class);
- suite.addTestSuite(ConfigurationProviderTest2.class);
- suite.addTestSuite(ConfigurationProviderTest3.class);
- return suite;
- }
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
deleted file mode 100644
index 474a387ad..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest1.java
+++ /dev/null
@@ -1,377 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.config;
-
-import iaik.asn1.structures.Name;
-import iaik.pki.pathvalidation.ChainingModes;
-import iaik.utils.RFC2253NameParser;
-import iaik.utils.RFC2253NameParserException;
-import iaik.x509.X509Certificate;
-
-import java.math.BigInteger;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.server.config.CRLDistributionPoint;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.config.HardwareCryptoModule;
-import at.gv.egovernment.moa.spss.server.config.HardwareKeyModule;
-import at.gv.egovernment.moa.spss.server.config.KeyGroup;
-import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry;
-import at.gv.egovernment.moa.spss.server.config.OCSPDistributionPoint;
-import at.gv.egovernment.moa.spss.server.config.SoftwareKeyModule;
-import at.gv.egovernment.moa.spss.server.config.TrustProfile;
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class ConfigurationProviderTest1 extends TestCase
-{
- private static final String CONFIG_BASE_ =
- "e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/";
-
- static at.gv.egovernment.moa.spss.server.config.ConfigurationProvider provider_;
-
- static
- {
- System.setProperty(
- "log4j.configuration",
- "file:/" + CONFIG_BASE_ + "log4j.properties");
- System.setProperty(
- at.gv.egovernment.moa.spss.server.config.ConfigurationProvider.CONFIG_PROPERTY_NAME,
- CONFIG_BASE_ + "moa.spss.complete-config.xml");
- try
- {
- ConfigurationProvider.reload();
- provider_ = at.gv.egovernment.moa.spss.server.config.ConfigurationProvider.getInstance();
- }
- catch (ConfigurationException e)
- {
- throw new RuntimeException("Fehler beim Setup des Tests: " + e.getMessage());
- }
- }
-
- /**
- * Constructor for ConfigurationProvider.
- * @param arg0
- */
- public ConfigurationProviderTest1() throws MOAException
- {
- super("ConfigurationProvider");
- }
-
- public void testGetWarnings()
- {
- assertEquals(0, provider_.getWarnings().size());
- }
-
- public void testGetDigestMethodAlgorithmName()
- {
- assertEquals(
- Constants.SHA1_URI,
- provider_.getDigestMethodAlgorithmName());
- }
-
- public void testGetCanonicalizationAlgorithmName()
- {
- assertEquals(
- Constants.C14N_WITH_COMMENTS_URI,
- provider_.getCanonicalizationAlgorithmName());
- }
-
- public void testGetHardwareCryptoModules()
- {
- List hwcms = provider_.getHardwareCryptoModules();
- assertEquals(2, hwcms.size());
-
- HardwareCryptoModule hwc1 = (HardwareCryptoModule) hwcms.get(0);
- assertEquals("HWC1_Name", hwc1.getName());
- assertEquals("HWC1_SlotId", hwc1.getSlotID());
- assertEquals("HWC1_UserPIN", hwc1.getUserPIN());
-
- HardwareCryptoModule hwc2 = (HardwareCryptoModule) hwcms.get(1);
- assertEquals("HWC2_Name", hwc2.getName());
- assertNull(hwc2.getSlotID());
- assertEquals("HWC2_UserPIN", hwc2.getUserPIN());
- }
-
- public void testGetHardwareKeyModules()
- {
- List hwkms = provider_.getHardwareKeyModules();
- assertEquals(2, hwkms.size());
-
- HardwareKeyModule hwk1 = (HardwareKeyModule) hwkms.get(0);
- assertEquals("HWK1_Id", hwk1.getId());
- assertEquals("HWK1_Name", hwk1.getName());
- assertEquals("HWK1_SlotId", hwk1.getSlotID());
- assertEquals("HWK1_UserPIN", hwk1.getUserPIN());
-
- HardwareKeyModule hwk2 = (HardwareKeyModule) hwkms.get(1);
- assertEquals("HWK2_Id", hwk2.getId());
- assertEquals("HWK2_Name", hwk2.getName());
- assertNull(hwk2.getSlotID());
- assertEquals("HWK2_UserPIN", hwk2.getUserPIN());
- }
-
- public void testGetSoftwareKeyModules()
- {
- List swkms = provider_.getSoftwareKeyModules();
- assertEquals(2, swkms.size());
-
- SoftwareKeyModule swk1 = (SoftwareKeyModule) swkms.get(0);
- assertEquals("SWK1_Id", swk1.getId());
- assertEquals(CONFIG_BASE_ + "swk/SWK1_FileName.txt", swk1.getFileName().replace('\\', '/'));
- assertEquals("SWK1_Password", swk1.getPassWord());
-
- SoftwareKeyModule swk2 = (SoftwareKeyModule) swkms.get(1);
- assertEquals("SWK2_Id", swk2.getId());
- assertEquals(CONFIG_BASE_ + "swk/SWK2_FileName.txt", swk2.getFileName().replace('\\', '/'));
- assertNull(swk2.getPassWord());
- }
-
- public void testGetKeyGroups()
- {
- Map keyGroups = provider_.getKeyGroups();
- assertEquals(2, keyGroups.size());
-
- KeyGroup kg1 = (KeyGroup) keyGroups.get("KG1_Id");
- assertNotNull(kg1);
- assertEquals("KG1_Id", kg1.getId());
-
- Set kg1Entries = kg1.getKeyGroupEntries();
- assertEquals(2, kg1Entries.size());
-
- Iterator kg1EntriesIt = kg1Entries.iterator();
- while(kg1EntriesIt.hasNext())
- {
- KeyGroupEntry currentEntry = (KeyGroupEntry)kg1EntriesIt.next();
- if ("HWK1_Id".equals(currentEntry.getModuleID()))
- {
- assertEquals("CN=HWK1_Issuer", currentEntry.getIssuerDN());
- assertEquals(0, currentEntry.getSerialNumber().intValue());
- }
- else if ("HWK2_Id".equals(currentEntry.getModuleID()))
- {
- assertEquals("CN=HWK2_Issuer", currentEntry.getIssuerDN());
- assertEquals(1, currentEntry.getSerialNumber().intValue());
- }
- else fail("Invalid module identifer found.");
- }
-
- KeyGroup kg2 = (KeyGroup) keyGroups.get("KG2_Id");
- assertNotNull(kg2);
- assertEquals("KG2_Id", kg2.getId());
-
- Set kg2Entries = kg2.getKeyGroupEntries();
- assertEquals(2, kg2Entries.size());
-
- Iterator kg2EntriesIt = kg1Entries.iterator();
- while(kg1EntriesIt.hasNext())
- {
- KeyGroupEntry currentEntry = (KeyGroupEntry)kg2EntriesIt.next();
- if ("SWK1_Id".equals(currentEntry.getModuleID()))
- {
- assertEquals("CN=CN=SWK1_Issuer", currentEntry.getIssuerDN());
- assertEquals(2, currentEntry.getSerialNumber().intValue());
- }
- else if ("SWK2_Id".equals(currentEntry.getModuleID()))
- {
- assertEquals("CN=SWK2_Issuer", currentEntry.getIssuerDN());
- assertEquals(3, currentEntry.getSerialNumber().intValue());
- }
- else fail("Invalid module identifer found.");
- }
- }
-
- public void testGetKeyGroupEntries() throws RFC2253NameParserException
- {
- RFC2253NameParser parser = new RFC2253NameParser("CN=Customer1_Issuer");
- Name name = parser.parse();
- Set kgEntries = provider_.getKeyGroupEntries(name, BigInteger.valueOf(4), "KG1_Id");
- assertEquals(2, kgEntries.size());
-
- Iterator kgEntriesIt = kgEntries.iterator();
- while (kgEntriesIt.hasNext())
- {
- KeyGroupEntry currentEntry = (KeyGroupEntry) kgEntriesIt.next();
- if (!"HWK1_Id".equals(currentEntry.getModuleID()) && !"HWK2_Id".equals(currentEntry.getModuleID()))
- {
- fail("Invalid module identifier found.");
- }
- }
- }
-
- public void testGetChainingMode() throws RFC2253NameParserException
- {
- X509Certificate cert = new X509Certificate();
- RFC2253NameParser parser = new RFC2253NameParser("CN=Unknown");
- Name name = parser.parse();
- cert.setIssuerDN(name);
- cert.setSerialNumber(BigInteger.valueOf(0));
- assertEquals(ChainingModes.PKIX_MODE, provider_.getChainingMode(cert)); // Default chaining mode
-
- parser = new RFC2253NameParser("CN=TA1_Issuer");
- name = parser.parse();
- cert.setIssuerDN(name);
- cert.setSerialNumber(BigInteger.valueOf(5));
- assertEquals(ChainingModes.CHAIN_MODE, provider_.getChainingMode(cert));
- }
-
- public void testGetDistributionPoints() throws RFC2253NameParserException
- {
- X509Certificate cert = new X509Certificate();
- RFC2253NameParser parser = new RFC2253NameParser("CN=DP1_Issuer");
- Name name = parser.parse();
- cert.setIssuerDN(name);
-
- Set dps = provider_.getDistributionPoints(cert);
- assertEquals(2, dps.size());
-
- Iterator dpIt = dps.iterator();
- while (dpIt.hasNext())
- {
- CRLDistributionPoint currentDP = (CRLDistributionPoint)dpIt.next();
- if ("http://crl.myca.org".equals(currentDP.getUri()))
- {
- int reasonCodes =
- iaik.asn1.structures.DistributionPoint.unused |
- iaik.asn1.structures.DistributionPoint.keyCompromise |
- iaik.asn1.structures.DistributionPoint.cACompromise |
- iaik.asn1.structures.DistributionPoint.affiliationChanged |
- iaik.asn1.structures.DistributionPoint.superseded |
- iaik.asn1.structures.DistributionPoint.cessationOfOperation |
- iaik.asn1.structures.DistributionPoint.certificateHold |
- iaik.asn1.structures.DistributionPoint.privilegeWithdrawn |
- iaik.asn1.structures.DistributionPoint.aACompromise;
- assertEquals(reasonCodes, currentDP.getReasonCodes());
- }
- else if ("http://crl.myotherca.org".equals(currentDP.getUri()))
- {
- int reasonCodes =
- iaik.asn1.structures.DistributionPoint.aACompromise |
- iaik.asn1.structures.DistributionPoint.affiliationChanged;
- assertEquals(reasonCodes, currentDP.getReasonCodes());
- }
- else fail("Invalid CRL DP URI found: " + currentDP.getUri());
- }
-
- parser = new RFC2253NameParser("CN=DP2_Issuer");
- name = parser.parse();
- cert.setIssuerDN(name);
-
- dps = provider_.getDistributionPoints(cert);
- assertEquals(1, dps.size());
-
- OCSPDistributionPoint dpo = (OCSPDistributionPoint) dps.toArray()[0];
- assertEquals("http://crl.yetanotherca.org", dpo.getUri());
- }
-
- public void testGetCRLArchiveDuration()
- {
- assertEquals(730, provider_.getCRLArchiveDuration());
- }
-
- public void testGetEnableRevocationArchiving()
- {
- assertFalse(provider_.getEnableRevocationArchiving());
- }
-
- public void testGetCertStoreLocation()
- {
- assertEquals(
- CONFIG_BASE_ + "certstore_test",
- provider_.getCertStoreLocation().replace('\\', '/'));
- }
-
- public void testGetCreateTransformsInfoProfile()
- {
- Element ctip1 = provider_.getCreateTransformsInfoProfile("CTIP_1");
- assertEquals("CreateTransformsInfoProfile", ctip1.getLocalName());
-
- Element ctip2 = provider_.getCreateTransformsInfoProfile("CTIP_2");
- assertEquals("CreateTransformsInfoProfile", ctip2.getLocalName());
- }
-
- public void testGetCreateSignatureEnvironmentProfile()
- {
- Element csep = provider_.getCreateSignatureEnvironmentProfile("CSEP_1");
- assertEquals("CreateSignatureEnvironmentProfile", csep.getLocalName());
- }
-
- public void testGetVerifyTransformsInfoProfile()
- {
- Element vtip = provider_.getVerifyTransformsInfoProfile("VTIP_1");
- assertEquals("VerifyTransformsInfoProfile", vtip.getLocalName());
- }
-
- public void testGetSupplementProfile()
- {
- Element sp = provider_.getSupplementProfile("SP_1");
- assertEquals("SupplementProfile", sp.getLocalName());
- }
-
- public void testGetTrustProfile()
- {
- TrustProfile tp1 = provider_.getTrustProfile("TP1_Id");
- assertEquals(
- "file:/" + CONFIG_BASE_ + "trustprofiles/tp1/anchors",
- tp1.getUri());
- assertEquals(
- "file:/" + CONFIG_BASE_ + "trustprofiles/tp1/signercerts",
- tp1.getSignerCertsUri());
-
- TrustProfile tp2 = provider_.getTrustProfile("TP2_Id");
- assertEquals(
- "file:" + CONFIG_BASE_ + "trustprofiles/tp2/anchors",
- tp2.getUri());
- assertEquals(
- "file:" + CONFIG_BASE_ + "trustprofiles/tp2/signercerts",
- tp2.getSignerCertsUri());
- }
-
- public void testGetRevocationArchiveJDBCURL()
- {
- assertEquals("jdbc://dummy", provider_.getRevocationArchiveJDBCURL());
- }
-
- public void testGetRevocationArchiveJDBCDriverClass()
- {
- assertEquals("fully.qualified.classname", provider_.getRevocationArchiveJDBCDriverClass());
- }
-
- public void testGetEnableRevocationChecking()
- {
- assertFalse(provider_.getEnableRevocationChecking());
- }
-
- public void testGetMaxRevocationAge()
- {
- assertEquals(10000, provider_.getMaxRevocationAge());
- }
-
- public void testGetServiceOrder()
- {
- String[] serviceOrder = provider_.getServiceOrder();
- assertEquals(2, serviceOrder.length);
- assertEquals("crl", serviceOrder[0]);
- assertEquals("ocsp", serviceOrder[1]);
- }
-
- public void testGetAutoAddCertificates()
- {
- assertFalse(provider_.getAutoAddCertificates());
- }
-
- public void testGetUseAuthorityInfoAccess()
- {
- assertFalse(provider_.getUseAuthorityInfoAccess());
- }
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
deleted file mode 100644
index adf02809b..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest2.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.config;
-
-import iaik.asn1.structures.Name;
-import iaik.pki.pathvalidation.ChainingModes;
-import iaik.utils.RFC2253NameParser;
-import iaik.utils.RFC2253NameParserException;
-import iaik.x509.X509Certificate;
-
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.config.TrustProfile;
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class ConfigurationProviderTest2 extends TestCase
-{
- private static final String CONFIG_BASE_ =
- "e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/";
-
- static at.gv.egovernment.moa.spss.server.config.ConfigurationProvider provider_;
-
- static
- {
- System.setProperty(
- "log4j.configuration",
- "file:/" + CONFIG_BASE_ + "log4j.properties");
- System.setProperty(
- at.gv.egovernment.moa.spss.server.config.ConfigurationProvider.CONFIG_PROPERTY_NAME,
- CONFIG_BASE_ + "moa.ss.noopts-config.xml");
- try
- {
- ConfigurationProvider.reload();
- provider_ = at.gv.egovernment.moa.spss.server.config.ConfigurationProvider.getInstance();
- }
- catch (ConfigurationException e)
- {
- throw new RuntimeException("Fehler beim Setup des Tests: " + e.getMessage());
- }
- }
-
-
- /**
- * Constructor for ConfigurationProvider.
- * @param arg0
- */
- public ConfigurationProviderTest2() throws MOAException
- {
- super("ConfigurationProvider");
- }
-
- public void testGetWarnings()
- {
- // 3 Warnings should be collected: C14N not found, DigestMethod not found, ArchiveDuration not found
- assertEquals(3, provider_.getWarnings().size());
- }
-
- public void testGetDigestMethodAlgorithmName()
- {
- // Element is missing in config file, check if default value is returned
- assertEquals(
- Constants.SHA1_URI,
- provider_.getDigestMethodAlgorithmName());
- }
-
- public void testGetCanonicalizationAlgorithmName()
- {
- // Element is missing in config file, check if default value is returned
- assertEquals(
- Constants.C14N_URI,
- provider_.getCanonicalizationAlgorithmName());
- }
-
- public void testGetHardwareCryptoModules()
- {
- // No hardware crypto modules in config file, check for empty list
- List hwcms = provider_.getHardwareCryptoModules();
- assertEquals(0, hwcms.size());
- }
-
- public void testGetHardwareKeyModules()
- {
- List hwkms = provider_.getHardwareKeyModules();
- assertEquals(1, hwkms.size());
- }
-
- public void testGetSoftwareKeyModules()
- {
- // No software key modules in config file, check for empty list
- List swkms = provider_.getSoftwareKeyModules();
- assertEquals(0, swkms.size());
- }
-
- public void testGetChainingMode() throws RFC2253NameParserException
- {
- // Default Chaining Mode not set in configuration, check for default value
- X509Certificate cert = new X509Certificate();
- RFC2253NameParser parser = new RFC2253NameParser("CN=Unknown");
- Name name = parser.parse();
- cert.setIssuerDN(name);
- cert.setSerialNumber(BigInteger.valueOf(0));
- assertEquals(ChainingModes.PKIX_MODE, provider_.getChainingMode(cert));
- }
-
- public void testGetDistributionPoints() throws RFC2253NameParserException
- {
- // Element is missing in config file, check if emty list is returned
- X509Certificate cert = new X509Certificate();
- RFC2253NameParser parser = new RFC2253NameParser("CN=DP1_Issuer");
- Name name = parser.parse();
- cert.setIssuerDN(name);
-
- Set dps = provider_.getDistributionPoints(cert);
- assertEquals(0, dps.size());
- }
-
- public void testGetCRLArchiveDuration()
- {
- // Element is missing in config file, check if default value is returned
- assertEquals(0, provider_.getCRLArchiveDuration());
- }
-
- public void testGetEnableRevocationArchiving()
- {
- // Element is missing in config file, check if default value is returned
- assertFalse(provider_.getEnableRevocationArchiving());
- }
-
- public void testGetCertStoreLocation()
- {
- // Element is missing in config file, check if default value is returned
- assertEquals(
- CONFIG_BASE_ + "certstore",
- provider_.getCertStoreLocation().replace('\\', '/'));
- }
-
- public void testGetCreateTransformsInfoProfile()
- {
- // No profile in config file, check for null
- Element ctip1 = provider_.getCreateTransformsInfoProfile("CTIP_1");
- assertNull(ctip1);
- }
-
- public void testGetCreateSignatureEnvironmentProfile()
- {
- // No profile in config file, check for null
- Element csep = provider_.getCreateSignatureEnvironmentProfile("CSEP_1");
- assertNull(csep);
- }
-
- public void testGetVerifyTransformsInfoProfile()
- {
- // No profile in config file, check for null
- Element vtip = provider_.getVerifyTransformsInfoProfile("VTIP_1");
- assertNull(vtip);
- }
-
- public void testGetSupplementProfile()
- {
- // No profile in config file, check for null
- Element sp = provider_.getSupplementProfile("SP_1");
- assertNull(sp);
- }
-
- public void testGetTrustProfile()
- {
- // No trust profiles config file, check for null
- TrustProfile tp1 = provider_.getTrustProfile("TP1_Id");
- assertNull(tp1);
- }
-
- public void testGetRevocationArchiveJDBCURL()
- {
- // Element is missing in config file, check for null
- assertNull(provider_.getRevocationArchiveJDBCURL());
- }
-
- public void testGetRevocationArchiveJDBCDriverClass()
- {
- // Element is missing in config file, check for null
- assertNull(provider_.getRevocationArchiveJDBCDriverClass());
- }
-
- public void testGetEnableRevocationChecking()
- {
- // Element is missing in config file, check for default value
- assertFalse(provider_.getEnableRevocationChecking());
- }
-
- public void testGetMaxRevocationAge()
- {
- // Element is missing in config file, check for default value
- assertEquals(0, provider_.getMaxRevocationAge());
- }
-
- public void testGetServiceOrder()
- {
- // Element is missing in config file, check for empty array
- String[] serviceOrder = provider_.getServiceOrder();
- assertEquals(0, serviceOrder.length);
- }
-
- public void testGetAutoAddCertificates()
- {
- // Element is missing in config file, check for default value
- assertFalse(provider_.getAutoAddCertificates());
- }
-
- public void testGetUseAuthorityInfoAccess()
- {
- // Element is missing in config file, check for default value
- assertFalse(provider_.getUseAuthorityInfoAccess());
- }
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
deleted file mode 100644
index 7da2165cb..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/config/ConfigurationProviderTest3.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.config;
-
-import iaik.asn1.structures.Name;
-import iaik.utils.RFC2253NameParser;
-import iaik.utils.RFC2253NameParserException;
-import iaik.x509.X509Certificate;
-
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
-import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class ConfigurationProviderTest3 extends TestCase
-{
- private static final String CONFIG_BASE_ =
- "e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/";
-
- static at.gv.egovernment.moa.spss.server.config.ConfigurationProvider provider_;
-
- static
- {
- System.setProperty(
- "log4j.configuration",
- "file:/" + CONFIG_BASE_ + "log4j.properties");
- System.setProperty(
- at.gv.egovernment.moa.spss.server.config.ConfigurationProvider.CONFIG_PROPERTY_NAME,
- CONFIG_BASE_ + "moa.sp.noopts-config.xml");
- try
- {
- ConfigurationProvider.reload();
- provider_ = at.gv.egovernment.moa.spss.server.config.ConfigurationProvider.getInstance();
- }
- catch (ConfigurationException e)
- {
- throw new RuntimeException("Fehler beim Setup des Tests: " + e.getMessage());
- }
- }
-
- /**
- * Constructor for ConfigurationProvider.
- * @param arg0
- */
- public ConfigurationProviderTest3() throws MOAException
- {
- super("ConfigurationProvider");
- }
-
- public void testGetWarnings()
- {
- // 3 Warnings should be collected: C14N not found, DigestMethod not found, ArchiveDuration not found
- assertEquals(3, provider_.getWarnings().size());
- }
-
- public void testGetDigestMethodAlgorithmName()
- {
- // Element is missing in config file, check if default value is returned
- assertEquals(
- Constants.SHA1_URI,
- provider_.getDigestMethodAlgorithmName());
- }
-
- public void testGetCanonicalizationAlgorithmName()
- {
- // Element is missing in config file, check if default value is returned
- assertEquals(
- Constants.C14N_URI,
- provider_.getCanonicalizationAlgorithmName());
- }
-
- public void testGetHardwareCryptoModules()
- {
- // No hardware crypto modules in config file, check for empty list
- List hwcms = provider_.getHardwareCryptoModules();
- assertEquals(0, hwcms.size());
- }
-
- public void testGetHardwareKeyModules()
- {
- // No hardware key modules in config file, check for empty list
- List hwkms = provider_.getHardwareKeyModules();
- assertEquals(0, hwkms.size());
- }
-
- public void testGetSoftwareKeyModules()
- {
- // No software key modules in config file, check for empty list
- List swkms = provider_.getSoftwareKeyModules();
- assertEquals(0, swkms.size());
- }
-
- public void testGetDistributionPoints() throws RFC2253NameParserException
- {
- // No distribution points in config file, check for emtpy set
- X509Certificate cert = new X509Certificate();
- RFC2253NameParser parser = new RFC2253NameParser("CN=DP1_Issuer");
- Name name = parser.parse();
- cert.setIssuerDN(name);
-
- Set dps = provider_.getDistributionPoints(cert);
- assertEquals(0, dps.size());
- }
-
- public void testGetCRLArchiveDuration()
- {
- // No archive duration in config file, check for default value
- assertEquals(0, provider_.getCRLArchiveDuration());
- }
-
- public void testGetCreateTransformsInfoProfile()
- {
- // No profile in config file, check for null
- Element ctip1 = provider_.getCreateTransformsInfoProfile("CTIP_1");
- assertNull(ctip1);
- }
-
- public void testGetCreateSignatureEnvironmentProfile()
- {
- // No profile in config file, check for null
- Element csep = provider_.getCreateSignatureEnvironmentProfile("CSEP_1");
- assertNull(csep);
- }
-
- public void testGetVerifyTransformsInfoProfile()
- {
- // No profile in config file, check for null
- Element vtip = provider_.getVerifyTransformsInfoProfile("VTIP_1");
- assertNull(vtip);
- }
-
- public void testGetSupplementProfile()
- {
- // No profile in config file, check for null
- Element sp = provider_.getSupplementProfile("SP_1");
- assertNull(sp);
- }
-
- public void testGetRevocationArchiveJDBCURL()
- {
- // No archive in config file, check for null
- assertNull(provider_.getRevocationArchiveJDBCURL());
- }
-
- public void testGetRevocationArchiveJDBCDriverClass()
- {
- // No archive in config file, check for null
- assertNull(provider_.getRevocationArchiveJDBCDriverClass());
- }
-
- public void testGetServiceOrder()
- {
- // Element is missing in config file, check for empty array
- String[] serviceOrder = provider_.getServiceOrder();
- assertEquals(0, serviceOrder.length);
- }
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
deleted file mode 100644
index be1090e4a..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.iaik.config;
-
-import java.io.FileInputStream;
-import java.security.KeyStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import iaik.asn1.structures.DistributionPoint;
-import iaik.pki.PKIConfiguration;
-import iaik.pki.pathvalidation.ChainingModes;
-import iaik.pki.pathvalidation.ValidationConfiguration;
-import iaik.pki.revocation.CRLDistributionPoint;
-import iaik.pki.revocation.RevocationConfiguration;
-import iaik.pki.store.certstore.CertStoreConfiguration;
-import iaik.pki.store.certstore.CertStoreTypes;
-import iaik.pki.store.revocation.archive.ArchiveConfiguration;
-import iaik.pki.store.revocation.archive.db.DataBaseArchiveParameter;
-import iaik.server.ConfigurationData;
-import iaik.server.modules.keys.HardwareKeyModuleConfiguration;
-import iaik.server.modules.keys.SoftwareKeyModuleConfiguration;
-
-import at.gv.egovernment.moa.spss.server.iaik.config.ConfigurationDataImpl;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-
-/**
- * Tests the <code>ConfigurationDataImpl</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class ConfigurationDataImplTest extends SPSSTestCase {
-
- private ConfigurationData config;
- private X509Certificate iaikCert;
-
- public ConfigurationDataImplTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- TransactionContext context;
-
- setUpTransactionContext();
- context = TransactionContextManager.getInstance().getTransactionContext();
-
- config = new ConfigurationDataImpl(context.getConfiguration());
-
- KeyStore ks = KeyStore.getInstance("JKS", "SUN");
- ks.load(
- new FileInputStream(TESTDATA_ROOT + "security/server.keystore"),
- "changeit".toCharArray());
-
- CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
- Collection certs =
- certFactory.generateCertificates(
- new FileInputStream(
- TESTDATA_ROOT
- + "conf/moa-spss/trustprofiles/TrustProfile1/IAIKRoot.cer"));
- iaikCert = (X509Certificate) certs.toArray()[0];
-
- }
-
- public void testGetPKIConfiguration() {
- PKIConfiguration pkiConfig = config.getPKIConfiguration();
- ArchiveConfiguration archiveConfig = pkiConfig.getArchiveConfiguration();
- CertStoreConfiguration certStoreConfig =
- pkiConfig.getCertStoreConfiguration();
- RevocationConfiguration revocationConfig =
- pkiConfig.getRevocationConfiguration();
- ValidationConfiguration validationConfig =
- pkiConfig.getValidationConfiguration();
- DataBaseArchiveParameter archiveParam;
- Set distributionPoints;
- Iterator iter;
- boolean found;
-
- // test archive parameters
- archiveParam =
- (DataBaseArchiveParameter) archiveConfig.getArchiveParameters();
- assertEquals(
- archiveParam.getJDBCUrl(),
- "jdbc:postgresql://10.16.46.108/moa?user=moa&password=moatest");
-
- // test cert store configuration
- assertEquals(1, certStoreConfig.getParameters().length);
- assertEquals(
- CertStoreTypes.DIRECTORY,
- certStoreConfig.getParameters()[0].getType());
-
- // test revocation configuration
- distributionPoints =
- revocationConfig.getAlternativeDistributionPoints(iaikCert, null, new Date());
- assertEquals(3, distributionPoints.size());
- found = false;
- for (iter = distributionPoints.iterator(); iter.hasNext();) {
- CRLDistributionPoint dp = (CRLDistributionPoint) iter.next();
- if (dp.getUri().equals("http://www.iaik.at/testCA/iaik_test_sig.crl")) {
- found =
- dp.getReasonCodes()
- == (DistributionPoint.keyCompromise
- | DistributionPoint.affiliationChanged);
- }
- }
- assertTrue(found);
-
- // test validation configuration
- assertEquals(
- ChainingModes.PKIX_MODE,
- validationConfig.getChainingMode(iaikCert));
- }
-
- /*
- public void testGetCryptoModuleConfigurations() {
- List cryptoConfigs = config.getCryptoModuleConfigurations();
- HardwareCryptoModuleConfiguration moduleConfig;
-
- assertEquals(2, cryptoConfigs.size());
- moduleConfig = (HardwareCryptoModuleConfiguration) cryptoConfigs.get(0);
- assertEquals("Module1", moduleConfig.getModuleName());
- assertEquals("Slot1", moduleConfig.getSlotID());
- assertEquals("PIN1", new String(moduleConfig.getUserPIN()));
- }
- */
-
- public void testGetKeyModuleConfigurations() {
- List keyConfigs = config.getKeyModuleConfigurations();
- HardwareKeyModuleConfiguration hwKey;
- SoftwareKeyModuleConfiguration swKey;
-
- assertEquals(7, keyConfigs.size());
- hwKey = (HardwareKeyModuleConfiguration) keyConfigs.get(0);
- assertEquals("cryptoki.dll", hwKey.getModuleName());
- assertEquals("0", hwKey.getSlotID());
- assertEquals("0000", new String(hwKey.getUserPIN()));
- swKey = (SoftwareKeyModuleConfiguration) keyConfigs.get(1);
- assertEquals(
- "buergerkarte",
- new String(swKey.getKeyStoreAuthenticationData()));
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java
deleted file mode 100644
index 3b403dc19..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.iaik.config;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
-import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
-
-/**
- * Tests the <code>IaikConfigurator</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class IaikConfiguratorTest extends SPSSTestCase {
-
- public IaikConfiguratorTest(String name) {
- super(name);
- }
-
- /**
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUpTransactionContext();
- }
-
- public void testConfigure() throws Exception {
- IaikConfigurator configurator = new IaikConfigurator();
- TransactionContext context =
- TransactionContextManager.getInstance().getTransactionContext();
-
- configurator.configure(context.getConfiguration());
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java
deleted file mode 100644
index 65fa2bf72..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/AllTests.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.invoke;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Runs all tests in this package.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite();
-
- suite.addTestSuite(DataObjectFactoryTest.class);
- suite.addTestSuite(TransformationFactoryTest.class);
- suite.addTestSuite(XMLSignatureCreationInvokerTest.class);
- suite.addTestSuite(CMSSignatureVerificationInvokerTest.class);
- suite.addTestSuite(XMLSignatureVerificationInvokerTest.class);
-
- return suite;
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
deleted file mode 100644
index 3024730f4..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.invoke;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.util.DOMUtils;
-
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest;
-import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
-import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureRequestParser;
-import at.gv.egovernment.moa.spss.api.xmlbind.VerifyCMSSignatureResponseBuilder;
-import at.gv.egovernment.moa.spss.server.invoke.CMSSignatureVerificationInvoker;
-
-/**
- * Mainly a smoke test for debugging the CMSSignatureVerificationInvoker.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CMSSignatureVerificationInvokerTest extends SPSSTestCase {
- private static final String TESTDATA_BASE =
- TESTDATA_ROOT + "xml/VerifyCMSSignature/";
-
- /**
- * Constructor for CMSSignatureVerificationInvokerTest.
- * @param name
- */
- public CMSSignatureVerificationInvokerTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- setUpTransactionContext();
- setUpLoggingContext();
- setUpIaikConfiguration();
- }
-
- public void testVerifyCMSSignature() throws Exception {
- try {
- CMSSignatureVerificationInvoker invoker =
- CMSSignatureVerificationInvoker.getInstance();
- VerifyCMSSignatureRequestParser requestParser =
- new VerifyCMSSignatureRequestParser();
- Document doc =
- SPSSTestCase.parseXmlValidating(
- TESTDATA_BASE + "TestGeneratorVC0.001.Req.xml");
- VerifyCMSSignatureRequest request =
- requestParser.parse(doc.getDocumentElement());
- VerifyCMSSignatureResponse response = invoker.verifyCMSSignature(request);
- VerifyCMSSignatureResponseBuilder responseBuilder =
- new VerifyCMSSignatureResponseBuilder();
- Element result = responseBuilder.build(response).getDocumentElement();
-
- System.out.println(DOMUtils.serializeNode(result));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
deleted file mode 100644
index 7de2add33..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.invoke;
-
-import java.io.InputStream;
-import java.security.Security;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import iaik.server.modules.xml.BinaryDataObject;
-import iaik.server.modules.xml.DataObject;
-import iaik.server.modules.xml.XMLDataObject;
-
-import at.gv.egovernment.moa.util.Base64Utils;
-
-import at.gv.egovernment.moa.spss.MOAException;
-import at.gv.egovernment.moa.spss.api.SPSSFactory;
-import at.gv.egovernment.moa.spss.api.common.Content;
-import at.gv.egovernment.moa.spss.server.iaik.xml.ByteArrayDataObjectImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.ByteStreamDataObjectImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XMLDataObjectImpl;
-import at.gv.egovernment.moa.spss.server.iaik.xml.XMLNodeListDataObjectImpl;
-import at.gv.egovernment.moa.spss.server.invoke.DataObjectFactory;
-
-/**
- * Test cases for the <code>DataObjectFactory</code> class.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class DataObjectFactoryTest extends SPSSTestCase {
-
- private static final String HTTP_BINARY_CONTENT_URL = "http://www.google.com";
- private static final String HTTP_XML_CONTENT_URL =
- "http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd";
- private static final String HTTPS_BINARY_CONTENT_URL =
- "https://businessnet.ba-ca.com";
- private static final String HTTPS_UNTRUSTED_URL =
- "https://heribert.anecon.com";
- private static final String HTTP_UNKNOWN_HOST_URL = "http://uurjmjmruuw.com";
- private static final String MALFORMED_URL = "//hsld///ddd";
- private static final String FILE_BINARY_CONTENT_URL = "file:/C:/boot.ini";
- private static final String XML_CONTENT =
- "<XMLContent>"
- + " <User name=\"test1\"/>"
- + " <USer name=\"test2\"/>"
- + "</XMLContent>";
- private static final String BASE64_CONTENT = "U3Zlbg==";
-
- private SPSSFactory spssFactory = SPSSFactory.getInstance();
- private DataObjectFactory factory;
-
- /**
- * Constructor for DataObjectFactoryTest.
- * @param name
- */
- public DataObjectFactoryTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- factory = DataObjectFactory.getInstance();
-
- // set up SSL
- 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");
- */
- }
-
- public void testCreateFromURIWithBinaryHttp() throws Exception {
- DataObject dataObject =
- factory.createFromURI(HTTP_BINARY_CONTENT_URL, false);
-
- assertNotNull(dataObject);
- assertTrue(dataObject instanceof ByteStreamDataObjectImpl);
- assertNotNull(((BinaryDataObject) dataObject).getInputStream());
- }
-
- public void testCreateFromURIWithXmlHttp() throws Exception {
- DataObject dataObject = factory.createFromURI(HTTP_XML_CONTENT_URL, false);
- Element element;
-
- assertNotNull(dataObject);
- assertTrue(dataObject instanceof XMLDataObjectImpl);
- element = ((XMLDataObject) dataObject).getElement();
- assertNotNull(element);
- assertEquals("schema", element.getTagName());
- }
-
- public void testCreateFromURIWithMalformedURI() throws Exception {
- try {
- factory.createFromURI(MALFORMED_URL, false);
- fail();
- } catch (MOAException e) {
- }
- }
-
- public void testCreateFromURIWithNonExistingHttpURL() throws Exception {
- try {
- factory.createFromURI(HTTP_UNKNOWN_HOST_URL, false);
- fail();
- } catch (MOAException e) {
- }
- }
-
- public void testCreateFromURIWithHttps() throws Exception {
- DataObject dataObject =
- factory.createFromURI(HTTPS_BINARY_CONTENT_URL, false);
- assertNotNull(dataObject);
- assertTrue(dataObject instanceof BinaryDataObject);
- }
-
- public void testCreateFromURIWithUntrustedHttps() throws Exception {
- try {
- factory.createFromURI(HTTPS_UNTRUSTED_URL, false);
- fail();
- } catch (MOAException e) {
-
- }
- }
-
- public void testCreateFromURIWithFile() throws Exception {
- try {
- factory.createFromURI(FILE_BINARY_CONTENT_URL, false);
- fail();
- } catch (MOAException e) {
- }
- }
-
- public void testCreateFromContentOptionalRefTypeWithXmlContent()
- throws Exception {
- Document doc = parseXmlString(XML_CONTENT);
- Content content =
- spssFactory.createContent(
- doc.getDocumentElement().getChildNodes(),
- "http://data");
- DataObject dataObject =
- factory.createFromContentOptionalRefType(
- content,
- null,
- null,
- true,
- false,
- true,
- false);
-
- assertTrue(dataObject instanceof XMLNodeListDataObjectImpl);
- }
-
- public void testCreateFromContentOptionalRefTypeWithBase64Content()
- throws Exception {
- InputStream is = Base64Utils.decodeToStream(BASE64_CONTENT, true);
- Content content = spssFactory.createContent(is, "http://data");
- DataObject dataObject =
- factory.createFromContentOptionalRefType(
- content,
- null,
- null,
- false,
- false,
- true,
- false);
-
- assertNotNull(dataObject);
- assertTrue(dataObject instanceof ByteArrayDataObjectImpl);
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
deleted file mode 100644
index 13a80cbf1..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.invoke;
-
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.Document;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import iaik.ixsil.init.IXSILInit;
-import iaik.ixsil.util.URI;
-import iaik.server.modules.xml.Base64Transformation;
-import iaik.server.modules.xml.Canonicalization;
-import iaik.server.modules.xml.EnvelopedSignatureTransformation;
-import iaik.server.modules.xml.Transformation;
-import iaik.server.modules.xml.XPath2Transformation;
-import iaik.server.modules.xml.XPathTransformation;
-import iaik.server.modules.xml.XSLTTransformation;
-
-import at.gv.egovernment.moa.util.Constants;
-
-import at.gv.egovernment.moa.spss.MOAApplicationException;
-import at.gv.egovernment.moa.spss.api.common.Transform;
-import at.gv.egovernment.moa.spss.api.xmlbind.TransformParser;
-import at.gv.egovernment.moa.spss.server.invoke.TransformationFactory;
-
-/**
- * Test cases for the <code>TransformationFactory</code> class.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class TransformationFactoryTest extends SPSSTestCase {
-
- private static final String TESTDATA_BASE =
- TESTDATA_ROOT + "xml/dsigTransform/";
- private TransformationFactory factory = TransformationFactory.getInstance();
- private TransformParser transformParser = new TransformParser();
-
- /**
- * Constructor for TransformationFactoryTest.
- * @param name
- */
- public TransformationFactoryTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- IXSILInit.init(new URI("init/properties/init.properties"));
- //IXSILInit.init(new URI("file:data/deploy/ixsil/init/properties/init.properties"));
-
- }
-
- public void testCreateCanonicalization() throws Exception {
- Document transform = parseXml(TESTDATA_BASE + "canonicalization.xml");
- Transform tr =
- transformParser.parseTransform(transform.getDocumentElement());
- Transformation t = factory.createTransformation(tr);
-
- assertTrue(t instanceof Canonicalization);
- assertEquals(
- "http://www.w3.org/TR/2001/REC-xml-c14n-20010315",
- t.getAlgorithmURI());
- }
-
- public void testCreateCanonicalizationWithComments() throws Exception {
- Document transform =
- parseXml(TESTDATA_BASE + "canonicalizationWithComments.xml");
- Transform tr =
- transformParser.parseTransform(transform.getDocumentElement());
- Transformation t = factory.createTransformation(tr);
-
- assertTrue(t instanceof Canonicalization);
- assertEquals(
- "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments",
- t.getAlgorithmURI());
- }
-
- public void testCreateBase64Decode() throws Exception {
- Document transform = parseXml(TESTDATA_BASE + "base64.xml");
- Transform tr =
- transformParser.parseTransform(transform.getDocumentElement());
- Transformation t = factory.createTransformation(tr);
- assertTrue(t instanceof Base64Transformation);
- }
-
- public void testCreateEnvelopedSignature() throws Exception {
- Document transform = parseXml(TESTDATA_BASE + "enveloped.xml");
- Transform tr =
- transformParser.parseTransform(transform.getDocumentElement());
- Transformation t = factory.createTransformation(tr);
- assertTrue(t instanceof EnvelopedSignatureTransformation);
- }
-
- public void testXPathTransformation() throws Exception {
- Document transform = parseXml(TESTDATA_BASE + "xpath.xml");
- Transform tr =
- transformParser.parseTransform(transform.getDocumentElement());
- Transformation t = factory.createTransformation(tr);
- Map nsDecls;
-
- assertTrue(t instanceof XPathTransformation);
- nsDecls = ((XPathTransformation) t).getNamespaceDeclarations();
- assertEquals(1, nsDecls.size());
- assertEquals(Constants.DSIG_NS_URI, nsDecls.get("dsig"));
- }
-
- public void testCreateXPath2Transformation() throws Exception {
- Document transform = parseXml(TESTDATA_BASE + "xpath2.xml");
- Transform tr =
- transformParser.parseTransform(transform.getDocumentElement());
- Transformation t = factory.createTransformation(tr);
- assertTrue(t instanceof XPath2Transformation);
- }
-
- public void testCreateXSLTTransformation() throws Exception {
- Document transform = parseXml(TESTDATA_BASE + "xslt.xml");
- Transform tr =
- transformParser.parseTransform(transform.getDocumentElement());
- XSLTTransformation t =
- (XSLTTransformation) factory.createTransformation(tr);
- assertNotNull(t.getStylesheetElement());
- }
-
- public void testCreateWithIllegalAlgorithm() throws Exception {
- try {
- Document transform = parseXml(TESTDATA_BASE + "illegalAlgorithm.xml");
- Transform tr =
- transformParser.parseTransform(transform.getDocumentElement());
- factory.createTransformation(tr);
- fail();
- } catch (MOAApplicationException e) {
- }
- }
-
- public void testEqualsXslt() throws Exception {
- Document xslt = parseXml(TESTDATA_BASE + "xslt.xml");
- Transform tr = transformParser.parseTransform(xslt.getDocumentElement());
- Transformation trXslt = factory.createTransformation(tr);
-
- Document xsltEqu = parseXml(TESTDATA_BASE + "xsltEqual.xml");
- tr = transformParser.parseTransform(xsltEqu.getDocumentElement());
- Transformation trXsltEqu = factory.createTransformation(tr);
-
- Document xsltDiff = parseXml(TESTDATA_BASE + "xsltDifferent.xml");
- tr = transformParser.parseTransform(xsltDiff.getDocumentElement());
- Transformation trXsltDiff = factory.createTransformation(tr);
-
- Document canonicalization =
- parseXml(TESTDATA_BASE + "canonicalization.xml");
-
- assertTrue(trXslt.equals(trXsltEqu));
- assertFalse(trXslt.equals(trXsltDiff));
- assertFalse(trXsltEqu.equals(trXsltDiff));
- assertEquals(trXslt.hashCode(), trXsltEqu.hashCode());
- assertFalse(trXslt.hashCode() == trXsltDiff.hashCode());
- assertFalse(trXsltEqu.hashCode() == trXsltDiff.hashCode());
- assertFalse(trXslt.equals(canonicalization));
- }
-
- public void testEqualsXPath() throws Exception {
- Document xpath = parseXml(TESTDATA_BASE + "xpath.xml");
- Transform tr = transformParser.parseTransform(xpath.getDocumentElement());
- Transformation trXpath = factory.createTransformation(tr);
- Transformation trXpathEqu = factory.createTransformation(tr);
-
- Document xpathDiff = parseXml(TESTDATA_BASE + "xpathDifferent.xml");
- tr = transformParser.parseTransform(xpathDiff.getDocumentElement());
- Transformation trXpathDiff = factory.createTransformation(tr);
-
- assertTrue(trXpath.equals(trXpathEqu));
- assertEquals(trXpath.hashCode(), trXpathEqu.hashCode());
- assertFalse(trXpath.equals(trXpathDiff));
- assertFalse(trXpath.hashCode() == trXpathDiff.hashCode());
- }
-
- public void testEqualsXPath2() throws Exception {
- Document xpath2 = parseXml(TESTDATA_BASE + "xpath2.xml");
- Transform tr = transformParser.parseTransform(xpath2.getDocumentElement());
- Transformation trXpath2 = factory.createTransformation(tr);
- Transformation trXpath2Equ = factory.createTransformation(tr);
-
- Document xpath2Diff = parseXml(TESTDATA_BASE + "xpath2Different.xml");
- tr = transformParser.parseTransform(xpath2Diff.getDocumentElement());
- Transformation trXpath2Diff = factory.createTransformation(tr);
-
- assertTrue(trXpath2.equals(trXpath2Equ));
- assertEquals(trXpath2.hashCode(), trXpath2Equ.hashCode());
- assertFalse(trXpath2.equals(trXpath2Diff));
- assertFalse(trXpath2.hashCode() == trXpath2Diff.hashCode());
- }
-
- public void testCreateTransformationList() throws Exception {
- Document transforms = parseXml(TESTDATA_BASE + "transforms.xml");
- List trs = transformParser.parseTransforms(transforms.getDocumentElement());
- List transformationList = factory.createTransformationList(trs);
-
- assertEquals(3, transformationList.size());
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
deleted file mode 100644
index 28cd3805a..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.invoke;
-
-import java.util.Collections;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.util.DOMUtils;
-
-import at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureRequestParser;
-import at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureResponseBuilder;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
-import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureCreationInvoker;
-
-/**
- * Mainly a smoke test for debugging the XMLSignatureCreationInvoker.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureCreationInvokerTest extends SPSSTestCase {
- private static final String TESTDATA_BASE =
- TESTDATA_ROOT + "xml/CreateXMLSignature/";
-
- public XMLSignatureCreationInvokerTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- setUpTransactionContext();
- setUpLoggingContext();
- setUpIaikConfiguration();
- setUpSSL();
- }
-
- public void testCreateXMLSignature() throws Exception {
- try {
- XMLSignatureCreationInvoker invoker =
- XMLSignatureCreationInvoker.getInstance();
- CreateXMLSignatureRequestParser requestParser =
- new CreateXMLSignatureRequestParser();
- Document doc =
- SPSSTestCase.parseXmlValidating(
- TESTDATA_BASE + "TestGeneratorCX2.004.Req.xml");
- CreateXMLSignatureRequest request =
- requestParser.parse(doc.getDocumentElement());
- CreateXMLSignatureResponse response =
- invoker.createXMLSignature(request, Collections.EMPTY_SET);
- CreateXMLSignatureResponseBuilder responseBuilder =
- new CreateXMLSignatureResponseBuilder();
- Element result = responseBuilder.build(response).getDocumentElement();
-
- System.out.println(DOMUtils.serializeNode(result));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
- }
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
deleted file mode 100644
index 56e3d541b..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.invoke;
-
-import org.w3c.dom.Document;
-
-import test.at.gv.egovernment.moa.spss.SPSSTestCase;
-
-import at.gv.egovernment.moa.util.DOMUtils;
-
-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;
-import at.gv.egovernment.moa.spss.server.invoke.XMLSignatureVerificationInvoker;
-
-/**
- * Mainly a smoke test for debugging the XMLSignatureVerificationInvoker.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class XMLSignatureVerificationInvokerTest extends SPSSTestCase {
- private static final String TESTDATA_BASE =
- TESTDATA_ROOT + "xml/VerifyXMLSignature/";
-
- public XMLSignatureVerificationInvokerTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- setUpTransactionContext();
- setUpLoggingContext();
- setUpIaikConfiguration();
- }
-
- public void testVerifyXMLSignature() throws Exception {
- try {
- XMLSignatureVerificationInvoker invoker =
- XMLSignatureVerificationInvoker.getInstance();
- VerifyXMLSignatureRequestParser requestParser =
- new VerifyXMLSignatureRequestParser();
- VerifyXMLSignatureResponseBuilder responseBuilder =
- new VerifyXMLSignatureResponseBuilder();
- Document doc =
- SPSSTestCase.parseXmlValidating(
- TESTDATA_BASE + "TestGeneratorVX.201.Req.xml");
-
- VerifyXMLSignatureRequest request =
- requestParser.parse(doc.getDocumentElement());
- VerifyXMLSignatureResponse response;
-
- response = invoker.verifyXMLSignature(request);
- System.out.println(
- DOMUtils.serializeNode(responseBuilder.build(response)));
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
- }
-
-
-}
diff --git a/spss.server/src/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java b/spss.server/src/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
deleted file mode 100644
index b46c20086..000000000
--- a/spss.server/src/test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package test.at.gv.egovernment.moa.spss.server.tools;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import at.gv.egovernment.moa.spss.server.tools.CertTool;
-
-import test.at.gv.egovernment.moa.MOATestCase;
-
-/**
- * Tests for the <code>CertTool</code>.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class CertToolTest extends MOATestCase {
-
- private static final String EXPECTED_RESULT =
- "SubjectDN (RFC2253):"
- + " CN=Patrick Peck,OU=MOA Team,O=BRZ,L=Vienna,ST=Vienna,C=AT\r\n"
- + "IssuerDN (RFC2253) :"
- + " CN=Patrick Peck,OU=MOA Team,O=BRZ,L=Vienna,ST=Vienna,C=AT\r\n"
- + "Serial Number :"
- + " 1047548672\r\n";
- private CertTool certTool;
-
- /**
- * Constructor for CertToolTest.
- * @param name
- */
- public CertToolTest(String name) {
- super(name);
- }
-
- protected void setUp() {
- certTool = new CertTool();
- }
-
- public void testPrintCertInfo() {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(bos);
- String result;
-
- certTool.printCertInfo(TESTDATA_ROOT + "security/server.cer", ps);
- result = new String(bos.toByteArray());
- System.out.println(result);
- assertEquals(EXPECTED_RESULT, result);
- }
-
-}
diff --git a/spss.server/web.xml b/spss.server/web.xml
deleted file mode 100644
index b68ee850e..000000000
--- a/spss.server/web.xml
+++ /dev/null
@@ -1,55 +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 SP-SS</display-name>
- <description>MOA Signature Creation and Verification Services</description>
- <servlet>
- <servlet-name>ConfigurationServlet</servlet-name>
- <display-name>MOA Configuration Servlet</display-name>
- <servlet-class>
- at.gv.egovernment.moa.spss.server.service.ConfigurationServlet
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </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>AxisServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ConfigurationServlet</servlet-name>
- <url-pattern>/ConfigurationUpdate</url-pattern>
- </servlet-mapping>
-
- <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>
-
- <security-role>
- <description>
- The role that is required to log in to the moa Application
- </description>
- <role-name>moa-admin</role-name>
- </security-role>
-</web-app>
diff --git a/spss.slinterface/.classpath b/spss.slinterface/.classpath
deleted file mode 100644
index dc4d54119..000000000
--- a/spss.slinterface/.classpath
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="res"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/IAIK JCE 3.0.3 signiert"/>
- <classpathentry kind="lib" path="lib/axis-1.0/axis.jar"/>
- <classpathentry kind="lib" path="lib/commons-discovery-0.2/commons-discovery.jar"/>
- <classpathentry kind="lib" path="lib/commons-fileupload-1.0/commons-fileupload-1.0.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging-1.0.4/commons-logging.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/axis-1.0/jaxrpc.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.0/saaj.jar"/>
- <classpathentry kind="lib" path="lib/axis-1.0/wsdl4j.jar"/>
- <classpathentry kind="lib" path="lib/xalan-2.5.1/xalan.jar"/>
- <classpathentry kind="lib" path="lib/xerces-2.6.2/xercesImpl.jar"/>
- <classpathentry kind="lib" path="lib/xerces-2.6.2/xmlParserAPIs.jar"/>
- <classpathentry kind="output" path="WEB-INF/classes"/>
-</classpath>
diff --git a/spss.slinterface/.project b/spss.slinterface/.project
deleted file mode 100644
index 85d06023f..000000000
--- a/spss.slinterface/.project
+++ /dev/null
@@ -1,28 +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.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value>&lt;project&gt;/.externalToolBuilders/MOA SL (Ant).launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <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/WEB-INF/web.xml b/spss.slinterface/WEB-INF/web.xml
deleted file mode 100644
index da7d74f7b..000000000
--- a/spss.slinterface/WEB-INF/web.xml
+++ /dev/null
@@ -1,99 +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>HashInputDataServlet</servlet-name>
- <display-name>Displays a particular hash input data</display-name>
- <servlet-class>
- at.gv.egovernment.moa.spss.slinterface.servlets.HashInputDataServlet
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>ReturnServlet</servlet-name>
- <display-name>Return servlet</display-name>
- <servlet-class>
- at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <!-- For test purposes only -->
- <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>
-
- <!-- For test purposes only -->
- <servlet>
- <servlet-name>RewriteServlet</servlet-name>
- <display-name>URL rewriting test servlet</display-name>
- <servlet-class>
- test.at.gv.egovernment.moa.spss.slinterface.RewriteServlet
- </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>HashInputDataServlet</servlet-name>
- <url-pattern>/showdata</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ReturnServlet</servlet-name>
- <url-pattern>/return</url-pattern>
- </servlet-mapping>
-
- <!-- For test purposes only -->
- <servlet-mapping>
- <servlet-name>DataURLServlet</servlet-name>
- <url-pattern>/dataurl</url-pattern>
- </servlet-mapping>
-
- <!-- For test purposes only -->
- <servlet-mapping>
- <servlet-name>RewriteServlet</servlet-name>
- <url-pattern>/rewrite</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/spss.slinterface/build.xml b/spss.slinterface/build.xml
deleted file mode 100644
index 08c17b9c9..000000000
--- a/spss.slinterface/build.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<!--
-
- Ant Buildfile for MOA SP/SS Server
-
- Authors: Patrick Peck, Gregor Karlinger
-
- $Id$
-
--->
-<project name="moa-sl" default="dist-ws" basedir=".">
- <property environment="env"/>
- <property name="script-suffix" value="${env.SCRIPT_SUFFIX}"/>
- <property name="version" value="1.1.0"/>
-
- <property name="lib" value="lib"/>
- <property name="src" value="src"/>
- <property name="res" value="res"/>
- <property name="web-inf" value="WEB-INF"/>
- <property name="pages" value="pages"/>
- <property name="handbook" value="handbook"/>
- <property name="conf" value="conf"/>
- <property name="test" value="test"/>
- <property name="tempdir" value="workdir/temp"/>
-
- <property name="tmp" value="tmp"/>
- <property name="compile" value="${tmp}/compile"/>
- <property name="api-doc" value="${tmp}/api-doc"/>
- <property name="dist" value="${tmp}/dist"/>
- <property name="dist.ws" value="${dist}/ws"/>
- <property name="dist.ws.conf" value="${dist.ws}/conf"/>
- <property name="dist.ws-zip" value="${dist}/ws-zip"/>
- <property name="dist.src" value="${dist}/src"/>
- <property name="dist.src-zip" value="${dist}/src-zip"/>
-
- <property name="lib.axis" value="${lib}/axis-1.0"/>
- <property name="lib.commons-discovery" value="${lib}/commons-discovery-0.2"/>
- <property name="lib.commons-fileupload" value="${lib}/commons-fileupload-1.0"/>
- <property name="lib.commons-logging" value="${lib}/commons-logging-1.0.4"/>
- <property name="lib.log4j" value="${lib}/log4j-1.2.7"/>
- <property name="lib.servlet" value="${lib}/servlet-2.3"/>
- <property name="lib.xalan" value="${lib}/xalan-2.5.1"/>
- <property name="lib.xerces" value="${lib}/xerces-2.6.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.commons-logging}/commons-logging-api.jar"/>
- <pathelement location="${lib.commons-fileupload}/commons-fileupload-1.0.jar"/>
- <pathelement location="${lib.commons-discovery}/commons-discovery.jar"/>
- <pathelement location="${lib.log4j}/log4j-1.2.7.jar"/>
- <pathelement location="${lib.servlet}/servlet-2_3-fcs-classfiles.zip"/>
- <pathelement location="${lib.xalan}/xalan.jar"/>
- <pathelement location="${lib.xerces}/xmlParserAPIs.jar"/>
- <pathelement location="${lib.xerces}/xercesImpl.jar"/>
- </path>
-
- <target name="init">
- <description>set up directories etc.</description>
- <tstamp/>
- <mkdir dir="${tmp}"/>
- <mkdir dir="${compile}"/>
- <mkdir dir="${api-doc}"/>
- <mkdir dir="${handbook}"/>
- <mkdir dir="${dist}"/>
- <mkdir dir="${dist.ws}"/>
- <mkdir dir="${dist.ws-zip}"/>
- <mkdir dir="${dist.src}"/>
- <mkdir dir="${dist.src-zip}"/>
- </target>
-
- <target name="compile" depends="init">
- <description>compile everything</description>
- <javac srcdir="${src}" destdir="${compile}"
- classpathref="compile.classpath"
- debug="on">
- </javac>
- </target>
-
- <target name="package-ws" depends="compile, manifest">
- <description>package the server war file</description>
- <war warfile="${dist.ws}/moa-sl.war" webxml="${web-inf}/web.xml" manifest="${tmp}/MANIFEST.MF">
- <lib dir="${lib.axis}"/>
- <lib dir="${lib.commons-logging}"/>
- <lib dir="${lib.commons-fileupload}"/>
- <lib dir="${lib.commons-discovery}"/>
- <lib dir="${lib.log4j}"/>
- <lib dir="${lib.xalan}"/>
- <lib dir="${lib.xerces}"/>
- <classes dir="${compile}" excludes=""/>
- <classes dir="${res}" excludes="test/**"/>
- <classes file="${conf}/log4j/log4j.properties"/>
- <zipfileset dir="${pages}" excludes="" prefix="pages"/>
- <zipfileset dir="${test}" excludes="echtdaten*/** .cvsignore" prefix="test"/>
- <zipfileset dir="${tempdir}" prefix="workdir/temp"/>
- <!--<webinf dir="${handbook}" includes="conf/**"/>-->
- </war>
- </target>
-
- <target name="api-doc" depends="init">
- <description>create java doc</description>
- <!-- TODO does not work at the moment -->
- <!--<javadoc defaultexcludes="yes"
- destdir="${api-doc}"
- author="true"
- version="true"
- use="true"
- windowtitle="MOA SL System Documentation">
- <packageset dir="src">
- <exclude name="test/**"/>
- </packageset>
- <link offline="false" href="http://java.sun.com/j2se/1.3/docs/api/"/>
- <doctitle><![CDATA[MOA SL System Documentation]]></doctitle>
- <classpath refid="compile.classpath"/>
- </javadoc>-->
- </target>
-
- <target name="dist-ws" depends="clean, package-ws">
- <description>create the webservice distributable</description>
- <copy toDir="${dist.ws}/conf">
- <fileset dir="${conf}"/>
- </copy>
- <copy toDir="${dist.ws}/doc/handbook">
- <fileset dir="${handbook}" excludes="handbook/common/LogoMoa4c.3148x3545.jpg" />
- </copy>
- <copy toDir="${dist.ws}/endorsed14">
- <fileset dir="${lib.xalan}"/>
- <fileset dir="${lib.xerces}"/>
- </copy>
- <!--<copy toDir="${dist.ws}/licenses">
- <fileset dir="${licenses}"/>
- </copy>-->
- <!--<copy toDir="${dist.ws}">
- <fileset dir="." includes="readme.inst.txt, readme.update.txt, history.txt"/>
- </copy>-->
- <fixcrlf srcdir="${dist.ws}" includes="**/*.sh" eol="lf" eof="remove"/>
- </target>
-
- <target name="dist-ws-doc" depends="dist-ws, api-doc">
- <description>
- create the webservice-distributable, including all documentation
- </description>
- <copy toDir="${dist.ws}/doc/api-doc">
- <fileset dir="${api-doc}"/>
- </copy>
- </target>
-
- <target name="dist-ws-zip" depends="dist-ws-doc">
- <description>
- create the zipped webservice distributable
- </description>
- <zip zipfile="${dist.ws-zip}/moa-sl-${version}.zip">
- <zipfileset dir="${dist.ws}" prefix="moa-sl-${version}"/>
- </zip>
- </target>
-
- <target name="dist-src">
- <description>create the source distributable</description>
- <copy toDir="${dist.src}">
- <fileset dir="." excludes="tmp"/>
- </copy>
- <fixcrlf srcdir="${dist.src}" includes="**/*.sh" eol="lf" eof="remove"/>
- </target>
-
- <target name="dist-src-zip" depends="dist-src">
- <zip zipfile="${dist.src-zip}/moa-sl-${version}-src.zip">
- <zipfileset dir="${dist.src}" prefix="moa-sl-${version}-src"/>
- </zip>
- </target>
-
- <target name="dist-all" depends="dist-ws-zip, dist-src-zip">
- <description>create all distributables</description>
- </target>
-
- <target name="deploy-catalina" depends="dist-ws" if="env.CATALINA_HOME">
- <description>
- deploy the webservice to catalina (needs CATALINA_HOME defined)
- </description>
- <delete dir="${env.CATALINA_HOME}/webapps/moa-sl"/>
- <copy file="${dist.ws}/moa-sl.war" toDir="${env.CATALINA_HOME}/webapps"/>
- <!-- copy endorsed jars -->
- <copy toDir="${env.JAVA_ENDORSED_DIRS">
- <fileset dir="${dist.ws}/endorsed14"/>
- </copy>
- <!-- copy sample configuration -->
- <copy toDir="${env.CATALINA_HOME}/conf">
- <fileset dir="${conf}"/>
- </copy>
- </target>
-
- <target name="clean">
- <description>clean temporary files</description>
- <delete dir="${tmp}"/>
- </target>
-
- <target name="manifest">
- <filter token="version" value="${version}" />
- <copy file="manifest.template" tofile="${tmp}/MANIFEST.MF" overwrite="true" filtering="true" />
- </target>
-
-</project>
diff --git a/spss.slinterface/conf/log4j/log4j.properties b/spss.slinterface/conf/log4j/log4j.properties
deleted file mode 100644
index 5b485b0bb..000000000
--- a/spss.slinterface/conf/log4j/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Sample log4j configuration for the MOA-SL web service
-#
-
-# commons-logging setup
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-
-# Configure root logger and loggers for moa-spss
-log4j.rootLogger=info, stdout
-log4j.logger.slinterface=info, moasl
-
-# 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} | %20c | %10t | %m%n
-
-# Configure the 'moasl' appender to write moa-sl related logging output
-# to the file 'logs/moa-sl.log'. The file is rolled over every 1000KB,
-# and a maximum history of 10 log files is being kept.
-log4j.appender.moasl=org.apache.log4j.RollingFileAppender
-log4j.appender.moasl.File=logs/moa-sl.log
-log4j.appender.moasl.MaxFileSize=1000KB
-log4j.appender.moasl.MaxBackupIndex=10
-log4j.appender.moasl.layout=org.apache.log4j.PatternLayout
-log4j.appender.moasl.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c | %10t | %m%n
diff --git a/spss.slinterface/conf/moa-sl/moa-sl.properties b/spss.slinterface/conf/moa-sl/moa-sl.properties
deleted file mode 100644
index bed1f2893..000000000
--- a/spss.slinterface/conf/moa-sl/moa-sl.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-# [XML-Schemata für Request- und Response-Validierung]
-
-# Schema für Security-Layer V 1.2
-location.schema.sl = /WEB-INF/classes/resources/schemas/Core.20031231.xsd
-
-# Schema für MOA SP/SS V 1.3
-location.schema.moa = /WEB-INF/classes/resources/schemas/MOA-SPSS-1.3.xsd
-
-# Schema für das Anzeigeformat aus SL 1.2
-location.schema.slxhtml = /WEB-INF/classes/resources/schemas/slxhtml-1.0/slxhtml.xsd
-
-# [Arbeitsverzeichnis]
-
-# Arbeitsverzeichnis zum Ablegen der von der geprüften XML-Signatur signierten Daten
-location.tempdir = /workdir/temp/
-
-# [Parameter der verwendeten MOA SP Installation]
-
-# URL des Zugangspunkts
-service.sp.endpoint = http://localhost:8080/moa-spss/services/SignatureVerification
-
-# Zu verwendendes Vertrauensprofil
-service.sp.trustProfileId = MOA-SL-Test
-
-# [Umfang der Prüfberichtseite]
-
-# Sollen die ggf. vorhandenen Signatureigenschaften (z.B. Signaturdatum) in der Liste
-# der signierten Daten als XML-Datei angezeigt werden?
-result.showetsi = false
-
-# Sollen ein ggf. vorhandenes Security-Layer Manifest in der Liste der signierten Daten als
-# XML-Dateien angezeigt werden?
-result.showslmanifest = false
-
-# [Parameter für das Umschreiben der URLs in der Prüfberichtseite]
-
-# Ein-/Ausschalten des Umschreibens
-rewrite = true
-
-# URL des Proxys zu MOA SL, d. h. jenes Rechners, der vom Internet aus erreichbar ist
-rewrite.proxyURL = http://<proxyhost>:8080/moa-sl/rewrite
-
-# Platzhalter für den Hostnamen des Proxys zu MOA SL
-rewrite.proxyURL.proxyhostDummy = <proxyhost>
-
-# Tabelle für Reverse DNS Lookup zum Herausfinden des Hostnamens des Proxys zu MOA SL
-rewrite.dn.127.0.0.1 = localhost
-rewrite.dn.129.27.142.210 = localhost
-rewrite.dn.default = localhost
-
-# Name des Parameters in der Proxy-URL, dessen Wert die übersetzte URL für den Aufruf
-# von MOA SL enthält (empfängt der Proxy einen HTTP-Request mit diesem Parameter, so
-# setz er diesen HTTP-Request auf die in diesem Parameter angegebene URL um)
-rewrite.MOASLUrlParamName = targetURL
-
-# URL, wie der Webapplikations-Server mit MOA SL vom Proxy aus erreicht werden kann
-# (ohne abschließenden /). Diese URL bildet den ersten Teil des Werts für den obigen
-# Parameter.
-rewrite.MOASLWebAppServUrl = http://localhost:8080
diff --git a/spss.slinterface/conf/moa-spss/spss.config.fragment b/spss.slinterface/conf/moa-spss/spss.config.fragment
deleted file mode 100644
index 2cc7ffccc..000000000
--- a/spss.slinterface/conf/moa-spss/spss.config.fragment
+++ /dev/null
@@ -1,7 +0,0 @@
-Fügen Sie bitte das nachfolgende Fragment in Ihre Konfigurationsdatei für MOA SP/SS als Kind
-von MOAConfiguration/SignatureVerification/CertificateValidation/PathValidation ein.
-
-<cfg:TrustProfile xmlns:cfg="http://reference.e-government.gv.at/namespace/moaconfig/20021122#">
- <cfg:Id>MOA-SL-Test</cfg:Id>
- <cfg:TrustAnchorsLocation>trustProfiles/moa-sl-test</cfg:TrustAnchorsLocation>
-</cfg:TrustProfile>
diff --git a/spss.slinterface/conf/moa-spss/trustprofiles/moa-sl-test/isolde.buergerin.der b/spss.slinterface/conf/moa-spss/trustprofiles/moa-sl-test/isolde.buergerin.der
deleted file mode 100644
index 1cdc15c6e..000000000
--- a/spss.slinterface/conf/moa-spss/trustprofiles/moa-sl-test/isolde.buergerin.der
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/conf/tomcat/server.xml b/spss.slinterface/conf/tomcat/server.xml
deleted file mode 100644
index 0b3d040cf..000000000
--- a/spss.slinterface/conf/tomcat/server.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!-- 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">
-
- <!-- 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="8444"
- acceptCount="100" debug="0" connectionTimeout="20000"
- useURIValidationHack="false" disableUploadTimeout="true" />
- <!-- Note : To disable connection timeouts, set connectionTimeout value
- to 0 -->
-
- <!-- 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="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">
-
- <!-- 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>
-
-</Server>
-
diff --git a/spss.slinterface/conf/tomcat/unix/moa-env.sh b/spss.slinterface/conf/tomcat/unix/moa-env.sh
deleted file mode 100644
index 0e5ca3167..000000000
--- a/spss.slinterface/conf/tomcat/unix/moa-env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# MOA SL configuration properties file
-MOA_SL_CFG_HOME=$CATALINA_BASE/conf/moa-sl
-PARAM_SLCONFIG=-Dat.gv.egovernment.moa.spss.slinterface.PropertiesLocation=$MOA_SL_CFG_HOME/moa-sl.properties
-
-# MOA SL log4j configuration file
-MOA_SL_LOG4J_HOME=$CATALINA_BASE/conf/log4j
-PARAM_LOGGING=-Dlog4j.configuration=file:$MOA_SL_LOG4J_HOME/log4j.properties
-
-# SSL options, if Tomcat should be used for checking client authenticity
-# PARAM_TRUST_STORE=-Djavax.net.ssl.trustStore=truststore.jks
-# PARAM_TRUST_STORE_PASS=-Djavax.net.ssl.trustStorePassword=changeit
-# PARAM_TRUST_STORE_TYPE=-Djavax.net.ssl.trustStoreType=jks
-
-export CATALINA_OPTS="$PARAM_SLCONFIG $PARAM_LOGGING $ $PARAM_TRUST_STORE $PARAM_TRUST_STORE_PASS $PARAM_TRUST_STORE_TYPE"
-
-echo CATALINA_OPTS=$CATALINA_OPTS
diff --git a/spss.slinterface/conf/tomcat/win32/starttomcat.bat b/spss.slinterface/conf/tomcat/win32/starttomcat.bat
deleted file mode 100644
index d792f7777..000000000
--- a/spss.slinterface/conf/tomcat/win32/starttomcat.bat
+++ /dev/null
@@ -1,45 +0,0 @@
-rem ----------------
-rem Java home
-rem ----------------
-
-rem JDK home directory (no trailing path separator)
-set JAVA_HOME=<Java JDK home directory>
-
-rem Java endorsed directory
-rem If not set, the catalina scripts default applies (%CATALINA_HOME%/common/endorsed)
-rem set JAVA_ENDORSED_DIRS=<Java endorsed directory>
-
-rem ----------------
-rem Tomcat config
-rem ----------------
-
-rem Tomcat 4.1.x home directory (no trailing path separator)
-set CATALINA_HOME=<Tomcat home directory>
-
-rem Tomcat 4.1.x base directory (no trailing path separator)
-rem If you do not work with bases, please set base directory to CATALINA_HOME
-set CATALINA_BASE=%CATALINA_HOME%
-
-rem ----------------
-rem MOA SL config
-rem ----------------
-
-rem MOA SL configuration properties file
-set MOA_SL_CFG_HOME=%CATALINA_BASE%\conf\moa-sl
-set PARAM_SLCONFIG=-Dat.gv.egovernment.moa.spss.slinterface.PropertiesLocation=%MOA_SL_CFG_HOME%\moa-sl.properties
-
-rem MOA SL log4j configuration file
-set MOA_SL_LOG4J_HOME=%CATALINA_BASE%\conf\log4j
-set PARAM_LOGGING=-Dlog4j.configuration=file:%MOA_SL_LOG4J_HOME%\log4j.properties
-
-rem SSL options, if Tomcat should be used for checking client authenticity
-rem set PARAM_TRUST_STORE=-Djavax.net.ssl.trustStore=truststore.jks
-rem set PARAM_TRUST_STORE_PASS=-Djavax.net.ssl.trustStorePassword=changeit
-rem set PARAM_TRUST_STORE_TYPE=-Djavax.net.ssl.trustStoreType=jks
-
-rem set PARAMS_SSL=%PARAM_TRUST_STORE% %PARAM_TRUST_STORE_PASS% %PARAM_TRUST_STORE_TYPE%
-set PARAMS_MOA=%PARAM_SLCONFIG% %PARAM_LOGGING%
-set CATALINA_OPTS=%PARAMS_MOA% %PARAMS_SSL%
-
-cd %CATALINA_HOME%
-bin\catalina.bat run
diff --git a/spss.slinterface/conf/tomcat/win32/stoptomcat.bat b/spss.slinterface/conf/tomcat/win32/stoptomcat.bat
deleted file mode 100644
index 0c33e43ee..000000000
--- a/spss.slinterface/conf/tomcat/win32/stoptomcat.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-rem ----------------
-rem Java home
-rem ----------------
-
-rem JDK home directory (no trailing path separator)
-set JAVA_HOME=<Java JDK home directory>
-
-rem Java endorsed directory
-rem If not set, the catalina scripts default applies (%CATALINA_HOME%/common/endorsed)
-rem set JAVA_ENDORSED_DIRS=<Java endorsed directory>
-
-rem ----------------
-rem Tomcat config
-rem ----------------
-
-rem Tomcat 4.1.x home directory (no trailing path separator)
-set CATALINA_HOME=<Tomcat home directory>
-
-rem Tomcat 4.1.x base directory (no trailing path separator)
-rem If you do not work with bases, please set base directory to CATALINA_HOME
-set CATALINA_BASE=%CATALINA_HOME%
-
-cd %CATALINA_HOME%
-bin\catalina.bat stop \ No newline at end of file
diff --git a/spss.slinterface/handbook/common/LogoBKA.png b/spss.slinterface/handbook/common/LogoBKA.png
deleted file mode 100644
index 6a92647fd..000000000
--- a/spss.slinterface/handbook/common/LogoBKA.png
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/common/LogoMoa4c.jpg b/spss.slinterface/handbook/common/LogoMoa4c.jpg
deleted file mode 100644
index a1102090b..000000000
--- a/spss.slinterface/handbook/common/LogoMoa4c.jpg
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/common/LogoMoaBw.jpg b/spss.slinterface/handbook/common/LogoMoaBw.jpg
deleted file mode 100644
index 5a31e3e15..000000000
--- a/spss.slinterface/handbook/common/LogoMoaBw.jpg
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/common/MOA.css b/spss.slinterface/handbook/common/MOA.css
deleted file mode 100644
index b8428d58d..000000000
--- a/spss.slinterface/handbook/common/MOA.css
+++ /dev/null
@@ -1,300 +0,0 @@
-body
-{
- font-family: "Times New Roman", Times, serif;
- font-size: medium;
- font-weight: normal;
- margin-left: 2.5em;
- margin-right: 2.5em;
-}
-
-p
-{
- margin-top: 0pt;
- margin-bottom: 0.5em;
- text-align: justify
-}
-
-pre
-{
- font-family: "Courier New", monospace;
- font-size: 90%;
- background-color: #cccccc;
- color: #000000;
- margin-left:1.5%;
- margin-right:1.5%;
- margin-top: 1em;
- margin-bottom: 1em;
- border: #008000 none;
-}
-
-hr
-{
- color: #000080;
- background-color: #000080;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-
-table.fixedWidth
-{
- width: 97%;
- margin-left:1.5%;
- margin-right:1.5%;
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-
-table.varWidth
-{
- margin-left:1.5%;
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-th
-{
- text-align: left;
-}
-
-h1
-{
- color: #000080;
- text-align: left;
- font-size: 167%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h2
-{
- color: #000080;
- font-size: 150%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h3
-{
- color: #000080;
- font-size: 133%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h4
-{
- color: #000080;
- font-size: 116%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h5
-{
- color: #000080;
- font-size: 100%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-h6
-{
- color: #000080;
- font-size: 83%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal
-}
-
-code
-{
- font-family: "Courier New", Courier, monospace;
- font-size: 90%;
- color: #000000
-}
-
-dd
-{
- margin-top: 0.8em;
- margin-bottom: 0.8em;
- text-align: justify
-
-}
-
-dt
-{
- margin-top: 0.8em;
- font-family: Arial, Helvetica, sans-serif;
- color: #000080
-}
-
-ol
-{
- margin-top: 0.5em;
- margin-bottom: 0.5em
-}
-
-ol.alpha
-{
- list-style-type: lower-alpha
-}
-
-li
-{
- margin-top: 0.25em;
- margin-bottom: 0.25em;
- text-align: justify
-}
-
-a:hover
-{
- color: #990000
-}
-
-
-.title
-{
- text-align: left;
- font-size: 167%;
- color: #000080;
- font-family: Arial, Helvetica, sans-serif;
- margin-top: 0.4em;
- margin-bottom: 0.4em
-}
-
-.subtitle
-{
- text-align: left;
- font-size: 133%;
- color: #000080;
- font-family: Arial, Helvetica, sans-serif;
- margin-top: 0.4em;
- margin-bottom: 0.4em
-}
-
-.glossaryTerm
-{
- font-style: italic;
- color: #006699
-}
-
-.example
-{
- font-family: "Courier New", monospace;
- background-color: #CCFFFF;
- color: #000000;
- margin: 0pt 0pt;
- border: #008000 none
-}
-
-.schema
-{
- font-family: "Courier New", monospace;
- background-color: #FFFFCC;
- color: #000000;
- margin: 0pt 0pt;
- border: #008000 none
-}
-
-.documentinfo
-{
- font-family: Arial, Helvetica, sans-serif;
- font-size: 100%;
-}
-
-.ol-contents
-{
- font-size: 100%;
- margin-top: 0.0em;
- margin-bottom: 0.0em;
-}
-
-.li-contents
-{
- font-size: 100%;
- margin-top: 0.0em;
- margin-bottom: 0.0em;
-}
-
-.logoTitle
-{
- text-align: center;
- font-size: 133%;
- color: #000080;
- font-family: Arial, Helvetica, sans-serif;
-}
-
-.logoTable
-{
- margin-bottom: 0px;
- margin-left: 0px
-}
-
-.superscript
-{
- vertical-align: super;
- font-size: 66%;
-}
-
-.term
-{
- font-style: italic;
-}
-
-.comment
-{
- color: #000000;
- background: #ffff00;
- font-style: italic
-}
-
-.addedErrata12
-{
- color: #FF0000;
- background-color: #FFEEEE;
- text-decoration: underline
-}
-
-.deletedErrata12
-{
- color: #999999;
- background-color: #EEEEEE;
- text-decoration: line-through
-}
-
-.added12
-{
- color: #FF0000;
- text-decoration: underline
-; background-color: #F8F0FF
-}
-
-.deleted12
-{
- color: #999999;
- text-decoration: line-through
-; background-color: #f8f0ff
-}
-
-.rfc2119Keyword
-{
- font-variant: small-caps;
- font-style: normal;
-}
-
-.remark { font-style: italic}
-
-li.faq
-{
- margin-top: 1.5em;
- margin-bottom: 1.5em;
-}
-
-.faq-question
-{
- color: #000080;
- font-size: 100%;
- font-family: Arial, Helvetica, sans-serif;
- font-weight: normal;
- margin-bottom: 0.4em;
-}
diff --git a/spss.slinterface/handbook/constraints.txt b/spss.slinterface/handbook/constraints.txt
deleted file mode 100644
index f21d385c8..000000000
--- a/spss.slinterface/handbook/constraints.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Prüfung eines ggf. vorhandenen SL-Manifests wird nicht durchgeführt.
- In der Antwort wird der Code 98 zurückgeliefert.
-
-- Prüfung von dsig-Manifesten escheint nicht in der Auswertungsseite.
-
-- Bei signiertem XHTML-Dokument wird list-style-image-URL nicht geprüft. \ No newline at end of file
diff --git a/spss.slinterface/handbook/index.html b/spss.slinterface/handbook/index.html
deleted file mode 100644
index e8b496563..000000000
--- a/spss.slinterface/handbook/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
- <title>MOA SL - &Uuml;bersicht</title>
- <meta content="Evrsoft First Page" name="GENERATOR">
- <meta http-equiv="content-type" content="text/html; charset=us-ascii">
- <link href="./common/MOA.css" type="text/css" rel="stylesheet">
-</head>
-
-<body text="#000000" vlink="#666666" alink="#CC9966" link="#990000" bgcolor="white">
- <table class="logoTable" cellspacing="0" cellpadding="10" width="100%" border="0">
- <tbody>
- <tr>
- <td class="logoTitle" align="middle" width="267"><img height="37" alt="Logo BKA" src="common/LogoBKA.png" width="267" align="left"></td>
-
- <td class="logoTitle" align="middle">Open Source<br>
- f&uuml;r das E-Government</td>
-
- <td class="logoTitle" align="middle" width="123"><img height="138" alt="Logo MOA" src="common/LogoMoa4c.jpg" width="123" align="right"></td>
- </tr>
- </tbody>
- </table>
- <hr>
-
- <p class="title">MOA: Serverseitige Signaturpr&uuml;fung (SL) </p>
-
- <p class="subtitle">&Uuml;bersicht zur Dokumentation der Version 1.0</p>
- <hr>
-
- <dl>
- <dt><a href="./operation/operation.html">Betriebshandbuch </a></dt>
-
- <dd>Detaillierte Anleitung f&uuml;r die Installation sowie Erl&auml;uterung aller Konfigurationsoptionen.</dd>
-
- <dt><a href="./system/system.html">Systemhandbuch</a></dt>
-
- <dd>Beschreibung der einzelnen Komponenten von MOA SL und ihrem Zusammenspiel.</dd>
- </dl>
-</body>
-</html>
diff --git a/spss.slinterface/handbook/operation/images/testapp.screen1.png b/spss.slinterface/handbook/operation/images/testapp.screen1.png
deleted file mode 100644
index 38a226d09..000000000
--- a/spss.slinterface/handbook/operation/images/testapp.screen1.png
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/operation/images/testapp.screen2.png b/spss.slinterface/handbook/operation/images/testapp.screen2.png
deleted file mode 100644
index 45230d5c9..000000000
--- a/spss.slinterface/handbook/operation/images/testapp.screen2.png
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/operation/images/testapp.screen3.png b/spss.slinterface/handbook/operation/images/testapp.screen3.png
deleted file mode 100644
index 7d5db9cad..000000000
--- a/spss.slinterface/handbook/operation/images/testapp.screen3.png
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/operation/images/testapp.screen4.png b/spss.slinterface/handbook/operation/images/testapp.screen4.png
deleted file mode 100644
index 9fe7ee264..000000000
--- a/spss.slinterface/handbook/operation/images/testapp.screen4.png
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/operation/operation.html b/spss.slinterface/handbook/operation/operation.html
deleted file mode 100644
index 05287b293..000000000
--- a/spss.slinterface/handbook/operation/operation.html
+++ /dev/null
@@ -1,1351 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
- <title>MOA SL - Betriebshandbuch</title>
-
-
- <link rel="stylesheet" href="../common/MOA.css" type="text/css">
-
-</head>
-
-
-<body style="color: rgb(0, 0, 0); background-color: white;" alink="#cc9966" link="#990000" vlink="#666666">
-
-<table class="logoTable" border="0" cellpadding="10" cellspacing="0" width="100%">
-
- <tbody>
-
- <tr>
-
- <td class="logoTitle" align="center" width="267"><img src="../common/LogoBKA.png" alt="Logo BKA" align="left" height="37" width="267"></td>
-
- <td class="logoTitle" align="center">Open
-Source<br>
-
-f&uuml;r das E-Government</td>
-
- <td class="logoTitle" align="center" width="123"><img src="../common/LogoMoa4c.jpg" alt="Logo MOA" align="right" height="138" width="123"></td>
-
- </tr>
-
- </tbody>
-</table>
-
-<hr>
-<p class="title"><a href="../index.html">MOA:
-Serverseitige Signaturpr&uuml;fung (SL), V 1.1</a></p>
-
-<p class="subtitle">Betriebshandbuch</p>
-
-<hr>
-<h1>Inhalt</h1>
-
-<ol>
-
- <li>
- <p><a href="#%FCbersicht">&Uuml;bersicht</a></p>
-
- </li>
-
- <li><a href="#installation">Installation</a>
- <ol>
-
- <li><a href="#installation_einf%FChrung">Einf&uuml;hrung</a></li>
-
- <li><a href="#installation_vorbereitung">Vorbereitung</a></li>
-
- <li><a href="#installation_tomcatconfig">Konfiguration
-von Apache Tomcat</a>
- <ol>
-
- <li><a href="#installation_tomcatconfig_httpconn">Konfiguration
-des HTTP Connectors</a></li>
-
- <li><a href="#installation_tomcatconfig_httpsconn">Konfiguration
-des HTTPS Connectors</a></li>
-
- </ol>
-
- </li>
-
- <li><a href="#installation_deploy">Einsatz des
-MOA SL Webservices in Tomcat</a></li>
-
- <li><a href="#installation_tomcatstartstop">Starten
-und Stoppen von Tomcat</a>
- <ol>
-
- <li><a href="#installation_tomcatstartstop_windows">Unter
-Windows</a></li>
-
- <li><a href="#installation_tomcatstartstop_unix">Unter
-Unix</a></li>
-
- <li><a href="#installation_tomcatstartstop_logging">Logging</a>
- <ol>
-
- <li><a href="#webservice_basisinstallation_logging_format">Format
-der Log-Meldungen</a> </li>
-
- </ol>
-
- </li>
-
- <li><a href="#installation_tomcatstartstop_verify">Pr&uuml;fen
-des erfolgreichen Starts</a></li>
-
- </ol>
-
- </li>
-
- </ol>
-
- </li>
-
- <li><a href="#konfiguration">Konfiguration</a>
- <ol>
-
- <li><a href="#konfiguration_konfigurationsdatei">Zentrale
-Konfigurationsdatei</a>
- <ol>
-
- <li><a href="#konfiguration_konfigurationsdatei_schemata">XML-Schemata
-f&uuml;r Request- und Response-Validierung</a></li>
-
- <li><a href="#konfiguration_konfigurationsdatei_arbeitsverzeichnis">Arbeitsverzeichnis</a></li>
-
- <li><a href="#konfiguration_konfigurationsdatei_moasp">Parameter
-der verwendeten MOA SP Installation</a></li>
-
- <li><a href="#konfiguration_konfigurationsdatei_umfang">Umfang der
-Pr&uuml;fberichtseite</a></li>
-
- <li><a href="#konfiguration_konfigurationsdatei_umschreiben">Parameter
-f&uuml;r das Umschreiben der Links in der Pr&uuml;fberichtseite</a></li>
-
- </ol>
-
- </li>
-
- <li><a href="#konfiguration_layout">Layout des
-Pr&uuml;fberichts</a> </li>
-
- </ol>
-
- </li>
-
- <li><a href="#testapp">Durchlaufen der
-Testapplikation</a> </li>
-
-</ol>
-
-<hr>
-<h1><a name="&uuml;bersicht" id="&uuml;bersicht"></a>1
-&Uuml;bersicht</h1>
-
-<p> Das Modul<span class="term"> Serverseitige
-Signaturpr&uuml;fung</span> (MOA SL) ist als
-plattformunabh&auml;ngiges Modul ausgelegt, das als Webservice
-&uuml;ber HTTP bzw. HTTPS angesprochen werden kann. </p>
-
-<p>Dieses Handbuch beschreibt einerseits die Installation des
-Moduls, andererseits werden die Konfigurationsm&ouml;glichkeiten
-dargestellt. F&uuml;r eine funktionale Beschreibung des Moduls
-siehe <a href="../system/system.html">Systemhandbuch</a>.
-</p>
-
-<h1><a name="installation" id="installation"></a>2
-Installation</h1>
-
-<h2><a name="installation_einf&uuml;hrung" id="installation_einf&uuml;hrung"></a>2.1
-Einf&uuml;hrung </h2>
-
-<p>Das MOA SL Webservice wurde plattformunabh&auml;nig
-konzipiert und in Java entwickelt. Es ben&ouml;tigt als
-Ablaufumgebung eine Java 2 Standard Edition (J2SE SDK, Version <a href="http://java.sun.com/j2se/1.4.2/">1.4.2</a> oder <a href="http://java.sun.com/j2se/1.5.0/">5.0</a>) sowie
-einen Java Servlet Container, der die <a href="http://java.sun.com/products/servlet/reference/api/index.html">Java
-Servlet Specification</a> in der Version 2.3 erf&uuml;llt.</p>
-
-<p>In diesem Betriebshandbuch wird davon ausgegangen, dass MOA SL
-<a href="http://jakarta.apache.org/tomcat/index.html">Apache
-Tomcat</a> (Version 4.1 oder h&ouml;her) als Servlet
-Container verwendet. Die Verwendung eines anderen Servlet Containers
-ist grunds&auml;tzlich m&ouml;glich, wurde aber nicht getestet
-und ist auch nicht Gegenstand dieses Betriebshandbuchs. </p>
-
-<p>Weiters wird davon ausgegangen, dass Apache Tomcat
-gleichzeitig als HTTP- bzw. HTTPS-Endpunkt f&uuml;r das MOA SL
-Webservice dient, d.h. beide Protokolle werden direkt in Tomcat
-konfiguriert. Die Verwendung eines vor Apache Tomcat geschalteten
-Webservers ist grunds&auml;tzlich m&ouml;glich. So werden etwa
-als Teil des Apache Tomcat Projekts <a href="http://tomcat.apache.org/connectors-doc/">Module</a>
-zur Verbindung mit einem vorgeschalteten Microsoft Internet Information
-Server oder mit einem vorgeschalteten Apache Webserver angeboten. Die
-Beschreibung der m&ouml;glichen Vorschaltungen ist jedoch nicht
-Teil dieses Betriebshandbuchs. </p>
-
-<p>Das MOA SL Webservice nimmt Signaturpr&uuml;fungsrequests
-f&uuml;r XML-Signaturen entsprechend der Spezifikation des
-Security-Layers zur &ouml;sterreichischen B&uuml;rgerkarte in
-den Versionen 1.1 und 1.2 entgegen. F&uuml;r die
-Durchf&uuml;hrung der Signaturpr&uuml;fung bedient sich MOA SL
-des Moduls MOA Signaturpr&uuml;fung (SP). F&uuml;r den Betrieb
-von MOA SL ist daher die Verf&uuml;gbarkeit einer
-Webservice-Installation von MOA SP in der Version 1.2 oder
-h&ouml;her Voraussetzung. </p>
-
-<p>Als Logging Toolkit verwendet das MOA SL Webservice <a href="http://logging.apache.org/log4j/">Apache Log4j</a>.
-</p>
-
-<h2><a name="installation_vorbereitung" id="installation_vorbereitung"></a>2.2 Vorbereitung</h2>
-
-<p>Die folgenden Schritte dienen der Vorbereitung der
-Installation.</p>
-
-<dl>
-
- <dt>Installation von J2SE SDK</dt>
-
- <dd>Installieren Sie <a href="http://java.sun.com/j2se/1.4.2/">J2SE 1.4.2 SDK</a>
-oder <a href="http://java.sun.com/j2se/1.5.0/">J2SE 5.0
-SDK</a> in ein beliebiges Verzeichnis. Das Wurzelverzeichnis der
-J2SE SDK Installation wird im weiteren Verlauf als <code>$JAVA_HOME</code>
-bezeichnet. </dd>
-
- <dt>Installation von Apache Tomcat</dt>
-
- <dd> Installieren Sie <a href="http://jakarta.apache.org/tomcat/index.html">Apache
-Tomcat</a> 4.1.31 oder h&ouml;her in ein Verzeichnis, das
-keine Leerzeichen im Pfadnamen enth&auml;lt. Verwenden Sie bitte
-die zu Ihrem J2SE SDK passende Distribution von Tomcat. Das
-Wurzelverzeichnis der Tomcat-Installation wird im weiteren Verlauf als <code>$CATALINA_HOME</code>
-bezeichnet.</dd>
-
- <dt>Installation von MOA SP </dt>
-
- <dd>Installieren Sie das <a href="http://www.cio.gv.at/onlineservices/basicmodules/moa-spss/">Kombinationsmodul
-MOA SPSS</a> Version 1.3 oder h&ouml;her entsprechend seiner
-Installationsanleitung. Sie ben&ouml;tigen die
-Webservice-Schnittstelle von MOA SP. Es ist ausreichend, mittels
-entsprechender Konfigurationseinstellungen ausschlie&szlig;lich MOA
-SP zu aktivieren; MOA SS kann deaktiviert bleiben. Wenn Sie sowohl
-f&uuml;r MOA SPSS als auch f&uuml;r MOA SL Apache Tomcat als
-Servlet Container verwenden m&ouml;chten, empfehlen wir, MOA SPSS
-und MOA SL in jeweils eigenst&auml;ndigen Instanzen von Apache
-Tomcat zu betreiben. </dd>
-
- <dt>Entpacken der MOA SL Distribution</dt>
-
- <dd> Entpacken Sie die Datei <code>moa-sl-1.1.x.zip</code>
-in ein beliebiges Verzeichnis. Dieses Verzeichnis wird im weiteren
-Verlauf als <code>$MOA_SL_INST</code> bezeichnet. </dd>
-
-</dl>
-
-<h2><a name="installation_tomcatconfig" id="installation_tomcatconfig"></a>2.3 Konfiguration
-von Apache Tomcat</h2>
-
-<p> Die zentrale Konfigurations-Datei von Tomcat ist <code>$CATALINA_HOME/conf/server.xml</code>.
-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. </p>
-
-<h3><a name="installation_tomcatconfig_httpconn" id="installation_tomcatconfig_httpconn"></a>2.3.1
-Konfiguration des HTTP Connectors</h3>
-
-<p> Die Datei <code>$MOA_SL_INST/conf/tomcat/server.xml</code>
-enth&auml;lt eine minimale Tomcat-Konfiguration, die
-ausschlie&szlig;lich den Connector f&uuml;r HTTP auf Port 8080
-freischaltet. Durch kopieren dieser Datei nach <code>$CATALINA_HOME/conf/server.xml</code>
-kann Tomcat mit dieser Konfiguration gestartet werden. Wir empfehlen
-diese Konfiguration nur f&uuml;r F&auml;lle, in denen das MOA
-SL Webservice in einer abgeschlossenen Netzwerkumgebung betrieben wird.
-</p>
-
-<h3><a name="installation_tomcatconfig_httpsconn" id="installation_tomcatconfig_httpsconn"></a>2.3.2
-Konfiguration des HTTPS Connectors</h3>
-
-<p>Wird das MOA SL Webservice in einer nicht abgeschlossenen
-Umgebung (z.B. Erreichbarkeit &uuml;ber das Internet) betrieben,
-ist es f&uuml;r den Benutzer von MOA SL essentiell, die
-Identit&auml;t des Webservice eindeutig feststellen zu
-k&ouml;nnen, denn er vertraut dem Webservice ja die
-Pr&uuml;fung einer elektronischen Signatur an. Diese
-Identit&auml;tspr&uuml;fung kann mit hoher Qualit&auml;t
-vorgenommen werden, wenn die Erreichbarkeit des Webservice auf HTTPS
-mit Serverauthentisierung eingeschr&auml;nkt wird. </p>
-
-<p>F&uuml;r die dazu notwendige Konfiguration kann die im
-vorigen Abschnitt besprochene minimale Tomcat-Konfiguration als
-Ausgangspunkt verwendet werden: Zun&auml;chst ist der HTTP
-Connector abzuschalten (auszukommentieren). Anschlie&szlig;end ist
-der HTTPS Connector zu konfigurieren. Das Dokument <a href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/ssl-howto.html">Tomcat
-SSL Configuration HOW-TO </a> gibt einen guten
-&Uuml;berblick dazu. Grob zusammengefasst sind folgende Schritte
-durchzuf&uuml;hren: </p>
-
-<ul>
-
- <li>Erstellung eines <span class="term">Server-Keystores</span>,
-der den privaten Schl&uuml;ssel sowie das zugeh&ouml;rige
-Zertifikat des Webservices enth&auml;lt, mit dem es sich bei Aufbau
-einer SSL-Verbindung gegen&uuml;ber dem Kunden ausweist. Sie
-k&ouml;nnen diesen Keystore z.B. mit <code>keytool</code>
-erstellen, einem Programm, das Ihrem J2SE SDK beiliegt.</li>
-
- <li>Erstellung eines <span class="term">Client-Keystores</span>,
-der die Zertifikate aller Kunden des Webservices enth&auml;lt. Nur
-Kunden des MOA SL Webservices, die sich beim Aufbau einer
-SSL-Verbindung gegen&uuml;ber dem Webservice mit einem im <span class="term">Client-Keystore</span> enthaltenen
-Zertifikat ausweisen, erhalten Zugriff zu den Diensten des MOA SL
-Webservices. Auch dieser Keystore kann z.B. mit <code>keytool</code>
-erstellt werden. Dieser Keystore ist optional und braucht nur erstellt
-zu werden, wenn sich die Kunden gegen&uuml;ber dem MOA SL
-Webservice authentisieren m&uuml;ssen. </li>
-
- <li>Konfiguration des HTTPS Connectors in <code>$CATALINA_HOME/conf/server.xml</code>.</li>
-
-</ul>
-
-<p>Die Konfiguration des HTTPS Connectors kann entfallen, wenn
-Tomcat ein Webserver vorgeschaltet ist, und dieser die
-SSL-Kommunikation mit dem Kunden &uuml;bernimmt (siehe <a href="#installation_einf%FChrung">Abschnitt 2.1</a>).</p>
-
-<h2><a name="installation_deploy" id="installation_deploy"></a>2.4 Einsatz des MOA SL
-Webservices in Tomcat</h2>
-
-<p> Um das MOA SL Webservice in Tomcat f&uuml;r den Einsatz
-vorzubereiten, sind folgende Schritte notwendig:</p>
-
-<ul>
-
- <li>Die Datei <code>$MOA_SL_INST/moa-sl.war</code>
-enth&auml;lt das einsatzfertige MOA SL Webarchiv und muss ins
-Verzeichnis <code>$CATALINA_HOME/webapps</code> kopiert
-werden. Dort wird sie beim ersten Start von Tomcat automatisch ins
-Verzeichnis <code>$CATALINA_HOME/webapps/moa-sl</code>
-entpackt. </li>
-
- <li>Die zentrale Konfigurationsdatei f&uuml;r MOA SL muss
-in ein beliebiges Verzeichnis im Dateisystem kopiert werden (z.B. <code>$CATALINA_HOME/conf/moa-sl/</code>).
-Eine funktionsf&auml;hige Konfiguration, die als Ausgangspunkt
-f&uuml;r die Konfiguration des MOA SL Webservices dienen kann,
-finden Sie unter <code>$MOA_SL_INST/conf/moa-sl/moa-sl.properties</code>.
- </li>
-
- <li>Die Dateien <code>xalan.jar</code>, <code>xercesImpl.jar</code>
-und <code>xmlParserAPIs.jar</code> aus dem Verzeichnis <code>$MOA_SL_INST/endorsed14</code>
-m&uuml;ssen in das Tomcat-Verzeichnis <code>$CATALINA_HOME/common/endorsed</code>
-kopiert werden. Sind gleichnamige Dateien dort bereits vorhanden,
-m&uuml;ssen sie &uuml;berschrieben werden. Die ggf. in diesem
-Verzeichnis vorhandene Datei <code>xml-apis.jar</code>
-muss gel&ouml;scht werden.</li>
-
- <li>Folgende <span class="term">System Properties</span>
-f&uuml;r die <span class="term">Java Virtual Machine</span>
-m&uuml;ssen bzw. k&ouml;nnen gesetzt werden. Am einfachsten
-k&ouml;nnen diese <span class="term">System Properties</span>
-beim Starten von Tomcat in der Umgebungsvariablen <code>CATALINA_OPTS</code>
-in der Form <code>-D&lt;name&gt;=&lt;wert&gt;</code>
-&uuml;bergeben werden.
- <ul>
-
- <li id="klein"><code>at.gv.egovernment.moa.spss.slinterface.PropertiesLocation</code>:
-Pfad und Name der zentralen Konfigurationsdatei f&uuml;r MOA SL.
-Eine beispielhafte Konfigurationsdatei finden Sie unter <code>$MOA_SL_INST/conf/moa-sl/moa-sl.properties</code>.
-Wird ein relativer Pfad angegeben, wird zuerst versucht, diesen relativ
-zum Wurzelverzeichnis der Webapplikation (also <code>$CATALINA_HOME/webapps/moa-sl</code>)
-zu interpretieren. Klappt das nicht, wird dann versucht, den relativen
-Pfad relativ zum Startverzeichnis der <span class="term">Java
-Virtual Machine</span> zu interpretieren. Diese <span class="term">System Property</span> muss jedenfalls
-gesetzt werden.</li>
-
- <li id="klein"><code>log4j.configuration</code>:
-URL der Log4j Konfigurationsdatei. Eine beispielhafte
-Log4j-Konfiguration finden Sie unter <code>$MOA_SL_INST/conf/log4j/log4j.properties</code>. Wird eine
-relative URL angegeben, wird diese als File-URL relativ zum
-Startverzeichnis der <span class="term">Java Virtual
-Machine</span> interpretiert. Ist diese System Property nicht
-gesetzt, wird automatisch eine im Webarchiv unter <code>WEB-INF/classes</code>
-enthaltene Default-Konfiguration herangezogen.</li>
-
- <li id="klein"><code>javax.net.ssl.trustStore</code>:
-Pfad und Dateiname des <span class="term">Truststores</span>
-f&uuml;r vertrauensw&uuml;rdige SSL Client-Zertifikate
-(optional; nur wenn kein Webserver vor Tomcat geschalten wird und SSL
-Client-Authentisierung durchgef&uuml;hrt werden soll). Ein
-relativer Pfad werden relativ zum Startverzeichnis der <span class="term">Java Virtual Machine</span> interpretiert.</li>
-
- <li id="klein"><code>javax.net.ssl.trustStorePassword</code>:
-Passwort f&uuml;r den <span class="term">Truststore</span>
-(optional; nur wenn kein Webserver vor Tomcat geschalten wird und SSL
-Client-Authentisierung durchgef&uuml;hrt werden soll). </li>
-
- <li id="klein"><code>javax.net.ssl.trustStoreType</code>:
-Truststore-Typ (optional; nur wenn kein Webserver vor Tomcat geschalten
-wird und SSL Client-Authentisierung durchgef&uuml;hrt werden soll).
-Je nach verwendetem Keystore-Typ muss <code>jks</code> (<span class="term">Java Key Store</span>) oder <code>pkcs12</code>
-(PKCS#12-Datei) angegeben werden.</li>
-
- </ul>
-
- </li>
-
-</ul>
-
-<h2><a name="installation_tomcatstartstop" id="installation_tomcatstartstop"></a>2.5 Starten und
-Stoppen von Tomcat</h2>
-
-<h3><a name="installation_tomcatstartstop_windows" id="installation_tomcatstartstop_windows"></a>2.5.1
-Unter Windows</h3>
-
-<p>Das Verzeichnis <code>$MOA_SL_INST/conf/tomcat/win32</code>
-enth&auml;lt Script-Dateien zum Starten und Stoppen von Tomcat. Vor
-der erstmaligen Verwendung der Scripts m&uuml;ssen in den ersten
-Zeilen die Umgebungsvariablen <code>JAVA_HOME</code>
-(Basisverzeichnis des eingesetzten J2SE SDK) und <code>CATALINA_HOME</code>
-(Basisverzeichnis der eingesetzten Tomcat-Installation) angepasst
-werden. Evtl. m&uuml;ssen Sie auch noch die in den Script-Dateien
-gesetzten, in <a href="#installation_deploy">Abschnitt 2.4</a>
-besprochenen <span class="term">System Properties</span>
-anpassen. </p>
-
-<h3><a name="installation_tomcatstartstop_unix" id="installation_tomcatstartstop_unix"></a>2.5.2 Unter
-Unix</h3>
-
-<p>Zun&auml;chst m&uuml;ssen die in <a href="#installation_deploy">Abschnitt 2.4</a>
-besprochenen <span class="term">System Properties</span>
-mit Hilfe der Umgebungsvariablen <code>CATALINA_OPTS</code>
-gesetzt werden. Die Datei <code>$MOA_SL_INST/tomcat/unix/moa-env.sh</code>
-enth&auml;lt ein Beispiel daf&uuml;r. Weiters m&uuml;ssen
-noch die Umgebungsvariablen <code>JAVA_HOME</code>
-(Basisverzeichnis des eingesetzten J2SE SDK) und <code>CATALINA_HOME</code>
-(Basisverzeichnis der eingesetzten Tomcat-Installation) angepasst
-werden.</p>
-
-<p>Nun kann Tomcat aus seinem Basisverzeichnis mit </p>
-
-<pre>bin/catalina.sh start</pre>
-
-gestartet werden. Das Stoppen von Tomcat erfolgt analog mit
-<pre>bin/catalina.sh stop</pre>
-
-<h3><a name="installation_tomcatstartstop_logging" id="installation_tomcatstartstop_logging"></a>2.5.3
-Logging </h3>
-
-<p>Das MOA SL Webservice verwendet <a href="http://logging.apache.org/log4j/">Apache Log4j</a> 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://logging.apache.org/log4j/">Apache
-Log4j</a>
-Handbuch beschrieben sind. Unter anderem gibt es die
-M&ouml;glichkeit, folgende Einstellungen vorzunehmen:
-</p>
-
-<ul>
-
- <li id="klein">
- <p>Das verwendete Log-Level (<code>DEBUG</code>, <code>INFO</code>,
- <code>WARN</code>, <code>ERROR</code>, <code>FATAL</code>);</p>
-
- </li>
-
- <li id="klein">
- <p>Name und maximale Gr&ouml;&szlig;e der
-Log-Datei(en);</p>
-
- </li>
-
- <li id="klein">
- <p>Das Aussehen der Log-Eintr&auml;ge.</p>
-
- </li>
-
-</ul>
-
-<p>Das MOA SL Webservice verwendet f&uuml;r alle
-Logeintr&auml;ge die Log-Hierarchie <code>slinterface</code>.
-F&uuml;r die einzelnen Pakete des MOA SL Webservices werden davon
-abgeleitete Sub-Hierarchien eingesetzt, z.B. <code>slinterface.xmlparser</code>,
-<code>slinterface.beans</code> oder <code>slinterface.filters</code>.</p>
-
-<p>Eine f&uuml;r MOA SL passende Konfigurationsdatei
-f&uuml;r Log4j finden Sie unter <code>$MOA_SL_INST/conf/log4j/log4j.properties</code>. Wird diese
-Datei als Logging-Konfiguration verwendet, so werden alle Log-Meldungen
-sowohl in die Konsole, als auch in die Datei <code>$CATALINA_HOME/logs/moa-sl.log</code>
-geschrieben. </p>
-
-<h4><a name="webservice_basisinstallation_logging_format" id="webservice_basisinstallation_logging_format"></a>2.5.3.1
-Format der Log-Meldungen</h4>
-
-<p> Anhand einer konkreten Log-Meldung wird das Format der MOA SL
-Log-Meldungen erl&auml;utert: </p>
-
-<pre>INFO | 10 15:58:45,531 | slinterface.listeners | main | <br> Web application initialization succeeded..</pre>
-
-<p> Der Wert <code>INFO</code> besagt, dass die
-Log-Meldung im Log-Level <code>INFO</code> entstanden ist.
-Folgende Log-Levels existieren:</p>
-
-<ul>
-
- <li>
- <p><code>DEBUG</code>: Log-Meldungen im Log-Level
- <code>DEBUG</code> geben Auskunft &uuml;ber die
-innere Arbeitsweise des Systems. Sie sind haupts&auml;chlich
-f&uuml;r Entwickler interessant.</p>
-
- </li>
-
- <li>
- <p><code>INFO</code>: Diese Log-Meldungen geben
-Status-Informationen &uuml;ber den Ablauf des Webservices, wie z.B.
-&uuml;ber das Einlangen einer neuen Anfrage.</p>
-
- </li>
-
- <li>
- <p><code>WARN</code>: Bei der Ausf&uuml;hrung
-einer Anfrage sind leichte Fehler aufgetreten. Der Ablauf des
-Webservices ist nicht weiter beeintr&auml;chtigt.</p>
-
- </li>
-
- <li>
- <p><code>ERROR</code>: Die Ausf&uuml;hrung
-einer Anfrage musste abgebrochen werden. Das Webservice ist davon nicht
-beeintr&auml;chtigt. </p>
-
- </li>
-
- <li>
- <p><code>FATAL</code>: Es ist ein Fehler
-aufgetreten, der den weiteren Betrieb des Webservices nicht mehr
-erlaubt.</p>
-
- </li>
-
-</ul>
-
-<p>Der n&auml;chste Wert <code>10 15:58:45,531</code>
-gibt den Zeitpunkt an, zu dem die Log-Meldung generiert wurde (in
-diesem Fall den 10. Tag im aktuellen Monat, sowie die genaue Uhrzeit). </p>
-
-<p>Der Wert <code>slinterface.listeners</code> gibt
-die Log-Hierarchie an, aus der die Log-Meldung stammt. </p>
-
-<p>Der Wert <code>main</code> bezeichnet den Thread,
-aus der die Log-Meldung stammt. </p>
-
-<p>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.</p>
-
-<h3><a name="installation_tomcatstartstop_verify" id="installation_tomcatstartstop_verify"></a>2.5.4
-Pr&uuml;fen des erfolgreichen Starts </h3>
-
-<p>Ein erfolgreicher Start des MOA SL Webservices ist an
-folgender Log-Meldung ersichtlich: </p>
-
-<pre>INFO | 10 15:58:45,531 | slinterface.listeners | main | <br> Web application initialization succeeded..</pre>
-
-<p>Konnte das MOA SL Webservice nicht
-ordnungsgem&auml;&szlig; gestartet werden, f&uuml;hrt das
-zu folgender Log-Meldung:</p>
-
-<pre>FATAL | 18 10:17:03,475 | main | TID=startup NID=&lt;null&gt; <br> Web application initialization failed.<br></pre>
-
-<p>In diesem Fall geben die<code> </code>Log-Meldungen
-unmittelbar davor Aufschluss &uuml;ber den genaueren Grund. </p>
-
-<p>Fehlermeldungen w&auml;hrend der Initialisierung des
-XML-Parsers, die wie nachfolgend dargestellt aussehen, k&ouml;nnen
-ignoriert werden. Sie resultieren aus einem Bug im eingesetzten
-XML-Parser Apache Xerces in der Version 2.6.2. </p>
-
-<pre>[Error] xhtml-attribs-1.xsd:<em>xx</em>:<em>xx</em>: src-attribute_group.3: <br> Circular definitions detected for attribute group '<em>xxx</em>'. <br> Recursively following attribute group references eventually leads back to itself.<br>[Error] xhtml-attribs-1.xsd:<em>xx</em>:<em>xx</em>: src-redefine.7.2.1: <br> No attributeGroup in the redefined schema has a name matching '<em>xx</em>'.</pre>
-
-<h1><a name="konfiguration" id="konfiguration"></a>3
-Konfiguration</h1>
-
-<h2><a name="konfiguration_konfigurationsdatei" id="konfiguration_konfigurationsdatei"></a>3.1
-Zentrale Konfigurationsdatei</h2>
-
-<p>Alle Konfigurationsparameter von MOA SL mit Ausnahme des
-Layouts f&uuml;r den Pr&uuml;fbericht (siehe Abschnitt <a href="#konfiguration_layout">3.2</a>) sind in einer
-zentralen Konfigurationsdatei zusammengefasst. Eine beispielhafte
-Konfigurationsdatei finden Sie unter <code>$MOA_SL_INST/conf/moa-sl/moa-sl.properties</code>.
-F&uuml;r Hinweise, wie Sie dem MOA SL Webservice mitteilen, welche
-Konfigurationsdatei es verwenden soll, siehe Abschnitt <a href="#installation_deploy">2.4</a>. </p>
-
-<p>In den folgenden Abschnitten werden die einzelnen
-Konfigurationsparameter der zentralen Konfigurationsdatei im Detail
-besprochen. Die meisten Konfigurationsparameter werden leichter
-verst&auml;ndlich, wenn Sie zun&auml;chst<span style="font-style: italic;"> </span>das <a href="../system/system.html">Systemhandbuch<span class="comment"></span></a> lesen. Dort werden
-der gesamte Ablauf eines Signaturpr&uuml;fvorgangs in MOA SL sowie
-die daran beteiligten Komponenten erkl&auml;rt. </p>
-
-<p>Die Konfigurationsdatei ist als <span class="term">Java
-Properties</span> Datei aufgebaut, d. h. jede Zeile
-enth&auml;lt den Namen sowie den Wert des jeweiligen
-Konfigurationsparameters in der Form <code>name=wert</code>.
-Details zum Aufbau einer <span class="term">Java
-Properties</span> Datei finden Sie in der API-Dokumentation zu
-Ihrem Java JDK, beispielsweise <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Properties.html">hier</a>.
-</p>
-
-<h3><a name="konfiguration_konfigurationsdatei_schemata" id="konfiguration_konfigurationsdatei_schemata"></a>3.1.1
-XML-Schemata f&uuml;r Request- und Response-Validierung</h3>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>location.schema.sl</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Mit diesem Konfigurationsparameter wird MOA SL
-mitgeteilt, wo es das XML-Schema f&uuml;r die Validierung eines
-eingehenden Signaturpr&uuml;fungsrequests nach Security-Layer V1.2
-findet. </p>
-
- <p>Der Konfigurationsparameter muss als Wert einen Pfad
-enthalten, der mit <code>/</code> beginnt, und der von MOA
-SL als relativ zum <span class="term">Context Root</span>
-der Webapplikation interpretiert wird.</p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>/WEB-INF/classes/resources/schemas/Core.20031231.xsd</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>location.schema.moa</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Mit diesem Konfigurationsparameter wird MOA SL
-mitgeteilt, wo es das XML-Schema f&uuml;r die Validierung eines von
-MOA SP empfangenen Signaturpr&uuml;fungsresponses nach MOA SPSS
-V1.3 findet. </p>
-
- <p>Der Konfigurationsparameter muss als Wert einen Pfad
-enthalten, der mit <code>/</code> beginnt, und der von MOA
-SL als relativ zum <span class="term">Context Root</span>
-der Webapplikation interpretiert wird.</p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>/WEB-INF/classes/resources/schemas/MOA-SPSS-1.3.xsd</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<h3><a name="konfiguration_konfigurationsdatei_arbeitsverzeichnis" id="konfiguration_konfigurationsdatei_arbeitsverzeichnis"></a>3.1.2
-Arbeitsverzeichnis</h3>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>location.tempdir</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Mit diesem Konfigurationsparameter wird MOA SL
-mitgeteilt, wo es das Arbeitsverzeichnis zum Ablegen der von einer
-gepr&uuml;ften Signatur abgesicherten Dokumente findet. Diese
-Dokumente werden tempor&auml;r gespeichert, damit sie vom Benutzer
-&uuml;ber den Pr&uuml;fbericht abgerufen werden
-k&ouml;nnen. </p>
-
- <p>Der Konfigurationsparameter muss als Wert einen Pfad
-enthalten, der von MOA SL als relativ zum <span class="term">Context
-Root</span> der Webapplikation interpretiert wird. Der angegebene
-Pfad muss einen abschlie&szlig;enden <code>/</code>
-aufweisen und im Dateisystem tats&auml;chlich existieren. </p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>/workdir/temp/</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<h3><a name="konfiguration_konfigurationsdatei_moasp" id="konfiguration_konfigurationsdatei_moasp"></a>3.1.3
-Parameter der verwendeten MOA SP Installation</h3>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>service.sp.endpoint</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Mit diesem Konfigurationsparameter wird MOA SL der
-Zugangspunkt zum Webservice von MOA SP mitgeteilt. </p>
-
- <p>Der Konfigurationsparameter muss eine URL enthalten, die
-von MOA SL aus erreichbar ist und den Zugangspunkt zu MOA SP
-adressiert. </p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>http://localhost:8080/moa-spss/services/SignatureVerification</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>service.sp.trustProfileId</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Mit diesem Konfigurationsparameter wird MOA SL
-mitgeteilt, welches Vertrauensprofil es im Signaturpr&uuml;frequest
-an MOA SP verwenden soll. </p>
-
- <p>Der Konfigurationsparameter muss den Bezeichner eines in
-MOA SP hinterlegten Vertrauensprofils enthalten.</p>
-
- <p class="remark">Hinweis: Zum Durchlaufen der
-Testapplikation nach Abschnitt <a href="#testapp">4</a>
-dieses Handbuchs m&uuml;ssen Sie in MOA SP ein Vertrauensprofil mit
-dem Namen <code>MOA-SL-Test</code> einrichten. Unter <code>$MOA_SL_INST/conf/moa-spss/trustprofiles/spssconfig.fragment
- </code>finden Sie das dazu notwendige XML-Fragment zum
-Einf&uuml;gen in die Konfigurationsdatei von MOA SP. Unter <code>$MOA_SL_INST/conf/moa-spss/trustprofiles/moa-sl/test/</code>
-finden Sie das im XML-Fragment referenzierte Verzeichnis mit den
-f&uuml;r das Vertrauensprofil notwendigen Zertifikatsdateien. </p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>MOA-SL-Test</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<h3><a name="konfiguration_konfigurationsdatei_umfang" id="konfiguration_konfigurationsdatei_umfang"></a>3.1.4
-Umfang der Pr&uuml;fberichtseite</h3>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>result.showetsi</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Dieser Konfigurationsparameter gibt an, ob MOA SL auf
-der Pr&uuml;fberichtseite unter den signierten Dokumenten auch
-eventuell vorhandenene, mitsignierte Signatureigenschaften (z.B. das
-Signaturdatum) auflisten soll. Signatureigenschaften sind in der Regel
-vorhanden, wenn die zur Pr&uuml;fung eingereichte Signatur von
-einer B&uuml;rgerkartenumgebung erstellt worden ist.</p>
-
- <p>Der Konfigurationsparamter muss einen der Werte <code>true</code>
-oder <code>false</code> aufweisen. </p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>false</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>result.showslmanifest</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Dieser Konfigurationsparameter gibt an, ob MOA SL auf
-der Pr&uuml;fberichtseite unter den signierten Dokumenten auch ein
-eventuell vorhandenes, mitsigniertes <span class="term"><a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/aktuell/core/Core.html#signaturerstellungNachXMLDSIGAntwort">Signaturmanifest</a></span>
-nach Security-Layer V1.2 auflisten soll. </p>
-
- <p>Der Konfigurationsparamter muss einen der Werte <code>true</code>
-oder <code>false</code> aufweisen. </p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>false</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<h3><a name="konfiguration_konfigurationsdatei_umschreiben" id="konfiguration_konfigurationsdatei_umschreiben"></a>3.1.5
-Parameter f&uuml;r das Umschreiben der Links in der
-Pr&uuml;fberichtseite</h3>
-
-<p>Insbesondere zum Verst&auml;ndnis dieses Abschnitts
-sollten Sie zun&auml;chst&nbsp;das <a href="../system/system.html">Systemhandbuch</a> lesen.
-Dort werden der gesamte Ablauf eines Signaturpr&uuml;fvorgangs in
-MOA SL sowie die daran beteiligten Komponenten erkl&auml;rt. </p>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>rewrite</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Dieser Konfigurationsparameter gibt an, ob MOA SL Links
-auf der Pr&uuml;fberichtseite umschreiben soll.</p>
-
- <p>der&nbsp;</p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>true</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>rewrite.proxyURL</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Dieser Konfigurationsparameter enth&auml;lt die URL
-des <span class="term">Rewrite-Proxy</span>. Der <span class="term">Rewrite-Proxy</span> ist jener Rechner,
-der (m&ouml;glicherweise im Gegensatz zum Rechner, auf dem MOA SL
-l&auml;uft) vom Internet aus erreichbar ist, und &uuml;ber den
-alle Anfragen vom Benutzer an MOA SL geleitet werden. </p>
-
- <p>Teil der mit diesem Konfigurationsparameter angegebenen
-URL ist der Platzhalter f&uuml;r den Dom&auml;nennamen des <span class="term">Rewrite-Proxy</span>. Wie dieser
-Platzhalter aussehen muss, wird im Konfigurationsparameter <code>rewrite.proxyURL.proxyhostDummy</code>
-festgelegt. Im unten angegebenen Beispiel lautet der Platzhalter <code>&lt;proxyhost&gt;</code>.</p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>http://&lt;rewriteproxyhost&gt;:1234/rewrite</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>rewrite.proxyURL.proxyhostDummy</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Dieser Konfigurationsparameter enth&auml;lt das
-Format f&uuml;r den Platzhalter f&uuml;r den
-Dom&auml;nennamen des <span class="term">Rewrite-Proxy</span>.
-Der Platzhalter im Konfigurationsparameter <code>rewrite.proxyURL</code>
-muss genau diesem Format entsprechen. </p>
-
- <p>Notwendig ist dieser Platzhalter, weil MOA SL bei der
-Erstellung der Pr&uuml;fberichtseite alle Vorkommnisse dieses
-Platzhalters in der Pr&uuml;fberichtseite durch den
-Dom&auml;nennamen jener IP-Adresse ersetzt, von der aus der
-Signaturpr&uuml;frequest an MOA SL gesendet wurde. Die
-Konfiguration des dazu notwendigen <span class="term">Reverse
-DNS Lookup</span> geschieht mit dem Konfigurationsparameter <code>rewrite.dn.*</code>.
- </p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>&lt;rewriteproxyhost&gt;</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>rewrite.dn.*</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Dieser (bzw. diese) Konfigurationsparameter definieren
-die Lookup-Tabelle f&uuml;r das <span class="term">Reverse
-DNS Lookup</span> im Zuge der Umschreibung von Links in der
-Pr&uuml;fberichtseite, damit diese ausschlie&szlig;lich
-&uuml;ber den <span class="term">Rewrite-Proxy</span>
-abgerufen werden k&ouml;nnen. </p>
-
- <p>Der Aufbau der Konfigurationsparameter entspricht dabei
-dem Schema<code>
-rewrite.dn.&lt;IP-Adresse&gt;=&lt;Dom&auml;nenname&gt;</code>.
- </p>
-
- <p>Der Default-Dom&auml;nenname, der f&uuml;r die
-Umschreibung verwendet wird, wenn f&uuml;r die IP-Adresse des <span class="term">Rewrite-Proxy</span> kein Eintrag in der
-Lookup-Tabelle definiert wurde, wird wie folgt angegeben: <code>rewrite.dn.default=&lt;Dom&auml;nenname&gt;</code>.
- </p>
-
- <p>Das Beispiel geht von zwei m&ouml;glichen <span class="term">Rewrite-Proxys</span> aus, denen die
-IP-Adressen <code>192.168.0.101</code> bzw. <code>192.168.0.102</code>
-zugeordnet sind. Die nach au&szlig;en sichtbaren Namen dieser <span class="term">Rewrite-Proxys</span> lauten <code>rewriteproxyhost1</code>
-und <code>rewriteproxyhost2</code>. <code>rewriteproxyhost1</code>
-ist als Standard-<span class="term">Rewrite-Proxy</span>
-konfiguriert. </p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>rewrite.dn.192.168.0.101=rewriteproxyhost1<br>
-
-rewrite.dn.192.168.0.102=rewriteproxyhost2<br>
-
-rewrite.dn.default=rewriteproxyhost1</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>rewrite.MOASLUrlParamName</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Dieser Konfigurationsparameter gibt den Namen des
-URL-Parameters in den im Signaturpr&uuml;fbericht f&uuml;r den <span class="term">Rewrite-Proxy</span> umgeschriebenen
-Links an, dessen Wert die vom <span class="term">Rewrite-Proxy</span>
-f&uuml;r den tats&auml;chlichen Abruf von Daten von MOA SL
-enth&auml;lt.</p>
-
- <p>Am Wert dieses Konfigurationsparameters erkennt der <span class="term">Rewrite-Proxy</span>, wie der
-HTTP-Request an den <span class="term">Rewrite-Proxy</span>
-in einen HTTP-Request an das MOA SL Webservice umzusetzen ist. Lautet
-eine im Signaturpr&uuml;fbericht enthaltene URL z.B. <code>http://rewriteproxyhost1:1234/rewrite?targetURL=http://moaslhost:8080/moa-sl/showdata?hidCount=0</code>,
-dann geht zun&auml;chst ein HTTP-Request an den <span class="term">Rewrite-Proxy </span>(der auf dem
-Rechner mit dem Namen <code>rewriteproxyhost1 unter Port 1234
-lauscht)</code>. Der <span class="term">Rewrite-Proxy</span>
-entnimmt nun aus dem URL-Parameter <code>targetURL</code>
-die URL f&uuml;r die Umsetzung an MOA SL, also <code>http://moaslhost:8080/moa-sl/showdata?hidCount=0</code>.
-Der <span class="term">Rewrite-Proxy</span> setzt
-nun einen entsprechenden HTTP-Request an MOA SL ab; die Antwort von MOA
-SL wird als Antwort auf den an den <span class="term">Rewrite-Proxy</span>
-gerichteten HTTP-Request weitergegeben. </p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>targetURL</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<table class="fixedWidth" border="1" cellpadding="2">
-
- <tbody>
-
- <tr>
-
- <td>Name</td>
-
- <td><code>rewrite.MOASLWebAppServUrl</code></td>
-
- </tr>
-
- <tr>
-
- <td>Erl&auml;uterung</td>
-
- <td>
- <p>Dieser Konfigurationsparameter gibt jene URL an, unter
-der der Webapplikationsserver mit MOA SL vom <code>Rewrite-Proxy</code>
-aus erreichbar ist.</p>
-
- <p>Die URL besteht aus Protokoll, Dom&auml;nennamen
-sowie gegebenenfalls Port (wenn dieser nicht dem Standardport
-f&uuml;r das Protokoll entspricht). Nach dem Dom&auml;nennamen
-bzw. Port d&uuml;rfen keine weiteren Bestandteile mehr vorkommen. </p>
-
- <p>Verwendung findet dieser Konfigurationsparameter als
-erster Teil des Werts f&uuml;r den oben besprochenen URL-Parameter (<code>rewrite.sliUrlParamName</code>).
- </p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>Beispiel</td>
-
- <td>
- <p><code>http://moaslhost:8080</code></p>
-
- </td>
-
- </tr>
-
- </tbody>
-</table>
-
-<h2><a name="konfiguration_layout" id="konfiguration_layout"></a>3.2 Layout des
-Pr&uuml;fberichts </h2>
-
-<p>Die einzige Schnittstelle des MOA SL Webservices zum Benutzer
-ist der Pr&uuml;fbericht &uuml;ber die eingereichte Signatur,
-den das Service dem Benutzer in einer f&uuml;r ihn gut
-aufbereiteten Form darstellt, bevor das automatisch auswertbare
-Pr&uuml;fprotokoll an die aufrufende Applikation
-zur&uuml;ck&uuml;bermittelt (f&uuml;r eine
-Erkl&auml;rung des gesamten Signaturpr&uuml;fvorgangs in MOA SL
-sowie der daran beteiligten Komponenten vergleiche&nbsp;das <a href="../system/system.html">Systemhandbuch</a>). </p>
-
-<p>Das Layout des Pr&uuml;fberichts, das in der JSP-Seite <code>$MOA_SL_WEBAPP/pages/resultOverview.jsp</code>
-(<code>$MOA_SL_WEBAPP</code> steht f&uuml;r den Ort der
-Webapplikatioin, f&uuml;r gew&ouml;hnlich ist das<code>
-$CATALINA_HOME/webapps</code>) festgelegt ist, kann
-v&ouml;llig frei gestaltet werden. </p>
-
-<p>Wenn Sie das Layout gegen&uuml;ber der Vorgabe
-ver&auml;ndern m&ouml;chten, editieren Sie einfach die
-HTML-Teile dieser JSP-Seite. Beachten Sie bitte, dass Sie dabei die
-JSP-Scriptelemente unver&auml;ndert lassen. JSP-Scriptelemente sind
-entweder Tags, die mit dem Pr&auml;fix <code>jsp</code>
-gekennzeichnet sind (z.B. <code>&lt;jsp:useBean&gt;</code>
-oder <code>&lt;jsp:getProperty&gt;</code>, oder
-Bereiche die mit der Kennzeichnung <code>&lt;%</code>
-eingeleitet bzw. mit der Kennzeichnung <code>%&gt;</code>
-ausgeleitet werden. </p>
-
-<h1><a name="testapp" id="testapp"></a>4
-Durchlaufen der Testapplikation</h1>
-
-<p>Konnte das MOA SL Webservice entsprechend Abschnitt <a href="#installation_tomcatstartstop_verify">2.5.4</a>
-erfolgreich initialisiert werden, und haben Sie weiters die
-Konfiguration des MOA SL Webservices entsprechend Abschnitt <a href="#konfiguration">3</a> an Ihre Anforderungen
-angepasst, sollten Sie schlie&szlig;lich pr&uuml;fen, ob die
-mit MOA SL mitgelieferte Testapplikation erfolgreich durchlaufen werden
-kann.</p>
-
-<p>Beginnen Sie bitte, in dem Sie einen Webbrowser starten und
-sich mit folgender Seite verbinden, die Teil des MOA SL Webservices
-ist. Sollte Ihre Tomcat-Installation unter einer anderen Adresse als <code>localhost:8080</code>
-erreichbar sein, passen Sie die URL bitte entsprechend an.</p>
-
-<pre>http://localhost:8080/moa-sl/pages/test/forms/verify.slxhtml.jsp</pre>
-
-<p>Die aufgerufene Webseite sollte in etwa wie folgt aussehen
-(f&uuml;r eine gr&ouml;&szlig;ere Darstellung bitte
-klicken):</p>
-
-<p style="text-align: center;"><a href="images/testapp.screen1.png" target="_blank"><img src="images/testapp.screen1.png" alt="pplikation - Screen 1" border="0" height="287" width="400"></a></p>
-
-<p>Durch Abschicken des dargestellten Formulars wird ein
-vorbereiteter Signaturpr&uuml;fungsrequest entsprechend der
-Spezifikation des Security-Layers an MOA SL &uuml;bermittelt. Als
-weiterer Parameter wird eine DataURL ebenfalls ensprechend der
-Spezifikation des Security-Layers angegeben. Beide Parameter sind auf
-das installierte MOA SL Webservice abgestimmt und k&ouml;nnen
-unver&auml;ndert &uuml;bernommen werden. </p>
-
-<p>Wenn das Formular an an MOA SL &uuml;bermittelt wurde,
-antwortet MOA SL mit dem Signaturpr&uuml;fbericht, der in etwa wie
-folgt aussehen sollte:</p>
-
-<p style="text-align: center;"><a href="images/testapp.screen2.png" target="_blank"><img src="images/testapp.screen2.png" alt="pplikation - Screen 2" height="458" width="400"></a></p>
-
-<p>Sollten Sie an statt des Pr&uuml;fberichts eine
-Fehlerseite von Tomcat erhalten, liegt das mit hoher Wahrscheinlichkeit
-daran, dass das Zusammenspiel von MOA SL mit MOA SPSS nicht korrekt
-konfiguriert wurde. Pr&uuml;fen Sie dann Ihre Konfiguration
-entsprechend den Angaben in Abschnitt <a href="#konfiguration_konfigurationsdatei_moasp">3.1.3</a>.</p>
-
-<p>Wenn Sie den Pr&uuml;fbericht zwar erhalten, der Text zu
-Pr&uuml;fungen/Zertifikat jedoch in rot gehalten ist und auf einen
-Fehler bei der Zertifikatspr&uuml;fung hinweist, wurde das
-f&uuml;r die Testapplikation notwendige Vertrauensprofil in MOA
-SPSS nicht korrekt konfiguriert. Folgen Sie dann den Hinweisen in
-Abschnitt <a href="#konfiguration_konfigurationsdatei_moasp">3.1.3</a>.</p>
-
-<p>Der Pr&uuml;fbericht selbst enth&auml;lt Informationen
-zum Ersteller der Signatur, zum Aussteller des Zertifikats,
-&uuml;ber Seriennummer und Qualit&auml;t des Zertifikats, sowie
-&uuml;ber die durchgef&uuml;hrten Pr&uuml;fungen
-bez&uuml;glich der Signatur selbst sowie des verwendeten
-Zertifikats. Nach diesen Informationen enth&auml;lt der
-Pr&uuml;fbericht eine Liste der von der Signatur gesicherten
-Dokumente. In unserem Fall erstreckt sich die Signatur &uuml;ber
-genau ein Dokument. Dieses Dokument kann durch einen Klick auf den
-entsprechenden Link in einem neuen Fenster ge&ouml;ffnet werden.
-Das ge&ouml;ffnete Dokument sollte in etwa wie folgt aussehen:</p>
-
-<p style="text-align: center;"><a href="images/testapp.screen3.png" target="_blank"><img src="images/testapp.screen3.png" alt="Testapplikation - Screen 3" height="100" width="400"></a>
-</p>
-
-<p>Wenn Sie schlie&szlig;lich im Pr&uuml;fbericht dem
-Link <span class="term">Zur&uuml;ck zur Anwendung ...</span>
-folgen, gelangen Sie zur Abschlussseite der Testapplikation:</p>
-
-<p style="text-align: center;"><a href="images/testapp.screen4.png" target="_blank"><img src="images/testapp.screen4.png" alt="Testapplikation - Screen 4" border="0" height="290" width="400"></a></p>
-
-<p> Die Abschlussseite pr&auml;sentiert in Tabellenform die
-Informationen, die vom MOA SL Webservice als automatisch auswertbare
-Information entsprechend der Spezifikation des Security-Layers an den <code>DataURL</code>-Server
-(vergleiche Parameter auf der Startseite der Testapplikation)
-&uuml;bermittelt. Im Wesentlichen ist das der
-Signaturpr&uuml;fresponse entsprechend der Spezifikation des
-Security-Layers. </p>
-
-</body>
-</html>
diff --git a/spss.slinterface/handbook/system/images/Zusammenspiel.VSD b/spss.slinterface/handbook/system/images/Zusammenspiel.VSD
deleted file mode 100644
index 0088d5109..000000000
--- a/spss.slinterface/handbook/system/images/Zusammenspiel.VSD
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/system/images/Zusammenspiel.mit.png b/spss.slinterface/handbook/system/images/Zusammenspiel.mit.png
deleted file mode 100644
index 4e7fcda67..000000000
--- a/spss.slinterface/handbook/system/images/Zusammenspiel.mit.png
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/system/images/Zusammenspiel.ohne.png b/spss.slinterface/handbook/system/images/Zusammenspiel.ohne.png
deleted file mode 100644
index 0dc944cb9..000000000
--- a/spss.slinterface/handbook/system/images/Zusammenspiel.ohne.png
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/handbook/system/system.html b/spss.slinterface/handbook/system/system.html
deleted file mode 100644
index b911d84c8..000000000
--- a/spss.slinterface/handbook/system/system.html
+++ /dev/null
@@ -1,512 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
- <title>MOA SL - Systemhandbuch</title>
-
-
- <link rel="stylesheet" href="../common/MOA.css" type="text/css">
-
-</head>
-
-
-<body style="color: rgb(0, 0, 0); background-color: white;" alink="#cc9966" link="#990000" vlink="#666666">
-
-<table class="logoTable" border="0" cellpadding="10" cellspacing="0" width="100%">
-
- <tbody>
-
- <tr>
-
- <td class="logoTitle" align="center" width="267"><img src="../common/LogoBKA.png" alt="Logo BKA" align="left" height="37" width="267"></td>
-
- <td class="logoTitle" align="center">Open
-Source<br>
-
-f&uuml;r das E-Government</td>
-
- <td class="logoTitle" align="center" width="123"><img src="../common/LogoMoa4c.jpg" alt="Logo MOA" align="right" height="138" width="123"></td>
-
- </tr>
-
- </tbody>
-</table>
-
-<hr>
-<p class="title"><a href="../index.html">MOA:
-Serverseitige Signaturpr&uuml;fung (SL), V 1.1</a></p>
-
-<p class="subtitle">Systemhandbuch</p>
-
-<hr>
-<h1>Inhalt</h1>
-
-<ol>
-
- <li>
- <p><a href="#einf%FChrung">Einf&uuml;hrung</a></p>
-
- </li>
-
- <li><a href="#%FCberblick">&Uuml;berblick</a></li>
-
- <li> <a href="#komponenten">Komponenten</a>
- <ol>
-
- <li><a href="#komponenten.sl2moafilter">Der
-Filter <code>SL2MOAFilter</code></a>
- </li>
-
- <li><a href="#komponenten.moaservlet">Das
-Servlet <code>MOAServlet</code></a>
- </li>
-
- <li><a href="#komponenten.resultoverview">Die
-JSP-Seite <code>resultOverview.jsp</code></a>
- </li>
-
- <li><a href="#komponenten.hashinputservlet">Das
-Servlet&nbsp;<code>HashInputDataServlet</code></a></li>
-
- <li><a href="#komponenten.returnservlet">Das
-Servlet <code>ReturnServlet</code></a></li>
-
- <li><a href="#komponenten.urlrewriter">Die
-Klasse URLRewriter</a></li>
-
- <li><a href="#komponenten.webxml">Der
-Deployment Descriptor web.xml</a></li>
-
- </ol>
-
- </li>
-
- <li><a href="#zusammenspiel">Zusammenspiel der
-Komponenten</a>
- <ol>
-
- <li><a href="#zusammenspiel.basis">Basisablauf</a></li>
-
- <li><a href="#zusammenspiel.rewrite">Ablauf mit Rewrite-Proxy</a></li>
-
- </ol>
-
- </li>
-
-</ol>
-
-<hr>
-<h1><a name="einf&uuml;hrung" id="einf&uuml;hrung"></a>1
-Einf&uuml;hrung </h1>
-
-<p>Das Modul <span class="term">Serverseitige
-Signaturpr&uuml;fung</span> (MOA SL) ist als
-plattformunabh&auml;ngiges Modul ausgelegt, das als Webservice
-&uuml;ber HTTP bzw. HTTPS angesprochen werden kann. </p>
-
-<p>Dieses Handbuch beschreibt den Aufbau von MOA SL. Abschnitt 2
-bietet einen groben &Uuml;berblick &uuml;ber die Funktionsweise
-von MOA SL. Abschnitt 3 beschreibt die einzelnen Komponenenten, aus
-denen MOA SL aufgebaut ist. Abschnitt 4 schlie&szlig;lich
-beschreibt das Zusammenspiel der einzelnen Komponenten.</p>
-
-<p>F&uuml;r die Installation und die Konfiguration von MOA SL
-siehe <a href="../operation.html">Betriebshandbuch</a>.
-</p>
-
-<h1><a name="&uuml;berblick" id="&uuml;berblick"></a>2
-&Uuml;berblick</h1>
-
-<p>Das Modul <span class="term">Serverseitige
-Signaturpr&uuml;fung</span> (MOA SL) bietet f&uuml;r
-Signaturpr&uuml;fung eine serverseitige Implementierung einer
-B&uuml;rgerkarten-Umgebung entsprechend den <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/">Spezifikationen
-zur &ouml;sterreichischen B&uuml;rgerkarte</a> in der
-Version 1.2. </p>
-
-<p>Der Funktionsumfang von MOA SL kann wie folgt zusammengefasst
-werden:</p>
-
-<ul>
-
- <li>Von den XML-Befehlen der <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/core/Core.html">Applikationsschnittstelle
-Security-Layer</a> wird genau ein Befehl unterst&uuml;tzt,
-und zwar jener zur Pr&uuml;fung von XML-Signaturen (<span class="term">VerifyXMLSignature</span>).</li>
-
- <li>Hinsichtlich der <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/bindings/Bindings.html">Transportprotokolle
-des Security-Layer</a> wird ausschlie&szlig;lich die
-HTTP-Bindung unterst&uuml;tzt, wobei f&uuml;r diese Bindung
-zus&auml;tzlich folgende Einschr&auml;nkungen gelten:
- <ul>
-
- <li>Keine Unterst&uuml;tzung der Formularparameter
-RedirectURL und StylesheetURL.</li>
-
- <li>Verpflichtende Verwendung des Formularparameters
-DataURL. </li>
-
- <li>Keine Unterst&uuml;tzung von Weitergabe-Parametern
-und Weitergabe-Headern.</li>
-
- <li>Keine Referenzierbarkeit von Formularfeldern.</li>
-
- <li>Hinsichtlich der Ablaufsteuerung laut <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/bindings/Bindings.html#http.ablauf.schritte">Abschnitt
-3.2.3</a> wird ausschlie&szlig;lich Fall 5e
-unterst&uuml;tzt. </li>
-
- </ul>
-
- </li>
-
- <li>Hinsichtlich der Anzeigeformate des Security-Layer wird
-ausschlie&szlig;lich das <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/minimum/Minimum.html#anzeigeformate.formate.slxhtml">Standardanzeigeformat
-des Security-Layers</a> unterst&uuml;tzt. Liegen die von der
-zu pr&uuml;fenden Signatur gesicherten Daten in einem anderen
-Format vor, k&ouml;nnen diese nicht angezeigt, sondern stattdessen
-per Download bezogen werden. </li>
-
-</ul>
-
-<h1><a name="komponenten" id="komponenten"></a>3
-Komponenten</h1>
-
-<h2><a name="komponenten.sl2moafilter" id="komponenten"></a>3.1
-Der Filter <code>SL2MOAFilter</code></h2>
-
-<p>Die Klasse <code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code>
-ist ein
-<code><abbr title="javax.servlet.Filter">Filter</abbr></code>,
-der einerseits
-den <code><abbr title="javax.servlet.http.httpservletrequest=">HttpServletRequest</abbr>
-ver&auml;ndert, bevor er an das Servlet <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>
-weitergeleitet wird, und andererseits den <code><abbr title="javax.servlet.http.HttpServletResponse">HttpServletResponse</abbr></code>
-ver&auml;ndert, nachdem er vom Servlet <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>
-bearbeitet wurde.</code></p>
-
-<p>Der <code><abbr title="javax.servlet.http.HttpServletRequest">HttpServletRequest</abbr></code>
-enh&auml;lt ja zun&auml;chst den Request zur Pr&uuml;fung
-der XML-Signatur in einem Format entsprechend der&nbsp;<a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/">Spezifikationen
-zur &ouml;sterreichischen B&uuml;rgerkarte</a> in der
-Version 1.2 (SL-Request). Das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>
-erwartet sich jedoch den
-Request zur Pr&uuml;fung der XML-Signatur in einem Format
-entsprechend der Webservice-Schnittstelle f&uuml;r das Basismodul
-MOA SP (MOA-Request). Aufgabe des <code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code>s
-ist es daher, vor der Ausf&uuml;hrung des <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>s
-f&uuml;r eine passende Umsetzung des SL-Requests in den
-entsprechenden MOA-Request zu sorgen. Zur Erf&uuml;llung dieser
-Aufgabe bedient sich der <code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code>
-der Klasse <code><abbr title="at.gv.egovernment.moa.spss.slinterface.transformers.SL2MOA">SL2MOA</abbr></code>,
-in der die
-Request-Transformation gekapselt ist.</p>
-
-<p>Das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>
-w&uuml;rde dann die Antwort des Basismoduls MOA SP in einem Format
-entsprechend der Webservice-Schnittstelle f&uuml;r das Basismodul
-MOA SP (MOA-Response) retournieren. Die Anwendung, die das <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>
-aufruft, erwartet sich jedoch die Antwort auf den Request zur
-Pr&uuml;fung
-der XML-Signatur in einem Format entsprechend der&nbsp;<a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/">Spezifikationen
-zur &ouml;sterreichischen B&uuml;rgerkarte</a> in der
-Version 1.2 (SL-Response). Aufgabe&nbsp;des <code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code>s
-ist es daher, nach der Ausf&uuml;hrung&nbsp;des <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>s
-f&uuml;r eine passende Umsetzung der MOA-Response in die
-entsprechende SL-Response zu sorgen.&nbsp;Zur Erf&uuml;llung
-dieser
-Aufgabe bedient sich der <code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code>
-der Klasse <code><abbr title="at.gv.egovernment.moa.spss.slinterface.transformers.MOA2SL">MOA2SL</abbr></code>,
-in der die
-Response-Transformation gekapselt ist.</p>
-
-<p>Eine weitere Aufgabe der Klasse <code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code>
-ist es schlie&szlig;lich, die JSP-Seite <code>resultoverview.jsp</code>
-einzubinden, die f&uuml;r eine benutzertaugliche HTML-Darstellung
-der SL-Response sorgt. Diese benutzertaugliche Darstellung wird dann
-tats&auml;chlich als finales Resultat des <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>s
-an die Anwendung zur&uuml;ck&uuml;bermittelt. Bevor die
-JSP-Seite eingebunden wird, erzeugt <code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code>
-Java Beans aus den Informationen der SL-Response und speichert sie im
-Request Scope bzw. Session Scope. Diese Java Beans werden dann von der
-JSP-Seite zum
-Aufbau der benutzertauglichen HTML-Darstellung herangezogen.
-F&uuml;r weitere Informationen zur JSP-Seite sowie zu den von ihr
-verwendeten Java Beans siehe <a href="#komponenten.resultoverview">Abschnitt 3.3</a>.
-</p>
-
-<h2><a name="komponenten.moaservlet" id="komponenten"></a>3.2
-Das Servlet <code>MOAServlet</code></h2>
-
-<p>Die Klasse <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">
-MOAServlet</abbr></code> ist ein <code><abbr title="javax.servlet.http.HttpServlet">HttpServlet</abbr></code>
-und als solches f&uuml;r die Kommunikation mit dem Basismodul MOA
-SP verantwortlich. </p>
-
-<p>Das Servlet liest aus dem <code><abbr title="javax.servlet.ServletInputStream">ServletInputStream</abbr></code>
-des <code><abbr title="javax.servlet.http.HttpServletRequest">HttpServletRequest</abbr></code>s
-den MOA SP Request
-zur Pr&uuml;fung der XML-Signatur und sendet diesen XML-Request
-unter Verwendung der Webservice-Schnittstelle von MOA SP an das
-Basismodul MOA SP.</p>
-
-<p>Danach liest das Servlet die vom Basismodul MOA SP auf den
-Request zur Pr&uuml;fung der XML-Signatur
-r&uuml;ck&uuml;bermittelte Response und schreibt diese
-XML-Response in den <code><abbr title="javax.servlet.ServletOutputStream">ServletOutputStream</abbr></code>
-der <code><abbr title="javax.servlet.http.HttpServletResponse">HttpServletResponse</abbr></code>.</p>
-
-<p>Das MOAServlet bedient sich zur Kommunikation mit MOA SP der
-Klasse <code><abbr title="at.gv.egovernment.moa.spss.slinterface.moainvoker.MOAInvoker">
-MOAInvoker</abbr></code>, in der die
-Funktionalit&auml;t des Webservice-Clients f&uuml;r MOA SP
-gekapselt ist.</p>
-
-<h2><a name="komponenten.resultoverview" id="komponenten"></a>3.3 Die JSP-Seite <code>resultOverview.jsp</code></h2>
-
-<p>Die JSP-Seite <code>resultOverview.jsp</code> ist
-verantwortlich f&uuml;r die Aufbereitung
-einer&nbsp;benutzertauglichen HTML-Darstellung der SL-Response, die
-das Servlet&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>
-im Zusammenspiel mit dem Filter&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code>
-erzeugt.&nbsp;</p>
-
-<p>Die f&uuml;r die Aufbereitung erforderlichen Informationen
-werden der JSP-Seite in Form von Java Beans zur Verf&uuml;gung
-gestellt, die zuvor vom <code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter
-</abbr></code>erzeugt worden sind (vergleiche <a href="#komponenten.sl2moafilter">Abschnitt 3.1</a>).
-Folgende Java Beans stehen der JSP-Seite zur Verf&uuml;gung:</p>
-
-<ul>
-
- <li><code><abbr title="at.gv.egovernment.moa.spss.slinterface.beans.DataInfoBean">DataInfoBean</abbr></code>:
-Enth&auml;lt
-alle notwendigen Informationen zu den von der gepr&uuml;ften
-XML-Signatur gesicherten Dokumenten. Beim Erzeugen dieser Java Bean
-werden unter anderem die gesicherten Dokumente f&uuml;r den
-sp&auml;teren Abruf durch die Anwendung (vergleiche
- <a href="#komponenten.hashinputservlet">Abschnitt 3.4</a>)
-im Filesystem zwischengespeichert sowie die Pr&uuml;fung
-vorgenommen, ob es sich bei einem gesicherten Dokument um ein
-XHTML-Dokument gem&auml;&szlig;&nbsp;<a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/">Spezifikationen
-zur &ouml;sterreichischen B&uuml;rgerkarte</a> in der
-Version 1.2 handelt (SLXHTML-Dokument) oder nicht. Die Bean ist im
-Session Scope abgelegt.</li>
-
- <li><code><abbr title="at.gv.egovernment.moa.spss.slinterface.beans.SignerInfoBean">SignerInfoBean</abbr></code>:
-Enth&auml;lt
-alle notwendigen Informationen zum Ersteller der gepr&uuml;ften
-XML-Signatur. Die Bean ist im Servlet Scope abgelegt.</li>
-
- <li><code><abbr title="at.gv.egovernment.moa.spss.slinterface.beans.ChecksInfoBean">ChecksInfoBean</abbr></code>:
-Enth&auml;lt
-alle notwendigen Informationen zum Ergebnis der Pr&uuml;fung der
-XML-Signatur.&nbsp;Die Bean ist im Servlet Scope abgelegt.</li>
-
-</ul>
-
-<p>Die JSP-Seite <code>resultOverview.jsp</code>
-erzeugt aus den mittels der erw&auml;hnten Java Beans zur
-Verf&uuml;gung gestellten Informationen eine HTML-Darstellung.
-Diese HTML-Darstellung ist in die folgenden Informationsbl&ouml;cke
-unterteilt:</p>
-
-<ul>
-
- <li>Informationen zum Ersteller der gepr&uuml;ften
-XML-Signatur: Name des Erstellers, Name des Ausstellers des
-Zertifikats, Angaben zur Qualit&auml;t des Zertifikats.</li>
-
- <li>Informationen zum Ergebnis der Pr&uuml;fung der
-XML-Signatur: Ergebnis der Signaturpr&uuml;fung, Ergebnis der
-Pr&uuml;fung des Zertifikats.</li>
-
- <li>Informationen zu jedem von der XML-Signatur gesicherten
-Dokument: Angabe, ob es sich beim Dokument um ein SLXHTML-Dokument
-handelt, Link zum Download des gesicherten Dokuments. Wenn es sich um
-ein SLXHTML-Dokument handelt, wird das Dokument bei Verfolgung des
-Links in einem neuen Browserfenster angezeigt, ansonsten kann das
-Dokument heruntergeladen und gespeichert werden.</li>
-
-</ul>
-
-<p>Ein Beispiel f&uuml;r die resultierende HTML-Darstellung
-befindet sich <a href="../operation/images/testapp.screen2.png">hier</a>.</p>
-
-<h2><a name="komponenten.hashinputservlet" id="komponenten"></a>3.4 Das Servlet <code>HashInputDataServlet</code></h2>
-
-<p>Das Servlet <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.HashInputServlet">HashInputServlet</abbr></code>
-ist
-f&uuml;r die Verf&uuml;gbarkeit der von der gepr&uuml;ften
-XML-Signatur gesicherten Dokumente verantwortlich.&nbsp;</p>
-
-<p>In der HTML-Aufbereitung der SL-Response, die von der
-JSP-Seite <code>resultOverview.jsp </code>erzeugt wird,
-(vergleiche <a href="#komponenten.resultoverview">Abschnitt
-3.3</a>) befinden sich Links auf alle gesicherten Dokumente.
-Diese Links f&uuml;hren jeweils auf das Servlet <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.HashInputServlet">HashInputServlet</abbr></code>.&nbsp;</p>
-
-<p>Das Servlet entnimmt aus der aufgerufenen URL die Parameter
-zum Auffinden des Session Scopes sowie die fortlaufende Nummer des
-gesicherten Dokuments. Im Session Scope ist als Attribut die in <a href="#komponenten.resultoverview">Abschnitt 3.3</a>
-erw&auml;hnte&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.beans.DataInfoBean">DataInfoBean</abbr></code>:
-gespeichert, die alle notwendigen Informationen enth&auml;lt, damit
-das Servlet das angefragte gesicherte Dokument aus dem Filesystem lesen
-und als Ergebnis an den Browser zur&uuml;ckliefern kann. Je nach
-dem, ob es sich beim gesicherten Dokument um ein SLXHTML-Dokument
-handelt oder nicht, wird der Content-Type Header der HTTP Response an
-den Browser passend gesetzt.</p>
-
-<h2><a name="komponenten.returnservlet" id="komponenten"></a>3.5
-Das Servlet <code>ReturnServlet</code></h2>
-
-<p>Das Servlet <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code>
-ist nach Quittierung der HTML-Darstellung zur gepr&uuml;ften
-XML-Signatur durch den Benutzer f&uuml;r die Weiterleitung der
-SL-Response an den DataURL-Server sowie f&uuml;r die Weiterleitung
-der daraus resultierenden Antwort des DataURL-Servers an den Benutzer
-verantwortlich.</p>
-
-<p>Damit verh&auml;lt sich MOA SL genau wie in der
-Spezifikation <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/bindings/Bindings.html">Transportprotokolle
-Security-Layer</a> (Teil der&nbsp;<a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/">Spezifikationen
-zur &ouml;sterreichischen B&uuml;rgerkarte</a> in der
-Version 1.2) in&nbsp;<a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20040514/bindings/Bindings.html#http.ablauf.schritte">Abschnitt
-3.2.3</a> f&uuml;r den Fall 5e beschrieben ist: Wenn der
-Benutzer die HTML-Aufbereitung der Ergebnisse der gepr&uuml;ften
-XML-Signatur gesichtet hat und durch Verfolgung des darin enthaltenen
-Links quittiert, sendet das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code>
-die SL-Response an den DataURL-Server. Die URL des DataURL-Servers
-wurde von der Anwendung im urspr&uuml;nglichen Request an das <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>
-als Formular-Parameter angegeben. Der DataURL-Server antwortet auf das
-Eintreffen der SL-Response mit einem HTTP-Response an das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code>,
-diese wird vom <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code>
-als Antwort auf das Quittieren der HTML-Darstellung an den Browser
-weitergeleitet.&nbsp;</p>
-
-<p>Nachdem mit diesem Schritt die Bearbeitung der zur
-Pr&uuml;fung &uuml;bermittelten XML-Signatur durch MOA-SL
-abgeschlossen ist, wird am Ende des&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code>
-die Session und damit alle gespeicherten Informationen zur
-gepr&uuml;ften XML-Signatur&nbsp;gel&ouml;scht.&nbsp;</p>
-
-<h2><a name="komponenten.urlrewriter" id="komponenten"></a>3.6
-Die Klasse <code>URLRewriter</code></h2>
-
-<p>Die Klasse <code><abbr title="at.gv.egovernment.moa.spss.slinterface.URLRewriter">URLRewriter</abbr></code>
-ist
-f&uuml;r das Umschreiben von URLs verantwortlich die in der
-HTML-Aufbereitung der SL-Response enthalten sind, die dem Benutzer in
-seinem Webbrowser angezeigt wird.</p>
-
-<p>MOA SL kann so konfiguriert werden, dass die in der
-HTML-Aufbereitung der SL-Response enthaltenen
-URLs&nbsp;nicht&nbsp;direkt
-auf
-Ressourcen von MOA SL (z.B. die von der Signatur gesicherten
-Dokumente), sondern auf einen Rewrite-Proxy
-verweisen. Die URL auf die eigentliche Ressource von MOA SL ist in dem
-umgeschriebenen Link als URL-Parameter kodiert. Der&nbsp;Rewrite-Proxy sorgt
-f&uuml;r die Umsetzung des aus dem umgeschriebenen Link
-resultierenden
-Requests an ihn selbst in einen Request an MOA SL.&nbsp;</p>
-
-<p>Sinnvoll ist diese Konfigurationsvariante dann, wenn MOA SL
-nicht direkt vom Internet aus erreichbar sein soll, sondern nur auf dem
-Umweg &uuml;ber einen dedizierten Webserver, dem Rewrite-Proxy.</p>
-
-<p>Die Methode <code>rewrite</code> der Klasse <code><abbr title="at.gv.egovernment.moa.spss.slinterface.URLRewriter">URLRewriter</abbr></code>
-wird bei der Erstellung der HTML-Aufbereitung der SL-Response durch die
-JSP-Seite <code>resultOverview.jsp</code> jedenfalls
-aufgerufen; die Entscheidung, ob die in die Methode &uuml;bergebene
-URL tats&auml;chlich umgeschrieben wird oder nicht, entscheidet die
-Methode auf Grund der Konfigurationseinstellungen von MOA SL.</p>
-
-<h2><a name="komponenten.webxml" id="komponenten"></a>3.7
-Der Deployment Descriptor <code>web.xml</code></h2>
-<p>
-Im Deployment Descriptor <code><abbr title="WEB-INF/web.xml">web.xml</abbr></code>des
-Web Archives (WAR-File) von MOA SL sind im Wesentlichen folgende
-Konfigurationen eingerichtet, die im Normalfall nicht ver&auml;ndert
-werden m&uuml;ssen:</p>
-<ul>
- <li>Definition der URLs, unter denen die Servlets&nbsp;von MOA SL (<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code>, <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.HashInputServlet">HashInputServlet</abbr></code>, <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code>) relativ zum Root der Web Application erreichbar sind (XML-Elemente <code>servlet</code> bzw. <code>servlet-mapping</code>).</li>
- <li>Definition der Filter, die f&uuml;r das Servlet&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code> zur Anwendung kommen sollen (XML Elemente <code>filter</code> bzw. <code>filter-mapping</code>). &nbsp;Die Konfiguration ist so&nbsp;eingerichtet, dass f&uuml;r das Servlet <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code> genau ein Filter, n&auml;mlich <code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code>&nbsp;konfiguriert ist.&nbsp;&nbsp;</li>
-</ul>
-
-<h1><a name="zusammenspiel" id="zusammenspiel"></a>4
-Zusammenspiel der Komponenten</h1>
-
-<h1><a name="zusammenspiel.basis" id="zusammenspiel"></a>4.1 Basisablauf</h1>
-<p>Die nachfolgende Grafik stellt das Zusammenspiel der Komponenten aus Abschnitt 3 mit dem Anwender und dem DataURL-Server dar.</p>
-<p style="text-align: center;"><img style="width: 760px; height: 463px;" alt="Zusammenspiel der Komponenten - Basisablauf" src="images/Zusammenspiel.ohne.png" vspace="25"></p>
-<table style="text-align: left; width: 983px; height: 216px;" border="1" cellpadding="2" cellspacing="2">
- <tbody>
- <tr>
- <td>1, 2</td>
- <td>
- <p>Pr&uuml;fung der Signatur: Anfrage wird eigentlich an&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code> gerichtet, durch die Filter-Konfiguration &uuml;ber den Deployment-Descriptor web.xml wird jedoch vorher und nachher der&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code> dazwischengeschalten. Die Aufbereitung der HTML-Darstellung der SL-Response wird vom&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code> an die JSP-Seite <code>resultOverview.jsp</code> delegiert.</p>
- </td>
- </tr>
- <tr>
- <td>3,4</td>
- <td>
- <p>&Uuml;ber die HTML-Ansicht der SL-Response kann der Anwender
-die einzelnen, von der XML-Signatur gesicherten&nbsp;Dokumente abrufen.
-Die Links f&uuml;r die Dokumente verweisen auf das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.HashInputServlet">HashInputServlet</abbr></code>, die Zuordnung im Servlet passiert &uuml;ber URL-Parameter (Session-ID, fortlaufende Nummer des Dokuments).</p>
- </td>
- </tr>
- <tr>
- <td>5, 6, 7, 8</td>
- <td>
- <p>In Schritt 5 quittiert der Anwender die HTML-Darstellung der
-SL-Response. Das Quittieren funktioniert &uuml;ber einen Link in der
-HTML-Darstellung, der auf das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code> verweist. Das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code>
-sendet die SL-Response an den DataURL-Server. Der DataURL-Server
-antwortet entsprechend auf die &uuml;bermittelte SL-Response; diese
-Antwort wird vom&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code> unver&auml;ndert an den Antwender weitergeleitet.</p>
- </td>
- </tr>
- </tbody>
-</table>
-<h1><a name="zusammenspiel.rewrite" id="zusammenspiel"></a>4.2 Ablauf mit Rewrite-Proxy</h1>
-Die nachfolgende Grafik stellt das Zusammenspiel der Komponenten aus
-Abschnitt 3 mit dem Anwender und dem DataURL-Server dar, wobei die
-Anfragen vom Anwender nicht direkt an MOA SL, sondern indirekt
-&uuml;ber einen Rewrite-Proxy gestellt werden.<br>
-<div style="text-align: center;"><img style="width: 1021px; height: 463px;" alt="Zusemmenspiel der Komponenten - mit Rewrite-Proxy" src="images/Zusammenspiel.mit.png" vspace="25"><br>
-<div style="text-align: left;">
-<table style="text-align: left; width: 983px; height: 216px;" border="1" cellpadding="2" cellspacing="2">
- <tbody>
- <tr>
- <td>1, 2</td>
- <td>
- <p>Pr&uuml;fung der Signatur: Anfrage wird eigentlich an&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code> gerichtet, durch die Filter-Konfiguration &uuml;ber den Deployment-Descriptor web.xml wird jedoch vorher und nachher der&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code> dazwischengeschalten. Die Aufbereitung der HTML-Darstellung der SL-Response wird vom&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.filters.SL2MOAFilter">SL2MOAFilter</abbr></code> an die JSP-Seite <code>resultOverview.jsp</code> delegiert. Die Anfrage des Anwenders wird nicht direkt an das <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.MOAServlet">MOAServlet</abbr></code> gerichtet, sondern &uuml;ber den Rewrite-Proxy, der die Anfrage-URL passend umschreibt.</p>
- </td>
- </tr>
- <tr>
- <td>3,4</td>
- <td>
- <p>&Uuml;ber
-die HTML-Ansicht der SL-Response kann der Anwender die einzelnen, von
-der XML-Signatur gesicherten&nbsp;Dokumente abrufen. Die Links f&uuml;r die
-Dokumente verweisen nicht direkt auf das <code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.HashInputServlet">HashInputServlet</abbr></code>, sondern zun&auml;chst auf den Rewrite-Proxy, der die Links passend auf das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.HashInputServlet">HashInputServlet</abbr></code> umsetzt. Die Zuordnung im Servlet passiert &uuml;ber URL-Parameter (Session-ID, fortlaufende Nummer des Dokuments).</p>
- </td>
- </tr>
- <tr>
- <td>5, 6, 7, 8</td>
- <td>
- <p>In
-Schritt 5 quittiert der Anwender die HTML-Darstellung der SL-Response.
-Das Quittieren funktioniert &uuml;ber einen Link in der HTML-Darstellung,
-der&nbsp;nicht direkt auf das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code> verweist, sondern zun&auml;chst auf den Rewrite-Proxy, der die Links passend auf das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code> &nbsp;umsetzt. Das&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code>
-sendet die SL-Response an den DataURL-Server. Der DataURL-Server
-antwortet entsprechend auf die &uuml;bermittelte SL-Response; diese Antwort
-wird vom&nbsp;<code><abbr title="at.gv.egovernment.moa.spss.slinterface.servlets.ReturnServlet">ReturnServlet</abbr></code> unver&auml;ndert an den Antwender weitergeleitet.</p>
- </td>
- </tr>
- </tbody>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/spss.slinterface/lib/axis-1.0/axis-ant.jar b/spss.slinterface/lib/axis-1.0/axis-ant.jar
deleted file mode 100644
index 9cb30a98a..000000000
--- a/spss.slinterface/lib/axis-1.0/axis-ant.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/axis-1.0/axis.jar b/spss.slinterface/lib/axis-1.0/axis.jar
deleted file mode 100644
index 869ee16f5..000000000
--- a/spss.slinterface/lib/axis-1.0/axis.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/axis-1.0/jaxrpc.jar b/spss.slinterface/lib/axis-1.0/jaxrpc.jar
deleted file mode 100644
index 5f6a56f02..000000000
--- a/spss.slinterface/lib/axis-1.0/jaxrpc.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/axis-1.0/saaj.jar b/spss.slinterface/lib/axis-1.0/saaj.jar
deleted file mode 100644
index f2242abe5..000000000
--- a/spss.slinterface/lib/axis-1.0/saaj.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/axis-1.0/wsdl4j.jar b/spss.slinterface/lib/axis-1.0/wsdl4j.jar
deleted file mode 100644
index 820abd082..000000000
--- a/spss.slinterface/lib/axis-1.0/wsdl4j.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/commons-discovery-0.2/commons-discovery.jar b/spss.slinterface/lib/commons-discovery-0.2/commons-discovery.jar
deleted file mode 100644
index b88554847..000000000
--- a/spss.slinterface/lib/commons-discovery-0.2/commons-discovery.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/commons-fileupload-1.0/commons-fileupload-1.0.jar b/spss.slinterface/lib/commons-fileupload-1.0/commons-fileupload-1.0.jar
deleted file mode 100644
index 1ca4a9cd3..000000000
--- a/spss.slinterface/lib/commons-fileupload-1.0/commons-fileupload-1.0.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/commons-logging-1.0.4/commons-logging.jar b/spss.slinterface/lib/commons-logging-1.0.4/commons-logging.jar
deleted file mode 100644
index b99c9375a..000000000
--- a/spss.slinterface/lib/commons-logging-1.0.4/commons-logging.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/log4j-1.2.7/log4j-1.2.7.jar b/spss.slinterface/lib/log4j-1.2.7/log4j-1.2.7.jar
deleted file mode 100644
index 1595a56ef..000000000
--- a/spss.slinterface/lib/log4j-1.2.7/log4j-1.2.7.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip b/spss.slinterface/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip
deleted file mode 100644
index c450772ea..000000000
--- a/spss.slinterface/lib/servlet-2.3/servlet-2_3-fcs-classfiles.zip
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/xalan-2.5.1/xalan.jar b/spss.slinterface/lib/xalan-2.5.1/xalan.jar
deleted file mode 100644
index 44d4d094d..000000000
--- a/spss.slinterface/lib/xalan-2.5.1/xalan.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/xerces-2.6.2/xercesImpl.jar b/spss.slinterface/lib/xerces-2.6.2/xercesImpl.jar
deleted file mode 100644
index 14c3162c0..000000000
--- a/spss.slinterface/lib/xerces-2.6.2/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/lib/xerces-2.6.2/xmlParserAPIs.jar b/spss.slinterface/lib/xerces-2.6.2/xmlParserAPIs.jar
deleted file mode 100644
index 2dd837714..000000000
--- a/spss.slinterface/lib/xerces-2.6.2/xmlParserAPIs.jar
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/pages/images/LogoMoa4c.png b/spss.slinterface/pages/images/LogoMoa4c.png
deleted file mode 100644
index c3735160c..000000000
--- a/spss.slinterface/pages/images/LogoMoa4c.png
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/pages/resultOverview.jsp b/spss.slinterface/pages/resultOverview.jsp
deleted file mode 100644
index 388efa77e..000000000
--- a/spss.slinterface/pages/resultOverview.jsp
+++ /dev/null
@@ -1,270 +0,0 @@
-<%@ page contentType="text/html; charset=ISO-8859-1" %>
-
-<jsp:useBean
- id="checksInfo"
- class="at.gv.egovernment.moa.spss.slinterface.beans.ChecksInfoBean" scope="request">
-</jsp:useBean>
-
-<jsp:useBean
- id="signerInfo"
- class="at.gv.egovernment.moa.spss.slinterface.beans.SignerInfoBean" scope="request">
-</jsp:useBean>
-
-<jsp:useBean
- id="dataInfo"
- class="at.gv.egovernment.moa.spss.slinterface.beans.DataInfoBean" scope="session">
-</jsp:useBean>
-
-<html>
- <head>
- <head><title>Bundeskanzleramt der Republik Österreich - Signaturprüfdienst</title></head>
- </head>
- <body>
- <table width="800px" align="center">
- <tr>
- <td>
- <table bgcolor="#eeeeee" width="790px" border="1" cellpadding="3">
- <td width="150px" align="center"><img width="70px"
- <% out.print(
- "src=\"" +
- ((at.gv.egovernment.moa.spss.slinterface.URLRewriter) application.getAttribute(at.gv.egovernment.moa.spss.slinterface.Constants.WSCP_URL_REWRITER_)).rewrite(
- request.getContextPath() + "/pages/images/aut-emb2.gif\"", request.getSession()) +
- " alt=\"Republik Österreich\""); %>
- ></td>
- <td align="center"><b>Bundeskanzleramt der Republik Österreich - Signaturprüfdienst</b></td>
- </table>
-
- <p>Nachfolgend finden Sie das Ergebnis der Prüfung der eingereichten elektronischen Signatur.</p>
-
- <p>
- <a href="<%out.print(
- ((at.gv.egovernment.moa.spss.slinterface.URLRewriter) application.getAttribute(at.gv.egovernment.moa.spss.slinterface.Constants.WSCP_URL_REWRITER_)).rewrite(
- request.getContextPath() + "/return", request.getSession()));%>">
- Zurück zur Anwendung ...</a>
- </p>
-
- <!-- ######################################################### -->
- <!-- Name des Unterzeichners -->
- <!-- ######################################################### -->
-
- <table bgcolor="#eeeeee" width="790px" border="1" cellpadding="3">
- <th>
- <tr span="2"><b>Unterzeichner</b></tr>
- </th>
- <%
- String[] subOIDNames = new String[]{"2.5.4.3", "2.5.4.11", "2.5.4.10", "2.5.4.6"}; // CN, OU, O, C
- String[] subOIDRegNames = new String[]{"Name", "Organisationseinheit", "Organisation", "Staat"};
- for (int i = 0; i < subOIDNames.length; i++)
- {
- signerInfo.setSubjectNameItemSel(subOIDNames[i]);
- String currSubjectNameRDN = signerInfo.getSubjectNameItem();
- if (currSubjectNameRDN != null)
- {
- out.print("<tr ><td width=\"150px\" align=\"right\">" + subOIDRegNames[i] + "</td><td align=\"left\"><code>" + currSubjectNameRDN + "</code></td></tr>");
- }
- }
- %>
- </table>
-
- <!-- ######################################################### -->
- <!-- Name des Ausstellers -->
- <!-- ######################################################### -->
-
-
- <table bgcolor="#eeeeee" width="790px" border="1" cellpadding="3">
- <th>
- <tr span="2"><b>Aussteller des Zertifikats</b></tr>
- </th>
- <%
- String[] issuerOIDNames = new String[]{"2.5.4.3", "2.5.4.11", "2.5.4.10", "2.5.4.6"}; // CN, OU, O, C
- String[] issuerOIDRegNames = new String[]{"Name", "Organisationseinheit", "Organisation", "Staat"};
- for (int i = 0; i < issuerOIDNames.length; i++)
- {
- signerInfo.setIssuerNameItemSel(issuerOIDNames[i]);
- String currIssuerNameRDN = signerInfo.getIssuerNameItem();
- if (currIssuerNameRDN != null)
- {
- out.print("<tr><td width=\"150px\" align=\"right\">" + issuerOIDRegNames[i] + "</td><td align=\"left\"><code>" + currIssuerNameRDN + "</code></td></tr>");
- }
- }
- %>
- </table>
-
- <!-- ######################################################### -->
- <!-- Seriennummer des Zertifikats -->
- <!-- ######################################################### -->
-
- <table bgcolor="#eeeeee" width="790px" border="1" cellpadding="3">
- <th>
- <tr span="2"><b>Informationen zum Zertifikat</b></tr>
- </th>
- <tr>
- <td width="150px" align="right">Seriennummer</td>
- <td align="left"><code>
- <%
- out.print(signerInfo.getSerial());
- %>
- </code></td>
- </tr>
-
- <!-- ######################################################### -->
- <!-- Qualifiziertes Zertifikat? -->
- <!-- ######################################################### -->
-
- <tr>
- <td align="right">Qualität</td>
- <td align="left"><code>
- <% out.print(signerInfo.getIsQualified() ? "qualifiziertes" : "gewöhnliches"); %> Zertifikat
- </code></td>
- </tr>
- </table>
-
-
- <table bgcolor="#eeeeee" width="790px" border="1" cellpadding="3">
- <th>
- <tr span="2"><b>Prüfungen</b></tr>
- </th>
-
- <!-- ######################################################### -->
- <!-- Signaturprüfung -->
- <!-- ######################################################### -->
-
- <tr>
- <td width="150px" align="right">Signatur</td>
- <%
- String [] sigCheckMsgs = new String[]
- {
- "Die Überprüfung der Hash-Werte und des Werts der Signatur konnte erfolgreich durchgeführt werden.",
- "Bei der Überprüfung des Hash-Werts zumindest einer dsig:Reference der Signatur ist ein Fehler aufgetreten. Der Wert der Signatur (dsig:SignatureValue) wurde nicht überprüft.",
- "Die Überprüfung der Hash-Werte konnte erfolgreich durchgeführt werden. Beim Überprüfen des Werts der Signatur (dsig:SignatureValue) ist jedoch ein Fehler aufgetreten."
- };
-
- int sigCheckCode = Integer.parseInt(checksInfo.getSigCheckCode());
- out.print("<td align=\"left\"><p><code>");
- if (sigCheckCode != 0) out.print("<font color=\"red\">");
- out.print(sigCheckMsgs[sigCheckCode]);
- if (sigCheckCode != 0) out.print("</font>");
- %>
- </code></p>
- <%
- if (sigCheckCode == 1)
- {
- %>
- <p><code><font color="red">Fehlerhafte Referenzen:
- <%
- int count = 0;
- do
- {
- checksInfo.setSigCheckFailedRefCount(count);
- String failedRef = checksInfo.getSigCheckFailedRef();
- if (null == failedRef) break;
- if (count > 0) out.print(", ");
- out.print(failedRef);
- count++;
- }
- while (true);
- %>
- </code></font></p>
- <%
- }
- %>
- </td></tr>
-
- <!-- ######################################################### -->
- <!-- Signaturmanifestprüfung -->
- <!-- ######################################################### -->
-
- <!-- Aus der Sicht des Bürgers nicht sinnvoll -->
-
- <!-- ######################################################### -->
- <!-- XMLDSIG-Manifestprüfung -->
- <!-- ######################################################### -->
-
- <!-- Derzeit nicht implementiert, Bean "checksInfo" enthält allerdings alle notwendigen Infos -->
-
- <!-- ######################################################### -->
- <!-- Zertifikatsprüfung -->
- <!-- ######################################################### -->
-
- <tr>
- <td align="right">Zertifikat</td>
- <%
- String [] certCheckMsgs = new String[]
- {
- "Eine formal korrekte Zertifikatskette vom Signatorzertifikat zu einem vertrauenswürdigen Wurzelzertifikat konnte konstruiert werden. Jedes Zertifikat dieser Kette ist zum in der Anfrage angegebenen Prüfzeitpunkt gültig.",
- "Es konnte keine formal korrekte Zertifikatskette vom Signatorzertifikat zu einem vertrauenswürdigen Wurzelzertifikat konstruiert werden.",
- "Eine formal korrekte Zertifikatskette vom Signatorzertifikat zu einem vertrauenswürdigen Wurzelzertifikat konnte konstruiert werden. Für zumindest ein Zertifikat dieser Kette fällt der Prüfzeitpunkt nicht in das Gültigkeitsintervall.",
- "Eine formal korrekte Zertifikatskette vom Signatorzertifikat zu einem vertrauenswürdigen Wurzelzertifikat konnte konstruiert werden. Für alle Zertifikate dieser Kette fällt der Prüfzeitpunkt in das jeweilige Gültigkeitsintervall. Für zumindest ein Zertifikat konnte der Zertifikatstatus nicht festgestellt werden.",
- "Eine formal korrekte Zertifikatskette vom Signatorzertifikat zu einem vertrauenswürdigen Wurzelzertifikat konnte konstruiert werden. Für alle Zertifikate dieser Kette fällt der Prüfzeitpunkt in das jeweilige Gültigkeitsintervall. Zumindest ein Zertifikat ist zum Prüfzeitpunkt widerrufen.",
- "Eine formal korrekte Zertifikatskette vom Signatorzertifikat zu einem vertrauenswürdigen Wurzelzertifikat konnte konstruiert werden. Für alle Zertifikate dieser Kette fällt der Prüfzeitpunkt in das jeweilige Gültigkeitsintervall. Kein Zertifikat dieser Kette ist zum Prüfzeitpunkt widerrufen. Zumindest ein Zertifikat ist zum Prüfzeitpunkt gesperrt.",
- "Die Prüfung der Signaturprüfdaten wurde nicht durchgeführt, da bei der Prüfung der Gültigkeit der Signatur ein Fehler aufgetreten ist."
- };
- int certCheckCode = Integer.parseInt(checksInfo.getCertCheckCode());
- certCheckCode = (certCheckCode == 99) ? 6 : certCheckCode;
- out.print("<td align=\"left\"><p><code>");
- if (certCheckCode != 0) out.print("<font color=\"red\">");
- out.print(certCheckMsgs[certCheckCode]);
- if (certCheckCode != 0) out.print("</font>");
- %>
- </code></p></td></tr></table>
-
- <!-- ######################################################### -->
- <!-- Signierte Daten -->
- <!-- ######################################################### -->
-
- <table bgcolor="#eeeeee" width="790px" border="1" cellpadding="3">
- <th>
- <tr span="2"><b>Signierte Daten</b></tr>
- </th>
- <%
- int i = 0;
- int j = 0;
- do
- {
- dataInfo.setHashInputDataCount(i);
- String hashDataInputURL = dataInfo.getHashInputDataURL();
- if (hashDataInputURL == null) break;
- boolean doShow = dataInfo.getShowHashInputData();
- if (doShow)
- {
- out.print("<tr><td width=\"150px\" align=\"right\"><code>");
-
- // out.print("<a href=\"" + response.encodeURL(request.getContextPath() + dataInfo.getHashInputDataURL()) + "\"");
- out.print(
- "<a href=\"" +
- ((at.gv.egovernment.moa.spss.slinterface.URLRewriter) application.getAttribute(at.gv.egovernment.moa.spss.slinterface.Constants.WSCP_URL_REWRITER_)).rewrite(
- request.getContextPath() + dataInfo.getHashInputDataURL(), request.getSession()) +
- "\"");
-
- boolean isSLXHTML = dataInfo.getIsSLXHTMLDocument();
- if (isSLXHTML) out.write(" target=\"_blank\"");
- out.print(">Datei Nr." + (j + 1) + "</a>");
- out.print("</code></td><td align=\"left\">");
- if (isSLXHTML)
- {
- out.print(" Die Datei kann in einem eigenen Browser-Fenster angezeigt werden.");
- }
- else
- {
- out.print("Der Typ der Datei ist nicht bekannt. Die Datei kann in Binärform heruntergeladen werden.");
- }
- out.print("</td><tr>");
- j++;
- }
- i++;
- }
- while (true);
- %>
- </table>
-
- <p>
- <a href="<%out.print(
- ((at.gv.egovernment.moa.spss.slinterface.URLRewriter) application.getAttribute(at.gv.egovernment.moa.spss.slinterface.Constants.WSCP_URL_REWRITER_)).rewrite(
- request.getContextPath() + "/return", request.getSession()));%>">
- Zurück zur Anwendung ...</a>
- </p>
- </td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/spss.slinterface/pages/test/bildspeicher/bild2.jpg b/spss.slinterface/pages/test/bildspeicher/bild2.jpg
deleted file mode 100644
index 24e45d182..000000000
--- a/spss.slinterface/pages/test/bildspeicher/bild2.jpg
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/pages/test/dataURL.jsp b/spss.slinterface/pages/test/dataURL.jsp
deleted file mode 100644
index affef5022..000000000
--- a/spss.slinterface/pages/test/dataURL.jsp
+++ /dev/null
@@ -1,44 +0,0 @@
-<%@ page contentType="text/html; ISO-8859-1" %>
-
-<jsp:useBean
- id="dataURLResult"
- class="test.at.gv.egovernment.moa.spss.slinterface.DataURLBean" scope="request">
-</jsp:useBean>
-
-<html>
-<head>
- <title>Testanwendung für MOA SL - Resultat</title>
-</head>
- <body>
-<form action="" method="post">
-<table width="800px" align="center">
-<tr>
-<td>
-<h1 align="center">Testanwendung für MOA SL - Resultat</h1>
-<p align="center">Die folgenden Daten wurden von MOA SL als Ergebnis gesendet.</p>
-<table bgcolor="#eeeeee" width="790px" border="1" cellpadding="3">
-<tr>
-<td>Content-Type</td>
-<td>
-<textarea name="DataURL" cols="80" rows="1">
-<jsp:getProperty name="dataURLResult" property="contentType"/>
-</textarea>
-<td>
-</tr>
-<tr>
-<td>Inhalt</td>
-<td>
-<textarea name="XMLRequest" cols=80 rows=20>
-<jsp:getProperty name="dataURLResult" property="content"/>
-</textarea>
-</td>
-</tr>
-</table>
-<p align="center">
-</p>
-</td>
-</tr>
-</table>
-</form>
-</body>
-</html>
diff --git a/spss.slinterface/pages/test/forms/verify.default.jsp b/spss.slinterface/pages/test/forms/verify.default.jsp
deleted file mode 100644
index 5392e0df8..000000000
--- a/spss.slinterface/pages/test/forms/verify.default.jsp
+++ /dev/null
@@ -1,99 +0,0 @@
-<%@ page contentType="text/html; ISO-8859-1" %>
-
-<jsp:useBean
- id="initPropertiesBean"
- class="at.gv.egovernment.moa.spss.slinterface.beans.InitPropertiesBean" scope="application">
-</jsp:useBean>
-
-<html>
-<head>
- <title>Testanwendung für MOA SL</title>
-</head>
- <body>
-<form action="<% out.write(initPropertiesBean.getMOASLWebAppURL() + request.getContextPath()); %>/http-security-layer-request" method="post">
-<table width="800px" align="center">
-<tr>
-<td>
-<h1 align="center">Testanwendung für MOA SL</h1>
-<p align="center">Das signierte Dokument ist kein Security-Layer XHTML Dokument.</p>
-<table bgcolor="#eeeeee" width="790px" border="1" cellpadding="3">
-<tr>
-<td>Signaturprüfungsrequest</td>
-<td>
-<textarea name="XMLRequest" cols=80 rows=20>
-&lt;?xml version="1.0" encoding="UTF-8"?>
-&lt;VerifyXMLSignatureRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" 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#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- &lt;SignatureInfo>
- &lt;SignatureEnvironment>
- &lt;XMLContent>
-&lt;dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">&lt;dsig:SignedInfo>&lt;dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>&lt;dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>&lt;dsig:Reference Id="reference-1-1" URI="xmlDocument.xml">&lt;dsig:Transforms>&lt;dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">&lt;xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- &lt;xsl:import href="stylesheet.xsl"/>
- &lt;/xsl:stylesheet>&lt;/dsig:Transform>&lt;dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>&lt;/dsig:Transforms>&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>qWbsEi/iFwXaXZvCBanbFu7poqQ=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;dsig:Reference Id="reference-1-2" URI="bild1.gif">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>mCGwDv9ku7uHVbL4bkNC8o52LrE=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;dsig:Reference Id="reference-1-3" URI="bild2.jpg">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>Jc6oVCCGjgvFFYQR6jklGkGL4l4=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#manifest-1-1">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>8HbxBKILDNRUeewGlObTKbBsB18=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id(&apos;etsi-signed-1-1&apos;)/child::etsi:QualifyingProperties/child::etsi:SignedProperties)">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>hgityh9+8rEQjPzU0+6R/6rol3k=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;/dsig:SignedInfo>&lt;dsig:SignatureValue>AfkIFItBFm9bTyciEQFwd+nx/5wfuDzAOPhfgEl8s8OVeyL/ZH99+4inrDTcrM6E
-yhnKu/OZYfBdZicia9SGwXtnXabaUrOu/yMoxyh0DYoJY0ujLZFr6ywg4vZkM6X3
-tif5UrwAlSqnfJquT203GqpOS6euTZW86RRnvdR/4Jc=&lt;/dsig:SignatureValue>&lt;dsig:KeyInfo>&lt;dsig:X509Data>&lt;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&lt;/dsig:X509Certificate>&lt;/dsig:X509Data>&lt;/dsig:KeyInfo>&lt;dsig:Object>&lt;dsig:Manifest Id="manifest-1-1">&lt;dsig:Reference URI="stylesheet.xsl">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>/KjC84jSkt2ZHN35vNKXBvI2p80=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;/dsig:Manifest>&lt;/dsig:Object>&lt;dsig:Object Id="etsi-signed-1-1">&lt;etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#">&lt;etsi:SignedProperties>&lt;etsi:SignedSignatureProperties>&lt;etsi:SigningTime>2003-12-03T11:51:13&lt;/etsi:SigningTime>&lt;etsi:SigningCertificate>&lt;etsi:Cert>&lt;etsi:CertDigest>&lt;etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=&lt;/etsi:DigestValue>&lt;/etsi:CertDigest>&lt;etsi:IssuerSerial>&lt;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&lt;/dsig:X509IssuerName>&lt;dsig:X509SerialNumber>1044289238331&lt;/dsig:X509SerialNumber>&lt;/etsi:IssuerSerial>&lt;/etsi:Cert>&lt;/etsi:SigningCertificate>&lt;etsi:SignaturePolicyIdentifier>&lt;etsi:SignaturePolicyImplied/>&lt;/etsi:SignaturePolicyIdentifier>&lt;/etsi:SignedSignatureProperties>&lt;etsi:SignedDataObjectProperties>&lt;etsi:DataObjectFormat ObjectReference="#reference-1-1">&lt;etsi:MimeType>text/html&lt;/etsi:MimeType>&lt;/etsi:DataObjectFormat>&lt;etsi:DataObjectFormat ObjectReference="#reference-1-2">&lt;etsi:MimeType>img/gif&lt;/etsi:MimeType>&lt;/etsi:DataObjectFormat>&lt;etsi:DataObjectFormat ObjectReference="#reference-1-3">&lt;etsi:MimeType>img/jpg&lt;/etsi:MimeType>&lt;/etsi:DataObjectFormat>&lt;/etsi:SignedDataObjectProperties>&lt;/etsi:SignedProperties>&lt;/etsi:QualifyingProperties>&lt;/dsig:Object>&lt;/dsig:Signature>
- &lt;/XMLContent>
- &lt;/SignatureEnvironment>
- &lt;SignatureLocation>/dsig:Signature&lt;/SignatureLocation>
- &lt;/SignatureInfo>
- &lt;Supplement>
- &lt;Content Reference="stylesheet.xsl">
- &lt;LocRefContent><% out.write(initPropertiesBean.getMOASLWebAppURL() + request.getContextPath()); %>/pages/test/stylesheet.xsl&lt;/LocRefContent>
- &lt;/Content>
- &lt;/Supplement>
- &lt;Supplement>
- &lt;Content Reference="xmlDocument.xml">
- &lt;XMLContent>
- &lt;XMLDarstellung xmlns="urn:instance">Etwas Text. Dann kommt das erste Bild.&lt;Bild Reference="bild1.gif"/>Wieder etwas Text. Dann kommt das zweite Bild.&lt;Bild Reference="bild2.jpg"/>Und noch ein wenig finaler Text.&lt;/XMLDarstellung>
- &lt;/XMLContent>
- &lt;/Content>
- &lt;/Supplement>
- &lt;Supplement>
- &lt;Content Reference="bild1.gif">
- &lt;Base64Content>R0lGODlhHgAPAJEAAAD/AAAAAAAAAAAAACwAAAAAHgAPAAAIJAABCBxIsKDBgwgTKlzIsKHD
-hxAjSpxIsaLFixgzatzIsePDgAA7&lt;/Base64Content>
- &lt;/Content>
- &lt;/Supplement>
- &lt;Supplement>
- &lt;Content Reference="bild2.jpg">
- &lt;LocRefContent><% out.write(initPropertiesBean.getMOASLWebAppURL() + request.getContextPath()); %>/pages/test/bildspeicher/bild2.jpg&lt;/LocRefContent>
- &lt;/Content>
- &lt;/Supplement>
-&lt;/VerifyXMLSignatureRequest>
-</textarea>
-</td>
-</tr>
-<tr>
-<td>DataURL</td>
-<td><input name="DataURL" value="<% out.write(initPropertiesBean.getMOASLWebAppURL() + request.getContextPath()); %>/dataurl" size=70/>
-</td>
-</tr>
-</table>
-<p align="center">
-<input type="submit">
-</p>
-</td>
-</tr>
-</table>
-</form>
-</body>
-</html>
diff --git a/spss.slinterface/pages/test/forms/verify.slxhtml.jsp b/spss.slinterface/pages/test/forms/verify.slxhtml.jsp
deleted file mode 100644
index 2dfd90a5b..000000000
--- a/spss.slinterface/pages/test/forms/verify.slxhtml.jsp
+++ /dev/null
@@ -1,99 +0,0 @@
-<%@ page contentType="text/html; ISO-8859-1" %>
-
-<jsp:useBean
- id="initPropertiesBean"
- class="at.gv.egovernment.moa.spss.slinterface.beans.InitPropertiesBean" scope="application">
-</jsp:useBean>
-
-<html>
-<head>
- <title>Testanwendung für MOA SL</title>
-</head>
- <body>
-<form action="<% out.write(initPropertiesBean.getMOASLWebAppURL() + request.getContextPath()); %>/http-security-layer-request" method="post">
-<table width="800px" align="center">
-<tr>
-<td>
-<h1 align="center">Testanwendung für MOA SL</h1>
-<p align="center">Das signierte Dokument ist ein Security-Layer XHTML Dokument.</p>
-<table bgcolor="#eeeeee" width="790px" border="1" cellpadding="3">
-<tr>
-<td>Signaturprüfungsrequest</td>
-<td>
-<textarea name="XMLRequest" cols=80 rows=20>
-&lt;?xml version="1.0" encoding="UTF-8"?>
-&lt;VerifyXMLSignatureRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" 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#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- &lt;SignatureInfo>
- &lt;SignatureEnvironment>
- &lt;XMLContent>
-&lt;dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">&lt;dsig:SignedInfo>&lt;dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>&lt;dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>&lt;dsig:Reference Id="reference-1-1" URI="xmlDocument.xml">&lt;dsig:Transforms>&lt;dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">&lt;xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- &lt;xsl:import href="stylesheet.xsl"/>
- &lt;/xsl:stylesheet>&lt;/dsig:Transform>&lt;dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>&lt;/dsig:Transforms>&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>qWbsEi/iFwXaXZvCBanbFu7poqQ=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;dsig:Reference Id="reference-1-2" Type="http://www.buergerkarte.at/specifications/Security-Layer/20031113?Name=SignedImage&amp;amp;InstanceDocRef=0" URI="bild1.gif">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>mCGwDv9ku7uHVbL4bkNC8o52LrE=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;dsig:Reference Id="reference-1-3" Type="http://www.buergerkarte.at/specifications/Security-Layer/20031113?Name=SignedImage&amp;amp;InstanceDocRef=0" URI="bild2.jpg">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>Jc6oVCCGjgvFFYQR6jklGkGL4l4=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;dsig:Reference Type="http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest" URI="#manifest-1-1">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>8HbxBKILDNRUeewGlObTKbBsB18=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id(&apos;etsi-signed-1-1&apos;)/child::etsi:QualifyingProperties/child::etsi:SignedProperties)">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>QixjzDGm3YVNnrWBVdkNLlp2Pmk=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;/dsig:SignedInfo>&lt;dsig:SignatureValue>wAt9rJy+7xx4b5VcMyGC9iwAtK+bHpMrqsiz5fLyXQJ11Iq+ME/yHhglv3u3cp6d
-BCsNAuMacqEM0qGJ2xoIaxVPS5QIPJoF6KuS7t4rPGRW9g04EgE8xyRkH6qyxP9J
-ilfBOISA/1GJcEejFeJdOkTLFrH7toE+IqB2fEl7eKs=&lt;/dsig:SignatureValue>&lt;dsig:KeyInfo>&lt;dsig:X509Data>&lt;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&lt;/dsig:X509Certificate>&lt;/dsig:X509Data>&lt;/dsig:KeyInfo>&lt;dsig:Object>&lt;dsig:Manifest Id="manifest-1-1">&lt;dsig:Reference URI="stylesheet.xsl">&lt;dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;dsig:DigestValue>/KjC84jSkt2ZHN35vNKXBvI2p80=&lt;/dsig:DigestValue>&lt;/dsig:Reference>&lt;/dsig:Manifest>&lt;/dsig:Object>&lt;dsig:Object Id="etsi-signed-1-1">&lt;etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#">&lt;etsi:SignedProperties>&lt;etsi:SignedSignatureProperties>&lt;etsi:SigningTime>2003-12-03T10:13:28&lt;/etsi:SigningTime>&lt;etsi:SigningCertificate>&lt;etsi:Cert>&lt;etsi:CertDigest>&lt;etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>&lt;etsi:DigestValue>dL59VDpBsujcngd207z0ohPl1/U=&lt;/etsi:DigestValue>&lt;/etsi:CertDigest>&lt;etsi:IssuerSerial>&lt;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&lt;/dsig:X509IssuerName>&lt;dsig:X509SerialNumber>1044289238331&lt;/dsig:X509SerialNumber>&lt;/etsi:IssuerSerial>&lt;/etsi:Cert>&lt;/etsi:SigningCertificate>&lt;etsi:SignaturePolicyIdentifier>&lt;etsi:SignaturePolicyImplied/>&lt;/etsi:SignaturePolicyIdentifier>&lt;/etsi:SignedSignatureProperties>&lt;etsi:SignedDataObjectProperties>&lt;etsi:DataObjectFormat ObjectReference="#reference-1-1">&lt;etsi:MimeType>text/html&lt;/etsi:MimeType>&lt;/etsi:DataObjectFormat>&lt;etsi:DataObjectFormat ObjectReference="#reference-1-2">&lt;etsi:MimeType>img/gif&lt;/etsi:MimeType>&lt;/etsi:DataObjectFormat>&lt;etsi:DataObjectFormat ObjectReference="#reference-1-3">&lt;etsi:MimeType>img/jpg&lt;/etsi:MimeType>&lt;/etsi:DataObjectFormat>&lt;/etsi:SignedDataObjectProperties>&lt;/etsi:SignedProperties>&lt;/etsi:QualifyingProperties>&lt;/dsig:Object>&lt;/dsig:Signature>
- &lt;/XMLContent>
- &lt;/SignatureEnvironment>
- &lt;SignatureLocation>/dsig:Signature&lt;/SignatureLocation>
- &lt;/SignatureInfo>
- &lt;Supplement>
- &lt;Content Reference="stylesheet.xsl">
- &lt;LocRefContent><% out.write(initPropertiesBean.getMOASLWebAppURL() + request.getContextPath()); %>/pages/test/stylesheet.xsl&lt;/LocRefContent>
- &lt;/Content>
- &lt;/Supplement>
- &lt;Supplement>
- &lt;Content Reference="xmlDocument.xml">
- &lt;XMLContent>
- &lt;XMLDarstellung xmlns="urn:instance">Etwas Text. Dann kommt das erste Bild.&lt;Bild Reference="bild1.gif"/>Wieder etwas Text. Dann kommt das zweite Bild.&lt;Bild Reference="bild2.jpg"/>Und noch ein wenig finaler Text.&lt;/XMLDarstellung>
- &lt;/XMLContent>
- &lt;/Content>
- &lt;/Supplement>
- &lt;Supplement>
- &lt;Content Reference="bild1.gif">
- &lt;Base64Content>R0lGODlhHgAPAJEAAAD/AAAAAAAAAAAAACwAAAAAHgAPAAAIJAABCBxIsKDBgwgTKlzIsKHD
-hxAjSpxIsaLFixgzatzIsePDgAA7&lt;/Base64Content>
- &lt;/Content>
- &lt;/Supplement>
- &lt;Supplement>
- &lt;Content Reference="bild2.jpg">
- &lt;LocRefContent><% out.write(initPropertiesBean.getMOASLWebAppURL() + request.getContextPath()); %>/pages/test/bildspeicher/bild2.jpg&lt;/LocRefContent>
- &lt;/Content>
- &lt;/Supplement>
-&lt;/VerifyXMLSignatureRequest>
-</textarea>
-</td>
-</tr>
-<tr>
-<td>DataURL</td>
-<td><input name="DataURL" value="<% out.write(initPropertiesBean.getMOASLWebAppURL() + request.getContextPath()); %>/dataurl" size=70/>
-</td>
-</tr>
-</table>
-<p align="center">
-<input type="submit">
-</p>
-</td>
-</tr>
-</table>
-</form>
-</body>
-</html>
diff --git a/spss.slinterface/pages/test/stylesheet.xsl b/spss.slinterface/pages/test/stylesheet.xsl
deleted file mode 100644
index 9af3e3cc6..000000000
--- a/spss.slinterface/pages/test/stylesheet.xsl
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xmlspysamplexml e:\cio\projekte\erecht\beispiele\xmlDokument.xml?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:inst="urn:instance">
- <xsl:output encoding="UTF-8" method="xml" indent="yes"/>
- <xsl:template match="/inst:XMLDarstellung">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>HTML-Darstellung</title>
- </head>
- <body>
- <p>
- <xsl:for-each select="child::node()">
- <xsl:choose>
- <xsl:when test="./self::text()">
- <xsl:value-of select="."/>
- </xsl:when>
- <xsl:when test="./self::inst:Bild">
- <img>
- <xsl:attribute name="src"><xsl:value-of select="./@Reference"/></xsl:attribute>
- <xsl:attribute name="alt">alternative text</xsl:attribute>
- </img>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </p>
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet>
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.3.xsd b/spss.slinterface/res/resources/schemas/MOA-SPSS-1.3.xsd
deleted file mode 100644
index 481530276..000000000
--- a/spss.slinterface/res/resources/schemas/MOA-SPSS-1.3.xsd
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- MOA SP/SS 1.3 Schema
--->
-<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
- <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <!--########## Create XML Signature ###-->
- <!--### Create XML Signature Request ###-->
- <xsd:element name="CreateXMLSignatureRequest">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="CreateXMLSignatureRequestType"/>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="CreateXMLSignatureRequestType">
- <xsd:sequence>
- <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>
- <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="DataObjectInfo" maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="DataObjectInfoType">
- <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="CreateSignatureInfo" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>
- <xsd:choice>
- <xsd:annotation>
- <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>
- </xsd:annotation>
- <xsd:element ref="CreateSignatureEnvironmentProfile"/>
- <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>
- </xsd:choice>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <!--### Create XML Signature Response ###-->
- <xsd:complexType name="CreateXMLSignatureResponseType">
- <xsd:choice maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>
- </xsd:annotation>
- <xsd:element name="SignatureEnvironment">
- <xsd:annotation>
- <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:any namespace="##any" processContents="lax"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element ref="ErrorResponse"/>
- </xsd:choice>
- </xsd:complexType>
- <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>
- <!--########## Verify CMS Signature ###-->
- <!--### Verifiy CMS Signature Request ###-->
- <xsd:element name="VerifyCMSSignatureRequest">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="VerifyCMSSignatureRequestType">
- <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:complexType name="VerifyCMSSignatureRequestType">
- <xsd:sequence>
- <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
- <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
- <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
- <xsd:element name="TrustProfileID" type="xsd:token">
- <xsd:annotation>
- <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <!--### Verify CMS Signature Response ###-->
- <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>
- <xsd:complexType name="VerifyCMSSignatureResponseType">
- <xsd:sequence maxOccurs="unbounded">
- <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
- <xsd:annotation>
- <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="SignatureCheck" type="CheckResultType"/>
- <xsd:element name="CertificateCheck" type="CheckResultType"/>
- </xsd:sequence>
- </xsd:complexType>
- <!--########## Verify XML Signature ###-->
- <!--### Verify XML Signature Request ###-->
- <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>
- <xsd:complexType name="VerifyXMLSignatureRequestType">
- <xsd:sequence>
- <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
- <xsd:element name="VerifySignatureInfo">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>
- <xsd:element name="VerifySignatureLocation" type="xsd:token"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element ref="SupplementProfile"/>
- <xsd:element name="SupplementProfileID" type="xsd:string"/>
- </xsd:choice>
- <xsd:element name="SignatureManifestCheckParams" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="ReturnHashInputData" minOccurs="0"/>
- <xsd:element name="TrustProfileID" type="xsd:token">
- <xsd:annotation>
- <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <!--### Verify XML Signature Response ###-->
- <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>
- <xsd:complexType name="VerifyXMLSignatureResponseType">
- <xsd:sequence>
- <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
- <xsd:annotation>
- <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="HashInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ReferenceInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
- <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
- <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="CertificateCheck" type="CheckResultType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="ProfileIdentifierType">
- <xsd:restriction base="xsd:token"/>
- </xsd:simpleType>
- <xsd:complexType name="InputDataType">
- <xsd:complexContent>
- <xsd:extension base="ContentExLocRefBaseType">
- <xsd:attribute name="PartOf" use="optional" default="SignedInfo">
- <xsd:simpleType>
- <xsd:restriction base="xsd:token">
- <xsd:enumeration value="SignedInfo"/>
- <xsd:enumeration value="XMLDSIGManifest"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="ReferringSigReference" type="xsd:nonNegativeInteger" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="MetaInfoType">
- <xsd:sequence>
- <xsd:element name="MimeType" type="MimeTypeType"/>
- <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>
- <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="FinalDataMetaInfoType">
- <xsd:complexContent>
- <xsd:extension base="MetaInfoType">
- <xsd:sequence>
- <xsd:element name="Type" type="xsd:anyURI" minOccurs="0"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="DataObjectInfoType">
- <xsd:sequence>
- <xsd:element name="DataObject">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="ContentOptionalRefType"/>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:choice>
- <xsd:annotation>
- <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>
- </xsd:annotation>
- <xsd:element ref="CreateTransformsInfoProfile"/>
- <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="Structure" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="detached"/>
- <xsd:enumeration value="enveloping"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:complexType name="TransformsInfoType">
- <xsd:sequence>
- <xsd:element ref="dsig:Transforms" minOccurs="0"/>
- <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="XMLDataObjectAssociationType">
- <xsd:sequence>
- <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
- <xsd:element name="Content" type="ContentRequiredRefType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CMSDataObjectOptionalMetaType">
- <xsd:sequence>
- <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
- <xsd:element name="Content" type="CMSContentBaseType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CMSContentBaseType">
- <xsd:complexContent>
- <xsd:restriction base="ContentOptionalRefType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- </xsd:choice>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="CheckResultType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ReferencesCheckResultType">
- <xsd:complexContent>
- <xsd:restriction base="CheckResultType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">
- <xsd:complexContent mixed="true">
- <xsd:restriction base="AnyChildrenType">
- <xsd:sequence>
- <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ManifestRefsCheckResultType">
- <xsd:complexContent>
- <xsd:restriction base="CheckResultType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
- <xsd:complexContent mixed="true">
- <xsd:restriction base="AnyChildrenType">
- <xsd:sequence>
- <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <!--########## Error Response ###-->
- <xsd:element name="ErrorResponse" type="ErrorResponseType">
- <xsd:annotation>
- <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:complexType name="ErrorResponseType">
- <xsd:sequence>
- <xsd:element name="ErrorCode" type="xsd:integer"/>
- <xsd:element name="Info" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- <!--########## Auxiliary Types ###-->
- <xsd:simpleType name="KeyIdentifierType">
- <xsd:restriction base="xsd:string"/>
- </xsd:simpleType>
- <xsd:simpleType name="KeyStorageType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Software"/>
- <xsd:enumeration value="Hardware"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:simpleType name="MimeTypeType">
- <xsd:restriction base="xsd:token"/>
- </xsd:simpleType>
- <xsd:complexType name="AnyChildrenType" mixed="true">
- <xsd:sequence>
- <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="XMLContentType" mixed="true">
- <xsd:complexContent mixed="true">
- <xsd:extension base="AnyChildrenType">
- <xsd:attribute ref="xml:space" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ContentBaseType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="XMLContentType"/>
- <xsd:element name="LocRefContent" type="xsd:anyURI"/>
- </xsd:choice>
- </xsd:complexType>
- <xsd:complexType name="ContentExLocRefBaseType">
- <xsd:complexContent>
- <xsd:restriction base="ContentBaseType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="XMLContentType"/>
- </xsd:choice>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ContentOptionalRefType">
- <xsd:complexContent>
- <xsd:extension base="ContentBaseType">
- <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="ContentRequiredRefType">
- <xsd:complexContent>
- <xsd:restriction base="ContentOptionalRefType">
- <xsd:choice minOccurs="0">
- <xsd:element name="Base64Content" type="xsd:base64Binary"/>
- <xsd:element name="XMLContent" type="XMLContentType"/>
- <xsd:element name="LocRefContent" type="xsd:anyURI"/>
- </xsd:choice>
- <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="VerifyTransformsDataType">
- <xsd:choice maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>
- </xsd:annotation>
- <xsd:element ref="VerifyTransformsInfoProfile"/>
- <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- <xsd:element name="QualifiedCertificate"/>
- <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
- <xsd:complexType name="PublicAuthorityType">
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="SignatoriesType">
- <xsd:union memberTypes="AllSignatoriesType">
- <xsd:simpleType>
- <xsd:list itemType="xsd:positiveInteger"/>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
- <xsd:simpleType name="AllSignatoriesType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="all"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="CreateSignatureLocationType">
- <xsd:simpleContent>
- <xsd:extension base="xsd:token">
- <xsd:attribute name="Index" type="xsd: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/slxhtml-1.0/slxhtml-model-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd
deleted file mode 100644
index 140b35e84..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- This is the XML Schema module of named XHTML content models for SLXHTML.
- SLXHTML is a profile of XHTML (see W3C copyright notice below).
-
- @author: Gregor Karlinger gregor.karlinger@cio.gv.at
- $Id: slxhtml-model-1.xsd,v 1.2 2003/11/13 18:38:16 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>
- XHTML Document Model
-
- This module describes the groupings of elements/attributes that make up
- common content models for XHTML elements.
-
- XHTML has following basic content models:
-
- Inline.mix; character-level elements
- Block.mix; block-like elements, eg., paragraphs and lists
- Flow.mix; any block or inline elements
- HeadOpts.mix; Head Elements
- InlinePre.mix; Special class for pre content model
- InlineNoAnchor.mix; Content model for Anchor
-
- Any groups declared in this module may be used
- to create element content models, but the above are
- considered 'global' (insofar as that term applies here).
-
- XHTML has the following Attribute Groups
- Core.extra.attrib
- I18n.extra.attrib
- Common.extra
-
- The above attribute Groups are considered Global
-
- </xs:documentation>
- </xs:annotation>
-
- <xs:attributeGroup name="I18n.extra.attrib">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: attributeGroup "dir.attrib" removed.
- </xs:documentation>
- </xs:annotation>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="Common.extra">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: attributeGroup "style.attrib" removed.
- </xs:documentation>
- </xs:annotation>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="Core.extra.attrib">
- </xs:attributeGroup>
-
-
- <xs:group name="HeadOpts.mix">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: elements "script", "meta", "link", "object" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:element ref="style"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="Edit.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: elements "ins", "del" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice/>
- </xs:group>
-
- <xs:group name="Script.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: elements "script", "noscript" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice/>
- </xs:group>
-
- <xs:group name="Misc.extra">
- <xs:choice/>
- </xs:group>
-
- <xs:group name="Misc.class">
- <xs:choice>
- <xs:group ref="Edit.class"/>
- <xs:group ref="Script.class"/>
- <xs:group ref="Misc.extra"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="InlStruct.class">
- <xs:choice>
- <xs:element ref="br"/>
- <xs:element ref="span"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="InlPhras.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: elements "dfn", "samp", "kbd", "var", "q" , "abbr" and
- "acronym" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:element ref="em"/>
- <xs:element ref="strong"/>
- <xs:element ref="code"/>
- <xs:element ref="cite"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="InlPres.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: elements "tt", "i", "b", "big", "small", "sub", "sup" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice/>
- </xs:group>
-
- <xs:group name="I18n.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: element "bdo" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:sequence/>
- </xs:group>
-
- <xs:group name="Anchor.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: element "a" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:sequence/>
- </xs:group>
-
- <xs:group name="InlSpecial.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: elements "map", "object" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:element ref="img"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="InlForm.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: elements "input", "select", "textara", "lable", "button" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice/>
- </xs:group>
-
- <xs:group name="Inline.extra">
- <xs:choice/>
- </xs:group>
-
- <xs:group name="Ruby.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: element "ruby" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:sequence/>
- </xs:group>
-
- <xs:group name="Inline.class">
- <xs:choice>
- <xs:group ref="InlStruct.class"/>
- <xs:group ref="InlPhras.class"/>
- <xs:group ref="InlPres.class"/>
- <xs:group ref="I18n.class"/>
- <xs:group ref="Anchor.class"/>
- <xs:group ref="InlSpecial.class"/>
- <xs:group ref="InlForm.class"/>
- <xs:group ref="Ruby.class"/>
- <xs:group ref="Inline.extra"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="InlNoRuby.class">
- <xs:choice>
- <xs:group ref="InlStruct.class"/>
- <xs:group ref="InlPhras.class"/>
- <xs:group ref="InlPres.class"/>
- <xs:group ref="I18n.class"/>
- <xs:group ref="Anchor.class"/>
- <xs:group ref="InlSpecial.class"/>
- <xs:group ref="InlForm.class"/>
- <xs:group ref="Inline.extra"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="InlinePre.mix">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: elements "tt", "i", "b", "script", "map" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:group ref="InlStruct.class"/>
- <xs:group ref="InlPhras.class"/>
- <xs:group ref="I18n.class"/>
- <xs:group ref="Anchor.class"/>
- <xs:group ref="Inline.extra"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="InlNoAnchor.class">
- <xs:choice>
- <xs:group ref="InlStruct.class"/>
- <xs:group ref="InlPhras.class"/>
- <xs:group ref="InlPres.class"/>
- <xs:group ref="I18n.class"/>
- <xs:group ref="InlSpecial.class"/>
- <xs:group ref="InlForm.class"/>
- <xs:group ref="Ruby.class"/>
- <xs:group ref="Inline.extra"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="InlNoAnchor.mix">
- <xs:choice>
- <xs:group ref="InlNoAnchor.class"/>
- <xs:group ref="Misc.class"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="Inline.mix">
- <xs:choice>
- <xs:group ref="Inline.class"/>
- <xs:group ref="Misc.class"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="InlNoRuby.mix">
- <xs:choice>
- <xs:group ref="InlNoRuby.class"/>
- <xs:group ref="Misc.class"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="Heading.class">
- <xs:choice>
- <xs:element ref="h1"/>
- <xs:element ref="h2"/>
- <xs:element ref="h3"/>
- <xs:element ref="h4"/>
- <xs:element ref="h5"/>
- <xs:element ref="h6"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="List.class">
- <xs:choice>
- <xs:element ref="ul"/>
- <xs:element ref="ol"/>
- <xs:element ref="dl"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="Table.class">
- <xs:choice>
- <xs:element ref="table"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="Form.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: element "form" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice/>
- </xs:group>
-
- <xs:group name="Fieldset.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: element "fieldset" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice/>
- </xs:group>
-
- <xs:group name="BlkStruct.class">
- <xs:choice>
- <xs:element ref="p"/>
- <xs:element ref="div"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="BlkPhras.class">
- <xs:annotation>
- <xs:documentation>
- SLXHTML: element "address" removed.
- </xs:documentation>
- </xs:annotation>
- <xs:choice>
- <xs:element ref="pre"/>
- <xs:element ref="blockquote"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="BlkPres.class">
- <xs:sequence>
- <xs:element ref="hr"/>
- </xs:sequence>
- </xs:group>
-
- <xs:group name="BlkSpecial.class">
- <xs:choice>
- <xs:group ref="Table.class"/>
- <xs:group ref="Form.class"/>
- <xs:group ref="Fieldset.class"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="Block.extra">
- <xs:choice/>
- </xs:group>
-
- <xs:group name="Block.class">
- <xs:choice>
- <xs:group ref="BlkStruct.class"/>
- <xs:group ref="BlkPhras.class"/>
- <xs:group ref="BlkPres.class"/>
- <xs:group ref="BlkSpecial.class"/>
- <xs:group ref="Block.extra"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="Block.mix">
- <xs:choice>
- <xs:group ref="Heading.class"/>
- <xs:group ref="List.class"/>
- <xs:group ref="Block.class"/>
- <xs:group ref="Misc.class"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="Flow.mix">
- <xs:choice>
- <xs:group ref="Heading.class"/>
- <xs:group ref="List.class"/>
- <xs:group ref="Block.class"/>
- <xs:group ref="Inline.class"/>
- <xs:group ref="Misc.class"/>
- </xs:choice>
- </xs:group>
-
- <xs:group name="BlkNoForm.mix">
- <xs:choice>
- <xs:group ref="Heading.class"/>
- <xs:group ref="List.class"/>
- <xs:group ref="BlkStruct.class"/>
- <xs:group ref="BlkPhras.class" />
- <xs:group ref="BlkPres.class"/>
- <xs:group ref="Table.class"/>
- <xs:group ref="Block.extra"/>
- <xs:group ref="Misc.class"/>
- </xs:choice>
- </xs:group>
-
-</xs:schema> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd
deleted file mode 100644
index d58fe93f0..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- This XML Schema declares changes to the content models
- of modules included in SLXHTML 1.0
- $Id: slxhtml-module-redefines-1.xsd,v 1.3 2003/12/02 19:34:37 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>
- Module Content Model Redefinitions
-
- This schema describes the changes (Redefinitions) to the
- content model of individual modules as they are instantiated as part of
- SLXHTML 1.0 Document
- </xs:documentation>
- </xs:annotation>
-
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- <!-- Changes to Structural Module -->
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
- <xs:redefine schemaLocation="xhtml-struct-1.xsd">
-
- <xs:group name="head.content">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML: Only a single instance of element "style" is
- allowed apart from the obligatory "title" element.
- </xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element ref="title"/>
- <xs:element ref="style" minOccurs="0"/>
- </xs:sequence>
- </xs:group>
-
- <xs:attributeGroup name="version.attrib">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML: Change value of the version attrib.
- </xs:documentation>
- </xs:annotation>
- <xs:attribute name="version" type="FPI" fixed="-//www.buergerkarte.at//DOCUMENT SLXHTML 1.0//DE"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="profile.attrib">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML: Removed profile attrib.
- </xs:documentation>
- </xs:annotation>
- </xs:attributeGroup>
-
- </xs:redefine>
-
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- <!-- Changes to common attributes module (included in framework module) -->
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
- <xs:redefine schemaLocation="xhtml-framework-1.xsd">
-
- <xs:attributeGroup name="I18n.attrib">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML: Removed xml:lang attrib.
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="I18n.extra.attrib"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="title">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML: Removed title attrib.
- </xs:documentation>
- </xs:annotation>
- </xs:attributeGroup>
-
- </xs:redefine>
-
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- <!-- Changes to block phrasal elements module (included in text module) -->
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
- <xs:redefine schemaLocation="xhtml-text-1.xsd">
-
- <xs:attributeGroup name="blockquote.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML: Removed cite attrib.
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- </xs:redefine>
-
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- <!-- Changes to images module -->
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
- <xs:redefine schemaLocation="xhtml-image-1.xsd">
-
- <xs:attributeGroup name="img.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML: Removed attributes "longdesc", "height", "width".
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="src" type="URI" use="required"/>
- <xs:attribute name="alt" type="Text" use="required"/>
- </xs:attributeGroup>
-
- </xs:redefine>
-
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- <!-- Changes to style module -->
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
- <xs:redefine schemaLocation="xhtml-style-1.xsd">
-
- <xs:attributeGroup name="style.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute group "title"
- Removed attribute "xml:space"
- Fixed value of attribute "type"
- Fixed value of attribute "media"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="I18n.attrib"/>
- <xs:attribute name="type" type="ContentType" use="required" fixed="text/css"/>
- <xs:attribute name="media" type="MediaDesc" fixed="screen"/>
- </xs:attributeGroup>
-
- </xs:redefine>
-
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- <!-- Changes to table module -->
- <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
- <xs:redefine schemaLocation="xhtml-table-1.xsd">
-
- <xs:attributeGroup name="td.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute groups "scope.attrib", "CellHAlign.attrib", "CellVAlign.attrib"
- Removed attributes "abbr", "axis", "headers"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="rowspan" type="Number" default="1"/>
- <xs:attribute name="colspan" type="Number" default="1"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="th.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute groups "scope.attrib", "CellHAlign.attrib", "CellVAlign.attrib"
- Removed attributes "abbr", "axis", "headers"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="rowspan" type="Number" default="1"/>
- <xs:attribute name="colspan" type="Number" default="1"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="tr.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="col.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
- Removed attributes "span", "width"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="colgroup.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
- Removed attributes "span", "width"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="tbody.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="tfoot.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="thead.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute groups "CellHAlign.attrib", "CellVAlign.attrib"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="table.attlist">
- <xs:annotation>
- <xs:documentation>
- Redefinition by SLXHTML:
- Removed attribute groups "frame.attrib", "rules.attrib"
- Removed attributes "summary", "width", "border", "cellspacing", "cellpadding"
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- </xs:redefine>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd
deleted file mode 100644
index 05087803f..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" blockDefault="#all">
- <xs:annotation>
- <xs:documentation>
- This is the XML Schema driver for SLXHTML 1.0.
- SLXHTML is a profile of XHTML (see W3C copyright notice below).
-
- @author: Gregor Karlinger gregor.karlinger@cio.gv.at
- $Id: slxhtml.xsd,v 1.2 2003/12/02 19:34:37 karlinger Exp $
- </xs:documentation>
- </xs:annotation>
- <xs:annotation>
- <xs:documentation>
- This is XHTML, a reformulation of HTML as a modular XML application
- The Extensible HyperText Markup Language (XHTML)
- Copyright &#169;1998-2003 World Wide Web Consortium
- (Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University).
- All Rights Reserved.
-
- Permission to use, copy, modify and distribute the XHTML Schema
- modules and their accompanying xs:documentation for any purpose
- and without fee is hereby granted in perpetuity, provided that the above
- copyright notice and this paragraph appear in all copies.
- The copyright holders make no representation about the suitability of
- these XML Schema modules for any purpose.
-
- They are provided "as is" without expressed or implied warranty.
- </xs:documentation>
- </xs:annotation>
- <xs:annotation>
- <xs:documentation>
- This is the Schema Driver file for SLXHTML 1.0
- Document Type
-
- This schema includes
- + modules for SLXHTML 1.0 Document Type.
-
- + schema that defines all the named model for
- the SLXHTML 1.0 Document Type
-
- + schema that redefines the content model of
- individual elements defined in the Module
- implementations.
-
- SLXHTML 1.0 Document Type includes the following Modules
-
- XHTML Core modules
- + text
- + lists
- + structure
-
- Other XHTML modules
- + Style
- + Image
- + Tables
-
- </xs:documentation>
- </xs:annotation>
- <xs:include schemaLocation="slxhtml-module-redefines-1.xsd">
- <xs:annotation>
- <xs:documentation>
- This schema redefines the content model defined by
- the individual modules for SLXHTML 1.0 Document Type
- </xs:documentation>
- </xs:annotation>
- </xs:include>
- <xs:include schemaLocation="slxhtml-model-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Document Model module for the SLXHTML 1.0 Document Type.
- This schema file defines all named models used by XHTML
- Modularization Framework for SLXHTML 1.0 Document Type
- </xs:documentation>
- </xs:annotation>
- </xs:include>
- <!--<xs:include schemaLocation="xhtml-framework-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Schema Framework Component Modules:
- + notations
- + datatypes
- + common attributes
- + character entities
- </xs:documentation>
- <xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_commonatts"/>
- </xs:annotation>
- </xs:include>-->
- <!--<xs:include schemaLocation="xhtml-text-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Text module
-
- The Text module includes declarations for all core
- text container elements and their attributes.
-
- + block phrasal
- + block structural
- + inline phrasal
- + inline structural
-
- Elements defined here:
- * address, blockquote, pre, h1, h2, h3, h4, h5, h6
- * div, p
- * abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
- * br, span
- </xs:documentation>
- <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_textmodule"/>
- </xs:annotation>
- </xs:include>-->
- <xs:include schemaLocation="xhtml-list-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Lists module
-
- Elements defined here:
- * dt, dd, dl, ol, ul, li
- </xs:documentation>
- <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_listmodule"/>
- </xs:annotation>
- </xs:include>
-<!-- <xs:include schemaLocation="xhtml-struct-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Structural module
-
- Elements defined here:
- * title, head, body, html
- </xs:documentation>
- <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_structuremodule"/>
- </xs:annotation>
- </xs:include>-->
- <xs:include schemaLocation="xhtml-blkpres-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Block Presentational module
-
- Elements defined here:
- * hr
- </xs:documentation>
- </xs:annotation>
- </xs:include>
- <!--<xs:include schemaLocation="xhtml-style-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Style module
-
- Elements defined here:
- * style
- </xs:documentation>
- </xs:annotation>
- </xs:include>-->
- <!--<xs:include schemaLocation="xhtml-image-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Image module
-
- Elements defined here:
- * img
- </xs:documentation>
- </xs:annotation>
- </xs:include>-->
- <!--<xs:include schemaLocation="xhtml-table-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Tables module
-
- Elements defined here:
- * table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
- </xs:documentation>
- </xs:annotation>
- </xs:include>-->
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-attribs-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-attribs-1.xsd
deleted file mode 100644
index d2c693dd9..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-attribs-1.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- This is the XML Schema common attributes module for XHTML
- $Id: xhtml-attribs-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="xml.xsd"/>
-
- <xs:attributeGroup name="id">
- <xs:attribute name="id" type="xs:ID"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="class">
- <xs:attribute name="class" type="xs:NMTOKENS"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="title">
- <xs:attribute name="title" type="xs:string"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="Core.attrib">
- <xs:attributeGroup ref="id"/>
- <xs:attributeGroup ref="class"/>
- <xs:attributeGroup ref="title"/>
- <xs:attributeGroup ref="Core.extra.attrib"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="I18n.attrib">
- <xs:attribute ref="xml:lang"/>
- <xs:attributeGroup ref="I18n.extra.attrib"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="Common.attrib">
- <xs:attributeGroup ref="Core.attrib"/>
- <xs:attributeGroup ref="I18n.attrib"/>
- <xs:attributeGroup ref="Common.extra"/>
- </xs:attributeGroup>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkphras-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkphras-1.xsd
deleted file mode 100644
index 464f0d2ca..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkphras-1.xsd
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- Block Phrasal elements module
- This is the XML Schema block phrasal element module for XHTML
-
- * address, blockquote, pre, h1, h2, h3, h4, h5, h6
-
- This module declares the elements and their attributes used to
- support block-level phrasal markup.
-
- $Id: xhtml-blkphras-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="xml.xsd"/>
-
- <!-- address -->
- <xs:attributeGroup name="address.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- <xs:group name="address.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="address.type" mixed="true">
- <xs:group ref="address.content"/>
- <xs:attributeGroup ref="address.attlist"/>
- </xs:complexType>
- <xs:element name="address" type="address.type"/>
- <!-- blockquote -->
- <xs:attributeGroup name="blockquote.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="cite" type="URI"/>
- </xs:attributeGroup>
- <xs:group name="blockquote.content">
- <xs:sequence>
- <xs:group ref="Block.mix" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="blockquote.type">
- <xs:group ref="blockquote.content"/>
- <xs:attributeGroup ref="blockquote.attlist"/>
- </xs:complexType>
- <xs:element name="blockquote" type="blockquote.type"/>
- <!-- pre -->
- <xs:attributeGroup name="pre.attlist">
- <xs:annotation>
- <xs:documentation>
- Change by SLXHTML: Removed attribute "fixed" form attribute declaration for "xml:space",
- because this is is a buggy declaration in the original XHTML declaration: The attribute
- fixed is not allowed since the original specification of the "xml:space" attribute has
- the default attribute set.
- (Original declaration was: &lt;xs:attribute ref="xml:space" fixed="preserve"/&gt;).
- </xs:documentation>
- </xs:annotation>
- <xs:attribute ref="xml:space"/>
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- <xs:group name="pre.content">
- <xs:sequence>
- <xs:group ref="InlinePre.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="pre.type" mixed="true">
- <xs:group ref="pre.content"/>
- <xs:attributeGroup ref="pre.attlist"/>
- </xs:complexType>
- <xs:element name="pre" type="pre.type"/>
- <!-- Heading Elements -->
- <xs:attributeGroup name="heading.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- <xs:complexType name="heading.type" mixed="true">
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- <xs:attributeGroup ref="heading.attlist"/>
- </xs:complexType>
- <xs:attributeGroup name="h1.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- <xs:group name="h1.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="h1.type" mixed="true">
- <xs:group ref="h1.content"/>
- <xs:attributeGroup ref="h1.attlist"/>
- </xs:complexType>
- <xs:element name="h1" type="h1.type"/>
- <xs:attributeGroup name="h2.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- <xs:group name="h2.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="h2.type" mixed="true">
- <xs:group ref="h2.content"/>
- <xs:attributeGroup ref="h2.attlist"/>
- </xs:complexType>
- <xs:element name="h2" type="h2.type"/>
- <xs:attributeGroup name="h3.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- <xs:group name="h3.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="h3.type" mixed="true">
- <xs:group ref="h3.content"/>
- <xs:attributeGroup ref="h3.attlist"/>
- </xs:complexType>
- <xs:element name="h3" type="h3.type"/>
- <xs:attributeGroup name="h4.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- <xs:group name="h4.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="h4.type" mixed="true">
- <xs:group ref="h4.content"/>
- <xs:attributeGroup ref="h4.attlist"/>
- </xs:complexType>
- <xs:element name="h4" type="h4.type"/>
- <xs:attributeGroup name="h5.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- <xs:group name="h5.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="h5.type" mixed="true">
- <xs:group ref="h5.content"/>
- <xs:attributeGroup ref="h5.attlist"/>
- </xs:complexType>
- <xs:element name="h5" type="h5.type"/>
- <xs:attributeGroup name="h6.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
- <xs:group name="h6.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="h6.type" mixed="true">
- <xs:group ref="h6.content"/>
- <xs:attributeGroup ref="h6.attlist"/>
- </xs:complexType>
- <xs:element name="h6" type="h6.type"/>
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkpres-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkpres-1.xsd
deleted file mode 100644
index 9c9b45bf0..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkpres-1.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- This is the XML SchemaBlock presentation element module for XHTML
- $Id: xhtml-blkpres-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>
- Block Presentational Elements
-
- * hr
-
- This module declares the elements and their attributes used to
- support block-level presentational markup.
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_presentationmodule"/>
- </xs:annotation>
-
- <xs:attributeGroup name="hr.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="hr.content">
- <xs:sequence/>
- </xs:group>
-
- <xs:complexType name="hr.type">
- <xs:group ref="hr.content"/>
- <xs:attributeGroup ref="hr.attlist"/>
- </xs:complexType>
-
- <xs:element name="hr" type="hr.type"/>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkstruct-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkstruct-1.xsd
deleted file mode 100644
index 581ab5b91..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-blkstruct-1.xsd
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- Block Structural
-
- * div, p
-
- This module declares the elements and their attributes used to
- support block-level structural markup.
-
- This is the XML Schema Block Structural module for XHTML
- $Id: xhtml-blkstruct-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
- <!-- div -->
- <xs:attributeGroup name="div.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="div.content">
- <xs:sequence>
- <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="div.type" mixed="true">
- <xs:group ref="div.content"/>
- <xs:attributeGroup ref="div.attlist"/>
- </xs:complexType>
-
- <xs:element name="div" type="div.type"/>
-
- <!-- p -->
- <xs:attributeGroup name="p.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="p.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="p.type" mixed="true">
- <xs:group ref="p.content"/>
- <xs:attributeGroup ref="p.attlist"/>
- </xs:complexType>
-
- <xs:element name="p" type="p.type"/>
-
-</xs:schema> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-charent-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-charent-1.xsd
deleted file mode 100644
index 7ad94214e..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-charent-1.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This schema module includes three named character entity files.
--->
-<!DOCTYPE xs:schema [
-<!-- These are the entity sets for ISO Latin 1 characters for the XHTML -->
-<!ENTITY % HTMLlat1 PUBLIC
- "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent">
-%HTMLlat1;
-<!-- These are the entity sets for special characters for the XHTML -->
-<!ENTITY % HTMLsymbol PUBLIC
- "-//W3C//ENTITIES Symbols for XHTML//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent">
-%HTMLsymbol;
-<!-- These are the entity sets for symbol characters for the XHTML -->
-<!ENTITY % HTMLspecial PUBLIC
- "-//W3C//ENTITIES Special for XHTML//EN"
- "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent">
-%HTMLspecial;
-]>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- Character Entities for XHTML
- This is the XML Schema Character Entities module for XHTML
-
- This module declares the set of character entities for XHTML,
- including the Latin 1, Symbol and Special character collections.
- XML Schema does not support Entities, hence Entities are enable
- through an Internal DTD Subset.
-
- $Id: xhtml-charent-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
-</xs:schema> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-copyright-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-copyright-1.xsd
deleted file mode 100644
index 110e08843..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-copyright-1.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:annotation>
- <xs:documentation>
- This is XHTML, a reformulation of HTML as a modular XML application
- The Extensible HyperText Markup Language (XHTML)
- Copyright &#169;1998-2002 World Wide Web Consortium
- (Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University).
- All Rights Reserved.
-
- Permission to use, copy, modify and distribute the XHTML Schema
- modules and their accompanying xs:documentation for any purpose
- and without fee is hereby granted in perpetuity, provided that the above
- copyright notice and this paragraph appear in all copies.
- The copyright holders make no representation about the suitability of
- these XML Schema modules for any purpose.
-
- They are provided "as is" without expressed or implied warranty.
- </xs:documentation>
- </xs:annotation>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-datatypes-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-datatypes-1.xsd
deleted file mode 100644
index 45bcd0528..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-datatypes-1.xsd
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- XHTML Datatypes
- This is the XML Schema datatypes module for XHTML
-
- Defines containers for the XHTML datatypes, many of
- these imported from other specifications and standards.
-
- $Id: xhtml-datatypes-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstraction.html#s_common_attrtypes"/>
- </xs:annotation>
-
- <!-- nn for pixels or nn% for percentage length -->
- <xs:simpleType name="Length">
- <xs:union memberTypes="xs:nonNegativeInteger">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:pattern value="\d+[%]|\d*\.\d+[%]"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
-
- <!-- space-separated list of link types -->
- <xs:simpleType name="LinkTypes">
- <xs:list itemType="xs:NMTOKEN"/>
- </xs:simpleType>
-
- <!-- single or comma-separated list of media descriptors -->
- <xs:simpleType name="MediaDesc">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <!-- pixel, percentage, or relative -->
- <xs:simpleType name="MultiLength">
- <xs:union memberTypes="Length">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:pattern value="\d*\*"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
-
- <!-- one or more digits (NUMBER) -->
- <xs:simpleType name="Number">
- <xs:restriction base="xs:nonNegativeInteger"/>
- </xs:simpleType>
-
- <!-- integer representing length in pixels -->
- <xs:simpleType name="Pixels">
- <xs:restriction base="xs:nonNegativeInteger"/>
- </xs:simpleType>
-
- <!-- script expression -->
- <xs:simpleType name="Script">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <!-- sixteen color names or RGB color expression-->
- <xs:simpleType name="Color">
- <xs:union memberTypes="xs:NMTOKEN">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:pattern value="#[0-9a-fA-F]{6}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
-
- <!-- textual content -->
- <xs:simpleType name="Text">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <!-- Imported Datatypes -->
- <!-- a single character, as per section 2.2 of [XML] -->
- <xs:simpleType name="Character">
- <xs:restriction base="xs:string">
- <xs:length value="1" fixed="true"/>
- </xs:restriction>
- </xs:simpleType>
-
- <!-- a character encoding, as per [RFC2045] -->
- <xs:simpleType name="Charset">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <!-- a space separated list of character encodings, as per [RFC2045] -->
- <xs:simpleType name="Charsets">
- <xs:list itemType="Charset"/>
- </xs:simpleType>
-
- <!-- media type, as per [RFC2045] -->
- <xs:simpleType name="ContentType">
- <xs:list itemType="xs:string"/>
- </xs:simpleType>
-
- <!-- comma-separated list of media types, as per [RFC2045] -->
- <xs:simpleType name="ContentTypes">
- <xs:list itemType="xs:string"/>
- </xs:simpleType>
-
- <!-- date and time information. ISO date format -->
- <xs:simpleType name="Datetime">
- <xs:restriction base="xs:dateTime"/>
- </xs:simpleType>
-
- <!-- formal public identifier, as per [ISO8879] -->
- <xs:simpleType name="FPI">
- <xs:restriction base="xs:normalizedString"/>
- </xs:simpleType>
-
- <!-- a language code, as per [RFC3066] -->
- <xs:simpleType name="LanguageCode">
- <xs:restriction base="xs:language"/>
- </xs:simpleType>
-
- <!-- a Uniform Resource Identifier, see [URI] -->
- <xs:simpleType name="URI">
- <xs:restriction base="xs:anyURI"/>
- </xs:simpleType>
-
- <!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
- <xs:simpleType name="URIs">
- <xs:list itemType="xs:anyURI"/>
- </xs:simpleType>
-
- <!-- comma-separated list of MultiLength -->
- <xs:simpleType name="MultiLengths">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <!-- character Data -->
- <xs:simpleType name="CDATA">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-framework-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-framework-1.xsd
deleted file mode 100644
index da380e57a..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-framework-1.xsd
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- XHTML Modular Framework
- This is the XML Schema Modular Framework module for XHTML
-
- This required module instantiates the necessary modules
- needed to support the XHTML modularization framework.
-
- The Schema modules instantiated are:
- + notations
- + datatypes
- + common attributes
- + character entities
-
- $Id: xhtml-framework-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="xml.xsd">
- <xs:annotation>
- <xs:documentation>
- Common Attributes
- This import brings in the attributes
- xml:lang and xml:space in the XML namespace.
- </xs:documentation>
- </xs:annotation>
- </xs:import>
-
- <xs:include schemaLocation="xhtml-notations-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Notations module
- Declares XHTML notations for Attribute data types
- </xs:documentation>
- </xs:annotation>
- </xs:include>
-
- <xs:include schemaLocation="xhtml-datatypes-1.xsd">
- <xs:annotation>
- <xs:documentation>
- This module defines XHTML Attribute DataTypes
- </xs:documentation>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstraction.html#s_common_attrtypes"/>
- </xs:annotation>
- </xs:include>
-
- <xs:include schemaLocation="xhtml-attribs-1.xsd">
- <xs:annotation>
- <xs:documentation>
- This module defines Common attributes for XHTML
- </xs:documentation>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_commonatts"/>
- </xs:annotation>
- </xs:include>
-
- <xs:include schemaLocation="xhtml-charent-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Character entities module
- Note: Entities are not supported in XML Schema
- The Schema Module uses DTDs to define Entities
-
- This module defines
- + XHTML Latin 1 Character Entities
- + XHTML Special Characters
- + XHTML Mathematical, Greek, and Symbolic Characters
- </xs:documentation>
- </xs:annotation>
- </xs:include>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-image-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-image-1.xsd
deleted file mode 100644
index 18e60bf74..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-image-1.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- Images
- This is the XML Schema Images module for XHTML
-
- * img
-
- This module provides markup to support basic image embedding.
-
- To avoid problems with text-only UAs as well as to make
- image content understandable and navigable to users of
- non-visual UAs, you need to provide a description with
- the 'alt' attribute, and avoid server-side image maps.
-
-
- $Id: xhtml-image-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_imagemodule"/>
- </xs:annotation>
-
-
- <xs:attributeGroup name="img.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="src" type="URI" use="required"/>
- <xs:attribute name="alt" type="Text" use="required"/>
- <xs:attribute name="longdesc" type="URI"/>
- <xs:attribute name="height" type="Length"/>
- <xs:attribute name="width" type="Length"/>
- </xs:attributeGroup>
-
- <xs:group name="img.content">
- <xs:sequence/>
- </xs:group>
-
- <xs:complexType name="img.type">
- <xs:group ref="img.content"/>
- <xs:attributeGroup ref="img.attlist"/>
- </xs:complexType>
-
- <xs:element name="img" type="img.type"/>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlphras-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlphras-1.xsd
deleted file mode 100644
index 439291eba..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlphras-1.xsd
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- Inline Phrasal
- This is the XML Schema Inline Phrasal module for XHTML
-
- * abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
-
- This module declares the elements and their attributes used to
- support inline-level phrasal markup.
- $Id: xhtml-inlphras-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
-
- <xs:attributeGroup name="abbr.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="abbr.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="abbr.type" mixed="true">
- <xs:group ref="abbr.content"/>
- <xs:attributeGroup ref="abbr.attlist"/>
- </xs:complexType>
-
- <xs:element name="abbr" type="abbr.type"/>
-
- <xs:attributeGroup name="acronym.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="acronym.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="acronym.type" mixed="true">
- <xs:group ref="acronym.content"/>
- <xs:attributeGroup ref="acronym.attlist"/>
- </xs:complexType>
-
- <xs:element name="acronym" type="acronym.type"/>
-
- <xs:attributeGroup name="cite.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="cite.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="cite.type" mixed="true">
- <xs:group ref="cite.content"/>
- <xs:attributeGroup ref="cite.attlist"/>
- </xs:complexType>
-
- <xs:element name="cite" type="cite.type">
- <xs:annotation>
- <xs:documentation>
- Change by SLXHTML: Changed type to "cite.type".
- (Original declaration was: &lt;xs:element name="cite" type="dfn.type"/&gt;).
- </xs:documentation>
- </xs:annotation>
- </xs:element>
-
- <xs:attributeGroup name="code.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="code.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="code.type" mixed="true">
- <xs:group ref="code.content"/>
- <xs:attributeGroup ref="code.attlist"/>
- </xs:complexType>
-
- <xs:element name="code" type="code.type">
- <xs:annotation>
- <xs:documentation>
- Change by SLXHTML: Changed type to "code.type".
- (Original declaration was: &lt;xs:element name="code" type="dfn.type"/&gt;).
- </xs:documentation>
- </xs:annotation>
- </xs:element>
-
- <xs:attributeGroup name="dfn.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="dfn.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="dfn.type" mixed="true">
- <xs:group ref="dfn.content"/>
- <xs:attributeGroup ref="dfn.attlist"/>
- </xs:complexType>
-
- <xs:element name="dfn" type="dfn.type"/>
-
- <xs:attributeGroup name="em.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="em.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="em.type" mixed="true">
- <xs:group ref="em.content"/>
- <xs:attributeGroup ref="em.attlist"/>
- </xs:complexType>
-
- <xs:element name="em" type="em.type"/>
-
-
- <xs:attributeGroup name="kbd.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="kbd.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="kbd.type" mixed="true">
- <xs:group ref="kbd.content"/>
- <xs:attributeGroup ref="kbd.attlist"/>
- </xs:complexType>
-
- <xs:element name="kbd" type="kbd.type"/>
-
-
- <xs:attributeGroup name="samp.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="samp.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="samp.type" mixed="true">
- <xs:group ref="samp.content"/>
- <xs:attributeGroup ref="samp.attlist"/>
- </xs:complexType>
-
- <xs:element name="samp" type="samp.type"/>
-
-
- <xs:attributeGroup name="strong.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="strong.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="strong.type" mixed="true">
- <xs:group ref="strong.content"/>
- <xs:attributeGroup ref="strong.attlist"/>
- </xs:complexType>
-
- <xs:element name="strong" type="strong.type"/>
-
- <xs:attributeGroup name="var.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="var.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="var.type" mixed="true">
- <xs:group ref="var.content"/>
- <xs:attributeGroup ref="var.attlist"/>
- </xs:complexType>
-
- <xs:element name="var" type="var.type"/>
-
- <xs:attributeGroup name="q.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="cite" type="URI"/>
- </xs:attributeGroup>
-
- <xs:group name="q.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="q.type" mixed="true">
- <xs:group ref="q.content"/>
- <xs:attributeGroup ref="q.attlist"/>
- </xs:complexType>
-
- <xs:element name="q" type="q.type"/>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstruct-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstruct-1.xsd
deleted file mode 100644
index 07aad4819..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstruct-1.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- Inline Structural
- This is the XML Schema Inline Structural element module for XHTML
-
- * br, span
-
- This module declares the elements and their attributes
- used to support inline-level structural markup.
-
- $Id: xhtml-inlstruct-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
- <xs:attributeGroup name="br.attlist">
- <xs:attributeGroup ref="Core.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="br.content">
- <xs:sequence/>
- </xs:group>
-
- <xs:complexType name="br.type">
- <xs:group ref="br.content"/>
- <xs:attributeGroup ref="br.attlist"/>
- </xs:complexType>
-
- <xs:element name="br" type="br.type"/>
-
- <xs:attributeGroup name="span.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="span.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="span.type" mixed="true">
- <xs:group ref="span.content"/>
- <xs:attributeGroup ref="span.attlist"/>
- </xs:complexType>
-
- <xs:element name="span" type="span.type"/>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstyle-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstyle-1.xsd
deleted file mode 100644
index d9f60ad12..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstyle-1.xsd
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- Inline Style module
- This is the XML Schema Inline Style module for XHTML
-
- * styloe attribute
-
- This module declares the 'style' attribute, used to support inline
- style markup.
-
- $Id: xhtml-inlstyle-1.xsd,v 1.2 2003/09/20 01:41:37 speruvem Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_styleattributemodule"/>
- </xs:annotation>
-
- <xs:attributeGroup name="style.attrib">
- <xs:attribute name="style" type="CDATA"/>
- </xs:attributeGroup>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-list-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-list-1.xsd
deleted file mode 100644
index 80b755f3d..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-list-1.xsd
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- List Module
- This is the XML Schema Lists module for XHTML
- List Module Elements
-
- * dl, dt, dd, ol, ul, li
-
- This module declares the list-oriented element types
- and their attributes.
- $Id: xhtml-list-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_listmodule"/>
- </xs:annotation>
-
- <xs:attributeGroup name="dt.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="dt.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="dt.type" mixed="true">
- <xs:group ref="dt.content"/>
- <xs:attributeGroup ref="dt.attlist"/>
- </xs:complexType>
-
- <xs:element name="dt" type="dt.type"/>
-
- <xs:attributeGroup name="dd.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="dd.content">
- <xs:sequence>
- <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="dd.type" mixed="true">
- <xs:group ref="dd.content"/>
- <xs:attributeGroup ref="dd.attlist"/>
- </xs:complexType>
-
- <xs:element name="dd" type="dd.type"/>
-
- <xs:attributeGroup name="dl.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="dl.content">
- <xs:sequence>
- <xs:choice maxOccurs="unbounded">
- <xs:element ref="dt"/>
- <xs:element ref="dd"/>
- </xs:choice>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="dl.type">
- <xs:group ref="dl.content"/>
- <xs:attributeGroup ref="dl.attlist"/>
- </xs:complexType>
-
- <xs:element name="dl" type="dl.type"/>
-
- <xs:attributeGroup name="li.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="li.content">
- <xs:sequence>
- <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="li.type" mixed="true">
- <xs:group ref="li.content"/>
- <xs:attributeGroup ref="li.attlist"/>
- </xs:complexType>
-
- <xs:element name="li" type="li.type"/>
-
- <xs:attributeGroup name="ol.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="ol.content">
- <xs:sequence>
- <xs:element ref="li" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="ol.type">
- <xs:group ref="ol.content"/>
- <xs:attributeGroup ref="ol.attlist"/>
- </xs:complexType>
-
- <xs:element name="ol" type="ol.type"/>
-
- <xs:attributeGroup name="ul.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="ul.content">
- <xs:sequence>
- <xs:element ref="li" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="ul.type">
- <xs:group ref="ul.content"/>
- <xs:attributeGroup ref="ul.attlist"/>
- </xs:complexType>
-
- <xs:element name="ul" type="ul.type"/>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-notations-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-notations-1.xsd
deleted file mode 100644
index 246be792b..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-notations-1.xsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- Notations module
- This is the XML Schema module for data type notations for XHTML
-
- Defines the following notations, many of these imported from
- other specifications and standards. When an existing FPI is
- known, it is incorporated here.
-
- $Id: xhtml-notations-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
- <!-- W3C XML 1.0 Recommendation -->
- <xs:notation name="w3c-xml"
- public="ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN"/>
-
- <!-- XML 1.0 CDATA -->
- <xs:notation name="cdata" public="-//W3C//NOTATION XML 1.0: CDATA//EN"/>
-
- <!-- SGML Formal Public Identifiers -->
- <xs:notation name="fpi"
- public="ISO 8879:1986//NOTATION Formal Public Identifier//EN"/>
-
- <!-- XHTML Notations ... -->
- <!-- Length defined for cellpadding/cellspacing -->
- <!-- nn for pixels or nn% for percentage length -->
- <!-- a single character, as per section 2.2 of [XML] -->
- <xs:notation name="character"
- public="-//W3C//NOTATION XHTML Datatype: Character//EN"/>
-
- <!-- a character encoding, as per [RFC2045] -->
- <xs:notation name="charset"
- public="-//W3C//NOTATION XHTML Datatype: Charset//EN"/>
-
- <!-- a space separated list of character encodings, as per [RFC2045] -->
- <xs:notation name="charsets"
- public="-//W3C//NOTATION XHTML Datatype: Charsets//EN"/>
-
- <!-- media type, as per [RFC2045] -->
- <xs:notation name="contentType"
- public="-//W3C//NOTATION XHTML Datatype: ContentType//EN"/>
-
- <!-- comma-separated list of media types, as per [RFC2045] -->
- <xs:notation name="contentTypes"
- public="-//W3C//NOTATION XHTML Datatype: ContentTypes//EN"/>
-
- <!-- date and time information. ISO date format -->
- <xs:notation name="datetime"
- public="-//W3C//NOTATION XHTML Datatype: Datetime//EN"/>
-
- <!-- a language code, as per [RFC3066] -->
- <xs:notation name="languageCode"
- public="-//W3C//NOTATION XHTML Datatype: LanguageCode//EN"/>
-
- <!-- nn for pixels or nn% for percentage length -->
- <xs:notation name="length"
- public="-//W3C//NOTATION XHTML Datatype: Length//EN"/>
-
- <!-- space-separated list of link types -->
- <xs:notation name="linkTypes"
- public="-//W3C//NOTATION XHTML Datatype: LinkTypes//EN"/>
-
- <!-- single or comma-separated list of media descriptors -->
- <xs:notation name="mediaDesc"
- public="-//W3C//NOTATION XHTML Datatype: MediaDesc//EN"/>
-
- <!-- pixel, percentage, or relative -->
- <xs:notation name="multiLength"
- public="-//W3C//NOTATION XHTML Datatype: MultiLength//EN"/>
-
- <!-- one or more digits (NUMBER) -->
- <xs:notation name="number"
- public="-//W3C//NOTATION XHTML Datatype: Number//EN"/>
-
- <!-- one or more digits (NUMBER) -->
- <xs:notation name="pixels"
- public="-//W3C//NOTATION XHTML Datatype: Pixels//EN"/>
-
- <!-- script expression -->
- <xs:notation name="script"
- public="-//W3C//NOTATION XHTML Datatype: Script//EN"/>
-
- <!-- textual content -->
- <xs:notation name="text" public="-//W3C//NOTATION XHTML Datatype: Text//EN"/>
-
- <!-- a Uniform Resource Identifier, see [URI] -->
- <xs:notation name="uri" public="-//W3C//NOTATION XHTML Datatype: URI//EN"/>
-
- <!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
- <xs:notation name="uris" public="-//W3C//NOTATION XHTML Datatype: URIs//EN"/>
-
-</xs:schema> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-struct-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-struct-1.xsd
deleted file mode 100644
index 3a4bf3473..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-struct-1.xsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" >
-
- <xs:annotation>
- <xs:documentation>
- This is the XML Schema Document Structure module for XHTML
- Document Structure
-
- * title, head, body, html
-
- The Structure Module defines the major structural elements and
- their attributes.
-
- $Id: xhtml-struct-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_structuremodule"/>
- </xs:annotation>
-
- <xs:attributeGroup name="title.attlist">
- <xs:attributeGroup ref="I18n.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="title.content">
- <xs:sequence/>
- </xs:group>
-
- <xs:complexType name="title.type" mixed="true">
- <xs:group ref="title.content"/>
- <xs:attributeGroup ref="title.attlist"/>
- </xs:complexType>
-
-
- <xs:element name="title" type="title.type"/>
-
- <xs:group name="head.content">
- <xs:sequence>
- <xs:group ref="HeadOpts.mix" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="title"/>
- <xs:group ref="HeadOpts.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:attributeGroup name="profile.attrib">
- <xs:attribute name="profile" type="URI"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="head.attlist">
- <xs:attributeGroup ref="profile.attrib"/>
- <xs:attributeGroup ref="I18n.attrib"/>
- </xs:attributeGroup>
-
- <xs:complexType name="head.type">
- <xs:group ref="head.content"/>
- <xs:attributeGroup ref="head.attlist"/>
- </xs:complexType>
-
- <xs:element name="head" type="head.type"/>
-
- <xs:attributeGroup name="body.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="body.content">
- <xs:sequence>
- <xs:group ref="Block.mix" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="body.type">
- <xs:group ref="body.content"/>
- <xs:attributeGroup ref="body.attlist"/>
- </xs:complexType>
-
- <xs:element name="body" type="body.type"/>
-
- <xs:attributeGroup name="version.attrib">
- <xs:attribute name="version" type="FPI"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="html.attlist">
- <xs:attributeGroup ref="version.attrib"/>
- <xs:attributeGroup ref="I18n.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="html.content">
- <xs:sequence>
- <xs:element ref="head"/>
- <xs:element ref="body"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="html.type">
- <xs:group ref="html.content"/>
- <xs:attributeGroup ref="html.attlist"/>
- </xs:complexType>
-
- <xs:element name="html" type="html.type"/>
-
-</xs:schema> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-style-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-style-1.xsd
deleted file mode 100644
index 6feb7c48d..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-style-1.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- This is the XML Schema Stylesheets module for XHTML
- $Id: xhtml-style-1.xsd,v 1.1 2003/10/17 14:11:19 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>
- Stylesheets
-
- * style
-
- This module declares the style element type and its attributes,
- used to embed stylesheet information in the document head element.
- </xs:documentation>
- <xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_stylemodule"/>
- </xs:annotation>
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="xml.xsd"/>
-
- <xs:attributeGroup name="style.attlist">
- <xs:annotation>
- <xs:documentation>
- Change by SLXHTML: Removed attribute "fixed" form attribute declaration for "xml:space",
- because this is is a buggy declaration in the original XHTML declaration: The attribute
- fixed is not allowed since the original specification of the "xml:space" attribute has
- the default attribute set.
- (Original declaration was: &lt;xs:attribute ref="xml:space" fixed="preserve"/&gt;).
- </xs:documentation>
- </xs:annotation>
- <xs:attributeGroup ref="title"/>
- <xs:attributeGroup ref="I18n.attrib"/>
- <xs:attribute name="type" type="ContentType" use="required"/>
- <xs:attribute name="media" type="MediaDesc"/>
- <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
- <xs:group name="style.content">
- <xs:sequence/>
- </xs:group>
- <xs:complexType name="style.type" mixed="true">
- <xs:group ref="style.content"/>
- <xs:attributeGroup ref="style.attlist"/>
- </xs:complexType>
- <xs:element name="style" type="style.type"/>
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-table-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-table-1.xsd
deleted file mode 100644
index 35e0e2403..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-table-1.xsd
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:annotation>
- <xs:documentation>
- This is the XML Schema Tables module for XHTML
- $Id: xhtml-table-1.xsd,v 1.1 2003/10/17 14:11:20 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- </xs:annotation>
- <xs:annotation>
- <xs:documentation>
- Tables
-
- * table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
-
- This module declares element types and attributes used to provide
- table markup similar to HTML 4.0, including features that enable
- better accessibility for non-visual user agents.
- </xs:documentation>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_tablemodule"/>
- </xs:annotation>
-
- <xs:attributeGroup name="frame.attrib">
- <xs:attribute name="frame">
- <xs:simpleType>
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="void"/>
- <xs:enumeration value="above"/>
- <xs:enumeration value="below"/>
- <xs:enumeration value="hsides"/>
- <xs:enumeration value="lhs"/>
- <xs:enumeration value="rhs"/>
- <xs:enumeration value="vsides"/>
- <xs:enumeration value="box"/>
- <xs:enumeration value="border"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="rules.attrib">
- <xs:attribute name="rules">
- <xs:simpleType>
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="none"/>
- <xs:enumeration value="groups"/>
- <xs:enumeration value="rows"/>
- <xs:enumeration value="cols"/>
- <xs:enumeration value="all"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="CellVAlign.attrib">
- <xs:attribute name="valign">
- <xs:simpleType>
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="top"/>
- <xs:enumeration value="middle"/>
- <xs:enumeration value="bottom"/>
- <xs:enumeration value="baseline"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="CellHAlign.attrib">
- <xs:attribute name="align">
- <xs:simpleType>
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="left"/>
- <xs:enumeration value="center"/>
- <xs:enumeration value="right"/>
- <xs:enumeration value="justify"/>
- <xs:enumeration value="char"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="char" type="Character"/>
- <xs:attribute name="charoff" type="Length"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="scope.attrib">
- <xs:attribute name="scope">
- <xs:simpleType>
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="row"/>
- <xs:enumeration value="col"/>
- <xs:enumeration value="rowgroup"/>
- <xs:enumeration value="colgroup"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="td.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="abbr" type="Text"/>
- <xs:attribute name="axis" type="CDATA"/>
- <xs:attribute name="headers" type="xs:IDREFS"/>
- <xs:attributeGroup ref="scope.attrib"/>
- <xs:attribute name="rowspan" type="Number" default="1"/>
- <xs:attribute name="colspan" type="Number" default="1"/>
- <xs:attributeGroup ref="CellHAlign.attrib"/>
- <xs:attributeGroup ref="CellVAlign.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="td.content">
- <xs:sequence>
- <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="td.type" mixed="true">
- <xs:group ref="td.content"/>
- <xs:attributeGroup ref="td.attlist"/>
- </xs:complexType>
-
- <xs:element name="td" type="td.type"/>
-
- <xs:attributeGroup name="th.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="abbr" type="Text"/>
- <xs:attribute name="axis" type="CDATA"/>
- <xs:attribute name="headers" type="xs:IDREFS"/>
- <xs:attributeGroup ref="scope.attrib"/>
- <xs:attribute name="rowspan" type="Number" default="1"/>
- <xs:attribute name="colspan" type="Number" default="1"/>
- <xs:attributeGroup ref="CellHAlign.attrib"/>
- <xs:attributeGroup ref="CellVAlign.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="th.content">
- <xs:sequence>
- <xs:group ref="Flow.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="th.type" mixed="true">
- <xs:group ref="th.content"/>
- <xs:attributeGroup ref="th.attlist"/>
- </xs:complexType>
-
- <xs:element name="th" type="th.type"/>
-
- <xs:attributeGroup name="tr.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attributeGroup ref="CellHAlign.attrib"/>
- <xs:attributeGroup ref="CellVAlign.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="tr.content">
- <xs:sequence>
- <xs:choice maxOccurs="unbounded">
- <xs:element ref="th"/>
- <xs:element ref="td"/>
- </xs:choice>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="tr.type">
- <xs:group ref="tr.content"/>
- <xs:attributeGroup ref="tr.attlist"/>
- </xs:complexType>
-
- <xs:element name="tr" type="tr.type"/>
-
- <xs:attributeGroup name="col.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="span" type="Number" default="1"/>
- <xs:attribute name="width" type="MultiLength"/>
- <xs:attributeGroup ref="CellHAlign.attrib"/>
- <xs:attributeGroup ref="CellVAlign.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="col.content">
- <xs:sequence/>
- </xs:group>
-
- <xs:complexType name="col.type">
- <xs:group ref="col.content"/>
- <xs:attributeGroup ref="col.attlist"/>
- </xs:complexType>
-
- <xs:element name="col" type="col.type"/>
-
- <xs:attributeGroup name="colgroup.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="span" type="Number" default="1"/>
- <xs:attribute name="width" type="MultiLength"/>
- <xs:attributeGroup ref="CellHAlign.attrib"/>
- <xs:attributeGroup ref="CellVAlign.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="colgroup.content">
- <xs:sequence>
- <xs:element ref="col" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
- <xs:complexType name="colgroup.type">
- <xs:group ref="colgroup.content"/>
- <xs:attributeGroup ref="colgroup.attlist"/>
- </xs:complexType>
-
- <xs:element name="colgroup" type="colgroup.type"/>
-
- <xs:attributeGroup name="tbody.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attributeGroup ref="CellHAlign.attrib"/>
- <xs:attributeGroup ref="CellVAlign.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="tbody.content">
- <xs:sequence>
- <xs:element ref="tr" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="tbody.type">
- <xs:group ref="tbody.content"/>
- <xs:attributeGroup ref="tbody.attlist"/>
- </xs:complexType>
-
- <xs:element name="tbody" type="tbody.type"/>
-
- <xs:attributeGroup name="tfoot.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attributeGroup ref="CellHAlign.attrib"/>
- <xs:attributeGroup ref="CellVAlign.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="tfoot.content">
- <xs:sequence>
- <xs:element ref="tr" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="tfoot.type">
- <xs:group ref="tfoot.content"/>
- <xs:attributeGroup ref="tfoot.attlist"/>
- </xs:complexType>
-
- <xs:element name="tfoot" type="tfoot.type"/>
-
- <xs:attributeGroup name="thead.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attributeGroup ref="CellHAlign.attrib"/>
- <xs:attributeGroup ref="CellVAlign.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="thead.content">
- <xs:sequence>
- <xs:element ref="tr" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="thead.type">
- <xs:group ref="thead.content"/>
- <xs:attributeGroup ref="thead.attlist"/>
- </xs:complexType>
-
- <xs:element name="thead" type="thead.type"/>
-
- <xs:attributeGroup name="caption.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- </xs:attributeGroup>
-
- <xs:group name="caption.content">
- <xs:sequence>
- <xs:group ref="Inline.mix" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="caption.type" mixed="true">
- <xs:group ref="caption.content"/>
- <xs:attributeGroup ref="caption.attlist"/>
- </xs:complexType>
-
- <xs:element name="caption" type="caption.type"/>
-
- <xs:attributeGroup name="table.attlist">
- <xs:attributeGroup ref="Common.attrib"/>
- <xs:attribute name="summary" type="Text"/>
- <xs:attribute name="width" type="Length"/>
- <xs:attribute name="border" type="Pixels"/>
- <xs:attributeGroup ref="frame.attrib"/>
- <xs:attributeGroup ref="rules.attrib"/>
- <xs:attribute name="cellspacing" type="Length"/>
- <xs:attribute name="cellpadding" type="Length"/>
- </xs:attributeGroup>
-
- <xs:group name="table.content">
- <xs:sequence>
- <xs:element ref="caption" minOccurs="0"/>
- <xs:choice>
- <xs:element ref="col" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="colgroup" minOccurs="0" maxOccurs="unbounded"/>
- </xs:choice>
- <xs:choice>
- <xs:sequence>
- <xs:element ref="thead" minOccurs="0"/>
- <xs:element ref="tfoot" minOccurs="0"/>
- <xs:element ref="tbody" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:choice>
- <xs:element ref="tr" maxOccurs="unbounded"/>
- </xs:choice>
- </xs:choice>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="table.type">
- <xs:group ref="table.content"/>
- <xs:attributeGroup ref="table.attlist"/>
- </xs:complexType>
-
- <xs:element name="table" type="table.type"/>
-
-</xs:schema> \ No newline at end of file
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-text-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-text-1.xsd
deleted file mode 100644
index 71a08e772..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-text-1.xsd
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.w3.org/1999/xhtml"
- xmlns="http://www.w3.org/1999/xhtml">
-
- <xs:annotation>
- <xs:documentation>
- Textual Content
- This is the XML Schema Text module for XHTML
-
- The Text module includes declarations for all core
- text container elements and their attributes.
-
- + block phrasal
- + block structural
- + inline phrasal
- + inline structural
-
- $Id: xhtml-text-1.xsd,v 1.1 2003/10/17 14:11:20 karlinger Exp $
- </xs:documentation>
- <xs:documentation source="xhtml-copyright-1.xsd"/>
- <xs:documentation
- source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_textmodule"/>
- </xs:annotation>
-
- <xs:include schemaLocation="xhtml-blkphras-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Block Phrasal module
- Elements defined here:
-
- * address, blockquote, pre, h1, h2, h3, h4, h5, h6
- </xs:documentation>
- </xs:annotation>
- </xs:include>
-
- <xs:include schemaLocation="xhtml-blkstruct-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Block Structural module
- Elements defined here:
-
- * div, p
- </xs:documentation>
- </xs:annotation>
- </xs:include>
-
- <xs:include schemaLocation="xhtml-inlphras-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Inline Phrasal module
- Elements defined here:
-
- * abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
- </xs:documentation>
- </xs:annotation>
- </xs:include>
-
- <xs:include schemaLocation="xhtml-inlstruct-1.xsd">
- <xs:annotation>
- <xs:documentation>
- Inline Structural module
- Elements defined here:
-
- * br,span
- </xs:documentation>
- </xs:annotation>
- </xs:include>
-
-</xs:schema>
diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xml.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xml.xsd
deleted file mode 100644
index abe08ec25..000000000
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xml.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version='1.0'?>
-<!--<!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/spss.slinterface/res/resources/schemas/xml.xsd b/spss.slinterface/res/resources/schemas/xml.xsd
deleted file mode 100644
index ff784eb98..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 801b01416..000000000
--- a/spss.slinterface/res/resources/schemas/xmldsig-core-schema.xsd
+++ /dev/null
@@ -1,322 +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"/>
- Changed GK 20040621: Avoid parsing errors when parsing html/stylesheet markup -->
- <any namespace="##other" processContents="skip"/>
-
- <!-- (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/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/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/test/simpleVerReq.moa.xml b/spss.slinterface/res/resources/test/simpleVerReq.moa.xml
deleted file mode 100644
index de6f34ed2..000000000
--- a/spss.slinterface/res/resources/test/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/test/simpleVerReq.sl11.xml b/spss.slinterface/res/resources/test/simpleVerReq.sl11.xml
deleted file mode 100644
index 78180c2c3..000000000
--- a/spss.slinterface/res/resources/test/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/test/simpleVerReq.sl12.locref.moa.xml b/spss.slinterface/res/resources/test/simpleVerReq.sl12.locref.moa.xml
deleted file mode 100644
index 65e4f5de2..000000000
--- a/spss.slinterface/res/resources/test/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/test/simpleVerReq.sl12.locref.xml b/spss.slinterface/res/resources/test/simpleVerReq.sl12.locref.xml
deleted file mode 100644
index 25194465d..000000000
--- a/spss.slinterface/res/resources/test/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/test/simpleVerReq.xml b/spss.slinterface/res/resources/test/simpleVerReq.xml
deleted file mode 100644
index 78180c2c3..000000000
--- a/spss.slinterface/res/resources/test/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/test/test.xml b/spss.slinterface/res/resources/test/test.xml
deleted file mode 100644
index a2f6a0740..000000000
--- a/spss.slinterface/res/resources/test/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/test.xsl b/spss.slinterface/res/resources/test/test.xsl
deleted file mode 100644
index 6bb618072..000000000
--- a/spss.slinterface/res/resources/test/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/res/resources/test/verifyresponse.moa.sl.xml b/spss.slinterface/res/resources/test/verifyresponse.moa.sl.xml
deleted file mode 100644
index 8033f8dae..000000000
--- a/spss.slinterface/res/resources/test/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/test/verifyresponse.moa.xml b/spss.slinterface/res/resources/test/verifyresponse.moa.xml
deleted file mode 100644
index d591997ed..000000000
--- a/spss.slinterface/res/resources/test/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/src/at/gv/egovernment/moa/spss/slinterface/Constants.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/Constants.java
deleted file mode 100644
index 419f1fb9b..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/Constants.java
+++ /dev/null
@@ -1,90 +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
-
- // TODO Revisit if constants can be removed
- // 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_SLXHTML_SCHEMA_ = "location.schema.slxhtml";
- public static final String IP_TEMP_DIR_ = "location.tempdir";
- public static final String IP_SP_ENDPOINT_ = "service.sp.endpoint";
- public static final String IP_SP_TRUSTPROFILEID_ = "service.sp.trustProfileId";
- public static final String IP_RES_SHOWETSI_ = "result.showetsi";
- public static final String IP_RES_SHOWSLMAN_ = "result.showslmanifest";
-
- public static final String IP_REW_ = "rewrite";
- public static final String IP_REW_PROXYURL_ = "rewrite.proxyURL";
- public static final String IP_REW_PROXYURL_HOSTDUMMY_ = "rewrite.proxyURL.proxyhostDummy";
- public static final String IP_REW_DNS_LOOKUP_PREFIX_ = "rewrite.dn.";
- public static final String IP_REW_DNS_LOOKUP_DEFAULT_ = "rewrite.dn.default";
- public static final String IP_REW_MOASL_URLPARAMNAME_ = "rewrite.MOASLUrlParamName";
- public static final String IP_REW_MOASL_WEBAPPSERV_URL_ = "rewrite.MOASLWebAppServUrl";
-
- // Logging hierarchies
-
- public static final String LH_BASE_ = "slinterface";
- public static final String LH_LISTENERS_ = LH_BASE_ + ".listeners";
- public static final String LH_LISTENERS_XMLPARSER_ = LH_LISTENERS_ + ".xmlparser";
- public static final String LH_FILTERS_ = LH_BASE_ + ".filters";
- public static final String LH_SERVLETS_ = LH_BASE_ + ".servlets";
- public static final String LH_BEANS_ = LH_BASE_ + ".beans";
- 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_INITPROPS_BEAN_ = "initPropertiesBean";
- // TODO Revisit if constants can be removed
- // public static final String WSCP_SL2MOA_TRANSFORMER_ = "sl2MoaTransformer";
- // public static final String WSCP_MOA2SL_TRANSFORMER_ = "moa2SlTransformer";
- public static final String WSCP_XMLPARSER_ = "xmlParser";
- public static final String WSCP_URL_REWRITER_ = "urlRewriter";
-
- // 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#";
- // TODO Change Namespace to final SL 1.2
- 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";
- public static final String NSURI_DSIG_ = "http://www.w3.org/2000/09/xmldsig#";
- public static final String NSURI_XHTML_ = "http://www.w3.org/1999/xhtml";
-
- // 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";
- public static final String NSPRE_DSIG_ = "dsig";
- public static final String NSPRE_XHTML_ = "xhtml";
-
- // MOA invoker constants
-
- public static final String MI_SP_QNAME_ = "SignatureVerification";
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/DOMUtils.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/DOMUtils.java
deleted file mode 100644
index 814d7832e..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/DOMUtils.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Created on 28.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.parsers.DOMParser;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import at.gv.egovernment.moa.spss.slinterface.listeners.XMLParserErrorHandler;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class DOMUtils
-{
- private static final String SAX_NAMESPACES_FEATURE = "http://xml.org/sax/features/namespaces";
- 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";
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Gets the first text node of the specified element.
- *
- * @param elem The element.
- *
- * @return the first text node of the specified element, or <code>null</code> if <code>element</code>
- * equals <code>null</code>, or if the element has no text node.
- */
- public static String getText(Element elem)
- {
- if (elem == null) return null;
- NodeList childNodes = elem.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++)
- {
- Node currNode = childNodes.item(i);
- if (currNode.getNodeType() == Node.TEXT_NODE) return currNode.getNodeValue();
- }
- return null;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Gets the first text node of the specified child element from the specified parent element.
- *
- * @param parent The parent.
- *
- * @param childNS The namespace of the child element.
- *
- * @param childLocName The local name of the child element.
- *
- * @return the first text node of the specified child, or <code>null</code> if <code>parent</code> equals
- * <code>null</code> or has no child element with the specified namespace and local name, or if
- * the child element has no text node.
- */
- public static String getChildText(Element parent, String childNS, String childLocName)
- {
- if (parent == null) return null;
- Element child = getChildElem(parent, childNS, childLocName);
- if (child == null) return null;
- return getText(child);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Gets the first child element of the specified parent with the specified namspace and local name.
- *
- * @param parent The parent.
- *
- * @param childNS The namespace of the child element to be searched for.
- *
- * @param childLocName The local name of the child element to be searched for.
- *
- * @return the first child element as described above, or <code>null</code> if <code>parent</code> is
- * null or has no child elements with for the specified namespace and local name.
- */
- public static Element getChildElem(Element parent, String childNS, String childLocName)
- {
- List childElems = getChildElems(parent, childNS, childLocName, true);
- return (childElems == null) ? null : (Element) childElems.get(0);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Gets all or the first child element(s) of the specified parent with the specified namspace and local
- * name.
- *
- * @param parent The parent.
- *
- * @param childNS The namespace of the child elements to be searched for.
- *
- * @param childLocName The local name of the child elements to be searched for.
- *
- * @param firstOnly Specifies wheter only the first or all child elements with the specified namespace and
- * local name should be returned.
- *
- * @return a <code>java.util.List</code> with objects of type <code>org.w3c.dom.Element</code>; each
- * element in the list represents a child element as specified above. If <code>parent</code>
- * equals <code>null</code>, or if there are no child elements as specified above, <code>null
- * </code> will be returned.
- */
- public static List getChildElems(Element parent, String childNS, String childLocName, boolean firstOnly)
- {
- if (parent == null) return null;
-
- ArrayList childElems = new ArrayList();
- NodeList childNodes = parent.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++)
- {
- Node currNode = childNodes.item(i);
- if (currNode.getNodeType() == Node.ELEMENT_NODE)
- {
- Element currElem = (Element) currNode;
- if (childNS.equals(currElem.getNamespaceURI()) && childLocName.equals(currElem.getLocalName()))
- {
- childElems.add(currElem);
- if (firstOnly) break;
- }
- }
- }
- return (childElems.size() == 0) ? null : childElems;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public static Document parseWellFormed(InputStream is) throws Exception
- {
- DOMParser xmlParser = new DOMParser();
- try
- {
- xmlParser.setFeature(SAX_NAMESPACES_FEATURE, true);
- xmlParser.setFeature(XERCES_CREATE_ENTITY_REF_NODES_FEATURE, false);
- xmlParser.setFeature(XERCES_DEFER_NODE_EXPANSION_, false);
- xmlParser.setErrorHandler(new XMLParserErrorHandler(false, true, true));
-
- }
- catch (SAXException e)
- {
- String message = "Initialization of XML parser failed.";
- throw new Exception(message, e);
- }
- try
- {
- xmlParser.parse(new InputSource(is));
- return xmlParser.getDocument();
- }
- catch (Exception e)
- {
- String message = "Wellformed parsing failed.";
- throw new Exception(message, e);
- }
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/URLRewriter.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/URLRewriter.java
deleted file mode 100644
index 683851ff9..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/URLRewriter.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Created on 15.12.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Properties;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class URLRewriter
-{
- private static Logger logger_ = Logger.getLogger(Constants.LH_LISTENERS_);
-
- Properties initProps_;
-
- /**
- * Flag indicating whether rewriting should take place or not.
- */
- boolean doRewrite_;
-
- /**
- * Class that manges the rewriting of URLs for the result pages. Necessary as workaround for the deploy-
- * ment in the Federal Chancellory.
- */
- public URLRewriter(Properties initProps)
- {
- initProps_ = initProps;
- doRewrite_ = Boolean.valueOf(initProps_.getProperty(Constants.IP_REW_)).booleanValue();
- }
-
- /**
- * Rewrites the specified URL.
- *
- * @param url A URL relative to the root of the web application server containing MOA SL.
- *
- * @param session The session which will be considered in the rewritten URL.
- *
- * @return A URL fitting for the proxy component running at the Federal Chancellory.
- */
- public String rewrite(String url, HttpSession session)
- {
- if (doRewrite_)
- {
- // Get remote IP address and resolve to remote to remote domain name
- String remoteAddr = (String)session.getAttribute("remoteAddr");
- String remoteName = null;
- if (remoteAddr != null)
- {
- remoteName = initProps_.getProperty(Constants.IP_REW_DNS_LOOKUP_PREFIX_ + remoteAddr);
- logger_.debug("Remote address lookup succeeded for IP " + remoteAddr + ", using " + remoteName);
- }
- if (remoteName == null)
- {
- remoteName = initProps_.getProperty(Constants.IP_REW_DNS_LOOKUP_DEFAULT_);
- logger_.debug("Remote address lookup failed for IP " + remoteAddr + ", using default: " + remoteName);
- }
-
- // Get proxy URL and replace proxy URL hostname placeholder with remote domain name
- String proxyURLStr = initProps_.getProperty(Constants.IP_REW_PROXYURL_);
- int pHStartIndex = proxyURLStr.indexOf(initProps_.getProperty(Constants.IP_REW_PROXYURL_HOSTDUMMY_));
- proxyURLStr = proxyURLStr.substring(0, pHStartIndex)
- + remoteName
- + proxyURLStr.substring(pHStartIndex
- + initProps_.getProperty(Constants.IP_REW_PROXYURL_HOSTDUMMY_).length());
-
- String slInterfaceURLParamName = initProps_.getProperty(Constants.IP_REW_MOASL_URLPARAMNAME_);
- String slInterfaceWebAppServURLStr = initProps_.getProperty(Constants.IP_REW_MOASL_WEBAPPSERV_URL_);
-
- if (proxyURLStr == null ||
- slInterfaceURLParamName == null ||
- slInterfaceWebAppServURLStr == null ||
- "".equals(proxyURLStr.trim()) ||
- "".equals(slInterfaceURLParamName.trim()) ||
- "".equals(slInterfaceWebAppServURLStr.trim()))
- {
- logger_.warn("Some params for URL rewriting are not available; rewriting disabled:" +
- " proxyURL: \"" + proxyURLStr + "\"," +
- " slInterfaceURLParamName: \"" + slInterfaceURLParamName + "\"," +
- " slInterfaceWebAppServURLStr: \"" + slInterfaceWebAppServURLStr + "\"");
- return url;
- }
-
- URL slInterfaceURL = null;
- try
- {
- slInterfaceURL = new URL(slInterfaceWebAppServURLStr + url);
- }
- catch (MalformedURLException e)
- {
- logger_.warn("Parameter \"slInterfaceURL\" is not a valid URL: \"" + slInterfaceWebAppServURLStr + url + "\"");
- return url;
- }
- URL proxyURL = null;
- try
- {
- proxyURL = new URL(proxyURLStr);
- }
- catch (MalformedURLException e)
- {
- logger_.warn("Parameter \"proxyURL\" is not a valid URL: \"" + proxyURLStr + "\"");
- return url;
- }
-
- String sessionId = session.getId();
- String sessionIdParam = (sessionId != null) ? (";" + "jsessionid=" + sessionId) : "";
- String returnValue =
- proxyURL.getProtocol() +
- "://" +
- proxyURL.getHost() +
- ((proxyURL.getPort() != -1) ? (":" + proxyURL.getPort()) : "") +
- proxyURL.getPath() +
- ((proxyURL.getQuery() != null) ? "?" + proxyURL.getQuery() + "&" : "?") +
- slInterfaceURLParamName + "=" +
- slInterfaceURL.getProtocol() +
- "://" +
- slInterfaceURL.getHost() +
- ((slInterfaceURL.getPort() != -1) ? (":" + slInterfaceURL.getPort()) : "") +
- slInterfaceURL.getPath() +
- sessionIdParam +
- ((slInterfaceURL.getQuery() != null) ? "?" + escapeQueryPart(slInterfaceURL.getQuery()) : "");
-
- logger_.debug("Rewritten URL: " + returnValue);
- return returnValue;
- }
- else
- {
- logger_.debug("URL rewriting disabled via configuration. URL \"" + url + "\" remains unchanged.");
- return url;
- }
- }
-
- private String escapeQueryPart(String query)
- {
- StringBuffer querySB = new StringBuffer();
- for (int i = 0; i < query.length(); i++)
- {
- if (query.charAt(i) == '&')
- {
- querySB.append("%26");
- }
- else
- {
- querySB.append(query.charAt(i));
- }
- }
- return querySB.toString();
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/Utils.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/Utils.java
deleted file mode 100644
index 50ae5dc03..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/Utils.java
+++ /dev/null
@@ -1,51 +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;
-import java.io.OutputStream;
-
-/**
- * @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();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public static void transferStreams(InputStream in, OutputStream out) throws IOException
- {
- byte[] currentBytes = new byte[500];
- int bytesRead;
- do
- {
- bytesRead = in.read(currentBytes);
- if (bytesRead > 0)
- {
- out.write(currentBytes, 0, bytesRead);
- }
- }
- while (bytesRead != -1);
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/XPathUtils.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/XPathUtils.java
deleted file mode 100644
index 16e4938ed..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/XPathUtils.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Created on 02.12.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface;
-
-import java.util.HashMap;
-import java.util.StringTokenizer;
-
-import org.apache.xml.utils.PrefixResolverDefault;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class XPathUtils
-{
- /**
- * The XPath context for the XPath engine.
- */
- protected XPathContext xPathContext_;
-
- /**
- * The prefix resolver for the XPath engine.
- */
- protected PrefixResolver prefixResolver_;
-
- /**
- * The XPath engine.
- */
- protected XPath xPath_;
-
- /* ==================================================================================================== */
-
- public void setupContext(String xPathExpr, Node namespaceNode, String additionalNSPrefixes)
- throws Exception
- {
-
- try
- {
- // Set up a new evaluation context
- xPathContext_ = new XPathContext();
-
- // Set up the namespace prefix resolver for the XPath engine
- prefixResolver_ = new PrefixResolver(namespaceNode, additionalNSPrefixes);
-
- // Initialize XPath engine
- xPath_ = new XPath(xPathExpr, null, prefixResolver_, XPath.SELECT, null);
- }
- catch (Exception e)
- {
- throw new Exception("Setting up XPath evaluation context failed.", e);
- }
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public NodeList selectNodeSet(Node contextNode) throws Exception
- {
- XObject xObject;
- try
- {
- xObject = xPath_.execute(xPathContext_, contextNode, prefixResolver_);
- return xObject.nodelist();
- }
- catch (Exception e)
- {
- throw new Exception("Executing XPath expression failed.", e);
- }
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public boolean selectBoolean(Node contextNode) throws Exception
- {
- XObject xObject;
- try
- {
- xObject = xPath_.execute(xPathContext_, contextNode, prefixResolver_);
- return xObject.bool();
- }
- catch (Exception e)
- {
- throw new Exception("Executing XPath expression failed.", e);
- }
- }
-
- /* ==================================================================================================== */
-
- /**
- * Special extension of the {@link org.apache.xml.utils.PrefixResolverDefault} interface. Used to
- * configure the Apache Xalan XPath engine which is employed as the backbone of this class.
- */
- protected class PrefixResolver extends PrefixResolverDefault
- {
-
- /**
- * Contains the additionally specified namespace prefix (key) to namespace URI (value) attributions.
- */
- protected HashMap additionalNSPrefixesMap_;
-
- /* ================================================================================================== */
-
- /**
- * Basic constructor.
- *
- * @param xpathExpressionContext The namespace declarations in scope for this node will be used to get
- * the namespace uri for a prefix specified in the XPath expression.
- *
- * @param additionalNSPrefixes Allows the specification of additional prefix to uri attributions apart
- * from the declarations in scope for the parameter <code>
- * xpathExpressionContext</code>. May be <code>null</code>.
- */
- public PrefixResolver(Node xpathExpressionContext, String additionalNSPrefixes) throws Exception
- {
- super(xpathExpressionContext);
- additionalNSPrefixesMap_ = new HashMap();
-
- // Register the specified additional namespace prefix to namespace uri attributions
- if (additionalNSPrefixes != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(additionalNSPrefixes, " ");
- while (tokenizer.hasMoreTokens())
- {
- String prefix = tokenizer.nextToken();
- if (!tokenizer.hasMoreTokens())
- {
-
- // There must be an even number of tokens in the string
- throw new Exception("Parameter \"additionalNSPrefixes\" must have an even number of tokens.");
- }
- String uri = tokenizer.nextToken();
- additionalNSPrefixesMap_.put(prefix, uri);
- }
- }
- }
-
- /* -------------------------------------------------------------------------------------------------- */
-
- /**
- * Gets the namespace uri for the specified namespace prefix. The additionally specified prefixes
- * overrule the prefixes found in the specified namespace node.
- *
- * @param prefix The namespace prefix for which a namespace uri should be found.
- *
- * @return the namespace uri for the specified namespace prefix.
- */
- public String getNamespaceForPrefix(String prefix)
- {
- String additionalURI = (String) additionalNSPrefixesMap_.get(prefix);
- return (additionalURI != null)
- ? additionalURI
- : super.getNamespaceForPrefix(prefix);
- }
- }
-}
-
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/ChecksInfoBean.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/ChecksInfoBean.java
deleted file mode 100644
index 00c9fd517..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/ChecksInfoBean.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Created on 27.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.beans;
-
-import java.util.List;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-import at.gv.egovernment.moa.spss.slinterface.DOMUtils;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class ChecksInfoBean
-{
- private static final String SIG_CHECK_ELEM_ = "SignatureCheck";
- private static final String SIGMF_CHECK_ELEM_ = "SignatureManifestCheck";
- private static final String XMLDSIGMF_CHECK_ELEM_ = "XMLDSIGManifestCheck";
- private static final String CERT_CHECK_ELEM_ = "CertificateCheck";
- private static final String CODE_ELEM_ = "Code";
- private static final String INFO_ELEM_ = "Info";
- private static final String FAILEDREF_ELEM_ = "FailedReference";
- private static final String REFSIGREF_ELEM_ = "ReferringSigReference";
-
- private Element sigCheckElem_;
- private int sigCheckFaildRefCount_;
-
- private Element sigMFCheckElem_;
- private int sigMFCheckFaildRefCount_;
-
- private List xmldsigMFCheckElems_;
- private int xmldsigMFCheckCount_;
- private int xmldsigMFCheckFaildRefCount_;
-
- private Element certCheckElem_;
-
- /**
- * Creates a bean with information about the checks executed for the verified xml signature.
- *
- * @pre slResponseDoc has been validated.
- */
- public ChecksInfoBean(Document slResponseDoc)
- {
- Element verifyXMLResponseElem = slResponseDoc.getDocumentElement();
- sigCheckElem_ = DOMUtils.getChildElem(
- verifyXMLResponseElem, Constants.NSURI_SL_11_, SIG_CHECK_ELEM_);
- sigMFCheckElem_ = DOMUtils.getChildElem(
- verifyXMLResponseElem, Constants.NSURI_SL_11_, SIGMF_CHECK_ELEM_);
- xmldsigMFCheckElems_ = DOMUtils.getChildElems(
- verifyXMLResponseElem, Constants.NSURI_SL_11_, XMLDSIGMF_CHECK_ELEM_, false);
- certCheckElem_ = DOMUtils.getChildElem(
- verifyXMLResponseElem, Constants.NSURI_SL_11_, CERT_CHECK_ELEM_);
-
- sigCheckFaildRefCount_ = 0;
- sigMFCheckFaildRefCount_ = 0;
- xmldsigMFCheckFaildRefCount_ = 0;
- xmldsigMFCheckCount_ = 0;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getSigCheckCode()
- {
- return DOMUtils.getChildText(sigCheckElem_, Constants.NSURI_SL_11_, CODE_ELEM_);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void setSigCheckFailedRefCount(int count)
- {
- sigCheckFaildRefCount_ = count;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getSigCheckFailedRef()
- {
- Element info = DOMUtils.getChildElem(sigCheckElem_, Constants.NSURI_SL_11_, INFO_ELEM_);
- if (info == null) return null;
- List failedRefElems = DOMUtils.getChildElems(info, Constants.NSURI_SL_11_, FAILEDREF_ELEM_, false);
- if (failedRefElems == null || failedRefElems.size() <= sigCheckFaildRefCount_) return null;
- return DOMUtils.getText((Element)failedRefElems.get(sigCheckFaildRefCount_));
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getSigMFCheckCode()
- {
- return DOMUtils.getChildText(sigMFCheckElem_, Constants.NSURI_SL_11_, CODE_ELEM_);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void setSigMFCheckFailedRefCount(int count)
- {
- sigMFCheckFaildRefCount_ = count;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getSigMFCheckFailedRef()
- {
- Element info = DOMUtils.getChildElem(sigMFCheckElem_, Constants.NSURI_SL_11_, INFO_ELEM_);
- if (info == null) return null;
- List failedRefElems = DOMUtils.getChildElems(info, Constants.NSURI_SL_11_, FAILEDREF_ELEM_, false);
- if (failedRefElems == null || failedRefElems.size() <= sigMFCheckFaildRefCount_) return null;
- return DOMUtils.getText((Element)failedRefElems.get(sigMFCheckFaildRefCount_));
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void setXmldsigMFCheckCount(int count)
- {
- xmldsigMFCheckCount_ = count;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void setXmldsigMFCheckFailedRefCount(int count)
- {
- xmldsigMFCheckFaildRefCount_ = count;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getXmldsigMFCheckCode()
- {
- Element xmldsigMFCheckElem = (Element)xmldsigMFCheckElems_.get(xmldsigMFCheckCount_);
- return DOMUtils.getChildText(xmldsigMFCheckElem, Constants.NSURI_SL_11_, CODE_ELEM_);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getXmldsigMFCheckFailedRef()
- {
- Element xmldsigMFCheckElem = (Element)xmldsigMFCheckElems_.get(xmldsigMFCheckCount_);
- Element info = DOMUtils.getChildElem(xmldsigMFCheckElem, Constants.NSURI_SL_11_, INFO_ELEM_);
- if (info == null) return null;
- List failedRefElems = DOMUtils.getChildElems(info, Constants.NSURI_SL_11_, FAILEDREF_ELEM_, false);
- if (failedRefElems == null || failedRefElems.size() <= xmldsigMFCheckFaildRefCount_) return null;
- return DOMUtils.getText((Element)failedRefElems.get(xmldsigMFCheckFaildRefCount_));
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getXmldsigMFCheckReferringSigRef()
- {
- Element xmldsigMFCheckElem = (Element)xmldsigMFCheckElems_.get(xmldsigMFCheckCount_);
- Element info = DOMUtils.getChildElem(xmldsigMFCheckElem, Constants.NSURI_SL_11_, INFO_ELEM_);
- if (info == null) return null;
- return DOMUtils.getChildText(info, Constants.NSURI_SL_11_, REFSIGREF_ELEM_);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getCertCheckCode()
- {
- return DOMUtils.getChildText(certCheckElem_, Constants.NSURI_SL_10_, CODE_ELEM_);
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/DataInfoBean.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/DataInfoBean.java
deleted file mode 100644
index 570f3fb15..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/DataInfoBean.java
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
- * Created on 27.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.beans;
-
-import iaik.utils.Util;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionBindingListener;
-
-import org.apache.log4j.Logger;
-import org.apache.xerces.parsers.DOMParser;
-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;
-import org.xml.sax.InputSource;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-import at.gv.egovernment.moa.spss.slinterface.DOMUtils;
-import at.gv.egovernment.moa.spss.slinterface.URLRewriter;
-import at.gv.egovernment.moa.spss.slinterface.XPathUtils;
-import at.gv.egovernment.moa.spss.slinterface.moainvoker.MOAInvoker;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class DataInfoBean implements HttpSessionBindingListener
-{
- private static Logger logger_ = Logger.getLogger(Constants.LH_BEANS_);
-
- // MOA
- private static final String HID_ELEM_ = "HashInputData";
- private static final String B64CONT_ELEM_ = "Base64Content";
- private static final String XMLCONT_ELEM_ = "XMLContent";
- private static final String SIGLOC_ELEM_ = "VerifySignatureLocation";
-
- // XMLDSIG
- private static final String TYPE_ATTR_ = "Type";
- private static final String URI_ATTR_ = "URI";
-
- // XHTML
- private static final String SRC_ATTR_ = "src";
- private static final String HTML_ELEM_ = "html";
-
- private static final String HID_URL_PREFIX_ = "/showdata?hidCount=";
-
- private static final String XPATH_ALL_IMG_ = "//" + Constants.NSPRE_XHTML_ + ":img";
- private static final String XPATH_ALL_REF_ = "./" + Constants.NSPRE_DSIG_ + ":SignedInfo/" +
- Constants.NSPRE_DSIG_ + ":Reference";
- private static final String XPATH_SIG_ENV_CONTENT_ = "/" + Constants.NSPRE_MOA_12_ + ":VerifyXMLSignatureRequest/" +
- Constants.NSPRE_MOA_12_ + ":VerifySignatureInfo/" + Constants.NSPRE_MOA_12_ + ":VerifySignatureEnvironment/*";
-
- private static final String SLXHTML_TYPE_PREFIX_ = "http://www.buergerkarte.at/specifications/" +
- "Security-Layer/20031113?Name=SignedImage&InstanceDocRef=";
-
- private static final String ETSI_TYPE_ = "http://uri.etsi.org/01903/v1.1.1#SignedProperties";
- private static final String SLMANIFEST_TYPE_ =
- "http://www.buergerkarte.at/specifications/Securitylayer/20020225#SignatureManifest";
-
- ServletContext context_;
- String contextPath_;
- HttpSession session_;
-
- Properties initProps_;
-
- /**
- * Contains objects of type {@link HashInputDataInfo}.
- */
- List hashInputDataInfos_;
-
- int hashInputDataCount_;
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public DataInfoBean(Document moaRequestDoc, Document moaResponseDoc, String contextPath, HttpSession session,
- ServletContext context) throws Exception
- {
- context_ = context;
- contextPath_ = contextPath;
- session_ = session;
- initProps_ = (Properties) context_.getAttribute(Constants.WSCP_INIT_PROPS_);
-
- hashInputDataInfos_ = new ArrayList();
- int hashInputDataCount_ = 0;
-
- Element moaResponseElem = moaResponseDoc.getDocumentElement();
- List hidElems = DOMUtils.getChildElems(moaResponseElem, Constants.NSURI_MOA_12_, HID_ELEM_, false);
-
- String tempDir = initProps_.getProperty(Constants.IP_TEMP_DIR_);
- if (tempDir == null)
- {
- String message = "Init property \"" + Constants.IP_TEMP_DIR_ + "\" not set.";
- logger_.error(message);
- throw new IOException(message);
- }
-
- Random random = new Random();
- for (int i = 0; i < hidElems.size(); i++)
- {
- // Open file for current hash input data
- String currHidFileNameStr = tempDir + session_.getId() + "_" + System.currentTimeMillis() + "_" +
- random.nextLong();
- currHidFileNameStr = context_.getRealPath(currHidFileNameStr);
- FileOutputStream currHidFOS;
- try
- {
- currHidFOS = new FileOutputStream(currHidFileNameStr);
- }
- catch (IOException e)
- {
- String message = "Cannot open file \"" + currHidFileNameStr + "\".";
- logger_.error(message);
- throw new IOException(message);
- }
-
- // Write HID to file
- Element currHidElem = (Element) hidElems.get(i);
- Element base64ContentElem = DOMUtils.getChildElem(currHidElem, Constants.NSURI_MOA_12_, B64CONT_ELEM_);
- if (base64ContentElem != null)
- {
- // HID is base64
-
- String base64ContentText = DOMUtils.getText(base64ContentElem);
- byte[] content = Util.Base64Decode(base64ContentText.getBytes());
- try
- {
- currHidFOS.write(content);
- currHidFOS.close();
- }
- catch (IOException e)
- {
- String message = "Cannot write to file \"" + currHidFileNameStr + "\".";
- logger_.error(message);
- throw new IOException(message);
- }
- }
- else
- {
- // HID is XML
-
- // TODO treatment of XML content
- throw new RuntimeException("XML content not support yet.");
- }
-
- hashInputDataInfos_.add(new HashInputDataInfo(currHidFileNameStr));
- }
- logger_.debug("Finnished writing hash input data to files.");
-
- // Check if hids are slxhtml documents; mark them appropriately
- try
- {
- Map signedImages = getSignedImages(moaRequestDoc, hashInputDataInfos_);
- for (int i = 0; i < hashInputDataInfos_.size(); i++)
- {
- HashInputDataInfo currHid = (HashInputDataInfo) hashInputDataInfos_.get(i);
- FileInputStream currHidIS = new FileInputStream(currHid.filename_);
- checkImages(currHidIS, currHid, signedImages);
- }
- }
- catch (Exception e)
- {
- String message = "Performing SLXHTML checks failed.";
- logger_.error(message, e);
- throw new Exception(message, e);
- }
- logger_.debug("Finnished checking hash input data for slxhtml conformity.");
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void valueBound(HttpSessionBindingEvent event)
- {
- // Do nothing.
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void valueUnbound(HttpSessionBindingEvent event)
- {
- // Delete all temporary hash input data files
- for (int i = 0; i < hashInputDataInfos_.size(); i++)
- {
- String currFileStr = ((HashInputDataInfo) hashInputDataInfos_.get(i)).filename_;
- File currFile = new File(currFileStr);
- currFile.delete();
- }
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void setHashInputDataCount(int count)
- {
- hashInputDataCount_ = count;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getHashInputDataFilename()
- {
- HashInputDataInfo currHid = (HashInputDataInfo) hashInputDataInfos_.get(hashInputDataCount_);
- return (currHid == null) ? null : currHid.filename_;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getHashInputDataURL()
- {
- return (hashInputDataInfos_.size() > hashInputDataCount_)
- ? HID_URL_PREFIX_ + hashInputDataCount_
- : null;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public boolean getShowHashInputData()
- {
- HashInputDataInfo currHid = (HashInputDataInfo) hashInputDataInfos_.get(hashInputDataCount_);
- return (currHid == null) ? false : currHid.doShow_;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public boolean getIsSLXHTMLDocument()
- {
- HashInputDataInfo currHid = (HashInputDataInfo) hashInputDataInfos_.get(hashInputDataCount_);
- return (currHid == null) ? false : currHid.isSLXHTMLDocument_;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private Document parseSLXHTMLDocument(InputStream docIS)
- {
- DOMParser xmlParser = (DOMParser) context_.getAttribute(Constants.WSCP_XMLPARSER_);
- InputSource docInputSource = new InputSource(docIS);
- Document parsedDoc = null;
- try
- {
- xmlParser.parse(docInputSource);
- parsedDoc = xmlParser.getDocument();
- }
- catch (Exception e)
- {
- // Exception shows that document is not a valid SLXHTML document; return null in that case
- logger_.debug("HashInputData is not a valid SLXHTML document.", e);
- return null;
- }
-
- Element docElem = parsedDoc.getDocumentElement();
- if (docElem.getNamespaceURI() != Constants.NSURI_XHTML_ || docElem.getLocalName() != HTML_ELEM_)
- {
- return null;
- }
-
- return parsedDoc;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private void checkImages(InputStream hidIS, HashInputDataInfo hid, Map signedImages) throws Exception
- {
- // Parse hidIS
- Document slxhtmlDoc = parseSLXHTMLDocument(hidIS);
- if (slxhtmlDoc == null) return;
-
- // Get all img elements of slxhtml document
- XPathUtils xpUtils = new XPathUtils();
- String additionalNSPrefixes = Constants.NSPRE_XHTML_ + " " + Constants.NSURI_XHTML_;
- xpUtils.setupContext(XPATH_ALL_IMG_, slxhtmlDoc.getDocumentElement(), additionalNSPrefixes);
- NodeList imgTags = xpUtils.selectNodeSet(slxhtmlDoc);
-
- // Check if all img elements have corresponding slxhtml signed images
- boolean allImgsSigned = true;
- for (int i = 0; i < imgTags.getLength(); i++)
- {
- Element currImgElem = (Element) imgTags.item(i);
- String uri = currImgElem.getAttribute(SRC_ATTR_);
- if (!signedImages.containsKey(uri))
- {
- allImgsSigned = false;
- break;
- }
- }
-
- // Mark all corresponding slxhtml signed images as not to be shown
- if (allImgsSigned)
- {
- for (int i = 0; i < imgTags.getLength(); i++)
- {
- Element currImgElem = (Element) imgTags.item(i);
- String uri = currImgElem.getAttribute(SRC_ATTR_);
- HashInputDataInfo currHidi = (HashInputDataInfo) signedImages.get(uri);
- currHidi.doShow_ = false;
- }
- }
-
- if (allImgsSigned)
- {
- // Change the src attributes of all img tags so that they refer to the temporary names
- for (int i = 0; i < imgTags.getLength(); i++)
- {
- Element currImgElem = (Element) imgTags.item(i);
- String uri = currImgElem.getAttribute(SRC_ATTR_);
- HashInputDataInfo currHidi = (HashInputDataInfo) signedImages.get(uri);
-
- Attr srcAttr = currImgElem.getAttributeNode(SRC_ATTR_);
- int slashPos = currHidi.filename_.lastIndexOf(System.getProperty("file.separator"));
-
-// Properties initProps = (Properties) context_.getAttribute(Constants.WSCP_INIT_PROPS_);
-// String tempDir = initProps.getProperty(Constants.IP_TEMP_DIR_);
-// String newSrcAttrValue = "." + tempDir + currHidi.filename_.substring(slashPos + 1);
-
- Properties initProps = (Properties) context_.getAttribute(Constants.WSCP_INIT_PROPS_);
- String tempDir = initProps.getProperty(Constants.IP_TEMP_DIR_);
- URLRewriter urlRewriter = (URLRewriter) context_.getAttribute(Constants.WSCP_URL_REWRITER_);
- String newSrcAttrValue = urlRewriter.rewrite(
- contextPath_ + tempDir + currHidi.filename_.substring(slashPos + 1), session_);
-
- srcAttr.setNodeValue(newSrcAttrValue);
- }
-
- // Mark hid as slxhtml document
- hid.isSLXHTMLDocument_ = true;
-
- // Serialize modified slxhtml document to temporary file location
- FileOutputStream slxhtmlFOS = new FileOutputStream(hid.filename_);
- MOAInvoker.serializeDocument(slxhtmlDoc, slxhtmlFOS);
- slxhtmlFOS.close();
- }
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private Map getSignedImages(Document moaRequestDoc, List hashInputDataInfos) throws Exception
- {
- // Get signature from MOA request
- Element signatureElem = getSignature(moaRequestDoc);
-
- // Get all signature references from MOA request
- XPathUtils xpUtils = new XPathUtils();
- String additionalNSPrefixes = Constants.NSPRE_DSIG_ + " " + Constants.NSURI_DSIG_;
- xpUtils.setupContext(XPATH_ALL_REF_, signatureElem, additionalNSPrefixes);
- NodeList dsigRefs = xpUtils.selectNodeSet(signatureElem);
-
- // Check signature references for slxhtml images
- HashMap imgHids = new HashMap(dsigRefs.getLength());
- for (int i = 0; i < dsigRefs.getLength(); i++)
- {
- Element currRef = (Element) dsigRefs.item(i);
- String type = currRef.getAttribute(TYPE_ATTR_);
- if (type != null && type.startsWith(SLXHTML_TYPE_PREFIX_))
- {
- String uri = currRef.getAttribute(URI_ATTR_);
- Set referredHids = createReferredHidsSet(type);
- HashInputDataInfo currHidi = (HashInputDataInfo)hashInputDataInfos.get(i);
- currHidi.uri_ = uri;
- currHidi.referredHids_ = referredHids;
- currHidi.isSLXHTMLImage_ = true;
- imgHids.put(uri, currHidi);
- }
- }
-
- // Check signature references if they refer to etsi attributes or to a SL manifest
- for (int i = 0; i < dsigRefs.getLength(); i++)
- {
- Element currRef = (Element) dsigRefs.item(i);
- String type = currRef.getAttribute(TYPE_ATTR_);
- if (type != null && type.equals(ETSI_TYPE_))
- {
- HashInputDataInfo currHidi = (HashInputDataInfo)hashInputDataInfos.get(i);
- currHidi.doShow_ = new Boolean(initProps_.getProperty(Constants.IP_RES_SHOWETSI_).trim()).booleanValue();
- }
- if (type != null && type.equals(SLMANIFEST_TYPE_))
- {
- HashInputDataInfo currHidi = (HashInputDataInfo)hashInputDataInfos.get(i);
- currHidi.doShow_ = new Boolean(initProps_.getProperty(Constants.IP_RES_SHOWSLMAN_).trim()).booleanValue();
- }
- }
-
- return imgHids;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private Set createReferredHidsSet(String type) throws Exception
- {
- HashSet set = new HashSet();
- String typeSuffix = type.substring(SLXHTML_TYPE_PREFIX_.length());
- StringTokenizer tokenizer = new StringTokenizer(typeSuffix, ",");
- while (tokenizer.hasMoreTokens())
- {
- try
- {
- set.add(new Integer(tokenizer.nextToken()));
- }
- catch (NumberFormatException e)
- {
- String message = "Signed image type attribute \"" + type + "\" is malformed.";
- logger_.error(message, e);
- throw new Exception(message, e);
- }
- }
- return set;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private Element getSignature(Document moaRequestDoc) throws Exception
- {
- // Get signature environment content
- NodeList contentNL;
- try
- {
- XPathUtils xpUtils = new XPathUtils();
- String addNSPrefixes = Constants.NSPRE_MOA_12_ + " " + Constants.NSURI_MOA_12_;
- xpUtils.setupContext(XPATH_SIG_ENV_CONTENT_, moaRequestDoc, addNSPrefixes);
- contentNL = xpUtils.selectNodeSet(moaRequestDoc);
- }
- catch (Exception e)
- {
- String message = "Cannot find signature environment content.";
- logger_.error(message);
- throw new Exception(message, e);
- }
- if (contentNL.getLength() == 0)
- {
- String message = "Cannot find signature environment content.";
- logger_.error(message);
- throw new Exception(message);
- }
- Element contentElem = (Element) contentNL.item(0);
-
- // Get signature environment document from signature environment content
- String contentElemLocName = contentElem.getLocalName();
- Element sigEnvElem = null;
- Element oldDocElem = null;
- if (XMLCONT_ELEM_.equals(contentElemLocName))
- {
- // XML content
- NodeList contentNodes = contentElem.getChildNodes();
- for (int i = 0; i < contentNodes.getLength(); i++)
- {
- Node currContNode = (Node) contentNodes.item(i);
- if (currContNode.getNodeType() == Node.ELEMENT_NODE)
- {
- sigEnvElem = (Element) currContNode;
- oldDocElem = (Element) moaRequestDoc.replaceChild(sigEnvElem, moaRequestDoc.getDocumentElement());
- break;
- }
- }
- }
- else if (B64CONT_ELEM_.equals(contentElemLocName))
- {
- // Base64 content
- String base64ContStr = DOMUtils.getText(contentElem);
- byte[] contBytes = Util.Base64Decode(base64ContStr.getBytes());
- ByteArrayInputStream contBIS = new ByteArrayInputStream(contBytes);
- Document sigEnvDoc;
- try
- {
- sigEnvDoc = DOMUtils.parseWellFormed(contBIS);
- }
- catch (Exception e)
- {
- String message = "Cannot parse signature environment from base64 content.";
- logger_.error(message);
- throw new Exception(message, e);
- }
- sigEnvElem = sigEnvDoc.getDocumentElement();
- }
- else
- {
- // LocRef content
- String locRef = DOMUtils.getText(contentElem);
- URL locRefURL = new URL(locRef);
- InputStream contentIS = locRefURL.openStream();
- Document sigEnvDoc;
- try
- {
- sigEnvDoc = DOMUtils.parseWellFormed(contentIS);
- }
- catch (Exception e)
- {
- String message = "Cannot parse signature environment from location reference content.";
- logger_.error(message);
- throw new Exception(message, e);
- }
- sigEnvElem = sigEnvDoc.getDocumentElement();
- }
-
- // Get signature form signature environment document
- Element sigInfoElem = (Element) contentElem.getParentNode().getParentNode();
- Element sigLocElem = DOMUtils.getChildElem(sigInfoElem, Constants.NSURI_MOA_12_, SIGLOC_ELEM_);
- String sigLocXPath = DOMUtils.getText(sigLocElem);
- NodeList sigElemNL;
- try
- {
- XPathUtils xpUtils = new XPathUtils();
- xpUtils.setupContext(sigLocXPath, sigLocElem, null);
- sigElemNL = xpUtils.selectNodeSet(sigEnvElem);
- }
- catch (Exception e)
- {
- String message = "Cannot get signature at location \"" + sigLocXPath + "\" from signature environment.";
- logger_.error(message);
- throw new Exception(message, e);
- }
- if (sigElemNL.getLength() != 1 || ((Node) sigElemNL.item(0)).getNodeType() != Node.ELEMENT_NODE)
- {
- String message = "Cannot get signature at location \"" + sigLocXPath + "\" from signature environment.";
- logger_.error(message);
- throw new Exception(message);
- }
-
- if (oldDocElem != null) moaRequestDoc.replaceChild(oldDocElem, moaRequestDoc.getDocumentElement());
-
- return (Element) sigElemNL.item(0);
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/HashInputDataInfo.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/HashInputDataInfo.java
deleted file mode 100644
index e2cb27ab3..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/HashInputDataInfo.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Created on 02.12.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.beans;
-
-import java.util.Set;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class HashInputDataInfo
-{
- /**
- * The name of the temporary file in which this data is stored.
- */
- public String filename_;
-
- /**
- * Is this HID a SLXHTML document?
- */
- public boolean isSLXHTMLDocument_;
-
- /**
- * Is this HID a SLXHTML signed image?
- */
- public boolean isSLXHTMLImage_;
-
- /**
- * Show HID in result presentation?
- */
- public boolean doShow_;
-
- /**
- * The URI attribute value of the dsig:Reference corresponding with this HID.
- */
- public String uri_;
-
- /**
- * In case that this ID is a SLXHTML signed image, this set contains objects of type <code>Integer</code>,
- * indicating the SLXHTML HIDs where this image is referenced.
- */
- public Set referredHids_;
-
- public HashInputDataInfo(String filename)
- {
- filename_ = filename;
- isSLXHTMLDocument_ = false;
- isSLXHTMLImage_ = false;
- doShow_ = true;
- uri_ = null;
- referredHids_ = null;
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/InitPropertiesBean.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/InitPropertiesBean.java
deleted file mode 100644
index 8cb7e0a41..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/InitPropertiesBean.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package at.gv.egovernment.moa.spss.slinterface.beans;
-
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@siemens.com)
- */
-public class InitPropertiesBean
-{
- private Properties initProps_;
-
- private static Logger logger_ = Logger.getLogger(Constants.LH_BEANS_);
-
- public InitPropertiesBean(Properties props)
- {
- initProps_ = props;
- }
-
- public String getMOASLWebAppURL()
- {
- String webAppServerURLProp = initProps_.getProperty(Constants.IP_REW_MOASL_WEBAPPSERV_URL_);
- logger_.debug("MOA SL Web application server URL property: " + webAppServerURLProp);
- if (webAppServerURLProp == null || webAppServerURLProp.trim().length() == 0)
- {
- String defaultWebAppServerURL = "http://localhost:8080";
- logger_.info("MOA SL Web application server URL property not available, using default (" + defaultWebAppServerURL + ")");
- return defaultWebAppServerURL;
- }
- else return webAppServerURLProp;
-
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/SignerInfoBean.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/SignerInfoBean.java
deleted file mode 100644
index 2893b2ac3..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/beans/SignerInfoBean.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Created on 27.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.beans;
-
-import iaik.asn1.ObjectID;
-import iaik.asn1.structures.Name;
-import iaik.utils.RFC2253NameParser;
-import iaik.utils.RFC2253NameParserException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-import at.gv.egovernment.moa.spss.slinterface.DOMUtils;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class SignerInfoBean
-{
- private static final String SIGNERINFO_ELEM_ = "SignerInfo";
- private static final String X509DATA_ELEM_ = "X509Data";
- private static final String X509SUBJNAME_ELEM_ = "X509SubjectName";
- private static final String X509ISSUERSERIAL_ELEM_ = "X509IssuerSerial";
- private static final String SERIAL_ELEM_ = "X509SerialNumber";
- private static final String ISSUER_ELEM_ = "X509IssuerName";
- private static final String QUALCERT_ELEM_ = "QualifiedCertificate";
-
- private Element signerInfoElem_;
-
- private String subjectNameItemSel_;
- private String issuerNameItemSel_;
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public SignerInfoBean(Document slResponseDoc)
- {
- Element verifyXMLResponseElem = slResponseDoc.getDocumentElement();
- signerInfoElem_ = DOMUtils.getChildElem(
- verifyXMLResponseElem, Constants.NSURI_SL_11_, SIGNERINFO_ELEM_);
-
- subjectNameItemSel_ = "2.5.4.3";
- issuerNameItemSel_ = "2.5.4.3";
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void setSubjectNameItemSel(String selector)
- {
- subjectNameItemSel_ = selector;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getSubjectNameItem()
- {
- Element x509DataElem = DOMUtils.getChildElem(signerInfoElem_, Constants.NSURI_DSIG_, X509DATA_ELEM_);
- String subjectNameStr = DOMUtils.getChildText(x509DataElem, Constants.NSURI_DSIG_, X509SUBJNAME_ELEM_);
- if (subjectNameStr == null) return null;
- return getRDN(subjectNameStr, subjectNameItemSel_);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getSerial()
- {
- Element x509DataElem = DOMUtils.getChildElem(signerInfoElem_, Constants.NSURI_DSIG_, X509DATA_ELEM_);
- Element iSElem = DOMUtils.getChildElem(x509DataElem, Constants.NSURI_DSIG_, X509ISSUERSERIAL_ELEM_);
- return DOMUtils.getChildText(iSElem, Constants.NSURI_DSIG_, SERIAL_ELEM_);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void setIssuerNameItemSel(String selector)
- {
- issuerNameItemSel_ = selector;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public String getIssuerNameItem()
- {
- Element x509DataElem = DOMUtils.getChildElem(signerInfoElem_, Constants.NSURI_DSIG_, X509DATA_ELEM_);
- Element iSElem = DOMUtils.getChildElem(x509DataElem, Constants.NSURI_DSIG_, X509ISSUERSERIAL_ELEM_);
- String issuerNameStr = DOMUtils.getChildText(iSElem, Constants.NSURI_DSIG_, ISSUER_ELEM_);
- if (issuerNameStr == null) return null;
- return getRDN(issuerNameStr, issuerNameItemSel_);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public boolean getIsQualified()
- {
- Element x509DataElem = DOMUtils.getChildElem(signerInfoElem_, Constants.NSURI_DSIG_, X509DATA_ELEM_);
- Element qCElem = DOMUtils.getChildElem(x509DataElem, Constants.NSURI_SL_11_, QUALCERT_ELEM_);
- return (qCElem != null);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- private String getRDN(String nameStr, String oidStr)
- {
- try
- {
- RFC2253NameParser nameParser = new RFC2253NameParser(nameStr);
- Name name = nameParser.parse();
- ObjectID oid = ObjectID.getObjectID(oidStr);
- if (oid == null) return null;
- String[] rdns = name.getRDNs(oid);
- if (rdns == null) return null;
- StringBuffer rdnsStr = new StringBuffer();
- for (int i = 0; i < rdns.length; i++)
- {
- if (i > 0) rdnsStr.append(", ");
- rdnsStr.append(rdns[i]);
- }
- return rdnsStr.toString();
- }
- catch (RFC2253NameParserException e)
- {
- return null;
- }
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/RequestWrapper.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/RequestWrapper.java
deleted file mode 100644
index a6652a56e..000000000
--- a/spss.slinterface/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/src/at/gv/egovernment/moa/spss/slinterface/filters/ResponseWrapper.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/ResponseWrapper.java
deleted file mode 100644
index 420723abb..000000000
--- a/spss.slinterface/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/src/at/gv/egovernment/moa/spss/slinterface/filters/SL2MOAFilter.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/SL2MOAFilter.java
deleted file mode 100644
index d73dbdfd2..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/SL2MOAFilter.java
+++ /dev/null
@@ -1,381 +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.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.RequestDispatcher;
-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 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.beans.ChecksInfoBean;
-import at.gv.egovernment.moa.spss.slinterface.beans.DataInfoBean;
-import at.gv.egovernment.moa.spss.slinterface.beans.SignerInfoBean;
-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
- {
- // It is necessary to set the content type header already here, because for any unknown reason setting
- // it in the response JSP page has no effects at all. Perhaps any of the filters or the like already
- // writes to the response output stream.
- HttpServletResponse httpResponse = (HttpServletResponse) response;
- httpResponse.setHeader("Content-Type", "text/html; charset=ISO-8859-1");
-
- // Create session
- HttpSession session = ((HttpServletRequest) request).getSession(true);
-
- // Check if request is HTTP-POST
- checkHttpPost((HttpServletRequest) request);
-
- // Remember remote IP address for later URL rewriting
- session.setAttribute("remoteAddr", request.getRemoteAddr());
-
- // 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);
- logger_.debug("Finnished schema validating SL request.");
-
- // 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());
- logger_.debug("Finnished transforming SL request into a MOA SP request.");
-
- // Invoke MOA SPSS
- RequestWrapper requestWrapper = new RequestWrapper((HttpServletRequest) request, moaRequestIS);
- ResponseWrapper responseWrapper = new ResponseWrapper((HttpServletResponse) response);
- chain.doFilter(requestWrapper, responseWrapper);
- logger_.debug("Finnished invoking MOA SP service.");
-
- // Parse MOA 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 moaResponseDoc;
- try
- {
- xmlParser.parse(responseSource);
- moaResponseDoc = xmlParser.getDocument();
- }
- catch (SAXException e)
- {
- String message = "Parsing MOA XML response failed.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- logger_.debug("Finnished parsing MOA SP response.");
-
- // Create bean with info about signed data
- try
- {
- DataInfoBean dataInfo = new DataInfoBean(
- moaXMLRequestDoc,
- moaResponseDoc,
- ((HttpServletRequest) request).getContextPath(),
- session,
- config_.getServletContext());
- session.setAttribute("dataInfo", dataInfo);
- }
- catch (Exception e)
- {
- String message = "Creating DataInfobean failed.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- logger_.debug("Finnished creating bean with info about signed data.");
-
- // Transform MOA response into a SL response
- Document slResponseDoc;
- slResponseDoc = MOA2SL.toSlVerifyXMLSignatureResponse(moaResponseDoc);
- session.setAttribute("slResponseDoc", slResponseDoc);
- logger_.debug("Finnished transforming MOA SP response into a SL response.");
-
- // Create bean with info about signer
- SignerInfoBean signerInfo = new SignerInfoBean(slResponseDoc);
- request.setAttribute("signerInfo", signerInfo);
- logger_.debug("Finnished creating bean with info about signer.");
-
- // Create bean with info about checks
- ChecksInfoBean checksInfo = new ChecksInfoBean(slResponseDoc);
- request.setAttribute("checksInfo", checksInfo);
- logger_.debug("Finnished creating bean with info about checks.");
-
- // Include jsp page, which writes the overview information about the verified signature
- try
- {
- RequestDispatcher dispatcher = request.getRequestDispatcher("/pages/resultOverview.jsp");
- dispatcher.include(request, response);
- }
- catch (IOException e)
- {
- String message = "Failed to create result overview page.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- logger_.debug("Finnished SL2MOAFilter.");
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see javax.servlet.Filter#destroy()
- */
- public void destroy()
- {
- // Nothing to do here at the moment.
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- // TODO Revisit if method can be removed
- /* 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/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletInputStream.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletInputStream.java
deleted file mode 100644
index b0609c2f8..000000000
--- a/spss.slinterface/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/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletOutputStream.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/filters/ServletOutputStream.java
deleted file mode 100644
index b790ee55c..000000000
--- a/spss.slinterface/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/src/at/gv/egovernment/moa/spss/slinterface/listeners/ContextListener.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/listeners/ContextListener.java
deleted file mode 100644
index 8b8befb1c..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/listeners/ContextListener.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Created on 18.11.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.listeners;
-
-import java.io.FileInputStream;
-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;
-import at.gv.egovernment.moa.spss.slinterface.URLRewriter;
-import at.gv.egovernment.moa.spss.slinterface.beans.InitPropertiesBean;
-
-/**
- * @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";
- protected static final String XERCES_AUGMENT_PSI_ =
- "http://apache.org/xml/features/validation/schema/augment-psvi";
-
- private static final int BIG_PRIME = 2039;
-
- private static Logger logger_ = Logger.getLogger(Constants.LH_LISTENERS_);
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * Initializes the web application.
- * @throws Exception
- *
- * @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_.fatal("System property \"" + Constants.SP_INIT_PROPS_LOC_ + "\" not set.");
- logger_.fatal("Web application initialization failed.");
- return;
- }
-
- // Load init properties
- try
- {
- logger_.debug("Init properties location \"" + initPropsLoc + "\" will be used.");
-
- // Try to interpret init properties location as relative to the web application root
- InputStream initPropsIS = context.getResourceAsStream(initPropsLoc);
-
- if (initPropsIS == null)
- {
- // If this does not work, try to interpret init properties location as an absolute file system path
- initPropsIS = new FileInputStream(initPropsLoc);
- }
-
- Properties initProps = new Properties();
- initProps.load(initPropsIS);
- context.setAttribute(Constants.WSCP_INIT_PROPS_, initProps);
-
- // Prepare application bean knowing about init properties
- InitPropertiesBean initPropsBean = new InitPropertiesBean(initProps);
- context.setAttribute(Constants.WSCP_INITPROPS_BEAN_, initPropsBean);
- }
- catch (IOException e)
- {
- logger_.fatal("Cannot load initialization properties from location \"" + initPropsLoc + "\".", e);
- logger_.fatal("Web application initialization failed.");
- return;
- }
-
- // Put helper object for rewriting URLs in the result page into the context
- URLRewriter urlRewriter = new URLRewriter((Properties)context.getAttribute(Constants.WSCP_INIT_PROPS_));
- context.setAttribute(Constants.WSCP_URL_REWRITER_, urlRewriter);
-
- // 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);
-
- // Schema for Security-Layer 1.2 alpha (including LocRefContent)
- Properties initProps = (Properties) context.getAttribute(Constants.WSCP_INIT_PROPS_);
- String slSchemaLoc = initProps.getProperty(Constants.IP_SL_SCHEMA_);
- if (!preparseSchema(context, preparser, slSchemaLoc))
- {
- logger_.fatal("Web application initialization failed.");
- return;
- }
-
- // Schema for MOA 1.2
- String moaSchemaLoc = initProps.getProperty(Constants.IP_MOA_SCHEMA_);
- if (!preparseSchema(context, preparser, moaSchemaLoc))
- {
- logger_.fatal("Web application initialization failed.");
- return;
- }
-
- // Schema for SLXHTML 1.0
- String slxhtmlSchemaLoc = initProps.getProperty(Constants.IP_SLXHTML_SCHEMA_);
- if (!preparseSchema(context, preparser, slxhtmlSchemaLoc))
- {
- logger_.fatal("Web application initialization failed.");
- return;
- }
-
-
- // TODO parser is not threadsafe
- 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_, true);
- xmlParser.setFeature(XERCES_AUGMENT_PSI_, false);
- xmlParser.setErrorHandler(new XMLParserErrorHandler(false, true, true));
- }
- catch (SAXException e)
- {
- String message = "Initialization of XML parser failed.";
- logger_.fatal(message, e);
- logger_.fatal("Web application initialization failed.");
- return;
- }
- context.setAttribute(Constants.WSCP_XMLPARSER_, xmlParser);
-
- String message = "Web application initialization succeeded.";
- logger_.info(message);
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * 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 boolean preparseSchema(ServletContext context, XMLGrammarPreparser preparser, String schemaLoc)
- {
- InputStream schemaIS = context.getResourceAsStream(schemaLoc);
- if (schemaIS == null)
- {
- String message = "Cannot load schema from location \"" + schemaLoc + "\".";
- logger_.fatal(message);
- return false;
- }
- 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_.fatal(message, e);
- return false;
- }
- return true;
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/listeners/XMLParserErrorHandler.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/listeners/XMLParserErrorHandler.java
deleted file mode 100644
index 496d0aadb..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/listeners/XMLParserErrorHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Created on 02.12.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.listeners;
-
-import org.apache.log4j.Logger;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class XMLParserErrorHandler implements ErrorHandler
-{
- private static Logger logger_ = Logger.getLogger(Constants.LH_LISTENERS_XMLPARSER_);
-
- private boolean reportWarning_, reportError_, reportFatal_;
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public XMLParserErrorHandler(boolean reportWarning, boolean reportError, boolean reportFatal)
- {
- reportWarning_ = reportWarning;
- reportError_ = reportError;
- reportFatal_ = reportFatal;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
- */
- public void warning(SAXParseException exception) throws SAXException
- {
- logger_.warn("XML parser reported a warning.", exception);
- if (reportWarning_) throw exception;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
- */
- public void error(SAXParseException exception) throws SAXException
- {
- logger_.error("XML parser reported an error.", exception);
- if (reportError_) throw exception;
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- /**
- * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
- */
- public void fatalError(SAXParseException exception) throws SAXException
- {
- logger_.error("XML parser reported a fatal error.", exception);
- if (reportFatal_) throw exception;
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/moainvoker/MOAInvoker.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/moainvoker/MOAInvoker.java
deleted file mode 100644
index e89d255f0..000000000
--- a/spss.slinterface/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/src/at/gv/egovernment/moa/spss/slinterface/servlets/HashInputDataServlet.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/HashInputDataServlet.java
deleted file mode 100644
index 1f82540bb..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/HashInputDataServlet.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Created on 01.12.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package at.gv.egovernment.moa.spss.slinterface.servlets;
-
-import java.io.FileInputStream;
-import java.io.OutputStream;
-
-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 org.apache.log4j.Logger;
-
-import at.gv.egovernment.moa.spss.slinterface.Constants;
-import at.gv.egovernment.moa.spss.slinterface.Utils;
-import at.gv.egovernment.moa.spss.slinterface.beans.DataInfoBean;
-
-/**
- * @author Gregor Karlinger (mailto:gregor.karlinger@cio.gv.at)
- */
-public class HashInputDataServlet extends HttpServlet
-{
- private static Logger logger_ = Logger.getLogger(Constants.LH_SERVLETS_);
-
- /**
- * Default constructor.
- */
- public HashInputDataServlet()
- {
- super();
- }
-
- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException
- {
- // Get DataInfoBean object from session
- HttpSession session = request.getSession(false);
- if (session == null)
- {
- String message = "No session available.";
- logger_.error(message);
- throw new ServletException(message);
- }
- DataInfoBean dataInfo = (DataInfoBean) session.getAttribute("dataInfo");
-
- // Get parameter inicating which hash input data file to show
- String hidCountStr = request.getParameter("hidCount");
- if (hidCountStr == null)
- {
- String message = "Parameter \"hidCount\" not available in request.";
- logger_.error(message);
- throw new ServletException(message);
- }
- int hidCount = -1;
- try
- {
- hidCount = Integer.parseInt(hidCountStr);
- }
- catch (NumberFormatException e)
- {
- String message = "Parameter \"hidCount\" (\"" + hidCount + "\") is not a valid string representation of an integer.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
-
- // Get file name of temporary HID file
- dataInfo.setHashInputDataCount(hidCount);
- String hidFilename = dataInfo.getHashInputDataFilename();
-
- // Set content type
- boolean isSLXHTML = dataInfo.getIsSLXHTMLDocument();
- String contenType = (isSLXHTML) ? "text/html;charset=utf-8" : "application/octet-stream";
- response.setContentType(contenType);
-
- // Write content from temporary HID file to response OS
- try
- {
- FileInputStream hidFIS = new FileInputStream(hidFilename);
- OutputStream responseOS = response.getOutputStream();
- Utils.transferStreams(hidFIS, responseOS);
- }
- catch (Exception e)
- {
- String message = "Writing hash input data to response stream failed.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/MOAServlet.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/MOAServlet.java
deleted file mode 100644
index 362793064..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/MOAServlet.java
+++ /dev/null
@@ -1,113 +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);
- }
- logger_.debug("Got response from MOA SP service.");
-
- // 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);
- }
- logger_.debug("Wrote response from MOA SP service to http response outputstream.");
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/ReturnServlet.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/ReturnServlet.java
deleted file mode 100644
index 84ce26be0..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/ReturnServlet.java
+++ /dev/null
@@ -1,129 +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 ReturnServlet extends HttpServlet
-{
-
- private static Logger logger_ = Logger.getLogger(Constants.LH_SERVLETS_);
-
- /**
- * Default constructor.
- */
- public ReturnServlet()
- {
- 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
- {
- // TODO Does not conform to SL/Bindings/sec. 3.3.2.2
-
- // 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
- {
- // TODO Does not conform to SL/Bindings/sec. 3.3.2.1
-
- // 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/src/at/gv/egovernment/moa/spss/slinterface/servlets/SLRequest.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/servlets/SLRequest.java
deleted file mode 100644
index 3c19d5ff6..000000000
--- a/spss.slinterface/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/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java
deleted file mode 100644
index 2e82d4d32..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java
+++ /dev/null
@@ -1,93 +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.Node;
-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();
- Element certCheckElem = (Element) verifyResponseElem.getElementsByTagNameNS(
- Constants.NSURI_SL_11_, "CertificateCheck").item(0);
- NodeList certCheckChildren = certCheckElem.getChildNodes();
- ArrayList certCheckChildElemsList = new ArrayList(certCheckChildren.getLength());
- for (int i = 0; i < certCheckChildren.getLength(); i++)
- {
- Node currentNode = certCheckChildren.item(i);
- if (currentNode.getNodeType() == Node.ELEMENT_NODE)
- certCheckChildElemsList.add(certCheckChildren.item(i));
- }
- for (int i = 0; i < certCheckChildElemsList.size(); i++)
- Utils.transformDeep((Element) certCheckChildElemsList.get(i), prefixMap, nsTransforms,
- nameTransforms);
-
- return moaVerifyXMLSignatureResponse;
- }
-}
diff --git a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/QName.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/QName.java
deleted file mode 100644
index 6da0c433f..000000000
--- a/spss.slinterface/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/src/at/gv/egovernment/moa/spss/slinterface/transformers/SL2MOA.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/SL2MOA.java
deleted file mode 100644
index 6c476e9ce..000000000
--- a/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/SL2MOA.java
+++ /dev/null
@@ -1,93 +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 ReturnHashInputData element
- Element returnHashInputDataElem = slVerifyXMLSignatureRequest.createElementNS(
- Constants.NSURI_MOA_12_, Constants.NSPRE_MOA_12_ + ":ReturnHashInputData");
- verifyRequestElem.appendChild(returnHashInputDataElem);
-
- // 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/src/at/gv/egovernment/moa/spss/slinterface/transformers/Utils.java b/spss.slinterface/src/at/gv/egovernment/moa/spss/slinterface/transformers/Utils.java
deleted file mode 100644
index d03895efe..000000000
--- a/spss.slinterface/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/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLBean.java b/spss.slinterface/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLBean.java
deleted file mode 100644
index 4cf099a45..000000000
--- a/spss.slinterface/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/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLServlet.java b/spss.slinterface/src/test/at/gv/egovernment/moa/spss/slinterface/DataURLServlet.java
deleted file mode 100644
index ff4cbbe59..000000000
--- a/spss.slinterface/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/src/test/at/gv/egovernment/moa/spss/slinterface/RewriteServlet.java b/spss.slinterface/src/test/at/gv/egovernment/moa/spss/slinterface/RewriteServlet.java
deleted file mode 100644
index 43685d4f4..000000000
--- a/spss.slinterface/src/test/at/gv/egovernment/moa/spss/slinterface/RewriteServlet.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Created on 15.12.2003
- *
- * (c) Stabsstelle IKT-Strategie des Bundes
- */
-package test.at.gv.egovernment.moa.spss.slinterface;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Properties;
-
-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 RewriteServlet extends HttpServlet
-{
- private static Logger logger_ = Logger.getLogger(Constants.LH_TEST_);
-
- public RewriteServlet()
- {
- super();
- }
-
- /* ---------------------------------------------------------------------------------------------------- */
-
- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException
- {
- // Read content form POST request
- try
- {
- logger_.debug("Received GET request:");
- logger_.debug("Request URI: \"" + request.getRequestURL() + "\"");
-
- Properties initProps = (Properties) this.getServletContext().getAttribute(Constants.WSCP_INIT_PROPS_);
- String paramName = (initProps != null)
- ? initProps.getProperty(Constants.IP_REW_MOASL_URLPARAMNAME_)
- : null;
-
- if (paramName == null || "".equals(paramName))
- throw new ServletException("Could not get rewrite parameter name from init properties.");
-
- logger_.debug("SLInterface rewrite parameter : \"" + paramName + "\"");
-
- String slInterfaceURLStr = request.getParameter(paramName);
- URL slInterfaceURL = new URL(slInterfaceURLStr);
- URLConnection slInterfaceURLConn = slInterfaceURL.openConnection();
-
- response.setContentType(slInterfaceURLConn.getContentType());
-
- InputStream slInterfaceIS = slInterfaceURLConn.getInputStream();
- OutputStream responseOS = response.getOutputStream();
- Utils.transferStreams(slInterfaceIS, responseOS);
- }
- catch (Exception e)
- {
- String message = "Failed to get answer from SL interface.";
- logger_.error(message, e);
- throw new ServletException(message, e);
- }
- }
-}
diff --git a/spss.slinterface/test/moa-wartung-la9/106_2006.img1is.gif b/spss.slinterface/test/moa-wartung-la9/106_2006.img1is.gif
deleted file mode 100644
index 971fec9a0..000000000
--- a/spss.slinterface/test/moa-wartung-la9/106_2006.img1is.gif
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/test/moa-wartung-la9/106_2006.img2is.gif b/spss.slinterface/test/moa-wartung-la9/106_2006.img2is.gif
deleted file mode 100644
index 971fec9a0..000000000
--- a/spss.slinterface/test/moa-wartung-la9/106_2006.img2is.gif
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/test/moa-wartung-la9/106_2006.img3is.gif b/spss.slinterface/test/moa-wartung-la9/106_2006.img3is.gif
deleted file mode 100644
index 971fec9a0..000000000
--- a/spss.slinterface/test/moa-wartung-la9/106_2006.img3is.gif
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__106_2006.iso8859.xml b/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__106_2006.iso8859.xml
deleted file mode 100644
index 43d4357b6..000000000
--- a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__106_2006.iso8859.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<erechtdok stylesheet="eRechtXML2XHTML11_1.9.0.xsl" h-version="2.8.1_20.02.2006" h-creator="RTF2XML.Converter_09. März 2006_13:07:22(19824)" h-created="09. März 2006, 13:07:25" xmlns="http://www.bka.gv.at">
- <metadaten></metadaten>
- <nutzdaten>
- <abschnitt nr="1" typ="ns" paperf="h" endnhier="true">
- <kzinhalt typ="p">
- <absatz typ="kz" halign="j">
- <tab align="z" position="212,65" leader="o"></tab>BGBl. II - Ausgegeben am 9. März 2006 - Nr. 106<tab align="r" position="425,25" leader="o"></tab>Seite <feld code="+PAGE++%5C%2A+MERGEFORMAT+">2</feld> von <feld code="+NUMPAGES++%5C%2A+MERGEFORMAT+">2</feld>
- </absatz>
- </kzinhalt>
- <kzinhalt typ="f">
- <absatz typ="kz" halign="j">
- <tab align="z" position="212,65" leader="o"></tab>
- <tab align="r" position="425,25" leader="o"></tab>
- <feld code="+PAGE++%5C%2A+MERGEFORMAT+">1</feld> von <feld code="+NUMPAGES++%5C%2A+MERGEFORMAT+">2</feld>
- </absatz>
- </kzinhalt>
- <fzinhalt typ="p">
- <absatz typ="fz" halign="j">www.ris.bka.gv.at</absatz>
- </fzinhalt>
- <fzinhalt typ="f">
- <absatz typ="fz" halign="j">www.ris.bka.gv.at</absatz>
- </fzinhalt>
- <ueberschrift typ="bdgesblatt" halign="c">BUNDESGESETZBLATT</ueberschrift>
- <ueberschrift typ="repoesterr" halign="c">FÜR DIE REPUBLIK ÖSTERREICH</ueberschrift>
- <ausgabe>
- <adtext>Jahrgang 2006</adtext>
- <addat>Ausgegeben am 9. März 2006</addat>
- <adid>Teil II</adid>
- </ausgabe>
- <ueberschrift typ="kurztitel" halign="j">106. Verordnung:<tab></tab>Rohmilchverordnung</ueberschrift>
- <ueberschrift typ="titel" halign="j">106. Verordnung der Bundesministerin für Gesundheit und Frauen über Rohmilch und Rohrahm (Rohmilchverordnung)</ueberschrift>
- <absatz typ="promkleinlsatz" halign="j">Auf Grund des § 14 Z 1 des Lebensmittelsicherheits- und Verbraucherschutzgesetzes <kidea></kidea> LMSVG, BGBl. I Nr. 13/2006, geändert durch das Bundesgesetz BGBl. I Nr. 151/2005, wird im Einvernehmen mit dem Bundesminister für Land- und Forstwirtschaft, Umwelt und Wasserwirtschaft verordnet:</absatz>
- <ueberschrift typ="para" halign="c">Geltungsbereich</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>1.</gldsym> Diese Verordnung regelt das Inverkehrbringen von Rohmilch und Rohrahm, die für den unmittelbaren menschlichen Verzehr bestimmt sind sowie damit in Zusammenhang stehende Behandlungs- und Kennzeichnungvorschriften.</absatz>
- <ueberschrift typ="para" halign="c">Allgemeine Bestimmungen</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>2.</gldsym> (1) Rohmilch und Rohrahm dürfen nur direkt vom Tierhalter an den Endverbraucher oder an Einzelhandelsunternehmen und von diesen Einzelhandelsunternehmen direkt an den Endverbraucher abgegeben werden.</absatz>
- <absatz typ="abs" halign="j">(2) Rohmilch und Rohrahm dürfen nicht an Schulen und Kindergärten abgegeben werden. Andere Einrichtungen der Gemeinschaftsversorgung, denen Rohmilch oder Rohrahm gemäß Abs. 1 abgegeben wird, dürfen diese nur zum Zwecke der Herstellung von Speisen und Getränken verwenden, die einem Erhitzungsverfahren unterzogen werden, mit dem eine ausreichend hohe Kerntemperatur erzielt wird, um die Abtötung von pathogenen Mikroorganismen sicherzustellen.</absatz>
- <ueberschrift typ="para" halign="c">Milchautomaten</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>3.</gldsym> Rohmilch kann durch einen nach anerkannten Kriterien geprüften Milchautomaten abgegeben werden, wenn gewährleistet ist, dass die Rohmilch durch den Milchautomaten oder dessen Standort keine hygienisch nachteilige Beeinträchtigung erfährt.</absatz>
- <ueberschrift typ="para" halign="c">Zeitpunkt der Abgabe</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>4.</gldsym> Rohmilch darf nur am Tag der Gewinnung und an den zwei darauf folgenden Tagen abgegeben werden. Rohrahm darf nur am Tag der Gewinnung der Rohmilch oder am darauf folgenden Tag aus dieser hergestellt und abgegeben werden.</absatz>
- <ueberschrift typ="para" halign="c">Kennzeichnung</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>5.</gldsym> (1) Unbeschadet der Bestimmungen der Lebensmittelkennzeichnungsverordnung 1993 - LMKV, BGBl. Nr. 72/1993 in der jeweils geltenden Fassung, ist Rohmilch zum unmittelbaren menschlichen Verzehr mit dem Hinweis <bdquo></bdquo>Rohmilch, vor dem Verzehr abkochen<ldquo></ldquo> und Rohrahm mit dem Hinweis <bdquo></bdquo>Rohrahm, nur zur Herstellung von durcherhitzten Speisen verwenden<ldquo></ldquo> zu deklarieren.</absatz>
- <absatz typ="abs" halign="j">(2) Bei Rohmilch und Rohrahm, die nicht gemäß der Lebensmittelkennzeichnungsverordnung 1993 -LMKV zu kennzeichnen sind und nicht zum unmittelbaren Verzehr an Ort und Stelle bestimmt sind, hat der Hinweis gemäß Abs. 1 - bei Abgabe an den Endverbraucher - auf einem Aushang, den der Endverbraucher einsehen kann, deutlich lesbar zu erfolgen. Bei Abgabe an Einzelhandelsunternehmen ist auf dem Transportbehälter und auf den die Ware begleitenden Dokumenten, wie Lieferschein oder Rechnung <bdquo></bdquo>Rohmilch<ldquo></ldquo> oder <bdquo></bdquo>Rohrahm<ldquo></ldquo> anzugeben.</absatz>
- <ueberschrift typ="para" halign="c">Kriterien</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>6.</gldsym> Rohmilch muss folgende Kriterien erfüllen:</absatz>
- <liste>
- <ziffernliste ebene="1">
- <listelem>
- <symbol stellen="2">1.</symbol>Rohe Kuhmilch:</listelem>
- </ziffernliste>
- <schluss typ="Ziff">a) Keimzahl bei 30°C (pro ml): <binary nr="1" shapetype="is" height="12" width="10,2" alt="" brightness="0,5" contrast="0,5" oleclass="unknown" datatype="gif">
- <src>./Bilder-Dateien/Bilder.img1is.gif</src></binary> 50 000;</schluss>
- <schluss typ="Ziff">b) Somatische Zellen (pro ml): <binary nr="2" shapetype="is" height="12" width="10,2" alt="" brightness="0,5" contrast="0,5" oleclass="unknown" datatype="gif">
- <src>./Bilder-Dateien/Bilder.img2is.gif</src></binary> 400 000.</schluss>
- <ziffernliste ebene="1">
- <listelem>
- <symbol stellen="2">2.</symbol>Rohmilch von anderen Tierarten: Keimzahl bei 30°C (pro ml): <binary nr="3" shapetype="is" height="12" width="10,2" alt="" brightness="0,5" contrast="0,5" oleclass="unknown" datatype="gif">
- <src>./Bilder-Dateien/Bilder.img3is.gif</src></binary> 500 000.</listelem>
- </ziffernliste>
- </liste>
- <ueberschrift typ="para" halign="c">Personenbezogene Bezeichnungen</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>7.</gldsym> Bei den in dieser Verordnung verwendeten personenbezogenen Bezeichnungen gilt die gewählte Form für beide Geschlechter.</absatz>
- <ueberschrift typ="para" halign="c">Schlussbestimmung</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>8.</gldsym> Diese Verordnung wurde unter Einhaltung der Bestimmungen der Richtlinie 98/34/EG über ein Informationsverfahren auf dem Gebiet der Normen und technischen Vorschriften, ABl. Nr. L 204 vom 21. Juli 1998 und des Artikels 10 Abs. 5 der Verordnung (EG) Nr. 853/2004 mit spezifischen Hygienevorschriften für Lebensmittel tierischen Ursprungs, ABl. Nr. L 139 vom 30. April 2004, berichtigt durch ABl. Nr. L 226 vom 25. Juni 2004, notifiziert.</absatz>
- <unterschrift typ="links">Rauch-Kallat</unterschrift>
- </abschnitt>
- </nutzdaten>
- <layoutdaten paperf="7" paperh="842" paperw="595.35" margl="85.05" margr="85.05" margt="85.05" margb="85.05" headerd="28.35" footerd="65.2" gutter="0" gutterpos="0" deftab="35.4"></layoutdaten>
-</erechtdok> \ No newline at end of file
diff --git a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__106_2006.utf8.xml b/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__106_2006.utf8.xml
deleted file mode 100644
index 86609dd11..000000000
--- a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__106_2006.utf8.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<erechtdok stylesheet="eRechtXML2XHTML11_1.9.0.xsl" h-version="2.8.1_20.02.2006" h-creator="RTF2XML.Converter_09. März 2006_13:07:22(19824)" h-created="09. März 2006, 13:07:25" xmlns="http://www.bka.gv.at">
- <metadaten></metadaten>
- <nutzdaten>
- <abschnitt nr="1" typ="ns" paperf="h" endnhier="true">
- <kzinhalt typ="p">
- <absatz typ="kz" halign="j">
- <tab align="z" position="212,65" leader="o"></tab>BGBl. II - Ausgegeben am 9. März 2006 - Nr. 106<tab align="r" position="425,25" leader="o"></tab>Seite <feld code="+PAGE++%5C%2A+MERGEFORMAT+">2</feld> von <feld code="+NUMPAGES++%5C%2A+MERGEFORMAT+">2</feld>
- </absatz>
- </kzinhalt>
- <kzinhalt typ="f">
- <absatz typ="kz" halign="j">
- <tab align="z" position="212,65" leader="o"></tab>
- <tab align="r" position="425,25" leader="o"></tab>
- <feld code="+PAGE++%5C%2A+MERGEFORMAT+">1</feld> von <feld code="+NUMPAGES++%5C%2A+MERGEFORMAT+">2</feld>
- </absatz>
- </kzinhalt>
- <fzinhalt typ="p">
- <absatz typ="fz" halign="j">www.ris.bka.gv.at</absatz>
- </fzinhalt>
- <fzinhalt typ="f">
- <absatz typ="fz" halign="j">www.ris.bka.gv.at</absatz>
- </fzinhalt>
- <ueberschrift typ="bdgesblatt" halign="c">BUNDESGESETZBLATT</ueberschrift>
- <ueberschrift typ="repoesterr" halign="c">FÜR DIE REPUBLIK ÖSTERREICH</ueberschrift>
- <ausgabe>
- <adtext>Jahrgang 2006</adtext>
- <addat>Ausgegeben am 9. März 2006</addat>
- <adid>Teil II</adid>
- </ausgabe>
- <ueberschrift typ="kurztitel" halign="j">106. Verordnung:<tab></tab>Rohmilchverordnung</ueberschrift>
- <ueberschrift typ="titel" halign="j">106. Verordnung der Bundesministerin für Gesundheit und Frauen über Rohmilch und Rohrahm (Rohmilchverordnung)</ueberschrift>
- <absatz typ="promkleinlsatz" halign="j">Auf Grund des § 14 Z 1 des Lebensmittelsicherheits- und Verbraucherschutzgesetzes <kidea></kidea> LMSVG, BGBl. I Nr. 13/2006, geändert durch das Bundesgesetz BGBl. I Nr. 151/2005, wird im Einvernehmen mit dem Bundesminister für Land- und Forstwirtschaft, Umwelt und Wasserwirtschaft verordnet:</absatz>
- <ueberschrift typ="para" halign="c">Geltungsbereich</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>1.</gldsym> Diese Verordnung regelt das Inverkehrbringen von Rohmilch und Rohrahm, die für den unmittelbaren menschlichen Verzehr bestimmt sind sowie damit in Zusammenhang stehende Behandlungs- und Kennzeichnungvorschriften.</absatz>
- <ueberschrift typ="para" halign="c">Allgemeine Bestimmungen</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>2.</gldsym> (1) Rohmilch und Rohrahm dürfen nur direkt vom Tierhalter an den Endverbraucher oder an Einzelhandelsunternehmen und von diesen Einzelhandelsunternehmen direkt an den Endverbraucher abgegeben werden.</absatz>
- <absatz typ="abs" halign="j">(2) Rohmilch und Rohrahm dürfen nicht an Schulen und Kindergärten abgegeben werden. Andere Einrichtungen der Gemeinschaftsversorgung, denen Rohmilch oder Rohrahm gemäß Abs. 1 abgegeben wird, dürfen diese nur zum Zwecke der Herstellung von Speisen und Getränken verwenden, die einem Erhitzungsverfahren unterzogen werden, mit dem eine ausreichend hohe Kerntemperatur erzielt wird, um die Abtötung von pathogenen Mikroorganismen sicherzustellen.</absatz>
- <ueberschrift typ="para" halign="c">Milchautomaten</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>3.</gldsym> Rohmilch kann durch einen nach anerkannten Kriterien geprüften Milchautomaten abgegeben werden, wenn gewährleistet ist, dass die Rohmilch durch den Milchautomaten oder dessen Standort keine hygienisch nachteilige Beeinträchtigung erfährt.</absatz>
- <ueberschrift typ="para" halign="c">Zeitpunkt der Abgabe</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>4.</gldsym> Rohmilch darf nur am Tag der Gewinnung und an den zwei darauf folgenden Tagen abgegeben werden. Rohrahm darf nur am Tag der Gewinnung der Rohmilch oder am darauf folgenden Tag aus dieser hergestellt und abgegeben werden.</absatz>
- <ueberschrift typ="para" halign="c">Kennzeichnung</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>5.</gldsym> (1) Unbeschadet der Bestimmungen der Lebensmittelkennzeichnungsverordnung 1993 - LMKV, BGBl. Nr. 72/1993 in der jeweils geltenden Fassung, ist Rohmilch zum unmittelbaren menschlichen Verzehr mit dem Hinweis <bdquo></bdquo>Rohmilch, vor dem Verzehr abkochen<ldquo></ldquo> und Rohrahm mit dem Hinweis <bdquo></bdquo>Rohrahm, nur zur Herstellung von durcherhitzten Speisen verwenden<ldquo></ldquo> zu deklarieren.</absatz>
- <absatz typ="abs" halign="j">(2) Bei Rohmilch und Rohrahm, die nicht gemäß der Lebensmittelkennzeichnungsverordnung 1993 -LMKV zu kennzeichnen sind und nicht zum unmittelbaren Verzehr an Ort und Stelle bestimmt sind, hat der Hinweis gemäß Abs. 1 - bei Abgabe an den Endverbraucher - auf einem Aushang, den der Endverbraucher einsehen kann, deutlich lesbar zu erfolgen. Bei Abgabe an Einzelhandelsunternehmen ist auf dem Transportbehälter und auf den die Ware begleitenden Dokumenten, wie Lieferschein oder Rechnung <bdquo></bdquo>Rohmilch<ldquo></ldquo> oder <bdquo></bdquo>Rohrahm<ldquo></ldquo> anzugeben.</absatz>
- <ueberschrift typ="para" halign="c">Kriterien</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>6.</gldsym> Rohmilch muss folgende Kriterien erfüllen:</absatz>
- <liste>
- <ziffernliste ebene="1">
- <listelem>
- <symbol stellen="2">1.</symbol>Rohe Kuhmilch:</listelem>
- </ziffernliste>
- <schluss typ="Ziff">a) Keimzahl bei 30°C (pro ml): <binary nr="1" shapetype="is" height="12" width="10,2" alt="" brightness="0,5" contrast="0,5" oleclass="unknown" datatype="gif">
- <src>./Bilder-Dateien/Bilder.img1is.gif</src></binary> 50 000;</schluss>
- <schluss typ="Ziff">b) Somatische Zellen (pro ml): <binary nr="2" shapetype="is" height="12" width="10,2" alt="" brightness="0,5" contrast="0,5" oleclass="unknown" datatype="gif">
- <src>./Bilder-Dateien/Bilder.img2is.gif</src></binary> 400 000.</schluss>
- <ziffernliste ebene="1">
- <listelem>
- <symbol stellen="2">2.</symbol>Rohmilch von anderen Tierarten: Keimzahl bei 30°C (pro ml): <binary nr="3" shapetype="is" height="12" width="10,2" alt="" brightness="0,5" contrast="0,5" oleclass="unknown" datatype="gif">
- <src>./Bilder-Dateien/Bilder.img3is.gif</src></binary> 500 000.</listelem>
- </ziffernliste>
- </liste>
- <ueberschrift typ="para" halign="c">Personenbezogene Bezeichnungen</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>7.</gldsym> Bei den in dieser Verordnung verwendeten personenbezogenen Bezeichnungen gilt die gewählte Form für beide Geschlechter.</absatz>
- <ueberschrift typ="para" halign="c">Schlussbestimmung</ueberschrift>
- <absatz typ="abs" halign="j">
- <gldsym>§<nbsp></nbsp>8.</gldsym> Diese Verordnung wurde unter Einhaltung der Bestimmungen der Richtlinie 98/34/EG über ein Informationsverfahren auf dem Gebiet der Normen und technischen Vorschriften, ABl. Nr. L 204 vom 21. Juli 1998 und des Artikels 10 Abs. 5 der Verordnung (EG) Nr. 853/2004 mit spezifischen Hygienevorschriften für Lebensmittel tierischen Ursprungs, ABl. Nr. L 139 vom 30. April 2004, berichtigt durch ABl. Nr. L 226 vom 25. Juni 2004, notifiziert.</absatz>
- <unterschrift typ="links">Rauch-Kallat</unterschrift>
- </abschnitt>
- </nutzdaten>
- <layoutdaten paperf="7" paperh="842" paperw="595.35" margl="85.05" margr="85.05" margt="85.05" margb="85.05" headerd="28.35" footerd="65.2" gutter="0" gutterpos="0" deftab="35.4"></layoutdaten>
-</erechtdok> \ No newline at end of file
diff --git a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__204_2006.iso8859.xml b/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__204_2006.iso8859.xml
deleted file mode 100644
index 38f0f2772..000000000
--- a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__204_2006.iso8859.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<erechtdok stylesheet="eRechtXML2XHTML11_1.9.1.xsl" h-version="2.8.2_24.05.2006" h-creator="RTF2XML.Converter_30. Mai 2006_10:06:50(2792)" h-created="30. Mai 2006, 10:06:53" xmlns="http://www.bka.gv.at">
-<metadaten></metadaten>
-<nutzdaten>
-<abschnitt nr="1" typ="ns" paperf="h" endnhier="true">
-<kzinhalt typ="p">
-<absatz typ="kz" halign="j">
-<tab align="z" position="212,65" leader="o"></tab>BGBl. II - Ausgegeben am 30. Mai 2006 - Nr. 204<tab align="r" position="425,25" leader="o"></tab>Seite <feld code="+PAGE++%5C%2A+MERGEFORMAT+">1</feld> von <feld code="+NUMPAGES++%5C%2A+MERGEFORMAT+">1</feld>
-</absatz>
-</kzinhalt>
-<kzinhalt typ="f">
-<absatz typ="kz" halign="j">
-<tab align="z" position="212,65" leader="o"></tab>
-<tab align="r" position="425,25" leader="o"></tab>
-<feld code="+PAGE++%5C%2A+MERGEFORMAT+">1</feld> von <feld code="+NUMPAGES++%5C%2A+MERGEFORMAT+">1</feld>
-</absatz>
-</kzinhalt>
-<fzinhalt typ="p">
-<absatz typ="fz" halign="j">www.ris.bka.gv.at</absatz>
-</fzinhalt>
-<fzinhalt typ="f">
-<absatz typ="fz" halign="j">www.ris.bka.gv.at</absatz>
-</fzinhalt>
-<ueberschrift typ="bdgesblatt" halign="c">BUNDESGESETZBLATT</ueberschrift>
-<ueberschrift typ="repoesterr" halign="c">FÜR DIE REPUBLIK ÖSTERREICH</ueberschrift>
-<ausgabe>
-<adtext>Jahrgang 2006</adtext>
-<addat>Ausgegeben am 30. Mai 2006</addat>
-<adid>Teil<nbsp></nbsp>II</adid>
-</ausgabe>
-<ueberschrift typ="kurztitel" halign="j">204. Verordnung: Änderung der Schiffstechnikverordnung</ueberschrift>
-<ueberschrift typ="titel" halign="j">204. Verordnung des Bundesministers für Verkehr, Innovation und Technologie, mit der die Schiffstechnikverordnung geändert wird</ueberschrift>
-<absatz typ="promkleinlsatz" halign="j">Auf Grund des §<nbsp></nbsp>109 Abs.<nbsp></nbsp>7 des Schifffahrtsgesetzes, BGBl.<nbsp></nbsp>I Nr.<nbsp></nbsp>62/1997 in der Fassung BGBl.<nbsp></nbsp>I Nr.<nbsp></nbsp>123/2005, wird verordnet:</absatz>
-<absatz typ="novao1" halign="j">Dem §<nbsp></nbsp>26 der Schiffstechnikverordnung, BGBl. Nr.<nbsp></nbsp>450/1993, zuletzt geändert durch BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>196/1997, werden folgende Absätze 8 und 9 angefügt:</absatz>
-<absatz typ="abs" halign="j">
-<bdquo></bdquo>(8) Motoren der Kategorien V 1:1, V 1:2 und V 1:3 gemäß Verordnung des Bundesministers für Wirtschaft und Arbeit über Maßnahmen zur Bekämpfung der Emission von gasförmigen Schadstoffen und luftverunreinigenden Partikeln aus Verbrennungsmotoren für mobile Maschinen und Geräte, BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>136/2005, dürfen nach dem 31.<nbsp></nbsp>Dezember 2006 nur als Haupt- oder Hilfsmaschinen in Fahrzeuge, ausgenommen Kleinfahrzeuge, eingebaut werden, wenn sie über eine Typgenehmigung gemäß §<nbsp></nbsp>10 Absatz 3e dieser Verordnung verfügen.</absatz>
-<absatz typ="abs" halign="j">(9) Motoren der Kategorien V 1:4 und V 2 gemäß Verordnung des Bundesministers für Wirtschaft und Arbeit über Maßnahmen zur Bekämpfung der Emission von gasförmigen Schadstoffen und luftverunreinigenden Partikeln aus Verbrennungsmotoren für mobile Maschinen und Geräte, BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>136/2005, dürfen nach dem 31.<nbsp></nbsp>Dezember 2008 nur als Haupt- oder Hilfsmaschinen in Fahrzeuge, ausgenommen Kleinfahrzeuge, eingebaut werden, wenn sie über eine Typgenehmigung gemäß §<nbsp></nbsp>10 Absatz 3e dieser Verordnung verfügen.<ldquo></ldquo>
-</absatz>
-<unterschrift typ="links">Gorbach</unterschrift>
-</abschnitt>
-</nutzdaten>
-<layoutdaten paperf="7" paperh="841.9" paperw="595.3" margl="85.05" margr="85.05" margt="85.05" margb="85.05" headerd="28.35" footerd="65.2" gutter="0" gutterpos="0" deftab="35.4"></layoutdaten>
-</erechtdok>
diff --git a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__204_2006.utf8.xml b/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__204_2006.utf8.xml
deleted file mode 100644
index 97c430ce8..000000000
--- a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__204_2006.utf8.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<erechtdok stylesheet="eRechtXML2XHTML11_1.9.1.xsl" h-version="2.8.2_24.05.2006" h-creator="RTF2XML.Converter_30. Mai 2006_10:06:50(2792)" h-created="30. Mai 2006, 10:06:53" xmlns="http://www.bka.gv.at">
-<metadaten></metadaten>
-<nutzdaten>
-<abschnitt nr="1" typ="ns" paperf="h" endnhier="true">
-<kzinhalt typ="p">
-<absatz typ="kz" halign="j">
-<tab align="z" position="212,65" leader="o"></tab>BGBl. II - Ausgegeben am 30. Mai 2006 - Nr. 204<tab align="r" position="425,25" leader="o"></tab>Seite <feld code="+PAGE++%5C%2A+MERGEFORMAT+">1</feld> von <feld code="+NUMPAGES++%5C%2A+MERGEFORMAT+">1</feld>
-</absatz>
-</kzinhalt>
-<kzinhalt typ="f">
-<absatz typ="kz" halign="j">
-<tab align="z" position="212,65" leader="o"></tab>
-<tab align="r" position="425,25" leader="o"></tab>
-<feld code="+PAGE++%5C%2A+MERGEFORMAT+">1</feld> von <feld code="+NUMPAGES++%5C%2A+MERGEFORMAT+">1</feld>
-</absatz>
-</kzinhalt>
-<fzinhalt typ="p">
-<absatz typ="fz" halign="j">www.ris.bka.gv.at</absatz>
-</fzinhalt>
-<fzinhalt typ="f">
-<absatz typ="fz" halign="j">www.ris.bka.gv.at</absatz>
-</fzinhalt>
-<ueberschrift typ="bdgesblatt" halign="c">BUNDESGESETZBLATT</ueberschrift>
-<ueberschrift typ="repoesterr" halign="c">FÜR DIE REPUBLIK ÖSTERREICH</ueberschrift>
-<ausgabe>
-<adtext>Jahrgang 2006</adtext>
-<addat>Ausgegeben am 30. Mai 2006</addat>
-<adid>Teil<nbsp></nbsp>II</adid>
-</ausgabe>
-<ueberschrift typ="kurztitel" halign="j">204. Verordnung: Änderung der Schiffstechnikverordnung</ueberschrift>
-<ueberschrift typ="titel" halign="j">204. Verordnung des Bundesministers für Verkehr, Innovation und Technologie, mit der die Schiffstechnikverordnung geändert wird</ueberschrift>
-<absatz typ="promkleinlsatz" halign="j">Auf Grund des §<nbsp></nbsp>109 Abs.<nbsp></nbsp>7 des Schifffahrtsgesetzes, BGBl.<nbsp></nbsp>I Nr.<nbsp></nbsp>62/1997 in der Fassung BGBl.<nbsp></nbsp>I Nr.<nbsp></nbsp>123/2005, wird verordnet:</absatz>
-<absatz typ="novao1" halign="j">Dem §<nbsp></nbsp>26 der Schiffstechnikverordnung, BGBl. Nr.<nbsp></nbsp>450/1993, zuletzt geändert durch BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>196/1997, werden folgende Absätze 8 und 9 angefügt:</absatz>
-<absatz typ="abs" halign="j">
-<bdquo></bdquo>(8) Motoren der Kategorien V 1:1, V 1:2 und V 1:3 gemäß Verordnung des Bundesministers für Wirtschaft und Arbeit über Maßnahmen zur Bekämpfung der Emission von gasförmigen Schadstoffen und luftverunreinigenden Partikeln aus Verbrennungsmotoren für mobile Maschinen und Geräte, BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>136/2005, dürfen nach dem 31.<nbsp></nbsp>Dezember 2006 nur als Haupt- oder Hilfsmaschinen in Fahrzeuge, ausgenommen Kleinfahrzeuge, eingebaut werden, wenn sie über eine Typgenehmigung gemäß §<nbsp></nbsp>10 Absatz 3e dieser Verordnung verfügen.</absatz>
-<absatz typ="abs" halign="j">(9) Motoren der Kategorien V 1:4 und V 2 gemäß Verordnung des Bundesministers für Wirtschaft und Arbeit über Maßnahmen zur Bekämpfung der Emission von gasförmigen Schadstoffen und luftverunreinigenden Partikeln aus Verbrennungsmotoren für mobile Maschinen und Geräte, BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>136/2005, dürfen nach dem 31.<nbsp></nbsp>Dezember 2008 nur als Haupt- oder Hilfsmaschinen in Fahrzeuge, ausgenommen Kleinfahrzeuge, eingebaut werden, wenn sie über eine Typgenehmigung gemäß §<nbsp></nbsp>10 Absatz 3e dieser Verordnung verfügen.<ldquo></ldquo>
-</absatz>
-<unterschrift typ="links">Gorbach</unterschrift>
-</abschnitt>
-</nutzdaten>
-<layoutdaten paperf="7" paperh="841.9" paperw="595.3" margl="85.05" margr="85.05" margt="85.05" margb="85.05" headerd="28.35" footerd="65.2" gutter="0" gutterpos="0" deftab="35.4"></layoutdaten>
-</erechtdok>
diff --git a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__341_2004.iso8859.xml b/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__341_2004.iso8859.xml
deleted file mode 100644
index c014b868c..000000000
--- a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__341_2004.iso8859.xml
+++ /dev/null
@@ -1,550 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<erechtdok stylesheet="eRechtXML2XHTML11_1.8.6.xsl" h-version="2.6.1_01.07.2004" h-creator="RTF2XML.Converter_30. August 2004_11:28:59(2460)" h-created="30. August 2004, 11:29:02" xmlns="http://www.bka.gv.at">
-<metadaten xmlns:bka="http://www.bka.gv.at">
-<sachbea>SCHMIDL, Renate</sachbea>
-<legist>Mag. Christine Hochholdinger</legist>
-<dokId>COO_2026_100_2_123336</dokId>
-<vorhabenId>COO_2026_100_2_123331</vorhabenId>
-<dokName>Entwurf</dokName>
-</metadaten>
-<nutzdaten>
-<abschnitt nr="1" typ="ns" paperf="h" endnhier="true">
-<kzinhalt typ="p">
-<absatz typ="kz">
-<tab align="z" position="212,65" leader="o"></tab>BGBl. II <kidea></kidea> Ausgegeben am 30. August 2004 <kidea></kidea> Nr. 341 <tab align="r" position="425,25" leader="o"></tab>
-<feld code=" PAGE ">2</feld> von <feld code=" NUMPAGES ">3</feld>
-</absatz>
-</kzinhalt>
-<kzinhalt typ="f">
-<absatz typ="kz">
-<tab align="z" position="212,65" leader="o"></tab>
-<tab align="r" position="425,25" leader="o"></tab>
-<feld code=" PAGE ">1</feld> von <feld code=" NUMPAGES ">3</feld>
-</absatz>
-</kzinhalt>
-<fzinhalt typ="p">
-<absatz typ="fz">www.ris.bka.gv.at</absatz>
-</fzinhalt>
-<fzinhalt typ="f">
-<absatz typ="fz">www.ris.bka.gv.at</absatz>
-</fzinhalt>
-<ueberschrift typ="bdgesblatt">BUNDESGESETZBLATT</ueberschrift>
-<ueberschrift typ="repoesterr">FÜR DIE REPUBLIK ÖSTERREICH</ueberschrift>
-<ausgabe>
-<adtext>Jahrgang 2004 </adtext>
-<addat>Ausgegeben am 30. August 2004 </addat>
-<adid>Teil II</adid>
-</ausgabe>
-<ueberschrift typ="kurztitel">341. Verordnung:<tab></tab>Änderung der Altlastenatlas-VO</ueberschrift>
-<ueberschrift typ="titel">341. Verordnung des Bundesministers für Land- und Forstwirtschaft, Umwelt und Wasserwirtschaft, mit der die Altlastenatlas-VO geändert wird</ueberschrift>
-<absatz typ="promkleinlsatz">Auf Grund der §§<nbsp></nbsp>13 und 14 des Altlastensanierungsgesetzes, BGBl. Nr.<nbsp></nbsp>299/1989, in der Fassung des Bundesgesetzes BGBl.<nbsp></nbsp>I Nr.<nbsp></nbsp>71/2003, wird verordnet:</absatz>
-<absatz typ="promkleinlsatz">Die Altlastenatlas-VO, BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>232/2004, wird wie folgt geändert:</absatz>
-<absatz typ="novao1">1. Der bisherige Text des §<nbsp></nbsp>2 erhält die Absatzbezeichnung <bdquo></bdquo>(1)<ldquo></ldquo> und folgender Abs.<nbsp></nbsp>2 wird angefügt:</absatz>
-<absatz typ="abs">
-<bdquo></bdquo>(2) Die Anhänge<nbsp></nbsp>3 und <nbsp></nbsp>4 in der Fassung der Verordnung BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>341/2004 treten mit 15.<nbsp></nbsp>September 2004 in Kraft.<ldquo></ldquo>
-</absatz>
-<absatz typ="novao1">2. Im Anhang 3 wird folgender Eintrag ALTLAST N54 angefügt:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST N54: Beizschlammdeponie Ternitz</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Neunkirchen</absatz>
-<absatz typ="tabtext">Ternitz</absatz>
-<absatz typ="tabtext">Dunkelstein (23303)</absatz>
-<absatz typ="tabtext">734/1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altablagerung</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">2</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<absatz typ="novao1">3. Im Anhang 4 lautet der Eintrag ALTLAST O50:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST O50: Schwellenimprägnierung Schneegattern</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Braunau am Inn</absatz>
-<absatz typ="tabtext">Lengau</absatz>
-<absatz typ="tabtext">Krenwald (40114)</absatz>
-<absatz typ="tabtext">470/1, 523/5, 604/3, 956, 985/4, 986/7</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">21.8.2001</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">3</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<absatz typ="novao1">4. Im Anhang 4 lauten die Einträge ALTLAST O60 bis O62:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST O60: Putzerei Exclusiv Schwab</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">.318/7</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">29.8.2003</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">ALTLAST O61: Putzerei Szöts</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">.900</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2003</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">2</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">ALTLAST O62: Putzerei Schwab-Norge</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">.466</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">10.9.2003</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<absatz typ="novao1">5. Im Anhang 4 lautet der Eintrag ALTLAST O64:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST O64: Kitzmantel</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Gmunden</absatz>
-<absatz typ="tabtext">Vorchdorf</absatz>
-<absatz typ="tabtext">Vorchdorf (42164)</absatz>
-<absatz typ="tabtext">376/1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altablagerung</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">25.12.2003</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">3</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<absatz typ="novao1">6. Im Anhang 4 werden folgende Einträge ALTLAST O65 bis O67 angefügt:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST O65: Rappersberger Chemikalien</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">482/1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">-</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">ALTLAST O66: Putzerei Käferböck</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">.372/2</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">ALTLAST O67: BP-Tanklager Linz 1 alt - Schadensfall SF2A</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Lustenau (45204)</absatz>
-<absatz typ="tabtext">1485/2, 1485/8</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">3</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<unterschrift typ="links">Pröll</unterschrift>
-</abschnitt>
-</nutzdaten>
-<layoutdaten paperf="7" paperh="841.9" paperw="595.3" margl="85.05" margr="85.05" margt="85.05" margb="85.05" headerd="28.35" footerd="65.2" gutter="0" gutterpos="0" deftab="35.4"></layoutdaten>
-</erechtdok>
diff --git a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__341_2004.utf8.xml b/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__341_2004.utf8.xml
deleted file mode 100644
index 6f810e4b8..000000000
--- a/spss.slinterface/test/moa-wartung-la9/BGBl__II_Nr__341_2004.utf8.xml
+++ /dev/null
@@ -1,550 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<erechtdok stylesheet="eRechtXML2XHTML11_1.8.6.xsl" h-version="2.6.1_01.07.2004" h-creator="RTF2XML.Converter_30. August 2004_11:28:59(2460)" h-created="30. August 2004, 11:29:02" xmlns="http://www.bka.gv.at">
-<metadaten xmlns:bka="http://www.bka.gv.at">
-<sachbea>SCHMIDL, Renate</sachbea>
-<legist>Mag. Christine Hochholdinger</legist>
-<dokId>COO_2026_100_2_123336</dokId>
-<vorhabenId>COO_2026_100_2_123331</vorhabenId>
-<dokName>Entwurf</dokName>
-</metadaten>
-<nutzdaten>
-<abschnitt nr="1" typ="ns" paperf="h" endnhier="true">
-<kzinhalt typ="p">
-<absatz typ="kz">
-<tab align="z" position="212,65" leader="o"></tab>BGBl. II <kidea></kidea> Ausgegeben am 30. August 2004 <kidea></kidea> Nr. 341 <tab align="r" position="425,25" leader="o"></tab>
-<feld code=" PAGE ">2</feld> von <feld code=" NUMPAGES ">3</feld>
-</absatz>
-</kzinhalt>
-<kzinhalt typ="f">
-<absatz typ="kz">
-<tab align="z" position="212,65" leader="o"></tab>
-<tab align="r" position="425,25" leader="o"></tab>
-<feld code=" PAGE ">1</feld> von <feld code=" NUMPAGES ">3</feld>
-</absatz>
-</kzinhalt>
-<fzinhalt typ="p">
-<absatz typ="fz">www.ris.bka.gv.at</absatz>
-</fzinhalt>
-<fzinhalt typ="f">
-<absatz typ="fz">www.ris.bka.gv.at</absatz>
-</fzinhalt>
-<ueberschrift typ="bdgesblatt">BUNDESGESETZBLATT</ueberschrift>
-<ueberschrift typ="repoesterr">FÜR DIE REPUBLIK ÖSTERREICH</ueberschrift>
-<ausgabe>
-<adtext>Jahrgang 2004 </adtext>
-<addat>Ausgegeben am 30. August 2004 </addat>
-<adid>Teil II</adid>
-</ausgabe>
-<ueberschrift typ="kurztitel">341. Verordnung:<tab></tab>Änderung der Altlastenatlas-VO</ueberschrift>
-<ueberschrift typ="titel">341. Verordnung des Bundesministers für Land- und Forstwirtschaft, Umwelt und Wasserwirtschaft, mit der die Altlastenatlas-VO geändert wird</ueberschrift>
-<absatz typ="promkleinlsatz">Auf Grund der §§<nbsp></nbsp>13 und 14 des Altlastensanierungsgesetzes, BGBl. Nr.<nbsp></nbsp>299/1989, in der Fassung des Bundesgesetzes BGBl.<nbsp></nbsp>I Nr.<nbsp></nbsp>71/2003, wird verordnet:</absatz>
-<absatz typ="promkleinlsatz">Die Altlastenatlas-VO, BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>232/2004, wird wie folgt geändert:</absatz>
-<absatz typ="novao1">1. Der bisherige Text des §<nbsp></nbsp>2 erhält die Absatzbezeichnung <bdquo></bdquo>(1)<ldquo></ldquo> und folgender Abs.<nbsp></nbsp>2 wird angefügt:</absatz>
-<absatz typ="abs">
-<bdquo></bdquo>(2) Die Anhänge<nbsp></nbsp>3 und <nbsp></nbsp>4 in der Fassung der Verordnung BGBl.<nbsp></nbsp>II Nr.<nbsp></nbsp>341/2004 treten mit 15.<nbsp></nbsp>September 2004 in Kraft.<ldquo></ldquo>
-</absatz>
-<absatz typ="novao1">2. Im Anhang 3 wird folgender Eintrag ALTLAST N54 angefügt:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST N54: Beizschlammdeponie Ternitz</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Neunkirchen</absatz>
-<absatz typ="tabtext">Ternitz</absatz>
-<absatz typ="tabtext">Dunkelstein (23303)</absatz>
-<absatz typ="tabtext">734/1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altablagerung</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">2</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<absatz typ="novao1">3. Im Anhang 4 lautet der Eintrag ALTLAST O50:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST O50: Schwellenimprägnierung Schneegattern</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Braunau am Inn</absatz>
-<absatz typ="tabtext">Lengau</absatz>
-<absatz typ="tabtext">Krenwald (40114)</absatz>
-<absatz typ="tabtext">470/1, 523/5, 604/3, 956, 985/4, 986/7</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">21.8.2001</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">3</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<absatz typ="novao1">4. Im Anhang 4 lauten die Einträge ALTLAST O60 bis O62:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST O60: Putzerei Exclusiv Schwab</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">.318/7</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">29.8.2003</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">ALTLAST O61: Putzerei Szöts</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">.900</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2003</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">2</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">ALTLAST O62: Putzerei Schwab-Norge</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">.466</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">10.9.2003</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<absatz typ="novao1">5. Im Anhang 4 lautet der Eintrag ALTLAST O64:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST O64: Kitzmantel</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Gmunden</absatz>
-<absatz typ="tabtext">Vorchdorf</absatz>
-<absatz typ="tabtext">Vorchdorf (42164)</absatz>
-<absatz typ="tabtext">376/1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altablagerung</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">25.12.2003</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">3</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<absatz typ="novao1">6. Im Anhang 4 werden folgende Einträge ALTLAST O65 bis O67 angefügt:</absatz>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">
-<bdquo></bdquo>ALTLAST O65: Rappersberger Chemikalien</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">482/1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">-</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">-</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">ALTLAST O66: Putzerei Käferböck</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Urfahr (45212)</absatz>
-<absatz typ="tabtext">.372/2</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">1</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-</table>
-<abstand></abstand>
-<table border="1" cellspacing="0" cellpadding="0" width="567" style="width:15.0cm;border-collapse:collapse;border:none">
-<tr>
-<td width="567" colspan="2" valign="top" style="width:15.0cm;border:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<ueberschrift typ="erll">ALTLAST O67: BP-Tanklager Linz 1 alt - Schadensfall SF2A</ueberschrift>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Bezirk:</absatz>
-<absatz typ="tabtextr">Gemeinde:</absatz>
-<absatz typ="tabtextr">Katastralgemeinde:</absatz>
-<absatz typ="tabtextr">Grundstücksnummern:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Linz</absatz>
-<absatz typ="tabtext">Lustenau (45204)</absatz>
-<absatz typ="tabtext">1485/2, 1485/8</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Art der Altlast:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">Altstandort</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Altlastausweisung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Prioritätenklasse:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">3</absatz>
-</td>
-</tr>
-<tr>
-<td width="209" valign="top" style="width:157.0pt;border:solid windowtext 1.0pt; border-top:none;padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtextr">Datum der Prioritätenklassifizierung:</absatz>
-</td>
-<td width="358" valign="top" style="width:268.25pt;border-top:none;border-left: none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt; padding:2.85pt 2.85pt 2.85pt 2.85pt">
-<absatz typ="tabtext">15.9.2004<ldquo></ldquo>
-</absatz>
-</td>
-</tr>
-</table>
-<unterschrift typ="links">Pröll</unterschrift>
-</abschnitt>
-</nutzdaten>
-<layoutdaten paperf="7" paperh="841.9" paperw="595.3" margl="85.05" margr="85.05" margt="85.05" margb="85.05" headerd="28.35" footerd="65.2" gutter="0" gutterpos="0" deftab="35.4"></layoutdaten>
-</erechtdok>
diff --git a/spss.slinterface/test/moa-wartung-la9/moa-wartung-la9.zip b/spss.slinterface/test/moa-wartung-la9/moa-wartung-la9.zip
deleted file mode 100644
index 54d012c9d..000000000
--- a/spss.slinterface/test/moa-wartung-la9/moa-wartung-la9.zip
+++ /dev/null
Binary files differ
diff --git a/spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__106_2006.xml b/spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__106_2006.xml
deleted file mode 100644
index 6ed145191..000000000
--- a/spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__106_2006.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><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="dokument.xml" Id="reference-1-1"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><stylesheet version="1.0" xmlns="http://www.w3.org/1999/XSL/Transform"><include href="stylesheet.xsl" /></stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><dsig:DigestValue>NPbycy/WxCxeWTH1KWTS61Sl3Qo=</dsig:DigestValue></dsig:Reference><dsig:Reference URI="./Bilder-Dateien/Bilder.img1is.gif" Type="http://www.buergerkarte.at/specifications/Security-Layer/20031113?Name=SignedImage&amp;InstanceDocRef=0" Id="reference-1-2"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><dsig:DigestValue>VxfA0lOw1IrRcZ/mtLJnjN235tw=</dsig:DigestValue></dsig:Reference><dsig:Reference URI="./Bilder-Dateien/Bilder.img2is.gif" Type="http://www.buergerkarte.at/specifications/Security-Layer/20031113?Name=SignedImage&amp;InstanceDocRef=0" Id="reference-1-3"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><dsig:DigestValue>VxfA0lOw1IrRcZ/mtLJnjN235tw=</dsig:DigestValue></dsig:Reference><dsig:Reference URI="./Bilder-Dateien/Bilder.img3is.gif" Type="http://www.buergerkarte.at/specifications/Security-Layer/20031113?Name=SignedImage&amp;InstanceDocRef=0" Id="reference-1-4"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><dsig:DigestValue>VxfA0lOw1IrRcZ/mtLJnjN235tw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>m+LsMeF1y6oEDvNaxzQZzGu2jicilXuIeDwY3tPRWquc3MZrhEPmjZGgh9D3kg9G
-mEikxklLQ1xA0JDCHlBbupYq/wzb+IKMPfGm6CZuO4NxW/dBexLsNrj5BA9hW3pl
-TnPWO8ZUtAb67YYVLUtcWxzswxLK/aZmmvq6/vUy3I8=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIE4TCCA8mgAwIBAgICUuUwDQYJKoZIhvcNAQEFBQAwgZ8xCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIjAgBgNVBAsTGWEtc2lnbi1jb3Jw
-b3JhdGUtbGlnaHQtMDExIjAgBgNVBAMTGWEtc2lnbi1jb3Jwb3JhdGUtbGlnaHQt
-MDEwHhcNMDMxMjEwMTcyMzA3WhcNMDYxMjEwMTcyMzA3WjCBnzELMAkGA1UEBhMC
-QVQxWTBXBgNVBAoeUABCAHUAbgBkAGUAcwBrAGEAbgB6AGwAZQByAGEAbQB0ACAA
-ZABlAHIAIABSAGUAcAB1AGIAbABpAGsAIADWAHMAdABlAHIAcgBlAGkAYwBoMRow
-GAYDVQQLExFWZXJmYXNzdW5nc2RpZW5zdDEZMBcGA1UEAxMQQ2hyaXN0aWFuIFdy
-ZWdhcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv7Z6w9XhQLoIxipExnL7
-go/rp5Leh/y0E8mjS7XKe4acgmb/+p7cyAIzDjSY4Jse4xz9cKb+0hrEyKJjvR61
-Tl4lJxQsdYan3rLqcruPlC0GRkAgiiRdLwvAaAUBqzYxzTjKvdZBdcnuY+S2Ad1Z
-5N5zAF2XRzykcsmLRZvpvJ8CAwEAAaOCAacwggGjMAkGA1UdEwQCMAAwEQYDVR0O
-BAoECEhNunRQSAFFMF0GA1UdIARWMFQwUgYHKigAEQEOATBHMEUGCCsGAQUFBwIB
-FjlodHRwOi8vd3d3LmEtdHJ1c3QuYXQvZG9jcy9jcC9hc2lnbi1nb3Zlcm5tZW50
-LXNlcnZlci5wZGYwEwYDVR0jBAwwCoAITp5/1C/JHx8wfwYIKwYBBQUHAQEEczBx
-MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRydXN0LmF0L29jc3AwRgYIKwYB
-BQUHMAKGOmh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNpZ24tY29ycG9y
-YXRlLWxpZ2h0LTAxYS5jcnQwDgYDVR0PAQH/BAQDAgeAMG4GA1UdHwRnMGUwY6Bh
-oF+GXWxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1s
-aWdodC0wMSxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0
-PzAOBgcqKAAKAQEBBAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFIWZVsrHNwZDSkE
-44Cyc1cCJU49CrjsX7OPG43notq9JPRPMvbVAOrN3g0H8x2oOSYoxscKut1IqLxc
-xUVKYuCZEQBj0FZTYLFIuK8//vPOwmTSTBKMjKZpkkxfdcM5JX+nGdJgfqndjqPw
-e9lZ213EMIEfEf1Nfr5R0MNk1uCUg9diqEpDcUdVks2KN4/zQVuNRlGFgM+y8E2N
-VFopTtCBhSj6nuxeIbpbEOmjuAfF5zoVAJg4nj4DKJC8oiaY+KR+817fXpHclzxd
-f1s0aVpqdOf7Dc0FXjrCBGKpyjcN4Qj9zioy5J6awkiWDF9CQICxwt4TYB1lS8Vx
-Z+ghQ0g=</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature> \ No newline at end of file
diff --git a/spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__204_2006.xml b/spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__204_2006.xml
deleted file mode 100644
index cd20d235a..000000000
--- a/spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__204_2006.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><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="dokument.xml" Id="reference-1-1"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><stylesheet version="1.0" xmlns="http://www.w3.org/1999/XSL/Transform"><include href="stylesheet.xsl" /></stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><dsig:DigestValue>RujiliZvytFe0R20bw1wQQhjesw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Bi5mWS19bCHic6Y/OgRLtstf4eLnRlH9mvSxw8itcsLjVYFtavxhfVDknwSmJtj0
-H6raS0tp6l5HUisl9G1/CV9DTRmwWCyq4KZoiGnT0fKJYvnVPKeI6iy69fWYMcdy
-NiXv88YXa4zlMwjgUbQF1ExB3iRb2FXncSKXGTfBMMY=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIE4TCCA8mgAwIBAgICUuUwDQYJKoZIhvcNAQEFBQAwgZ8xCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIjAgBgNVBAsTGWEtc2lnbi1jb3Jw
-b3JhdGUtbGlnaHQtMDExIjAgBgNVBAMTGWEtc2lnbi1jb3Jwb3JhdGUtbGlnaHQt
-MDEwHhcNMDMxMjEwMTcyMzA3WhcNMDYxMjEwMTcyMzA3WjCBnzELMAkGA1UEBhMC
-QVQxWTBXBgNVBAoeUABCAHUAbgBkAGUAcwBrAGEAbgB6AGwAZQByAGEAbQB0ACAA
-ZABlAHIAIABSAGUAcAB1AGIAbABpAGsAIADWAHMAdABlAHIAcgBlAGkAYwBoMRow
-GAYDVQQLExFWZXJmYXNzdW5nc2RpZW5zdDEZMBcGA1UEAxMQQ2hyaXN0aWFuIFdy
-ZWdhcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv7Z6w9XhQLoIxipExnL7
-go/rp5Leh/y0E8mjS7XKe4acgmb/+p7cyAIzDjSY4Jse4xz9cKb+0hrEyKJjvR61
-Tl4lJxQsdYan3rLqcruPlC0GRkAgiiRdLwvAaAUBqzYxzTjKvdZBdcnuY+S2Ad1Z
-5N5zAF2XRzykcsmLRZvpvJ8CAwEAAaOCAacwggGjMAkGA1UdEwQCMAAwEQYDVR0O
-BAoECEhNunRQSAFFMF0GA1UdIARWMFQwUgYHKigAEQEOATBHMEUGCCsGAQUFBwIB
-FjlodHRwOi8vd3d3LmEtdHJ1c3QuYXQvZG9jcy9jcC9hc2lnbi1nb3Zlcm5tZW50
-LXNlcnZlci5wZGYwEwYDVR0jBAwwCoAITp5/1C/JHx8wfwYIKwYBBQUHAQEEczBx
-MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRydXN0LmF0L29jc3AwRgYIKwYB
-BQUHMAKGOmh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNpZ24tY29ycG9y
-YXRlLWxpZ2h0LTAxYS5jcnQwDgYDVR0PAQH/BAQDAgeAMG4GA1UdHwRnMGUwY6Bh
-oF+GXWxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1s
-aWdodC0wMSxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0
-PzAOBgcqKAAKAQEBBAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFIWZVsrHNwZDSkE
-44Cyc1cCJU49CrjsX7OPG43notq9JPRPMvbVAOrN3g0H8x2oOSYoxscKut1IqLxc
-xUVKYuCZEQBj0FZTYLFIuK8//vPOwmTSTBKMjKZpkkxfdcM5JX+nGdJgfqndjqPw
-e9lZ213EMIEfEf1Nfr5R0MNk1uCUg9diqEpDcUdVks2KN4/zQVuNRlGFgM+y8E2N
-VFopTtCBhSj6nuxeIbpbEOmjuAfF5zoVAJg4nj4DKJC8oiaY+KR+817fXpHclzxd
-f1s0aVpqdOf7Dc0FXjrCBGKpyjcN4Qj9zioy5J6awkiWDF9CQICxwt4TYB1lS8Vx
-Z+ghQ0g=</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature> \ No newline at end of file
diff --git a/spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__341_2004.xml b/spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__341_2004.xml
deleted file mode 100644
index 24c93cfbe..000000000
--- a/spss.slinterface/test/moa-wartung-la9/signatur_BGBl__II_Nr__341_2004.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"><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="dokument.xml" Id="reference-1-1"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><stylesheet version="1.0" xmlns="http://www.w3.org/1999/XSL/Transform"><include href="stylesheet.xsl" /></stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><dsig:DigestValue>zhYOFhgjFd8wmiQyzymnTVT8yMA=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>lUpyWqkJOMEGup7Jbj7mUdA32WDA5U8RwNQWqUdEM48uA7nY19Kg4X3fRnXU2C/V
-1vUaS7cTElzNwm5ZEm1Rj+eFgeMQpzUenkd7xCbhHs5H0+AfOKSNEgBuY7A6iTnQ
-McbmL9JOSflSM+nj7jeSYCI7mxVc2zIBdh7/+XgomKA=</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIIE4TCCA8mgAwIBAgICUuUwDQYJKoZIhvcNAQEFBQAwgZ8xCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIjAgBgNVBAsTGWEtc2lnbi1jb3Jw
-b3JhdGUtbGlnaHQtMDExIjAgBgNVBAMTGWEtc2lnbi1jb3Jwb3JhdGUtbGlnaHQt
-MDEwHhcNMDMxMjEwMTcyMzA3WhcNMDYxMjEwMTcyMzA3WjCBnzELMAkGA1UEBhMC
-QVQxWTBXBgNVBAoeUABCAHUAbgBkAGUAcwBrAGEAbgB6AGwAZQByAGEAbQB0ACAA
-ZABlAHIAIABSAGUAcAB1AGIAbABpAGsAIADWAHMAdABlAHIAcgBlAGkAYwBoMRow
-GAYDVQQLExFWZXJmYXNzdW5nc2RpZW5zdDEZMBcGA1UEAxMQQ2hyaXN0aWFuIFdy
-ZWdhcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv7Z6w9XhQLoIxipExnL7
-go/rp5Leh/y0E8mjS7XKe4acgmb/+p7cyAIzDjSY4Jse4xz9cKb+0hrEyKJjvR61
-Tl4lJxQsdYan3rLqcruPlC0GRkAgiiRdLwvAaAUBqzYxzTjKvdZBdcnuY+S2Ad1Z
-5N5zAF2XRzykcsmLRZvpvJ8CAwEAAaOCAacwggGjMAkGA1UdEwQCMAAwEQYDVR0O
-BAoECEhNunRQSAFFMF0GA1UdIARWMFQwUgYHKigAEQEOATBHMEUGCCsGAQUFBwIB
-FjlodHRwOi8vd3d3LmEtdHJ1c3QuYXQvZG9jcy9jcC9hc2lnbi1nb3Zlcm5tZW50
-LXNlcnZlci5wZGYwEwYDVR0jBAwwCoAITp5/1C/JHx8wfwYIKwYBBQUHAQEEczBx
-MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRydXN0LmF0L29jc3AwRgYIKwYB
-BQUHMAKGOmh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNpZ24tY29ycG9y
-YXRlLWxpZ2h0LTAxYS5jcnQwDgYDVR0PAQH/BAQDAgeAMG4GA1UdHwRnMGUwY6Bh
-oF+GXWxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1s
-aWdodC0wMSxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0
-PzAOBgcqKAAKAQEBBAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFIWZVsrHNwZDSkE
-44Cyc1cCJU49CrjsX7OPG43notq9JPRPMvbVAOrN3g0H8x2oOSYoxscKut1IqLxc
-xUVKYuCZEQBj0FZTYLFIuK8//vPOwmTSTBKMjKZpkkxfdcM5JX+nGdJgfqndjqPw
-e9lZ213EMIEfEf1Nfr5R0MNk1uCUg9diqEpDcUdVks2KN4/zQVuNRlGFgM+y8E2N
-VFopTtCBhSj6nuxeIbpbEOmjuAfF5zoVAJg4nj4DKJC8oiaY+KR+817fXpHclzxd
-f1s0aVpqdOf7Dc0FXjrCBGKpyjcN4Qj9zioy5J6awkiWDF9CQICxwt4TYB1lS8Vx
-Z+ghQ0g=</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature> \ No newline at end of file
diff --git a/spss.slinterface/test/moa-wartung-la9/stylesheet.1.8.6.xsl b/spss.slinterface/test/moa-wartung-la9/stylesheet.1.8.6.xsl
deleted file mode 100644
index 9399a4941..000000000
--- a/spss.slinterface/test/moa-wartung-la9/stylesheet.1.8.6.xsl
+++ /dev/null
@@ -1,3182 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version = "1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns="http://www.w3.org/1999/xhtml" xmlns:bka="http://www.bka.gv.at">
-<!--
- /////////////////////////////////////////////////////////////////
- Autor: Hermann Anderl, Klaus Schipany
- Revision: 1.8.6
- Erstellt: 03.10.2003
- Modifiziert: 24.03.2004
- ///////////////////////////////////////////////////////////////// -->
-<!-- Empfehlung Hr. Karlinger (23.12.03): keine DOCTYPE-Deklaration -->
-<!-- Vereinbarung Hr. Karlinger (29.12.03): keine MS-Extensions: <msxsl:script> -->
-<xsl:output method="xml" encoding="ISO-8859-1" omit-xml-declaration="yes" indent="yes"/>
-<!--
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- Bei der Erstellung dieses Stylesheets wurden folgende Kriterien angewandt:
- 1.) Das generierbare XHTML Dokument entspricht der XHTML 1.1 Spezifikation + CSS 2(W3C).
- 2.) Darüber hinaus folgt das Stylesheet den erweiterten Einschränkungen von
- SLXHTML in der Version 1.0.1 (18.12.2003), Gregor Karlinger.
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-<!-- Bei Verwendung definieren: xmlns:msxsl="urn:schemas-microsoft-com:xslt" -->
-<!--msxsl:script language="JScript" implements-prefix="bka">
- function replace(old) { return old.replace(/\./,"_"); }
-</msxsl:script-->
-
-<xsl:template match="bka:table" mode="sort">
- <!-- Es wird verarbeitet: @width, @border, @cellspacing, @cellpadding, @style-->
- <xsl:text>
- </xsl:text>
- <xsl:value-of select="string('&lt;!-- table -->')" disable-output-escaping="yes"/>
- <xsl:text>
- .</xsl:text><xsl:value-of select="generate-id(.)"/>
- <xsl:text> {</xsl:text>
- <xsl:if test="./@width"><!-- horizontal und vertikal.-->
- <xsl:text> width:</xsl:text><xsl:value-of select="./@width"/><xsl:text>;</xsl:text>
- </xsl:if>
- <xsl:if test="not(./@border[.=0])"><!-- Alle 4 Seiten, wenn nicht 0 -->
- <xsl:text> border:</xsl:text><xsl:value-of select="./@border"/><xsl:text>px solid black;</xsl:text>
- </xsl:if>
- <xsl:if test="./@cellspacing"><!-- horizontal und vertikal.-->
- <xsl:text> border-spacing:</xsl:text><xsl:value-of select="./@cellspacing"/><xsl:text>;</xsl:text>
- </xsl:if>
- <xsl:if test="./@cellpadding"><!-- Alle 4 Seiten -->
- <xsl:text> padding:</xsl:text><xsl:value-of select="./@cellpadding"/><xsl:text>;</xsl:text>
- </xsl:if>
- <xsl:value-of select="./@style"/>
- <xsl:text>}</xsl:text>
- <!-- Alle Zeilen (TR) -->
- <xsl:text>
- </xsl:text>
- <xsl:value-of select="string('&lt;!-- tr -->')" disable-output-escaping="yes"/>
- <xsl:for-each select="bka:tr | bka:thead/bka:tr">
- <!-- Es wird verarbeitet: @height, @style-->
- <xsl:if test="./@*">
- <xsl:text>
- .</xsl:text><xsl:value-of select="generate-id(.)"/>
- <xsl:text> {</xsl:text>
- <xsl:if test="./@height">
- <xsl:text> height:</xsl:text><xsl:value-of select="./@height"/><xsl:text>;</xsl:text>
- </xsl:if>
- <xsl:value-of select="./@style"/>
- <xsl:text>}</xsl:text>
- </xsl:if>
- </xsl:for-each>
- <!-- Alle Zellen (TD) -->
- <xsl:text>
- </xsl:text>
- <xsl:value-of select="string('&lt;!-- td -->')" disable-output-escaping="yes"/>
- <xsl:for-each select="bka:tr/bka:td | bka:thead/bka:tr/bka:td">
- <!-- Es wird verarbeitet: @width, @align, @valign, @style-->
- <xsl:text>
- .</xsl:text><xsl:value-of select="generate-id(.)"/>
- <xsl:text> {</xsl:text>
- <xsl:if test="./@width">
- <xsl:text> width:</xsl:text><xsl:value-of select="./@width"/><xsl:text>;</xsl:text>
- </xsl:if>
- <xsl:if test="./@algin">
- <xsl:text> text-align:</xsl:text><xsl:value-of select="./@align"/><xsl:text>;</xsl:text>
- </xsl:if>
- <xsl:if test="./@valign">
- <xsl:text> vertical-align:</xsl:text><xsl:value-of select="./@valign"/><xsl:text>;</xsl:text>
- </xsl:if>
- <!-- Sur Sicherheit zum Schluss, da dahinter kein ";" steht. -->
- <xsl:value-of select="./@style"/>
- <xsl:text>}</xsl:text>
- </xsl:for-each>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Keys
- ///////////////////////////////////////////////////////////////// -->
-<xsl:key name="key_ueberschrift_typ" match="bka:ueberschrift" use="@typ"/>
-<xsl:key name="key_kzinhalt_typ" match="bka:kzinhalt" use="@typ"/>
-<xsl:key name="key_fzinhalt_typ" match="bka:fzinhalt" use="@typ"/>
-<!--
- /////////////////////////////////////////////////////////////////
- //// Aufbau des XHTML-Dokuments
- /////////////////////////////////////////////////////////////////-->
-<xsl:template match="bka:erechtdok">
- <xsl:value-of disable-output-escaping="yes" select="string('&lt;?xml version=&#x22;1.0&#x22; encoding=&#x22;ISO-8859-1&#x22;?>')"/>
- <xsl:element name="html">
- <xsl:apply-templates/>
- </xsl:element>
-</xsl:template>
-
-<!-- ////////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:metadaten">
- <xsl:element name="head">
- <xsl:element name="title">eRecht XHTML 1.1 Dokument</xsl:element>
- <xsl:element name="style">
- <xsl:attribute name="type">text/css</xsl:attribute>
- <!-- Seitenränder dynamisch setzen -->
- <xsl:variable name="layoutdaten" select = "//bka:layoutdaten"></xsl:variable>
- <!-- Die Breiten sind in Points (pt) angegeben und werden so weitergereicht. -->
- <xsl:variable name="margt" select = "$layoutdaten/@margt"></xsl:variable>
- <xsl:variable name="margr" select = "$layoutdaten/@margr"></xsl:variable>
- <xsl:variable name="margb" select = "$layoutdaten/@margb"></xsl:variable>
- <xsl:variable name="margl" select = "$layoutdaten/@margl"></xsl:variable>
- <xsl:variable name="paperw" select = "$layoutdaten/@paperw"></xsl:variable>
- <xsl:variable name="paperh" select = "$layoutdaten/@paperh"></xsl:variable>
- <!-- Alle Breitenangaben (width) und generischen CSS-Angaben (style) durch CSS-classes ersetzen. -->
- <!-- width=Pixelangabe; in style/class=umgerechnet in pt/cm. z.B. 170(px) = 127.6pt oder 378(px) = 10cm -->
- <xsl:apply-templates select="//bka:table" mode="sort"/>
- <!-- In dieser Schleife werden alle Höhenangaben (height) in td-Elementen durch CSS-classes ersetzt. -->
- <xsl:for-each select="//bka:td/@height">
- <xsl:sort/>
- <xsl:text>
- .H</xsl:text><xsl:value-of select="generate-id(.)"/><!--xsl:value-of select="bka:replace(string(.))"/--><xsl:text> { height: </xsl:text><xsl:value-of select="."/><xsl:text>;}</xsl:text>
- </xsl:for-each>
- <!-- Aufzählungen: 1. Spalte 38 px, 2. Spalte 15 px, 3. Spalte 22 px, 4. Spalte 22 px (empirisch ermittelt)-->
- <xsl:text>
- .W38 { width:38px; }</xsl:text>
- <xsl:text>
- .W15 { width:15px; }</xsl:text>
- <xsl:text>
- .W22 { width:22px; }</xsl:text>
- <xsl:text>
- .wi100 { width:100%; }</xsl:text>
- <!-- Erlaeuterungsaufzaehlung -->
- <xsl:text>
- .WErl { width:15px; }</xsl:text>
- <!-- 2. Spalte: berechnet-->
- <xsl:text>
- .E1Sp2 { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperw - 38"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .E2Sp2 { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperw - 38 - 15"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .E3Sp2 { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .E4Sp2 { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22 - 22"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .E5Sp2 { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22 - 22 - 22"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .ErlSp2 { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperw - 25"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .E1Sp2Q { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperh - 38"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .E2Sp2Q { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperh - 38 - 15"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .E3Sp2Q { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .E4Sp2Q { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22 - 22"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .E5Sp2Q { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22 - 22 - 22"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .ErlSp2Q { width:</xsl:text><xsl:value-of select="$layoutdaten/@paperh - 25"/><xsl:text>px; }</xsl:text>
- <xsl:text>
- .nextpage { page-break-before:always; }</xsl:text>
- <xsl:if test="$layoutdaten/@margt | $layoutdaten/@margr | $layoutdaten/@margb | $layoutdaten/@margl">
- <xsl:text>
- .margins {</xsl:text>
- <xsl:if test="$layoutdaten/@margt">
- <xsl:value-of select="concat('margin-top:', $margt, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margr">
- <xsl:value-of select="concat('margin-right:', $margr, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margb">
- <xsl:value-of select="concat('margin-bottom:', $margb, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margl">
- <xsl:value-of select="concat('margin-left:', $margl, 'pt;')"/>
- </xsl:if>
- <xsl:text>}</xsl:text>
- </xsl:if>
- <!-- Seitenbreite dynamisch setzen (Hochformat) -->
- <xsl:if test="$layoutdaten/@paperw">
- <xsl:text>
- @media screen { .paperw {</xsl:text>
- <xsl:value-of select="concat('width:', $paperw, 'px;')"/>
- <xsl:if test="$layoutdaten/@margt">
- <xsl:value-of select="concat('margin-top:', $margt, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margr">
- <xsl:value-of select="concat('margin-right:', $margr, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margb">
- <xsl:value-of select="concat('margin-bottom:', $margb, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margl">
- <xsl:value-of select="concat('margin-left:', $margl, 'pt;')"/>
- </xsl:if>
- <xsl:text>}}</xsl:text>
- <xsl:text>
- @media print { .paperw {</xsl:text>
- <xsl:value-of select="concat('width:', $paperw, 'px;')"/>
- <xsl:text>margin-top:0.0pt;margin-right:0.0pt;margin-bottom:0.0pt;margin-left:0.0pt;size:portrait;</xsl:text>
- <xsl:text>}}</xsl:text>
- </xsl:if>
- <!-- Seitenbreite ist die Höhe (Querformat), Drehung der Ränder nach "rechts" -->
- <xsl:if test="$layoutdaten/@paperh">
- <xsl:text>
- @media screen { .paperh {</xsl:text>
- <xsl:value-of select="concat('width:', $paperh, 'px;')"/>
- <xsl:if test="$layoutdaten/@margt">
- <xsl:value-of select="concat('margin-right:', $margt, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margr">
- <xsl:value-of select="concat('margin-bottom:', $margr, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margb">
- <xsl:value-of select="concat('margin-left:', $margb, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margl">
- <xsl:value-of select="concat('margin-top:', $margl, 'pt;')"/>
- </xsl:if>
- <xsl:text>}}</xsl:text>
- <xsl:text>
- @media print { .paperh {</xsl:text>
- <xsl:value-of select="concat('width:', $paperh, 'px;')"/>
- <xsl:text>margin-top:0.0pt;margin-right:0.0pt;margin-bottom:0.0pt;margin-left:0.0pt;size:landscape</xsl:text>
- <xsl:text>}}</xsl:text>
- </xsl:if>
-<xsl:text>
-/***************************/
-/* Revision: 1.8.6 */
-/* Erstellt: 03.10.2003 */
-/* Modifiziert: 24.03.2004 */
-/***************************/
-/* Allgemeine Angaben zum Anzeigen von Linien in Tabellen */
-
-/*@page :left {
- size: 21cm 29.7cm;
- margin-left: 2cm;
- margin-right: 2cm;
- marks:crop;
-}
-
-@page :right {
- size: 21cm 29.7cm;
- margin-left: 2cm;
- margin-right: 2cm;
- marks:crop;
-}
-*/
-table.top
-{
- border-top-style: solid;
- border-top-width: thin;
- border-color: black;
-}
-
-table.bottom
-{
- border-bottom-style: solid;
- border-bottom-width: thin;
- border-color: black;
-}
-
-td.top
-{
- border-top-style:solid;
- border-top-width:1pt;
-}
-td.right
-{
- border-right-style:solid;
- border-right-width:1pt;
-}
-td.bottom
-{
- border-bottom-style:solid;
- border-bottom-width:1pt;
-}
-td.left
-{
- border-left-style:solid;
- border-left-width:1pt;
-}
-
-/*Text innerhalb einer Tabellenzelle*/
-.AlignLeft
-{
- text-align:left;
-}
-.AlignRight
-{
- text-align:right;
-}
-.AlignCenter
-{
- text-align:center;
-}
-.AlignJustify
-{
- text-align:justify;
-}
-.VAlignTop {
- vertical-align:top;
-}
-/***************************************************************/
-/* Legistik-Standard-Formatvorlage */
-/***************************************************************/
-
-/* Formatvorlage: 00_LegStandard */
-.LegStandard
-{
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/***************************************************************/
-/* Formatvorlagen fuer Absaetze */
-/***************************************************************/
-
-/* Formatvorlage: 01_Undefiniert */
-p.Undefiniert
-{
- margin-top:1.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color: red;
-}
-
-/* Formatvorlage: 02_BDGesBlatt */
-p.BDGesBlatt
-{
- margin-top:14.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:center;
- line-height:35.0pt;
- font-size:35.0pt;
- font-family:"Times New Roman";
- color:black;
- text-transform:uppercase;
- letter-spacing:1.3pt;
- font-weight:bold;
-}
-
-/* Formatvorlage: 03_RepOesterr */
-p.RepOesterr
-{
- margin-top:6.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- margin-bottom:12.0pt;
- text-align:center;
- line-height:20.0pt;
- border:none;
- padding:0cm;
- font-size:20.0pt;
- font-family:"Times New Roman";
- color:black;
- text-transform:uppercase;
- letter-spacing:1.0pt;
- font-weight:bold;
-}
-
-/* Formatvorlage: 04_AusgabeDaten */
-p.AusgabeDaten
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:14.0pt;
- padding:0cm;
- font-size:12.0pt;
- font-family:"Times New Roman";
- color: black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 05_Kurztitel */
-/* Kurztitel in einer Spalte (wenn kein TAB vorhanden ist) */
-p.Kurztitel1
-{
- margin-top:2.0pt;
- margin-right: 0cm;
- margin-bottom:0cm;
- margin-left: 3.6cm;
- text-align:justify;
- text-indent: -3.6cm;
- border:none;
- padding:0cm;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Kurztitel in zwei Spalten (wenn ein TAB vorhanden ist) */
-p.Kurztitel2
-{
- margin-top:2.0pt;
- margin-right: 0cm;
- margin-bottom:0cm;
- margin-left: 0cm;
- text-align:justify;
- border:none;
- padding:0cm;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-span.Kurztitelbreite
-{
- width: 3.4cm;
-}
-
-/* Formatvorlage: 09_Abstand */
-p.Abstand
-{
- margin:6.0pt;
- margin-bottom:6.0pt;
- line-height:10.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 10_Entwurf */
-p.Entwurf
-{
- margin-top:80.0pt;
- margin-right:0cm;
- margin-bottom:64.0pt;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- letter-spacing:1.3pt;
-}
-
-/* Formatvorlage: 11_Titel */
-p.Titel
-{
- margin-top:24.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:11.0pt;
- font-family:"Times New Roman";
- font-weight:bold;
-}
-
-/* Formatvorlage: 12_PromKl_EinlSatz */
-p.PromKlEinlSatz
-{
- margin-top:8.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- text-indent:19.85pt;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 18_Abbildung_oder_Objekt */
-p.AbbildungoderObjekt
-{
- margin-top:6.0pt;
- margin-right:0cm;
- margin-bottom:6.0pt;
- margin-left:0cm;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 18_Abbildung_oder_Objekt */
-p.AbbildungoderObjektL
-{
- margin-top:6.0pt;
- margin-right:0cm;
- margin-bottom:6.0pt;
- margin-left:0cm;
- text-align:left;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 18_Abbildung_oder_Objekt */
-p.AbbildungoderObjektZ
-{
- margin-top:6.0pt;
- margin-right:0cm;
- margin-bottom:6.0pt;
- margin-left:0cm;
- text-align:center;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 18_Abbildung_oder_Objekt */
-p.AbbildungoderObjektR
-{
- margin-top:6.0pt;
- margin-right:0cm;
- margin-bottom:6.0pt;
- margin-left:0cm;
- text-align:right;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 19_Beschriftung */
-p.Beschriftung
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:6.0pt;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 19_Beschriftung */
-p.BeschriftungL
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:6.0pt;
- margin-left:0cm;
- line-height:11.0pt;
- text-align:left;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 19_Beschriftung */
-p.BeschriftungZ
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:6.0pt;
- margin-left:0cm;
- line-height:11.0pt;
- text-align:center;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 19_Beschriftung */
-p.BeschriftungR
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:6.0pt;
- margin-left:0cm;
- line-height:11.0pt;
- text-align:right;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 21_NovAo1 */
-p.NovAo1
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:10.0pt;
- font-family:"Times New Roman";
- font-style:italic;
-}
-
-/* Formatvorlage: 22_NovAo1 */
-p.NovAo2
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- font-style:italic;
-}
-
-/* Formatvorlage: 23_Satz_(nach_Novao) */
-p.SatznachNovao
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 30_InhaltUeberschrift */
-p.InhaltUeberschrift
-{
- margin-top:16.0pt;
- margin-right:0cm;
- margin-bottom:8.0pt;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- font-weight:bold;
-}
-
-/* Formatvorlage: 31_InhaltSpalte */
-p.InhaltSpalte
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:4.0pt;
- margin-left:0cm;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:10.0pt;
- font-family:"Times New Roman";
- font-weight:bold;
-}
-
-/* Formatvorlage: 32_InhaltEintrag */
-p.InhaltEintrag
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 41_UeberschrG1 */
-p.UeberschrG1
-{
- margin-top:16.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:11.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 42_UeberschrG1- */
-p.UeberschrG1-
-{
- margin-top:8.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:11.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 43_UeberschrG2 */
-p.UeberschrG2
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:4.0pt;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:11.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 44_UeberschrArt */
-p.UeberschrArt
-{
- margin-top:8.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 45_UeberschrPara */
-p.UeberschrPara
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 51_Abs */
-p.Abs
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- text-indent:19.85pt;
-/* line-height:11.0pt; */
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 52_Ziffer_e1 */
-p.ZifferE1
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 52_Ziffer_e2 */
-p.ZifferE2
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 52_Ziffer_e3 */
-p.ZifferE3
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 52_Ziffer_mit_Betrag */
-p.ZifferMitBetrag
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- punctuation-wrap:simple;
- text-autospace:none;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 52aT_Ziffer_mit_Betrag_TGUE */
-p.ZifferMitBetragTGUE
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- punctuation-wrap:simple;
- text-autospace:none;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 53_Litera_e1 */
-p.LiteraE1
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 53_Litera_e2 */
-p.LiteraE2
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 53_Litera_e3 */
-p.LiteraE3
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 53_Litera_mit_Betrag */
-p.LiteraMitBetrag
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- punctuation-wrap:simple;
- text-autospace:none;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 53aT_Litera_mit_Betrag_TGUE */
-p.LiteraMitBetragTGUE
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- punctuation-wrap:simple;
- text-autospace:none;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54_Sublitera_e1 */
-p.SubliteraE1
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54_Sublitera_e2 */
-p.SubliteraE2
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54_Sublitera_e3 */
-p.SubliteraE3
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54_Sublitera_mit_Betrag */
-p.SubliteraMitBetrag
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- punctuation-wrap:simple;
- text-autospace:none;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54aT_Sublitera_mit_Betrag_TGUE */
-p.SubliteraMitBetragTGUE
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- punctuation-wrap:simple;
- text-autospace:none;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54a_Strich_e1 */
-p.StrichE1
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54a_Strich_e2 */
-p.StrichE2
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54a_Strich_e3 */
-p.StrichE3
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54a_Strich_e4 */
-p.StrichE4
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54a_Strich_e5 */
-p.StrichE5
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 54a_Strich_e6 */
-p.StrichE6
-{
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 54a_Strich_e7 */
-p.StrichE7
- {
- margin-top:2.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 55_SchlussteilAbs */
-p.SchlussteilAbs
-{
- margin:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 56_SchlussteilZiff */
-p.SchlussteilZiff
-{
- margin:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 57_SchlussteilLit */
-p.SchlussteilLit
-{
- margin:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 61_TabText */
-p.TabText
-{
- margin:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 61a_TabTextRechtsb */
-p.TabTextRechtsb
-{
- margin:0cm;
- text-align:right;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 61b_TabTextZentriert */
-p.TabTextZentriert
-{
- margin:0cm;
- text-align:center;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 61c_TabTextBlock */
-p.TabTextBlock
-{
- margin:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 62_Kopfzeile */
-p.Kopfzeile
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color: #C0C0C0;
-}
-
-/* Formatvorlage: 63_Fußzeile */
-p.Fusszeile
-{
- margin-top:10.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:9.0pt;
- font-family:"Times New Roman";
- color: #C0C0C0;
-}
-
-/* Formatvorlage: 64_FN_Linie */
-p.FNLinie
-{
- margin-top:11.0pt;
- margin-right:13.0cm;
- margin-bottom:1.0pt;
- margin-left:0cm;
- line-height:11.0pt;
- padding:0cm;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
- border-bottom-style: solid;
- border-bottom-color: Gray;
- border-bottom-width: 1px;
-}
-
-/* Formatvorlage: 65_FN_Text */
-p.FNText
-{
- margin:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:9.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 66_FN_Zeichen */
-span.FNZeichen
-{
- vertical-align:super;
-}
-
-/* Formatvorlage: 68_UnterschrL */
-p.UnterschrL
-{
- margin-top:8.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:left;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 69_UnterschrM */
-p.UnterschrM
-{
- margin-top:8.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 71_Anlagenbez */
-p.Anlagenbez
-{
- margin-top:8.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:right;
- line-height:11.0pt;
- font-size:11.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 81_ErlUeberschrZ */
-p.ErlUeberschrZ
-{
- margin-top:16.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:11.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 82_ErlUeberschrL */
-p.ErlUeberschrL
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/* Formatvorlage: 83_ErlText */
-p.ErlText
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
-}
-
-/* Formatvorlage: 85_ErlAufzaehlg - noch nicht fertig */
-p.ErlAufzaehlg
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
-}
-
-/* Formatvorlage: 89_TGUE_UeberschrSpalte*/
-p.TGUEUeberschrSpalte
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:center;
- line-height:11.0pt;
- page-break-after:avoid;
- font-size:10.0pt;
- font-family:"Times New Roman";
- color:black;
- font-weight:bold;
-}
-
-/***************************************************************/
-/* Formatvorlagen fuer Zeichenformatierung */
-/***************************************************************/
-
-/* Formatvorlage: 990_Fehler */
-span.Fehler
-{
- color: red;
-}
-
-/* Formatvorlage: 991_GldSymbol */
-span.GldSymbol
-{
- font-weight:bold;
-}
-
-/* Formatvorlage: 992_Normal */
-span.Normal
-{
- font-style: normal;
-}
-
-/* Formatvorlage: 993_Fett */
-span.Fett
-{
- font-weight:bold;
-}
-
-/* Formatvorlage: 994_Kursiv */
-span.Kursiv
-{
- font-style:italic;
-}
-
-/* Formatvorlage: 995_Unterstrichen */
-span.Unterstrichen
-{
- text-decoration:underline;
-}
-
-/* Formatvorlage: 996_Gesperrt */
-span.Gesperrt
-{
- letter-spacing:1.3pt;
-}
-
-/* Formatvorlage: 997_Hoch */
-span.Hoch
-{
- font-size: 50%;
- vertical-align:super;
-}
-
-/* Formatvorlage: 998_Tief */
-span.Tief
-{
- font-size: 50%;
- vertical-align:sub;
-}
-
-/* Formatvorlage: 999_Fett_und_Kursiv */
-span.FettundKursiv
-{
- font-weight:bold;
- font-style:italic;
-}
-
-/* Standardtabschrittweite aus Word */
-span.Standardtabulator
-{
- width:35.45pt;
-}
-
-/***************************************************************/
-/* Formatvorlagen der Parlamentsdirektion */
-/***************************************************************/
-
-p.PD_Allonge, li.PD_Allonge, div.PD_Allonge
-{
- margin-top:14.0pt;
- margin-right:0cm;
- margin-bottom:10.0pt;
- margin-left:0cm;
- text-align:center;
- font-size:14.0pt;
- font-family:"Times New Roman";
- layout-grid-mode:line;
-}
-
-p.PD_AllongeB, li.PD_AllongeB, div.PD_AllongeB
-{
- margin-top:14.0pt;
- margin-right:0cm;
- margin-bottom:10.0pt;
- margin-left:0cm;
- text-align:justify;
- font-size:14.0pt;
- font-family:"Times New Roman";
- layout-grid-mode:line;
-}
-
-p.PD_AllongeL, li.PD_AllongeL, div.PD_AllongeL
-{
- margin-top:14.0pt;
- margin-right:0cm;
- margin-bottom:10.0pt;
- margin-left:0cm;
- font-size:14.0pt;
- font-family:"Times New Roman";
- layout-grid-mode:line;
-}
-
-p.PD_Antragsformel, li.PD_Antragsformel, div.PD_Antragsformel
-{
- margin-top:14.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- layout-grid-mode:line;
-}
-
-p.PD_Datum, li.PD_Datum, div.PD_Datum
-{
- margin-top:14.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- layout-grid-mode:line;
-}
-
-p.PD_Entschliessung, li.PD_Entschliessung, div.PD_Entschliessung
-{
- margin-top:8.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:11.0pt;
- font-family:"Times New Roman";
- layout-grid-mode:line;
- font-weight:bold;
-}
-
-p.PD_K1, li.PD_K1, div.PD_K1
-{
- margin:0cm;
- text-align:center;
- border:none;
- padding:0cm;
- font-size:12.0pt;
- font-family:"Times New Roman";
- letter-spacing:-.4pt;
- font-weight:bold;
-}
-
-p.PD_K1Anlage, li.PD_K1Anlage, div.PD_K1Anlage
-{
- margin:0cm;
- text-align:right;
- font-size:12.0pt;
- font-family:"Times New Roman";
- letter-spacing:-.4pt;
- font-weight:bold;
-}
-
-p.PD_K1Ausg, li.PD_K1Ausg, div.PD_K1Ausg
-{
- margin-top:62.9pt;
- margin-right:0cm;
- margin-bottom:27.0pt;
- margin-left:0cm;
- font-size:11.0pt;
- font-family:"Times New Roman";
- font-weight:bold;
-}
-
-p.PD_K2, li.PD_K2, div.PD_K2
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:11.35pt;
- margin-left:0cm;
- font-size:22.0pt;
- font-family:"Times New Roman";
- font-weight:bold;
-}
-
-p.PD_K3, li.PD_K3, div.PD_K3
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:20.0pt;
- margin-left:0cm;
- font-size:18.0pt;
- font-family:"Times New Roman";
- font-weight:bold;
-}
-
-p.PD_K4, li.PD_K4, div.PD_K4
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:6.0pt;
- margin-left:0cm;
- font-size:13.0pt;
- font-family:"Times New Roman";
- font-weight:bold;
-}
-
-p.PD_Kopfzeile, li.PD_Kopfzeile, div.PD_Kopfzeile
-{
- margin-top:4.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- layout-grid-mode:line;
-}
-
-p.PD_U1, li.PD_U1, div.PD_U1
-{
- margin-top:22.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:10.0pt;
- font-family:"Times New Roman";
- font-weight:bold;
-}
-
-p.PD_U2, li.PD_U2, div.PD_U2
-{
- margin-top:5.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- line-height:11.0pt;
- font-size:9.0pt;
- font-family:"Times New Roman";
-}
-
-p.PD_Vorlage, li.PD_Vorlage, div.PD_Vorlage
-{
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:10.0pt;
- margin-left:0cm;
- text-align:justify;
- line-height:11.0pt;
- font-size:11.0pt;
- font-family:"Times New Roman";
- layout-grid-mode:line;
- font-weight:bold;
-}
-</xsl:text>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-<!-- ////////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:nutzdaten">
- <xsl:element name="body">
- <xsl:apply-templates/>
- <xsl:apply-templates select="//bka:fnen" mode="dokumentende"/>
- </xsl:element>
-</xsl:template>
-
-<!-- ////////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:abschnitt">
- <xsl:variable name="layoutdaten" select = "//bka:layoutdaten"></xsl:variable>
- <xsl:element name="div">
- <xsl:choose>
- <xsl:when test="@paperf[.='q']"><!-- Querformat? -->
- <xsl:if test="$layoutdaten/@paperh | @typ[.='ns']">
- <xsl:attribute name="class">
- <xsl:if test="$layoutdaten/@paperh">
- <xsl:text>paperh</xsl:text>
- </xsl:if>
- <xsl:if test="@typ[.='ns']">
- <xsl:if test="@nr[.>1]">
- <xsl:text> nextpage</xsl:text>
- </xsl:if>
- </xsl:if>
- </xsl:attribute><!-- Abschnitt <xsl:value-of select="position()-1"/ -->
- </xsl:if>
- <xsl:apply-templates select="key('key_kzinhalt_typ', 'f')[1]" mode="dokumentanfang"/>
- <xsl:apply-templates/>
- <xsl:apply-templates select="key('key_fzinhalt_typ', 'f')[1]" mode="dokumentende"/>
- </xsl:when>
- <xsl:otherwise><!-- Hochformat (default) -->
- <xsl:if test="$layoutdaten/@paperw | @typ[.='ns']">
- <xsl:attribute name="class">
- <xsl:if test="$layoutdaten/@paperw">
- <xsl:text>paperw</xsl:text>
- </xsl:if>
- <xsl:if test="@typ[.='ns']">
- <xsl:if test="@nr[.>1]">
- <xsl:text> nextpage</xsl:text>
- </xsl:if>
- </xsl:if>
- </xsl:attribute><!--Abschnitt <xsl:value-of select="position()-1"/-->
- </xsl:if>
- <xsl:apply-templates select="key('key_kzinhalt_typ', 'f')[1]" mode="dokumentanfang"/>
- <xsl:apply-templates/>
- <xsl:apply-templates select="key('key_fzinhalt_typ', 'f')[1]" mode="dokumentende"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:element>
-</xsl:template>
-<!--
- /////////////////////////////////////////////////////////////////
- //// Ausgabedaten
- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:ausgabe">
- <xsl:element name="table">
- <xsl:attribute name="class">top bottom wi100</xsl:attribute>
- <xsl:element name="tr">
- <xsl:apply-templates mode="erzeuge_ausgabe"/>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<xsl:template match="bka:adtext" mode="erzeuge_ausgabe">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">AusgabeDaten AlignLeft</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<xsl:template match="bka:addat" mode="erzeuge_ausgabe">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">AusgabeDaten AlignCenter</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<xsl:template match="bka:adid" mode="erzeuge_ausgabe">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">AusgabeDaten AlignRight</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Kurztitel
- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="*" mode="erzeuge_zeilen"></xsl:template><!-- nichts tun -->
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="key('key_ueberschrift_typ', 'kurztitel')" mode="erzeuge_zeilen">
- <xsl:element name="tr">
- <xsl:if test="bka:tab[1]">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">Kurztitel2 AlignLeft VAlignTop</xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">Kurztitelbreite</xsl:attribute>
- <!-- Verarbeite nun alles was vor dem 1. Tabulator kommt. -->
- <!-- tab[1]/preceding-sibling::text() bewirkt die Verarbeitung aller Textknoten vor dem 1. Tab. -->
- <!-- tab[1]/preceding-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:for-each select="bka:tab[1]/preceding-sibling::text() | bka:tab[1]/preceding-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">Kurztitel2 AlignLeft</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem 1. Tabulator. -->
- <!-- tab[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem 1. Tab. -->
- <!-- tab[1]/following-sibling::* bewirkt die Verarbeitung der restlichen Tabulatoren und enthaltener Subknoten. -->
- <xsl:for-each select="bka:tab[1]/following-sibling::text() | bka:tab[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:if>
- <xsl:if test="not(bka:tab[1])">
- <!-- Da es keinen Tabulator gibt, wird nur eine Spalte erzeugt. -->
- <xsl:element name="td">
- <xsl:attribute name="colspan">2</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class">Kurztitel1 AlignLeft VAlignTop</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
- </xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Inhaltsverzeichnis, HTML-Tabellen ////
- ///////////////////////////////////////////////////////////////// -->
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:inhaltsvz">
- <xsl:choose >
- <xsl:when test="./@typ='ueberschrift'">
- <xsl:element name="p">
- <xsl:attribute name="class">InhaltUeberschrift</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='spalte'">
- <xsl:element name="p">
- <xsl:attribute name="class">InhaltSpalte</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='eintrag'">
- <xsl:element name="p">
- <xsl:attribute name="class">InhaltEintrag</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:table">
- <xsl:element name="table">
- <xsl:attribute name="class"><xsl:value-of select = "generate-id(.)"/></xsl:attribute>
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:thead">
- <xsl:element name="thead">
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:tr">
- <xsl:element name="tr">
- <xsl:if test="./@*">
- <xsl:attribute name="class"><xsl:value-of select = "generate-id(.)"/></xsl:attribute>
- <xsl:apply-templates select="./@*"/>
- </xsl:if>
- <xsl:apply-templates/>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:td">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:value-of select = "generate-id(.)"/></xsl:attribute>
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@colspan">
- <xsl:attribute name="colspan"><xsl:value-of select = "." /></xsl:attribute>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@rowspan">
- <xsl:attribute name="rowspan"><xsl:value-of select = "." /></xsl:attribute>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@border">
- <!-- Wurde in die dyn. class aufgenommen -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@cellspacing">
- <!-- Wurde in die dyn. class aufgenommen -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-
-<xsl:template match="@cellpadding">
- <!-- Wurde in die dyn. class aufgenommen -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@width">
- <!-- Wurde in die dyn. class aufgenommen -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@height">
- <!-- Wurde in die dyn. class aufgenommen -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@align">
- <!-- Wurde in die dyn. class aufgenommen -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@valign">
- <!-- Wurde in die dyn. class aufgenommen -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@style">
- <!-- Wurde in die dyn. class aufgenommen -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@class">
- <xsl:attribute name="class"><xsl:value-of select = "." /></xsl:attribute>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@nowrap">
- <!-- Derzeit nichts tun -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@h-start">
- <!-- nichts tun nur RTF-Info -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@h-xval">
- <!-- nichts tun nur RTF-Info -->
-</xsl:template>
-
-<xsl:template name="checkForEmptyCell">
- <xsl:if test="ancestor::bka:table">
- <xsl:if test=". = ''"><xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/></xsl:if>
- </xsl:if>
- <xsl:apply-templates/>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Ueberschriften
- ///////////////////////////////////////////////////////////////// -->
-
-<xsl:template match="bka:ueberschrift">
- <xsl:choose >
- <xsl:when test="./@typ='bdgesblatt'">
- <xsl:element name="p">
- <xsl:attribute name="class">BDGesBlatt</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='repoesterr'">
- <xsl:element name="p">
- <xsl:attribute name="class">RepOesterr</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='entwurf'">
- <xsl:element name="p">
- <xsl:attribute name="class">Entwurf</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='kurztitel'">
- <xsl:if test="not(name(preceding-sibling::*[1]) = 'ueberschrift')">
- <xsl:element name="table">
- <xsl:attribute name="class">bottom wi100</xsl:attribute>
-<!-- <xsl:attribute name="parent"><xsl:value-of select="name(parent::*)"/></xsl:attribute>
- <xsl:attribute name="preceding"><xsl:value-of select="name(preceding::*)"/></xsl:attribute>
- <xsl:attribute name="preceding-sibling"><xsl:value-of select="name(preceding-sibling::*)"/></xsl:attribute>
- <xsl:attribute name="preceding-sibling-typ"><xsl:value-of select="preceding-sibling::*/@typ"/></xsl:attribute>
- <xsl:attribute name="count-preceding-sibling"><xsl:value-of select="count(preceding-sibling::*)"/></xsl:attribute>
- <xsl:attribute name="count-preceding"><xsl:value-of select="count(preceding::*)"/></xsl:attribute>
- <xsl:attribute name="yyy-sibling-typ"><xsl:value-of select="name(preceding-sibling::*[1])"/></xsl:attribute>
- <xsl:attribute name="zzz-sibling-typ"><xsl:value-of select="name(preceding::*[1])"/></xsl:attribute> -->
- <xsl:apply-templates select="../bka:ueberschrift" mode="erzeuge_zeilen"/>
- </xsl:element>
- </xsl:if>
- </xsl:when>
- <xsl:when test="./@typ='titel'">
- <xsl:element name="p">
- <xsl:attribute name="class">Titel</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='g1'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrG1</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='g2'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrG2</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='g1min'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrG1-</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='art'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrArt</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='para'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrPara</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='anlage'">
- <xsl:element name="p">
- <xsl:attribute name="class">Anlagenbez</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='erlz'">
- <xsl:element name="p">
- <xsl:attribute name="class">ErlUeberschrZ</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='erll'">
- <xsl:element name="p">
- <xsl:attribute name="class">ErlUeberschrL</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tgue'">
- <xsl:element name="p">
- <xsl:attribute name="class">TGUEUeberschrSpalte</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Absaetze
- ///////////////////////////////////////////////////////////////// -->
-
-<xsl:template match="bka:absatz">
- <xsl:choose >
- <xsl:when test="./@typ='undef'">
- <xsl:element name="p">
- <xsl:attribute name="class">Undefiniert</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='promkleinlsatz'">
- <xsl:element name="p">
- <xsl:attribute name="class">PromKlEinlSatz</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='abs'">
- <xsl:element name="p">
- <xsl:attribute name="class">Abs</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='abbobj'">
- <xsl:element name="p">
- <xsl:choose >
- <xsl:when test="./@halign='left'">
- <xsl:attribute name="class">AbbildungoderObjektL</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:when>
- <xsl:when test="./@halign='center'">
- <xsl:attribute name="class">AbbildungoderObjektZ</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:when>
- <xsl:when test="./@halign='right'">
- <xsl:attribute name="class">AbbildungoderObjektR</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="class">AbbildungoderObjekt</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='novao1'">
- <xsl:element name="p">
- <xsl:attribute name="class">NovAo1</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='novao2'">
- <xsl:element name="p">
- <xsl:attribute name="class">NovAo2</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='satz'">
- <xsl:element name="p">
- <xsl:attribute name="class">SatznachNovao</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtext'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabText</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtextr'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabTextRechtsb</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtextz'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabTextZentriert</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtextb'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabTextBlock</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='erltext'">
- <xsl:element name="p">
- <xsl:attribute name="class">ErlText</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='kz'">
- <xsl:element name="p">
- <xsl:attribute name="class">Kopfzeile</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='fz'">
- <xsl:element name="p">
- <xsl:attribute name="class">Fusszeile</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:abstand">
- <xsl:element name="p">
- <xsl:attribute name="class">Abstand</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Normale Liste / Aufzaehlung
- ///////////////////////////////////////////////////////////////// -->
-
-<xsl:template match="bka:liste">
- <xsl:element name="table">
- <xsl:attribute name="class">wi100</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:erlliste">
- <xsl:apply-templates mode="erzeuge_erl_liste">
- <xsl:with-param name="classname">ErlAufzaehlg</xsl:with-param>
- </xsl:apply-templates>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:ziffernliste">
- <xsl:choose >
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">ZifferE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">ZifferE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">ZifferE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:literaliste">
- <xsl:choose >
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">LiteraE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">LiteraE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">LiteraE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:subliteraliste">
- <xsl:choose >
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">SubliteraE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">SubliteraE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">SubliteraE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:strichliste">
- <xsl:choose >
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">StrichE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">StrichE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">StrichE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='4'">
- <xsl:apply-templates mode="erzeuge_liste_ebene4">
- <xsl:with-param name="classname">StrichE4</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:listelem" mode="erzeuge_erl_liste">
- <xsl:param name = "classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>WErl AlignRight VAlignTop</xsl:text></xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">
- <xsl:text>AlignJustify </xsl:text>
- <xsl:choose>
- <xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']">
- <xsl:text>ErlSp2Q</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>ErlSp2</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="colspan">7</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:listelem" mode="erzeuge_liste_ebene1">
- <xsl:param name = "classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">
- <xsl:text>AlignJustify </xsl:text>
- <xsl:choose>
- <xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']">
- <xsl:text>E1Sp2Q</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>E1Sp2</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="colspan">7</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:listelem" mode="erzeuge_liste_ebene2">
- <xsl:param name = "classname"/>
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">W15 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">
- <xsl:text>AlignJustify </xsl:text>
- <xsl:choose>
- <xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']">
- <xsl:text>E2Sp2Q</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>E2Sp2</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="colspan">6</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:listelem" mode="erzeuge_liste_ebene3">
- <xsl:param name = "classname"/>
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">W22 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">
- <xsl:text>AlignJustify </xsl:text>
- <xsl:choose>
- <xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']">
- <xsl:text>E3Sp2Q</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>E3Sp2</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="colspan">5</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:listelem" mode="erzeuge_liste_ebene4">
- <xsl:param name = "classname"/>
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td"/>
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">W22 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">
- <xsl:text>AlignJustify </xsl:text>
- <xsl:choose>
- <xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']">
- <xsl:text>E4Sp2Q</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>E4Sp2</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="colspan">4</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:schluss">
- <xsl:choose >
- <xsl:when test="./@typ='Abs'"><!-- Keine Einrückung -->
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">8</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class">SchlussteilAbs</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='Ziff'"><!-- wie Ebene 1 -->
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">7</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:text>SchlussteilZiff</xsl:text></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='Lit'">
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">W15</xsl:attribute><!-- wie Ebene 2 -->
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">6</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class">SchlussteilLit</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Liste mit Betrag
- ///////////////////////////////////////////////////////////////// -->
-
-<xsl:template match="bka:betragliste">
- <xsl:choose >
- <xsl:when test="./@typ='ziffer'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene1">
- <xsl:with-param name="classname">ZifferMitBetrag</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='litera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene2">
- <xsl:with-param name="classname">LiteraMitBetrag</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='sublitera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene3">
- <xsl:with-param name="classname">SubliteraMitBetrag</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:betraglistetgue">
- <xsl:choose >
- <xsl:when test="./@typ='ziffer'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene1">
- <xsl:with-param name="classname">ZifferMitBetragTGUE</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='litera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene2">
- <xsl:with-param name="classname">LiteraMitBetragTGUE</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='sublitera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene3">
- <xsl:with-param name="classname">SubliteraMitBetragTGUE</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:listelem" mode="erzeuge_betragliste_ebene1">
- <xsl:param name = "classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class">AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">5</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:if test="name() = 'tab'">
- <xsl:value-of select="string('&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p class=&quot;')" disable-output-escaping="yes"/>
- <xsl:value-of select = "$classname"/><xsl:value-of select="string('&quot;&gt;')" disable-output-escaping="yes"/>
- </xsl:if>
- <xsl:if test="name() != 'tab'">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:listelem" mode="erzeuge_betragliste_ebene2">
- <xsl:param name = "classname"/>
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">4</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:if test="name() = 'tab'">
- <xsl:value-of select="string('&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p class=&quot;')" disable-output-escaping="yes"/>
- <xsl:value-of select = "$classname"/><xsl:value-of select="string('&quot;&gt;')" disable-output-escaping="yes"/>
- </xsl:if>
- <xsl:if test="name() != 'tab'">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:listelem" mode="erzeuge_betragliste_ebene3">
- <xsl:param name = "classname"/>
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">3</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select = "$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:if test="name() = 'tab'">
- <xsl:value-of select="string('&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p class=&quot;')" disable-output-escaping="yes"/>
- <xsl:value-of select = "$classname"/><xsl:value-of select="string('&quot;&gt;')" disable-output-escaping="yes"/>
- </xsl:if>
- <xsl:if test="name() != 'tab'">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Unterschrift
- ///////////////////////////////////////////////////////////////// -->
-
-<xsl:template match="bka:unterschrift">
- <xsl:choose >
- <xsl:when test="./@typ='links'">
- <xsl:element name="p">
- <xsl:attribute name="class">UnterschrL</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='mitte'">
- <xsl:element name="p">
- <xsl:attribute name="class">UnterschrM</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='rechts'">
- <xsl:element name="p">
- <xsl:attribute name="class">UnterschrR</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Zeichenformatierung
- ///////////////////////////////////////////////////////////////// -->
-
-<xsl:template match="bka:error">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:gldsym">
- <xsl:element name="span">
- <xsl:attribute name="class">GldSymbol</xsl:attribute>
- <xsl:if test=".=' '"><xsl:value-of select = "." /></xsl:if><!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')"><xsl:apply-templates/></xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:n">
- <xsl:element name="span">
- <xsl:attribute name="class">Normal</xsl:attribute>
- <xsl:if test=".=' '"><xsl:value-of select = "." /></xsl:if><!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')"><xsl:apply-templates/></xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:f | bka:b">
- <xsl:element name="span">
- <xsl:attribute name="class">Fett</xsl:attribute>
- <xsl:if test=".=' '"><xsl:value-of select = "." /></xsl:if><!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')"><xsl:apply-templates/></xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:k | bka:i">
- <xsl:element name="span">
- <xsl:attribute name="class">Kursiv</xsl:attribute>
- <xsl:if test=".=' '"><xsl:value-of select = "." /></xsl:if><!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')"><xsl:apply-templates/></xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:u">
- <xsl:element name="span">
- <xsl:attribute name="class">Unterstrichen</xsl:attribute>
- <xsl:if test=".=' '"><xsl:value-of select = "." /></xsl:if><!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')"><xsl:apply-templates/></xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:gs">
- <xsl:element name="span">
- <xsl:attribute name="class">Gesperrt</xsl:attribute>
- <xsl:if test=".=' '"><xsl:value-of select = "." /></xsl:if><!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')"><xsl:apply-templates/></xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:h | bka:super">
- <xsl:element name="span">
- <xsl:attribute name="class">Hoch</xsl:attribute>
- <xsl:if test=".=' '"><xsl:value-of select = "." /></xsl:if><!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')"><xsl:apply-templates/></xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:t | bka:sub">
- <xsl:element name="span">
- <xsl:attribute name="class">Tief</xsl:attribute>
- <xsl:if test=".=' '"><xsl:value-of select = "." /></xsl:if><!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')"><xsl:apply-templates/></xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:fk">
- <xsl:element name="span">
- <xsl:attribute name="class">FettundKursiv</xsl:attribute>
- <xsl:if test=".=' '"><xsl:value-of select = "." /></xsl:if><!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')"><xsl:apply-templates/></xsl:if>
- </xsl:element>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Sonderzeichen
- ///////////////////////////////////////////////////////////////// -->
-
-<!-- ///////////////////////////////////////////////////////////////// geschütztes Leerzeichen -->
-<xsl:template match="bka:nbsp">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// doppeltes Anführungszeichen unten (typografisch) -->
-<xsl:template match="bka:bdquo">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8222;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// doppeltes Anführungszeichen oben, links (typografisch) -->
-<xsl:template match="bka:ldquo">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8220;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// kurzer Gedankenstrich -->
-<xsl:template match="bka:kidea">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8211;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// langer Gedankenstrich -->
-<xsl:template match="bka:lidea">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8212;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// geschützter Trennstrich -->
-<xsl:template match="bka:gdash">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#45;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// bedingter Trennstrich (Silbentrennzeichen), Word spezifisch -->
-<xsl:template match="bka:bdash"><!-- nichts tun -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// Euro-Zeichen -->
-<xsl:template match="bka:euro">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8364;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// <-Zeichen -->
-<xsl:template match="bka:lt">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;lt;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// >-Zeichen -->
-<xsl:template match="bka:gt">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;gt;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// &-Zeichen -->
-<xsl:template match="bka:amp">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;amp;')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// Manueller Zeilenumbruch -->
-<xsl:template match="bka:br">
- <xsl:value-of disable-output-escaping="yes" select="string('&lt;br/>')"/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:tab">
- <!-- Da weder in HTML noch in CSS2 Tabulatoren moeglich sind, wird ein Tabulator durch ein Blank ersetzt, das in span eingeschlossen ist. -->
- <xsl:element name="span">
- <xsl:attribute name="class">Standardtabulator</xsl:attribute>
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// Zeilenwechsel / Spaltenwechsel-->
-<xsl:template match="bka:wechsel"><!-- nichts tun -->
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Verweise
- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:wwwlink">
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:text>[Verweis: </xsl:text>
- <xsl:value-of select="@url"/>
- <xsl:text>] </xsl:text>
- <xsl:apply-templates/>
- <!-- XHTML 1.1 -->
- <!--xsl:element name="a">
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element-->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="@url">
- <xsl:attribute name="href"><xsl:value-of select = "." /></xsl:attribute>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////////////////
- //// Eingebettete base64-codierte Binärdaten
- /////////////////////////////////////////////////////////////////////////////
-
- Alle Binärdateien werden in ein Unterverzeichnis ausgelagert.
- Nach dem alten eRecht-Schema mußte das binary-Element ein ref-Attribut besitzen,
- das den relativen Dateinamen der ausgelagerten Datei enthält.
- Nach dem neuen eRecht-Schema wird dieser relative Dateiname in einem
- src-Element (unter dem binary-Element) gehalten.
- Dieses Stylesheet-File unterstuetzt beide Varianten. -->
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:binary">
- <xsl:element name="img">
- <xsl:if test="./@ref">
- <xsl:if test="./@ref = ''">
- <!-- Abfragen der Art <xsl:if test="./bka:src"> funktionieren nicht. -->
- <xsl:apply-templates select="./bka:src"/>
- </xsl:if>
- <xsl:if test="not(./@ref = '')">
- <xsl:attribute name="src"><xsl:value-of select = "./@ref" /></xsl:attribute>
- </xsl:if>
- </xsl:if>
- <xsl:if test="not(./@ref)">
- <!-- Abfragen der Art <xsl:if test="./bka:src"> funktionieren nicht. -->
- <xsl:apply-templates select="./bka:src"/>
- </xsl:if>
- <xsl:attribute name="alt"><xsl:value-of select = "./@alt" /></xsl:attribute>
- </xsl:element>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:src">
- <xsl:attribute name="src"><xsl:value-of select = "." /></xsl:attribute>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Beschriftung zu Grafiken
- ///////////////////////////////////////////////////////////////// -->
-
-<xsl:template match="bka:beschr">
- <xsl:choose >
- <xsl:when test="./@typ='links'">
- <xsl:element name="p">
- <xsl:attribute name="class">BeschriftungL</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='mitte'">
- <xsl:element name="p">
- <xsl:attribute name="class">BeschriftungZ</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='rechts'">
- <xsl:element name="p">
- <xsl:attribute name="class">BeschriftungR</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:attribute name="class">Beschriftung</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Fuß- und Endnoten
- ///////////////////////////////////////////////////////////////// -->
-
-<!-- Fußzeilen sollen erst am Ende verarbeitet werden -->
-<xsl:template match="bka:fnen"><!-- nichts tun -->
-</xsl:template>
-
-<xsl:template match="bka:fnen" mode="dokumentende">
- <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<!-- In XHTML1.1: Statt dem Attribut "name" wird jetzt "id" verwendet. -->
-<xsl:template match="bka:fnzeichen">
- <xsl:choose >
- <xsl:when test="./@typ='f'">
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#FN')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('FNREF')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:apply-templates/>
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:apply-templates/>
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='e'">
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#EN')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('ENREF')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:apply-templates/>
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:apply-templates/>
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<!-- In XHTML1.1: Statt dem Attribut "name" wird jetzt "id" verwendet. -->
-<xsl:template match="bka:fntext">
- <xsl:choose >
- <xsl:when test="./@typ='f'">
- <xsl:if test="./@nr = 1">
- <xsl:element name="p">
- <xsl:attribute name="class">FNLinie</xsl:attribute>
- </xsl:element>
- </xsl:if>
- <xsl:element name="p">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#FNREF')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('FN')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:value-of select = "./@nr" />
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute><!-- unten kein FNZeichen! -->
- <xsl:value-of select = "string('[')" />
- <xsl:value-of select = "./@nr" />
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='e'">
- <xsl:if test="./@nr = 1">
- <xsl:element name="p">
- <xsl:attribute name="class">FNLinie</xsl:attribute>
- </xsl:element>
- </xsl:if>
- <xsl:element name="p">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#ENREF')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('EN')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:value-of select = "./@nr" />
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute><!-- unten kein FNZeichen! -->
- <xsl:value-of select = "string('[')" />
- <xsl:value-of select = "./@nr" />
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<!--
- /////////////////////////////////////////////////////////////////
- //// Kopf- und Fußzeilen
- ///////////////////////////////////////////////////////////////// -->
-
-<!-- Kopf- und Fußzeilen sollen an bestimmten Stellen verarbeitet werden und nicht dann wenn sie im XML-String vorkommen -->
-<xsl:template match="bka:kzinhalt | bka:fzinhalt"><!-- nichts tun -->
-</xsl:template>
-
-<!--
-<xsl:template match="fzinhalt" mode="dokumentende">
- <xsl:choose >
- <xsl:when test="./@typ='f'">
- </xsl:when>
- <xsl:when test="./@typ='p'">
- <xsl:apply-templates/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
--->
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="key('key_kzinhalt_typ', 'f')" mode="dokumentanfang">
- <!--xsl:apply-templates/--><!-- keine Ausgabe gewuenscht -->
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="key('key_fzinhalt_typ', 'f')" mode="dokumentende">
- <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ///////////////////////////////////////////////////////////////// -->
-<xsl:template match="bka:symbol">
- <xsl:apply-templates/>
-</xsl:template>
-
-<!-- //////////////Alle anderen Konstrukte//////////////////////////// -->
-<xsl:template match="*">
- <!--xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsches Konstrukt: Bitte melden Sie den Fehler:</xsl:text> <xsl:value-of select="name()"></xsl:value-of>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element-->
- <xsl:element name="{name()}">
- <xsl:for-each select = "./@*" >
- <xsl:attribute name="{name()}"><xsl:value-of select="."></xsl:value-of></xsl:attribute>
- </xsl:for-each>
- <xsl:apply-templates/>
- </xsl:element>
-</xsl:template>
-
-<!-- //////////// Folgende Elemente muessen ignoriert werden, da sie bereits anderweitig abgefragt werden. //////////// -->
-<xsl:template match="bka:layoutdaten | bka:aw | bka:pdeinst"><!-- nichts tun -->
-</xsl:template>
-
-<!-- ////////////// Parlamentsdirektion //////////////////////////// -->
-<xsl:template match="bka:pdvorlage">
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="./bka:pdeinst[1]/@formatname"></xsl:value-of></xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
-</xsl:template>
-
-</xsl:stylesheet> \ No newline at end of file
diff --git a/spss.slinterface/test/moa-wartung-la9/stylesheet.1.9.0.xsl b/spss.slinterface/test/moa-wartung-la9/stylesheet.1.9.0.xsl
deleted file mode 100644
index b2fddb3c1..000000000
--- a/spss.slinterface/test/moa-wartung-la9/stylesheet.1.9.0.xsl
+++ /dev/null
@@ -1,1897 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:bka="http://www.bka.gv.at">
- <!--
- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- Autor: Hermann Anderl, Klaus Schipany
- Revision: 1.9.0
- Erstellt: 03.10.2003
- Modifiziert:
- 23.12.2003 - Empfehlung Hr. Karlinger: keine DOCTYPE-Deklaration verwenden.
- 29.12.2003 - Vereinbarung Hr. Karlinger: keine MS-Extensions: <msxsl:script> verwenden.
- 17.12.2004 - Abstimmung Hr Karlinger: thead, tbody, tfoot heraus filtern.
- 12.05.2005 - Div. Aenderungen. Der Parameter Encoding ist neu. Der Defaultwert ist ISO-8859-1 damit das bisherige Encoding beibehalten wird, wenn dieser Parameter nicht uebergeben wird.
- 05.01.2006 - @halign bei <absatz>, <ueberschrift> und <beschr> Elementen prüfen.
- 12.01.2006 - Die CSS-Reduktion erfolgt bereits im XML. Wurde aus dem Stylesheet entfernt.
- 16.01.2006 - erzeuge_liste_ebene2, 3 und 4 wurde korrigiert.
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
- <xsl:param name="Encoding">ISO-8859-1</xsl:param>
- <!-- Da beim Attr. encoding scheinbar keine Variable verwendet werden darf, wird das Encoding hier nochmals hardcoded.
- Das bedeutet fuer den XML2XHTML-Konverter, dass er den Encoding-Parameter auch an dieser Stelle übergeben muss
- (indem in dem DOM-Baum der dieses Stylesheet enthaelt die Nodes mit den hardcodeden Encodingtexten durch das gewünschte Encoding ersetzt werden. -->
- <xsl:output method="xml" encoding="ISO-8859-1" omit-xml-declaration="yes" indent="yes"/>
- <!--
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- Bei der Erstellung dieses Stylesheets wurden folgende Kriterien angewandt:
- 1.) Das generierbare XHTML Dokument entspricht der XHTML 1.1 Spezifikation + CSS 2(W3C).
- 2.) Darüber hinaus folgt das Stylesheet den erweiterten Einschränkungen von SLXHTML in der Version 1.0.1 (18.12.2003), Gregor Karlinger.
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
- <!--
- /////////////////////////////////////////////////////////////////
- //// Keys
- ///////////////////////////////////////////////////////////////// -->
- <xsl:key name="key_ueberschrift_typ" match="bka:ueberschrift" use="@typ"/>
- <xsl:key name="key_kzinhalt_typ" match="bka:kzinhalt" use="@typ"/>
- <xsl:key name="key_fzinhalt_typ" match="bka:fzinhalt" use="@typ"/>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Aufbau des XHTML-Dokuments
- /////////////////////////////////////////////////////////////////-->
- <xsl:template match="bka:erechtdok">
- <xsl:value-of disable-output-escaping="yes" select="string('&lt;?xml version=&#x22;1.0&#x22; encoding=&#x22;')"/>
- <xsl:value-of select="$Encoding"/>
- <xsl:value-of disable-output-escaping="yes" select="string('&#x22;?>')"/>
- <xsl:element name="html">
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ////////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:metadaten">
- <xsl:element name="head">
- <xsl:element name="title">eRecht Dokument (1.9.0)</xsl:element>
- <xsl:element name="style">
- <xsl:attribute name="type">text/css</xsl:attribute>
- <!-- Seitenränder dynamisch setzen -->
- <xsl:variable name="layoutdaten" select="//bka:layoutdaten"/>
- <!-- Die Breiten sind in Points (pt) angegeben und werden so weitergereicht. -->
- <xsl:variable name="margt" select="$layoutdaten/@margt"/>
- <xsl:variable name="margr" select="$layoutdaten/@margr"/>
- <xsl:variable name="margb" select="$layoutdaten/@margb"/>
- <xsl:variable name="margl" select="$layoutdaten/@margl"/>
- <xsl:variable name="paperw" select="$layoutdaten/@paperw"/>
- <xsl:variable name="paperh" select="$layoutdaten/@paperh"/>
- <!-- Die CSS-Klassen werden aus dem XML übernommen -->
- <xsl:value-of select="//bka:classes"/>
- <!-- Aufzählungen: 1. Spalte 38 px, 2. Spalte 15 px, 3. Spalte 22 px, 4. Spalte 22 px (empirisch ermittelt)-->
- <xsl:text>
- .W38 { width:38px; }</xsl:text>
- <xsl:text>
- .W15 { width:15px; }</xsl:text>
- <xsl:text>
- .W22 { width:22px; }</xsl:text>
- <xsl:text>
- .wi100 { width:100%; }</xsl:text>
- <!-- Erlaeuterungsaufzaehlung -->
- <xsl:text>
- .WErl { width:15px; }</xsl:text>
- <!-- 2. Spalte: berechnet-->
- <xsl:text>
- .E1Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E2Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E3Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E4Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E5Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22 - 22 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .ErlSp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 25"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E1Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E2Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E3Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E4Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E5Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22 - 22 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .ErlSp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 25"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .nextpage { page-break-before:always; }</xsl:text>
- <xsl:if test="$layoutdaten/@margt | $layoutdaten/@margr | $layoutdaten/@margb | $layoutdaten/@margl">
- <xsl:text>
- .margins {</xsl:text>
- <xsl:if test="$layoutdaten/@margt">
- <xsl:value-of select="concat('margin-top:', $margt, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margr">
- <xsl:value-of select="concat('margin-right:', $margr, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margb">
- <xsl:value-of select="concat('margin-bottom:', $margb, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margl">
- <xsl:value-of select="concat('margin-left:', $margl, 'pt;')"/>
- </xsl:if>
- <xsl:text>}</xsl:text>
- </xsl:if>
- <!-- Seitenbreite dynamisch setzen (Hochformat) -->
- <xsl:if test="$layoutdaten/@paperw">
- <xsl:text>
- @media screen { .paperw {</xsl:text>
- <xsl:value-of select="concat('width:', $paperw, 'px;')"/>
- <xsl:if test="$layoutdaten/@margt">
- <xsl:value-of select="concat('margin-top:', $margt, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margr">
- <xsl:value-of select="concat('margin-right:', $margr, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margb">
- <xsl:value-of select="concat('margin-bottom:', $margb, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margl">
- <xsl:value-of select="concat('margin-left:', $margl, 'pt;')"/>
- </xsl:if>
- <xsl:text>}}</xsl:text>
- <xsl:text>
- @media print { .paperw {</xsl:text>
- <xsl:value-of select="concat('width:', $paperw, 'px;')"/>
- <xsl:text>margin-top:0.0pt;margin-right:0.0pt;margin-bottom:0.0pt;margin-left:0.0pt;size:portrait;</xsl:text>
- <xsl:text>}}</xsl:text>
- </xsl:if>
- <!-- Seitenbreite ist die Höhe (Querformat), Drehung der Ränder nach "rechts" -->
- <xsl:if test="$layoutdaten/@paperh">
- <xsl:text>
- @media screen { .paperh {</xsl:text>
- <xsl:value-of select="concat('width:', $paperh, 'px;')"/>
- <xsl:if test="$layoutdaten/@margt">
- <xsl:value-of select="concat('margin-right:', $margt, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margr">
- <xsl:value-of select="concat('margin-bottom:', $margr, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margb">
- <xsl:value-of select="concat('margin-left:', $margb, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margl">
- <xsl:value-of select="concat('margin-top:', $margl, 'pt;')"/>
- </xsl:if>
- <xsl:text>}}</xsl:text>
- <xsl:text>
- @media print { .paperh {</xsl:text>
- <xsl:value-of select="concat('width:', $paperh, 'px;')"/>
- <xsl:text>margin-top:0.0pt;margin-right:0.0pt;margin-bottom:0.0pt;margin-left:0.0pt;size:landscape</xsl:text>
- <xsl:text>}}</xsl:text>
- </xsl:if>
- <xsl:text>
-/* Allgemeine Angaben zum Anzeigen von Linien in Tabellen */
-/*
-@page :left {size: 21cm 29.7cm;margin-left: 2cm;margin-right: 2cm;marks:crop;}
-@page :right {size: 21cm 29.7cm;margin-left: 2cm;margin-right: 2cm;marks:crop;}
-*/
-table.top {border-top-style: solid;border-top-width: thin;border-color: black;}
-table.bottom {border-bottom-style: solid;border-bottom-width: thin;border-color: black;}
-td.top {border-top-style:solid;border-top-width:1pt;}
-td.right {border-right-style:solid;border-right-width:1pt;}
-td.bottom {border-bottom-style:solid;border-bottom-width:1pt;}
-td.left {border-left-style:solid;border-left-width:1pt;}
-/*Text innerhalb einer Tabellenzelle fuer "absatz" und "ueberschrift"*/
-.AlignLeft {text-align:left;}
-.AlignRight {text-align:right;}
-.AlignCenter {text-align:center;}
-.AlignJustify {text-align:justify;}
-.VAlignTop {vertical-align:top; }
-/***************************************************************/
-/* Legistik-Standard-Formatvorlage */
-/* Formatvorlage: 00_LegStandard */
-/***************************************************************/
-.LegStandard {
-text-align:justify;/*OK*/
-line-height:11.0pt;
-font-size:10.0pt;
-font-family:"Times New Roman";}
-/***************************************************************/
-/* Formatvorlagen fuer Absaetze */
-/***************************************************************/
-/* Formatvorlage: 01_Undefiniert */
-p.Undefiniert {margin-top:1.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;/*OK*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color: red;}
-/* Formatvorlage: 02_BDGesBlatt */
-p.BDGesBlatt {margin-top:14.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:35.0pt;font-size:35.0pt;font-family:"Times New Roman";color:black;text-transform:uppercase;letter-spacing:1.3pt;font-weight:bold;}
-/* Formatvorlage: 03_RepOesterr */
-p.RepOesterr {margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;margin-bottom:12.0pt;/*text-align:center;*/line-height:20.0pt;border:none;padding:0cm;font-size:20.0pt;font-family:"Times New Roman";color:black;text-transform:uppercase;letter-spacing:1.0pt;font-weight:bold;}
-/* Formatvorlage: 04_AusgabeDaten */
-p.AusgabeDaten {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:14.0pt;padding:0cm;font-size:12.0pt;font-family:"Times New Roman";color: black;font-weight:bold;}
-/* Formatvorlage: 05_Kurztitel
-Kurztitel in einer Spalte (wenn kein TAB vorhanden ist) */
-p.Kurztitel1 {margin-top:2.0pt;margin-right: 0cm;margin-bottom:0cm;margin-left: 3.6cm;/*text-align:justify;*/text-indent: -3.6cm;border:none;padding:0cm;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Kurztitel in zwei Spalten (wenn ein TAB vorhanden ist) */
-p.Kurztitel2 {margin-top:2.0pt;margin-right: 0cm;margin-bottom:0cm;margin-left: 0cm;/*text-align:justify;*/border:none;padding:0cm;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-span.Kurztitelbreite {width: 3.4cm;}
-/* Formatvorlage: 09_Abstand */
-p.Abstand {margin:6.0pt;margin-bottom:6.0pt;line-height:10.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 10_Entwurf */
-p.Entwurf {margin-top:80.0pt;margin-right:0cm;margin-bottom:64.0pt;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";letter-spacing:1.3pt;}
-/* Formatvorlage: 11_Titel */
-p.Titel {margin-top:24.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:11.0pt;font-family:"Times New Roman";font-weight:bold;}
-/* Formatvorlage: 12_PromKl_EinlSatz */
-p.PromKlEinlSatz {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/text-indent:19.85pt;line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 18_Abbildung_oder_Objekt */
-p.AbbildungoderObjekt {margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 19_Beschriftung */
-p.Beschriftung {margin-top:0cm;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 21_NovAo1 */
-p.NovAo1 {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";font-style:italic;}
-/* Formatvorlage: 22_NovAo1 */
-p.NovAo2 {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";font-style:italic;}
-/* Formatvorlage: 23_Satz_(nach_Novao) */
-p.SatznachNovao {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 30_InhaltUeberschrift */
-p.InhaltUeberschrift {margin-top:16.0pt;margin-right:0cm;margin-bottom:8.0pt;margin-left:0cm;text-align:center;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";font-weight:bold;}
-/* Formatvorlage: 31_InhaltSpalte */
-p.InhaltSpalte {margin-top:4.0pt;margin-right:0cm;margin-bottom:4.0pt;margin-left:0cm;line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";font-weight:bold;}
-/* Formatvorlage: 32_InhaltEintrag */
-p.InhaltEintrag {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 41_UeberschrG1 */
-p.UeberschrG1 {margin-top:16.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 42_UeberschrG1- */
-p.UeberschrG1- {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 43_UeberschrG2 */
-p.UeberschrG2 {margin-top:4.0pt;margin-right:0cm;margin-bottom:4.0pt;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 44_UeberschrArt */
-p.UeberschrArt {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 45_UeberschrPara */
-p.UeberschrPara {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 51_Abs */
-p.Abs {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/text-indent:19.85pt;/*line-height:11.0pt;*/font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 52_Ziffer_e1 - e3 */
-p.ZifferE1, p.ZifferE2, p.ZifferE3 {margin-top:2.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 52_Ziffer_mit_Betrag */
-p.ZifferMitBetrag {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 52aT_Ziffer_mit_Betrag_TGUE */
-p.ZifferMitBetragTGUE {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 53_Litera_e1 - e3 */
-p.LiteraE1, p.LiteraE2, p.LiteraE3 {margin-top:2.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 53_Litera_mit_Betrag */
-p.LiteraMitBetrag {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 53aT_Litera_mit_Betrag_TGUE */
-p.LiteraMitBetragTGUE {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 54_Sublitera_e1 - e3 */
-p.SubliteraE1, p.SubliteraE2, p.SubliteraE3 {margin-top:2.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 54_Sublitera_mit_Betrag */
-p.SubliteraMitBetrag {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 54aT_Sublitera_mit_Betrag_TGUE */
-p.SubliteraMitBetragTGUE {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 54a_Strich_e1 - e7 */
-p.StrichE1, p.StrichE2, p.StrichE3, p.StrichE4, p.StrichE5, p.StrichE6, p.StrichE7 {margin-top:2.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 55_SchlussteilAbs, 56_SchlussteilZiff, 57_SchlussteilLit*/
-p.SchlussteilAbs, p.SchlussteilZiff, p.SchlussteilLit {margin:0cm; line-height:11.0pt; font-size:10.0pt; font-family:"Times New Roman";}
-/* Formatvorlage: 61_TabText */
-p.TabText {margin:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 61a_TabTextRechtsb */
-p.TabTextRechtsb {margin:0cm;text-align:right;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 61b_TabTextZentriert */
-p.TabTextZentriert {margin:0cm;text-align:center;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 61c_TabTextBlock */
-p.TabTextBlock {margin:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 62_Kopfzeile */
-p.Kopfzeile {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color: #C0C0C0;}
-/* Formatvorlage: 63_Fußzeile */
-p.Fusszeile {margin-top:10.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:9.0pt;font-family:"Times New Roman";color: #C0C0C0;}
-/* Formatvorlage: 64_FN_Linie */
-p.FNLinie {margin-top:11.0pt;margin-right:13.0cm;margin-bottom:1.0pt;margin-left:0cm;line-height:11.0pt;padding:0cm;font-size:10.0pt;font-family:"Times New Roman";color:black;border-bottom-style: solid;border-bottom-color: Gray;border-bottom-width: 1px;}
-/* Formatvorlage: 65_FN_Text */
-p.FNText {margin:0cm;text-align:justify;line-height:11.0pt;font-size:9.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 66_FN_Zeichen */
-span.FNZeichen {vertical-align:super;}
-/* Formatvorlage: 68_UnterschrL */
-p.UnterschrL {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:left;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 69_UnterschrM */
-p.UnterschrM {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:center;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 71_Anlagenbez */
-p.Anlagenbez {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:right;*/line-height:11.0pt;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 81_ErlUeberschrZ */
-p.ErlUeberschrZ {margin-top:16.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 82_ErlUeberschrL */
-p.ErlUeberschrL {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 83_ErlText */
-p.ErlText {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 85_ErlAufzaehlg - noch nicht fertig */
-p.ErlAufzaehlg {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 89_TGUE_UeberschrSpalte*/
-p.TGUEUeberschrSpalte {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/***************************************************************/
-/* Formatvorlagen fuer Zeichenformatierung */
-/***************************************************************/
-/* Formatvorlage: 990_Fehler */
-span.Fehler {color: red;}
-/* Formatvorlage: 991_GldSymbol */
-span.GldSymbol {font-weight:bold;}
-/* Formatvorlage: 992_Normal */
-span.Normal {font-style: normal;}
-/* Formatvorlage: 993_Fett */
-span.Fett {font-weight:bold;}
-/* Formatvorlage: 994_Kursiv */
-span.Kursiv {font-style:italic;}
-/* Formatvorlage: 995_Unterstrichen */
-span.Unterstrichen {text-decoration:underline;}
-/* Formatvorlage: 996_Gesperrt */
-span.Gesperrt {letter-spacing:1.3pt;}
-/* Formatvorlage: 997_Hoch */
-span.Hoch {line-height: 60%; font-size: 60%; vertical-align:super;}
-/* Formatvorlage: 998_Tief */
-span.Tief {vertical-align:sub;}
-/* Formatvorlage: 999_Fett_und_Kursiv */
-span.FettundKursiv {font-weight:bold; font-style:italic;}
-/* Standardtabschrittweite aus Word */
-span.Standardtabulator {width:35.45pt;}
-/***************************************************************/
-/* Formatvorlagen der Parlamentsdirektion */
-/***************************************************************/
-p.PDAllonge, li.PDAllonge, div.PDAllonge {margin-top:14.0pt;margin-right:0cm;margin-bottom:10.0pt;margin-left:0cm;text-align:center;font-size:14.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDAllongeB, li.PDAllongeB, div.PDAllongeB {margin-top:14.0pt;margin-right:0cm;margin-bottom:10.0pt;margin-left:0cm;text-align:justify;font-size:14.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDAllongeL, li.PDAllongeL, div.PDAllongeL {margin-top:14.0pt;margin-right:0cm;margin-bottom:10.0pt;margin-left:0cm;font-size:14.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDAntragsformel, li.PDAntragsformel, div.PDAntragsformel {margin-top:14.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDDatum, li.PDDatum, div.PDDatum {margin-top:14.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDEntschliessung, li.PDEntschliessung, div.PDEntschliessung {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:11.0pt;font-family:"Times New Roman";layout-grid-mode:line;font-weight:bold;}
-p.PDK1, li.PDK1, div.PDK1 {margin:0cm;text-align:center;border:none;padding:0cm;font-size:12.0pt;font-family:"Times New Roman";letter-spacing:-.4pt;font-weight:bold;}
-p.PDK1Anlage, li.PDK1Anlage, div.PDK1Anlage {margin:0cm;text-align:right;font-size:12.0pt;font-family:"Times New Roman";letter-spacing:-.4pt;font-weight:bold;}
-p.PDK1Ausg, li.PDK1Ausg, div.PDK1Ausg {margin-top:62.9pt;margin-right:0cm;margin-bottom:27.0pt;margin-left:0cm;font-size:11.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDK2, li.PDK2, div.PDK2 {margin-top:0cm;margin-right:0cm;margin-bottom:11.35pt;margin-left:0cm;font-size:22.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDK3, li.PDK3, div.PDK3 {margin-top:0cm;margin-right:0cm;margin-bottom:20.0pt;margin-left:0cm;font-size:18.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDK4, li.PDK4, div.PDK4 {margin-top:0cm;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;font-size:13.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDKopfzeile, li.PDKopfzeile, div.PDKopfzeile {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDU1, li.PDU1, div.PDU1 {margin-top:22.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDU2, li.PDU2, div.PDU2 {margin-top:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:9.0pt;font-family:"Times New Roman";}
-p.PDVorlage, li.PDVorlage, div.PDVorlage {margin-top:0cm;margin-right:0cm;margin-bottom:10.0pt;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:11.0pt;font-family:"Times New Roman";layout-grid-mode:line;font-weight:bold;}
-</xsl:text>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ////////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:nutzdaten">
- <xsl:element name="body">
- <xsl:apply-templates/>
- <xsl:apply-templates select="//bka:fnen" mode="dokumentende"/>
- </xsl:element>
- </xsl:template>
- <!-- ////////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:abschnitt">
- <xsl:variable name="layoutdaten" select="//bka:layoutdaten"/>
- <xsl:element name="div">
- <xsl:choose>
- <xsl:when test="@paperf[.='q']">
- <!-- Querformat? -->
- <xsl:if test="$layoutdaten/@paperh | @typ[.='ns']">
- <xsl:attribute name="class"><xsl:if test="$layoutdaten/@paperh"><xsl:text>paperh</xsl:text></xsl:if><xsl:if test="@typ[.='ns']"><xsl:if test="@nr[.>1]"><xsl:text> nextpage</xsl:text></xsl:if></xsl:if></xsl:attribute>
- <!-- Abschnitt <xsl:value-of select="position()-1"/ -->
- </xsl:if>
- <xsl:apply-templates select="key('key_kzinhalt_typ', 'f')[1]" mode="dokumentanfang"/>
- <xsl:apply-templates/>
- <xsl:apply-templates select="key('key_fzinhalt_typ', 'f')[1]" mode="dokumentende"/>
- </xsl:when>
- <xsl:otherwise>
- <!-- Hochformat (default) -->
- <xsl:if test="$layoutdaten/@paperw | @typ[.='ns']">
- <xsl:attribute name="class"><xsl:if test="$layoutdaten/@paperw"><xsl:text>paperw</xsl:text></xsl:if><xsl:if test="@typ[.='ns']"><xsl:if test="@nr[.>1]"><xsl:text> nextpage</xsl:text></xsl:if></xsl:if></xsl:attribute>
- <!--Abschnitt <xsl:value-of select="position()-1"/-->
- </xsl:if>
- <xsl:apply-templates select="key('key_kzinhalt_typ', 'f')[1]" mode="dokumentanfang"/>
- <xsl:apply-templates/>
- <xsl:apply-templates select="key('key_fzinhalt_typ', 'f')[1]" mode="dokumentende"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Ausgabedaten
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:ausgabe">
- <xsl:element name="table">
- <xsl:attribute name="class">top bottom wi100</xsl:attribute>
- <xsl:element name="tr">
- <xsl:apply-templates mode="erzeuge_ausgabe"/>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <xsl:template match="bka:adtext" mode="erzeuge_ausgabe">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">AusgabeDaten AlignLeft</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <xsl:template match="bka:addat" mode="erzeuge_ausgabe">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">AusgabeDaten AlignCenter</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <xsl:template match="bka:adid" mode="erzeuge_ausgabe">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">AusgabeDaten AlignRight</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Kurztitel
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="*" mode="erzeuge_zeilen"/>
- <!-- nichts tun -->
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="key('key_ueberschrift_typ', 'kurztitel')" mode="erzeuge_zeilen">
- <xsl:element name="tr">
- <xsl:if test="bka:tab[1]">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">Kurztitel2 AlignLeft VAlignTop</xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">Kurztitelbreite</xsl:attribute>
- <!-- Verarbeite nun alles was vor dem 1. Tabulator kommt. -->
- <!-- tab[1]/preceding-sibling::text() bewirkt die Verarbeitung aller Textknoten vor dem 1. Tab. -->
- <!-- tab[1]/preceding-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:for-each select="bka:tab[1]/preceding-sibling::text() | bka:tab[1]/preceding-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">Kurztitel2 AlignLeft</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem 1. Tabulator. -->
- <!-- tab[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem 1. Tab. -->
- <!-- tab[1]/following-sibling::* bewirkt die Verarbeitung der restlichen Tabulatoren und enthaltener Subknoten. -->
- <xsl:for-each select="bka:tab[1]/following-sibling::text() | bka:tab[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:if>
- <xsl:if test="not(bka:tab[1])">
- <!-- Da es keinen Tabulator gibt, wird nur eine Spalte erzeugt. -->
- <xsl:element name="td">
- <xsl:attribute name="colspan">2</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class">Kurztitel1 AlignLeft VAlignTop</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Inhaltsverzeichnis, HTML-Tabellen ////
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:inhaltsvz">
- <xsl:choose>
- <xsl:when test="./@typ='ueberschrift'">
- <xsl:element name="p">
- <xsl:attribute name="class">InhaltUeberschrift <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='spalte'">
- <xsl:element name="p">
- <xsl:attribute name="class">InhaltSpalte <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='eintrag'">
- <xsl:element name="p">
- <xsl:attribute name="class">InhaltEintrag <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:table">
- <xsl:element name="table">
- <xsl:attribute name="class"><xsl:value-of select="generate-id(.)"/></xsl:attribute>
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:thead | bka:tfoot | bka:tbody">
- <!-- 20.12.04 heraus filtern-->
- <!--xsl:element name="thead">
- <xsl:apply-templates select="./@*"/ -->
- <xsl:apply-templates/>
- <!-- /xsl:element -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:tr">
- <xsl:element name="tr">
- <xsl:if test="./@*">
- <xsl:attribute name="class"><xsl:value-of select="generate-id(.)"/></xsl:attribute>
- <xsl:apply-templates select="./@*"/>
- </xsl:if>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:td">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:value-of select="generate-id(.)"/></xsl:attribute>
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@colspan">
- <xsl:attribute name="colspan"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@rowspan">
- <xsl:attribute name="rowspan"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@border">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@cellspacing">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@cellpadding">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@width">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@height">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@align">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@valign">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@style">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@class">
- <xsl:attribute name="class"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@nowrap">
- <!-- Derzeit nichts tun -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@h-start">
- <!-- nichts tun nur RTF-Info -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@h-xval">
- <!-- nichts tun nur RTF-Info -->
- </xsl:template>
- <xsl:template name="checkForEmptyCell">
- <xsl:if test="ancestor::bka:table">
- <xsl:if test=". = ''">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- </xsl:if>
- </xsl:if>
- <xsl:apply-templates/>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Ueberschriften
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:ueberschrift">
- <xsl:choose>
- <xsl:when test="./@typ='bdgesblatt'">
- <xsl:element name="p">
- <xsl:attribute name="class">BDGesBlatt <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='repoesterr'">
- <xsl:element name="p">
- <xsl:attribute name="class">RepOesterr <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='entwurf'">
- <xsl:element name="p">
- <xsl:attribute name="class">Entwurf <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='kurztitel'">
- <xsl:if test="not(name(preceding-sibling::*[1]) = 'ueberschrift')">
- <xsl:element name="table">
- <xsl:attribute name="class">bottom wi100</xsl:attribute>
- <!-- <xsl:attribute name="parent"><xsl:value-of select="name(parent::*)"/></xsl:attribute>
- <xsl:attribute name="preceding"><xsl:value-of select="name(preceding::*)"/></xsl:attribute>
- <xsl:attribute name="preceding-sibling"><xsl:value-of select="name(preceding-sibling::*)"/></xsl:attribute>
- <xsl:attribute name="preceding-sibling-typ"><xsl:value-of select="preceding-sibling::*/@typ"/></xsl:attribute>
- <xsl:attribute name="count-preceding-sibling"><xsl:value-of select="count(preceding-sibling::*)"/></xsl:attribute>
- <xsl:attribute name="count-preceding"><xsl:value-of select="count(preceding::*)"/></xsl:attribute>
- <xsl:attribute name="yyy-sibling-typ"><xsl:value-of select="name(preceding-sibling::*[1])"/></xsl:attribute>
- <xsl:attribute name="zzz-sibling-typ"><xsl:value-of select="name(preceding::*[1])"/></xsl:attribute> -->
- <xsl:apply-templates select="../bka:ueberschrift" mode="erzeuge_zeilen"/>
- </xsl:element>
- </xsl:if>
- </xsl:when>
- <xsl:when test="./@typ='titel'">
- <xsl:element name="p">
- <xsl:attribute name="class">Titel <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='g1'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrG1 <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='g2'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrG2 <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='g1min'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrG1- <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='art'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrArt <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='para'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrPara <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='anlage'">
- <xsl:element name="p">
- <xsl:attribute name="class">Anlagenbez <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='erlz'">
- <xsl:element name="p">
- <xsl:attribute name="class">ErlUeberschrZ <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='erll'">
- <xsl:element name="p">
- <xsl:attribute name="class">ErlUeberschrL <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tgue'">
- <xsl:element name="p">
- <xsl:attribute name="class">TGUEUeberschrSpalte <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Absaetze
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:absatz">
- <xsl:choose>
- <xsl:when test="./@typ='undef'">
- <xsl:element name="p">
- <xsl:attribute name="class">Undefiniert</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='promkleinlsatz'">
- <xsl:element name="p">
- <xsl:attribute name="class">PromKlEinlSatz <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='abs'">
- <xsl:element name="p">
- <xsl:attribute name="class">Abs <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='abbobj'">
- <xsl:element name="p">
- <xsl:attribute name="class">AbbildungoderObjekt <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='novao1'">
- <xsl:element name="p">
- <xsl:attribute name="class">NovAo1 <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='novao2'">
- <xsl:element name="p">
- <xsl:attribute name="class">NovAo2 <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='satz'">
- <xsl:element name="p">
- <xsl:attribute name="class">SatznachNovao <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtext'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabText <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtextr'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabTextRechtsb <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtextz'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabTextZentriert <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtextb'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabTextBlock <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='erltext'">
- <xsl:element name="p">
- <xsl:attribute name="class">ErlText <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='kz'">
- <xsl:element name="p">
- <xsl:attribute name="class">Kopfzeile <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='fz'">
- <xsl:element name="p">
- <xsl:attribute name="class">Fusszeile <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:abstand">
- <xsl:element name="p">
- <xsl:attribute name="class">Abstand <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Normale Liste / Aufzaehlung
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:liste">
- <xsl:element name="table">
- <xsl:attribute name="class">wi100</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:erlliste">
- <xsl:apply-templates mode="erzeuge_erl_liste">
- <xsl:with-param name="classname">ErlAufzaehlg</xsl:with-param>
- </xsl:apply-templates>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:ziffernliste">
- <xsl:choose>
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">ZifferE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">ZifferE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">ZifferE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:literaliste">
- <xsl:choose>
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">LiteraE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">LiteraE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">LiteraE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:subliteraliste">
- <xsl:choose>
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">SubliteraE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">SubliteraE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">SubliteraE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:strichliste">
- <xsl:choose>
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">StrichE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">StrichE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">StrichE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='4'">
- <xsl:apply-templates mode="erzeuge_liste_ebene4">
- <xsl:with-param name="classname">StrichE4</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_erl_liste">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>WErl AlignRight VAlignTop</xsl:text></xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>ErlSp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>ErlSp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">7</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_liste_ebene1">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E1Sp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>E1Sp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">7</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_liste_ebene2">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">W15 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E2Sp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>E2Sp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">6</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_liste_ebene3">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W15 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">W22 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E3Sp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>E3Sp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">5</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_liste_ebene4">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W15 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W22 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">W22 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E4Sp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>E4Sp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">4</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:schluss">
- <xsl:choose>
- <xsl:when test="./@typ='Abs'">
- <!-- Keine Einrückung -->
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">8</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class">SchlussteilAbs</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='Ziff'">
- <!-- wie Ebene 1 -->
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">7</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:text>SchlussteilZiff</xsl:text></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='Lit'">
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">W15</xsl:attribute>
- <!-- wie Ebene 2 -->
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">6</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class">SchlussteilLit</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Liste mit Betrag
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:betragliste">
- <xsl:choose>
- <xsl:when test="./@typ='ziffer'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene1">
- <xsl:with-param name="classname">ZifferMitBetrag</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='litera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene2">
- <xsl:with-param name="classname">LiteraMitBetrag</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='sublitera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene3">
- <xsl:with-param name="classname">SubliteraMitBetrag</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:betraglistetgue">
- <xsl:choose>
- <xsl:when test="./@typ='ziffer'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene1">
- <xsl:with-param name="classname">ZifferMitBetragTGUE</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='litera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene2">
- <xsl:with-param name="classname">LiteraMitBetragTGUE</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='sublitera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene3">
- <xsl:with-param name="classname">SubliteraMitBetragTGUE</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_betragliste_ebene1">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class">AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">5</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:if test="name() = 'tab'">
- <xsl:value-of select="string('&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p class=&quot;')" disable-output-escaping="yes"/>
- <xsl:value-of select="$classname"/>
- <xsl:value-of select="string('&quot;&gt;')" disable-output-escaping="yes"/>
- </xsl:if>
- <xsl:if test="name() != 'tab'">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_betragliste_ebene2">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">4</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:if test="name() = 'tab'">
- <xsl:value-of select="string('&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p class=&quot;')" disable-output-escaping="yes"/>
- <xsl:value-of select="$classname"/>
- <xsl:value-of select="string('&quot;&gt;')" disable-output-escaping="yes"/>
- </xsl:if>
- <xsl:if test="name() != 'tab'">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_betragliste_ebene3">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">3</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:if test="name() = 'tab'">
- <xsl:value-of select="string('&lt;/p&gt;&lt;/td&gt;&lt;td&gt;&lt;p class=&quot;')" disable-output-escaping="yes"/>
- <xsl:value-of select="$classname"/>
- <xsl:value-of select="string('&quot;&gt;')" disable-output-escaping="yes"/>
- </xsl:if>
- <xsl:if test="name() != 'tab'">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Unterschrift
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:unterschrift">
- <xsl:choose>
- <xsl:when test="./@typ='links'">
- <xsl:element name="p">
- <xsl:attribute name="class">UnterschrL</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='mitte'">
- <xsl:element name="p">
- <xsl:attribute name="class">UnterschrM</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='rechts'">
- <xsl:element name="p">
- <xsl:attribute name="class">UnterschrR</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Zeichenformatierung
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:error">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:gldsym">
- <xsl:element name="span">
- <xsl:attribute name="class">GldSymbol</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:n">
- <xsl:element name="span">
- <xsl:attribute name="class">Normal</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:f | bka:b">
- <xsl:element name="span">
- <xsl:attribute name="class">Fett</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:k | bka:i">
- <xsl:element name="span">
- <xsl:attribute name="class">Kursiv</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:u">
- <xsl:element name="span">
- <xsl:attribute name="class">Unterstrichen</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:gs">
- <xsl:element name="span">
- <xsl:attribute name="class">Gesperrt</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:h | bka:super">
- <xsl:element name="span">
- <xsl:attribute name="class">Hoch</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:t | bka:sub">
- <xsl:element name="span">
- <xsl:attribute name="class">Tief</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:fk">
- <xsl:element name="span">
- <xsl:attribute name="class">FettundKursiv</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Sonderzeichen
- ///////////////////////////////////////////////////////////////// -->
- <!-- ///////////////////////////////////////////////////////////////// Sonderzeichen mit gegebenem Code -->
- <!-- A.H., 13. Mai 2005: Diese Regel ist neu wegen Punkt 4.33 aus dem Lastenheft. -->
- <xsl:template match="bka:uchar">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#')"/>
- <xsl:value-of select="@code"/>
- <xsl:value-of disable-output-escaping="yes" select="string(';')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// geschütztes Leerzeichen -->
- <xsl:template match="bka:nbsp">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// doppeltes Anführungszeichen unten (typografisch) -->
- <xsl:template match="bka:bdquo">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8222;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// doppeltes Anführungszeichen oben, links (typografisch) -->
- <xsl:template match="bka:ldquo">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8220;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// kurzer Gedankenstrich -->
- <xsl:template match="bka:kidea">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8211;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// langer Gedankenstrich -->
- <xsl:template match="bka:lidea">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8212;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// geschützter Trennstrich -->
- <xsl:template match="bka:gdash">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#45;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// bedingter Trennstrich (Silbentrennzeichen), Word spezifisch -->
- <xsl:template match="bka:bdash">
- <!-- nichts tun -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// Euro-Zeichen -->
- <xsl:template match="bka:euro">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8364;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// <-Zeichen -->
- <xsl:template match="bka:lt">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;lt;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// >-Zeichen -->
- <xsl:template match="bka:gt">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;gt;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// &-Zeichen -->
- <xsl:template match="bka:amp">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;amp;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// Manueller Zeilenumbruch -->
- <xsl:template match="bka:br">
- <xsl:value-of disable-output-escaping="yes" select="string('&lt;br/>')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:tab">
- <!-- Da weder in HTML noch in CSS2 Tabulatoren moeglich sind, wird ein Tabulator durch ein Blank ersetzt, das in span eingeschlossen ist. -->
- <xsl:element name="span">
- <xsl:attribute name="class">Standardtabulator</xsl:attribute>
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// Zeilenwechsel / Spaltenwechsel-->
- <xsl:template match="bka:wechsel">
- <!-- nichts tun -->
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Verweise
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:wwwlink">
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:text>[Verweis: </xsl:text>
- <xsl:value-of select="@url"/>
- <xsl:text>] </xsl:text>
- <xsl:apply-templates/>
- <!-- XHTML 1.1 -->
- <!--xsl:element name="a">
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element-->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@url">
- <xsl:attribute name="href"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////////////////
- //// Eingebettete base64-codierte Binärdaten
- /////////////////////////////////////////////////////////////////////////////
-
- Alle Binärdateien werden in ein Unterverzeichnis ausgelagert.
- Nach dem alten eRecht-Schema mußte das binary-Element ein ref-Attribut besitzen,
- das den relativen Dateinamen der ausgelagerten Datei enthält.
- Nach dem neuen eRecht-Schema wird dieser relative Dateiname in einem
- src-Element (unter dem binary-Element) gehalten.
- Dieses Stylesheet-File unterstuetzt beide Varianten. -->
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:binary">
- <xsl:element name="img">
- <xsl:if test="./@ref">
- <xsl:if test="./@ref = ''">
- <!-- Abfragen der Art <xsl:if test="./bka:src"> funktionieren nicht. -->
- <xsl:apply-templates select="./bka:src"/>
- </xsl:if>
- <xsl:if test="not(./@ref = '')">
- <xsl:attribute name="src"><xsl:value-of select="./@ref"/></xsl:attribute>
- </xsl:if>
- </xsl:if>
- <xsl:if test="not(./@ref)">
- <!-- Abfragen der Art <xsl:if test="./bka:src"> funktionieren nicht. -->
- <xsl:apply-templates select="./bka:src"/>
- </xsl:if>
- <xsl:attribute name="alt"><xsl:value-of select="./@alt"/></xsl:attribute>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:src">
- <xsl:attribute name="src"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Beschriftung zu Grafiken
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:beschr">
- <xsl:element name="p">
- <xsl:attribute name="class">Beschriftung <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Fuß- und Endnoten
- ///////////////////////////////////////////////////////////////// -->
- <!-- Fußzeilen sollen erst am Ende verarbeitet werden -->
- <xsl:template match="bka:fnen">
- <!-- nichts tun -->
- </xsl:template>
- <xsl:template match="bka:fnen" mode="dokumentende">
- <xsl:apply-templates/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <!-- In XHTML1.1: Statt dem Attribut "name" wird jetzt "id" verwendet. -->
- <xsl:template match="bka:fnzeichen">
- <xsl:choose>
- <xsl:when test="./@typ='f'">
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#FN')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('FNREF')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:apply-templates/>
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNZeichen</xsl:attribute>
- <xsl:value-of select="string('[')"/>
- <xsl:apply-templates/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='e'">
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#EN')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('ENREF')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:apply-templates/>
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNZeichen</xsl:attribute>
- <xsl:value-of select="string('[')"/>
- <xsl:apply-templates/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='r'">
- <!-- Typ "r" ist neu seit 20. Juli 2004. Er steht fuer eine Referenz auf eine Fusz-/Endnote -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNZeichen</xsl:attribute>
- <xsl:value-of select="string('[')"/>
- <xsl:apply-templates/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <!-- In XHTML1.1: Statt dem Attribut "name" wird jetzt "id" verwendet. -->
- <xsl:template match="bka:fntext">
- <xsl:choose>
- <xsl:when test="./@typ='f'">
- <xsl:if test="./@nr = 1">
- <xsl:element name="p">
- <xsl:attribute name="class">FNLinie</xsl:attribute>
- </xsl:element>
- </xsl:if>
- <xsl:element name="p">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#FNREF')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('FN')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:value-of select = "./@nr" />
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- unten kein FNZeichen! -->
- <xsl:value-of select="string('[')"/>
- <xsl:value-of select="./@nr"/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='e'">
- <xsl:if test="./@nr = 1">
- <xsl:element name="p">
- <xsl:attribute name="class">FNLinie</xsl:attribute>
- </xsl:element>
- </xsl:if>
- <xsl:element name="p">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#ENREF')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('EN')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:value-of select = "./@nr" />
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- unten kein FNZeichen! -->
- <xsl:value-of select="string('[')"/>
- <xsl:value-of select="./@nr"/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <!-- Bei Feldern soll nur ihr Inhalt nach HTML uebernommen werden. -->
- <xsl:template match="bka:feld">
- <xsl:apply-templates/>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Kopf- und Fußzeilen
- ///////////////////////////////////////////////////////////////// -->
- <!-- Kopf- und Fußzeilen sollen an bestimmten Stellen verarbeitet werden und nicht dann wenn sie im XML-String vorkommen -->
- <xsl:template match="bka:kzinhalt | bka:fzinhalt">
- <!-- nichts tun -->
- </xsl:template>
- <!--
-<xsl:template match="fzinhalt" mode="dokumentende">
- <xsl:choose >
- <xsl:when test="./@typ='f'">
- </xsl:when>
- <xsl:when test="./@typ='p'">
- <xsl:apply-templates/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
--->
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="key('key_kzinhalt_typ', 'f')" mode="dokumentanfang">
- <!--xsl:apply-templates/-->
- <!-- keine Ausgabe gewuenscht -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="key('key_fzinhalt_typ', 'f')" mode="dokumentende">
- <xsl:apply-templates/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:symbol">
- <xsl:apply-templates/>
- </xsl:template>
- <!-- //////////////Alle anderen Konstrukte//////////////////////////// -->
- <xsl:template match="*">
- <!--xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsches Konstrukt: Bitte melden Sie den Fehler:</xsl:text> <xsl:value-of select="name()"></xsl:value-of>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element-->
- <xsl:element name="{name()}">
- <xsl:for-each select="./@*">
- <xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute>
- </xsl:for-each>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- //////////// Folgende Elemente muessen ignoriert werden, da sie bereits anderweitig abgefragt werden. //////////// -->
- <xsl:template match="bka:layoutdaten | bka:aw | bka:pdeinst">
- <!-- nichts tun -->
- </xsl:template>
- <!-- ////////////// Parlamentsdirektion //////////////////////////// -->
- <xsl:template match="bka:pdvorlage">
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="./bka:pdeinst[1]/@formatname"/></xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ////////////// Ausrichtung von Abätzen (05.01.2006) //////////////////////////// -->
- <xsl:template mode="halign" match="*">
- <!-- Jeder Absatz hat jetzt ein @halign -->
- <xsl:if test="@halign">
- <xsl:choose>
- <xsl:when test="@halign='c'">
- <xsl:text>AlignCenter</xsl:text>
- </xsl:when>
- <xsl:when test="@halign='r'">
- <xsl:text>AlignRight</xsl:text>
- </xsl:when>
- <xsl:when test="@halign='j'">
- <xsl:text>AlignJustify</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>AlignLeft</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.slinterface/test/moa-wartung-la9/stylesheet.1.9.1.xsl b/spss.slinterface/test/moa-wartung-la9/stylesheet.1.9.1.xsl
deleted file mode 100644
index bdc68a099..000000000
--- a/spss.slinterface/test/moa-wartung-la9/stylesheet.1.9.1.xsl
+++ /dev/null
@@ -1,1954 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:bka="http://www.bka.gv.at">
- <!--
- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- Autor: Hermann Anderl, Klaus Schipany
- Revision: 1.9.1
- Erstellt: 03.10.2003
- Änderungen:
- 23.12.2003 - Empfehlung Hr. Karlinger: keine DOCTYPE-Deklaration verwenden.
- 29.12.2003 - Vereinbarung Hr. Karlinger: keine MS-Extensions: <msxsl:script> verwenden.
- 17.12.2004 - Abstimmung Hr Karlinger: thead, tbody, tfoot heraus filtern.
- 12.05.2005 - Div. Aenderungen. Der Parameter Encoding ist neu. Der Defaultwert ist ISO-8859-1 damit das bisherige Encoding beibehalten wird, wenn dieser Parameter nicht uebergeben wird.
- 05.01.2006 - @halign bei <absatz>, <ueberschrift> und <beschr> Elementen prüfen.
- 12.01.2006 - Die CSS-Reduktion erfolgt bereits im XML. Wurde aus dem Stylesheet entfernt.
- 16.01.2006 - erzeuge_liste_ebene2, 3 und 4 wurde korrigiert.
- 14.03.2006 - Verbesserte Darstellung von Aufzählungen mit Betrag (Ziffer, Litera, Strich); CSS für "66_FN_Zeichen" angepasst.
- 06.04.2006 - span.Tief: line-height: 60%; font-size: 60%; hinzugefügt.
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
- <xsl:param name="Encoding">ISO-8859-1</xsl:param>
- <!-- Da beim Attr. encoding scheinbar keine Variable verwendet werden darf, wird das Encoding hier nochmals hardcoded.
- Das bedeutet fuer den XML2XHTML-Konverter, dass er den Encoding-Parameter auch an dieser Stelle übergeben muss
- (indem in dem DOM-Baum der dieses Stylesheet enthaelt die Nodes mit den hardcodeden Encodingtexten durch das gewünschte Encoding ersetzt werden. -->
- <xsl:output method="xml" encoding="ISO-8859-1" omit-xml-declaration="yes" indent="yes"/>
- <!--
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- Bei der Erstellung dieses Stylesheets wurden folgende Kriterien angewandt:
- 1.) Das generierbare XHTML Dokument entspricht der XHTML 1.1 Spezifikation + CSS 2(W3C).
- 2.) Darüber hinaus folgt das Stylesheet den erweiterten Einschränkungen von SLXHTML in der Version 1.0.1 (18.12.2003), Gregor Karlinger.
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
- <!--
- /////////////////////////////////////////////////////////////////
- //// Keys
- ///////////////////////////////////////////////////////////////// -->
- <xsl:key name="key_ueberschrift_typ" match="bka:ueberschrift" use="@typ"/>
- <xsl:key name="key_kzinhalt_typ" match="bka:kzinhalt" use="@typ"/>
- <xsl:key name="key_fzinhalt_typ" match="bka:fzinhalt" use="@typ"/>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Aufbau des XHTML-Dokuments
- /////////////////////////////////////////////////////////////////-->
- <xsl:template match="bka:erechtdok">
- <xsl:value-of disable-output-escaping="yes" select="string('&lt;?xml version=&#x22;1.0&#x22; encoding=&#x22;')"/>
- <xsl:value-of select="$Encoding"/>
- <xsl:value-of disable-output-escaping="yes" select="string('&#x22;?>')"/>
- <xsl:element name="html">
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ////////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:metadaten">
- <xsl:element name="head">
- <xsl:element name="title">eRecht Dokument (1.9.0)</xsl:element>
- <xsl:element name="style">
- <xsl:attribute name="type">text/css</xsl:attribute>
- <!-- Seitenränder dynamisch setzen -->
- <xsl:variable name="layoutdaten" select="//bka:layoutdaten"/>
- <!-- Die Breiten sind in Points (pt) angegeben und werden so weitergereicht. -->
- <xsl:variable name="margt" select="$layoutdaten/@margt"/>
- <xsl:variable name="margr" select="$layoutdaten/@margr"/>
- <xsl:variable name="margb" select="$layoutdaten/@margb"/>
- <xsl:variable name="margl" select="$layoutdaten/@margl"/>
- <xsl:variable name="paperw" select="$layoutdaten/@paperw"/>
- <xsl:variable name="paperh" select="$layoutdaten/@paperh"/>
- <!-- Die CSS-Klassen werden aus dem XML übernommen -->
- <xsl:value-of select="//bka:classes"/>
- <!-- Aufzählungen: 1. Spalte 38 px, 2. Spalte 15 px, 3. Spalte 22 px, 4. Spalte 22 px (empirisch ermittelt) + Rest -->
- <xsl:text>
- .W38 { width:38px; }</xsl:text>
- <xsl:text>
- .W15 { width:15px; }</xsl:text>
- <xsl:text>
- .W22 { width:22px; }</xsl:text>
- <xsl:text>
- .W90 { width:90px; }</xsl:text><!-- 2 cm für die beiden Aufzählungsspalten mit Betrag -->
- <xsl:text>
- .wi100 { width:100%; }</xsl:text>
- <!-- Erlaeuterungsaufzaehlung -->
- <xsl:text>
- .WErl { width:15px; }</xsl:text>
- <!-- 2. Spalte: berechnet-->
- <xsl:text>
- .E1Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E2Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E3Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E4Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E5Sp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22 - 22 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .ErlSp2 { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 25"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E1Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E2Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E3Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E4Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E5Sp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22 - 22 - 22"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .ErlSp2Q { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 25"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E1Sp2B { width:</xsl:text><!-- Aufzählung mit Betrag -->
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 90 - 90"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E2Sp2B { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 90 - 90"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E3Sp2B { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15 - 22 - 90 - 90"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E1Sp2BQ { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 90 - 90"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E2Sp2BQ { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 90 - 90"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .E3Sp2BQ { width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15 - 22 - 90 - 90"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .TextWidth{ width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperw - 38 - 15 -22 -22 -22 - 90 - 90"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .TextWidthQ{ width:</xsl:text>
- <xsl:value-of select="$layoutdaten/@paperh - 38 - 15 -22 -22 -22 - 90 - 90"/>
- <xsl:text>px; }</xsl:text>
- <xsl:text>
- .invisible{ height: 0pt }</xsl:text>
- invisible
- <xsl:text>
- .nextpage { page-break-before:always; }</xsl:text>
- <xsl:if test="$layoutdaten/@margt | $layoutdaten/@margr | $layoutdaten/@margb | $layoutdaten/@margl">
- <xsl:text>
- .margins {</xsl:text>
- <xsl:if test="$layoutdaten/@margt">
- <xsl:value-of select="concat('margin-top:', $margt, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margr">
- <xsl:value-of select="concat('margin-right:', $margr, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margb">
- <xsl:value-of select="concat('margin-bottom:', $margb, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margl">
- <xsl:value-of select="concat('margin-left:', $margl, 'pt;')"/>
- </xsl:if>
- <xsl:text>}</xsl:text>
- </xsl:if>
- <!-- Seitenbreite dynamisch setzen (Hochformat) -->
- <xsl:if test="$layoutdaten/@paperw">
- <xsl:text>
- @media screen { .paperw {</xsl:text>
- <xsl:value-of select="concat('width:', $paperw, 'px;')"/>
- <xsl:if test="$layoutdaten/@margt">
- <xsl:value-of select="concat('margin-top:', $margt, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margr">
- <xsl:value-of select="concat('margin-right:', $margr, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margb">
- <xsl:value-of select="concat('margin-bottom:', $margb, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margl">
- <xsl:value-of select="concat('margin-left:', $margl, 'pt;')"/>
- </xsl:if>
- <xsl:text>}}</xsl:text>
- <xsl:text>
- @media print { .paperw {</xsl:text>
- <xsl:value-of select="concat('width:', $paperw, 'px;')"/>
- <xsl:text>margin-top:0.0pt;margin-right:0.0pt;margin-bottom:0.0pt;margin-left:0.0pt;size:portrait;</xsl:text>
- <xsl:text>}}</xsl:text>
- </xsl:if>
- <!-- Seitenbreite ist die Höhe (Querformat), Drehung der Ränder nach "rechts" -->
- <xsl:if test="$layoutdaten/@paperh">
- <xsl:text>
- @media screen { .paperh {</xsl:text>
- <xsl:value-of select="concat('width:', $paperh, 'px;')"/>
- <xsl:if test="$layoutdaten/@margt">
- <xsl:value-of select="concat('margin-right:', $margt, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margr">
- <xsl:value-of select="concat('margin-bottom:', $margr, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margb">
- <xsl:value-of select="concat('margin-left:', $margb, 'pt;')"/>
- </xsl:if>
- <xsl:if test="$layoutdaten/@margl">
- <xsl:value-of select="concat('margin-top:', $margl, 'pt;')"/>
- </xsl:if>
- <xsl:text>}}</xsl:text>
- <xsl:text>
- @media print { .paperh {</xsl:text>
- <xsl:value-of select="concat('width:', $paperh, 'px;')"/>
- <xsl:text>margin-top:0.0pt;margin-right:0.0pt;margin-bottom:0.0pt;margin-left:0.0pt;size:landscape</xsl:text>
- <xsl:text>}}</xsl:text>
- </xsl:if>
- <xsl:text>
-/* Allgemeine Angaben zum Anzeigen von Linien in Tabellen */
-/*
-@page :left {size: 21cm 29.7cm;margin-left: 2cm;margin-right: 2cm;marks:crop;}
-@page :right {size: 21cm 29.7cm;margin-left: 2cm;margin-right: 2cm;marks:crop;}
-*/
-table.top {border-top-style: solid;border-top-width: thin;border-color: black;}
-table.bottom {border-bottom-style: solid;border-bottom-width: thin;border-color: black;}
-td.top {border-top-style:solid;border-top-width:1pt;}
-td.right {border-right-style:solid;border-right-width:1pt;}
-td.bottom {border-bottom-style:solid;border-bottom-width:1pt;}
-td.left {border-left-style:solid;border-left-width:1pt;}
-/*Text innerhalb einer Tabellenzelle fuer "absatz" und "ueberschrift"*/
-.AlignLeft {text-align:left;}
-.AlignRight {text-align:right;}
-.AlignCenter {text-align:center;}
-.AlignJustify {text-align:justify;}
-.VAlignTop {vertical-align:top;}
-.VAlignBottom {vertical-align:bottom;}
-/***************************************************************/
-/* Legistik-Standard-Formatvorlage */
-/* Formatvorlage: 00_LegStandard */
-/***************************************************************/
-.LegStandard {
-text-align:justify;/*OK*/
-line-height:11.0pt;
-font-size:10.0pt;
-font-family:"Times New Roman";}
-/***************************************************************/
-/* Formatvorlagen fuer Absaetze */
-/***************************************************************/
-/* Formatvorlage: 01_Undefiniert */
-p.Undefiniert {margin-top:1.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;/*OK*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color: red;}
-/* Formatvorlage: 02_BDGesBlatt */
-p.BDGesBlatt {margin-top:14.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:35.0pt;font-size:35.0pt;font-family:"Times New Roman";color:black;text-transform:uppercase;letter-spacing:1.3pt;font-weight:bold;}
-/* Formatvorlage: 03_RepOesterr */
-p.RepOesterr {margin-top:6.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;margin-bottom:12.0pt;/*text-align:center;*/line-height:20.0pt;border:none;padding:0cm;font-size:20.0pt;font-family:"Times New Roman";color:black;text-transform:uppercase;letter-spacing:1.0pt;font-weight:bold;}
-/* Formatvorlage: 04_AusgabeDaten */
-p.AusgabeDaten {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:14.0pt;padding:0cm;font-size:12.0pt;font-family:"Times New Roman";color: black;font-weight:bold;}
-/* Formatvorlage: 05_Kurztitel
-Kurztitel in einer Spalte (wenn kein TAB vorhanden ist) */
-p.Kurztitel1 {margin-top:2.0pt;margin-right: 0cm;margin-bottom:0cm;margin-left: 3.6cm;/*text-align:justify;*/text-indent: -3.6cm;border:none;padding:0cm;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Kurztitel in zwei Spalten (wenn ein TAB vorhanden ist) */
-p.Kurztitel2 {margin-top:2.0pt;margin-right: 0cm;margin-bottom:0cm;margin-left: 0cm;/*text-align:justify;*/border:none;padding:0cm;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-span.Kurztitelbreite {width: 3.4cm;}
-/* Formatvorlage: 09_Abstand */
-p.Abstand {margin:6.0pt;margin-bottom:6.0pt;line-height:10.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 10_Entwurf */
-p.Entwurf {margin-top:80.0pt;margin-right:0cm;margin-bottom:64.0pt;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";letter-spacing:1.3pt;}
-/* Formatvorlage: 11_Titel */
-p.Titel {margin-top:24.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:11.0pt;font-family:"Times New Roman";font-weight:bold;}
-/* Formatvorlage: 12_PromKl_EinlSatz */
-p.PromKlEinlSatz {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/text-indent:19.85pt;line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 18_Abbildung_oder_Objekt */
-p.AbbildungoderObjekt {margin-top:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 19_Beschriftung */
-p.Beschriftung {margin-top:0cm;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 21_NovAo1 */
-p.NovAo1 {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";font-style:italic;}
-/* Formatvorlage: 22_NovAo1 */
-p.NovAo2 {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";font-style:italic;}
-/* Formatvorlage: 23_Satz_(nach_Novao) */
-p.SatznachNovao {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 30_InhaltUeberschrift */
-p.InhaltUeberschrift {margin-top:16.0pt;margin-right:0cm;margin-bottom:8.0pt;margin-left:0cm;text-align:center;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";font-weight:bold;}
-/* Formatvorlage: 31_InhaltSpalte */
-p.InhaltSpalte {margin-top:4.0pt;margin-right:0cm;margin-bottom:4.0pt;margin-left:0cm;line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";font-weight:bold;}
-/* Formatvorlage: 32_InhaltEintrag */
-p.InhaltEintrag {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 41_UeberschrG1 */
-p.UeberschrG1 {margin-top:16.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 42_UeberschrG1- */
-p.UeberschrG1- {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 43_UeberschrG2 */
-p.UeberschrG2 {margin-top:4.0pt;margin-right:0cm;margin-bottom:4.0pt;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 44_UeberschrArt */
-p.UeberschrArt {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 45_UeberschrPara */
-p.UeberschrPara {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 51_Abs */
-p.Abs {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/text-indent:19.85pt;/*line-height:11.0pt;*/font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 52_Ziffer_e1 - e3 */
-p.ZifferE1, p.ZifferE2, p.ZifferE3 {margin-top:2.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 52_Ziffer_mit_Betrag */
-p.ZifferMitBetrag {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 52aT_Ziffer_mit_Betrag_TGUE */
-p.ZifferMitBetragTGUE {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 53_Litera_e1 - e3 */
-p.LiteraE1, p.LiteraE2, p.LiteraE3 {margin-top:2.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 53_Litera_mit_Betrag */
-p.LiteraMitBetrag {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 53aT_Litera_mit_Betrag_TGUE */
-p.LiteraMitBetragTGUE {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 54_Sublitera_e1 - e3 */
-p.SubliteraE1, p.SubliteraE2, p.SubliteraE3 {margin-top:2.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 54_Sublitera_mit_Betrag */
-p.SubliteraMitBetrag {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 54aT_Sublitera_mit_Betrag_TGUE */
-p.SubliteraMitBetragTGUE {margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;punctuation-wrap:simple;text-autospace:none;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 54a_Strich_e1 - e7 */
-p.StrichE1, p.StrichE2, p.StrichE3, p.StrichE4, p.StrichE5, p.StrichE6, p.StrichE7 {margin-top:2.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 55_SchlussteilAbs, 56_SchlussteilZiff, 57_SchlussteilLit*/
-p.SchlussteilAbs, p.SchlussteilZiff, p.SchlussteilLit {margin:0cm; line-height:11.0pt; font-size:10.0pt; font-family:"Times New Roman";}
-/* Formatvorlage: 61_TabText */
-p.TabText {margin:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 61a_TabTextRechtsb */
-p.TabTextRechtsb {margin:0cm;text-align:right;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 61b_TabTextZentriert */
-p.TabTextZentriert {margin:0cm;text-align:center;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 61c_TabTextBlock */
-p.TabTextBlock {margin:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 62_Kopfzeile */
-p.Kopfzeile {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color: #C0C0C0;}
-/* Formatvorlage: 63_Fußzeile */
-p.Fusszeile {margin-top:10.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:9.0pt;font-family:"Times New Roman";color: #C0C0C0;}
-/* Formatvorlage: 64_FN_Linie */
-p.FNLinie {margin-top:11.0pt;margin-right:13.0cm;margin-bottom:1.0pt;margin-left:0cm;line-height:11.0pt;padding:0cm;font-size:10.0pt;font-family:"Times New Roman";color:black;border-bottom-style: solid;border-bottom-color: Gray;border-bottom-width: 1px;}
-/* Formatvorlage: 65_FN_Text */
-p.FNText {margin:0cm;text-align:justify;line-height:11.0pt;font-size:9.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 66_FN_Zeichen */
-span.FNZeichen {vertical-align:super; LAYOUT-GRID-MODE: line;}
-/* Formatvorlage: 68_UnterschrL */
-p.UnterschrL {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:left;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 69_UnterschrM */
-p.UnterschrM {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:center;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 71_Anlagenbez */
-p.Anlagenbez {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:right;*/line-height:11.0pt;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 81_ErlUeberschrZ */
-p.ErlUeberschrZ {margin-top:16.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:11.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 82_ErlUeberschrL */
-p.ErlUeberschrL {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/* Formatvorlage: 83_ErlText */
-p.ErlText {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:justify;*/line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";}
-/* Formatvorlage: 85_ErlAufzaehlg - noch nicht fertig */
-p.ErlAufzaehlg {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";color:black;}
-/* Formatvorlage: 89_TGUE_UeberschrSpalte*/
-p.TGUEUeberschrSpalte {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;/*text-align:center;*/line-height:11.0pt;page-break-after:avoid;font-size:10.0pt;font-family:"Times New Roman";color:black;font-weight:bold;}
-/***************************************************************/
-/* Formatvorlagen fuer Zeichenformatierung */
-/***************************************************************/
-/* Formatvorlage: 990_Fehler */
-span.Fehler {color: red;}
-/* Formatvorlage: 991_GldSymbol */
-span.GldSymbol {font-weight:bold;}
-/* Formatvorlage: 992_Normal */
-span.Normal {font-style: normal;}
-/* Formatvorlage: 993_Fett */
-span.Fett {font-weight:bold;}
-/* Formatvorlage: 994_Kursiv */
-span.Kursiv {font-style:italic;}
-/* Formatvorlage: 995_Unterstrichen */
-span.Unterstrichen {text-decoration:underline;}
-/* Formatvorlage: 996_Gesperrt */
-span.Gesperrt {letter-spacing:1.3pt;}
-/* Formatvorlage: 997_Hoch */
-span.Hoch {line-height: 60%; font-size: 60%; vertical-align:super;}
-/* Formatvorlage: 998_Tief */
-span.Tief {line-height: 60%; font-size: 60%; vertical-align:sub;}
-/* Formatvorlage: 999_Fett_und_Kursiv */
-span.FettundKursiv {font-weight:bold; font-style:italic;}
-/* Standardtabschrittweite aus Word */
-span.Standardtabulator {width:35.45pt;}
-/***************************************************************/
-/* Formatvorlagen der Parlamentsdirektion */
-/***************************************************************/
-p.PDAllonge, li.PDAllonge, div.PDAllonge {margin-top:14.0pt;margin-right:0cm;margin-bottom:10.0pt;margin-left:0cm;text-align:center;font-size:14.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDAllongeB, li.PDAllongeB, div.PDAllongeB {margin-top:14.0pt;margin-right:0cm;margin-bottom:10.0pt;margin-left:0cm;text-align:justify;font-size:14.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDAllongeL, li.PDAllongeL, div.PDAllongeL {margin-top:14.0pt;margin-right:0cm;margin-bottom:10.0pt;margin-left:0cm;font-size:14.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDAntragsformel, li.PDAntragsformel, div.PDAntragsformel {margin-top:14.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDDatum, li.PDDatum, div.PDDatum {margin-top:14.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDEntschliessung, li.PDEntschliessung, div.PDEntschliessung {margin-top:8.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:11.0pt;font-family:"Times New Roman";layout-grid-mode:line;font-weight:bold;}
-p.PDK1, li.PDK1, div.PDK1 {margin:0cm;text-align:center;border:none;padding:0cm;font-size:12.0pt;font-family:"Times New Roman";letter-spacing:-.4pt;font-weight:bold;}
-p.PDK1Anlage, li.PDK1Anlage, div.PDK1Anlage {margin:0cm;text-align:right;font-size:12.0pt;font-family:"Times New Roman";letter-spacing:-.4pt;font-weight:bold;}
-p.PDK1Ausg, li.PDK1Ausg, div.PDK1Ausg {margin-top:62.9pt;margin-right:0cm;margin-bottom:27.0pt;margin-left:0cm;font-size:11.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDK2, li.PDK2, div.PDK2 {margin-top:0cm;margin-right:0cm;margin-bottom:11.35pt;margin-left:0cm;font-size:22.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDK3, li.PDK3, div.PDK3 {margin-top:0cm;margin-right:0cm;margin-bottom:20.0pt;margin-left:0cm;font-size:18.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDK4, li.PDK4, div.PDK4 {margin-top:0cm;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;font-size:13.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDKopfzeile, li.PDKopfzeile, div.PDKopfzeile {margin-top:4.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";layout-grid-mode:line;}
-p.PDU1, li.PDU1, div.PDU1 {margin-top:22.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:10.0pt;font-family:"Times New Roman";font-weight:bold;}
-p.PDU2, li.PDU2, div.PDU2 {margin-top:5.0pt;margin-right:0cm;margin-bottom:0cm;margin-left:0cm;line-height:11.0pt;font-size:9.0pt;font-family:"Times New Roman";}
-p.PDVorlage, li.PDVorlage, div.PDVorlage {margin-top:0cm;margin-right:0cm;margin-bottom:10.0pt;margin-left:0cm;text-align:justify;line-height:11.0pt;font-size:11.0pt;font-family:"Times New Roman";layout-grid-mode:line;font-weight:bold;}
-</xsl:text>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ////////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:nutzdaten">
- <xsl:element name="body">
- <xsl:apply-templates/>
- <xsl:apply-templates select="//bka:fnen" mode="dokumentende"/>
- </xsl:element>
- </xsl:template>
- <!-- ////////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:abschnitt">
- <xsl:variable name="layoutdaten" select="//bka:layoutdaten"/>
- <xsl:element name="div">
- <xsl:choose>
- <xsl:when test="@paperf[.='q']">
- <!-- Querformat? -->
- <xsl:if test="$layoutdaten/@paperh | @typ[.='ns']">
- <xsl:attribute name="class"><xsl:if test="$layoutdaten/@paperh"><xsl:text>paperh</xsl:text></xsl:if><xsl:if test="@typ[.='ns']"><xsl:if test="@nr[.>1]"><xsl:text> nextpage</xsl:text></xsl:if></xsl:if></xsl:attribute>
- <!-- Abschnitt <xsl:value-of select="position()-1"/ -->
- </xsl:if>
- <xsl:apply-templates select="key('key_kzinhalt_typ', 'f')[1]" mode="dokumentanfang"/>
- <xsl:apply-templates/>
- <xsl:apply-templates select="key('key_fzinhalt_typ', 'f')[1]" mode="dokumentende"/>
- </xsl:when>
- <xsl:otherwise>
- <!-- Hochformat (default) -->
- <xsl:if test="$layoutdaten/@paperw | @typ[.='ns']">
- <xsl:attribute name="class"><xsl:if test="$layoutdaten/@paperw"><xsl:text>paperw</xsl:text></xsl:if><xsl:if test="@typ[.='ns']"><xsl:if test="@nr[.>1]"><xsl:text> nextpage</xsl:text></xsl:if></xsl:if></xsl:attribute>
- <!--Abschnitt <xsl:value-of select="position()-1"/-->
- </xsl:if>
- <xsl:apply-templates select="key('key_kzinhalt_typ', 'f')[1]" mode="dokumentanfang"/>
- <xsl:apply-templates/>
- <xsl:apply-templates select="key('key_fzinhalt_typ', 'f')[1]" mode="dokumentende"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Ausgabedaten
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:ausgabe">
- <xsl:element name="table">
- <xsl:attribute name="class">top bottom wi100</xsl:attribute>
- <xsl:element name="tr">
- <xsl:apply-templates mode="erzeuge_ausgabe"/>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <xsl:template match="bka:adtext" mode="erzeuge_ausgabe">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">AusgabeDaten AlignLeft</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <xsl:template match="bka:addat" mode="erzeuge_ausgabe">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">AusgabeDaten AlignCenter</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <xsl:template match="bka:adid" mode="erzeuge_ausgabe">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">AusgabeDaten AlignRight</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Kurztitel
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="*" mode="erzeuge_zeilen"/>
- <!-- nichts tun -->
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="key('key_ueberschrift_typ', 'kurztitel')" mode="erzeuge_zeilen">
- <xsl:element name="tr">
- <xsl:if test="bka:tab[1]">
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">Kurztitel2 AlignLeft VAlignTop</xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">Kurztitelbreite</xsl:attribute>
- <!-- Verarbeite nun alles was vor dem 1. Tabulator kommt. -->
- <!-- tab[1]/preceding-sibling::text() bewirkt die Verarbeitung aller Textknoten vor dem 1. Tab. -->
- <!-- tab[1]/preceding-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:for-each select="bka:tab[1]/preceding-sibling::text() | bka:tab[1]/preceding-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:element name="p">
- <xsl:attribute name="class">Kurztitel2 AlignLeft</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem 1. Tabulator. -->
- <!-- tab[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem 1. Tab. -->
- <!-- tab[1]/following-sibling::* bewirkt die Verarbeitung der restlichen Tabulatoren und enthaltener Subknoten. -->
- <xsl:for-each select="bka:tab[1]/following-sibling::text() | bka:tab[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:if>
- <xsl:if test="not(bka:tab[1])">
- <!-- Da es keinen Tabulator gibt, wird nur eine Spalte erzeugt. -->
- <xsl:element name="td">
- <xsl:attribute name="colspan">2</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class">Kurztitel1 AlignLeft VAlignTop</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:element>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Inhaltsverzeichnis, HTML-Tabellen ////
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:inhaltsvz">
- <xsl:choose>
- <xsl:when test="./@typ='ueberschrift'">
- <xsl:element name="p">
- <xsl:attribute name="class">InhaltUeberschrift <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='spalte'">
- <xsl:element name="p">
- <xsl:attribute name="class">InhaltSpalte <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='eintrag'">
- <xsl:element name="p">
- <xsl:attribute name="class">InhaltEintrag <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:table">
- <xsl:element name="table">
- <xsl:attribute name="class"><xsl:value-of select="generate-id(.)"/></xsl:attribute>
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:thead | bka:tfoot | bka:tbody">
- <!-- 20.12.04 heraus filtern-->
- <!--xsl:element name="thead">
- <xsl:apply-templates select="./@*"/ -->
- <xsl:apply-templates/>
- <!-- /xsl:element -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:tr">
- <xsl:element name="tr">
- <xsl:if test="./@*">
- <xsl:attribute name="class"><xsl:value-of select="generate-id(.)"/></xsl:attribute>
- <xsl:apply-templates select="./@*"/>
- </xsl:if>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:td">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:value-of select="generate-id(.)"/></xsl:attribute>
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@colspan">
- <xsl:attribute name="colspan"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@rowspan">
- <xsl:attribute name="rowspan"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@border">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@cellspacing">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@cellpadding">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@width">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@height">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@align">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@valign">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@style">
- <!-- Wurde in die dyn. class aufgenommen -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@class">
- <xsl:attribute name="class"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@nowrap">
- <!-- Derzeit nichts tun -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@h-start">
- <!-- nichts tun nur RTF-Info -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@h-xval">
- <!-- nichts tun nur RTF-Info -->
- </xsl:template>
- <xsl:template name="checkForEmptyCell">
- <xsl:if test="ancestor::bka:table">
- <xsl:if test=". = ''">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- </xsl:if>
- </xsl:if>
- <xsl:apply-templates/>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Ueberschriften
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:ueberschrift">
- <xsl:choose>
- <xsl:when test="./@typ='bdgesblatt'">
- <xsl:element name="p">
- <xsl:attribute name="class">BDGesBlatt <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='repoesterr'">
- <xsl:element name="p">
- <xsl:attribute name="class">RepOesterr <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='entwurf'">
- <xsl:element name="p">
- <xsl:attribute name="class">Entwurf <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='kurztitel'">
- <xsl:if test="not(name(preceding-sibling::*[1]) = 'ueberschrift')">
- <xsl:element name="table">
- <xsl:attribute name="class">bottom wi100</xsl:attribute>
- <!-- <xsl:attribute name="parent"><xsl:value-of select="name(parent::*)"/></xsl:attribute>
- <xsl:attribute name="preceding"><xsl:value-of select="name(preceding::*)"/></xsl:attribute>
- <xsl:attribute name="preceding-sibling"><xsl:value-of select="name(preceding-sibling::*)"/></xsl:attribute>
- <xsl:attribute name="preceding-sibling-typ"><xsl:value-of select="preceding-sibling::*/@typ"/></xsl:attribute>
- <xsl:attribute name="count-preceding-sibling"><xsl:value-of select="count(preceding-sibling::*)"/></xsl:attribute>
- <xsl:attribute name="count-preceding"><xsl:value-of select="count(preceding::*)"/></xsl:attribute>
- <xsl:attribute name="yyy-sibling-typ"><xsl:value-of select="name(preceding-sibling::*[1])"/></xsl:attribute>
- <xsl:attribute name="zzz-sibling-typ"><xsl:value-of select="name(preceding::*[1])"/></xsl:attribute> -->
- <xsl:apply-templates select="../bka:ueberschrift" mode="erzeuge_zeilen"/>
- </xsl:element>
- </xsl:if>
- </xsl:when>
- <xsl:when test="./@typ='titel'">
- <xsl:element name="p">
- <xsl:attribute name="class">Titel <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='g1'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrG1 <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='g2'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrG2 <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='g1min'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrG1- <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='art'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrArt <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='para'">
- <xsl:element name="p">
- <xsl:attribute name="class">UeberschrPara <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='anlage'">
- <xsl:element name="p">
- <xsl:attribute name="class">Anlagenbez <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='erlz'">
- <xsl:element name="p">
- <xsl:attribute name="class">ErlUeberschrZ <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='erll'">
- <xsl:element name="p">
- <xsl:attribute name="class">ErlUeberschrL <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tgue'">
- <xsl:element name="p">
- <xsl:attribute name="class">TGUEUeberschrSpalte <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Absaetze
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:absatz">
- <xsl:choose>
- <xsl:when test="./@typ='undef'">
- <xsl:element name="p">
- <xsl:attribute name="class">Undefiniert</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='promkleinlsatz'">
- <xsl:element name="p">
- <xsl:attribute name="class">PromKlEinlSatz <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='abs'">
- <xsl:element name="p">
- <xsl:attribute name="class">Abs <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='abbobj'">
- <xsl:element name="p">
- <xsl:attribute name="class">AbbildungoderObjekt <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='novao1'">
- <xsl:element name="p">
- <xsl:attribute name="class">NovAo1 <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='novao2'">
- <xsl:element name="p">
- <xsl:attribute name="class">NovAo2 <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='satz'">
- <xsl:element name="p">
- <xsl:attribute name="class">SatznachNovao <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtext'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabText <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtextr'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabTextRechtsb <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtextz'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabTextZentriert <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='tabtextb'">
- <xsl:element name="p">
- <xsl:attribute name="class">TabTextBlock <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='erltext'">
- <xsl:element name="p">
- <xsl:attribute name="class">ErlText <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='kz'">
- <xsl:element name="p">
- <xsl:attribute name="class">Kopfzeile <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='fz'">
- <xsl:element name="p">
- <xsl:attribute name="class">Fusszeile <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:abstand">
- <xsl:element name="p">
- <xsl:attribute name="class">Abstand <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Normale Liste / Aufzaehlung
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:liste">
- <xsl:element name="table">
- <xsl:attribute name="class">wi100</xsl:attribute>
- <!--xsl:attribute name="border">1</xsl:attribute-->
- <tr class="invisible">
- <td class="W38"></td>
- <td class="W15"></td>
- <td class="W22"></td>
- <td class="W22"></td>
- <td class="W22"></td>
- <td class="TextWidth"></td>
- <td class="W90"></td>
- <td class="W90"></td>
- </tr>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:erlliste">
- <xsl:apply-templates mode="erzeuge_erl_liste">
- <xsl:with-param name="classname">ErlAufzaehlg</xsl:with-param>
- </xsl:apply-templates>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:ziffernliste">
- <xsl:choose>
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">ZifferE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">ZifferE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">ZifferE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:literaliste">
- <xsl:choose>
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">LiteraE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">LiteraE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">LiteraE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:subliteraliste">
- <xsl:choose>
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">SubliteraE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">SubliteraE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">SubliteraE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:strichliste">
- <xsl:choose>
- <xsl:when test="./@ebene='1'">
- <xsl:apply-templates mode="erzeuge_liste_ebene1">
- <xsl:with-param name="classname">StrichE1</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='2'">
- <xsl:apply-templates mode="erzeuge_liste_ebene2">
- <xsl:with-param name="classname">StrichE2</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='3'">
- <xsl:apply-templates mode="erzeuge_liste_ebene3">
- <xsl:with-param name="classname">StrichE3</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@ebene='4'">
- <xsl:apply-templates mode="erzeuge_liste_ebene4">
- <xsl:with-param name="classname">StrichE4</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsche Ebene: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_erl_liste">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>WErl AlignRight VAlignTop</xsl:text></xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>ErlSp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>ErlSp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">7</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_liste_ebene1">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E1Sp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>E1Sp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">7</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_liste_ebene2">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">W15 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E2Sp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>E2Sp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">6</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_liste_ebene3">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W15 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">W22 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E3Sp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>E3Sp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">5</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_liste_ebene4">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W15 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W22 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">W22 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E4Sp2Q</xsl:text></xsl:when><xsl:otherwise><xsl:text>E4Sp2</xsl:text></xsl:otherwise></xsl:choose></xsl:attribute>
- <xsl:attribute name="colspan">4</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:apply-templates select="."/>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:schluss">
- <xsl:choose>
- <xsl:when test="./@typ='Abs'">
- <!-- Keine Einrückung -->
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">8</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class">SchlussteilAbs</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='Ziff'">
- <!-- wie Ebene 1 -->
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">7</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:text>SchlussteilZiff</xsl:text></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='Lit'">
- <xsl:element name="tr">
- <xsl:element name="td"/>
- <xsl:element name="td">
- <xsl:attribute name="class">W15</xsl:attribute>
- <!-- wie Ebene 2 -->
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">AlignJustify</xsl:attribute>
- <xsl:attribute name="colspan">6</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class">SchlussteilLit</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Liste mit Betrag
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:betragliste">
- <xsl:choose>
- <xsl:when test="./@typ='ziffer'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene1">
- <xsl:with-param name="classname">ZifferMitBetrag</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='litera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene2">
- <xsl:with-param name="classname">LiteraMitBetrag</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='sublitera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene3">
- <xsl:with-param name="classname">SubliteraMitBetrag</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:betraglistetgue">
- <xsl:choose>
- <xsl:when test="./@typ='ziffer'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene1">
- <xsl:with-param name="classname">ZifferMitBetragTGUE</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='litera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene2">
- <xsl:with-param name="classname">LiteraMitBetragTGUE</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="./@typ='sublitera'">
- <xsl:apply-templates mode="erzeuge_betragliste_ebene3">
- <xsl:with-param name="classname">SubliteraMitBetragTGUE</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_betragliste_ebene1">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class">W38 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E1Sp2BQ</xsl:text></xsl:when><xsl:otherwise><xsl:text>E1Sp2B</xsl:text></xsl:otherwise></xsl:choose> VAlignTop</xsl:attribute>
- <xsl:attribute name="colspan">5</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:if test="name() = 'tab'">
- <xsl:value-of select="string('&lt;/p&gt;&lt;/td&gt;&lt;td class=&quot;W90 AlignRight VAlignBottom&quot;&gt;&lt;p class=&quot;')" disable-output-escaping="yes"/>
- <xsl:value-of select="$classname"/>
- <xsl:value-of select="string('&quot;&gt;')" disable-output-escaping="yes"/>
- </xsl:if>
- <xsl:if test="name() != 'tab'">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_betragliste_ebene2">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">W15 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E2Sp2BQ</xsl:text></xsl:when><xsl:otherwise><xsl:text>E2Sp2B</xsl:text></xsl:otherwise></xsl:choose> VAlignTop</xsl:attribute>
- <xsl:attribute name="colspan">4</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:if test="name() = 'tab'">
- <xsl:value-of select="string('&lt;/p&gt;&lt;/td&gt;&lt;td class=&quot;W90 AlignRight VAlignBottom&quot;&gt;&lt;p class=&quot;')" disable-output-escaping="yes"/>
- <xsl:value-of select="$classname"/>
- <xsl:value-of select="string('&quot;&gt;')" disable-output-escaping="yes"/>
- </xsl:if>
- <xsl:if test="name() != 'tab'">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:listelem" mode="erzeuge_betragliste_ebene3">
- <xsl:param name="classname"/>
- <xsl:element name="tr">
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W38 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>W15 AlignRight VAlignTop</xsl:text></xsl:attribute>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class">W22 AlignRight VAlignTop</xsl:attribute>
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:apply-templates select="bka:symbol[1]"/>
- </xsl:element>
- </xsl:element>
- <xsl:element name="td">
- <xsl:attribute name="class"><xsl:text>AlignJustify </xsl:text><xsl:choose><xsl:when test="ancestor::bka:abschnitt/@paperf[.='q']"><xsl:text>E1Sp2BQ</xsl:text></xsl:when><xsl:otherwise><xsl:text>E1Sp2B</xsl:text></xsl:otherwise></xsl:choose> VAlignTop</xsl:attribute>
- <xsl:attribute name="colspan">3</xsl:attribute>
- <!-- Verarbeite nun den Rest ab dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::text() bewirkt die Verarbeitung aller Textknoten nach dem Symbolknoten. -->
- <!-- symbol[1]/following-sibling::* bewirkt die Verarbeitung der enthaltenen Subknoten. -->
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="$classname"/></xsl:attribute>
- <xsl:for-each select="bka:symbol[1]/following-sibling::text() | bka:symbol[1]/following-sibling::*">
- <xsl:if test="name() = 'tab'">
- <xsl:value-of select="string('&lt;/p&gt;&lt;/td&gt;&lt;td class=&quot;W90 AlignRight VAlignBottom&quot;&gt;&lt;p class=&quot;')" disable-output-escaping="yes"/>
- <xsl:value-of select="$classname"/>
- <xsl:value-of select="string('&quot;&gt;')" disable-output-escaping="yes"/>
- </xsl:if>
- <xsl:if test="name() != 'tab'">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
- </xsl:element>
- </xsl:element>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Unterschrift
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:unterschrift">
- <xsl:choose>
- <xsl:when test="./@typ='links'">
- <xsl:element name="p">
- <xsl:attribute name="class">UnterschrL</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='mitte'">
- <xsl:element name="p">
- <xsl:attribute name="class">UnterschrM</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='rechts'">
- <xsl:element name="p">
- <xsl:attribute name="class">UnterschrR</xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Zeichenformatierung
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:error">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:gldsym">
- <xsl:element name="span">
- <xsl:attribute name="class">GldSymbol</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:n">
- <xsl:element name="span">
- <xsl:attribute name="class">Normal</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:f | bka:b">
- <xsl:element name="span">
- <xsl:attribute name="class">Fett</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:k | bka:i">
- <xsl:element name="span">
- <xsl:attribute name="class">Kursiv</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:u">
- <xsl:element name="span">
- <xsl:attribute name="class">Unterstrichen</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:gs">
- <xsl:element name="span">
- <xsl:attribute name="class">Gesperrt</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:h | bka:super">
- <xsl:element name="span">
- <xsl:attribute name="class">Hoch</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:t | bka:sub">
- <xsl:element name="span">
- <xsl:attribute name="class">Tief</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:fk">
- <xsl:element name="span">
- <xsl:attribute name="class">FettundKursiv</xsl:attribute>
- <xsl:if test=".=' '">
- <xsl:value-of select="."/>
- </xsl:if>
- <!-- MSXSL reduziert mehrere Blanks auf eines. -->
- <xsl:if test="not(.=' ')">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Sonderzeichen
- ///////////////////////////////////////////////////////////////// -->
- <!-- ///////////////////////////////////////////////////////////////// Sonderzeichen mit gegebenem Code -->
- <!-- A.H., 13. Mai 2005: Diese Regel ist neu wegen Punkt 4.33 aus dem Lastenheft. -->
- <xsl:template match="bka:uchar">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#')"/>
- <xsl:value-of select="@code"/>
- <xsl:value-of disable-output-escaping="yes" select="string(';')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// geschütztes Leerzeichen -->
- <xsl:template match="bka:nbsp">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// doppeltes Anführungszeichen unten (typografisch) -->
- <xsl:template match="bka:bdquo">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8222;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// doppeltes Anführungszeichen oben, links (typografisch) -->
- <xsl:template match="bka:ldquo">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8220;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// kurzer Gedankenstrich -->
- <xsl:template match="bka:kidea">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8211;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// langer Gedankenstrich -->
- <xsl:template match="bka:lidea">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8212;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// geschützter Trennstrich -->
- <xsl:template match="bka:gdash">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#45;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// bedingter Trennstrich (Silbentrennzeichen), Word spezifisch -->
- <xsl:template match="bka:bdash">
- <!-- nichts tun -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// Euro-Zeichen -->
- <xsl:template match="bka:euro">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#8364;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// <-Zeichen -->
- <xsl:template match="bka:lt">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;lt;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// >-Zeichen -->
- <xsl:template match="bka:gt">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;gt;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// &-Zeichen -->
- <xsl:template match="bka:amp">
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;amp;')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// Manueller Zeilenumbruch -->
- <xsl:template match="bka:br">
- <xsl:value-of disable-output-escaping="yes" select="string('&lt;br/>')"/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:tab">
- <!-- Da weder in HTML noch in CSS2 Tabulatoren moeglich sind, wird ein Tabulator durch ein Blank ersetzt, das in span eingeschlossen ist. -->
- <xsl:element name="span">
- <xsl:attribute name="class">Standardtabulator</xsl:attribute>
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// Zeilenwechsel / Spaltenwechsel-->
- <xsl:template match="bka:wechsel">
- <!-- nichts tun -->
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Verweise
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:wwwlink">
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:text>[Verweis: </xsl:text>
- <xsl:value-of select="@url"/>
- <xsl:text>] </xsl:text>
- <xsl:apply-templates/>
- <!-- XHTML 1.1 -->
- <!--xsl:element name="a">
- <xsl:apply-templates select="./@*"/>
- <xsl:apply-templates/>
- </xsl:element-->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="@url">
- <xsl:attribute name="href"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////////////////
- //// Eingebettete base64-codierte Binärdaten
- /////////////////////////////////////////////////////////////////////////////
-
- Alle Binärdateien werden in ein Unterverzeichnis ausgelagert.
- Nach dem alten eRecht-Schema mußte das binary-Element ein ref-Attribut besitzen,
- das den relativen Dateinamen der ausgelagerten Datei enthält.
- Nach dem neuen eRecht-Schema wird dieser relative Dateiname in einem
- src-Element (unter dem binary-Element) gehalten.
- Dieses Stylesheet-File unterstuetzt beide Varianten. -->
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:binary">
- <xsl:element name="img">
- <xsl:if test="./@ref">
- <xsl:if test="./@ref = ''">
- <!-- Abfragen der Art <xsl:if test="./bka:src"> funktionieren nicht. -->
- <xsl:apply-templates select="./bka:src"/>
- </xsl:if>
- <xsl:if test="not(./@ref = '')">
- <xsl:attribute name="src"><xsl:value-of select="./@ref"/></xsl:attribute>
- </xsl:if>
- </xsl:if>
- <xsl:if test="not(./@ref)">
- <!-- Abfragen der Art <xsl:if test="./bka:src"> funktionieren nicht. -->
- <xsl:apply-templates select="./bka:src"/>
- </xsl:if>
- <xsl:attribute name="alt"><xsl:value-of select="./@alt"/></xsl:attribute>
- </xsl:element>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:src">
- <xsl:attribute name="src"><xsl:value-of select="."/></xsl:attribute>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Beschriftung zu Grafiken
- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:beschr">
- <xsl:element name="p">
- <xsl:attribute name="class">Beschriftung <xsl:apply-templates mode="halign" select="."/></xsl:attribute>
- <xsl:call-template name="checkForEmptyCell"/>
- </xsl:element>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Fuß- und Endnoten
- ///////////////////////////////////////////////////////////////// -->
- <!-- Fußzeilen sollen erst am Ende verarbeitet werden -->
- <xsl:template match="bka:fnen">
- <!-- nichts tun -->
- </xsl:template>
- <xsl:template match="bka:fnen" mode="dokumentende">
- <xsl:apply-templates/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <!-- In XHTML1.1: Statt dem Attribut "name" wird jetzt "id" verwendet. -->
- <xsl:template match="bka:fnzeichen">
- <xsl:choose>
- <xsl:when test="./@typ='f'">
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#FN')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('FNREF')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:apply-templates/>
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNZeichen</xsl:attribute>
- <xsl:value-of select="string('[')"/>
- <xsl:apply-templates/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='e'">
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#EN')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('ENREF')" /><xsl:value-of select = "." /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:apply-templates/>
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNZeichen</xsl:attribute>
- <xsl:value-of select="string('[')"/>
- <xsl:apply-templates/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='r'">
- <!-- Typ "r" ist neu seit 20. Juli 2004. Er steht fuer eine Referenz auf eine Fusz-/Endnote -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNZeichen</xsl:attribute>
- <xsl:value-of select="string('[')"/>
- <xsl:apply-templates/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <!-- In XHTML1.1: Statt dem Attribut "name" wird jetzt "id" verwendet. -->
- <xsl:template match="bka:fntext">
- <xsl:choose>
- <xsl:when test="./@typ='f'">
- <xsl:if test="./@nr = 1">
- <xsl:element name="p">
- <xsl:attribute name="class">FNLinie</xsl:attribute>
- </xsl:element>
- </xsl:if>
- <xsl:element name="p">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#FNREF')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('FN')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:value-of select = "./@nr" />
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- unten kein FNZeichen! -->
- <xsl:value-of select="string('[')"/>
- <xsl:value-of select="./@nr"/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:when>
- <xsl:when test="./@typ='e'">
- <xsl:if test="./@nr = 1">
- <xsl:element name="p">
- <xsl:attribute name="class">FNLinie</xsl:attribute>
- </xsl:element>
- </xsl:if>
- <xsl:element name="p">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- XHTML 1.1 Lösung -->
- <!--xsl:element name="a">
- <xsl:attribute name="href"><xsl:value-of select = "string('#ENREF')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:attribute name="id"><xsl:value-of select = "string('EN')" /><xsl:value-of select = "./@nr" /></xsl:attribute>
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <xsl:value-of select = "string('[')" />
- <xsl:value-of select = "./@nr" />
- <xsl:value-of select = "string(']')" />
- </xsl:element>
- </xsl:element-->
- <!-- SLXHTML 1.0.1 unterstützt das Hypertext Modul NICHT -->
- <xsl:element name="span">
- <xsl:attribute name="class">FNText</xsl:attribute>
- <!-- unten kein FNZeichen! -->
- <xsl:value-of select="string('[')"/>
- <xsl:value-of select="./@nr"/>
- <xsl:value-of select="string(']')"/>
- </xsl:element>
- <xsl:value-of disable-output-escaping="yes" select="string('&amp;#160;')"/>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <!-- Bei Feldern soll nur ihr Inhalt nach HTML uebernommen werden. -->
- <xsl:template match="bka:feld">
- <xsl:apply-templates/>
- </xsl:template>
- <!--
- /////////////////////////////////////////////////////////////////
- //// Kopf- und Fußzeilen
- ///////////////////////////////////////////////////////////////// -->
- <!-- Kopf- und Fußzeilen sollen an bestimmten Stellen verarbeitet werden und nicht dann wenn sie im XML-String vorkommen -->
- <xsl:template match="bka:kzinhalt | bka:fzinhalt">
- <!-- nichts tun -->
- </xsl:template>
- <!--
-<xsl:template match="fzinhalt" mode="dokumentende">
- <xsl:choose >
- <xsl:when test="./@typ='f'">
- </xsl:when>
- <xsl:when test="./@typ='p'">
- <xsl:apply-templates/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falscher Typ: Bitte melden Sie den Fehler:</xsl:text>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
--->
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="key('key_kzinhalt_typ', 'f')" mode="dokumentanfang">
- <!--xsl:apply-templates/-->
- <!-- keine Ausgabe gewuenscht -->
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="key('key_fzinhalt_typ', 'f')" mode="dokumentende">
- <xsl:apply-templates/>
- </xsl:template>
- <!-- ///////////////////////////////////////////////////////////////// -->
- <xsl:template match="bka:symbol">
- <xsl:apply-templates/>
- </xsl:template>
- <!-- //////////////Alle anderen Konstrukte//////////////////////////// -->
- <xsl:template match="*">
- <!--xsl:element name="p">
- <xsl:element name="span">
- <xsl:attribute name="class">Fehler</xsl:attribute>
- <xsl:text>Falsches Konstrukt: Bitte melden Sie den Fehler:</xsl:text> <xsl:value-of select="name()"></xsl:value-of>
- </xsl:element>
- <xsl:apply-templates/>
- </xsl:element-->
- <xsl:element name="{name()}">
- <xsl:for-each select="./@*">
- <xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute>
- </xsl:for-each>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- //////////// Folgende Elemente muessen ignoriert werden, da sie bereits anderweitig abgefragt werden. //////////// -->
- <xsl:template match="bka:layoutdaten | bka:aw | bka:pdeinst">
- <!-- nichts tun -->
- </xsl:template>
- <!-- ////////////// Parlamentsdirektion //////////////////////////// -->
- <xsl:template match="bka:pdvorlage">
- <xsl:element name="p">
- <xsl:attribute name="class"><xsl:value-of select="./bka:pdeinst[1]/@formatname"/></xsl:attribute>
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:template>
- <!-- ////////////// Ausrichtung von Abätzen (05.01.2006) //////////////////////////// -->
- <xsl:template mode="halign" match="*">
- <!-- Jeder Absatz hat jetzt ein @halign -->
- <xsl:if test="@halign">
- <xsl:choose>
- <xsl:when test="@halign='c'">
- <xsl:text>AlignCenter</xsl:text>
- </xsl:when>
- <xsl:when test="@halign='r'">
- <xsl:text>AlignRight</xsl:text>
- </xsl:when>
- <xsl:when test="@halign='j'">
- <xsl:text>AlignJustify</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>AlignLeft</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyRequest.106_2006.iso8859.xml b/spss.slinterface/test/moa-wartung-la9/verifyRequest.106_2006.iso8859.xml
deleted file mode 100644
index c71087424..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyRequest.106_2006.iso8859.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<VerifyXMLSignatureRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" 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#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SignatureInfo>
- <SignatureEnvironment>
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/signatur_BGBl__II_Nr__106_2006.xml</LocRefContent>
- </SignatureEnvironment>
- <SignatureLocation>/dsig:Signature</SignatureLocation>
- </SignatureInfo>
- <Supplement>
- <Content Reference="stylesheet.xsl">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/stylesheet.1.9.0.xsl</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="dokument.xml">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/BGBl__II_Nr__106_2006.iso8859.xml</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="./Bilder-Dateien/Bilder.img1is.gif">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/106_2006.img1is.gif</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="./Bilder-Dateien/Bilder.img2is.gif">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/106_2006.img2is.gif</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="./Bilder-Dateien/Bilder.img3is.gif">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/106_2006.img3is.gif</LocRefContent>
- </Content>
- </Supplement>
-</VerifyXMLSignatureRequest>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyRequest.106_2006.utf8.xml b/spss.slinterface/test/moa-wartung-la9/verifyRequest.106_2006.utf8.xml
deleted file mode 100644
index c71087424..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyRequest.106_2006.utf8.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<VerifyXMLSignatureRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" 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#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SignatureInfo>
- <SignatureEnvironment>
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/signatur_BGBl__II_Nr__106_2006.xml</LocRefContent>
- </SignatureEnvironment>
- <SignatureLocation>/dsig:Signature</SignatureLocation>
- </SignatureInfo>
- <Supplement>
- <Content Reference="stylesheet.xsl">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/stylesheet.1.9.0.xsl</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="dokument.xml">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/BGBl__II_Nr__106_2006.iso8859.xml</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="./Bilder-Dateien/Bilder.img1is.gif">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/106_2006.img1is.gif</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="./Bilder-Dateien/Bilder.img2is.gif">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/106_2006.img2is.gif</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="./Bilder-Dateien/Bilder.img3is.gif">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/106_2006.img3is.gif</LocRefContent>
- </Content>
- </Supplement>
-</VerifyXMLSignatureRequest>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyRequest.204_2006.iso8859.xml b/spss.slinterface/test/moa-wartung-la9/verifyRequest.204_2006.iso8859.xml
deleted file mode 100644
index 56c0259aa..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyRequest.204_2006.iso8859.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<VerifyXMLSignatureRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" 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#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SignatureInfo>
- <SignatureEnvironment>
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/signatur_BGBl__II_Nr__204_2006.xml</LocRefContent>
- </SignatureEnvironment>
- <SignatureLocation>/dsig:Signature</SignatureLocation>
- </SignatureInfo>
- <Supplement>
- <Content Reference="stylesheet.xsl">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/stylesheet.1.9.1.xsl</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="dokument.xml">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/BGBl__II_Nr__204_2006.utf8.xml</LocRefContent>
- </Content>
- </Supplement>
-</VerifyXMLSignatureRequest>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyRequest.204_2006.utf8.xml b/spss.slinterface/test/moa-wartung-la9/verifyRequest.204_2006.utf8.xml
deleted file mode 100644
index 56c0259aa..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyRequest.204_2006.utf8.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<VerifyXMLSignatureRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" 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#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SignatureInfo>
- <SignatureEnvironment>
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/signatur_BGBl__II_Nr__204_2006.xml</LocRefContent>
- </SignatureEnvironment>
- <SignatureLocation>/dsig:Signature</SignatureLocation>
- </SignatureInfo>
- <Supplement>
- <Content Reference="stylesheet.xsl">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/stylesheet.1.9.1.xsl</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="dokument.xml">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/BGBl__II_Nr__204_2006.utf8.xml</LocRefContent>
- </Content>
- </Supplement>
-</VerifyXMLSignatureRequest>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyRequest.341_2004.iso8859.xml b/spss.slinterface/test/moa-wartung-la9/verifyRequest.341_2004.iso8859.xml
deleted file mode 100644
index f1feb6858..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyRequest.341_2004.iso8859.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<VerifyXMLSignatureRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" 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#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SignatureInfo>
- <SignatureEnvironment>
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/signatur_BGBl__II_Nr__341_2004.xml</LocRefContent>
- </SignatureEnvironment>
- <SignatureLocation>/dsig:Signature</SignatureLocation>
- </SignatureInfo>
- <Supplement>
- <Content Reference="stylesheet.xsl">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/stylesheet.1.8.6.xsl</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="dokument.xml">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/BGBl__II_Nr__341_2004.utf8.xml</LocRefContent>
- </Content>
- </Supplement>
-</VerifyXMLSignatureRequest>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyRequest.341_2004.utf8.xml b/spss.slinterface/test/moa-wartung-la9/verifyRequest.341_2004.utf8.xml
deleted file mode 100644
index f1feb6858..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyRequest.341_2004.utf8.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<VerifyXMLSignatureRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20031231#" 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#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SignatureInfo>
- <SignatureEnvironment>
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/signatur_BGBl__II_Nr__341_2004.xml</LocRefContent>
- </SignatureEnvironment>
- <SignatureLocation>/dsig:Signature</SignatureLocation>
- </SignatureInfo>
- <Supplement>
- <Content Reference="stylesheet.xsl">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/stylesheet.1.8.6.xsl</LocRefContent>
- </Content>
- </Supplement>
- <Supplement>
- <Content Reference="dokument.xml">
- <LocRefContent>http://localhost:8080/moa-sl/test/moa-wartung-la9/BGBl__II_Nr__341_2004.utf8.xml</LocRefContent>
- </Content>
- </Supplement>
-</VerifyXMLSignatureRequest>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyResponse.106_2006.iso8859.xml b/spss.slinterface/test/moa-wartung-la9/verifyResponse.106_2006.iso8859.xml
deleted file mode 100644
index 6872e2cf4..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyResponse.106_2006.iso8859.xml
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl11:VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" 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:SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Christian Wregar,OU=Verfassungsdienst,O=Bundeskanzleramt der Republik \C3\96sterreich,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=a-sign-corporate-light-01,OU=a-sign-corporate-light-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>21221</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIE4TCCA8mgAwIBAgICUuUwDQYJKoZIhvcNAQEFBQAwgZ8xCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIjAgBgNVBAsTGWEtc2lnbi1jb3Jw
-b3JhdGUtbGlnaHQtMDExIjAgBgNVBAMTGWEtc2lnbi1jb3Jwb3JhdGUtbGlnaHQt
-MDEwHhcNMDMxMjEwMTcyMzA3WhcNMDYxMjEwMTcyMzA3WjCBnzELMAkGA1UEBhMC
-QVQxWTBXBgNVBAoeUABCAHUAbgBkAGUAcwBrAGEAbgB6AGwAZQByAGEAbQB0ACAA
-ZABlAHIAIABSAGUAcAB1AGIAbABpAGsAIADWAHMAdABlAHIAcgBlAGkAYwBoMRow
-GAYDVQQLExFWZXJmYXNzdW5nc2RpZW5zdDEZMBcGA1UEAxMQQ2hyaXN0aWFuIFdy
-ZWdhcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv7Z6w9XhQLoIxipExnL7
-go/rp5Leh/y0E8mjS7XKe4acgmb/+p7cyAIzDjSY4Jse4xz9cKb+0hrEyKJjvR61
-Tl4lJxQsdYan3rLqcruPlC0GRkAgiiRdLwvAaAUBqzYxzTjKvdZBdcnuY+S2Ad1Z
-5N5zAF2XRzykcsmLRZvpvJ8CAwEAAaOCAacwggGjMAkGA1UdEwQCMAAwEQYDVR0O
-BAoECEhNunRQSAFFMF0GA1UdIARWMFQwUgYHKigAEQEOATBHMEUGCCsGAQUFBwIB
-FjlodHRwOi8vd3d3LmEtdHJ1c3QuYXQvZG9jcy9jcC9hc2lnbi1nb3Zlcm5tZW50
-LXNlcnZlci5wZGYwEwYDVR0jBAwwCoAITp5/1C/JHx8wfwYIKwYBBQUHAQEEczBx
-MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRydXN0LmF0L29jc3AwRgYIKwYB
-BQUHMAKGOmh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNpZ24tY29ycG9y
-YXRlLWxpZ2h0LTAxYS5jcnQwDgYDVR0PAQH/BAQDAgeAMG4GA1UdHwRnMGUwY6Bh
-oF+GXWxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1s
-aWdodC0wMSxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0
-PzAOBgcqKAAKAQEBBAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFIWZVsrHNwZDSkE
-44Cyc1cCJU49CrjsX7OPG43notq9JPRPMvbVAOrN3g0H8x2oOSYoxscKut1IqLxc
-xUVKYuCZEQBj0FZTYLFIuK8//vPOwmTSTBKMjKZpkkxfdcM5JX+nGdJgfqndjqPw
-e9lZ213EMIEfEf1Nfr5R0MNk1uCUg9diqEpDcUdVks2KN4/zQVuNRlGFgM+y8E2N
-VFopTtCBhSj6nuxeIbpbEOmjuAfF5zoVAJg4nj4DKJC8oiaY+KR+817fXpHclzxd
-f1s0aVpqdOf7Dc0FXjrCBGKpyjcN4Qj9zioy5J6awkiWDF9CQICxwt4TYB1lS8Vx
-Z+ghQ0g=</dsig:X509Certificate><moa:PublicAuthority/></dsig:X509Data></sl11:SignerInfo><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>PGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgoJPGhl
-YWQ+Cjx0aXRsZT5lUmVjaHQgRG9rdW1lbnQgKDEuOS4wKTwvdGl0bGU+CjxzdHls
-ZSB0eXBlPSJ0ZXh0L2NzcyI+CiAgICAgICAgLlczOCB7IHdpZHRoOjM4cHg7IH0K
-ICAgICAgICAuVzE1IHsgd2lkdGg6MTVweDsgfQogICAgICAgIC5XMjIgeyB3aWR0
-aDoyMnB4OyB9CiAgICAgICAgLndpMTAwIHsgd2lkdGg6MTAwJTsgfQogICAgICAg
-IC5XRXJsIHsgd2lkdGg6MTVweDsgfQogICAgICAgIC5FMVNwMiB7IHdpZHRoOjU1
-Ny4zNXB4OyB9CiAgICAgICAgLkUyU3AyIHsgd2lkdGg6NTQyLjM1cHg7IH0KICAg
-ICAgICAuRTNTcDIgeyB3aWR0aDo1MjAuMzVweDsgfQogICAgICAgIC5FNFNwMiB7
-IHdpZHRoOjQ5OC4zNXB4OyB9CiAgICAgICAgLkU1U3AyIHsgd2lkdGg6NDc2LjM1
-cHg7IH0KICAgICAgICAuRXJsU3AyIHsgd2lkdGg6NTcwLjM1cHg7IH0KICAgICAg
-ICAuRTFTcDJRIHsgd2lkdGg6ODA0cHg7IH0KICAgICAgICAuRTJTcDJRIHsgd2lk
-dGg6Nzg5cHg7IH0KICAgICAgICAuRTNTcDJRIHsgd2lkdGg6NzY3cHg7IH0KICAg
-ICAgICAuRTRTcDJRIHsgd2lkdGg6NzQ1cHg7IH0KICAgICAgICAuRTVTcDJRIHsg
-d2lkdGg6NzIzcHg7IH0KICAgICAgICAuRXJsU3AyUSB7IHdpZHRoOjgxN3B4OyB9
-CiAgICAgICAgLm5leHRwYWdlIHsgcGFnZS1icmVhay1iZWZvcmU6YWx3YXlzOyB9
-CiAgICAgICAgLm1hcmdpbnMge21hcmdpbi10b3A6ODUuMDVwdDttYXJnaW4tcmln
-aHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2luLWxlZnQ6ODUu
-MDVwdDt9CiAgICAgICAgQG1lZGlhIHNjcmVlbiB7IC5wYXBlcncge3dpZHRoOjU5
-NS4zNXB4O21hcmdpbi10b3A6ODUuMDVwdDttYXJnaW4tcmlnaHQ6ODUuMDVwdDtt
-YXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2luLWxlZnQ6ODUuMDVwdDt9fQogICAg
-ICAgIEBtZWRpYSBwcmludCB7IC5wYXBlcncge3dpZHRoOjU5NS4zNXB4O21hcmdp
-bi10b3A6MC4wcHQ7bWFyZ2luLXJpZ2h0OjAuMHB0O21hcmdpbi1ib3R0b206MC4w
-cHQ7bWFyZ2luLWxlZnQ6MC4wcHQ7c2l6ZTpwb3J0cmFpdDt9fQogICAgICAgIEBt
-ZWRpYSBzY3JlZW4geyAucGFwZXJoIHt3aWR0aDo4NDJweDttYXJnaW4tcmlnaHQ6
-ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2luLWxlZnQ6ODUuMDVw
-dDttYXJnaW4tdG9wOjg1LjA1cHQ7fX0KICAgICAgICBAbWVkaWEgcHJpbnQgeyAu
-cGFwZXJoIHt3aWR0aDo4NDJweDttYXJnaW4tdG9wOjAuMHB0O21hcmdpbi1yaWdo
-dDowLjBwdDttYXJnaW4tYm90dG9tOjAuMHB0O21hcmdpbi1sZWZ0OjAuMHB0O3Np
-emU6bGFuZHNjYXBlfX0KLyogQWxsZ2VtZWluZSBBbmdhYmVuIHp1bSBBbnplaWdl
-biB2b24gTGluaWVuIGluIFRhYmVsbGVuICAgICAgKi8KLyoKQHBhZ2UgOmxlZnQg
-e3NpemU6IDIxY20gMjkuN2NtO21hcmdpbi1sZWZ0OiAyY207bWFyZ2luLXJpZ2h0
-OiAyY207bWFya3M6Y3JvcDt9CkBwYWdlIDpyaWdodCB7c2l6ZTogMjFjbSAyOS43
-Y207bWFyZ2luLWxlZnQ6IDJjbTttYXJnaW4tcmlnaHQ6IDJjbTttYXJrczpjcm9w
-O30KKi8KdGFibGUudG9wIHtib3JkZXItdG9wLXN0eWxlOiBzb2xpZDtib3JkZXIt
-dG9wLXdpZHRoOiB0aGluO2JvcmRlci1jb2xvcjogYmxhY2s7fQp0YWJsZS5ib3R0
-b20ge2JvcmRlci1ib3R0b20tc3R5bGU6IHNvbGlkO2JvcmRlci1ib3R0b20td2lk
-dGg6IHRoaW47Ym9yZGVyLWNvbG9yOiBibGFjazt9CnRkLnRvcCB7Ym9yZGVyLXRv
-cC1zdHlsZTpzb2xpZDtib3JkZXItdG9wLXdpZHRoOjFwdDt9CnRkLnJpZ2h0IHti
-b3JkZXItcmlnaHQtc3R5bGU6c29saWQ7Ym9yZGVyLXJpZ2h0LXdpZHRoOjFwdDt9
-CnRkLmJvdHRvbSB7Ym9yZGVyLWJvdHRvbS1zdHlsZTpzb2xpZDtib3JkZXItYm90
-dG9tLXdpZHRoOjFwdDt9CnRkLmxlZnQge2JvcmRlci1sZWZ0LXN0eWxlOnNvbGlk
-O2JvcmRlci1sZWZ0LXdpZHRoOjFwdDt9Ci8qVGV4dCBpbm5lcmhhbGIgZWluZXIg
-VGFiZWxsZW56ZWxsZSBmdWVyICJhYnNhdHoiIHVuZCAidWViZXJzY2hyaWZ0Iiov
-Ci5BbGlnbkxlZnQge3RleHQtYWxpZ246bGVmdDt9Ci5BbGlnblJpZ2h0IHt0ZXh0
-LWFsaWduOnJpZ2h0O30KLkFsaWduQ2VudGVyIHt0ZXh0LWFsaWduOmNlbnRlcjt9
-Ci5BbGlnbkp1c3RpZnkge3RleHQtYWxpZ246anVzdGlmeTt9Ci5WQWxpZ25Ub3Ag
-e3ZlcnRpY2FsLWFsaWduOnRvcDsJfQovKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBMZWdp
-c3Rpay1TdGFuZGFyZC1Gb3JtYXR2b3JsYWdlICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAqLwovKiBGb3JtYXR2b3JsYWdlOiAwMF9MZWdTdGFuZGFyZCAqLwov
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqLwouTGVnU3RhbmRhcmQgewp0ZXh0LWFsaWduOmp1c3Rp
-Znk7LypPSyovCmxpbmUtaGVpZ2h0OjExLjBwdDsKZm9udC1zaXplOjEwLjBwdDsK
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-LwovKiBGb3JtYXR2b3JsYWdlbiBmdWVyIEFic2FldHplICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAqLwovKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBGb3JtYXR2
-b3JsYWdlOiAwMV9VbmRlZmluaWVydCAqLwpwLlVuZGVmaW5pZXJ0IHttYXJnaW4t
-dG9wOjEuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFy
-Z2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTsvKk9LKi9saW5lLWhlaWdo
-dDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3
-IFJvbWFuIjtjb2xvcjogcmVkO30KLyogRm9ybWF0dm9ybGFnZTogMDJfQkRHZXNC
-bGF0dCAqLwpwLkJER2VzQmxhdHQge21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1y
-aWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4
-dC1hbGlnbjpjZW50ZXI7Ki9saW5lLWhlaWdodDozNS4wcHQ7Zm9udC1zaXplOjM1
-LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjazt0
-ZXh0LXRyYW5zZm9ybTp1cHBlcmNhc2U7bGV0dGVyLXNwYWNpbmc6MS4zcHQ7Zm9u
-dC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDAzX1JlcE9lc3RlcnIg
-Ki8KcC5SZXBPZXN0ZXJyIHttYXJnaW4tdG9wOjYuMHB0O21hcmdpbi1yaWdodDow
-Y207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO21hcmdpbi1ib3R0
-b206MTIuMHB0Oy8qdGV4dC1hbGlnbjpjZW50ZXI7Ki9saW5lLWhlaWdodDoyMC4w
-cHQ7Ym9yZGVyOm5vbmU7cGFkZGluZzowY207Zm9udC1zaXplOjIwLjBwdDtmb250
-LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjazt0ZXh0LXRyYW5z
-Zm9ybTp1cHBlcmNhc2U7bGV0dGVyLXNwYWNpbmc6MS4wcHQ7Zm9udC13ZWlnaHQ6
-Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDA0X0F1c2dhYmVEYXRlbiAqLwpwLkF1
-c2dhYmVEYXRlbiB7bWFyZ2luLXRvcDowY207bWFyZ2luLXJpZ2h0OjBjbTttYXJn
-aW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWlnaHQ6MTQuMHB0
-O3BhZGRpbmc6MGNtO2ZvbnQtc2l6ZToxMi4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7Y29sb3I6IGJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBG
-b3JtYXR2b3JsYWdlOiAwNV9LdXJ6dGl0ZWwKS3VyenRpdGVsIGluIGVpbmVyIFNw
-YWx0ZSAod2VubiBrZWluIFRBQiB2b3JoYW5kZW4gaXN0KSAqLwpwLkt1cnp0aXRl
-bDEge21hcmdpbi10b3A6Mi4wcHQ7bWFyZ2luLXJpZ2h0OiAwY207bWFyZ2luLWJv
-dHRvbTowY207bWFyZ2luLWxlZnQ6IDMuNmNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5
-OyovdGV4dC1pbmRlbnQ6IC0zLjZjbTtib3JkZXI6bm9uZTtwYWRkaW5nOjBjbTtm
-b250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2Nv
-bG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBLdXJ6dGl0ZWwgaW4gendl
-aSBTcGFsdGVuICh3ZW5uIGVpbiBUQUIgdm9yaGFuZGVuIGlzdCkgKi8KcC5LdXJ6
-dGl0ZWwyIHttYXJnaW4tdG9wOjIuMHB0O21hcmdpbi1yaWdodDogMGNtO21hcmdp
-bi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OiAwY207Lyp0ZXh0LWFsaWduOmp1c3Rp
-Znk7Ki9ib3JkZXI6bm9uZTtwYWRkaW5nOjBjbTtmb250LXNpemU6MTAuMHB0O2Zv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2Vp
-Z2h0OmJvbGQ7fQpzcGFuLkt1cnp0aXRlbGJyZWl0ZSB7d2lkdGg6IDMuNGNtO30K
-LyogRm9ybWF0dm9ybGFnZTogMDlfQWJzdGFuZCAqLwpwLkFic3RhbmQge21hcmdp
-bjo2LjBwdDttYXJnaW4tYm90dG9tOjYuMHB0O2xpbmUtaGVpZ2h0OjEwLjBwdDtm
-b250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2Nv
-bG9yOmJsYWNrO30KLyogRm9ybWF0dm9ybGFnZTogMTBfRW50d3VyZiAqLwpwLkVu
-dHd1cmYge21hcmdpbi10b3A6ODAuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2lu
-LWJvdHRvbTo2NC4wcHQ7bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpjZW50
-ZXI7Ki9saW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZh
-bWlseToiVGltZXMgTmV3IFJvbWFuIjtsZXR0ZXItc3BhY2luZzoxLjNwdDt9Ci8q
-IEZvcm1hdHZvcmxhZ2U6IDExX1RpdGVsICovCnAuVGl0ZWwge21hcmdpbi10b3A6
-MjQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2lu
-LWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5OyovbGluZS1oZWlnaHQ6MTEu
-MHB0O2ZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDEyX1Byb21L
-bF9FaW5sU2F0eiAqLwkKcC5Qcm9tS2xFaW5sU2F0eiB7bWFyZ2luLXRvcDo4LjBw
-dDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0
-OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL3RleHQtaW5kZW50OjE5Ljg1cHQ7
-bGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1z
-aXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjt9Ci8qIEZv
-cm1hdHZvcmxhZ2U6IDE4X0FiYmlsZHVuZ19vZGVyX09iamVrdCAqLwpwLkFiYmls
-ZHVuZ29kZXJPYmpla3Qge21hcmdpbi10b3A6Ni4wcHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjYuMHB0O21hcmdpbi1sZWZ0OjBjbTtmb250LXNpemU6
-MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNr
-O30KLyogRm9ybWF0dm9ybGFnZTogMTlfQmVzY2hyaWZ0dW5nICovCnAuQmVzY2hy
-aWZ0dW5nIHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206Ni4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtm
-b250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2Nv
-bG9yOmJsYWNrO30KLyogRm9ybWF0dm9ybGFnZTogMjFfTm92QW8xICovCnAuTm92
-QW8xIHttYXJnaW4tdG9wOjQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJv
-dHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5Oyov
-bGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1z
-aXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtmb250LXN0
-eWxlOml0YWxpYzt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDIyX05vdkFvMSAqLwpwLk5v
-dkFvMiB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsq
-L2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5
-OiJUaW1lcyBOZXcgUm9tYW4iO2ZvbnQtc3R5bGU6aXRhbGljO30KLyogRm9ybWF0
-dm9ybGFnZTogMjNfU2F0el8obmFjaF9Ob3ZhbykgKi8KcC5TYXR6bmFjaE5vdmFv
-IHttYXJnaW4tdG9wOjQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5OyovbGlu
-ZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRp
-bWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdlOiAz
-MF9JbmhhbHRVZWJlcnNjaHJpZnQgKi8KcC5JbmhhbHRVZWJlcnNjaHJpZnQge21h
-cmdpbi10b3A6MTYuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTo4
-LjBwdDttYXJnaW4tbGVmdDowY207dGV4dC1hbGlnbjpjZW50ZXI7bGluZS1oZWln
-aHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDMx
-X0luaGFsdFNwYWx0ZSAqLwpwLkluaGFsdFNwYWx0ZSB7bWFyZ2luLXRvcDo0LjBw
-dDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206NC4wcHQ7bWFyZ2luLWxl
-ZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdlLWJyZWFrLWFmdGVyOmF2b2lk
-O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7
-Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDMyX0luaGFsdEVp
-bnRyYWcgKi8KcC5JbmhhbHRFaW50cmFnIHttYXJnaW4tdG9wOjBjbTttYXJnaW4t
-cmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5l
-LWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGlt
-ZXMgTmV3IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDQxX1VlYmVyc2Nockcx
-ICovCnAuVWViZXJzY2hyRzEge21hcmdpbi10b3A6MTYuMHB0O21hcmdpbi1yaWdo
-dDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1h
-bGlnbjpjZW50ZXI7Ki9saW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVhay1hZnRl
-cjphdm9pZDtmb250LXNpemU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcg
-Um9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2
-b3JsYWdlOiA0Ml9VZWJlcnNjaHJHMS0gKi8KcC5VZWJlcnNjaHJHMS0ge21hcmdp
-bi10b3A6OC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTtt
-YXJnaW4tbGVmdDowY207Lyp0ZXh0LWFsaWduOmNlbnRlcjsqL2xpbmUtaGVpZ2h0
-OjExLjBwdDtwYWdlLWJyZWFrLWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMS4wcHQ7
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13
-ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDQzX1VlYmVyc2NockcyICov
-CnAuVWViZXJzY2hyRzIge21hcmdpbi10b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjQuMHB0O21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxp
-Z246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6
-YXZvaWQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9y
-bGFnZTogNDRfVWViZXJzY2hyQXJ0ICovCnAuVWViZXJzY2hyQXJ0IHttYXJnaW4t
-dG9wOjguMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFy
-Z2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpjZW50ZXI7Ki9saW5lLWhlaWdodDox
-MS4wcHQ7cGFnZS1icmVhay1hZnRlcjphdm9pZDtmb250LXNpemU6MTAuMHB0O2Zv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2Vp
-Z2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA0NV9VZWJlcnNjaHJQYXJhICov
-CnAuVWViZXJzY2hyUGFyYSB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6
-MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxp
-Z246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6
-YXZvaWQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9y
-bGFnZTogNTFfQWJzICovCnAuQWJzIHttYXJnaW4tdG9wOjQuMHB0O21hcmdpbi1y
-aWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4
-dC1hbGlnbjpqdXN0aWZ5OyovdGV4dC1pbmRlbnQ6MTkuODVwdDsvKmxpbmUtaGVp
-Z2h0OjExLjBwdDsqL2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1Ml9aaWZmZXJfZTEgLSBl
-MyAqLwpwLlppZmZlckUxLCBwLlppZmZlckUyLCBwLlppZmZlckUzIHttYXJnaW4t
-dG9wOjIuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFy
-Z2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0
-O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFn
-ZTogNTJfWmlmZmVyX21pdF9CZXRyYWcgKi8KcC5aaWZmZXJNaXRCZXRyYWcge21h
-cmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207
-bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwdW5jdHVhdGlvbi13
-cmFwOnNpbXBsZTt0ZXh0LWF1dG9zcGFjZTpub25lO2ZvbnQtc2l6ZToxMC4wcHQ7
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdl
-OiA1MmFUX1ppZmZlcl9taXRfQmV0cmFnX1RHVUUgKi8KcC5aaWZmZXJNaXRCZXRy
-YWdUR1VFIHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7cHVu
-Y3R1YXRpb24td3JhcDpzaW1wbGU7dGV4dC1hdXRvc3BhY2U6bm9uZTtmb250LXNp
-emU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9y
-bWF0dm9ybGFnZTogNTNfTGl0ZXJhX2UxIC0gZTMgKi8KcC5MaXRlcmFFMSwgcC5M
-aXRlcmFFMiwgcC5MaXRlcmFFMyB7bWFyZ2luLXRvcDoyLjBwdDttYXJnaW4tcmln
-aHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhl
-aWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDUzX0xpdGVyYV9taXRfQmV0
-cmFnICovCnAuTGl0ZXJhTWl0QmV0cmFnIHttYXJnaW4tdG9wOjBjbTttYXJnaW4t
-cmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5l
-LWhlaWdodDoxMS4wcHQ7cHVuY3R1YXRpb24td3JhcDpzaW1wbGU7dGV4dC1hdXRv
-c3BhY2U6bm9uZTtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFnZTogNTNhVF9MaXRlcmFfbWl0X0Jl
-dHJhZ19UR1VFICovCnAuTGl0ZXJhTWl0QmV0cmFnVEdVRSB7bWFyZ2luLXRvcDow
-Y207bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVm
-dDowY207bGluZS1oZWlnaHQ6MTEuMHB0O3B1bmN0dWF0aW9uLXdyYXA6c2ltcGxl
-O3RleHQtYXV0b3NwYWNlOm5vbmU7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWls
-eToiVGltZXMgTmV3IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDU0X1N1Ymxp
-dGVyYV9lMSAtIGUzICovCnAuU3VibGl0ZXJhRTEsIHAuU3VibGl0ZXJhRTIsIHAu
-U3VibGl0ZXJhRTMge21hcmdpbi10b3A6Mi4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTtt
-YXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWlnaHQ6MTEu
-MHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7fQovKiBGb3JtYXR2b3JsYWdlOiA1NF9TdWJsaXRlcmFfbWl0X0JldHJhZyAq
-LwpwLlN1YmxpdGVyYU1pdEJldHJhZyB7bWFyZ2luLXRvcDowY207bWFyZ2luLXJp
-Z2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1o
-ZWlnaHQ6MTEuMHB0O3B1bmN0dWF0aW9uLXdyYXA6c2ltcGxlO3RleHQtYXV0b3Nw
-YWNlOm5vbmU7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3
-IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDU0YVRfU3VibGl0ZXJhX21pdF9C
-ZXRyYWdfVEdVRSAqLwpwLlN1YmxpdGVyYU1pdEJldHJhZ1RHVUUge21hcmdpbi10
-b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2lu
-LWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwdW5jdHVhdGlvbi13cmFwOnNp
-bXBsZTt0ZXh0LWF1dG9zcGFjZTpub25lO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1NGFf
-U3RyaWNoX2UxIC0gZTcgKi8KcC5TdHJpY2hFMSwgcC5TdHJpY2hFMiwgcC5TdHJp
-Y2hFMywgcC5TdHJpY2hFNCwgcC5TdHJpY2hFNSwgcC5TdHJpY2hFNiwgcC5TdHJp
-Y2hFNyB7bWFyZ2luLXRvcDoyLjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7Zm9u
-dC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjt9Ci8q
-IEZvcm1hdHZvcmxhZ2U6IDU1X1NjaGx1c3N0ZWlsQWJzLCA1Nl9TY2hsdXNzdGVp
-bFppZmYsIDU3X1NjaGx1c3N0ZWlsTGl0Ki8KcC5TY2hsdXNzdGVpbEFicywgcC5T
-Y2hsdXNzdGVpbFppZmYsIHAuU2NobHVzc3RlaWxMaXQge21hcmdpbjowY207IGxp
-bmUtaGVpZ2h0OjExLjBwdDsgZm9udC1zaXplOjEwLjBwdDsgZm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA2MV9UYWJUZXh0
-ICovCnAuVGFiVGV4dCB7bWFyZ2luOjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7Zm9u
-dC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xv
-cjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDYxYV9UYWJUZXh0UmVjaHRzYiAq
-LwpwLlRhYlRleHRSZWNodHNiIHttYXJnaW46MGNtO3RleHQtYWxpZ246cmlnaHQ7
-bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdl
-OiA2MWJfVGFiVGV4dFplbnRyaWVydCAqLwpwLlRhYlRleHRaZW50cmllcnQge21h
-cmdpbjowY207dGV4dC1hbGlnbjpjZW50ZXI7bGluZS1oZWlnaHQ6MTEuMHB0O2Zv
-bnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29s
-b3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdlOiA2MWNfVGFiVGV4dEJsb2NrICov
-CnAuVGFiVGV4dEJsb2NrIHttYXJnaW46MGNtO3RleHQtYWxpZ246anVzdGlmeTts
-aW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToi
-VGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6
-IDYyX0tvcGZ6ZWlsZSAqLwpwLktvcGZ6ZWlsZSB7bWFyZ2luLXRvcDo0LjBwdDtt
-YXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBj
-bTsvKnRleHQtYWxpZ246anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBwdDtmb250
-LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9y
-OiAjQzBDMEMwO30KLyogRm9ybWF0dm9ybGFnZTogNjNfRnXDn3plaWxlICovCnAu
-RnVzc3plaWxlIHttYXJnaW4tdG9wOjEwLjBwdDttYXJnaW4tcmlnaHQ6MGNtO21h
-cmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246anVz
-dGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6OS4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6ICNDMEMwQzA7fQovKiBGb3Jt
-YXR2b3JsYWdlOiA2NF9GTl9MaW5pZSAqLwpwLkZOTGluaWUge21hcmdpbi10b3A6
-MTEuMHB0O21hcmdpbi1yaWdodDoxMy4wY207bWFyZ2luLWJvdHRvbToxLjBwdDtt
-YXJnaW4tbGVmdDowY207bGluZS1oZWlnaHQ6MTEuMHB0O3BhZGRpbmc6MGNtO2Zv
-bnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29s
-b3I6YmxhY2s7Ym9yZGVyLWJvdHRvbS1zdHlsZTogc29saWQ7Ym9yZGVyLWJvdHRv
-bS1jb2xvcjogR3JheTtib3JkZXItYm90dG9tLXdpZHRoOiAxcHg7fQovKiBGb3Jt
-YXR2b3JsYWdlOiA2NV9GTl9UZXh0ICovCnAuRk5UZXh0IHttYXJnaW46MGNtO3Rl
-eHQtYWxpZ246anVzdGlmeTtsaW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjku
-MHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO30K
-LyogRm9ybWF0dm9ybGFnZTogNjZfRk5fWmVpY2hlbiAqLwpzcGFuLkZOWmVpY2hl
-biB7dmVydGljYWwtYWxpZ246c3VwZXI7fQovKiBGb3JtYXR2b3JsYWdlOiA2OF9V
-bnRlcnNjaHJMICovCnAuVW50ZXJzY2hyTCB7bWFyZ2luLXRvcDo4LjBwdDttYXJn
-aW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0
-ZXh0LWFsaWduOmxlZnQ7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4w
-cHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9u
-dC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDY5X1VudGVyc2Nock0g
-Ki8KcC5VbnRlcnNjaHJNIHttYXJnaW4tdG9wOjguMHB0O21hcmdpbi1yaWdodDow
-Y207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246
-Y2VudGVyO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2VpZ2h0
-OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA3MV9BbmxhZ2VuYmV6ICovCnAuQW5s
-YWdlbmJleiB7bWFyZ2luLXRvcDo4LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdp
-bi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246cmlnaHQ7
-Ki9saW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWls
-eToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xk
-O30KLyogRm9ybWF0dm9ybGFnZTogODFfRXJsVWViZXJzY2hyWiAqLwpwLkVybFVl
-YmVyc2Nocloge21hcmdpbi10b3A6MTYuMHB0O21hcmdpbi1yaWdodDowY207bWFy
-Z2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpjZW50
-ZXI7Ki9saW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVhay1hZnRlcjphdm9pZDtm
-b250LXNpemU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2Nv
-bG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA4
-Ml9FcmxVZWJlcnNjaHJMICovCnAuRXJsVWViZXJzY2hyTCB7bWFyZ2luLXRvcDo0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1s
-ZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBw
-dDtwYWdlLWJyZWFrLWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6
-Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDgzX0VybFRleHQgKi8KcC5FcmxUZXh0
-IHttYXJnaW4tdG9wOjQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5OyovbGlu
-ZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRp
-bWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA4NV9FcmxBdWZ6YWVo
-bGcgLSBub2NoIG5pY2h0IGZlcnRpZyAqLwpwLkVybEF1ZnphZWhsZyB7bWFyZ2lu
-LXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21h
-cmdpbi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEu
-MHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7Y29sb3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdlOiA4OV9UR1VFX1VlYmVy
-c2NoclNwYWx0ZSovCnAuVEdVRVVlYmVyc2NoclNwYWx0ZSB7bWFyZ2luLXRvcDo0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1s
-ZWZ0OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0
-O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZh
-bWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpi
-b2xkO30KLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKi8KLyogRm9ybWF0dm9ybGFnZW4gZnVlciBa
-ZWljaGVuZm9ybWF0aWVydW5nICAgICAgICAgICAgICAgICAgICAgKi8KLyoqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKi8KLyogRm9ybWF0dm9ybGFnZTogOTkwX0ZlaGxlciAqLwpzcGFu
-LkZlaGxlciB7Y29sb3I6IHJlZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5MV9HbGRT
-eW1ib2wgKi8Kc3Bhbi5HbGRTeW1ib2wge2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBG
-b3JtYXR2b3JsYWdlOiA5OTJfTm9ybWFsICovCnNwYW4uTm9ybWFsIHtmb250LXN0
-eWxlOiBub3JtYWw7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTNfRmV0dCAqLwpzcGFu
-LkZldHQge2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTRf
-S3Vyc2l2ICovCnNwYW4uS3Vyc2l2IHtmb250LXN0eWxlOml0YWxpYzt9Ci8qIEZv
-cm1hdHZvcmxhZ2U6IDk5NV9VbnRlcnN0cmljaGVuICovCnNwYW4uVW50ZXJzdHJp
-Y2hlbiB7dGV4dC1kZWNvcmF0aW9uOnVuZGVybGluZTt9Ci8qIEZvcm1hdHZvcmxh
-Z2U6IDk5Nl9HZXNwZXJydCAqLwpzcGFuLkdlc3BlcnJ0IHtsZXR0ZXItc3BhY2lu
-ZzoxLjNwdDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5N19Ib2NoICovCnNwYW4uSG9j
-aCB7bGluZS1oZWlnaHQ6IDYwJTsgZm9udC1zaXplOiA2MCU7IHZlcnRpY2FsLWFs
-aWduOnN1cGVyO30KLyogRm9ybWF0dm9ybGFnZTogOTk4X1RpZWYgKi8Kc3Bhbi5U
-aWVmIHt2ZXJ0aWNhbC1hbGlnbjpzdWI7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTlf
-RmV0dF91bmRfS3Vyc2l2ICovCnNwYW4uRmV0dHVuZEt1cnNpdiB7Zm9udC13ZWln
-aHQ6Ym9sZDsgZm9udC1zdHlsZTppdGFsaWM7fQovKiBTdGFuZGFyZHRhYnNjaHJp
-dHR3ZWl0ZSBhdXMgV29yZCAqLwpzcGFuLlN0YW5kYXJkdGFidWxhdG9yIHt3aWR0
-aDozNS40NXB0O30KLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLyogRm9ybWF0dm9ybGFnZW4g
-ZGVyIFBhcmxhbWVudHNkaXJla3Rpb24gICAgICAgICAgICAgICAgICAgICAgKi8K
-LyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKi8KcC5QREFsbG9uZ2UsIGxpLlBEQWxsb25nZSwgZGl2
-LlBEQWxsb25nZSB7bWFyZ2luLXRvcDoxNC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTtt
-YXJnaW4tYm90dG9tOjEwLjBwdDttYXJnaW4tbGVmdDowY207dGV4dC1hbGlnbjpj
-ZW50ZXI7Zm9udC1zaXplOjE0LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7fQpwLlBEQWxsb25nZUIsIGxpLlBE
-QWxsb25nZUIsIGRpdi5QREFsbG9uZ2VCIHttYXJnaW4tdG9wOjE0LjBwdDttYXJn
-aW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MTAuMHB0O21hcmdpbi1sZWZ0OjBj
-bTt0ZXh0LWFsaWduOmp1c3RpZnk7Zm9udC1zaXplOjE0LjBwdDtmb250LWZhbWls
-eToiVGltZXMgTmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7fQpwLlBE
-QWxsb25nZUwsIGxpLlBEQWxsb25nZUwsIGRpdi5QREFsbG9uZ2VMIHttYXJnaW4t
-dG9wOjE0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MTAuMHB0
-O21hcmdpbi1sZWZ0OjBjbTtmb250LXNpemU6MTQuMHB0O2ZvbnQtZmFtaWx5OiJU
-aW1lcyBOZXcgUm9tYW4iO2xheW91dC1ncmlkLW1vZGU6bGluZTt9CnAuUERBbnRy
-YWdzZm9ybWVsLCBsaS5QREFudHJhZ3Nmb3JtZWwsIGRpdi5QREFudHJhZ3Nmb3Jt
-ZWwge21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJv
-dHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTtsaW5l
-LWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGlt
-ZXMgTmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7fQpwLlBERGF0dW0s
-IGxpLlBERGF0dW0sIGRpdi5QRERhdHVtIHttYXJnaW4tdG9wOjE0LjBwdDttYXJn
-aW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0
-ZXh0LWFsaWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZTox
-MC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGF5b3V0LWdyaWQt
-bW9kZTpsaW5lO30KcC5QREVudHNjaGxpZXNzdW5nLCBsaS5QREVudHNjaGxpZXNz
-dW5nLCBkaXYuUERFbnRzY2hsaWVzc3VuZyB7bWFyZ2luLXRvcDo4LjBwdDttYXJn
-aW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTts
-aW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWlseToi
-VGltZXMgTmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7Zm9udC13ZWln
-aHQ6Ym9sZDt9CnAuUERLMSwgbGkuUERLMSwgZGl2LlBESzEge21hcmdpbjowY207
-dGV4dC1hbGlnbjpjZW50ZXI7Ym9yZGVyOm5vbmU7cGFkZGluZzowY207Zm9udC1z
-aXplOjEyLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtsZXR0ZXIt
-c3BhY2luZzotLjRwdDtmb250LXdlaWdodDpib2xkO30KcC5QREsxQW5sYWdlLCBs
-aS5QREsxQW5sYWdlLCBkaXYuUERLMUFubGFnZSB7bWFyZ2luOjBjbTt0ZXh0LWFs
-aWduOnJpZ2h0O2ZvbnQtc2l6ZToxMi4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7bGV0dGVyLXNwYWNpbmc6LS40cHQ7Zm9udC13ZWlnaHQ6Ym9sZDt9
-CnAuUERLMUF1c2csIGxpLlBESzFBdXNnLCBkaXYuUERLMUF1c2cge21hcmdpbi10
-b3A6NjIuOXB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbToyNy4wcHQ7
-bWFyZ2luLWxlZnQ6MGNtO2ZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6IlRp
-bWVzIE5ldyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAuUERLMiwgbGkuUERL
-MiwgZGl2LlBESzIge21hcmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFy
-Z2luLWJvdHRvbToxMS4zNXB0O21hcmdpbi1sZWZ0OjBjbTtmb250LXNpemU6MjIu
-MHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2ZvbnQtd2VpZ2h0OmJv
-bGQ7fQpwLlBESzMsIGxpLlBESzMsIGRpdi5QREszIHttYXJnaW4tdG9wOjBjbTtt
-YXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MjAuMHB0O21hcmdpbi1sZWZ0
-OjBjbTtmb250LXNpemU6MTguMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9t
-YW4iO2ZvbnQtd2VpZ2h0OmJvbGQ7fQpwLlBESzQsIGxpLlBESzQsIGRpdi5QREs0
-IHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206
-Ni4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2ZvbnQtc2l6ZToxMy4wcHQ7Zm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAuUERLb3Bm
-emVpbGUsIGxpLlBES29wZnplaWxlLCBkaXYuUERLb3BmemVpbGUge21hcmdpbi10
-b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJn
-aW4tbGVmdDowY207dGV4dC1hbGlnbjpqdXN0aWZ5O2xpbmUtaGVpZ2h0OjExLjBw
-dDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4i
-O2xheW91dC1ncmlkLW1vZGU6bGluZTt9CnAuUERVMSwgbGkuUERVMSwgZGl2LlBE
-VTEge21hcmdpbi10b3A6MjIuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJv
-dHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250
-LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2ZvbnQt
-d2VpZ2h0OmJvbGQ7fQpwLlBEVTIsIGxpLlBEVTIsIGRpdi5QRFUyIHttYXJnaW4t
-dG9wOjUuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFy
-Z2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6OS4wcHQ7
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQpwLlBEVm9ybGFnZSwgbGku
-UERWb3JsYWdlLCBkaXYuUERWb3JsYWdlIHttYXJnaW4tdG9wOjBjbTttYXJnaW4t
-cmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MTAuMHB0O21hcmdpbi1sZWZ0OjBjbTt0
-ZXh0LWFsaWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZTox
-MS4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGF5b3V0LWdyaWQt
-bW9kZTpsaW5lO2ZvbnQtd2VpZ2h0OmJvbGQ7fQo8L3N0eWxlPgo8L2hlYWQ+Cgk8
-Ym9keT4KCQk8ZGl2IGNsYXNzPSJwYXBlcnciPgoJCQkKCQkJCgkJCQoJCQkKCQkJ
-PHAgY2xhc3M9IkJER2VzQmxhdHQgQWxpZ25DZW50ZXIiPkJVTkRFU0dFU0VUWkJM
-QVRUPC9wPgoJCQk8cCBjbGFzcz0iUmVwT2VzdGVyciBBbGlnbkNlbnRlciI+RsOc
-UiBESUUgUkVQVUJMSUsgw5ZTVEVSUkVJQ0g8L3A+CgkJCTx0YWJsZSBjbGFzcz0i
-dG9wIGJvdHRvbSB3aTEwMCI+Cjx0cj4KCQkJCTx0ZD4KPHAgY2xhc3M9IkF1c2dh
-YmVEYXRlbiBBbGlnbkxlZnQiPkphaHJnYW5nIDIwMDY8L3A+CjwvdGQ+CgkJCQk8
-dGQ+CjxwIGNsYXNzPSJBdXNnYWJlRGF0ZW4gQWxpZ25DZW50ZXIiPkF1c2dlZ2Vi
-ZW4gYW0gOS4gTcOkcnogMjAwNjwvcD4KPC90ZD4KCQkJCTx0ZD4KPHAgY2xhc3M9
-IkF1c2dhYmVEYXRlbiBBbGlnblJpZ2h0Ij5UZWlsIElJPC9wPgo8L3RkPgoJCQk8
-L3RyPgo8L3RhYmxlPgoJCQk8dGFibGUgY2xhc3M9ImJvdHRvbSB3aTEwMCI+Cjx0
-cj4KPHRkPgo8cCBjbGFzcz0iS3VyenRpdGVsMiBBbGlnbkxlZnQgVkFsaWduVG9w
-Ij4KPHNwYW4gY2xhc3M9Ikt1cnp0aXRlbGJyZWl0ZSI+MTA2LiBWZXJvcmRudW5n
-Ojwvc3Bhbj4KPC9wPgo8L3RkPgo8dGQ+CjxwIGNsYXNzPSJLdXJ6dGl0ZWwyIEFs
-aWduTGVmdCI+Um9obWlsY2h2ZXJvcmRudW5nPC9wPgo8L3RkPgo8L3RyPgo8L3Rh
-YmxlPgoJCQk8cCBjbGFzcz0iVGl0ZWwgQWxpZ25KdXN0aWZ5Ij4xMDYuIFZlcm9y
-ZG51bmcgZGVyIEJ1bmRlc21pbmlzdGVyaW4gZsO8ciBHZXN1bmRoZWl0IHVuZCBG
-cmF1ZW4gw7xiZXIgUm9obWlsY2ggdW5kIFJvaHJhaG0gKFJvaG1pbGNodmVyb3Jk
-bnVuZyk8L3A+CgkJCTxwIGNsYXNzPSJQcm9tS2xFaW5sU2F0eiBBbGlnbkp1c3Rp
-ZnkiPkF1ZiBHcnVuZCBkZXMgwqcgMTQgWiAxIGRlcyBMZWJlbnNtaXR0ZWxzaWNo
-ZXJoZWl0cy0gdW5kIFZlcmJyYXVjaGVyc2NodXR6Z2VzZXR6ZXMg4oCTIExNU1ZH
-LCBCR0JsLiBJIE5yLiAxMy8yMDA2LCBnZcOkbmRlcnQgZHVyY2ggZGFzIEJ1bmRl
-c2dlc2V0eiBCR0JsLiBJIE5yLiAxNTEvMjAwNSwgd2lyZCBpbSBFaW52ZXJuZWht
-ZW4gbWl0IGRlbSBCdW5kZXNtaW5pc3RlciBmw7xyIExhbmQtIHVuZCBGb3JzdHdp
-cnRzY2hhZnQsIFVtd2VsdCB1bmQgV2Fzc2Vyd2lydHNjaGFmdCB2ZXJvcmRuZXQ6
-PC9wPgoJCQk8cCBjbGFzcz0iVWViZXJzY2hyUGFyYSBBbGlnbkNlbnRlciI+R2Vs
-dHVuZ3NiZXJlaWNoPC9wPgoJCQk8cCBjbGFzcz0iQWJzIEFsaWduSnVzdGlmeSI+
-CgkJCQk8c3BhbiBjbGFzcz0iR2xkU3ltYm9sIj7Cp8KgMS48L3NwYW4+IERpZXNl
-IFZlcm9yZG51bmcgcmVnZWx0IGRhcyBJbnZlcmtlaHJicmluZ2VuIHZvbiBSb2ht
-aWxjaCB1bmQgUm9ocmFobSwgZGllIGbDvHIgZGVuIHVubWl0dGVsYmFyZW4gbWVu
-c2NobGljaGVuIFZlcnplaHIgYmVzdGltbXQgc2luZCBzb3dpZSBkYW1pdCBpbiBa
-dXNhbW1lbmhhbmcgc3RlaGVuZGUgQmVoYW5kbHVuZ3MtIHVuZCBLZW5uemVpY2hu
-dW5ndm9yc2NocmlmdGVuLjwvcD4KCQkJPHAgY2xhc3M9IlVlYmVyc2NoclBhcmEg
-QWxpZ25DZW50ZXIiPkFsbGdlbWVpbmUgQmVzdGltbXVuZ2VuPC9wPgoJCQk8cCBj
-bGFzcz0iQWJzIEFsaWduSnVzdGlmeSI+CgkJCQk8c3BhbiBjbGFzcz0iR2xkU3lt
-Ym9sIj7Cp8KgMi48L3NwYW4+ICgxKSBSb2htaWxjaCB1bmQgUm9ocmFobSBkw7xy
-ZmVuIG51ciBkaXJla3Qgdm9tIFRpZXJoYWx0ZXIgYW4gZGVuIEVuZHZlcmJyYXVj
-aGVyIG9kZXIgYW4gRWluemVsaGFuZGVsc3VudGVybmVobWVuIHVuZCB2b24gZGll
-c2VuIEVpbnplbGhhbmRlbHN1bnRlcm5laG1lbiBkaXJla3QgYW4gZGVuIEVuZHZl
-cmJyYXVjaGVyIGFiZ2VnZWJlbiB3ZXJkZW4uPC9wPgoJCQk8cCBjbGFzcz0iQWJz
-IEFsaWduSnVzdGlmeSI+KDIpIFJvaG1pbGNoIHVuZCBSb2hyYWhtIGTDvHJmZW4g
-bmljaHQgYW4gU2NodWxlbiB1bmQgS2luZGVyZ8OkcnRlbiBhYmdlZ2ViZW4gd2Vy
-ZGVuLiBBbmRlcmUgRWlucmljaHR1bmdlbiBkZXIgR2VtZWluc2NoYWZ0c3ZlcnNv
-cmd1bmcsIGRlbmVuIFJvaG1pbGNoIG9kZXIgUm9ocmFobSBnZW3DpMOfIEFicy4g
-MSBhYmdlZ2ViZW4gd2lyZCwgZMO8cmZlbiBkaWVzZSBudXIgenVtIFp3ZWNrZSBk
-ZXIgSGVyc3RlbGx1bmcgdm9uIFNwZWlzZW4gdW5kIEdldHLDpG5rZW4gdmVyd2Vu
-ZGVuLCBkaWUgZWluZW0gRXJoaXR6dW5nc3ZlcmZhaHJlbiB1bnRlcnpvZ2VuIHdl
-cmRlbiwgbWl0IGRlbSBlaW5lIGF1c3JlaWNoZW5kIGhvaGUgS2VybnRlbXBlcmF0
-dXIgZXJ6aWVsdCB3aXJkLCB1bSBkaWUgQWJ0w7Z0dW5nIHZvbiBwYXRob2dlbmVu
-IE1pa3Jvb3JnYW5pc21lbiBzaWNoZXJ6dXN0ZWxsZW4uPC9wPgoJCQk8cCBjbGFz
-cz0iVWViZXJzY2hyUGFyYSBBbGlnbkNlbnRlciI+TWlsY2hhdXRvbWF0ZW48L3A+
-CgkJCTxwIGNsYXNzPSJBYnMgQWxpZ25KdXN0aWZ5Ij4KCQkJCTxzcGFuIGNsYXNz
-PSJHbGRTeW1ib2wiPsKnwqAzLjwvc3Bhbj4gUm9obWlsY2gga2FubiBkdXJjaCBl
-aW5lbiBuYWNoIGFuZXJrYW5udGVuIEtyaXRlcmllbiBnZXByw7xmdGVuIE1pbGNo
-YXV0b21hdGVuIGFiZ2VnZWJlbiB3ZXJkZW4sIHdlbm4gZ2V3w6RocmxlaXN0ZXQg
-aXN0LCBkYXNzIGRpZSBSb2htaWxjaCBkdXJjaCBkZW4gTWlsY2hhdXRvbWF0ZW4g
-b2RlciBkZXNzZW4gU3RhbmRvcnQga2VpbmUgaHlnaWVuaXNjaCBuYWNodGVpbGln
-ZSBCZWVpbnRyw6RjaHRpZ3VuZyBlcmbDpGhydC48L3A+CgkJCTxwIGNsYXNzPSJV
-ZWJlcnNjaHJQYXJhIEFsaWduQ2VudGVyIj5aZWl0cHVua3QgZGVyIEFiZ2FiZTwv
-cD4KCQkJPHAgY2xhc3M9IkFicyBBbGlnbkp1c3RpZnkiPgoJCQkJPHNwYW4gY2xh
-c3M9IkdsZFN5bWJvbCI+wqfCoDQuPC9zcGFuPiBSb2htaWxjaCBkYXJmIG51ciBh
-bSBUYWcgZGVyIEdld2lubnVuZyB1bmQgYW4gZGVuIHp3ZWkgZGFyYXVmIGZvbGdl
-bmRlbiBUYWdlbiBhYmdlZ2ViZW4gd2VyZGVuLiBSb2hyYWhtIGRhcmYgbnVyIGFt
-IFRhZyBkZXIgR2V3aW5udW5nIGRlciBSb2htaWxjaCBvZGVyIGFtIGRhcmF1ZiBm
-b2xnZW5kZW4gVGFnIGF1cyBkaWVzZXIgaGVyZ2VzdGVsbHQgdW5kIGFiZ2VnZWJl
-biB3ZXJkZW4uPC9wPgoJCQk8cCBjbGFzcz0iVWViZXJzY2hyUGFyYSBBbGlnbkNl
-bnRlciI+S2VubnplaWNobnVuZzwvcD4KCQkJPHAgY2xhc3M9IkFicyBBbGlnbkp1
-c3RpZnkiPgoJCQkJPHNwYW4gY2xhc3M9IkdsZFN5bWJvbCI+wqfCoDUuPC9zcGFu
-PiAoMSkgVW5iZXNjaGFkZXQgZGVyIEJlc3RpbW11bmdlbiBkZXIgTGViZW5zbWl0
-dGVsa2VubnplaWNobnVuZ3N2ZXJvcmRudW5nIDE5OTMgLSBMTUtWLCBCR0JsLiBO
-ci4gNzIvMTk5MyBpbiBkZXIgamV3ZWlscyBnZWx0ZW5kZW4gRmFzc3VuZywgaXN0
-IFJvaG1pbGNoIHp1bSB1bm1pdHRlbGJhcmVuIG1lbnNjaGxpY2hlbiBWZXJ6ZWhy
-IG1pdCBkZW0gSGlud2VpcyDigJ5Sb2htaWxjaCwgdm9yIGRlbSBWZXJ6ZWhyIGFi
-a29jaGVu4oCcIHVuZCBSb2hyYWhtIG1pdCBkZW0gSGlud2VpcyDigJ5Sb2hyYWht
-LCBudXIgenVyIEhlcnN0ZWxsdW5nIHZvbiBkdXJjaGVyaGl0enRlbiBTcGVpc2Vu
-IHZlcndlbmRlbuKAnCB6dSBkZWtsYXJpZXJlbi48L3A+CgkJCTxwIGNsYXNzPSJB
-YnMgQWxpZ25KdXN0aWZ5Ij4oMikgQmVpIFJvaG1pbGNoIHVuZCBSb2hyYWhtLCBk
-aWUgbmljaHQgZ2Vtw6TDnyBkZXIgTGViZW5zbWl0dGVsa2VubnplaWNobnVuZ3N2
-ZXJvcmRudW5nIDE5OTMgLUxNS1YgenUga2VubnplaWNobmVuIHNpbmQgdW5kIG5p
-Y2h0IHp1bSB1bm1pdHRlbGJhcmVuIFZlcnplaHIgYW4gT3J0IHVuZCBTdGVsbGUg
-YmVzdGltbXQgc2luZCwgaGF0IGRlciBIaW53ZWlzIGdlbcOkw58gQWJzLiAxIC0g
-YmVpIEFiZ2FiZSBhbiBkZW4gRW5kdmVyYnJhdWNoZXIgLSBhdWYgZWluZW0gQXVz
-aGFuZywgZGVuIGRlciBFbmR2ZXJicmF1Y2hlciBlaW5zZWhlbiBrYW5uLCBkZXV0
-bGljaCBsZXNiYXIgenUgZXJmb2xnZW4uIEJlaSBBYmdhYmUgYW4gRWluemVsaGFu
-ZGVsc3VudGVybmVobWVuIGlzdCBhdWYgZGVtIFRyYW5zcG9ydGJlaMOkbHRlciB1
-bmQgYXVmIGRlbiBkaWUgV2FyZSBiZWdsZWl0ZW5kZW4gRG9rdW1lbnRlbiwgd2ll
-IExpZWZlcnNjaGVpbiBvZGVyIFJlY2hudW5nIOKAnlJvaG1pbGNo4oCcIG9kZXIg
-4oCeUm9ocmFobeKAnCBhbnp1Z2ViZW4uPC9wPgoJCQk8cCBjbGFzcz0iVWViZXJz
-Y2hyUGFyYSBBbGlnbkNlbnRlciI+S3JpdGVyaWVuPC9wPgoJCQk8cCBjbGFzcz0i
-QWJzIEFsaWduSnVzdGlmeSI+CgkJCQk8c3BhbiBjbGFzcz0iR2xkU3ltYm9sIj7C
-p8KgNi48L3NwYW4+IFJvaG1pbGNoIG11c3MgZm9sZ2VuZGUgS3JpdGVyaWVuIGVy
-ZsO8bGxlbjo8L3A+CgkJCTx0YWJsZSBjbGFzcz0id2kxMDAiPgoJCQkJCgkJCQkJ
-PHRyPgo8dGQgY2xhc3M9IlczOCBBbGlnblJpZ2h0IFZBbGlnblRvcCI+CjxwIGNs
-YXNzPSJaaWZmZXJFMSI+MS48L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iQWxpZ25KdXN0
-aWZ5IEUxU3AyIiBjb2xzcGFuPSI3Ij4KPHAgY2xhc3M9IlppZmZlckUxIj5Sb2hl
-IEt1aG1pbGNoOjwvcD4KPC90ZD4KPC90cj4KCQkJCQoJCQkJPHRyPgo8dGQgY2xh
-c3M9IlczOCI+PC90ZD4KPHRkIGNsYXNzPSJBbGlnbkp1c3RpZnkiIGNvbHNwYW49
-IjciPgo8cCBjbGFzcz0iU2NobHVzc3RlaWxaaWZmIj5hKSBLZWltemFobCBiZWkg
-MzDCsEMgKHBybyBtbCk6IDxpbWcgYWx0PSIiIHNyYz0iLi9CaWxkZXItRGF0ZWll
-bi9CaWxkZXIuaW1nMWlzLmdpZiI+PC9pbWc+IDUwIDAwMDs8L3A+CjwvdGQ+Cjwv
-dHI+CgkJCQk8dHI+Cjx0ZCBjbGFzcz0iVzM4Ij48L3RkPgo8dGQgY2xhc3M9IkFs
-aWduSnVzdGlmeSIgY29sc3Bhbj0iNyI+CjxwIGNsYXNzPSJTY2hsdXNzdGVpbFpp
-ZmYiPmIpIFNvbWF0aXNjaGUgWmVsbGVuIChwcm8gbWwpOiA8aW1nIGFsdD0iIiBz
-cmM9Ii4vQmlsZGVyLURhdGVpZW4vQmlsZGVyLmltZzJpcy5naWYiPjwvaW1nPiA0
-MDAgMDAwLjwvcD4KPC90ZD4KPC90cj4KCQkJCQoJCQkJCTx0cj4KPHRkIGNsYXNz
-PSJXMzggQWxpZ25SaWdodCBWQWxpZ25Ub3AiPgo8cCBjbGFzcz0iWmlmZmVyRTEi
-PjIuPC9wPgo8L3RkPgo8dGQgY2xhc3M9IkFsaWduSnVzdGlmeSBFMVNwMiIgY29s
-c3Bhbj0iNyI+CjxwIGNsYXNzPSJaaWZmZXJFMSI+Um9obWlsY2ggdm9uIGFuZGVy
-ZW4gVGllcmFydGVuOiBLZWltemFobCBiZWkgMzDCsEMgKHBybyBtbCk6IDxpbWcg
-YWx0PSIiIHNyYz0iLi9CaWxkZXItRGF0ZWllbi9CaWxkZXIuaW1nM2lzLmdpZiI+
-PC9pbWc+IDUwMCAwMDAuPC9wPgo8L3RkPgo8L3RyPgoJCQkJCgkJCTwvdGFibGU+
-CgkJCTxwIGNsYXNzPSJVZWJlcnNjaHJQYXJhIEFsaWduQ2VudGVyIj5QZXJzb25l
-bmJlem9nZW5lIEJlemVpY2hudW5nZW48L3A+CgkJCTxwIGNsYXNzPSJBYnMgQWxp
-Z25KdXN0aWZ5Ij4KCQkJCTxzcGFuIGNsYXNzPSJHbGRTeW1ib2wiPsKnwqA3Ljwv
-c3Bhbj4gQmVpIGRlbiBpbiBkaWVzZXIgVmVyb3JkbnVuZyB2ZXJ3ZW5kZXRlbiBw
-ZXJzb25lbmJlem9nZW5lbiBCZXplaWNobnVuZ2VuIGdpbHQgZGllIGdld8OkaGx0
-ZSBGb3JtIGbDvHIgYmVpZGUgR2VzY2hsZWNodGVyLjwvcD4KCQkJPHAgY2xhc3M9
-IlVlYmVyc2NoclBhcmEgQWxpZ25DZW50ZXIiPlNjaGx1c3NiZXN0aW1tdW5nPC9w
-PgoJCQk8cCBjbGFzcz0iQWJzIEFsaWduSnVzdGlmeSI+CgkJCQk8c3BhbiBjbGFz
-cz0iR2xkU3ltYm9sIj7Cp8KgOC48L3NwYW4+IERpZXNlIFZlcm9yZG51bmcgd3Vy
-ZGUgdW50ZXIgRWluaGFsdHVuZyBkZXIgQmVzdGltbXVuZ2VuIGRlciBSaWNodGxp
-bmllIDk4LzM0L0VHIMO8YmVyIGVpbiBJbmZvcm1hdGlvbnN2ZXJmYWhyZW4gYXVm
-IGRlbSBHZWJpZXQgZGVyIE5vcm1lbiB1bmQgdGVjaG5pc2NoZW4gVm9yc2Nocmlm
-dGVuLCBBQmwuIE5yLiBMIDIwNCB2b20gMjEuIEp1bGkgMTk5OCB1bmQgZGVzIEFy
-dGlrZWxzIDEwIEFicy4gNSBkZXIgVmVyb3JkbnVuZyAoRUcpIE5yLiA4NTMvMjAw
-NCBtaXQgc3BlemlmaXNjaGVuIEh5Z2llbmV2b3JzY2hyaWZ0ZW4gZsO8ciBMZWJl
-bnNtaXR0ZWwgdGllcmlzY2hlbiBVcnNwcnVuZ3MsIEFCbC4gTnIuIEwgMTM5IHZv
-bSAzMC4gQXByaWwgMjAwNCwgYmVyaWNodGlndCBkdXJjaCBBQmwuIE5yLiBMIDIy
-NiB2b20gMjUuIEp1bmkgMjAwNCwgbm90aWZpemllcnQuPC9wPgoJCQk8cCBjbGFz
-cz0iVW50ZXJzY2hyTCI+UmF1Y2gtS2FsbGF0PC9wPgoJCQoJCQkJPHAgY2xhc3M9
-IkZ1c3N6ZWlsZSBBbGlnbkp1c3RpZnkiPnd3dy5yaXMuYmthLmd2LmF0PC9wPgoJ
-CQk8L2Rpdj4KCTwvYm9keT4KCQo8L2h0bWw+</sl11:Base64Content></sl11:HashInputData><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>R0lGODlhDQAQAHcAMSH+GlNvZnR3YXJlOiBNaWNyb3NvZnQgT2ZmaWNlACH5BAEA
-AAAALAIAAwAJAAoAgAAAAAAAAAIRhG+BqReP4AJy0mYfnnvp/xQAOw==</sl11:Base64Content></sl11:HashInputData><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>R0lGODlhDQAQAHcAMSH+GlNvZnR3YXJlOiBNaWNyb3NvZnQgT2ZmaWNlACH5BAEA
-AAAALAIAAwAJAAoAgAAAAAAAAAIRhG+BqReP4AJy0mYfnnvp/xQAOw==</sl11:Base64Content></sl11:HashInputData><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>R0lGODlhDQAQAHcAMSH+GlNvZnR3YXJlOiBNaWNyb3NvZnQgT2ZmaWNlACH5BAEA
-AAAALAIAAwAJAAoAgAAAAAAAAAIRhG+BqReP4AJy0mYfnnvp/xQAOw==</sl11:Base64Content></sl11:HashInputData><sl11:SignatureCheck><sl11:Code>0</sl11:Code></sl11:SignatureCheck><sl11:SignatureManifestCheck><sl11:Code>98</sl11:Code></sl11:SignatureManifestCheck><sl11:SignatureManifestCheck><sl11:Code>0</sl11:Code></sl11:SignatureManifestCheck><sl11:CertificateCheck><sl10:Code>1</sl10:Code></sl11:CertificateCheck></sl11:VerifyXMLSignatureResponse>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyResponse.106_2006.utf8.xml b/spss.slinterface/test/moa-wartung-la9/verifyResponse.106_2006.utf8.xml
deleted file mode 100644
index 6872e2cf4..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyResponse.106_2006.utf8.xml
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl11:VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" 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:SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Christian Wregar,OU=Verfassungsdienst,O=Bundeskanzleramt der Republik \C3\96sterreich,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=a-sign-corporate-light-01,OU=a-sign-corporate-light-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>21221</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIE4TCCA8mgAwIBAgICUuUwDQYJKoZIhvcNAQEFBQAwgZ8xCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIjAgBgNVBAsTGWEtc2lnbi1jb3Jw
-b3JhdGUtbGlnaHQtMDExIjAgBgNVBAMTGWEtc2lnbi1jb3Jwb3JhdGUtbGlnaHQt
-MDEwHhcNMDMxMjEwMTcyMzA3WhcNMDYxMjEwMTcyMzA3WjCBnzELMAkGA1UEBhMC
-QVQxWTBXBgNVBAoeUABCAHUAbgBkAGUAcwBrAGEAbgB6AGwAZQByAGEAbQB0ACAA
-ZABlAHIAIABSAGUAcAB1AGIAbABpAGsAIADWAHMAdABlAHIAcgBlAGkAYwBoMRow
-GAYDVQQLExFWZXJmYXNzdW5nc2RpZW5zdDEZMBcGA1UEAxMQQ2hyaXN0aWFuIFdy
-ZWdhcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv7Z6w9XhQLoIxipExnL7
-go/rp5Leh/y0E8mjS7XKe4acgmb/+p7cyAIzDjSY4Jse4xz9cKb+0hrEyKJjvR61
-Tl4lJxQsdYan3rLqcruPlC0GRkAgiiRdLwvAaAUBqzYxzTjKvdZBdcnuY+S2Ad1Z
-5N5zAF2XRzykcsmLRZvpvJ8CAwEAAaOCAacwggGjMAkGA1UdEwQCMAAwEQYDVR0O
-BAoECEhNunRQSAFFMF0GA1UdIARWMFQwUgYHKigAEQEOATBHMEUGCCsGAQUFBwIB
-FjlodHRwOi8vd3d3LmEtdHJ1c3QuYXQvZG9jcy9jcC9hc2lnbi1nb3Zlcm5tZW50
-LXNlcnZlci5wZGYwEwYDVR0jBAwwCoAITp5/1C/JHx8wfwYIKwYBBQUHAQEEczBx
-MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRydXN0LmF0L29jc3AwRgYIKwYB
-BQUHMAKGOmh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNpZ24tY29ycG9y
-YXRlLWxpZ2h0LTAxYS5jcnQwDgYDVR0PAQH/BAQDAgeAMG4GA1UdHwRnMGUwY6Bh
-oF+GXWxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1s
-aWdodC0wMSxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0
-PzAOBgcqKAAKAQEBBAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFIWZVsrHNwZDSkE
-44Cyc1cCJU49CrjsX7OPG43notq9JPRPMvbVAOrN3g0H8x2oOSYoxscKut1IqLxc
-xUVKYuCZEQBj0FZTYLFIuK8//vPOwmTSTBKMjKZpkkxfdcM5JX+nGdJgfqndjqPw
-e9lZ213EMIEfEf1Nfr5R0MNk1uCUg9diqEpDcUdVks2KN4/zQVuNRlGFgM+y8E2N
-VFopTtCBhSj6nuxeIbpbEOmjuAfF5zoVAJg4nj4DKJC8oiaY+KR+817fXpHclzxd
-f1s0aVpqdOf7Dc0FXjrCBGKpyjcN4Qj9zioy5J6awkiWDF9CQICxwt4TYB1lS8Vx
-Z+ghQ0g=</dsig:X509Certificate><moa:PublicAuthority/></dsig:X509Data></sl11:SignerInfo><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>PGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgoJPGhl
-YWQ+Cjx0aXRsZT5lUmVjaHQgRG9rdW1lbnQgKDEuOS4wKTwvdGl0bGU+CjxzdHls
-ZSB0eXBlPSJ0ZXh0L2NzcyI+CiAgICAgICAgLlczOCB7IHdpZHRoOjM4cHg7IH0K
-ICAgICAgICAuVzE1IHsgd2lkdGg6MTVweDsgfQogICAgICAgIC5XMjIgeyB3aWR0
-aDoyMnB4OyB9CiAgICAgICAgLndpMTAwIHsgd2lkdGg6MTAwJTsgfQogICAgICAg
-IC5XRXJsIHsgd2lkdGg6MTVweDsgfQogICAgICAgIC5FMVNwMiB7IHdpZHRoOjU1
-Ny4zNXB4OyB9CiAgICAgICAgLkUyU3AyIHsgd2lkdGg6NTQyLjM1cHg7IH0KICAg
-ICAgICAuRTNTcDIgeyB3aWR0aDo1MjAuMzVweDsgfQogICAgICAgIC5FNFNwMiB7
-IHdpZHRoOjQ5OC4zNXB4OyB9CiAgICAgICAgLkU1U3AyIHsgd2lkdGg6NDc2LjM1
-cHg7IH0KICAgICAgICAuRXJsU3AyIHsgd2lkdGg6NTcwLjM1cHg7IH0KICAgICAg
-ICAuRTFTcDJRIHsgd2lkdGg6ODA0cHg7IH0KICAgICAgICAuRTJTcDJRIHsgd2lk
-dGg6Nzg5cHg7IH0KICAgICAgICAuRTNTcDJRIHsgd2lkdGg6NzY3cHg7IH0KICAg
-ICAgICAuRTRTcDJRIHsgd2lkdGg6NzQ1cHg7IH0KICAgICAgICAuRTVTcDJRIHsg
-d2lkdGg6NzIzcHg7IH0KICAgICAgICAuRXJsU3AyUSB7IHdpZHRoOjgxN3B4OyB9
-CiAgICAgICAgLm5leHRwYWdlIHsgcGFnZS1icmVhay1iZWZvcmU6YWx3YXlzOyB9
-CiAgICAgICAgLm1hcmdpbnMge21hcmdpbi10b3A6ODUuMDVwdDttYXJnaW4tcmln
-aHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2luLWxlZnQ6ODUu
-MDVwdDt9CiAgICAgICAgQG1lZGlhIHNjcmVlbiB7IC5wYXBlcncge3dpZHRoOjU5
-NS4zNXB4O21hcmdpbi10b3A6ODUuMDVwdDttYXJnaW4tcmlnaHQ6ODUuMDVwdDtt
-YXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2luLWxlZnQ6ODUuMDVwdDt9fQogICAg
-ICAgIEBtZWRpYSBwcmludCB7IC5wYXBlcncge3dpZHRoOjU5NS4zNXB4O21hcmdp
-bi10b3A6MC4wcHQ7bWFyZ2luLXJpZ2h0OjAuMHB0O21hcmdpbi1ib3R0b206MC4w
-cHQ7bWFyZ2luLWxlZnQ6MC4wcHQ7c2l6ZTpwb3J0cmFpdDt9fQogICAgICAgIEBt
-ZWRpYSBzY3JlZW4geyAucGFwZXJoIHt3aWR0aDo4NDJweDttYXJnaW4tcmlnaHQ6
-ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2luLWxlZnQ6ODUuMDVw
-dDttYXJnaW4tdG9wOjg1LjA1cHQ7fX0KICAgICAgICBAbWVkaWEgcHJpbnQgeyAu
-cGFwZXJoIHt3aWR0aDo4NDJweDttYXJnaW4tdG9wOjAuMHB0O21hcmdpbi1yaWdo
-dDowLjBwdDttYXJnaW4tYm90dG9tOjAuMHB0O21hcmdpbi1sZWZ0OjAuMHB0O3Np
-emU6bGFuZHNjYXBlfX0KLyogQWxsZ2VtZWluZSBBbmdhYmVuIHp1bSBBbnplaWdl
-biB2b24gTGluaWVuIGluIFRhYmVsbGVuICAgICAgKi8KLyoKQHBhZ2UgOmxlZnQg
-e3NpemU6IDIxY20gMjkuN2NtO21hcmdpbi1sZWZ0OiAyY207bWFyZ2luLXJpZ2h0
-OiAyY207bWFya3M6Y3JvcDt9CkBwYWdlIDpyaWdodCB7c2l6ZTogMjFjbSAyOS43
-Y207bWFyZ2luLWxlZnQ6IDJjbTttYXJnaW4tcmlnaHQ6IDJjbTttYXJrczpjcm9w
-O30KKi8KdGFibGUudG9wIHtib3JkZXItdG9wLXN0eWxlOiBzb2xpZDtib3JkZXIt
-dG9wLXdpZHRoOiB0aGluO2JvcmRlci1jb2xvcjogYmxhY2s7fQp0YWJsZS5ib3R0
-b20ge2JvcmRlci1ib3R0b20tc3R5bGU6IHNvbGlkO2JvcmRlci1ib3R0b20td2lk
-dGg6IHRoaW47Ym9yZGVyLWNvbG9yOiBibGFjazt9CnRkLnRvcCB7Ym9yZGVyLXRv
-cC1zdHlsZTpzb2xpZDtib3JkZXItdG9wLXdpZHRoOjFwdDt9CnRkLnJpZ2h0IHti
-b3JkZXItcmlnaHQtc3R5bGU6c29saWQ7Ym9yZGVyLXJpZ2h0LXdpZHRoOjFwdDt9
-CnRkLmJvdHRvbSB7Ym9yZGVyLWJvdHRvbS1zdHlsZTpzb2xpZDtib3JkZXItYm90
-dG9tLXdpZHRoOjFwdDt9CnRkLmxlZnQge2JvcmRlci1sZWZ0LXN0eWxlOnNvbGlk
-O2JvcmRlci1sZWZ0LXdpZHRoOjFwdDt9Ci8qVGV4dCBpbm5lcmhhbGIgZWluZXIg
-VGFiZWxsZW56ZWxsZSBmdWVyICJhYnNhdHoiIHVuZCAidWViZXJzY2hyaWZ0Iiov
-Ci5BbGlnbkxlZnQge3RleHQtYWxpZ246bGVmdDt9Ci5BbGlnblJpZ2h0IHt0ZXh0
-LWFsaWduOnJpZ2h0O30KLkFsaWduQ2VudGVyIHt0ZXh0LWFsaWduOmNlbnRlcjt9
-Ci5BbGlnbkp1c3RpZnkge3RleHQtYWxpZ246anVzdGlmeTt9Ci5WQWxpZ25Ub3Ag
-e3ZlcnRpY2FsLWFsaWduOnRvcDsJfQovKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBMZWdp
-c3Rpay1TdGFuZGFyZC1Gb3JtYXR2b3JsYWdlICAgICAgICAgICAgICAgICAgICAg
-ICAgICAgICAqLwovKiBGb3JtYXR2b3JsYWdlOiAwMF9MZWdTdGFuZGFyZCAqLwov
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqLwouTGVnU3RhbmRhcmQgewp0ZXh0LWFsaWduOmp1c3Rp
-Znk7LypPSyovCmxpbmUtaGVpZ2h0OjExLjBwdDsKZm9udC1zaXplOjEwLjBwdDsK
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-LwovKiBGb3JtYXR2b3JsYWdlbiBmdWVyIEFic2FldHplICAgICAgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAqLwovKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBGb3JtYXR2
-b3JsYWdlOiAwMV9VbmRlZmluaWVydCAqLwpwLlVuZGVmaW5pZXJ0IHttYXJnaW4t
-dG9wOjEuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFy
-Z2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTsvKk9LKi9saW5lLWhlaWdo
-dDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3
-IFJvbWFuIjtjb2xvcjogcmVkO30KLyogRm9ybWF0dm9ybGFnZTogMDJfQkRHZXNC
-bGF0dCAqLwpwLkJER2VzQmxhdHQge21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1y
-aWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4
-dC1hbGlnbjpjZW50ZXI7Ki9saW5lLWhlaWdodDozNS4wcHQ7Zm9udC1zaXplOjM1
-LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjazt0
-ZXh0LXRyYW5zZm9ybTp1cHBlcmNhc2U7bGV0dGVyLXNwYWNpbmc6MS4zcHQ7Zm9u
-dC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDAzX1JlcE9lc3RlcnIg
-Ki8KcC5SZXBPZXN0ZXJyIHttYXJnaW4tdG9wOjYuMHB0O21hcmdpbi1yaWdodDow
-Y207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO21hcmdpbi1ib3R0
-b206MTIuMHB0Oy8qdGV4dC1hbGlnbjpjZW50ZXI7Ki9saW5lLWhlaWdodDoyMC4w
-cHQ7Ym9yZGVyOm5vbmU7cGFkZGluZzowY207Zm9udC1zaXplOjIwLjBwdDtmb250
-LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjazt0ZXh0LXRyYW5z
-Zm9ybTp1cHBlcmNhc2U7bGV0dGVyLXNwYWNpbmc6MS4wcHQ7Zm9udC13ZWlnaHQ6
-Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDA0X0F1c2dhYmVEYXRlbiAqLwpwLkF1
-c2dhYmVEYXRlbiB7bWFyZ2luLXRvcDowY207bWFyZ2luLXJpZ2h0OjBjbTttYXJn
-aW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWlnaHQ6MTQuMHB0
-O3BhZGRpbmc6MGNtO2ZvbnQtc2l6ZToxMi4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7Y29sb3I6IGJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBG
-b3JtYXR2b3JsYWdlOiAwNV9LdXJ6dGl0ZWwKS3VyenRpdGVsIGluIGVpbmVyIFNw
-YWx0ZSAod2VubiBrZWluIFRBQiB2b3JoYW5kZW4gaXN0KSAqLwpwLkt1cnp0aXRl
-bDEge21hcmdpbi10b3A6Mi4wcHQ7bWFyZ2luLXJpZ2h0OiAwY207bWFyZ2luLWJv
-dHRvbTowY207bWFyZ2luLWxlZnQ6IDMuNmNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5
-OyovdGV4dC1pbmRlbnQ6IC0zLjZjbTtib3JkZXI6bm9uZTtwYWRkaW5nOjBjbTtm
-b250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2Nv
-bG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBLdXJ6dGl0ZWwgaW4gendl
-aSBTcGFsdGVuICh3ZW5uIGVpbiBUQUIgdm9yaGFuZGVuIGlzdCkgKi8KcC5LdXJ6
-dGl0ZWwyIHttYXJnaW4tdG9wOjIuMHB0O21hcmdpbi1yaWdodDogMGNtO21hcmdp
-bi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OiAwY207Lyp0ZXh0LWFsaWduOmp1c3Rp
-Znk7Ki9ib3JkZXI6bm9uZTtwYWRkaW5nOjBjbTtmb250LXNpemU6MTAuMHB0O2Zv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2Vp
-Z2h0OmJvbGQ7fQpzcGFuLkt1cnp0aXRlbGJyZWl0ZSB7d2lkdGg6IDMuNGNtO30K
-LyogRm9ybWF0dm9ybGFnZTogMDlfQWJzdGFuZCAqLwpwLkFic3RhbmQge21hcmdp
-bjo2LjBwdDttYXJnaW4tYm90dG9tOjYuMHB0O2xpbmUtaGVpZ2h0OjEwLjBwdDtm
-b250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2Nv
-bG9yOmJsYWNrO30KLyogRm9ybWF0dm9ybGFnZTogMTBfRW50d3VyZiAqLwpwLkVu
-dHd1cmYge21hcmdpbi10b3A6ODAuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2lu
-LWJvdHRvbTo2NC4wcHQ7bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpjZW50
-ZXI7Ki9saW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZh
-bWlseToiVGltZXMgTmV3IFJvbWFuIjtsZXR0ZXItc3BhY2luZzoxLjNwdDt9Ci8q
-IEZvcm1hdHZvcmxhZ2U6IDExX1RpdGVsICovCnAuVGl0ZWwge21hcmdpbi10b3A6
-MjQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2lu
-LWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5OyovbGluZS1oZWlnaHQ6MTEu
-MHB0O2ZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDEyX1Byb21L
-bF9FaW5sU2F0eiAqLwkKcC5Qcm9tS2xFaW5sU2F0eiB7bWFyZ2luLXRvcDo4LjBw
-dDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0
-OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL3RleHQtaW5kZW50OjE5Ljg1cHQ7
-bGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1z
-aXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjt9Ci8qIEZv
-cm1hdHZvcmxhZ2U6IDE4X0FiYmlsZHVuZ19vZGVyX09iamVrdCAqLwpwLkFiYmls
-ZHVuZ29kZXJPYmpla3Qge21hcmdpbi10b3A6Ni4wcHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjYuMHB0O21hcmdpbi1sZWZ0OjBjbTtmb250LXNpemU6
-MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNr
-O30KLyogRm9ybWF0dm9ybGFnZTogMTlfQmVzY2hyaWZ0dW5nICovCnAuQmVzY2hy
-aWZ0dW5nIHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206Ni4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtm
-b250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2Nv
-bG9yOmJsYWNrO30KLyogRm9ybWF0dm9ybGFnZTogMjFfTm92QW8xICovCnAuTm92
-QW8xIHttYXJnaW4tdG9wOjQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJv
-dHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5Oyov
-bGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1z
-aXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtmb250LXN0
-eWxlOml0YWxpYzt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDIyX05vdkFvMSAqLwpwLk5v
-dkFvMiB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsq
-L2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5
-OiJUaW1lcyBOZXcgUm9tYW4iO2ZvbnQtc3R5bGU6aXRhbGljO30KLyogRm9ybWF0
-dm9ybGFnZTogMjNfU2F0el8obmFjaF9Ob3ZhbykgKi8KcC5TYXR6bmFjaE5vdmFv
-IHttYXJnaW4tdG9wOjQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5OyovbGlu
-ZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRp
-bWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdlOiAz
-MF9JbmhhbHRVZWJlcnNjaHJpZnQgKi8KcC5JbmhhbHRVZWJlcnNjaHJpZnQge21h
-cmdpbi10b3A6MTYuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTo4
-LjBwdDttYXJnaW4tbGVmdDowY207dGV4dC1hbGlnbjpjZW50ZXI7bGluZS1oZWln
-aHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDMx
-X0luaGFsdFNwYWx0ZSAqLwpwLkluaGFsdFNwYWx0ZSB7bWFyZ2luLXRvcDo0LjBw
-dDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206NC4wcHQ7bWFyZ2luLWxl
-ZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdlLWJyZWFrLWFmdGVyOmF2b2lk
-O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7
-Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDMyX0luaGFsdEVp
-bnRyYWcgKi8KcC5JbmhhbHRFaW50cmFnIHttYXJnaW4tdG9wOjBjbTttYXJnaW4t
-cmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5l
-LWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGlt
-ZXMgTmV3IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDQxX1VlYmVyc2Nockcx
-ICovCnAuVWViZXJzY2hyRzEge21hcmdpbi10b3A6MTYuMHB0O21hcmdpbi1yaWdo
-dDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1h
-bGlnbjpjZW50ZXI7Ki9saW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVhay1hZnRl
-cjphdm9pZDtmb250LXNpemU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcg
-Um9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2
-b3JsYWdlOiA0Ml9VZWJlcnNjaHJHMS0gKi8KcC5VZWJlcnNjaHJHMS0ge21hcmdp
-bi10b3A6OC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTtt
-YXJnaW4tbGVmdDowY207Lyp0ZXh0LWFsaWduOmNlbnRlcjsqL2xpbmUtaGVpZ2h0
-OjExLjBwdDtwYWdlLWJyZWFrLWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMS4wcHQ7
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13
-ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDQzX1VlYmVyc2NockcyICov
-CnAuVWViZXJzY2hyRzIge21hcmdpbi10b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjQuMHB0O21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxp
-Z246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6
-YXZvaWQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9y
-bGFnZTogNDRfVWViZXJzY2hyQXJ0ICovCnAuVWViZXJzY2hyQXJ0IHttYXJnaW4t
-dG9wOjguMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFy
-Z2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpjZW50ZXI7Ki9saW5lLWhlaWdodDox
-MS4wcHQ7cGFnZS1icmVhay1hZnRlcjphdm9pZDtmb250LXNpemU6MTAuMHB0O2Zv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2Vp
-Z2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA0NV9VZWJlcnNjaHJQYXJhICov
-CnAuVWViZXJzY2hyUGFyYSB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6
-MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxp
-Z246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6
-YXZvaWQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9y
-bGFnZTogNTFfQWJzICovCnAuQWJzIHttYXJnaW4tdG9wOjQuMHB0O21hcmdpbi1y
-aWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4
-dC1hbGlnbjpqdXN0aWZ5OyovdGV4dC1pbmRlbnQ6MTkuODVwdDsvKmxpbmUtaGVp
-Z2h0OjExLjBwdDsqL2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1Ml9aaWZmZXJfZTEgLSBl
-MyAqLwpwLlppZmZlckUxLCBwLlppZmZlckUyLCBwLlppZmZlckUzIHttYXJnaW4t
-dG9wOjIuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFy
-Z2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0
-O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFn
-ZTogNTJfWmlmZmVyX21pdF9CZXRyYWcgKi8KcC5aaWZmZXJNaXRCZXRyYWcge21h
-cmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207
-bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwdW5jdHVhdGlvbi13
-cmFwOnNpbXBsZTt0ZXh0LWF1dG9zcGFjZTpub25lO2ZvbnQtc2l6ZToxMC4wcHQ7
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdl
-OiA1MmFUX1ppZmZlcl9taXRfQmV0cmFnX1RHVUUgKi8KcC5aaWZmZXJNaXRCZXRy
-YWdUR1VFIHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7cHVu
-Y3R1YXRpb24td3JhcDpzaW1wbGU7dGV4dC1hdXRvc3BhY2U6bm9uZTtmb250LXNp
-emU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9y
-bWF0dm9ybGFnZTogNTNfTGl0ZXJhX2UxIC0gZTMgKi8KcC5MaXRlcmFFMSwgcC5M
-aXRlcmFFMiwgcC5MaXRlcmFFMyB7bWFyZ2luLXRvcDoyLjBwdDttYXJnaW4tcmln
-aHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhl
-aWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDUzX0xpdGVyYV9taXRfQmV0
-cmFnICovCnAuTGl0ZXJhTWl0QmV0cmFnIHttYXJnaW4tdG9wOjBjbTttYXJnaW4t
-cmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5l
-LWhlaWdodDoxMS4wcHQ7cHVuY3R1YXRpb24td3JhcDpzaW1wbGU7dGV4dC1hdXRv
-c3BhY2U6bm9uZTtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFnZTogNTNhVF9MaXRlcmFfbWl0X0Jl
-dHJhZ19UR1VFICovCnAuTGl0ZXJhTWl0QmV0cmFnVEdVRSB7bWFyZ2luLXRvcDow
-Y207bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVm
-dDowY207bGluZS1oZWlnaHQ6MTEuMHB0O3B1bmN0dWF0aW9uLXdyYXA6c2ltcGxl
-O3RleHQtYXV0b3NwYWNlOm5vbmU7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWls
-eToiVGltZXMgTmV3IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDU0X1N1Ymxp
-dGVyYV9lMSAtIGUzICovCnAuU3VibGl0ZXJhRTEsIHAuU3VibGl0ZXJhRTIsIHAu
-U3VibGl0ZXJhRTMge21hcmdpbi10b3A6Mi4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTtt
-YXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWlnaHQ6MTEu
-MHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7fQovKiBGb3JtYXR2b3JsYWdlOiA1NF9TdWJsaXRlcmFfbWl0X0JldHJhZyAq
-LwpwLlN1YmxpdGVyYU1pdEJldHJhZyB7bWFyZ2luLXRvcDowY207bWFyZ2luLXJp
-Z2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1o
-ZWlnaHQ6MTEuMHB0O3B1bmN0dWF0aW9uLXdyYXA6c2ltcGxlO3RleHQtYXV0b3Nw
-YWNlOm5vbmU7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3
-IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDU0YVRfU3VibGl0ZXJhX21pdF9C
-ZXRyYWdfVEdVRSAqLwpwLlN1YmxpdGVyYU1pdEJldHJhZ1RHVUUge21hcmdpbi10
-b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2lu
-LWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwdW5jdHVhdGlvbi13cmFwOnNp
-bXBsZTt0ZXh0LWF1dG9zcGFjZTpub25lO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1NGFf
-U3RyaWNoX2UxIC0gZTcgKi8KcC5TdHJpY2hFMSwgcC5TdHJpY2hFMiwgcC5TdHJp
-Y2hFMywgcC5TdHJpY2hFNCwgcC5TdHJpY2hFNSwgcC5TdHJpY2hFNiwgcC5TdHJp
-Y2hFNyB7bWFyZ2luLXRvcDoyLjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7Zm9u
-dC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjt9Ci8q
-IEZvcm1hdHZvcmxhZ2U6IDU1X1NjaGx1c3N0ZWlsQWJzLCA1Nl9TY2hsdXNzdGVp
-bFppZmYsIDU3X1NjaGx1c3N0ZWlsTGl0Ki8KcC5TY2hsdXNzdGVpbEFicywgcC5T
-Y2hsdXNzdGVpbFppZmYsIHAuU2NobHVzc3RlaWxMaXQge21hcmdpbjowY207IGxp
-bmUtaGVpZ2h0OjExLjBwdDsgZm9udC1zaXplOjEwLjBwdDsgZm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA2MV9UYWJUZXh0
-ICovCnAuVGFiVGV4dCB7bWFyZ2luOjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7Zm9u
-dC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xv
-cjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDYxYV9UYWJUZXh0UmVjaHRzYiAq
-LwpwLlRhYlRleHRSZWNodHNiIHttYXJnaW46MGNtO3RleHQtYWxpZ246cmlnaHQ7
-bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdl
-OiA2MWJfVGFiVGV4dFplbnRyaWVydCAqLwpwLlRhYlRleHRaZW50cmllcnQge21h
-cmdpbjowY207dGV4dC1hbGlnbjpjZW50ZXI7bGluZS1oZWlnaHQ6MTEuMHB0O2Zv
-bnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29s
-b3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdlOiA2MWNfVGFiVGV4dEJsb2NrICov
-CnAuVGFiVGV4dEJsb2NrIHttYXJnaW46MGNtO3RleHQtYWxpZ246anVzdGlmeTts
-aW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToi
-VGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6
-IDYyX0tvcGZ6ZWlsZSAqLwpwLktvcGZ6ZWlsZSB7bWFyZ2luLXRvcDo0LjBwdDtt
-YXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBj
-bTsvKnRleHQtYWxpZ246anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBwdDtmb250
-LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9y
-OiAjQzBDMEMwO30KLyogRm9ybWF0dm9ybGFnZTogNjNfRnXDn3plaWxlICovCnAu
-RnVzc3plaWxlIHttYXJnaW4tdG9wOjEwLjBwdDttYXJnaW4tcmlnaHQ6MGNtO21h
-cmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246anVz
-dGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6OS4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6ICNDMEMwQzA7fQovKiBGb3Jt
-YXR2b3JsYWdlOiA2NF9GTl9MaW5pZSAqLwpwLkZOTGluaWUge21hcmdpbi10b3A6
-MTEuMHB0O21hcmdpbi1yaWdodDoxMy4wY207bWFyZ2luLWJvdHRvbToxLjBwdDtt
-YXJnaW4tbGVmdDowY207bGluZS1oZWlnaHQ6MTEuMHB0O3BhZGRpbmc6MGNtO2Zv
-bnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29s
-b3I6YmxhY2s7Ym9yZGVyLWJvdHRvbS1zdHlsZTogc29saWQ7Ym9yZGVyLWJvdHRv
-bS1jb2xvcjogR3JheTtib3JkZXItYm90dG9tLXdpZHRoOiAxcHg7fQovKiBGb3Jt
-YXR2b3JsYWdlOiA2NV9GTl9UZXh0ICovCnAuRk5UZXh0IHttYXJnaW46MGNtO3Rl
-eHQtYWxpZ246anVzdGlmeTtsaW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjku
-MHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO30K
-LyogRm9ybWF0dm9ybGFnZTogNjZfRk5fWmVpY2hlbiAqLwpzcGFuLkZOWmVpY2hl
-biB7dmVydGljYWwtYWxpZ246c3VwZXI7fQovKiBGb3JtYXR2b3JsYWdlOiA2OF9V
-bnRlcnNjaHJMICovCnAuVW50ZXJzY2hyTCB7bWFyZ2luLXRvcDo4LjBwdDttYXJn
-aW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0
-ZXh0LWFsaWduOmxlZnQ7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4w
-cHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9u
-dC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDY5X1VudGVyc2Nock0g
-Ki8KcC5VbnRlcnNjaHJNIHttYXJnaW4tdG9wOjguMHB0O21hcmdpbi1yaWdodDow
-Y207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246
-Y2VudGVyO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2VpZ2h0
-OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA3MV9BbmxhZ2VuYmV6ICovCnAuQW5s
-YWdlbmJleiB7bWFyZ2luLXRvcDo4LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdp
-bi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246cmlnaHQ7
-Ki9saW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWls
-eToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xk
-O30KLyogRm9ybWF0dm9ybGFnZTogODFfRXJsVWViZXJzY2hyWiAqLwpwLkVybFVl
-YmVyc2Nocloge21hcmdpbi10b3A6MTYuMHB0O21hcmdpbi1yaWdodDowY207bWFy
-Z2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpjZW50
-ZXI7Ki9saW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVhay1hZnRlcjphdm9pZDtm
-b250LXNpemU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2Nv
-bG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA4
-Ml9FcmxVZWJlcnNjaHJMICovCnAuRXJsVWViZXJzY2hyTCB7bWFyZ2luLXRvcDo0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1s
-ZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBw
-dDtwYWdlLWJyZWFrLWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6
-Ym9sZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDgzX0VybFRleHQgKi8KcC5FcmxUZXh0
-IHttYXJnaW4tdG9wOjQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpqdXN0aWZ5OyovbGlu
-ZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRp
-bWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA4NV9FcmxBdWZ6YWVo
-bGcgLSBub2NoIG5pY2h0IGZlcnRpZyAqLwpwLkVybEF1ZnphZWhsZyB7bWFyZ2lu
-LXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21h
-cmdpbi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEu
-MHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7Y29sb3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdlOiA4OV9UR1VFX1VlYmVy
-c2NoclNwYWx0ZSovCnAuVEdVRVVlYmVyc2NoclNwYWx0ZSB7bWFyZ2luLXRvcDo0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1s
-ZWZ0OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0
-O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZh
-bWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpi
-b2xkO30KLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKi8KLyogRm9ybWF0dm9ybGFnZW4gZnVlciBa
-ZWljaGVuZm9ybWF0aWVydW5nICAgICAgICAgICAgICAgICAgICAgKi8KLyoqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKi8KLyogRm9ybWF0dm9ybGFnZTogOTkwX0ZlaGxlciAqLwpzcGFu
-LkZlaGxlciB7Y29sb3I6IHJlZDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5MV9HbGRT
-eW1ib2wgKi8Kc3Bhbi5HbGRTeW1ib2wge2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBG
-b3JtYXR2b3JsYWdlOiA5OTJfTm9ybWFsICovCnNwYW4uTm9ybWFsIHtmb250LXN0
-eWxlOiBub3JtYWw7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTNfRmV0dCAqLwpzcGFu
-LkZldHQge2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTRf
-S3Vyc2l2ICovCnNwYW4uS3Vyc2l2IHtmb250LXN0eWxlOml0YWxpYzt9Ci8qIEZv
-cm1hdHZvcmxhZ2U6IDk5NV9VbnRlcnN0cmljaGVuICovCnNwYW4uVW50ZXJzdHJp
-Y2hlbiB7dGV4dC1kZWNvcmF0aW9uOnVuZGVybGluZTt9Ci8qIEZvcm1hdHZvcmxh
-Z2U6IDk5Nl9HZXNwZXJydCAqLwpzcGFuLkdlc3BlcnJ0IHtsZXR0ZXItc3BhY2lu
-ZzoxLjNwdDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5N19Ib2NoICovCnNwYW4uSG9j
-aCB7bGluZS1oZWlnaHQ6IDYwJTsgZm9udC1zaXplOiA2MCU7IHZlcnRpY2FsLWFs
-aWduOnN1cGVyO30KLyogRm9ybWF0dm9ybGFnZTogOTk4X1RpZWYgKi8Kc3Bhbi5U
-aWVmIHt2ZXJ0aWNhbC1hbGlnbjpzdWI7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTlf
-RmV0dF91bmRfS3Vyc2l2ICovCnNwYW4uRmV0dHVuZEt1cnNpdiB7Zm9udC13ZWln
-aHQ6Ym9sZDsgZm9udC1zdHlsZTppdGFsaWM7fQovKiBTdGFuZGFyZHRhYnNjaHJp
-dHR3ZWl0ZSBhdXMgV29yZCAqLwpzcGFuLlN0YW5kYXJkdGFidWxhdG9yIHt3aWR0
-aDozNS40NXB0O30KLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLyogRm9ybWF0dm9ybGFnZW4g
-ZGVyIFBhcmxhbWVudHNkaXJla3Rpb24gICAgICAgICAgICAgICAgICAgICAgKi8K
-LyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKi8KcC5QREFsbG9uZ2UsIGxpLlBEQWxsb25nZSwgZGl2
-LlBEQWxsb25nZSB7bWFyZ2luLXRvcDoxNC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTtt
-YXJnaW4tYm90dG9tOjEwLjBwdDttYXJnaW4tbGVmdDowY207dGV4dC1hbGlnbjpj
-ZW50ZXI7Zm9udC1zaXplOjE0LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7fQpwLlBEQWxsb25nZUIsIGxpLlBE
-QWxsb25nZUIsIGRpdi5QREFsbG9uZ2VCIHttYXJnaW4tdG9wOjE0LjBwdDttYXJn
-aW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MTAuMHB0O21hcmdpbi1sZWZ0OjBj
-bTt0ZXh0LWFsaWduOmp1c3RpZnk7Zm9udC1zaXplOjE0LjBwdDtmb250LWZhbWls
-eToiVGltZXMgTmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7fQpwLlBE
-QWxsb25nZUwsIGxpLlBEQWxsb25nZUwsIGRpdi5QREFsbG9uZ2VMIHttYXJnaW4t
-dG9wOjE0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MTAuMHB0
-O21hcmdpbi1sZWZ0OjBjbTtmb250LXNpemU6MTQuMHB0O2ZvbnQtZmFtaWx5OiJU
-aW1lcyBOZXcgUm9tYW4iO2xheW91dC1ncmlkLW1vZGU6bGluZTt9CnAuUERBbnRy
-YWdzZm9ybWVsLCBsaS5QREFudHJhZ3Nmb3JtZWwsIGRpdi5QREFudHJhZ3Nmb3Jt
-ZWwge21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJv
-dHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTtsaW5l
-LWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGlt
-ZXMgTmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7fQpwLlBERGF0dW0s
-IGxpLlBERGF0dW0sIGRpdi5QRERhdHVtIHttYXJnaW4tdG9wOjE0LjBwdDttYXJn
-aW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0
-ZXh0LWFsaWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZTox
-MC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGF5b3V0LWdyaWQt
-bW9kZTpsaW5lO30KcC5QREVudHNjaGxpZXNzdW5nLCBsaS5QREVudHNjaGxpZXNz
-dW5nLCBkaXYuUERFbnRzY2hsaWVzc3VuZyB7bWFyZ2luLXRvcDo4LjBwdDttYXJn
-aW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTts
-aW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWlseToi
-VGltZXMgTmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7Zm9udC13ZWln
-aHQ6Ym9sZDt9CnAuUERLMSwgbGkuUERLMSwgZGl2LlBESzEge21hcmdpbjowY207
-dGV4dC1hbGlnbjpjZW50ZXI7Ym9yZGVyOm5vbmU7cGFkZGluZzowY207Zm9udC1z
-aXplOjEyLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtsZXR0ZXIt
-c3BhY2luZzotLjRwdDtmb250LXdlaWdodDpib2xkO30KcC5QREsxQW5sYWdlLCBs
-aS5QREsxQW5sYWdlLCBkaXYuUERLMUFubGFnZSB7bWFyZ2luOjBjbTt0ZXh0LWFs
-aWduOnJpZ2h0O2ZvbnQtc2l6ZToxMi4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7bGV0dGVyLXNwYWNpbmc6LS40cHQ7Zm9udC13ZWlnaHQ6Ym9sZDt9
-CnAuUERLMUF1c2csIGxpLlBESzFBdXNnLCBkaXYuUERLMUF1c2cge21hcmdpbi10
-b3A6NjIuOXB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbToyNy4wcHQ7
-bWFyZ2luLWxlZnQ6MGNtO2ZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6IlRp
-bWVzIE5ldyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAuUERLMiwgbGkuUERL
-MiwgZGl2LlBESzIge21hcmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFy
-Z2luLWJvdHRvbToxMS4zNXB0O21hcmdpbi1sZWZ0OjBjbTtmb250LXNpemU6MjIu
-MHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2ZvbnQtd2VpZ2h0OmJv
-bGQ7fQpwLlBESzMsIGxpLlBESzMsIGRpdi5QREszIHttYXJnaW4tdG9wOjBjbTtt
-YXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MjAuMHB0O21hcmdpbi1sZWZ0
-OjBjbTtmb250LXNpemU6MTguMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9t
-YW4iO2ZvbnQtd2VpZ2h0OmJvbGQ7fQpwLlBESzQsIGxpLlBESzQsIGRpdi5QREs0
-IHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206
-Ni4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2ZvbnQtc2l6ZToxMy4wcHQ7Zm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAuUERLb3Bm
-emVpbGUsIGxpLlBES29wZnplaWxlLCBkaXYuUERLb3BmemVpbGUge21hcmdpbi10
-b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJn
-aW4tbGVmdDowY207dGV4dC1hbGlnbjpqdXN0aWZ5O2xpbmUtaGVpZ2h0OjExLjBw
-dDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4i
-O2xheW91dC1ncmlkLW1vZGU6bGluZTt9CnAuUERVMSwgbGkuUERVMSwgZGl2LlBE
-VTEge21hcmdpbi10b3A6MjIuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJv
-dHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250
-LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2ZvbnQt
-d2VpZ2h0OmJvbGQ7fQpwLlBEVTIsIGxpLlBEVTIsIGRpdi5QRFUyIHttYXJnaW4t
-dG9wOjUuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFy
-Z2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6OS4wcHQ7
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQpwLlBEVm9ybGFnZSwgbGku
-UERWb3JsYWdlLCBkaXYuUERWb3JsYWdlIHttYXJnaW4tdG9wOjBjbTttYXJnaW4t
-cmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MTAuMHB0O21hcmdpbi1sZWZ0OjBjbTt0
-ZXh0LWFsaWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZTox
-MS4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGF5b3V0LWdyaWQt
-bW9kZTpsaW5lO2ZvbnQtd2VpZ2h0OmJvbGQ7fQo8L3N0eWxlPgo8L2hlYWQ+Cgk8
-Ym9keT4KCQk8ZGl2IGNsYXNzPSJwYXBlcnciPgoJCQkKCQkJCgkJCQoJCQkKCQkJ
-PHAgY2xhc3M9IkJER2VzQmxhdHQgQWxpZ25DZW50ZXIiPkJVTkRFU0dFU0VUWkJM
-QVRUPC9wPgoJCQk8cCBjbGFzcz0iUmVwT2VzdGVyciBBbGlnbkNlbnRlciI+RsOc
-UiBESUUgUkVQVUJMSUsgw5ZTVEVSUkVJQ0g8L3A+CgkJCTx0YWJsZSBjbGFzcz0i
-dG9wIGJvdHRvbSB3aTEwMCI+Cjx0cj4KCQkJCTx0ZD4KPHAgY2xhc3M9IkF1c2dh
-YmVEYXRlbiBBbGlnbkxlZnQiPkphaHJnYW5nIDIwMDY8L3A+CjwvdGQ+CgkJCQk8
-dGQ+CjxwIGNsYXNzPSJBdXNnYWJlRGF0ZW4gQWxpZ25DZW50ZXIiPkF1c2dlZ2Vi
-ZW4gYW0gOS4gTcOkcnogMjAwNjwvcD4KPC90ZD4KCQkJCTx0ZD4KPHAgY2xhc3M9
-IkF1c2dhYmVEYXRlbiBBbGlnblJpZ2h0Ij5UZWlsIElJPC9wPgo8L3RkPgoJCQk8
-L3RyPgo8L3RhYmxlPgoJCQk8dGFibGUgY2xhc3M9ImJvdHRvbSB3aTEwMCI+Cjx0
-cj4KPHRkPgo8cCBjbGFzcz0iS3VyenRpdGVsMiBBbGlnbkxlZnQgVkFsaWduVG9w
-Ij4KPHNwYW4gY2xhc3M9Ikt1cnp0aXRlbGJyZWl0ZSI+MTA2LiBWZXJvcmRudW5n
-Ojwvc3Bhbj4KPC9wPgo8L3RkPgo8dGQ+CjxwIGNsYXNzPSJLdXJ6dGl0ZWwyIEFs
-aWduTGVmdCI+Um9obWlsY2h2ZXJvcmRudW5nPC9wPgo8L3RkPgo8L3RyPgo8L3Rh
-YmxlPgoJCQk8cCBjbGFzcz0iVGl0ZWwgQWxpZ25KdXN0aWZ5Ij4xMDYuIFZlcm9y
-ZG51bmcgZGVyIEJ1bmRlc21pbmlzdGVyaW4gZsO8ciBHZXN1bmRoZWl0IHVuZCBG
-cmF1ZW4gw7xiZXIgUm9obWlsY2ggdW5kIFJvaHJhaG0gKFJvaG1pbGNodmVyb3Jk
-bnVuZyk8L3A+CgkJCTxwIGNsYXNzPSJQcm9tS2xFaW5sU2F0eiBBbGlnbkp1c3Rp
-ZnkiPkF1ZiBHcnVuZCBkZXMgwqcgMTQgWiAxIGRlcyBMZWJlbnNtaXR0ZWxzaWNo
-ZXJoZWl0cy0gdW5kIFZlcmJyYXVjaGVyc2NodXR6Z2VzZXR6ZXMg4oCTIExNU1ZH
-LCBCR0JsLiBJIE5yLiAxMy8yMDA2LCBnZcOkbmRlcnQgZHVyY2ggZGFzIEJ1bmRl
-c2dlc2V0eiBCR0JsLiBJIE5yLiAxNTEvMjAwNSwgd2lyZCBpbSBFaW52ZXJuZWht
-ZW4gbWl0IGRlbSBCdW5kZXNtaW5pc3RlciBmw7xyIExhbmQtIHVuZCBGb3JzdHdp
-cnRzY2hhZnQsIFVtd2VsdCB1bmQgV2Fzc2Vyd2lydHNjaGFmdCB2ZXJvcmRuZXQ6
-PC9wPgoJCQk8cCBjbGFzcz0iVWViZXJzY2hyUGFyYSBBbGlnbkNlbnRlciI+R2Vs
-dHVuZ3NiZXJlaWNoPC9wPgoJCQk8cCBjbGFzcz0iQWJzIEFsaWduSnVzdGlmeSI+
-CgkJCQk8c3BhbiBjbGFzcz0iR2xkU3ltYm9sIj7Cp8KgMS48L3NwYW4+IERpZXNl
-IFZlcm9yZG51bmcgcmVnZWx0IGRhcyBJbnZlcmtlaHJicmluZ2VuIHZvbiBSb2ht
-aWxjaCB1bmQgUm9ocmFobSwgZGllIGbDvHIgZGVuIHVubWl0dGVsYmFyZW4gbWVu
-c2NobGljaGVuIFZlcnplaHIgYmVzdGltbXQgc2luZCBzb3dpZSBkYW1pdCBpbiBa
-dXNhbW1lbmhhbmcgc3RlaGVuZGUgQmVoYW5kbHVuZ3MtIHVuZCBLZW5uemVpY2hu
-dW5ndm9yc2NocmlmdGVuLjwvcD4KCQkJPHAgY2xhc3M9IlVlYmVyc2NoclBhcmEg
-QWxpZ25DZW50ZXIiPkFsbGdlbWVpbmUgQmVzdGltbXVuZ2VuPC9wPgoJCQk8cCBj
-bGFzcz0iQWJzIEFsaWduSnVzdGlmeSI+CgkJCQk8c3BhbiBjbGFzcz0iR2xkU3lt
-Ym9sIj7Cp8KgMi48L3NwYW4+ICgxKSBSb2htaWxjaCB1bmQgUm9ocmFobSBkw7xy
-ZmVuIG51ciBkaXJla3Qgdm9tIFRpZXJoYWx0ZXIgYW4gZGVuIEVuZHZlcmJyYXVj
-aGVyIG9kZXIgYW4gRWluemVsaGFuZGVsc3VudGVybmVobWVuIHVuZCB2b24gZGll
-c2VuIEVpbnplbGhhbmRlbHN1bnRlcm5laG1lbiBkaXJla3QgYW4gZGVuIEVuZHZl
-cmJyYXVjaGVyIGFiZ2VnZWJlbiB3ZXJkZW4uPC9wPgoJCQk8cCBjbGFzcz0iQWJz
-IEFsaWduSnVzdGlmeSI+KDIpIFJvaG1pbGNoIHVuZCBSb2hyYWhtIGTDvHJmZW4g
-bmljaHQgYW4gU2NodWxlbiB1bmQgS2luZGVyZ8OkcnRlbiBhYmdlZ2ViZW4gd2Vy
-ZGVuLiBBbmRlcmUgRWlucmljaHR1bmdlbiBkZXIgR2VtZWluc2NoYWZ0c3ZlcnNv
-cmd1bmcsIGRlbmVuIFJvaG1pbGNoIG9kZXIgUm9ocmFobSBnZW3DpMOfIEFicy4g
-MSBhYmdlZ2ViZW4gd2lyZCwgZMO8cmZlbiBkaWVzZSBudXIgenVtIFp3ZWNrZSBk
-ZXIgSGVyc3RlbGx1bmcgdm9uIFNwZWlzZW4gdW5kIEdldHLDpG5rZW4gdmVyd2Vu
-ZGVuLCBkaWUgZWluZW0gRXJoaXR6dW5nc3ZlcmZhaHJlbiB1bnRlcnpvZ2VuIHdl
-cmRlbiwgbWl0IGRlbSBlaW5lIGF1c3JlaWNoZW5kIGhvaGUgS2VybnRlbXBlcmF0
-dXIgZXJ6aWVsdCB3aXJkLCB1bSBkaWUgQWJ0w7Z0dW5nIHZvbiBwYXRob2dlbmVu
-IE1pa3Jvb3JnYW5pc21lbiBzaWNoZXJ6dXN0ZWxsZW4uPC9wPgoJCQk8cCBjbGFz
-cz0iVWViZXJzY2hyUGFyYSBBbGlnbkNlbnRlciI+TWlsY2hhdXRvbWF0ZW48L3A+
-CgkJCTxwIGNsYXNzPSJBYnMgQWxpZ25KdXN0aWZ5Ij4KCQkJCTxzcGFuIGNsYXNz
-PSJHbGRTeW1ib2wiPsKnwqAzLjwvc3Bhbj4gUm9obWlsY2gga2FubiBkdXJjaCBl
-aW5lbiBuYWNoIGFuZXJrYW5udGVuIEtyaXRlcmllbiBnZXByw7xmdGVuIE1pbGNo
-YXV0b21hdGVuIGFiZ2VnZWJlbiB3ZXJkZW4sIHdlbm4gZ2V3w6RocmxlaXN0ZXQg
-aXN0LCBkYXNzIGRpZSBSb2htaWxjaCBkdXJjaCBkZW4gTWlsY2hhdXRvbWF0ZW4g
-b2RlciBkZXNzZW4gU3RhbmRvcnQga2VpbmUgaHlnaWVuaXNjaCBuYWNodGVpbGln
-ZSBCZWVpbnRyw6RjaHRpZ3VuZyBlcmbDpGhydC48L3A+CgkJCTxwIGNsYXNzPSJV
-ZWJlcnNjaHJQYXJhIEFsaWduQ2VudGVyIj5aZWl0cHVua3QgZGVyIEFiZ2FiZTwv
-cD4KCQkJPHAgY2xhc3M9IkFicyBBbGlnbkp1c3RpZnkiPgoJCQkJPHNwYW4gY2xh
-c3M9IkdsZFN5bWJvbCI+wqfCoDQuPC9zcGFuPiBSb2htaWxjaCBkYXJmIG51ciBh
-bSBUYWcgZGVyIEdld2lubnVuZyB1bmQgYW4gZGVuIHp3ZWkgZGFyYXVmIGZvbGdl
-bmRlbiBUYWdlbiBhYmdlZ2ViZW4gd2VyZGVuLiBSb2hyYWhtIGRhcmYgbnVyIGFt
-IFRhZyBkZXIgR2V3aW5udW5nIGRlciBSb2htaWxjaCBvZGVyIGFtIGRhcmF1ZiBm
-b2xnZW5kZW4gVGFnIGF1cyBkaWVzZXIgaGVyZ2VzdGVsbHQgdW5kIGFiZ2VnZWJl
-biB3ZXJkZW4uPC9wPgoJCQk8cCBjbGFzcz0iVWViZXJzY2hyUGFyYSBBbGlnbkNl
-bnRlciI+S2VubnplaWNobnVuZzwvcD4KCQkJPHAgY2xhc3M9IkFicyBBbGlnbkp1
-c3RpZnkiPgoJCQkJPHNwYW4gY2xhc3M9IkdsZFN5bWJvbCI+wqfCoDUuPC9zcGFu
-PiAoMSkgVW5iZXNjaGFkZXQgZGVyIEJlc3RpbW11bmdlbiBkZXIgTGViZW5zbWl0
-dGVsa2VubnplaWNobnVuZ3N2ZXJvcmRudW5nIDE5OTMgLSBMTUtWLCBCR0JsLiBO
-ci4gNzIvMTk5MyBpbiBkZXIgamV3ZWlscyBnZWx0ZW5kZW4gRmFzc3VuZywgaXN0
-IFJvaG1pbGNoIHp1bSB1bm1pdHRlbGJhcmVuIG1lbnNjaGxpY2hlbiBWZXJ6ZWhy
-IG1pdCBkZW0gSGlud2VpcyDigJ5Sb2htaWxjaCwgdm9yIGRlbSBWZXJ6ZWhyIGFi
-a29jaGVu4oCcIHVuZCBSb2hyYWhtIG1pdCBkZW0gSGlud2VpcyDigJ5Sb2hyYWht
-LCBudXIgenVyIEhlcnN0ZWxsdW5nIHZvbiBkdXJjaGVyaGl0enRlbiBTcGVpc2Vu
-IHZlcndlbmRlbuKAnCB6dSBkZWtsYXJpZXJlbi48L3A+CgkJCTxwIGNsYXNzPSJB
-YnMgQWxpZ25KdXN0aWZ5Ij4oMikgQmVpIFJvaG1pbGNoIHVuZCBSb2hyYWhtLCBk
-aWUgbmljaHQgZ2Vtw6TDnyBkZXIgTGViZW5zbWl0dGVsa2VubnplaWNobnVuZ3N2
-ZXJvcmRudW5nIDE5OTMgLUxNS1YgenUga2VubnplaWNobmVuIHNpbmQgdW5kIG5p
-Y2h0IHp1bSB1bm1pdHRlbGJhcmVuIFZlcnplaHIgYW4gT3J0IHVuZCBTdGVsbGUg
-YmVzdGltbXQgc2luZCwgaGF0IGRlciBIaW53ZWlzIGdlbcOkw58gQWJzLiAxIC0g
-YmVpIEFiZ2FiZSBhbiBkZW4gRW5kdmVyYnJhdWNoZXIgLSBhdWYgZWluZW0gQXVz
-aGFuZywgZGVuIGRlciBFbmR2ZXJicmF1Y2hlciBlaW5zZWhlbiBrYW5uLCBkZXV0
-bGljaCBsZXNiYXIgenUgZXJmb2xnZW4uIEJlaSBBYmdhYmUgYW4gRWluemVsaGFu
-ZGVsc3VudGVybmVobWVuIGlzdCBhdWYgZGVtIFRyYW5zcG9ydGJlaMOkbHRlciB1
-bmQgYXVmIGRlbiBkaWUgV2FyZSBiZWdsZWl0ZW5kZW4gRG9rdW1lbnRlbiwgd2ll
-IExpZWZlcnNjaGVpbiBvZGVyIFJlY2hudW5nIOKAnlJvaG1pbGNo4oCcIG9kZXIg
-4oCeUm9ocmFobeKAnCBhbnp1Z2ViZW4uPC9wPgoJCQk8cCBjbGFzcz0iVWViZXJz
-Y2hyUGFyYSBBbGlnbkNlbnRlciI+S3JpdGVyaWVuPC9wPgoJCQk8cCBjbGFzcz0i
-QWJzIEFsaWduSnVzdGlmeSI+CgkJCQk8c3BhbiBjbGFzcz0iR2xkU3ltYm9sIj7C
-p8KgNi48L3NwYW4+IFJvaG1pbGNoIG11c3MgZm9sZ2VuZGUgS3JpdGVyaWVuIGVy
-ZsO8bGxlbjo8L3A+CgkJCTx0YWJsZSBjbGFzcz0id2kxMDAiPgoJCQkJCgkJCQkJ
-PHRyPgo8dGQgY2xhc3M9IlczOCBBbGlnblJpZ2h0IFZBbGlnblRvcCI+CjxwIGNs
-YXNzPSJaaWZmZXJFMSI+MS48L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iQWxpZ25KdXN0
-aWZ5IEUxU3AyIiBjb2xzcGFuPSI3Ij4KPHAgY2xhc3M9IlppZmZlckUxIj5Sb2hl
-IEt1aG1pbGNoOjwvcD4KPC90ZD4KPC90cj4KCQkJCQoJCQkJPHRyPgo8dGQgY2xh
-c3M9IlczOCI+PC90ZD4KPHRkIGNsYXNzPSJBbGlnbkp1c3RpZnkiIGNvbHNwYW49
-IjciPgo8cCBjbGFzcz0iU2NobHVzc3RlaWxaaWZmIj5hKSBLZWltemFobCBiZWkg
-MzDCsEMgKHBybyBtbCk6IDxpbWcgYWx0PSIiIHNyYz0iLi9CaWxkZXItRGF0ZWll
-bi9CaWxkZXIuaW1nMWlzLmdpZiI+PC9pbWc+IDUwIDAwMDs8L3A+CjwvdGQ+Cjwv
-dHI+CgkJCQk8dHI+Cjx0ZCBjbGFzcz0iVzM4Ij48L3RkPgo8dGQgY2xhc3M9IkFs
-aWduSnVzdGlmeSIgY29sc3Bhbj0iNyI+CjxwIGNsYXNzPSJTY2hsdXNzdGVpbFpp
-ZmYiPmIpIFNvbWF0aXNjaGUgWmVsbGVuIChwcm8gbWwpOiA8aW1nIGFsdD0iIiBz
-cmM9Ii4vQmlsZGVyLURhdGVpZW4vQmlsZGVyLmltZzJpcy5naWYiPjwvaW1nPiA0
-MDAgMDAwLjwvcD4KPC90ZD4KPC90cj4KCQkJCQoJCQkJCTx0cj4KPHRkIGNsYXNz
-PSJXMzggQWxpZ25SaWdodCBWQWxpZ25Ub3AiPgo8cCBjbGFzcz0iWmlmZmVyRTEi
-PjIuPC9wPgo8L3RkPgo8dGQgY2xhc3M9IkFsaWduSnVzdGlmeSBFMVNwMiIgY29s
-c3Bhbj0iNyI+CjxwIGNsYXNzPSJaaWZmZXJFMSI+Um9obWlsY2ggdm9uIGFuZGVy
-ZW4gVGllcmFydGVuOiBLZWltemFobCBiZWkgMzDCsEMgKHBybyBtbCk6IDxpbWcg
-YWx0PSIiIHNyYz0iLi9CaWxkZXItRGF0ZWllbi9CaWxkZXIuaW1nM2lzLmdpZiI+
-PC9pbWc+IDUwMCAwMDAuPC9wPgo8L3RkPgo8L3RyPgoJCQkJCgkJCTwvdGFibGU+
-CgkJCTxwIGNsYXNzPSJVZWJlcnNjaHJQYXJhIEFsaWduQ2VudGVyIj5QZXJzb25l
-bmJlem9nZW5lIEJlemVpY2hudW5nZW48L3A+CgkJCTxwIGNsYXNzPSJBYnMgQWxp
-Z25KdXN0aWZ5Ij4KCQkJCTxzcGFuIGNsYXNzPSJHbGRTeW1ib2wiPsKnwqA3Ljwv
-c3Bhbj4gQmVpIGRlbiBpbiBkaWVzZXIgVmVyb3JkbnVuZyB2ZXJ3ZW5kZXRlbiBw
-ZXJzb25lbmJlem9nZW5lbiBCZXplaWNobnVuZ2VuIGdpbHQgZGllIGdld8OkaGx0
-ZSBGb3JtIGbDvHIgYmVpZGUgR2VzY2hsZWNodGVyLjwvcD4KCQkJPHAgY2xhc3M9
-IlVlYmVyc2NoclBhcmEgQWxpZ25DZW50ZXIiPlNjaGx1c3NiZXN0aW1tdW5nPC9w
-PgoJCQk8cCBjbGFzcz0iQWJzIEFsaWduSnVzdGlmeSI+CgkJCQk8c3BhbiBjbGFz
-cz0iR2xkU3ltYm9sIj7Cp8KgOC48L3NwYW4+IERpZXNlIFZlcm9yZG51bmcgd3Vy
-ZGUgdW50ZXIgRWluaGFsdHVuZyBkZXIgQmVzdGltbXVuZ2VuIGRlciBSaWNodGxp
-bmllIDk4LzM0L0VHIMO8YmVyIGVpbiBJbmZvcm1hdGlvbnN2ZXJmYWhyZW4gYXVm
-IGRlbSBHZWJpZXQgZGVyIE5vcm1lbiB1bmQgdGVjaG5pc2NoZW4gVm9yc2Nocmlm
-dGVuLCBBQmwuIE5yLiBMIDIwNCB2b20gMjEuIEp1bGkgMTk5OCB1bmQgZGVzIEFy
-dGlrZWxzIDEwIEFicy4gNSBkZXIgVmVyb3JkbnVuZyAoRUcpIE5yLiA4NTMvMjAw
-NCBtaXQgc3BlemlmaXNjaGVuIEh5Z2llbmV2b3JzY2hyaWZ0ZW4gZsO8ciBMZWJl
-bnNtaXR0ZWwgdGllcmlzY2hlbiBVcnNwcnVuZ3MsIEFCbC4gTnIuIEwgMTM5IHZv
-bSAzMC4gQXByaWwgMjAwNCwgYmVyaWNodGlndCBkdXJjaCBBQmwuIE5yLiBMIDIy
-NiB2b20gMjUuIEp1bmkgMjAwNCwgbm90aWZpemllcnQuPC9wPgoJCQk8cCBjbGFz
-cz0iVW50ZXJzY2hyTCI+UmF1Y2gtS2FsbGF0PC9wPgoJCQoJCQkJPHAgY2xhc3M9
-IkZ1c3N6ZWlsZSBBbGlnbkp1c3RpZnkiPnd3dy5yaXMuYmthLmd2LmF0PC9wPgoJ
-CQk8L2Rpdj4KCTwvYm9keT4KCQo8L2h0bWw+</sl11:Base64Content></sl11:HashInputData><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>R0lGODlhDQAQAHcAMSH+GlNvZnR3YXJlOiBNaWNyb3NvZnQgT2ZmaWNlACH5BAEA
-AAAALAIAAwAJAAoAgAAAAAAAAAIRhG+BqReP4AJy0mYfnnvp/xQAOw==</sl11:Base64Content></sl11:HashInputData><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>R0lGODlhDQAQAHcAMSH+GlNvZnR3YXJlOiBNaWNyb3NvZnQgT2ZmaWNlACH5BAEA
-AAAALAIAAwAJAAoAgAAAAAAAAAIRhG+BqReP4AJy0mYfnnvp/xQAOw==</sl11:Base64Content></sl11:HashInputData><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>R0lGODlhDQAQAHcAMSH+GlNvZnR3YXJlOiBNaWNyb3NvZnQgT2ZmaWNlACH5BAEA
-AAAALAIAAwAJAAoAgAAAAAAAAAIRhG+BqReP4AJy0mYfnnvp/xQAOw==</sl11:Base64Content></sl11:HashInputData><sl11:SignatureCheck><sl11:Code>0</sl11:Code></sl11:SignatureCheck><sl11:SignatureManifestCheck><sl11:Code>98</sl11:Code></sl11:SignatureManifestCheck><sl11:SignatureManifestCheck><sl11:Code>0</sl11:Code></sl11:SignatureManifestCheck><sl11:CertificateCheck><sl10:Code>1</sl10:Code></sl11:CertificateCheck></sl11:VerifyXMLSignatureResponse>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyResponse.204_2006.iso8859.xml b/spss.slinterface/test/moa-wartung-la9/verifyResponse.204_2006.iso8859.xml
deleted file mode 100644
index 3cd93450a..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyResponse.204_2006.iso8859.xml
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl11:VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" 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:SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Christian Wregar,OU=Verfassungsdienst,O=Bundeskanzleramt der Republik \C3\96sterreich,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=a-sign-corporate-light-01,OU=a-sign-corporate-light-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>21221</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIE4TCCA8mgAwIBAgICUuUwDQYJKoZIhvcNAQEFBQAwgZ8xCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIjAgBgNVBAsTGWEtc2lnbi1jb3Jw
-b3JhdGUtbGlnaHQtMDExIjAgBgNVBAMTGWEtc2lnbi1jb3Jwb3JhdGUtbGlnaHQt
-MDEwHhcNMDMxMjEwMTcyMzA3WhcNMDYxMjEwMTcyMzA3WjCBnzELMAkGA1UEBhMC
-QVQxWTBXBgNVBAoeUABCAHUAbgBkAGUAcwBrAGEAbgB6AGwAZQByAGEAbQB0ACAA
-ZABlAHIAIABSAGUAcAB1AGIAbABpAGsAIADWAHMAdABlAHIAcgBlAGkAYwBoMRow
-GAYDVQQLExFWZXJmYXNzdW5nc2RpZW5zdDEZMBcGA1UEAxMQQ2hyaXN0aWFuIFdy
-ZWdhcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv7Z6w9XhQLoIxipExnL7
-go/rp5Leh/y0E8mjS7XKe4acgmb/+p7cyAIzDjSY4Jse4xz9cKb+0hrEyKJjvR61
-Tl4lJxQsdYan3rLqcruPlC0GRkAgiiRdLwvAaAUBqzYxzTjKvdZBdcnuY+S2Ad1Z
-5N5zAF2XRzykcsmLRZvpvJ8CAwEAAaOCAacwggGjMAkGA1UdEwQCMAAwEQYDVR0O
-BAoECEhNunRQSAFFMF0GA1UdIARWMFQwUgYHKigAEQEOATBHMEUGCCsGAQUFBwIB
-FjlodHRwOi8vd3d3LmEtdHJ1c3QuYXQvZG9jcy9jcC9hc2lnbi1nb3Zlcm5tZW50
-LXNlcnZlci5wZGYwEwYDVR0jBAwwCoAITp5/1C/JHx8wfwYIKwYBBQUHAQEEczBx
-MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRydXN0LmF0L29jc3AwRgYIKwYB
-BQUHMAKGOmh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNpZ24tY29ycG9y
-YXRlLWxpZ2h0LTAxYS5jcnQwDgYDVR0PAQH/BAQDAgeAMG4GA1UdHwRnMGUwY6Bh
-oF+GXWxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1s
-aWdodC0wMSxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0
-PzAOBgcqKAAKAQEBBAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFIWZVsrHNwZDSkE
-44Cyc1cCJU49CrjsX7OPG43notq9JPRPMvbVAOrN3g0H8x2oOSYoxscKut1IqLxc
-xUVKYuCZEQBj0FZTYLFIuK8//vPOwmTSTBKMjKZpkkxfdcM5JX+nGdJgfqndjqPw
-e9lZ213EMIEfEf1Nfr5R0MNk1uCUg9diqEpDcUdVks2KN4/zQVuNRlGFgM+y8E2N
-VFopTtCBhSj6nuxeIbpbEOmjuAfF5zoVAJg4nj4DKJC8oiaY+KR+817fXpHclzxd
-f1s0aVpqdOf7Dc0FXjrCBGKpyjcN4Qj9zioy5J6awkiWDF9CQICxwt4TYB1lS8Vx
-Z+ghQ0g=</dsig:X509Certificate><moa:PublicAuthority/></dsig:X509Data></sl11:SignerInfo><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>PGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgo8aGVh
-ZD4KPHRpdGxlPmVSZWNodCBEb2t1bWVudCAoMS45LjApPC90aXRsZT4KPHN0eWxl
-IHR5cGU9InRleHQvY3NzIj4KICAgICAgICAuVzM4IHsgd2lkdGg6MzhweDsgfQog
-ICAgICAgIC5XMTUgeyB3aWR0aDoxNXB4OyB9CiAgICAgICAgLlcyMiB7IHdpZHRo
-OjIycHg7IH0KICAgICAgICAuVzkwIHsgd2lkdGg6OTBweDsgfQogICAgICAgIC53
-aTEwMCB7IHdpZHRoOjEwMCU7IH0KICAgICAgICAuV0VybCB7IHdpZHRoOjE1cHg7
-IH0KICAgICAgICAuRTFTcDIgeyB3aWR0aDo1NTcuM3B4OyB9CiAgICAgICAgLkUy
-U3AyIHsgd2lkdGg6NTQyLjNweDsgfQogICAgICAgIC5FM1NwMiB7IHdpZHRoOjUy
-MC4zcHg7IH0KICAgICAgICAuRTRTcDIgeyB3aWR0aDo0OTguMjk5OTk5OTk5OTk5
-OTVweDsgfQogICAgICAgIC5FNVNwMiB7IHdpZHRoOjQ3Ni4yOTk5OTk5OTk5OTk5
-NXB4OyB9CiAgICAgICAgLkVybFNwMiB7IHdpZHRoOjU3MC4zcHg7IH0KICAgICAg
-ICAuRTFTcDJRIHsgd2lkdGg6ODAzLjlweDsgfQogICAgICAgIC5FMlNwMlEgeyB3
-aWR0aDo3ODguOXB4OyB9CiAgICAgICAgLkUzU3AyUSB7IHdpZHRoOjc2Ni45cHg7
-IH0KICAgICAgICAuRTRTcDJRIHsgd2lkdGg6NzQ0LjlweDsgfQogICAgICAgIC5F
-NVNwMlEgeyB3aWR0aDo3MjIuOXB4OyB9CiAgICAgICAgLkVybFNwMlEgeyB3aWR0
-aDo4MTYuOXB4OyB9CiAgICAgICAgLkUxU3AyQiB7IHdpZHRoOjM3Ny4yOTk5OTk5
-OTk5OTk5NXB4OyB9CiAgICAgICAgLkUyU3AyQiB7IHdpZHRoOjM2Mi4yOTk5OTk5
-OTk5OTk5NXB4OyB9CiAgICAgICAgLkUzU3AyQiB7IHdpZHRoOjM0MC4yOTk5OTk5
-OTk5OTk5NXB4OyB9CiAgICAgICAgLkUxU3AyQlEgeyB3aWR0aDo2MjMuOXB4OyB9
-CiAgICAgICAgLkUyU3AyQlEgeyB3aWR0aDo2MDguOXB4OyB9CiAgICAgICAgLkUz
-U3AyQlEgeyB3aWR0aDo1ODYuOXB4OyB9CiAgICAgICAgLlRleHRXaWR0aHsgd2lk
-dGg6Mjk2LjI5OTk5OTk5OTk5OTk1cHg7IH0KICAgICAgICAuVGV4dFdpZHRoUXsg
-d2lkdGg6NTQyLjlweDsgfQogICAgICAgIC5pbnZpc2libGV7IGhlaWdodDogMHB0
-IH0KCQkJCWludmlzaWJsZQoJCQkJCiAgICAgICAgLm5leHRwYWdlIHsgcGFnZS1i
-cmVhay1iZWZvcmU6YWx3YXlzOyB9CiAgICAgICAgLm1hcmdpbnMge21hcmdpbi10
-b3A6ODUuMDVwdDttYXJnaW4tcmlnaHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1
-LjA1cHQ7bWFyZ2luLWxlZnQ6ODUuMDVwdDt9CiAgICAgICAgQG1lZGlhIHNjcmVl
-biB7IC5wYXBlcncge3dpZHRoOjU5NS4zcHg7bWFyZ2luLXRvcDo4NS4wNXB0O21h
-cmdpbi1yaWdodDo4NS4wNXB0O21hcmdpbi1ib3R0b206ODUuMDVwdDttYXJnaW4t
-bGVmdDo4NS4wNXB0O319CiAgICAgICAgQG1lZGlhIHByaW50IHsgLnBhcGVydyB7
-d2lkdGg6NTk1LjNweDttYXJnaW4tdG9wOjAuMHB0O21hcmdpbi1yaWdodDowLjBw
-dDttYXJnaW4tYm90dG9tOjAuMHB0O21hcmdpbi1sZWZ0OjAuMHB0O3NpemU6cG9y
-dHJhaXQ7fX0KICAgICAgICBAbWVkaWEgc2NyZWVuIHsgLnBhcGVyaCB7d2lkdGg6
-ODQxLjlweDttYXJnaW4tcmlnaHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1
-cHQ7bWFyZ2luLWxlZnQ6ODUuMDVwdDttYXJnaW4tdG9wOjg1LjA1cHQ7fX0KICAg
-ICAgICBAbWVkaWEgcHJpbnQgeyAucGFwZXJoIHt3aWR0aDo4NDEuOXB4O21hcmdp
-bi10b3A6MC4wcHQ7bWFyZ2luLXJpZ2h0OjAuMHB0O21hcmdpbi1ib3R0b206MC4w
-cHQ7bWFyZ2luLWxlZnQ6MC4wcHQ7c2l6ZTpsYW5kc2NhcGV9fQovKiBBbGxnZW1l
-aW5lIEFuZ2FiZW4genVtIEFuemVpZ2VuIHZvbiBMaW5pZW4gaW4gVGFiZWxsZW4g
-ICAgICAqLwovKgpAcGFnZSA6bGVmdCB7c2l6ZTogMjFjbSAyOS43Y207bWFyZ2lu
-LWxlZnQ6IDJjbTttYXJnaW4tcmlnaHQ6IDJjbTttYXJrczpjcm9wO30KQHBhZ2Ug
-OnJpZ2h0IHtzaXplOiAyMWNtIDI5LjdjbTttYXJnaW4tbGVmdDogMmNtO21hcmdp
-bi1yaWdodDogMmNtO21hcmtzOmNyb3A7fQoqLwp0YWJsZS50b3Age2JvcmRlci10
-b3Atc3R5bGU6IHNvbGlkO2JvcmRlci10b3Atd2lkdGg6IHRoaW47Ym9yZGVyLWNv
-bG9yOiBibGFjazt9CnRhYmxlLmJvdHRvbSB7Ym9yZGVyLWJvdHRvbS1zdHlsZTog
-c29saWQ7Ym9yZGVyLWJvdHRvbS13aWR0aDogdGhpbjtib3JkZXItY29sb3I6IGJs
-YWNrO30KdGQudG9wIHtib3JkZXItdG9wLXN0eWxlOnNvbGlkO2JvcmRlci10b3At
-d2lkdGg6MXB0O30KdGQucmlnaHQge2JvcmRlci1yaWdodC1zdHlsZTpzb2xpZDti
-b3JkZXItcmlnaHQtd2lkdGg6MXB0O30KdGQuYm90dG9tIHtib3JkZXItYm90dG9t
-LXN0eWxlOnNvbGlkO2JvcmRlci1ib3R0b20td2lkdGg6MXB0O30KdGQubGVmdCB7
-Ym9yZGVyLWxlZnQtc3R5bGU6c29saWQ7Ym9yZGVyLWxlZnQtd2lkdGg6MXB0O30K
-LypUZXh0IGlubmVyaGFsYiBlaW5lciBUYWJlbGxlbnplbGxlIGZ1ZXIgImFic2F0
-eiIgdW5kICJ1ZWJlcnNjaHJpZnQiKi8KLkFsaWduTGVmdCB7dGV4dC1hbGlnbjps
-ZWZ0O30KLkFsaWduUmlnaHQge3RleHQtYWxpZ246cmlnaHQ7fQouQWxpZ25DZW50
-ZXIge3RleHQtYWxpZ246Y2VudGVyO30KLkFsaWduSnVzdGlmeSB7dGV4dC1hbGln
-bjpqdXN0aWZ5O30KLlZBbGlnblRvcCB7dmVydGljYWwtYWxpZ246dG9wO30KLlZB
-bGlnbkJvdHRvbSB7dmVydGljYWwtYWxpZ246Ym90dG9tO30KLyoqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKi8KLyogTGVnaXN0aWstU3RhbmRhcmQtRm9ybWF0dm9ybGFnZSAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgKi8KLyogRm9ybWF0dm9ybGFnZTogMDBfTGVn
-U3RhbmRhcmQgKi8KLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLkxlZ1N0YW5kYXJkIHsKdGV4
-dC1hbGlnbjpqdXN0aWZ5Oy8qT0sqLwpsaW5lLWhlaWdodDoxMS4wcHQ7CmZvbnQt
-c2l6ZToxMC4wcHQ7CmZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyoq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKi8KLyogRm9ybWF0dm9ybGFnZW4gZnVlciBBYnNhZXR6ZSAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKi8KLyoqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-Ki8KLyogRm9ybWF0dm9ybGFnZTogMDFfVW5kZWZpbmllcnQgKi8KcC5VbmRlZmlu
-aWVydCB7bWFyZ2luLXRvcDoxLjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmp1c3RpZnk7LypP
-SyovbGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6IHJlZDt9Ci8qIEZvcm1hdHZvcmxh
-Z2U6IDAyX0JER2VzQmxhdHQgKi8KcC5CREdlc0JsYXR0IHttYXJnaW4tdG9wOjE0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1s
-ZWZ0OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyovbGluZS1oZWlnaHQ6MzUuMHB0
-O2ZvbnQtc2l6ZTozNS4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7
-Y29sb3I6YmxhY2s7dGV4dC10cmFuc2Zvcm06dXBwZXJjYXNlO2xldHRlci1zcGFj
-aW5nOjEuM3B0O2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiAw
-M19SZXBPZXN0ZXJyICovCnAuUmVwT2VzdGVyciB7bWFyZ2luLXRvcDo2LjBwdDtt
-YXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBj
-bTttYXJnaW4tYm90dG9tOjEyLjBwdDsvKnRleHQtYWxpZ246Y2VudGVyOyovbGlu
-ZS1oZWlnaHQ6MjAuMHB0O2JvcmRlcjpub25lO3BhZGRpbmc6MGNtO2ZvbnQtc2l6
-ZToyMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6Ymxh
-Y2s7dGV4dC10cmFuc2Zvcm06dXBwZXJjYXNlO2xldHRlci1zcGFjaW5nOjEuMHB0
-O2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiAwNF9BdXNnYWJl
-RGF0ZW4gKi8KcC5BdXNnYWJlRGF0ZW4ge21hcmdpbi10b3A6MGNtO21hcmdpbi1y
-aWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO2xpbmUt
-aGVpZ2h0OjE0LjBwdDtwYWRkaW5nOjBjbTtmb250LXNpemU6MTIuMHB0O2ZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOiBibGFjaztmb250LXdlaWdo
-dDpib2xkO30KLyogRm9ybWF0dm9ybGFnZTogMDVfS3VyenRpdGVsCkt1cnp0aXRl
-bCBpbiBlaW5lciBTcGFsdGUgKHdlbm4ga2VpbiBUQUIgdm9yaGFuZGVuIGlzdCkg
-Ki8KcC5LdXJ6dGl0ZWwxIHttYXJnaW4tdG9wOjIuMHB0O21hcmdpbi1yaWdodDog
-MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OiAzLjZjbTsvKnRleHQt
-YWxpZ246anVzdGlmeTsqL3RleHQtaW5kZW50OiAtMy42Y207Ym9yZGVyOm5vbmU7
-cGFkZGluZzowY207Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xkO30KLyogS3Vy
-enRpdGVsIGluIHp3ZWkgU3BhbHRlbiAod2VubiBlaW4gVEFCIHZvcmhhbmRlbiBp
-c3QpICovCnAuS3VyenRpdGVsMiB7bWFyZ2luLXRvcDoyLjBwdDttYXJnaW4tcmln
-aHQ6IDBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDogMGNtOy8qdGV4
-dC1hbGlnbjpqdXN0aWZ5OyovYm9yZGVyOm5vbmU7cGFkZGluZzowY207Zm9udC1z
-aXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpi
-bGFjaztmb250LXdlaWdodDpib2xkO30Kc3Bhbi5LdXJ6dGl0ZWxicmVpdGUge3dp
-ZHRoOiAzLjRjbTt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDA5X0Fic3RhbmQgKi8KcC5B
-YnN0YW5kIHttYXJnaW46Ni4wcHQ7bWFyZ2luLWJvdHRvbTo2LjBwdDtsaW5lLWhl
-aWdodDoxMC4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtjb2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDEwX0Vu
-dHd1cmYgKi8KcC5FbnR3dXJmIHttYXJnaW4tdG9wOjgwLjBwdDttYXJnaW4tcmln
-aHQ6MGNtO21hcmdpbi1ib3R0b206NjQuMHB0O21hcmdpbi1sZWZ0OjBjbTsvKnRl
-eHQtYWxpZ246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZTox
-MC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGV0dGVyLXNwYWNp
-bmc6MS4zcHQ7fQovKiBGb3JtYXR2b3JsYWdlOiAxMV9UaXRlbCAqLwpwLlRpdGVs
-IHttYXJnaW4tdG9wOjI0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0
-b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL2xp
-bmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJU
-aW1lcyBOZXcgUm9tYW4iO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3Js
-YWdlOiAxMl9Qcm9tS2xfRWlubFNhdHogKi8JCnAuUHJvbUtsRWlubFNhdHoge21h
-cmdpbi10b3A6OC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBj
-bTttYXJnaW4tbGVmdDowY207Lyp0ZXh0LWFsaWduOmp1c3RpZnk7Ki90ZXh0LWlu
-ZGVudDoxOS44NXB0O2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdlLWJyZWFrLWFmdGVy
-OmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBS
-b21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiAxOF9BYmJpbGR1bmdfb2Rlcl9PYmpl
-a3QgKi8KcC5BYmJpbGR1bmdvZGVyT2JqZWt0IHttYXJnaW4tdG9wOjYuMHB0O21h
-cmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTo2LjBwdDttYXJnaW4tbGVmdDow
-Y207Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFu
-Ijtjb2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDE5X0Jlc2NocmlmdHVu
-ZyAqLwpwLkJlc2NocmlmdHVuZyB7bWFyZ2luLXRvcDowY207bWFyZ2luLXJpZ2h0
-OjBjbTttYXJnaW4tYm90dG9tOjYuMHB0O21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhl
-aWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtjb2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDIxX05v
-dkFvMSAqLwpwLk5vdkFvMSB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6
-MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxp
-Z246anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdlLWJyZWFrLWFmdGVy
-OmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBS
-b21hbiI7Zm9udC1zdHlsZTppdGFsaWM7fQovKiBGb3JtYXR2b3JsYWdlOiAyMl9O
-b3ZBbzEgKi8KcC5Ob3ZBbzIge21hcmdpbi10b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0
-OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207Lyp0ZXh0LWFs
-aWduOmp1c3RpZnk7Ki9saW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBw
-dDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtmb250LXN0eWxlOml0YWxp
-Yzt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDIzX1NhdHpfKG5hY2hfTm92YW8pICovCnAu
-U2F0em5hY2hOb3ZhbyB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNt
-O21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246
-anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2Zv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO30KLyogRm9y
-bWF0dm9ybGFnZTogMzBfSW5oYWx0VWViZXJzY2hyaWZ0ICovCnAuSW5oYWx0VWVi
-ZXJzY2hyaWZ0IHttYXJnaW4tdG9wOjE2LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21h
-cmdpbi1ib3R0b206OC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246Y2Vu
-dGVyO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFt
-aWx5OiJUaW1lcyBOZXcgUm9tYW4iO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3Jt
-YXR2b3JsYWdlOiAzMV9JbmhhbHRTcGFsdGUgKi8KcC5JbmhhbHRTcGFsdGUge21h
-cmdpbi10b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjQu
-MHB0O21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVh
-ay1hZnRlcjphdm9pZDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdl
-OiAzMl9JbmhhbHRFaW50cmFnICovCnAuSW5oYWx0RWludHJhZyB7bWFyZ2luLXRv
-cDowY207bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4t
-bGVmdDowY207bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9u
-dC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA0
-MV9VZWJlcnNjaHJHMSAqLwpwLlVlYmVyc2NockcxIHttYXJnaW4tdG9wOjE2LjBw
-dDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0
-OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0O3Bh
-Z2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWls
-eToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xk
-O30KLyogRm9ybWF0dm9ybGFnZTogNDJfVWViZXJzY2hyRzEtICovCnAuVWViZXJz
-Y2hyRzEtIHttYXJnaW4tdG9wOjguMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2lu
-LWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpjZW50ZXI7
-Ki9saW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVhay1hZnRlcjphdm9pZDtmb250
-LXNpemU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9y
-OmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA0M19V
-ZWJlcnNjaHJHMiAqLwpwLlVlYmVyc2NockcyIHttYXJnaW4tdG9wOjQuMHB0O21h
-cmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTo0LjBwdDttYXJnaW4tbGVmdDow
-Y207Lyp0ZXh0LWFsaWduOmNlbnRlcjsqL2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdl
-LWJyZWFrLWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6Ym9sZDt9
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDQ0X1VlYmVyc2NockFydCAqLwpwLlVlYmVyc2No
-ckFydCB7bWFyZ2luLXRvcDo4LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyov
-bGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1z
-aXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpi
-bGFjaztmb250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9ybGFnZTogNDVfVWVi
-ZXJzY2hyUGFyYSAqLwpwLlVlYmVyc2NoclBhcmEge21hcmdpbi10b3A6NC4wcHQ7
-bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDow
-Y207Lyp0ZXh0LWFsaWduOmNlbnRlcjsqL2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdl
-LWJyZWFrLWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6Ym9sZDt9
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDUxX0FicyAqLwpwLkFicyB7bWFyZ2luLXRvcDo0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1s
-ZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL3RleHQtaW5kZW50OjE5Ljg1
-cHQ7LypsaW5lLWhlaWdodDoxMS4wcHQ7Ki9mb250LXNpemU6MTAuMHB0O2ZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFnZTogNTJf
-WmlmZmVyX2UxIC0gZTMgKi8KcC5aaWZmZXJFMSwgcC5aaWZmZXJFMiwgcC5aaWZm
-ZXJFMyB7bWFyZ2luLXRvcDoyLjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7Zm9u
-dC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjt9Ci8q
-IEZvcm1hdHZvcmxhZ2U6IDUyX1ppZmZlcl9taXRfQmV0cmFnICovCnAuWmlmZmVy
-TWl0QmV0cmFnIHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdp
-bi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7
-cHVuY3R1YXRpb24td3JhcDpzaW1wbGU7dGV4dC1hdXRvc3BhY2U6bm9uZTtmb250
-LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyog
-Rm9ybWF0dm9ybGFnZTogNTJhVF9aaWZmZXJfbWl0X0JldHJhZ19UR1VFICovCnAu
-WmlmZmVyTWl0QmV0cmFnVEdVRSB7bWFyZ2luLXRvcDowY207bWFyZ2luLXJpZ2h0
-OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWln
-aHQ6MTEuMHB0O3B1bmN0dWF0aW9uLXdyYXA6c2ltcGxlO3RleHQtYXV0b3NwYWNl
-Om5vbmU7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDUzX0xpdGVyYV9lMSAtIGUzICovCnAu
-TGl0ZXJhRTEsIHAuTGl0ZXJhRTIsIHAuTGl0ZXJhRTMge21hcmdpbi10b3A6Mi4w
-cHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVm
-dDowY207bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1M19M
-aXRlcmFfbWl0X0JldHJhZyAqLwpwLkxpdGVyYU1pdEJldHJhZyB7bWFyZ2luLXRv
-cDowY207bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4t
-bGVmdDowY207bGluZS1oZWlnaHQ6MTEuMHB0O3B1bmN0dWF0aW9uLXdyYXA6c2lt
-cGxlO3RleHQtYXV0b3NwYWNlOm5vbmU7Zm9udC1zaXplOjEwLjBwdDtmb250LWZh
-bWlseToiVGltZXMgTmV3IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDUzYVRf
-TGl0ZXJhX21pdF9CZXRyYWdfVEdVRSAqLwpwLkxpdGVyYU1pdEJldHJhZ1RHVUUg
-e21hcmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTow
-Y207bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwdW5jdHVhdGlv
-bi13cmFwOnNpbXBsZTt0ZXh0LWF1dG9zcGFjZTpub25lO2ZvbnQtc2l6ZToxMC4w
-cHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3Js
-YWdlOiA1NF9TdWJsaXRlcmFfZTEgLSBlMyAqLwpwLlN1YmxpdGVyYUUxLCBwLlN1
-YmxpdGVyYUUyLCBwLlN1YmxpdGVyYUUzIHttYXJnaW4tdG9wOjIuMHB0O21hcmdp
-bi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO2xp
-bmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJU
-aW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFnZTogNTRfU3VibGl0ZXJh
-X21pdF9CZXRyYWcgKi8KcC5TdWJsaXRlcmFNaXRCZXRyYWcge21hcmdpbi10b3A6
-MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxl
-ZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwdW5jdHVhdGlvbi13cmFwOnNpbXBs
-ZTt0ZXh0LWF1dG9zcGFjZTpub25lO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1NGFUX1N1
-YmxpdGVyYV9taXRfQmV0cmFnX1RHVUUgKi8KcC5TdWJsaXRlcmFNaXRCZXRyYWdU
-R1VFIHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0
-b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7cHVuY3R1
-YXRpb24td3JhcDpzaW1wbGU7dGV4dC1hdXRvc3BhY2U6bm9uZTtmb250LXNpemU6
-MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0
-dm9ybGFnZTogNTRhX1N0cmljaF9lMSAtIGU3ICovCnAuU3RyaWNoRTEsIHAuU3Ry
-aWNoRTIsIHAuU3RyaWNoRTMsIHAuU3RyaWNoRTQsIHAuU3RyaWNoRTUsIHAuU3Ry
-aWNoRTYsIHAuU3RyaWNoRTcge21hcmdpbi10b3A6Mi4wcHQ7bWFyZ2luLXJpZ2h0
-OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWln
-aHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1NV9TY2hsdXNzdGVpbEFicywg
-NTZfU2NobHVzc3RlaWxaaWZmLCA1N19TY2hsdXNzdGVpbExpdCovCnAuU2NobHVz
-c3RlaWxBYnMsIHAuU2NobHVzc3RlaWxaaWZmLCBwLlNjaGx1c3N0ZWlsTGl0IHtt
-YXJnaW46MGNtOyBsaW5lLWhlaWdodDoxMS4wcHQ7IGZvbnQtc2l6ZToxMC4wcHQ7
-IGZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFn
-ZTogNjFfVGFiVGV4dCAqLwpwLlRhYlRleHQge21hcmdpbjowY207bGluZS1oZWln
-aHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Y29sb3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdlOiA2MWFfVGFi
-VGV4dFJlY2h0c2IgKi8KcC5UYWJUZXh0UmVjaHRzYiB7bWFyZ2luOjBjbTt0ZXh0
-LWFsaWduOnJpZ2h0O2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0
-O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO30KLyog
-Rm9ybWF0dm9ybGFnZTogNjFiX1RhYlRleHRaZW50cmllcnQgKi8KcC5UYWJUZXh0
-WmVudHJpZXJ0IHttYXJnaW46MGNtO3RleHQtYWxpZ246Y2VudGVyO2xpbmUtaGVp
-Z2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iO2NvbG9yOmJsYWNrO30KLyogRm9ybWF0dm9ybGFnZTogNjFjX1Rh
-YlRleHRCbG9jayAqLwpwLlRhYlRleHRCbG9jayB7bWFyZ2luOjBjbTt0ZXh0LWFs
-aWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7fQovKiBG
-b3JtYXR2b3JsYWdlOiA2Ml9Lb3BmemVpbGUgKi8KcC5Lb3BmemVpbGUge21hcmdp
-bi10b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTtt
-YXJnaW4tbGVmdDowY207Lyp0ZXh0LWFsaWduOmp1c3RpZnk7Ki9saW5lLWhlaWdo
-dDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3
-IFJvbWFuIjtjb2xvcjogI0MwQzBDMDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDYzX0Z1
-w596ZWlsZSAqLwpwLkZ1c3N6ZWlsZSB7bWFyZ2luLXRvcDoxMC4wcHQ7bWFyZ2lu
-LXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207Lyp0
-ZXh0LWFsaWduOmp1c3RpZnk7Ki9saW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXpl
-OjkuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOiAjQzBD
-MEMwO30KLyogRm9ybWF0dm9ybGFnZTogNjRfRk5fTGluaWUgKi8KcC5GTkxpbmll
-IHttYXJnaW4tdG9wOjExLjBwdDttYXJnaW4tcmlnaHQ6MTMuMGNtO21hcmdpbi1i
-b3R0b206MS4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtw
-YWRkaW5nOjBjbTtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2JvcmRlci1ib3R0b20tc3R5bGU6IHNvbGlk
-O2JvcmRlci1ib3R0b20tY29sb3I6IEdyYXk7Ym9yZGVyLWJvdHRvbS13aWR0aDog
-MXB4O30KLyogRm9ybWF0dm9ybGFnZTogNjVfRk5fVGV4dCAqLwpwLkZOVGV4dCB7
-bWFyZ2luOjBjbTt0ZXh0LWFsaWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0
-O2ZvbnQtc2l6ZTo5LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtj
-b2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDY2X0ZOX1plaWNoZW4gKi8K
-c3Bhbi5GTlplaWNoZW4ge3ZlcnRpY2FsLWFsaWduOnN1cGVyOyBMQVlPVVQtR1JJ
-RC1NT0RFOiBsaW5lO30KLyogRm9ybWF0dm9ybGFnZTogNjhfVW50ZXJzY2hyTCAq
-LwpwLlVudGVyc2Nockwge21hcmdpbi10b3A6OC4wcHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207dGV4dC1hbGlnbjps
-ZWZ0O2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFt
-aWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJv
-bGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA2OV9VbnRlcnNjaHJNICovCnAuVW50ZXJz
-Y2hyTSB7bWFyZ2luLXRvcDo4LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmNlbnRlcjtsaW5l
-LWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGlt
-ZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xkO30KLyog
-Rm9ybWF0dm9ybGFnZTogNzFfQW5sYWdlbmJleiAqLwpwLkFubGFnZW5iZXoge21h
-cmdpbi10b3A6OC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBj
-bTttYXJnaW4tbGVmdDowY207Lyp0ZXh0LWFsaWduOnJpZ2h0OyovbGluZS1oZWln
-aHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1h
-dHZvcmxhZ2U6IDgxX0VybFVlYmVyc2NoclogKi8KcC5FcmxVZWJlcnNjaHJaIHtt
-YXJnaW4tdG9wOjE2LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206
-MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyovbGluZS1o
-ZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1zaXplOjEx
-LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztm
-b250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9ybGFnZTogODJfRXJsVWViZXJz
-Y2hyTCAqLwpwLkVybFVlYmVyc2Nockwge21hcmdpbi10b3A6NC4wcHQ7bWFyZ2lu
-LXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207Lyp0
-ZXh0LWFsaWduOmp1c3RpZnk7Ki9saW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVh
-ay1hZnRlcjphdm9pZDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBG
-b3JtYXR2b3JsYWdlOiA4M19FcmxUZXh0ICovCnAuRXJsVGV4dCB7bWFyZ2luLXRv
-cDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdp
-bi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjEx
-LjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9t
-YW4iO30KLyogRm9ybWF0dm9ybGFnZTogODVfRXJsQXVmemFlaGxnIC0gbm9jaCBu
-aWNodCBmZXJ0aWcgKi8KcC5FcmxBdWZ6YWVobGcge21hcmdpbi10b3A6NC4wcHQ7
-bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDow
-Y207dGV4dC1hbGlnbjpqdXN0aWZ5O2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNp
-emU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJs
-YWNrO30KLyogRm9ybWF0dm9ybGFnZTogODlfVEdVRV9VZWJlcnNjaHJTcGFsdGUq
-LwpwLlRHVUVVZWJlcnNjaHJTcGFsdGUge21hcmdpbi10b3A6NC4wcHQ7bWFyZ2lu
-LXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207Lyp0
-ZXh0LWFsaWduOmNlbnRlcjsqL2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdlLWJyZWFr
-LWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKiovCi8qIEZvcm1hdHZvcmxhZ2VuIGZ1ZXIgWmVpY2hlbmZvcm1h
-dGllcnVuZyAgICAgICAgICAgICAgICAgICAgICovCi8qKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5MF9GZWhsZXIgKi8Kc3Bhbi5GZWhsZXIge2Nv
-bG9yOiByZWQ7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTFfR2xkU3ltYm9sICovCnNw
-YW4uR2xkU3ltYm9sIHtmb250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9ybGFn
-ZTogOTkyX05vcm1hbCAqLwpzcGFuLk5vcm1hbCB7Zm9udC1zdHlsZTogbm9ybWFs
-O30KLyogRm9ybWF0dm9ybGFnZTogOTkzX0ZldHQgKi8Kc3Bhbi5GZXR0IHtmb250
-LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9ybGFnZTogOTk0X0t1cnNpdiAqLwpz
-cGFuLkt1cnNpdiB7Zm9udC1zdHlsZTppdGFsaWM7fQovKiBGb3JtYXR2b3JsYWdl
-OiA5OTVfVW50ZXJzdHJpY2hlbiAqLwpzcGFuLlVudGVyc3RyaWNoZW4ge3RleHQt
-ZGVjb3JhdGlvbjp1bmRlcmxpbmU7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTZfR2Vz
-cGVycnQgKi8Kc3Bhbi5HZXNwZXJydCB7bGV0dGVyLXNwYWNpbmc6MS4zcHQ7fQov
-KiBGb3JtYXR2b3JsYWdlOiA5OTdfSG9jaCAqLwpzcGFuLkhvY2gge2xpbmUtaGVp
-Z2h0OiA2MCU7IGZvbnQtc2l6ZTogNjAlOyB2ZXJ0aWNhbC1hbGlnbjpzdXBlcjt9
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5OF9UaWVmICovCnNwYW4uVGllZiB7bGluZS1o
-ZWlnaHQ6IDYwJTsgZm9udC1zaXplOiA2MCU7IHZlcnRpY2FsLWFsaWduOnN1Yjt9
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5OV9GZXR0X3VuZF9LdXJzaXYgKi8Kc3Bhbi5G
-ZXR0dW5kS3Vyc2l2IHtmb250LXdlaWdodDpib2xkOyBmb250LXN0eWxlOml0YWxp
-Yzt9Ci8qIFN0YW5kYXJkdGFic2Nocml0dHdlaXRlIGF1cyBXb3JkICovCnNwYW4u
-U3RhbmRhcmR0YWJ1bGF0b3Ige3dpZHRoOjM1LjQ1cHQ7fQovKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqLwovKiBGb3JtYXR2b3JsYWdlbiBkZXIgUGFybGFtZW50c2RpcmVrdGlvbiAg
-ICAgICAgICAgICAgICAgICAgICAqLwovKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwpwLlBEQWxs
-b25nZSwgbGkuUERBbGxvbmdlLCBkaXYuUERBbGxvbmdlIHttYXJnaW4tdG9wOjE0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MTAuMHB0O21hcmdp
-bi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmNlbnRlcjtmb250LXNpemU6MTQuMHB0O2Zv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2xheW91dC1ncmlkLW1vZGU6bGlu
-ZTt9CnAuUERBbGxvbmdlQiwgbGkuUERBbGxvbmdlQiwgZGl2LlBEQWxsb25nZUIg
-e21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bToxMC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTtmb250
-LXNpemU6MTQuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2xheW91
-dC1ncmlkLW1vZGU6bGluZTt9CnAuUERBbGxvbmdlTCwgbGkuUERBbGxvbmdlTCwg
-ZGl2LlBEQWxsb25nZUwge21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1yaWdodDow
-Y207bWFyZ2luLWJvdHRvbToxMC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2ZvbnQtc2l6
-ZToxNC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGF5b3V0LWdy
-aWQtbW9kZTpsaW5lO30KcC5QREFudHJhZ3Nmb3JtZWwsIGxpLlBEQW50cmFnc2Zv
-cm1lbCwgZGl2LlBEQW50cmFnc2Zvcm1lbCB7bWFyZ2luLXRvcDoxNC4wcHQ7bWFy
-Z2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207
-dGV4dC1hbGlnbjpqdXN0aWZ5O2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6
-MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2xheW91dC1ncmlk
-LW1vZGU6bGluZTt9CnAuUEREYXR1bSwgbGkuUEREYXR1bSwgZGl2LlBERGF0dW0g
-e21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bTowY207bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTtsaW5lLWhl
-aWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7fQpwLlBERW50c2NobGll
-c3N1bmcsIGxpLlBERW50c2NobGllc3N1bmcsIGRpdi5QREVudHNjaGxpZXNzdW5n
-IHttYXJnaW4tdG9wOjguMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bTowY207bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNp
-emU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2xheW91dC1n
-cmlkLW1vZGU6bGluZTtmb250LXdlaWdodDpib2xkO30KcC5QREsxLCBsaS5QREsx
-LCBkaXYuUERLMSB7bWFyZ2luOjBjbTt0ZXh0LWFsaWduOmNlbnRlcjtib3JkZXI6
-bm9uZTtwYWRkaW5nOjBjbTtmb250LXNpemU6MTIuMHB0O2ZvbnQtZmFtaWx5OiJU
-aW1lcyBOZXcgUm9tYW4iO2xldHRlci1zcGFjaW5nOi0uNHB0O2ZvbnQtd2VpZ2h0
-OmJvbGQ7fQpwLlBESzFBbmxhZ2UsIGxpLlBESzFBbmxhZ2UsIGRpdi5QREsxQW5s
-YWdlIHttYXJnaW46MGNtO3RleHQtYWxpZ246cmlnaHQ7Zm9udC1zaXplOjEyLjBw
-dDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtsZXR0ZXItc3BhY2luZzot
-LjRwdDtmb250LXdlaWdodDpib2xkO30KcC5QREsxQXVzZywgbGkuUERLMUF1c2cs
-IGRpdi5QREsxQXVzZyB7bWFyZ2luLXRvcDo2Mi45cHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjI3LjBwdDttYXJnaW4tbGVmdDowY207Zm9udC1zaXpl
-OjExLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtmb250LXdlaWdo
-dDpib2xkO30KcC5QREsyLCBsaS5QREsyLCBkaXYuUERLMiB7bWFyZ2luLXRvcDow
-Y207bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjExLjM1cHQ7bWFyZ2lu
-LWxlZnQ6MGNtO2ZvbnQtc2l6ZToyMi4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAuUERLMywgbGkuUERLMywgZGl2
-LlBESzMge21hcmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJv
-dHRvbToyMC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2ZvbnQtc2l6ZToxOC4wcHQ7Zm9u
-dC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAu
-UERLNCwgbGkuUERLNCwgZGl2LlBESzQge21hcmdpbi10b3A6MGNtO21hcmdpbi1y
-aWdodDowY207bWFyZ2luLWJvdHRvbTo2LjBwdDttYXJnaW4tbGVmdDowY207Zm9u
-dC1zaXplOjEzLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtmb250
-LXdlaWdodDpib2xkO30KcC5QREtvcGZ6ZWlsZSwgbGkuUERLb3BmemVpbGUsIGRp
-di5QREtvcGZ6ZWlsZSB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNt
-O21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmp1
-c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGF5b3V0LWdyaWQtbW9kZTpsaW5lO30K
-cC5QRFUxLCBsaS5QRFUxLCBkaXYuUERVMSB7bWFyZ2luLXRvcDoyMi4wcHQ7bWFy
-Z2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207
-bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAuUERVMiwgbGku
-UERVMiwgZGl2LlBEVTIge21hcmdpbi10b3A6NS4wcHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWlnaHQ6
-MTEuMHB0O2ZvbnQtc2l6ZTo5LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjt9CnAuUERWb3JsYWdlLCBsaS5QRFZvcmxhZ2UsIGRpdi5QRFZvcmxhZ2Ug
-e21hcmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTox
-MC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTtsaW5lLWhl
-aWdodDoxMS4wcHQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7Zm9udC13ZWlnaHQ6Ym9s
-ZDt9Cjwvc3R5bGU+CjwvaGVhZD4KPGJvZHk+CjxkaXYgY2xhc3M9InBhcGVydyI+
-CgoKCgo8cCBjbGFzcz0iQkRHZXNCbGF0dCBBbGlnbkNlbnRlciI+QlVOREVTR0VT
-RVRaQkxBVFQ8L3A+CjxwIGNsYXNzPSJSZXBPZXN0ZXJyIEFsaWduQ2VudGVyIj5G
-w5xSIERJRSBSRVBVQkxJSyDDllNURVJSRUlDSDwvcD4KPHRhYmxlIGNsYXNzPSJ0
-b3AgYm90dG9tIHdpMTAwIj4KPHRyPgo8dGQ+CjxwIGNsYXNzPSJBdXNnYWJlRGF0
-ZW4gQWxpZ25MZWZ0Ij5KYWhyZ2FuZyAyMDA2PC9wPgo8L3RkPgo8dGQ+CjxwIGNs
-YXNzPSJBdXNnYWJlRGF0ZW4gQWxpZ25DZW50ZXIiPkF1c2dlZ2ViZW4gYW0gMzAu
-IE1haSAyMDA2PC9wPgo8L3RkPgo8dGQ+CjxwIGNsYXNzPSJBdXNnYWJlRGF0ZW4g
-QWxpZ25SaWdodCI+VGVpbMKgSUk8L3A+CjwvdGQ+CjwvdHI+CjwvdGFibGU+Cjx0
-YWJsZSBjbGFzcz0iYm90dG9tIHdpMTAwIj4KPHRyPgo8dGQgY29sc3Bhbj0iMiI+
-CjxwIGNsYXNzPSJLdXJ6dGl0ZWwxIEFsaWduTGVmdCBWQWxpZ25Ub3AiPjIwNC4g
-VmVyb3JkbnVuZzogw4RuZGVydW5nIGRlciBTY2hpZmZzdGVjaG5pa3Zlcm9yZG51
-bmc8L3A+CjwvdGQ+CjwvdHI+CjwvdGFibGU+CjxwIGNsYXNzPSJUaXRlbCBBbGln
-bkp1c3RpZnkiPjIwNC4gVmVyb3JkbnVuZyBkZXMgQnVuZGVzbWluaXN0ZXJzIGbD
-vHIgVmVya2VociwgSW5ub3ZhdGlvbiB1bmQgVGVjaG5vbG9naWUsIG1pdCBkZXIg
-ZGllIFNjaGlmZnN0ZWNobmlrdmVyb3JkbnVuZyBnZcOkbmRlcnQgd2lyZDwvcD4K
-PHAgY2xhc3M9IlByb21LbEVpbmxTYXR6IEFsaWduSnVzdGlmeSI+QXVmIEdydW5k
-IGRlcyDCp8KgMTA5IEFicy7CoDcgZGVzIFNjaGlmZmZhaHJ0c2dlc2V0emVzLCBC
-R0JsLsKgSSBOci7CoDYyLzE5OTcgaW4gZGVyIEZhc3N1bmcgQkdCbC7CoEkgTnIu
-wqAxMjMvMjAwNSwgd2lyZCB2ZXJvcmRuZXQ6PC9wPgo8cCBjbGFzcz0iTm92QW8x
-IEFsaWduSnVzdGlmeSI+RGVtIMKnwqAyNiBkZXIgU2NoaWZmc3RlY2huaWt2ZXJv
-cmRudW5nLCBCR0JsLiBOci7CoDQ1MC8xOTkzLCB6dWxldHp0IGdlw6RuZGVydCBk
-dXJjaCBCR0JsLsKgSUkgTnIuwqAxOTYvMTk5Nywgd2VyZGVuIGZvbGdlbmRlIEFi
-c8OkdHplIDggdW5kIDkgYW5nZWbDvGd0OjwvcD4KPHAgY2xhc3M9IkFicyBBbGln
-bkp1c3RpZnkiPgrigJ4oOCkgTW90b3JlbiBkZXIgS2F0ZWdvcmllbiBWIDE6MSwg
-ViAxOjIgdW5kIFYgMTozIGdlbcOkw58gVmVyb3JkbnVuZyBkZXMgQnVuZGVzbWlu
-aXN0ZXJzIGbDvHIgV2lydHNjaGFmdCB1bmQgQXJiZWl0IMO8YmVyIE1hw59uYWht
-ZW4genVyIEJla8OkbXBmdW5nIGRlciBFbWlzc2lvbiB2b24gZ2FzZsO2cm1pZ2Vu
-IFNjaGFkc3RvZmZlbiB1bmQgbHVmdHZlcnVucmVpbmlnZW5kZW4gUGFydGlrZWxu
-IGF1cyBWZXJicmVubnVuZ3Ntb3RvcmVuIGbDvHIgbW9iaWxlIE1hc2NoaW5lbiB1
-bmQgR2Vyw6R0ZSwgQkdCbC7CoElJIE5yLsKgMTM2LzIwMDUsIGTDvHJmZW4gbmFj
-aCBkZW0gMzEuwqBEZXplbWJlciAyMDA2IG51ciBhbHMgSGF1cHQtIG9kZXIgSGls
-ZnNtYXNjaGluZW4gaW4gRmFocnpldWdlLCBhdXNnZW5vbW1lbiBLbGVpbmZhaHJ6
-ZXVnZSwgZWluZ2ViYXV0IHdlcmRlbiwgd2VubiBzaWUgw7xiZXIgZWluZSBUeXBn
-ZW5laG1pZ3VuZyBnZW3DpMOfIMKnwqAxMCBBYnNhdHogM2UgZGllc2VyIFZlcm9y
-ZG51bmcgdmVyZsO8Z2VuLjwvcD4KPHAgY2xhc3M9IkFicyBBbGlnbkp1c3RpZnki
-Pig5KSBNb3RvcmVuIGRlciBLYXRlZ29yaWVuIFYgMTo0IHVuZCBWIDIgZ2Vtw6TD
-nyBWZXJvcmRudW5nIGRlcyBCdW5kZXNtaW5pc3RlcnMgZsO8ciBXaXJ0c2NoYWZ0
-IHVuZCBBcmJlaXQgw7xiZXIgTWHDn25haG1lbiB6dXIgQmVrw6RtcGZ1bmcgZGVy
-IEVtaXNzaW9uIHZvbiBnYXNmw7ZybWlnZW4gU2NoYWRzdG9mZmVuIHVuZCBsdWZ0
-dmVydW5yZWluaWdlbmRlbiBQYXJ0aWtlbG4gYXVzIFZlcmJyZW5udW5nc21vdG9y
-ZW4gZsO8ciBtb2JpbGUgTWFzY2hpbmVuIHVuZCBHZXLDpHRlLCBCR0JsLsKgSUkg
-TnIuwqAxMzYvMjAwNSwgZMO8cmZlbiBuYWNoIGRlbSAzMS7CoERlemVtYmVyIDIw
-MDggbnVyIGFscyBIYXVwdC0gb2RlciBIaWxmc21hc2NoaW5lbiBpbiBGYWhyemV1
-Z2UsIGF1c2dlbm9tbWVuIEtsZWluZmFocnpldWdlLCBlaW5nZWJhdXQgd2VyZGVu
-LCB3ZW5uIHNpZSDDvGJlciBlaW5lIFR5cGdlbmVobWlndW5nIGdlbcOkw58gwqfC
-oDEwIEFic2F0eiAzZSBkaWVzZXIgVmVyb3JkbnVuZyB2ZXJmw7xnZW4u4oCcCjwv
-cD4KPHAgY2xhc3M9IlVudGVyc2NockwiPkdvcmJhY2g8L3A+Cgo8cCBjbGFzcz0i
-RnVzc3plaWxlIEFsaWduSnVzdGlmeSI+d3d3LnJpcy5ia2EuZ3YuYXQ8L3A+Cjwv
-ZGl2Pgo8L2JvZHk+Cgo8L2h0bWw+</sl11:Base64Content></sl11:HashInputData><sl11:SignatureCheck><sl11:Code>0</sl11:Code></sl11:SignatureCheck><sl11:SignatureManifestCheck><sl11:Code>98</sl11:Code></sl11:SignatureManifestCheck><sl11:SignatureManifestCheck><sl11:Code>0</sl11:Code></sl11:SignatureManifestCheck><sl11:CertificateCheck><sl10:Code>1</sl10:Code></sl11:CertificateCheck></sl11:VerifyXMLSignatureResponse>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyResponse.204_2006.utf8.xml b/spss.slinterface/test/moa-wartung-la9/verifyResponse.204_2006.utf8.xml
deleted file mode 100644
index 3cd93450a..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyResponse.204_2006.utf8.xml
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl11:VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" 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:SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Christian Wregar,OU=Verfassungsdienst,O=Bundeskanzleramt der Republik \C3\96sterreich,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=a-sign-corporate-light-01,OU=a-sign-corporate-light-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>21221</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIE4TCCA8mgAwIBAgICUuUwDQYJKoZIhvcNAQEFBQAwgZ8xCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIjAgBgNVBAsTGWEtc2lnbi1jb3Jw
-b3JhdGUtbGlnaHQtMDExIjAgBgNVBAMTGWEtc2lnbi1jb3Jwb3JhdGUtbGlnaHQt
-MDEwHhcNMDMxMjEwMTcyMzA3WhcNMDYxMjEwMTcyMzA3WjCBnzELMAkGA1UEBhMC
-QVQxWTBXBgNVBAoeUABCAHUAbgBkAGUAcwBrAGEAbgB6AGwAZQByAGEAbQB0ACAA
-ZABlAHIAIABSAGUAcAB1AGIAbABpAGsAIADWAHMAdABlAHIAcgBlAGkAYwBoMRow
-GAYDVQQLExFWZXJmYXNzdW5nc2RpZW5zdDEZMBcGA1UEAxMQQ2hyaXN0aWFuIFdy
-ZWdhcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv7Z6w9XhQLoIxipExnL7
-go/rp5Leh/y0E8mjS7XKe4acgmb/+p7cyAIzDjSY4Jse4xz9cKb+0hrEyKJjvR61
-Tl4lJxQsdYan3rLqcruPlC0GRkAgiiRdLwvAaAUBqzYxzTjKvdZBdcnuY+S2Ad1Z
-5N5zAF2XRzykcsmLRZvpvJ8CAwEAAaOCAacwggGjMAkGA1UdEwQCMAAwEQYDVR0O
-BAoECEhNunRQSAFFMF0GA1UdIARWMFQwUgYHKigAEQEOATBHMEUGCCsGAQUFBwIB
-FjlodHRwOi8vd3d3LmEtdHJ1c3QuYXQvZG9jcy9jcC9hc2lnbi1nb3Zlcm5tZW50
-LXNlcnZlci5wZGYwEwYDVR0jBAwwCoAITp5/1C/JHx8wfwYIKwYBBQUHAQEEczBx
-MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRydXN0LmF0L29jc3AwRgYIKwYB
-BQUHMAKGOmh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNpZ24tY29ycG9y
-YXRlLWxpZ2h0LTAxYS5jcnQwDgYDVR0PAQH/BAQDAgeAMG4GA1UdHwRnMGUwY6Bh
-oF+GXWxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1s
-aWdodC0wMSxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0
-PzAOBgcqKAAKAQEBBAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFIWZVsrHNwZDSkE
-44Cyc1cCJU49CrjsX7OPG43notq9JPRPMvbVAOrN3g0H8x2oOSYoxscKut1IqLxc
-xUVKYuCZEQBj0FZTYLFIuK8//vPOwmTSTBKMjKZpkkxfdcM5JX+nGdJgfqndjqPw
-e9lZ213EMIEfEf1Nfr5R0MNk1uCUg9diqEpDcUdVks2KN4/zQVuNRlGFgM+y8E2N
-VFopTtCBhSj6nuxeIbpbEOmjuAfF5zoVAJg4nj4DKJC8oiaY+KR+817fXpHclzxd
-f1s0aVpqdOf7Dc0FXjrCBGKpyjcN4Qj9zioy5J6awkiWDF9CQICxwt4TYB1lS8Vx
-Z+ghQ0g=</dsig:X509Certificate><moa:PublicAuthority/></dsig:X509Data></sl11:SignerInfo><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>PGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgo8aGVh
-ZD4KPHRpdGxlPmVSZWNodCBEb2t1bWVudCAoMS45LjApPC90aXRsZT4KPHN0eWxl
-IHR5cGU9InRleHQvY3NzIj4KICAgICAgICAuVzM4IHsgd2lkdGg6MzhweDsgfQog
-ICAgICAgIC5XMTUgeyB3aWR0aDoxNXB4OyB9CiAgICAgICAgLlcyMiB7IHdpZHRo
-OjIycHg7IH0KICAgICAgICAuVzkwIHsgd2lkdGg6OTBweDsgfQogICAgICAgIC53
-aTEwMCB7IHdpZHRoOjEwMCU7IH0KICAgICAgICAuV0VybCB7IHdpZHRoOjE1cHg7
-IH0KICAgICAgICAuRTFTcDIgeyB3aWR0aDo1NTcuM3B4OyB9CiAgICAgICAgLkUy
-U3AyIHsgd2lkdGg6NTQyLjNweDsgfQogICAgICAgIC5FM1NwMiB7IHdpZHRoOjUy
-MC4zcHg7IH0KICAgICAgICAuRTRTcDIgeyB3aWR0aDo0OTguMjk5OTk5OTk5OTk5
-OTVweDsgfQogICAgICAgIC5FNVNwMiB7IHdpZHRoOjQ3Ni4yOTk5OTk5OTk5OTk5
-NXB4OyB9CiAgICAgICAgLkVybFNwMiB7IHdpZHRoOjU3MC4zcHg7IH0KICAgICAg
-ICAuRTFTcDJRIHsgd2lkdGg6ODAzLjlweDsgfQogICAgICAgIC5FMlNwMlEgeyB3
-aWR0aDo3ODguOXB4OyB9CiAgICAgICAgLkUzU3AyUSB7IHdpZHRoOjc2Ni45cHg7
-IH0KICAgICAgICAuRTRTcDJRIHsgd2lkdGg6NzQ0LjlweDsgfQogICAgICAgIC5F
-NVNwMlEgeyB3aWR0aDo3MjIuOXB4OyB9CiAgICAgICAgLkVybFNwMlEgeyB3aWR0
-aDo4MTYuOXB4OyB9CiAgICAgICAgLkUxU3AyQiB7IHdpZHRoOjM3Ny4yOTk5OTk5
-OTk5OTk5NXB4OyB9CiAgICAgICAgLkUyU3AyQiB7IHdpZHRoOjM2Mi4yOTk5OTk5
-OTk5OTk5NXB4OyB9CiAgICAgICAgLkUzU3AyQiB7IHdpZHRoOjM0MC4yOTk5OTk5
-OTk5OTk5NXB4OyB9CiAgICAgICAgLkUxU3AyQlEgeyB3aWR0aDo2MjMuOXB4OyB9
-CiAgICAgICAgLkUyU3AyQlEgeyB3aWR0aDo2MDguOXB4OyB9CiAgICAgICAgLkUz
-U3AyQlEgeyB3aWR0aDo1ODYuOXB4OyB9CiAgICAgICAgLlRleHRXaWR0aHsgd2lk
-dGg6Mjk2LjI5OTk5OTk5OTk5OTk1cHg7IH0KICAgICAgICAuVGV4dFdpZHRoUXsg
-d2lkdGg6NTQyLjlweDsgfQogICAgICAgIC5pbnZpc2libGV7IGhlaWdodDogMHB0
-IH0KCQkJCWludmlzaWJsZQoJCQkJCiAgICAgICAgLm5leHRwYWdlIHsgcGFnZS1i
-cmVhay1iZWZvcmU6YWx3YXlzOyB9CiAgICAgICAgLm1hcmdpbnMge21hcmdpbi10
-b3A6ODUuMDVwdDttYXJnaW4tcmlnaHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1
-LjA1cHQ7bWFyZ2luLWxlZnQ6ODUuMDVwdDt9CiAgICAgICAgQG1lZGlhIHNjcmVl
-biB7IC5wYXBlcncge3dpZHRoOjU5NS4zcHg7bWFyZ2luLXRvcDo4NS4wNXB0O21h
-cmdpbi1yaWdodDo4NS4wNXB0O21hcmdpbi1ib3R0b206ODUuMDVwdDttYXJnaW4t
-bGVmdDo4NS4wNXB0O319CiAgICAgICAgQG1lZGlhIHByaW50IHsgLnBhcGVydyB7
-d2lkdGg6NTk1LjNweDttYXJnaW4tdG9wOjAuMHB0O21hcmdpbi1yaWdodDowLjBw
-dDttYXJnaW4tYm90dG9tOjAuMHB0O21hcmdpbi1sZWZ0OjAuMHB0O3NpemU6cG9y
-dHJhaXQ7fX0KICAgICAgICBAbWVkaWEgc2NyZWVuIHsgLnBhcGVyaCB7d2lkdGg6
-ODQxLjlweDttYXJnaW4tcmlnaHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1
-cHQ7bWFyZ2luLWxlZnQ6ODUuMDVwdDttYXJnaW4tdG9wOjg1LjA1cHQ7fX0KICAg
-ICAgICBAbWVkaWEgcHJpbnQgeyAucGFwZXJoIHt3aWR0aDo4NDEuOXB4O21hcmdp
-bi10b3A6MC4wcHQ7bWFyZ2luLXJpZ2h0OjAuMHB0O21hcmdpbi1ib3R0b206MC4w
-cHQ7bWFyZ2luLWxlZnQ6MC4wcHQ7c2l6ZTpsYW5kc2NhcGV9fQovKiBBbGxnZW1l
-aW5lIEFuZ2FiZW4genVtIEFuemVpZ2VuIHZvbiBMaW5pZW4gaW4gVGFiZWxsZW4g
-ICAgICAqLwovKgpAcGFnZSA6bGVmdCB7c2l6ZTogMjFjbSAyOS43Y207bWFyZ2lu
-LWxlZnQ6IDJjbTttYXJnaW4tcmlnaHQ6IDJjbTttYXJrczpjcm9wO30KQHBhZ2Ug
-OnJpZ2h0IHtzaXplOiAyMWNtIDI5LjdjbTttYXJnaW4tbGVmdDogMmNtO21hcmdp
-bi1yaWdodDogMmNtO21hcmtzOmNyb3A7fQoqLwp0YWJsZS50b3Age2JvcmRlci10
-b3Atc3R5bGU6IHNvbGlkO2JvcmRlci10b3Atd2lkdGg6IHRoaW47Ym9yZGVyLWNv
-bG9yOiBibGFjazt9CnRhYmxlLmJvdHRvbSB7Ym9yZGVyLWJvdHRvbS1zdHlsZTog
-c29saWQ7Ym9yZGVyLWJvdHRvbS13aWR0aDogdGhpbjtib3JkZXItY29sb3I6IGJs
-YWNrO30KdGQudG9wIHtib3JkZXItdG9wLXN0eWxlOnNvbGlkO2JvcmRlci10b3At
-d2lkdGg6MXB0O30KdGQucmlnaHQge2JvcmRlci1yaWdodC1zdHlsZTpzb2xpZDti
-b3JkZXItcmlnaHQtd2lkdGg6MXB0O30KdGQuYm90dG9tIHtib3JkZXItYm90dG9t
-LXN0eWxlOnNvbGlkO2JvcmRlci1ib3R0b20td2lkdGg6MXB0O30KdGQubGVmdCB7
-Ym9yZGVyLWxlZnQtc3R5bGU6c29saWQ7Ym9yZGVyLWxlZnQtd2lkdGg6MXB0O30K
-LypUZXh0IGlubmVyaGFsYiBlaW5lciBUYWJlbGxlbnplbGxlIGZ1ZXIgImFic2F0
-eiIgdW5kICJ1ZWJlcnNjaHJpZnQiKi8KLkFsaWduTGVmdCB7dGV4dC1hbGlnbjps
-ZWZ0O30KLkFsaWduUmlnaHQge3RleHQtYWxpZ246cmlnaHQ7fQouQWxpZ25DZW50
-ZXIge3RleHQtYWxpZ246Y2VudGVyO30KLkFsaWduSnVzdGlmeSB7dGV4dC1hbGln
-bjpqdXN0aWZ5O30KLlZBbGlnblRvcCB7dmVydGljYWwtYWxpZ246dG9wO30KLlZB
-bGlnbkJvdHRvbSB7dmVydGljYWwtYWxpZ246Ym90dG9tO30KLyoqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKi8KLyogTGVnaXN0aWstU3RhbmRhcmQtRm9ybWF0dm9ybGFnZSAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgKi8KLyogRm9ybWF0dm9ybGFnZTogMDBfTGVn
-U3RhbmRhcmQgKi8KLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLkxlZ1N0YW5kYXJkIHsKdGV4
-dC1hbGlnbjpqdXN0aWZ5Oy8qT0sqLwpsaW5lLWhlaWdodDoxMS4wcHQ7CmZvbnQt
-c2l6ZToxMC4wcHQ7CmZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyoq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKi8KLyogRm9ybWF0dm9ybGFnZW4gZnVlciBBYnNhZXR6ZSAg
-ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKi8KLyoqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-Ki8KLyogRm9ybWF0dm9ybGFnZTogMDFfVW5kZWZpbmllcnQgKi8KcC5VbmRlZmlu
-aWVydCB7bWFyZ2luLXRvcDoxLjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmp1c3RpZnk7LypP
-SyovbGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6IHJlZDt9Ci8qIEZvcm1hdHZvcmxh
-Z2U6IDAyX0JER2VzQmxhdHQgKi8KcC5CREdlc0JsYXR0IHttYXJnaW4tdG9wOjE0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1s
-ZWZ0OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyovbGluZS1oZWlnaHQ6MzUuMHB0
-O2ZvbnQtc2l6ZTozNS4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7
-Y29sb3I6YmxhY2s7dGV4dC10cmFuc2Zvcm06dXBwZXJjYXNlO2xldHRlci1zcGFj
-aW5nOjEuM3B0O2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiAw
-M19SZXBPZXN0ZXJyICovCnAuUmVwT2VzdGVyciB7bWFyZ2luLXRvcDo2LjBwdDtt
-YXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBj
-bTttYXJnaW4tYm90dG9tOjEyLjBwdDsvKnRleHQtYWxpZ246Y2VudGVyOyovbGlu
-ZS1oZWlnaHQ6MjAuMHB0O2JvcmRlcjpub25lO3BhZGRpbmc6MGNtO2ZvbnQtc2l6
-ZToyMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6Ymxh
-Y2s7dGV4dC10cmFuc2Zvcm06dXBwZXJjYXNlO2xldHRlci1zcGFjaW5nOjEuMHB0
-O2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiAwNF9BdXNnYWJl
-RGF0ZW4gKi8KcC5BdXNnYWJlRGF0ZW4ge21hcmdpbi10b3A6MGNtO21hcmdpbi1y
-aWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO2xpbmUt
-aGVpZ2h0OjE0LjBwdDtwYWRkaW5nOjBjbTtmb250LXNpemU6MTIuMHB0O2ZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOiBibGFjaztmb250LXdlaWdo
-dDpib2xkO30KLyogRm9ybWF0dm9ybGFnZTogMDVfS3VyenRpdGVsCkt1cnp0aXRl
-bCBpbiBlaW5lciBTcGFsdGUgKHdlbm4ga2VpbiBUQUIgdm9yaGFuZGVuIGlzdCkg
-Ki8KcC5LdXJ6dGl0ZWwxIHttYXJnaW4tdG9wOjIuMHB0O21hcmdpbi1yaWdodDog
-MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OiAzLjZjbTsvKnRleHQt
-YWxpZ246anVzdGlmeTsqL3RleHQtaW5kZW50OiAtMy42Y207Ym9yZGVyOm5vbmU7
-cGFkZGluZzowY207Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xkO30KLyogS3Vy
-enRpdGVsIGluIHp3ZWkgU3BhbHRlbiAod2VubiBlaW4gVEFCIHZvcmhhbmRlbiBp
-c3QpICovCnAuS3VyenRpdGVsMiB7bWFyZ2luLXRvcDoyLjBwdDttYXJnaW4tcmln
-aHQ6IDBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDogMGNtOy8qdGV4
-dC1hbGlnbjpqdXN0aWZ5OyovYm9yZGVyOm5vbmU7cGFkZGluZzowY207Zm9udC1z
-aXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpi
-bGFjaztmb250LXdlaWdodDpib2xkO30Kc3Bhbi5LdXJ6dGl0ZWxicmVpdGUge3dp
-ZHRoOiAzLjRjbTt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDA5X0Fic3RhbmQgKi8KcC5B
-YnN0YW5kIHttYXJnaW46Ni4wcHQ7bWFyZ2luLWJvdHRvbTo2LjBwdDtsaW5lLWhl
-aWdodDoxMC4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtjb2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDEwX0Vu
-dHd1cmYgKi8KcC5FbnR3dXJmIHttYXJnaW4tdG9wOjgwLjBwdDttYXJnaW4tcmln
-aHQ6MGNtO21hcmdpbi1ib3R0b206NjQuMHB0O21hcmdpbi1sZWZ0OjBjbTsvKnRl
-eHQtYWxpZ246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZTox
-MC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGV0dGVyLXNwYWNp
-bmc6MS4zcHQ7fQovKiBGb3JtYXR2b3JsYWdlOiAxMV9UaXRlbCAqLwpwLlRpdGVs
-IHttYXJnaW4tdG9wOjI0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0
-b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL2xp
-bmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJU
-aW1lcyBOZXcgUm9tYW4iO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3Js
-YWdlOiAxMl9Qcm9tS2xfRWlubFNhdHogKi8JCnAuUHJvbUtsRWlubFNhdHoge21h
-cmdpbi10b3A6OC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBj
-bTttYXJnaW4tbGVmdDowY207Lyp0ZXh0LWFsaWduOmp1c3RpZnk7Ki90ZXh0LWlu
-ZGVudDoxOS44NXB0O2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdlLWJyZWFrLWFmdGVy
-OmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBS
-b21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiAxOF9BYmJpbGR1bmdfb2Rlcl9PYmpl
-a3QgKi8KcC5BYmJpbGR1bmdvZGVyT2JqZWt0IHttYXJnaW4tdG9wOjYuMHB0O21h
-cmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTo2LjBwdDttYXJnaW4tbGVmdDow
-Y207Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFu
-Ijtjb2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDE5X0Jlc2NocmlmdHVu
-ZyAqLwpwLkJlc2NocmlmdHVuZyB7bWFyZ2luLXRvcDowY207bWFyZ2luLXJpZ2h0
-OjBjbTttYXJnaW4tYm90dG9tOjYuMHB0O21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhl
-aWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtjb2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDIxX05v
-dkFvMSAqLwpwLk5vdkFvMSB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6
-MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxp
-Z246anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdlLWJyZWFrLWFmdGVy
-OmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBS
-b21hbiI7Zm9udC1zdHlsZTppdGFsaWM7fQovKiBGb3JtYXR2b3JsYWdlOiAyMl9O
-b3ZBbzEgKi8KcC5Ob3ZBbzIge21hcmdpbi10b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0
-OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207Lyp0ZXh0LWFs
-aWduOmp1c3RpZnk7Ki9saW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBw
-dDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtmb250LXN0eWxlOml0YWxp
-Yzt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDIzX1NhdHpfKG5hY2hfTm92YW8pICovCnAu
-U2F0em5hY2hOb3ZhbyB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNt
-O21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246
-anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2Zv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO30KLyogRm9y
-bWF0dm9ybGFnZTogMzBfSW5oYWx0VWViZXJzY2hyaWZ0ICovCnAuSW5oYWx0VWVi
-ZXJzY2hyaWZ0IHttYXJnaW4tdG9wOjE2LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21h
-cmdpbi1ib3R0b206OC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246Y2Vu
-dGVyO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFt
-aWx5OiJUaW1lcyBOZXcgUm9tYW4iO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3Jt
-YXR2b3JsYWdlOiAzMV9JbmhhbHRTcGFsdGUgKi8KcC5JbmhhbHRTcGFsdGUge21h
-cmdpbi10b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjQu
-MHB0O21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVh
-ay1hZnRlcjphdm9pZDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdl
-OiAzMl9JbmhhbHRFaW50cmFnICovCnAuSW5oYWx0RWludHJhZyB7bWFyZ2luLXRv
-cDowY207bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4t
-bGVmdDowY207bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9u
-dC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA0
-MV9VZWJlcnNjaHJHMSAqLwpwLlVlYmVyc2NockcxIHttYXJnaW4tdG9wOjE2LjBw
-dDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0
-OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyovbGluZS1oZWlnaHQ6MTEuMHB0O3Bh
-Z2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWls
-eToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xk
-O30KLyogRm9ybWF0dm9ybGFnZTogNDJfVWViZXJzY2hyRzEtICovCnAuVWViZXJz
-Y2hyRzEtIHttYXJnaW4tdG9wOjguMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2lu
-LWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtOy8qdGV4dC1hbGlnbjpjZW50ZXI7
-Ki9saW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVhay1hZnRlcjphdm9pZDtmb250
-LXNpemU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9y
-OmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA0M19V
-ZWJlcnNjaHJHMiAqLwpwLlVlYmVyc2NockcyIHttYXJnaW4tdG9wOjQuMHB0O21h
-cmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTo0LjBwdDttYXJnaW4tbGVmdDow
-Y207Lyp0ZXh0LWFsaWduOmNlbnRlcjsqL2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdl
-LWJyZWFrLWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6Ym9sZDt9
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDQ0X1VlYmVyc2NockFydCAqLwpwLlVlYmVyc2No
-ckFydCB7bWFyZ2luLXRvcDo4LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyov
-bGluZS1oZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1z
-aXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpi
-bGFjaztmb250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9ybGFnZTogNDVfVWVi
-ZXJzY2hyUGFyYSAqLwpwLlVlYmVyc2NoclBhcmEge21hcmdpbi10b3A6NC4wcHQ7
-bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDow
-Y207Lyp0ZXh0LWFsaWduOmNlbnRlcjsqL2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdl
-LWJyZWFrLWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6Ym9sZDt9
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDUxX0FicyAqLwpwLkFicyB7bWFyZ2luLXRvcDo0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1s
-ZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL3RleHQtaW5kZW50OjE5Ljg1
-cHQ7LypsaW5lLWhlaWdodDoxMS4wcHQ7Ki9mb250LXNpemU6MTAuMHB0O2ZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFnZTogNTJf
-WmlmZmVyX2UxIC0gZTMgKi8KcC5aaWZmZXJFMSwgcC5aaWZmZXJFMiwgcC5aaWZm
-ZXJFMyB7bWFyZ2luLXRvcDoyLjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7Zm9u
-dC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjt9Ci8q
-IEZvcm1hdHZvcmxhZ2U6IDUyX1ppZmZlcl9taXRfQmV0cmFnICovCnAuWmlmZmVy
-TWl0QmV0cmFnIHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdp
-bi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7
-cHVuY3R1YXRpb24td3JhcDpzaW1wbGU7dGV4dC1hdXRvc3BhY2U6bm9uZTtmb250
-LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyog
-Rm9ybWF0dm9ybGFnZTogNTJhVF9aaWZmZXJfbWl0X0JldHJhZ19UR1VFICovCnAu
-WmlmZmVyTWl0QmV0cmFnVEdVRSB7bWFyZ2luLXRvcDowY207bWFyZ2luLXJpZ2h0
-OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWln
-aHQ6MTEuMHB0O3B1bmN0dWF0aW9uLXdyYXA6c2ltcGxlO3RleHQtYXV0b3NwYWNl
-Om5vbmU7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDUzX0xpdGVyYV9lMSAtIGUzICovCnAu
-TGl0ZXJhRTEsIHAuTGl0ZXJhRTIsIHAuTGl0ZXJhRTMge21hcmdpbi10b3A6Mi4w
-cHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVm
-dDowY207bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1M19M
-aXRlcmFfbWl0X0JldHJhZyAqLwpwLkxpdGVyYU1pdEJldHJhZyB7bWFyZ2luLXRv
-cDowY207bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4t
-bGVmdDowY207bGluZS1oZWlnaHQ6MTEuMHB0O3B1bmN0dWF0aW9uLXdyYXA6c2lt
-cGxlO3RleHQtYXV0b3NwYWNlOm5vbmU7Zm9udC1zaXplOjEwLjBwdDtmb250LWZh
-bWlseToiVGltZXMgTmV3IFJvbWFuIjt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDUzYVRf
-TGl0ZXJhX21pdF9CZXRyYWdfVEdVRSAqLwpwLkxpdGVyYU1pdEJldHJhZ1RHVUUg
-e21hcmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTow
-Y207bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwdW5jdHVhdGlv
-bi13cmFwOnNpbXBsZTt0ZXh0LWF1dG9zcGFjZTpub25lO2ZvbnQtc2l6ZToxMC4w
-cHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3Js
-YWdlOiA1NF9TdWJsaXRlcmFfZTEgLSBlMyAqLwpwLlN1YmxpdGVyYUUxLCBwLlN1
-YmxpdGVyYUUyLCBwLlN1YmxpdGVyYUUzIHttYXJnaW4tdG9wOjIuMHB0O21hcmdp
-bi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxlZnQ6MGNtO2xp
-bmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJU
-aW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFnZTogNTRfU3VibGl0ZXJh
-X21pdF9CZXRyYWcgKi8KcC5TdWJsaXRlcmFNaXRCZXRyYWcge21hcmdpbi10b3A6
-MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTowY207bWFyZ2luLWxl
-ZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtwdW5jdHVhdGlvbi13cmFwOnNpbXBs
-ZTt0ZXh0LWF1dG9zcGFjZTpub25lO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1NGFUX1N1
-YmxpdGVyYV9taXRfQmV0cmFnX1RHVUUgKi8KcC5TdWJsaXRlcmFNaXRCZXRyYWdU
-R1VFIHttYXJnaW4tdG9wOjBjbTttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0
-b206MGNtO21hcmdpbi1sZWZ0OjBjbTtsaW5lLWhlaWdodDoxMS4wcHQ7cHVuY3R1
-YXRpb24td3JhcDpzaW1wbGU7dGV4dC1hdXRvc3BhY2U6bm9uZTtmb250LXNpemU6
-MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0
-dm9ybGFnZTogNTRhX1N0cmljaF9lMSAtIGU3ICovCnAuU3RyaWNoRTEsIHAuU3Ry
-aWNoRTIsIHAuU3RyaWNoRTMsIHAuU3RyaWNoRTQsIHAuU3RyaWNoRTUsIHAuU3Ry
-aWNoRTYsIHAuU3RyaWNoRTcge21hcmdpbi10b3A6Mi4wcHQ7bWFyZ2luLXJpZ2h0
-OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWln
-aHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7fQovKiBGb3JtYXR2b3JsYWdlOiA1NV9TY2hsdXNzdGVpbEFicywg
-NTZfU2NobHVzc3RlaWxaaWZmLCA1N19TY2hsdXNzdGVpbExpdCovCnAuU2NobHVz
-c3RlaWxBYnMsIHAuU2NobHVzc3RlaWxaaWZmLCBwLlNjaGx1c3N0ZWlsTGl0IHtt
-YXJnaW46MGNtOyBsaW5lLWhlaWdodDoxMS4wcHQ7IGZvbnQtc2l6ZToxMC4wcHQ7
-IGZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO30KLyogRm9ybWF0dm9ybGFn
-ZTogNjFfVGFiVGV4dCAqLwpwLlRhYlRleHQge21hcmdpbjowY207bGluZS1oZWln
-aHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Y29sb3I6YmxhY2s7fQovKiBGb3JtYXR2b3JsYWdlOiA2MWFfVGFi
-VGV4dFJlY2h0c2IgKi8KcC5UYWJUZXh0UmVjaHRzYiB7bWFyZ2luOjBjbTt0ZXh0
-LWFsaWduOnJpZ2h0O2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0
-O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO30KLyog
-Rm9ybWF0dm9ybGFnZTogNjFiX1RhYlRleHRaZW50cmllcnQgKi8KcC5UYWJUZXh0
-WmVudHJpZXJ0IHttYXJnaW46MGNtO3RleHQtYWxpZ246Y2VudGVyO2xpbmUtaGVp
-Z2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iO2NvbG9yOmJsYWNrO30KLyogRm9ybWF0dm9ybGFnZTogNjFjX1Rh
-YlRleHRCbG9jayAqLwpwLlRhYlRleHRCbG9jayB7bWFyZ2luOjBjbTt0ZXh0LWFs
-aWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7fQovKiBG
-b3JtYXR2b3JsYWdlOiA2Ml9Lb3BmemVpbGUgKi8KcC5Lb3BmemVpbGUge21hcmdp
-bi10b3A6NC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTtt
-YXJnaW4tbGVmdDowY207Lyp0ZXh0LWFsaWduOmp1c3RpZnk7Ki9saW5lLWhlaWdo
-dDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3
-IFJvbWFuIjtjb2xvcjogI0MwQzBDMDt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDYzX0Z1
-w596ZWlsZSAqLwpwLkZ1c3N6ZWlsZSB7bWFyZ2luLXRvcDoxMC4wcHQ7bWFyZ2lu
-LXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207Lyp0
-ZXh0LWFsaWduOmp1c3RpZnk7Ki9saW5lLWhlaWdodDoxMS4wcHQ7Zm9udC1zaXpl
-OjkuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOiAjQzBD
-MEMwO30KLyogRm9ybWF0dm9ybGFnZTogNjRfRk5fTGluaWUgKi8KcC5GTkxpbmll
-IHttYXJnaW4tdG9wOjExLjBwdDttYXJnaW4tcmlnaHQ6MTMuMGNtO21hcmdpbi1i
-b3R0b206MS4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtw
-YWRkaW5nOjBjbTtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2JvcmRlci1ib3R0b20tc3R5bGU6IHNvbGlk
-O2JvcmRlci1ib3R0b20tY29sb3I6IEdyYXk7Ym9yZGVyLWJvdHRvbS13aWR0aDog
-MXB4O30KLyogRm9ybWF0dm9ybGFnZTogNjVfRk5fVGV4dCAqLwpwLkZOVGV4dCB7
-bWFyZ2luOjBjbTt0ZXh0LWFsaWduOmp1c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0
-O2ZvbnQtc2l6ZTo5LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtj
-b2xvcjpibGFjazt9Ci8qIEZvcm1hdHZvcmxhZ2U6IDY2X0ZOX1plaWNoZW4gKi8K
-c3Bhbi5GTlplaWNoZW4ge3ZlcnRpY2FsLWFsaWduOnN1cGVyOyBMQVlPVVQtR1JJ
-RC1NT0RFOiBsaW5lO30KLyogRm9ybWF0dm9ybGFnZTogNjhfVW50ZXJzY2hyTCAq
-LwpwLlVudGVyc2Nockwge21hcmdpbi10b3A6OC4wcHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207dGV4dC1hbGlnbjps
-ZWZ0O2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFt
-aWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJv
-bGQ7fQovKiBGb3JtYXR2b3JsYWdlOiA2OV9VbnRlcnNjaHJNICovCnAuVW50ZXJz
-Y2hyTSB7bWFyZ2luLXRvcDo4LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1i
-b3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmNlbnRlcjtsaW5l
-LWhlaWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGlt
-ZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztmb250LXdlaWdodDpib2xkO30KLyog
-Rm9ybWF0dm9ybGFnZTogNzFfQW5sYWdlbmJleiAqLwpwLkFubGFnZW5iZXoge21h
-cmdpbi10b3A6OC4wcHQ7bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBj
-bTttYXJnaW4tbGVmdDowY207Lyp0ZXh0LWFsaWduOnJpZ2h0OyovbGluZS1oZWln
-aHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMS4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qIEZvcm1h
-dHZvcmxhZ2U6IDgxX0VybFVlYmVyc2NoclogKi8KcC5FcmxVZWJlcnNjaHJaIHtt
-YXJnaW4tdG9wOjE2LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206
-MGNtO21hcmdpbi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246Y2VudGVyOyovbGluZS1o
-ZWlnaHQ6MTEuMHB0O3BhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Zm9udC1zaXplOjEx
-LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtjb2xvcjpibGFjaztm
-b250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9ybGFnZTogODJfRXJsVWViZXJz
-Y2hyTCAqLwpwLkVybFVlYmVyc2Nockwge21hcmdpbi10b3A6NC4wcHQ7bWFyZ2lu
-LXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207Lyp0
-ZXh0LWFsaWduOmp1c3RpZnk7Ki9saW5lLWhlaWdodDoxMS4wcHQ7cGFnZS1icmVh
-ay1hZnRlcjphdm9pZDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iO2NvbG9yOmJsYWNrO2ZvbnQtd2VpZ2h0OmJvbGQ7fQovKiBG
-b3JtYXR2b3JsYWdlOiA4M19FcmxUZXh0ICovCnAuRXJsVGV4dCB7bWFyZ2luLXRv
-cDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MGNtO21hcmdp
-bi1sZWZ0OjBjbTsvKnRleHQtYWxpZ246anVzdGlmeTsqL2xpbmUtaGVpZ2h0OjEx
-LjBwdDtmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9t
-YW4iO30KLyogRm9ybWF0dm9ybGFnZTogODVfRXJsQXVmemFlaGxnIC0gbm9jaCBu
-aWNodCBmZXJ0aWcgKi8KcC5FcmxBdWZ6YWVobGcge21hcmdpbi10b3A6NC4wcHQ7
-bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDow
-Y207dGV4dC1hbGlnbjpqdXN0aWZ5O2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNp
-emU6MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2NvbG9yOmJs
-YWNrO30KLyogRm9ybWF0dm9ybGFnZTogODlfVEdVRV9VZWJlcnNjaHJTcGFsdGUq
-LwpwLlRHVUVVZWJlcnNjaHJTcGFsdGUge21hcmdpbi10b3A6NC4wcHQ7bWFyZ2lu
-LXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207Lyp0
-ZXh0LWFsaWduOmNlbnRlcjsqL2xpbmUtaGVpZ2h0OjExLjBwdDtwYWdlLWJyZWFr
-LWFmdGVyOmF2b2lkO2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7Y29sb3I6YmxhY2s7Zm9udC13ZWlnaHQ6Ym9sZDt9Ci8qKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKiovCi8qIEZvcm1hdHZvcmxhZ2VuIGZ1ZXIgWmVpY2hlbmZvcm1h
-dGllcnVuZyAgICAgICAgICAgICAgICAgICAgICovCi8qKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5MF9GZWhsZXIgKi8Kc3Bhbi5GZWhsZXIge2Nv
-bG9yOiByZWQ7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTFfR2xkU3ltYm9sICovCnNw
-YW4uR2xkU3ltYm9sIHtmb250LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9ybGFn
-ZTogOTkyX05vcm1hbCAqLwpzcGFuLk5vcm1hbCB7Zm9udC1zdHlsZTogbm9ybWFs
-O30KLyogRm9ybWF0dm9ybGFnZTogOTkzX0ZldHQgKi8Kc3Bhbi5GZXR0IHtmb250
-LXdlaWdodDpib2xkO30KLyogRm9ybWF0dm9ybGFnZTogOTk0X0t1cnNpdiAqLwpz
-cGFuLkt1cnNpdiB7Zm9udC1zdHlsZTppdGFsaWM7fQovKiBGb3JtYXR2b3JsYWdl
-OiA5OTVfVW50ZXJzdHJpY2hlbiAqLwpzcGFuLlVudGVyc3RyaWNoZW4ge3RleHQt
-ZGVjb3JhdGlvbjp1bmRlcmxpbmU7fQovKiBGb3JtYXR2b3JsYWdlOiA5OTZfR2Vz
-cGVycnQgKi8Kc3Bhbi5HZXNwZXJydCB7bGV0dGVyLXNwYWNpbmc6MS4zcHQ7fQov
-KiBGb3JtYXR2b3JsYWdlOiA5OTdfSG9jaCAqLwpzcGFuLkhvY2gge2xpbmUtaGVp
-Z2h0OiA2MCU7IGZvbnQtc2l6ZTogNjAlOyB2ZXJ0aWNhbC1hbGlnbjpzdXBlcjt9
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5OF9UaWVmICovCnNwYW4uVGllZiB7bGluZS1o
-ZWlnaHQ6IDYwJTsgZm9udC1zaXplOiA2MCU7IHZlcnRpY2FsLWFsaWduOnN1Yjt9
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDk5OV9GZXR0X3VuZF9LdXJzaXYgKi8Kc3Bhbi5G
-ZXR0dW5kS3Vyc2l2IHtmb250LXdlaWdodDpib2xkOyBmb250LXN0eWxlOml0YWxp
-Yzt9Ci8qIFN0YW5kYXJkdGFic2Nocml0dHdlaXRlIGF1cyBXb3JkICovCnNwYW4u
-U3RhbmRhcmR0YWJ1bGF0b3Ige3dpZHRoOjM1LjQ1cHQ7fQovKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqLwovKiBGb3JtYXR2b3JsYWdlbiBkZXIgUGFybGFtZW50c2RpcmVrdGlvbiAg
-ICAgICAgICAgICAgICAgICAgICAqLwovKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwpwLlBEQWxs
-b25nZSwgbGkuUERBbGxvbmdlLCBkaXYuUERBbGxvbmdlIHttYXJnaW4tdG9wOjE0
-LjBwdDttYXJnaW4tcmlnaHQ6MGNtO21hcmdpbi1ib3R0b206MTAuMHB0O21hcmdp
-bi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmNlbnRlcjtmb250LXNpemU6MTQuMHB0O2Zv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2xheW91dC1ncmlkLW1vZGU6bGlu
-ZTt9CnAuUERBbGxvbmdlQiwgbGkuUERBbGxvbmdlQiwgZGl2LlBEQWxsb25nZUIg
-e21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bToxMC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTtmb250
-LXNpemU6MTQuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2xheW91
-dC1ncmlkLW1vZGU6bGluZTt9CnAuUERBbGxvbmdlTCwgbGkuUERBbGxvbmdlTCwg
-ZGl2LlBEQWxsb25nZUwge21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1yaWdodDow
-Y207bWFyZ2luLWJvdHRvbToxMC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2ZvbnQtc2l6
-ZToxNC4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGF5b3V0LWdy
-aWQtbW9kZTpsaW5lO30KcC5QREFudHJhZ3Nmb3JtZWwsIGxpLlBEQW50cmFnc2Zv
-cm1lbCwgZGl2LlBEQW50cmFnc2Zvcm1lbCB7bWFyZ2luLXRvcDoxNC4wcHQ7bWFy
-Z2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207
-dGV4dC1hbGlnbjpqdXN0aWZ5O2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNpemU6
-MTAuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2xheW91dC1ncmlk
-LW1vZGU6bGluZTt9CnAuUEREYXR1bSwgbGkuUEREYXR1bSwgZGl2LlBERGF0dW0g
-e21hcmdpbi10b3A6MTQuMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bTowY207bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTtsaW5lLWhl
-aWdodDoxMS4wcHQ7Zm9udC1zaXplOjEwLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7fQpwLlBERW50c2NobGll
-c3N1bmcsIGxpLlBERW50c2NobGllc3N1bmcsIGRpdi5QREVudHNjaGxpZXNzdW5n
-IHttYXJnaW4tdG9wOjguMHB0O21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRv
-bTowY207bWFyZ2luLWxlZnQ6MGNtO2xpbmUtaGVpZ2h0OjExLjBwdDtmb250LXNp
-emU6MTEuMHB0O2ZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iO2xheW91dC1n
-cmlkLW1vZGU6bGluZTtmb250LXdlaWdodDpib2xkO30KcC5QREsxLCBsaS5QREsx
-LCBkaXYuUERLMSB7bWFyZ2luOjBjbTt0ZXh0LWFsaWduOmNlbnRlcjtib3JkZXI6
-bm9uZTtwYWRkaW5nOjBjbTtmb250LXNpemU6MTIuMHB0O2ZvbnQtZmFtaWx5OiJU
-aW1lcyBOZXcgUm9tYW4iO2xldHRlci1zcGFjaW5nOi0uNHB0O2ZvbnQtd2VpZ2h0
-OmJvbGQ7fQpwLlBESzFBbmxhZ2UsIGxpLlBESzFBbmxhZ2UsIGRpdi5QREsxQW5s
-YWdlIHttYXJnaW46MGNtO3RleHQtYWxpZ246cmlnaHQ7Zm9udC1zaXplOjEyLjBw
-dDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtsZXR0ZXItc3BhY2luZzot
-LjRwdDtmb250LXdlaWdodDpib2xkO30KcC5QREsxQXVzZywgbGkuUERLMUF1c2cs
-IGRpdi5QREsxQXVzZyB7bWFyZ2luLXRvcDo2Mi45cHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjI3LjBwdDttYXJnaW4tbGVmdDowY207Zm9udC1zaXpl
-OjExLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtmb250LXdlaWdo
-dDpib2xkO30KcC5QREsyLCBsaS5QREsyLCBkaXYuUERLMiB7bWFyZ2luLXRvcDow
-Y207bWFyZ2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjExLjM1cHQ7bWFyZ2lu
-LWxlZnQ6MGNtO2ZvbnQtc2l6ZToyMi4wcHQ7Zm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAuUERLMywgbGkuUERLMywgZGl2
-LlBESzMge21hcmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJv
-dHRvbToyMC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO2ZvbnQtc2l6ZToxOC4wcHQ7Zm9u
-dC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAu
-UERLNCwgbGkuUERLNCwgZGl2LlBESzQge21hcmdpbi10b3A6MGNtO21hcmdpbi1y
-aWdodDowY207bWFyZ2luLWJvdHRvbTo2LjBwdDttYXJnaW4tbGVmdDowY207Zm9u
-dC1zaXplOjEzLjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjtmb250
-LXdlaWdodDpib2xkO30KcC5QREtvcGZ6ZWlsZSwgbGkuUERLb3BmemVpbGUsIGRp
-di5QREtvcGZ6ZWlsZSB7bWFyZ2luLXRvcDo0LjBwdDttYXJnaW4tcmlnaHQ6MGNt
-O21hcmdpbi1ib3R0b206MGNtO21hcmdpbi1sZWZ0OjBjbTt0ZXh0LWFsaWduOmp1
-c3RpZnk7bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7bGF5b3V0LWdyaWQtbW9kZTpsaW5lO30K
-cC5QRFUxLCBsaS5QRFUxLCBkaXYuUERVMSB7bWFyZ2luLXRvcDoyMi4wcHQ7bWFy
-Z2luLXJpZ2h0OjBjbTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207
-bGluZS1oZWlnaHQ6MTEuMHB0O2ZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6
-IlRpbWVzIE5ldyBSb21hbiI7Zm9udC13ZWlnaHQ6Ym9sZDt9CnAuUERVMiwgbGku
-UERVMiwgZGl2LlBEVTIge21hcmdpbi10b3A6NS4wcHQ7bWFyZ2luLXJpZ2h0OjBj
-bTttYXJnaW4tYm90dG9tOjBjbTttYXJnaW4tbGVmdDowY207bGluZS1oZWlnaHQ6
-MTEuMHB0O2ZvbnQtc2l6ZTo5LjBwdDtmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjt9CnAuUERWb3JsYWdlLCBsaS5QRFZvcmxhZ2UsIGRpdi5QRFZvcmxhZ2Ug
-e21hcmdpbi10b3A6MGNtO21hcmdpbi1yaWdodDowY207bWFyZ2luLWJvdHRvbTox
-MC4wcHQ7bWFyZ2luLWxlZnQ6MGNtO3RleHQtYWxpZ246anVzdGlmeTtsaW5lLWhl
-aWdodDoxMS4wcHQ7Zm9udC1zaXplOjExLjBwdDtmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjtsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7Zm9udC13ZWlnaHQ6Ym9s
-ZDt9Cjwvc3R5bGU+CjwvaGVhZD4KPGJvZHk+CjxkaXYgY2xhc3M9InBhcGVydyI+
-CgoKCgo8cCBjbGFzcz0iQkRHZXNCbGF0dCBBbGlnbkNlbnRlciI+QlVOREVTR0VT
-RVRaQkxBVFQ8L3A+CjxwIGNsYXNzPSJSZXBPZXN0ZXJyIEFsaWduQ2VudGVyIj5G
-w5xSIERJRSBSRVBVQkxJSyDDllNURVJSRUlDSDwvcD4KPHRhYmxlIGNsYXNzPSJ0
-b3AgYm90dG9tIHdpMTAwIj4KPHRyPgo8dGQ+CjxwIGNsYXNzPSJBdXNnYWJlRGF0
-ZW4gQWxpZ25MZWZ0Ij5KYWhyZ2FuZyAyMDA2PC9wPgo8L3RkPgo8dGQ+CjxwIGNs
-YXNzPSJBdXNnYWJlRGF0ZW4gQWxpZ25DZW50ZXIiPkF1c2dlZ2ViZW4gYW0gMzAu
-IE1haSAyMDA2PC9wPgo8L3RkPgo8dGQ+CjxwIGNsYXNzPSJBdXNnYWJlRGF0ZW4g
-QWxpZ25SaWdodCI+VGVpbMKgSUk8L3A+CjwvdGQ+CjwvdHI+CjwvdGFibGU+Cjx0
-YWJsZSBjbGFzcz0iYm90dG9tIHdpMTAwIj4KPHRyPgo8dGQgY29sc3Bhbj0iMiI+
-CjxwIGNsYXNzPSJLdXJ6dGl0ZWwxIEFsaWduTGVmdCBWQWxpZ25Ub3AiPjIwNC4g
-VmVyb3JkbnVuZzogw4RuZGVydW5nIGRlciBTY2hpZmZzdGVjaG5pa3Zlcm9yZG51
-bmc8L3A+CjwvdGQ+CjwvdHI+CjwvdGFibGU+CjxwIGNsYXNzPSJUaXRlbCBBbGln
-bkp1c3RpZnkiPjIwNC4gVmVyb3JkbnVuZyBkZXMgQnVuZGVzbWluaXN0ZXJzIGbD
-vHIgVmVya2VociwgSW5ub3ZhdGlvbiB1bmQgVGVjaG5vbG9naWUsIG1pdCBkZXIg
-ZGllIFNjaGlmZnN0ZWNobmlrdmVyb3JkbnVuZyBnZcOkbmRlcnQgd2lyZDwvcD4K
-PHAgY2xhc3M9IlByb21LbEVpbmxTYXR6IEFsaWduSnVzdGlmeSI+QXVmIEdydW5k
-IGRlcyDCp8KgMTA5IEFicy7CoDcgZGVzIFNjaGlmZmZhaHJ0c2dlc2V0emVzLCBC
-R0JsLsKgSSBOci7CoDYyLzE5OTcgaW4gZGVyIEZhc3N1bmcgQkdCbC7CoEkgTnIu
-wqAxMjMvMjAwNSwgd2lyZCB2ZXJvcmRuZXQ6PC9wPgo8cCBjbGFzcz0iTm92QW8x
-IEFsaWduSnVzdGlmeSI+RGVtIMKnwqAyNiBkZXIgU2NoaWZmc3RlY2huaWt2ZXJv
-cmRudW5nLCBCR0JsLiBOci7CoDQ1MC8xOTkzLCB6dWxldHp0IGdlw6RuZGVydCBk
-dXJjaCBCR0JsLsKgSUkgTnIuwqAxOTYvMTk5Nywgd2VyZGVuIGZvbGdlbmRlIEFi
-c8OkdHplIDggdW5kIDkgYW5nZWbDvGd0OjwvcD4KPHAgY2xhc3M9IkFicyBBbGln
-bkp1c3RpZnkiPgrigJ4oOCkgTW90b3JlbiBkZXIgS2F0ZWdvcmllbiBWIDE6MSwg
-ViAxOjIgdW5kIFYgMTozIGdlbcOkw58gVmVyb3JkbnVuZyBkZXMgQnVuZGVzbWlu
-aXN0ZXJzIGbDvHIgV2lydHNjaGFmdCB1bmQgQXJiZWl0IMO8YmVyIE1hw59uYWht
-ZW4genVyIEJla8OkbXBmdW5nIGRlciBFbWlzc2lvbiB2b24gZ2FzZsO2cm1pZ2Vu
-IFNjaGFkc3RvZmZlbiB1bmQgbHVmdHZlcnVucmVpbmlnZW5kZW4gUGFydGlrZWxu
-IGF1cyBWZXJicmVubnVuZ3Ntb3RvcmVuIGbDvHIgbW9iaWxlIE1hc2NoaW5lbiB1
-bmQgR2Vyw6R0ZSwgQkdCbC7CoElJIE5yLsKgMTM2LzIwMDUsIGTDvHJmZW4gbmFj
-aCBkZW0gMzEuwqBEZXplbWJlciAyMDA2IG51ciBhbHMgSGF1cHQtIG9kZXIgSGls
-ZnNtYXNjaGluZW4gaW4gRmFocnpldWdlLCBhdXNnZW5vbW1lbiBLbGVpbmZhaHJ6
-ZXVnZSwgZWluZ2ViYXV0IHdlcmRlbiwgd2VubiBzaWUgw7xiZXIgZWluZSBUeXBn
-ZW5laG1pZ3VuZyBnZW3DpMOfIMKnwqAxMCBBYnNhdHogM2UgZGllc2VyIFZlcm9y
-ZG51bmcgdmVyZsO8Z2VuLjwvcD4KPHAgY2xhc3M9IkFicyBBbGlnbkp1c3RpZnki
-Pig5KSBNb3RvcmVuIGRlciBLYXRlZ29yaWVuIFYgMTo0IHVuZCBWIDIgZ2Vtw6TD
-nyBWZXJvcmRudW5nIGRlcyBCdW5kZXNtaW5pc3RlcnMgZsO8ciBXaXJ0c2NoYWZ0
-IHVuZCBBcmJlaXQgw7xiZXIgTWHDn25haG1lbiB6dXIgQmVrw6RtcGZ1bmcgZGVy
-IEVtaXNzaW9uIHZvbiBnYXNmw7ZybWlnZW4gU2NoYWRzdG9mZmVuIHVuZCBsdWZ0
-dmVydW5yZWluaWdlbmRlbiBQYXJ0aWtlbG4gYXVzIFZlcmJyZW5udW5nc21vdG9y
-ZW4gZsO8ciBtb2JpbGUgTWFzY2hpbmVuIHVuZCBHZXLDpHRlLCBCR0JsLsKgSUkg
-TnIuwqAxMzYvMjAwNSwgZMO8cmZlbiBuYWNoIGRlbSAzMS7CoERlemVtYmVyIDIw
-MDggbnVyIGFscyBIYXVwdC0gb2RlciBIaWxmc21hc2NoaW5lbiBpbiBGYWhyemV1
-Z2UsIGF1c2dlbm9tbWVuIEtsZWluZmFocnpldWdlLCBlaW5nZWJhdXQgd2VyZGVu
-LCB3ZW5uIHNpZSDDvGJlciBlaW5lIFR5cGdlbmVobWlndW5nIGdlbcOkw58gwqfC
-oDEwIEFic2F0eiAzZSBkaWVzZXIgVmVyb3JkbnVuZyB2ZXJmw7xnZW4u4oCcCjwv
-cD4KPHAgY2xhc3M9IlVudGVyc2NockwiPkdvcmJhY2g8L3A+Cgo8cCBjbGFzcz0i
-RnVzc3plaWxlIEFsaWduSnVzdGlmeSI+d3d3LnJpcy5ia2EuZ3YuYXQ8L3A+Cjwv
-ZGl2Pgo8L2JvZHk+Cgo8L2h0bWw+</sl11:Base64Content></sl11:HashInputData><sl11:SignatureCheck><sl11:Code>0</sl11:Code></sl11:SignatureCheck><sl11:SignatureManifestCheck><sl11:Code>98</sl11:Code></sl11:SignatureManifestCheck><sl11:SignatureManifestCheck><sl11:Code>0</sl11:Code></sl11:SignatureManifestCheck><sl11:CertificateCheck><sl10:Code>1</sl10:Code></sl11:CertificateCheck></sl11:VerifyXMLSignatureResponse>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyResponse.341_2004.iso8859.xml b/spss.slinterface/test/moa-wartung-la9/verifyResponse.341_2004.iso8859.xml
deleted file mode 100644
index 866d96f85..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyResponse.341_2004.iso8859.xml
+++ /dev/null
@@ -1,1166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl11:VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" 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:SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Christian Wregar,OU=Verfassungsdienst,O=Bundeskanzleramt der Republik \C3\96sterreich,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=a-sign-corporate-light-01,OU=a-sign-corporate-light-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>21221</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIE4TCCA8mgAwIBAgICUuUwDQYJKoZIhvcNAQEFBQAwgZ8xCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIjAgBgNVBAsTGWEtc2lnbi1jb3Jw
-b3JhdGUtbGlnaHQtMDExIjAgBgNVBAMTGWEtc2lnbi1jb3Jwb3JhdGUtbGlnaHQt
-MDEwHhcNMDMxMjEwMTcyMzA3WhcNMDYxMjEwMTcyMzA3WjCBnzELMAkGA1UEBhMC
-QVQxWTBXBgNVBAoeUABCAHUAbgBkAGUAcwBrAGEAbgB6AGwAZQByAGEAbQB0ACAA
-ZABlAHIAIABSAGUAcAB1AGIAbABpAGsAIADWAHMAdABlAHIAcgBlAGkAYwBoMRow
-GAYDVQQLExFWZXJmYXNzdW5nc2RpZW5zdDEZMBcGA1UEAxMQQ2hyaXN0aWFuIFdy
-ZWdhcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv7Z6w9XhQLoIxipExnL7
-go/rp5Leh/y0E8mjS7XKe4acgmb/+p7cyAIzDjSY4Jse4xz9cKb+0hrEyKJjvR61
-Tl4lJxQsdYan3rLqcruPlC0GRkAgiiRdLwvAaAUBqzYxzTjKvdZBdcnuY+S2Ad1Z
-5N5zAF2XRzykcsmLRZvpvJ8CAwEAAaOCAacwggGjMAkGA1UdEwQCMAAwEQYDVR0O
-BAoECEhNunRQSAFFMF0GA1UdIARWMFQwUgYHKigAEQEOATBHMEUGCCsGAQUFBwIB
-FjlodHRwOi8vd3d3LmEtdHJ1c3QuYXQvZG9jcy9jcC9hc2lnbi1nb3Zlcm5tZW50
-LXNlcnZlci5wZGYwEwYDVR0jBAwwCoAITp5/1C/JHx8wfwYIKwYBBQUHAQEEczBx
-MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRydXN0LmF0L29jc3AwRgYIKwYB
-BQUHMAKGOmh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNpZ24tY29ycG9y
-YXRlLWxpZ2h0LTAxYS5jcnQwDgYDVR0PAQH/BAQDAgeAMG4GA1UdHwRnMGUwY6Bh
-oF+GXWxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1s
-aWdodC0wMSxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0
-PzAOBgcqKAAKAQEBBAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFIWZVsrHNwZDSkE
-44Cyc1cCJU49CrjsX7OPG43notq9JPRPMvbVAOrN3g0H8x2oOSYoxscKut1IqLxc
-xUVKYuCZEQBj0FZTYLFIuK8//vPOwmTSTBKMjKZpkkxfdcM5JX+nGdJgfqndjqPw
-e9lZ213EMIEfEf1Nfr5R0MNk1uCUg9diqEpDcUdVks2KN4/zQVuNRlGFgM+y8E2N
-VFopTtCBhSj6nuxeIbpbEOmjuAfF5zoVAJg4nj4DKJC8oiaY+KR+817fXpHclzxd
-f1s0aVpqdOf7Dc0FXjrCBGKpyjcN4Qj9zioy5J6awkiWDF9CQICxwt4TYB1lS8Vx
-Z+ghQ0g=</dsig:X509Certificate><moa:PublicAuthority/></dsig:X509Data></sl11:SignerInfo><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>PGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgo8aGVh
-ZD4KPHRpdGxlPmVSZWNodCBYSFRNTCAxLjEgRG9rdW1lbnQ8L3RpdGxlPgo8c3R5
-bGUgdHlwZT0idGV4dC9jc3MiPgogIAogICAgLk4xMDBDMCB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwMEM5IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTAwRDkgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-MEVGIHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwMTA4IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDExMiB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDExRiB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTAxMjkgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAxMzYgeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMTQwIHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMTREIHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDE1NyB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogIAog
-ICAgLk4xMDE2QiB7IHdpZHRoOjU2NzsgYm9yZGVyOjFweCBzb2xpZCBibGFjazsg
-Ym9yZGVyLXNwYWNpbmc6MDsgcGFkZGluZzowO3dpZHRoOjE1LjBjbTtib3JkZXIt
-Y29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVyOm5vbmV9CiAgCiAgCiAgICAuTjEwMTc0
-IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTUuMGNtO2Jv
-cmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1
-cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAxODQgeyB3aWR0aDoyMDk7IHZlcnRp
-Y2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0
-IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMTlBIHsgd2lkdGg6MzU4OyB2ZXJ0aWNh
-bC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRl
-ci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBw
-dDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoy
-Ljg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMUIzIHsgd2lkdGg6
-MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44
-NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDFCRCB7IHdpZHRoOjM1
-ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6
-bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRv
-d3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7
-IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDFD
-QSB7IHdpZHRoOjIwOTsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7
-Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IGJvcmRlci10b3A6bm9uZTtw
-YWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAxRDQg
-eyB3aWR0aDozNTg7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoyNjguMjVwdDti
-b3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxlZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpz
-b2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2JvcmRlci1yaWdodDpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0K
-ICAgIC5OMTAxRTEgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0
-aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXIt
-dG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAg
-ICAuTjEwMUVCIHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6
-MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRl
-ci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVw
-dCAyLjg1cHR9CiAgICAuTjEwMUY4IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGln
-bjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBw
-dDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQg
-Mi44NXB0fQogICAgLk4xMDIwMiB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246
-dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDog
-bm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVy
-LXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIu
-ODVwdCAyLjg1cHQgMi44NXB0fQogIAogICAgLk4xMDIxNiB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwMjFGIHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTAyMkYgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-MjQ1IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwMjVFIHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDI2OCB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDI3NSB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTAyN0YgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAyOEMgeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMjk2IHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMkEzIHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDJBRCB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogIAog
-ICAgLk4xMDJCQiB7IHdpZHRoOjU2NzsgYm9yZGVyOjFweCBzb2xpZCBibGFjazsg
-Ym9yZGVyLXNwYWNpbmc6MDsgcGFkZGluZzowO3dpZHRoOjE1LjBjbTtib3JkZXIt
-Y29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVyOm5vbmV9CiAgCiAgCiAgICAuTjEwMkM0
-IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTUuMGNtO2Jv
-cmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1
-cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAyRDIgeyB3aWR0aDoyMDk7IHZlcnRp
-Y2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0
-IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMkU4IHsgd2lkdGg6MzU4OyB2ZXJ0aWNh
-bC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRl
-ci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBw
-dDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoy
-Ljg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMzAxIHsgd2lkdGg6
-MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44
-NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDMwQiB7IHdpZHRoOjM1
-ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6
-bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRv
-d3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7
-IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDMx
-OCB7IHdpZHRoOjIwOTsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7
-Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IGJvcmRlci10b3A6bm9uZTtw
-YWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAzMjIg
-eyB3aWR0aDozNTg7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoyNjguMjVwdDti
-b3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxlZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpz
-b2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2JvcmRlci1yaWdodDpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0K
-ICAgIC5OMTAzMkYgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0
-aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXIt
-dG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAg
-ICAuTjEwMzM5IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6
-MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRl
-ci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVw
-dCAyLjg1cHR9CiAgICAuTjEwMzQ2IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGln
-bjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBw
-dDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQg
-Mi44NXB0fQogICAgLk4xMDM1MCB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246
-dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDog
-bm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVy
-LXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIu
-ODVwdCAyLjg1cHQgMi44NXB0fQogIAogICAgLk4xMDM1RSB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwMzY3IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTAzNzUgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-MzhCIHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwM0E0IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDNBRSB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDNCQiB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTAzQzUgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAzRDIgeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwM0RDIHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwM0U5IHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDNGMyB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogIAog
-ICAgLk4xMDQwNyB7IHdpZHRoOjU2NzsgYm9yZGVyOjFweCBzb2xpZCBibGFjazsg
-Ym9yZGVyLXNwYWNpbmc6MDsgcGFkZGluZzowO3dpZHRoOjE1LjBjbTtib3JkZXIt
-Y29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVyOm5vbmV9CiAgCiAgCiAgICAuTjEwNDEw
-IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTUuMGNtO2Jv
-cmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1
-cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA0MjAgeyB3aWR0aDoyMDk7IHZlcnRp
-Y2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0
-IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNDM2IHsgd2lkdGg6MzU4OyB2ZXJ0aWNh
-bC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRl
-ci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBw
-dDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoy
-Ljg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNDRGIHsgd2lkdGg6
-MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44
-NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDQ1OSB7IHdpZHRoOjM1
-ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6
-bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRv
-d3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7
-IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDQ2
-NiB7IHdpZHRoOjIwOTsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7
-Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IGJvcmRlci10b3A6bm9uZTtw
-YWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA0NzAg
-eyB3aWR0aDozNTg7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoyNjguMjVwdDti
-b3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxlZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpz
-b2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2JvcmRlci1yaWdodDpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0K
-ICAgIC5OMTA0N0QgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0
-aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXIt
-dG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAg
-ICAuTjEwNDg3IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6
-MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRl
-ci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVw
-dCAyLjg1cHR9CiAgICAuTjEwNDk0IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGln
-bjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBw
-dDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQg
-Mi44NXB0fQogICAgLk4xMDQ5RSB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246
-dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDog
-bm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVy
-LXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIu
-ODVwdCAyLjg1cHQgMi44NXB0fQogIAogICAgLk4xMDRCMiB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwNEJCIHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTA0Q0IgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-NEUxIHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwNEZBIHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDUwNCB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDUxMSB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTA1MUIgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA1MjggeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNTMyIHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNTNGIHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDU0OSB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogIAog
-ICAgLk4xMDU1NyB7IHdpZHRoOjU2NzsgYm9yZGVyOjFweCBzb2xpZCBibGFjazsg
-Ym9yZGVyLXNwYWNpbmc6MDsgcGFkZGluZzowO3dpZHRoOjE1LjBjbTtib3JkZXIt
-Y29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVyOm5vbmV9CiAgCiAgCiAgICAuTjEwNTYw
-IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTUuMGNtO2Jv
-cmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1
-cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA1NkUgeyB3aWR0aDoyMDk7IHZlcnRp
-Y2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0
-IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNTg0IHsgd2lkdGg6MzU4OyB2ZXJ0aWNh
-bC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRl
-ci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBw
-dDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoy
-Ljg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNTlEIHsgd2lkdGg6
-MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44
-NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDVBNyB7IHdpZHRoOjM1
-ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6
-bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRv
-d3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7
-IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDVC
-NCB7IHdpZHRoOjIwOTsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7
-Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IGJvcmRlci10b3A6bm9uZTtw
-YWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA1QkUg
-eyB3aWR0aDozNTg7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoyNjguMjVwdDti
-b3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxlZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpz
-b2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2JvcmRlci1yaWdodDpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0K
-ICAgIC5OMTA1Q0IgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0
-aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXIt
-dG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAg
-ICAuTjEwNUQ1IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6
-MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRl
-ci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVw
-dCAyLjg1cHR9CiAgICAuTjEwNUUyIHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGln
-bjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBw
-dDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQg
-Mi44NXB0fQogICAgLk4xMDVFQyB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246
-dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDog
-bm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVy
-LXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIu
-ODVwdCAyLjg1cHQgMi44NXB0fQogIAogICAgLk4xMDVGQSB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwNjAzIHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTA2MTEgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-NjI3IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwNjQwIHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDY0QSB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDY1NyB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTA2NjEgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA2NkUgeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNjc4IHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNjg1IHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDY4RiB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAg
-ICAgIC5XMzggeyB3aWR0aDozOHB4OyB9CiAgICAgICAgLlcxNSB7IHdpZHRoOjE1
-cHg7IH0KICAgICAgICAuVzIyIHsgd2lkdGg6MjJweDsgfQogICAgICAgIC53aTEw
-MCB7IHdpZHRoOjEwMCU7IH0KICAgICAgICAuV0VybCB7IHdpZHRoOjE1cHg7IH0K
-ICAgICAgICAuRTFTcDIgeyB3aWR0aDo1NTcuM3B4OyB9CiAgICAgICAgLkUyU3Ay
-IHsgd2lkdGg6NTQyLjNweDsgfQogICAgICAgIC5FM1NwMiB7IHdpZHRoOjUyMC4z
-cHg7IH0KICAgICAgICAuRTRTcDIgeyB3aWR0aDo0OTguMjk5OTk5OTk5OTk5OTVw
-eDsgfQogICAgICAgIC5FNVNwMiB7IHdpZHRoOjQ3Ni4yOTk5OTk5OTk5OTk5NXB4
-OyB9CiAgICAgICAgLkVybFNwMiB7IHdpZHRoOjU3MC4zcHg7IH0KICAgICAgICAu
-RTFTcDJRIHsgd2lkdGg6ODAzLjlweDsgfQogICAgICAgIC5FMlNwMlEgeyB3aWR0
-aDo3ODguOXB4OyB9CiAgICAgICAgLkUzU3AyUSB7IHdpZHRoOjc2Ni45cHg7IH0K
-ICAgICAgICAuRTRTcDJRIHsgd2lkdGg6NzQ0LjlweDsgfQogICAgICAgIC5FNVNw
-MlEgeyB3aWR0aDo3MjIuOXB4OyB9CiAgICAgICAgLkVybFNwMlEgeyB3aWR0aDo4
-MTYuOXB4OyB9CiAgICAgICAgLm5leHRwYWdlIHsgcGFnZS1icmVhay1iZWZvcmU6
-YWx3YXlzOyB9CiAgICAgICAgLm1hcmdpbnMge21hcmdpbi10b3A6ODUuMDVwdDtt
-YXJnaW4tcmlnaHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2lu
-LWxlZnQ6ODUuMDVwdDt9CiAgICAgICAgQG1lZGlhIHNjcmVlbiB7IC5wYXBlcncg
-e3dpZHRoOjU5NS4zcHg7bWFyZ2luLXRvcDo4NS4wNXB0O21hcmdpbi1yaWdodDo4
-NS4wNXB0O21hcmdpbi1ib3R0b206ODUuMDVwdDttYXJnaW4tbGVmdDo4NS4wNXB0
-O319CiAgICAgICAgQG1lZGlhIHByaW50IHsgLnBhcGVydyB7d2lkdGg6NTk1LjNw
-eDttYXJnaW4tdG9wOjAuMHB0O21hcmdpbi1yaWdodDowLjBwdDttYXJnaW4tYm90
-dG9tOjAuMHB0O21hcmdpbi1sZWZ0OjAuMHB0O3NpemU6cG9ydHJhaXQ7fX0KICAg
-ICAgICBAbWVkaWEgc2NyZWVuIHsgLnBhcGVyaCB7d2lkdGg6ODQxLjlweDttYXJn
-aW4tcmlnaHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2luLWxl
-ZnQ6ODUuMDVwdDttYXJnaW4tdG9wOjg1LjA1cHQ7fX0KICAgICAgICBAbWVkaWEg
-cHJpbnQgeyAucGFwZXJoIHt3aWR0aDo4NDEuOXB4O21hcmdpbi10b3A6MC4wcHQ7
-bWFyZ2luLXJpZ2h0OjAuMHB0O21hcmdpbi1ib3R0b206MC4wcHQ7bWFyZ2luLWxl
-ZnQ6MC4wcHQ7c2l6ZTpsYW5kc2NhcGV9fQovKioqKioqKioqKioqKioqKioqKioq
-KioqKioqLwovKiBSZXZpc2lvbjogICAgMS44LjYgICAgICAqLwovKiBFcnN0ZWxs
-dDogICAgMDMuMTAuMjAwMyAqLwovKiBNb2RpZml6aWVydDogMjQuMDMuMjAwNCAq
-LwovKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBBbGxnZW1laW5lIEFu
-Z2FiZW4genVtIEFuemVpZ2VuIHZvbiBMaW5pZW4gaW4gVGFiZWxsZW4gKi8KCi8q
-QHBhZ2UgOmxlZnQgewogIHNpemU6IDIxY20gMjkuN2NtOyAKICBtYXJnaW4tbGVm
-dDogMmNtOwogIG1hcmdpbi1yaWdodDogMmNtOwogIG1hcmtzOmNyb3A7Cn0KCkBw
-YWdlIDpyaWdodCB7CiAgc2l6ZTogMjFjbSAyOS43Y207ICAKICBtYXJnaW4tbGVm
-dDogMmNtOwogIG1hcmdpbi1yaWdodDogMmNtOwogIG1hcmtzOmNyb3A7Cn0KKi8K
-dGFibGUudG9wCnsKCWJvcmRlci10b3Atc3R5bGU6IHNvbGlkOwoJYm9yZGVyLXRv
-cC13aWR0aDogdGhpbjsKCWJvcmRlci1jb2xvcjogYmxhY2s7Cn0KCnRhYmxlLmJv
-dHRvbQp7Cglib3JkZXItYm90dG9tLXN0eWxlOiBzb2xpZDsKCWJvcmRlci1ib3R0
-b20td2lkdGg6IHRoaW47Cglib3JkZXItY29sb3I6IGJsYWNrOwp9Cgp0ZC50b3AK
-ewogICBib3JkZXItdG9wLXN0eWxlOnNvbGlkOwogICBib3JkZXItdG9wLXdpZHRo
-OjFwdDsKfQp0ZC5yaWdodAp7CiAgIGJvcmRlci1yaWdodC1zdHlsZTpzb2xpZDsK
-ICAgYm9yZGVyLXJpZ2h0LXdpZHRoOjFwdDsKfQp0ZC5ib3R0b20KewogICBib3Jk
-ZXItYm90dG9tLXN0eWxlOnNvbGlkOwogICBib3JkZXItYm90dG9tLXdpZHRoOjFw
-dDsKfQp0ZC5sZWZ0CnsKICAgYm9yZGVyLWxlZnQtc3R5bGU6c29saWQ7CiAgIGJv
-cmRlci1sZWZ0LXdpZHRoOjFwdDsKfQoKLypUZXh0IGlubmVyaGFsYiBlaW5lciBU
-YWJlbGxlbnplbGxlKi8KLkFsaWduTGVmdAp7Cgl0ZXh0LWFsaWduOmxlZnQ7Cn0K
-LkFsaWduUmlnaHQKewoJdGV4dC1hbGlnbjpyaWdodDsKfQouQWxpZ25DZW50ZXIK
-ewoJdGV4dC1hbGlnbjpjZW50ZXI7Cn0KLkFsaWduSnVzdGlmeQp7Cgl0ZXh0LWFs
-aWduOmp1c3RpZnk7Cn0KLlZBbGlnblRvcCB7Cgl2ZXJ0aWNhbC1hbGlnbjp0b3A7
-CQp9Ci8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKiovCi8qIExlZ2lzdGlrLVN0YW5kYXJkLUZvcm1h
-dHZvcmxhZ2UgICAgICAgICAgICAgICAgICAgICAgICAgICAgICovCi8qKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKiovCgovKiBGb3JtYXR2b3JsYWdlOiAwMF9MZWdTdGFuZGFyZCAqLwou
-TGVnU3RhbmRhcmQKewoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6
-MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iOwp9CgovKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBGb3JtYXR2b3JsYWdl
-biBmdWVyIEFic2FldHplICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAq
-LwovKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqLwoKLyogRm9ybWF0dm9ybGFnZTogMDFfVW5kZWZp
-bmllcnQgKi8KcC5VbmRlZmluaWVydAp7CgltYXJnaW4tdG9wOjEuMHB0OwoJbWFy
-Z2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6
-MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJ
-Zm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4i
-OwoJY29sb3I6IHJlZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogMDJfQkRHZXNCbGF0
-dCAqLwpwLkJER2VzQmxhdHQKewoJbWFyZ2luLXRvcDoxNC4wcHQ7CgltYXJnaW4t
-cmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207
-Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjM1LjBwdDsKCWZvbnQt
-c2l6ZTozNS4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNv
-bG9yOmJsYWNrOwoJdGV4dC10cmFuc2Zvcm06dXBwZXJjYXNlOwoJbGV0dGVyLXNw
-YWNpbmc6MS4zcHQ7Cglmb250LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3Js
-YWdlOiAwM19SZXBPZXN0ZXJyICovCnAuUmVwT2VzdGVycgp7CgltYXJnaW4tdG9w
-OjYuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJ
-bWFyZ2luLWxlZnQ6MGNtOwoJbWFyZ2luLWJvdHRvbToxMi4wcHQ7Cgl0ZXh0LWFs
-aWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjIwLjBwdDsKCWJvcmRlcjpub25lOwoJ
-cGFkZGluZzowY207Cglmb250LXNpemU6MjAuMHB0OwoJZm9udC1mYW1pbHk6IlRp
-bWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKCXRleHQtdHJhbnNmb3JtOnVw
-cGVyY2FzZTsKCWxldHRlci1zcGFjaW5nOjEuMHB0OwoJZm9udC13ZWlnaHQ6Ym9s
-ZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogMDRfQXVzZ2FiZURhdGVuICovCnAuQXVz
-Z2FiZURhdGVuCnsKCW1hcmdpbi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsK
-CW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWln
-aHQ6MTQuMHB0OwoJcGFkZGluZzowY207Cglmb250LXNpemU6MTIuMHB0OwoJZm9u
-dC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjogYmxhY2s7Cglmb250
-LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiAwNV9LdXJ6dGl0ZWwg
-Ki8KLyogS3VyenRpdGVsIGluIGVpbmVyIFNwYWx0ZSAod2VubiBrZWluIFRBQiB2
-b3JoYW5kZW4gaXN0KSAqLwpwLkt1cnp0aXRlbDEKewoJbWFyZ2luLXRvcDoyLjBw
-dDsKCW1hcmdpbi1yaWdodDogMGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJn
-aW4tbGVmdDogMy42Y207Cgl0ZXh0LWFsaWduOmp1c3RpZnk7Cgl0ZXh0LWluZGVu
-dDogLTMuNmNtOwoJYm9yZGVyOm5vbmU7CglwYWRkaW5nOjBjbTsKCWZvbnQtc2l6
-ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNvbG9y
-OmJsYWNrOwoJZm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogS3VyenRpdGVsIGluIHp3
-ZWkgU3BhbHRlbiAod2VubiBlaW4gVEFCIHZvcmhhbmRlbiBpc3QpICovCnAuS3Vy
-enRpdGVsMgp7CgltYXJnaW4tdG9wOjIuMHB0OwoJbWFyZ2luLXJpZ2h0OiAwY207
-CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OiAwY207Cgl0ZXh0LWFs
-aWduOmp1c3RpZnk7Cglib3JkZXI6bm9uZTsKCXBhZGRpbmc6MGNtOwoJZm9udC1z
-aXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29s
-b3I6YmxhY2s7Cglmb250LXdlaWdodDpib2xkOwp9CgpzcGFuLkt1cnp0aXRlbGJy
-ZWl0ZQp7Cgl3aWR0aDogMy40Y207Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDA5X0Fi
-c3RhbmQgKi8KcC5BYnN0YW5kCnsKCW1hcmdpbjo2LjBwdDsKCW1hcmdpbi1ib3R0
-b206Ni4wcHQ7CglsaW5lLWhlaWdodDoxMC4wcHQ7Cglmb250LXNpemU6MTAuMHB0
-OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsK
-fQoKLyogRm9ybWF0dm9ybGFnZTogMTBfRW50d3VyZiAqLwpwLkVudHd1cmYKewoJ
-bWFyZ2luLXRvcDo4MC4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJv
-dHRvbTo2NC4wcHQ7CgltYXJnaW4tbGVmdDowY207Cgl0ZXh0LWFsaWduOmNlbnRl
-cjsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250
-LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWxldHRlci1zcGFjaW5nOjEuM3B0
-Owp9CgovKiBGb3JtYXR2b3JsYWdlOiAxMV9UaXRlbCAqLwpwLlRpdGVsCnsKCW1h
-cmdpbi10b3A6MjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0
-b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJ
-bGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjExLjBwdDsKCWZvbnQtZmFt
-aWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJZm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyog
-Rm9ybWF0dm9ybGFnZTogMTJfUHJvbUtsX0VpbmxTYXR6ICovCQpwLlByb21LbEVp
-bmxTYXR6CnsKCW1hcmdpbi10b3A6OC4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJ
-bWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207Cgl0ZXh0LWFsaWdu
-Omp1c3RpZnk7Cgl0ZXh0LWluZGVudDoxOS44NXB0OwoJbGluZS1oZWlnaHQ6MTEu
-MHB0OwoJcGFnZS1icmVhay1hZnRlcjphdm9pZDsKCWZvbnQtc2l6ZToxMC4wcHQ7
-Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9y
-bGFnZTogMThfQWJiaWxkdW5nX29kZXJfT2JqZWt0ICovCnAuQWJiaWxkdW5nb2Rl
-ck9iamVrdAp7CgltYXJnaW4tdG9wOjYuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsK
-CW1hcmdpbi1ib3R0b206Ni4wcHQ7CgltYXJnaW4tbGVmdDowY207Cglmb250LXNp
-emU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xv
-cjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTogMThfQWJiaWxkdW5nX29kZXJf
-T2JqZWt0ICovCnAuQWJiaWxkdW5nb2Rlck9iamVrdEwKewoJbWFyZ2luLXRvcDo2
-LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjYuMHB0OwoJ
-bWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpsZWZ0OwoJZm9udC1zaXplOjEw
-LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6Ymxh
-Y2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDE4X0FiYmlsZHVuZ19vZGVyX09iamVr
-dCAqLwpwLkFiYmlsZHVuZ29kZXJPYmpla3RaCnsKCW1hcmdpbi10b3A6Ni4wcHQ7
-CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTo2LjBwdDsKCW1hcmdp
-bi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246Y2VudGVyOwoJZm9udC1zaXplOjEwLjBw
-dDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7
-Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDE4X0FiYmlsZHVuZ19vZGVyX09iamVrdCAq
-LwpwLkFiYmlsZHVuZ29kZXJPYmpla3RSCnsKCW1hcmdpbi10b3A6Ni4wcHQ7Cglt
-YXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTo2LjBwdDsKCW1hcmdpbi1s
-ZWZ0OjBjbTsKCXRleHQtYWxpZ246cmlnaHQ7Cglmb250LXNpemU6MTAuMHB0OwoJ
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKfQoK
-LyogRm9ybWF0dm9ybGFnZTogMTlfQmVzY2hyaWZ0dW5nICovCnAuQmVzY2hyaWZ0
-dW5nCnsKCW1hcmdpbi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdp
-bi1ib3R0b206Ni4wcHQ7CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDox
-MS4wcHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Cgljb2xvcjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTogMTlf
-QmVzY2hyaWZ0dW5nICovCnAuQmVzY2hyaWZ0dW5nTAp7CgltYXJnaW4tdG9wOjBj
-bTsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjYuMHB0OwoJbWFy
-Z2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJdGV4dC1hbGlnbjps
-ZWZ0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcg
-Um9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDE5X0Jl
-c2NocmlmdHVuZyAqLwpwLkJlc2NocmlmdHVuZ1oKewoJbWFyZ2luLXRvcDowY207
-CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTo2LjBwdDsKCW1hcmdp
-bi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCXRleHQtYWxpZ246Y2Vu
-dGVyOwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcg
-Um9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDE5X0Jl
-c2NocmlmdHVuZyAqLwpwLkJlc2NocmlmdHVuZ1IKewoJbWFyZ2luLXRvcDowY207
-CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTo2LjBwdDsKCW1hcmdp
-bi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCXRleHQtYWxpZ246cmln
-aHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBS
-b21hbiI7Cgljb2xvcjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTogMjFfTm92
-QW8xICovCnAuTm92QW8xCnsKCW1hcmdpbi10b3A6NC4wcHQ7CgltYXJnaW4tcmln
-aHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207Cgl0
-ZXh0LWFsaWduOmp1c3RpZnk7CglsaW5lLWhlaWdodDoxMS4wcHQ7CglwYWdlLWJy
-ZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5
-OiJUaW1lcyBOZXcgUm9tYW4iOwoJZm9udC1zdHlsZTppdGFsaWM7Cn0KCi8qIEZv
-cm1hdHZvcmxhZ2U6IDIyX05vdkFvMSAqLwpwLk5vdkFvMgp7CgltYXJnaW4tdG9w
-OjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJ
-bWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWln
-aHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iOwoJZm9udC1zdHlsZTppdGFsaWM7Cn0KCi8qIEZvcm1hdHZv
-cmxhZ2U6IDIzX1NhdHpfKG5hY2hfTm92YW8pICovCnAuU2F0em5hY2hOb3Zhbwp7
-CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1i
-b3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5
-OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZv
-cm1hdHZvcmxhZ2U6IDMwX0luaGFsdFVlYmVyc2NocmlmdCAqLwpwLkluaGFsdFVl
-YmVyc2NocmlmdAp7CgltYXJnaW4tdG9wOjE2LjBwdDsKCW1hcmdpbi1yaWdodDow
-Y207CgltYXJnaW4tYm90dG9tOjguMHB0OwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4
-dC1hbGlnbjpjZW50ZXI7CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6
-MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cglmb250LXdl
-aWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiAzMV9JbmhhbHRTcGFsdGUg
-Ki8KcC5JbmhhbHRTcGFsdGUKewoJbWFyZ2luLXRvcDo0LjBwdDsKCW1hcmdpbi1y
-aWdodDowY207CgltYXJnaW4tYm90dG9tOjQuMHB0OwoJbWFyZ2luLWxlZnQ6MGNt
-OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJcGFnZS1icmVhay1hZnRlcjphdm9pZDsK
-CWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFu
-IjsKCWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDMyX0lu
-aGFsdEVpbnRyYWcgKi8KcC5JbmhhbHRFaW50cmFnCnsKCW1hcmdpbi10b3A6MGNt
-OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2lu
-LWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBw
-dDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2
-b3JsYWdlOiA0MV9VZWJlcnNjaHJHMSAqLwpwLlVlYmVyc2NockcxCnsKCW1hcmdp
-bi10b3A6MTYuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206
-MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpjZW50ZXI7CglsaW5l
-LWhlaWdodDoxMS4wcHQ7CglwYWdlLWJyZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1z
-aXplOjExLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29s
-b3I6YmxhY2s7Cglmb250LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdl
-OiA0Ml9VZWJlcnNjaHJHMS0gKi8KcC5VZWJlcnNjaHJHMS0KewoJbWFyZ2luLXRv
-cDo4LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjBjbTsK
-CW1hcmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246Y2VudGVyOwoJbGluZS1oZWln
-aHQ6MTEuMHB0OwoJcGFnZS1icmVhay1hZnRlcjphdm9pZDsKCWZvbnQtc2l6ZTox
-MS4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNvbG9yOmJs
-YWNrOwoJZm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogNDNf
-VWViZXJzY2hyRzIgKi8KcC5VZWJlcnNjaHJHMgp7CgltYXJnaW4tdG9wOjQuMHB0
-OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206NC4wcHQ7CgltYXJn
-aW4tbGVmdDowY207Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjEx
-LjBwdDsKCXBhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Cglmb250LXNpemU6MTEuMHB0
-OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsK
-CWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDQ0X1VlYmVy
-c2NockFydCAqLwpwLlVlYmVyc2NockFydAp7CgltYXJnaW4tdG9wOjguMHB0OwoJ
-bWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxl
-ZnQ6MGNtOwoJdGV4dC1hbGlnbjpjZW50ZXI7CglsaW5lLWhlaWdodDoxMS4wcHQ7
-CglwYWdlLWJyZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1zaXplOjEwLjBwdDsKCWZv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cglmb250
-LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA0NV9VZWJlcnNjaHJQ
-YXJhICovCnAuVWViZXJzY2hyUGFyYQp7CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFy
-Z2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6
-MGNtOwoJdGV4dC1hbGlnbjpjZW50ZXI7CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglw
-YWdlLWJyZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cglmb250LXdl
-aWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1MV9BYnMgKi8KcC5BYnMK
-ewoJbWFyZ2luLXRvcDo0LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4t
-Ym90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246anVzdGlm
-eTsKCXRleHQtaW5kZW50OjE5Ljg1cHQ7Ci8qCWxpbmUtaGVpZ2h0OjExLjBwdDsg
-Ki8KCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTJfWmlmZmVyX2UxICovCnAuWmlm
-ZmVyRTEKewoJbWFyZ2luLXRvcDoyLjBwdDsKCW1hcmdpbi1yaWdodDowY207Cglt
-YXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0
-OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTJfWmlmZmVyX2UyICov
-CnAuWmlmZmVyRTIKewoJbWFyZ2luLXRvcDoyLjBwdDsKCW1hcmdpbi1yaWdodDow
-Y207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUt
-aGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToi
-VGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTJfWmlmZmVy
-X2UzICovCnAuWmlmZmVyRTMKewoJbWFyZ2luLXRvcDoyLjBwdDsKCW1hcmdpbi1y
-aWdodDowY207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsK
-CWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZh
-bWlseToiVGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTJf
-WmlmZmVyX21pdF9CZXRyYWcgKi8KcC5aaWZmZXJNaXRCZXRyYWcKewoJbWFyZ2lu
-LXRvcDowY207CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207
-CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7CglwdW5jdHVh
-dGlvbi13cmFwOnNpbXBsZTsKCXRleHQtYXV0b3NwYWNlOm5vbmU7Cglmb250LXNp
-emU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8q
-IEZvcm1hdHZvcmxhZ2U6IDUyYVRfWmlmZmVyX21pdF9CZXRyYWdfVEdVRSAqLwpw
-LlppZmZlck1pdEJldHJhZ1RHVUUKewoJbWFyZ2luLXRvcDowY207CgltYXJnaW4t
-cmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207
-CglsaW5lLWhlaWdodDoxMS4wcHQ7CglwdW5jdHVhdGlvbi13cmFwOnNpbXBsZTsK
-CXRleHQtYXV0b3NwYWNlOm5vbmU7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDUz
-X0xpdGVyYV9lMSAqLwpwLkxpdGVyYUUxCnsKCW1hcmdpbi10b3A6Mi4wcHQ7Cglt
-YXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVm
-dDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6MTAuMHB0OwoJ
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8qIEZvcm1hdHZvcmxh
-Z2U6IDUzX0xpdGVyYV9lMiAqLwpwLkxpdGVyYUUyCnsKCW1hcmdpbi10b3A6Mi4w
-cHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJn
-aW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6MTAu
-MHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8qIEZvcm1h
-dHZvcmxhZ2U6IDUzX0xpdGVyYV9lMyAqLwpwLkxpdGVyYUUzCnsKCW1hcmdpbi10
-b3A6Mi4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207
-CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNp
-emU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8q
-IEZvcm1hdHZvcmxhZ2U6IDUzX0xpdGVyYV9taXRfQmV0cmFnICovCnAuTGl0ZXJh
-TWl0QmV0cmFnCnsKCW1hcmdpbi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsK
-CW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWln
-aHQ6MTEuMHB0OwoJcHVuY3R1YXRpb24td3JhcDpzaW1wbGU7Cgl0ZXh0LWF1dG9z
-cGFjZTpub25lOwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1M2FUX0xpdGVyYV9t
-aXRfQmV0cmFnX1RHVUUgKi8KcC5MaXRlcmFNaXRCZXRyYWdUR1VFCnsKCW1hcmdp
-bi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNt
-OwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJcHVuY3R1
-YXRpb24td3JhcDpzaW1wbGU7Cgl0ZXh0LWF1dG9zcGFjZTpub25lOwoJZm9udC1z
-aXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9Cgov
-KiBGb3JtYXR2b3JsYWdlOiA1NF9TdWJsaXRlcmFfZTEgKi8KcC5TdWJsaXRlcmFF
-MQp7CgltYXJnaW4tdG9wOjIuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdp
-bi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEu
-MHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcg
-Um9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1NF9TdWJsaXRlcmFfZTIgKi8K
-cC5TdWJsaXRlcmFFMgp7CgltYXJnaW4tdG9wOjIuMHB0OwoJbWFyZ2luLXJpZ2h0
-OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGlu
-ZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5
-OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1NF9TdWJs
-aXRlcmFfZTMgKi8KcC5TdWJsaXRlcmFFMwp7CgltYXJnaW4tdG9wOjIuMHB0OwoJ
-bWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxl
-ZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsK
-CWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3Js
-YWdlOiA1NF9TdWJsaXRlcmFfbWl0X0JldHJhZyAqLwpwLlN1YmxpdGVyYU1pdEJl
-dHJhZwp7CgltYXJnaW4tdG9wOjBjbTsKCW1hcmdpbi1yaWdodDowY207CgltYXJn
-aW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjEx
-LjBwdDsKCXB1bmN0dWF0aW9uLXdyYXA6c2ltcGxlOwoJdGV4dC1hdXRvc3BhY2U6
-bm9uZTsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3
-IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTRhVF9TdWJsaXRlcmFfbWl0
-X0JldHJhZ19UR1VFICovCnAuU3VibGl0ZXJhTWl0QmV0cmFnVEdVRQp7CgltYXJn
-aW4tdG9wOjBjbTsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjBj
-bTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCXB1bmN0
-dWF0aW9uLXdyYXA6c2ltcGxlOwoJdGV4dC1hdXRvc3BhY2U6bm9uZTsKCWZvbnQt
-c2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKfQoK
-LyogRm9ybWF0dm9ybGFnZTogNTRhX1N0cmljaF9lMSAqLwpwLlN0cmljaEUxCnsK
-CW1hcmdpbi10b3A6Mi4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJv
-dHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7
-Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDU0YV9TdHJpY2hfZTIgKi8KcC5TdHJp
-Y2hFMgp7CgltYXJnaW4tdG9wOjIuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1h
-cmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6
-MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1NGFfU3RyaWNoX2UzICov
-CnAuU3RyaWNoRTMKewoJbWFyZ2luLXRvcDoyLjBwdDsKCW1hcmdpbi1yaWdodDow
-Y207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUt
-aGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToi
-VGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTRhX1N0cmlj
-aF9lNCAqLwpwLlN0cmljaEU0CnsKCW1hcmdpbi10b3A6Mi4wcHQ7CgltYXJnaW4t
-cmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207
-CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDU0
-YV9TdHJpY2hfZTUgKi8KcC5TdHJpY2hFNQp7CgltYXJnaW4tdG9wOjIuMHB0OwoJ
-bWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxl
-ZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsK
-CWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3Js
-YWdlOiA1NGFfU3RyaWNoX2U2ICovCnAuU3RyaWNoRTYKewoJbWFyZ2luLXRvcDoy
-LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1h
-cmdpbi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZTox
-MC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNvbG9yOmJs
-YWNrOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1NGFfU3RyaWNoX2U3ICovCnAuU3Ry
-aWNoRTcKCXsKCW1hcmdpbi10b3A6Mi4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJ
-bWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdo
-dDoxMS4wcHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTog
-NTVfU2NobHVzc3RlaWxBYnMgKi8KcC5TY2hsdXNzdGVpbEFicwp7CgltYXJnaW46
-MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdl
-OiA1Nl9TY2hsdXNzdGVpbFppZmYgKi8KcC5TY2hsdXNzdGVpbFppZmYKewoJbWFy
-Z2luOjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7
-Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9y
-bGFnZTogNTdfU2NobHVzc3RlaWxMaXQgKi8KcC5TY2hsdXNzdGVpbExpdAp7Cglt
-YXJnaW46MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBw
-dDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2
-b3JsYWdlOiA2MV9UYWJUZXh0ICovCnAuVGFiVGV4dAp7CgltYXJnaW46MGNtOwoJ
-bGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFt
-aWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZvcm1h
-dHZvcmxhZ2U6IDYxYV9UYWJUZXh0UmVjaHRzYiAqLwpwLlRhYlRleHRSZWNodHNi
-CnsKCW1hcmdpbjowY207Cgl0ZXh0LWFsaWduOnJpZ2h0OwoJbGluZS1oZWlnaHQ6
-MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDYx
-Yl9UYWJUZXh0WmVudHJpZXJ0ICovCnAuVGFiVGV4dFplbnRyaWVydAp7CgltYXJn
-aW46MGNtOwoJdGV4dC1hbGlnbjpjZW50ZXI7CglsaW5lLWhlaWdodDoxMS4wcHQ7
-Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7Cgljb2xvcjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTogNjFjX1RhYlRl
-eHRCbG9jayAqLwpwLlRhYlRleHRCbG9jawp7CgltYXJnaW46MGNtOwoJdGV4dC1h
-bGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEw
-LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6Ymxh
-Y2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDYyX0tvcGZ6ZWlsZSAqLwpwLktvcGZ6
-ZWlsZQp7CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1h
-cmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpq
-dXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsK
-CWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6ICNDMEMwQzA7
-Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDYzX0Z1w596ZWlsZSAqLwpwLkZ1c3N6ZWls
-ZQp7CgltYXJnaW4tdG9wOjEwLjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJn
-aW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246anVz
-dGlmeTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZTo5LjBwdDsKCWZv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6ICNDMEMwQzA7Cn0K
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDY0X0ZOX0xpbmllICovCnAuRk5MaW5pZQp7Cglt
-YXJnaW4tdG9wOjExLjBwdDsKCW1hcmdpbi1yaWdodDoxMy4wY207CgltYXJnaW4t
-Ym90dG9tOjEuMHB0OwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEu
-MHB0OwoJcGFkZGluZzowY207Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKCWJvcmRlci1ib3R0
-b20tc3R5bGU6IHNvbGlkOwoJYm9yZGVyLWJvdHRvbS1jb2xvcjogR3JheTsKCWJv
-cmRlci1ib3R0b20td2lkdGg6IDFweDsKfQoKLyogRm9ybWF0dm9ybGFnZTogNjVf
-Rk5fVGV4dCAqLwpwLkZOVGV4dAp7CgltYXJnaW46MGNtOwoJdGV4dC1hbGlnbjpq
-dXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjkuMHB0OwoJ
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKfQoK
-LyogRm9ybWF0dm9ybGFnZTogNjZfRk5fWmVpY2hlbiAqLwpzcGFuLkZOWmVpY2hl
-bgp7Cgl2ZXJ0aWNhbC1hbGlnbjpzdXBlcjsKfQoKLyogRm9ybWF0dm9ybGFnZTog
-NjhfVW50ZXJzY2hyTCAqLwpwLlVudGVyc2NockwKewoJbWFyZ2luLXRvcDo4LjBw
-dDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdp
-bi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246bGVmdDsKCWxpbmUtaGVpZ2h0OjExLjBw
-dDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjsKCWNvbG9yOmJsYWNrOwoJZm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogRm9y
-bWF0dm9ybGFnZTogNjlfVW50ZXJzY2hyTSAqLwpwLlVudGVyc2Nock0KewoJbWFy
-Z2luLXRvcDo4LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9t
-OjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246Y2VudGVyOwoJbGlu
-ZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5
-OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cglmb250LXdlaWdodDpi
-b2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA3MV9BbmxhZ2VuYmV6ICovCnAuQW5s
-YWdlbmJlegp7CgltYXJnaW4tdG9wOjguMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsK
-CW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGln
-bjpyaWdodDsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMS4wcHQ7
-Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNvbG9yOmJsYWNrOwoJ
-Zm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogODFfRXJsVWVi
-ZXJzY2hyWiAqLwpwLkVybFVlYmVyc2NocloKewoJbWFyZ2luLXRvcDoxNi4wcHQ7
-CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4t
-bGVmdDowY207Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjExLjBw
-dDsKCXBhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Cglmb250LXNpemU6MTEuMHB0OwoJ
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKCWZv
-bnQtd2VpZ2h0OmJvbGQ7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDgyX0VybFVlYmVy
-c2NockwgKi8KcC5FcmxVZWJlcnNjaHJMCnsKCW1hcmdpbi10b3A6NC4wcHQ7Cglt
-YXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVm
-dDowY207Cgl0ZXh0LWFsaWduOmp1c3RpZnk7CglsaW5lLWhlaWdodDoxMS4wcHQ7
-CglwYWdlLWJyZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1zaXplOjEwLjBwdDsKCWZv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cglmb250
-LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA4M19FcmxUZXh0ICov
-CnAuRXJsVGV4dAp7CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBj
-bTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1h
-bGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEw
-LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3Jt
-YXR2b3JsYWdlOiA4NV9FcmxBdWZ6YWVobGcgLSBub2NoIG5pY2h0IGZlcnRpZyAq
-LwpwLkVybEF1ZnphZWhsZwp7CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFyZ2luLXJp
-Z2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJ
-dGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1z
-aXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29s
-b3I6YmxhY2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDg5X1RHVUVfVWViZXJzY2hy
-U3BhbHRlKi8KcC5UR1VFVWViZXJzY2hyU3BhbHRlCnsKCW1hcmdpbi10b3A6NC4w
-cHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJn
-aW4tbGVmdDowY207Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjEx
-LjBwdDsKCXBhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Cglmb250LXNpemU6MTAuMHB0
-OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsK
-CWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCi8qKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi8qIEZvcm1h
-dHZvcmxhZ2VuIGZ1ZXIgWmVpY2hlbmZvcm1hdGllcnVuZyAgICAgICAgICAgICAg
-ICAgICAgICovCi8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKiovCgovKiBGb3JtYXR2b3JsYWdlOiA5
-OTBfRmVobGVyICovCnNwYW4uRmVobGVyCnsKCWNvbG9yOiByZWQ7Cn0KCi8qIEZv
-cm1hdHZvcmxhZ2U6IDk5MV9HbGRTeW1ib2wgKi8Kc3Bhbi5HbGRTeW1ib2wKewoJ
-Zm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogOTkyX05vcm1h
-bCAqLwpzcGFuLk5vcm1hbAp7Cglmb250LXN0eWxlOiBub3JtYWw7Cn0KCi8qIEZv
-cm1hdHZvcmxhZ2U6IDk5M19GZXR0ICovCnNwYW4uRmV0dAp7Cglmb250LXdlaWdo
-dDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA5OTRfS3Vyc2l2ICovCnNwYW4u
-S3Vyc2l2CnsKCWZvbnQtc3R5bGU6aXRhbGljOwp9CgovKiBGb3JtYXR2b3JsYWdl
-OiA5OTVfVW50ZXJzdHJpY2hlbiAqLwpzcGFuLlVudGVyc3RyaWNoZW4KewoJdGV4
-dC1kZWNvcmF0aW9uOnVuZGVybGluZTsKfQoKLyogRm9ybWF0dm9ybGFnZTogOTk2
-X0dlc3BlcnJ0ICovCnNwYW4uR2VzcGVycnQKewoJbGV0dGVyLXNwYWNpbmc6MS4z
-cHQ7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDk5N19Ib2NoICovCnNwYW4uSG9jaAp7
-Cglmb250LXNpemU6IDUwJTsKCXZlcnRpY2FsLWFsaWduOnN1cGVyOwp9CgovKiBG
-b3JtYXR2b3JsYWdlOiA5OThfVGllZiAqLwpzcGFuLlRpZWYKewoJZm9udC1zaXpl
-OiA1MCU7Cgl2ZXJ0aWNhbC1hbGlnbjpzdWI7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6
-IDk5OV9GZXR0X3VuZF9LdXJzaXYgKi8Kc3Bhbi5GZXR0dW5kS3Vyc2l2CnsKCWZv
-bnQtd2VpZ2h0OmJvbGQ7Cglmb250LXN0eWxlOml0YWxpYzsKfQoKLyogU3RhbmRh
-cmR0YWJzY2hyaXR0d2VpdGUgYXVzIFdvcmQgKi8Kc3Bhbi5TdGFuZGFyZHRhYnVs
-YXRvcgp7Cgl3aWR0aDozNS40NXB0Owp9CgovKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBG
-b3JtYXR2b3JsYWdlbiBkZXIgUGFybGFtZW50c2RpcmVrdGlvbiAgICAgICAgICAg
-ICAgICAgICAgICAqLwovKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwoKcC5QRF9BbGxvbmdlLCBs
-aS5QRF9BbGxvbmdlLCBkaXYuUERfQWxsb25nZQp7CgltYXJnaW4tdG9wOjE0LjBw
-dDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjEwLjBwdDsKCW1h
-cmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246Y2VudGVyOwoJZm9udC1zaXplOjE0
-LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJbGF5b3V0LWdy
-aWQtbW9kZTpsaW5lOwp9CgpwLlBEX0FsbG9uZ2VCLCBsaS5QRF9BbGxvbmdlQiwg
-ZGl2LlBEX0FsbG9uZ2VCCnsKCW1hcmdpbi10b3A6MTQuMHB0OwoJbWFyZ2luLXJp
-Z2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MTAuMHB0OwoJbWFyZ2luLWxlZnQ6MGNt
-OwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJZm9udC1zaXplOjE0LjBwdDsKCWZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJbGF5b3V0LWdyaWQtbW9kZTpsaW5l
-Owp9CgpwLlBEX0FsbG9uZ2VMLCBsaS5QRF9BbGxvbmdlTCwgZGl2LlBEX0FsbG9u
-Z2VMCnsKCW1hcmdpbi10b3A6MTQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1h
-cmdpbi1ib3R0b206MTAuMHB0OwoJbWFyZ2luLWxlZnQ6MGNtOwoJZm9udC1zaXpl
-OjE0LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJbGF5b3V0
-LWdyaWQtbW9kZTpsaW5lOwp9CgpwLlBEX0FudHJhZ3Nmb3JtZWwsIGxpLlBEX0Fu
-dHJhZ3Nmb3JtZWwsIGRpdi5QRF9BbnRyYWdzZm9ybWVsCnsKCW1hcmdpbi10b3A6
-MTQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJ
-bWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWln
-aHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iOwoJbGF5b3V0LWdyaWQtbW9kZTpsaW5lOwp9CgpwLlBEX0Rh
-dHVtLCBsaS5QRF9EYXR1bSwgZGl2LlBEX0RhdHVtCnsKCW1hcmdpbi10b3A6MTQu
-MHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFy
-Z2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6
-MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iOwoJbGF5b3V0LWdyaWQtbW9kZTpsaW5lOwp9CgpwLlBEX0VudHNj
-aGxpZXNzdW5nLCBsaS5QRF9FbnRzY2hsaWVzc3VuZywgZGl2LlBEX0VudHNjaGxp
-ZXNzdW5nCnsKCW1hcmdpbi10b3A6OC4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJ
-bWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdo
-dDoxMS4wcHQ7Cglmb250LXNpemU6MTEuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7CglsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7Cglmb250LXdlaWdo
-dDpib2xkOwp9CgpwLlBEX0sxLCBsaS5QRF9LMSwgZGl2LlBEX0sxCnsKCW1hcmdp
-bjowY207Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWJvcmRlcjpub25lOwoJcGFkZGlu
-ZzowY207Cglmb250LXNpemU6MTIuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7CglsZXR0ZXItc3BhY2luZzotLjRwdDsKCWZvbnQtd2VpZ2h0OmJv
-bGQ7Cn0KCnAuUERfSzFBbmxhZ2UsIGxpLlBEX0sxQW5sYWdlLCBkaXYuUERfSzFB
-bmxhZ2UKewoJbWFyZ2luOjBjbTsKCXRleHQtYWxpZ246cmlnaHQ7Cglmb250LXNp
-emU6MTIuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7CglsZXR0
-ZXItc3BhY2luZzotLjRwdDsKCWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCnAuUERfSzFB
-dXNnLCBsaS5QRF9LMUF1c2csIGRpdi5QRF9LMUF1c2cKewoJbWFyZ2luLXRvcDo2
-Mi45cHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbToyNy4wcHQ7
-CgltYXJnaW4tbGVmdDowY207Cglmb250LXNpemU6MTEuMHB0OwoJZm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7Cglmb250LXdlaWdodDpib2xkOwp9CgpwLlBE
-X0syLCBsaS5QRF9LMiwgZGl2LlBEX0syCnsKCW1hcmdpbi10b3A6MGNtOwoJbWFy
-Z2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MTEuMzVwdDsKCW1hcmdpbi1s
-ZWZ0OjBjbTsKCWZvbnQtc2l6ZToyMi4wcHQ7Cglmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjsKCWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCnAuUERfSzMsIGxpLlBE
-X0szLCBkaXYuUERfSzMKewoJbWFyZ2luLXRvcDowY207CgltYXJnaW4tcmlnaHQ6
-MGNtOwoJbWFyZ2luLWJvdHRvbToyMC4wcHQ7CgltYXJnaW4tbGVmdDowY207Cglm
-b250LXNpemU6MTguMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7
-Cglmb250LXdlaWdodDpib2xkOwp9CgpwLlBEX0s0LCBsaS5QRF9LNCwgZGl2LlBE
-X0s0CnsKCW1hcmdpbi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdp
-bi1ib3R0b206Ni4wcHQ7CgltYXJnaW4tbGVmdDowY207Cglmb250LXNpemU6MTMu
-MHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cglmb250LXdlaWdo
-dDpib2xkOwp9CgpwLlBEX0tvcGZ6ZWlsZSwgbGkuUERfS29wZnplaWxlLCBkaXYu
-UERfS29wZnplaWxlCnsKCW1hcmdpbi10b3A6NC4wcHQ7CgltYXJnaW4tcmlnaHQ6
-MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207Cgl0ZXh0
-LWFsaWduOmp1c3RpZnk7CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6
-MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7CglsYXlvdXQt
-Z3JpZC1tb2RlOmxpbmU7Cn0KCnAuUERfVTEsIGxpLlBEX1UxLCBkaXYuUERfVTEK
-ewoJbWFyZ2luLXRvcDoyMi4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2lu
-LWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4w
-cHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBS
-b21hbiI7Cglmb250LXdlaWdodDpib2xkOwp9CgpwLlBEX1UyLCBsaS5QRF9VMiwg
-ZGl2LlBEX1UyCnsKCW1hcmdpbi10b3A6NS4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNt
-OwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhl
-aWdodDoxMS4wcHQ7Cglmb250LXNpemU6OS4wcHQ7Cglmb250LWZhbWlseToiVGlt
-ZXMgTmV3IFJvbWFuIjsKfQoKcC5QRF9Wb3JsYWdlLCBsaS5QRF9Wb3JsYWdlLCBk
-aXYuUERfVm9ybGFnZQp7CgltYXJnaW4tdG9wOjBjbTsKCW1hcmdpbi1yaWdodDow
-Y207CgltYXJnaW4tYm90dG9tOjEwLjBwdDsKCW1hcmdpbi1sZWZ0OjBjbTsKCXRl
-eHQtYWxpZ246anVzdGlmeTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6
-ZToxMS4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWxheW91
-dC1ncmlkLW1vZGU6bGluZTsKCWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KPC9zdHlsZT4K
-PC9oZWFkPgo8Ym9keT4KPGRpdiBjbGFzcz0icGFwZXJ3Ij4KCgoKCjxwIGNsYXNz
-PSJCREdlc0JsYXR0Ij5CVU5ERVNHRVNFVFpCTEFUVDwvcD4KPHAgY2xhc3M9IlJl
-cE9lc3RlcnIiPkbDnFIgRElFIFJFUFVCTElLIMOWU1RFUlJFSUNIPC9wPgo8dGFi
-bGUgY2xhc3M9InRvcCBib3R0b20gd2kxMDAiPgo8dHI+Cjx0ZD4KPHAgY2xhc3M9
-IkF1c2dhYmVEYXRlbiBBbGlnbkxlZnQiPkphaHJnYW5nIDIwMDQgPC9wPgo8L3Rk
-Pgo8dGQ+CjxwIGNsYXNzPSJBdXNnYWJlRGF0ZW4gQWxpZ25DZW50ZXIiPkF1c2dl
-Z2ViZW4gYW0gMzAuIEF1Z3VzdCAyMDA0IDwvcD4KPC90ZD4KPHRkPgo8cCBjbGFz
-cz0iQXVzZ2FiZURhdGVuIEFsaWduUmlnaHQiPlRlaWwgSUk8L3A+CjwvdGQ+Cjwv
-dHI+CjwvdGFibGU+Cjx0YWJsZSBjbGFzcz0iYm90dG9tIHdpMTAwIj4KPHRyPgo8
-dGQ+CjxwIGNsYXNzPSJLdXJ6dGl0ZWwyIEFsaWduTGVmdCBWQWxpZ25Ub3AiPgo8
-c3BhbiBjbGFzcz0iS3VyenRpdGVsYnJlaXRlIj4zNDEuIFZlcm9yZG51bmc6PC9z
-cGFuPgo8L3A+CjwvdGQ+Cjx0ZD4KPHAgY2xhc3M9Ikt1cnp0aXRlbDIgQWxpZ25M
-ZWZ0Ij7DhG5kZXJ1bmcgZGVyIEFsdGxhc3RlbmF0bGFzLVZPPC9wPgo8L3RkPgo8
-L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0iVGl0ZWwiPjM0MS4gVmVyb3JkbnVuZyBk
-ZXMgQnVuZGVzbWluaXN0ZXJzIGbDvHIgTGFuZC0gdW5kIEZvcnN0d2lydHNjaGFm
-dCwgVW13ZWx0IHVuZCBXYXNzZXJ3aXJ0c2NoYWZ0LCBtaXQgZGVyIGRpZSBBbHRs
-YXN0ZW5hdGxhcy1WTyBnZcOkbmRlcnQgd2lyZDwvcD4KPHAgY2xhc3M9IlByb21L
-bEVpbmxTYXR6Ij5BdWYgR3J1bmQgZGVyIMKnwqfCoDEzIHVuZCAxNCBkZXMgQWx0
-bGFzdGVuc2FuaWVydW5nc2dlc2V0emVzLCBCR0JsLiBOci7CoDI5OS8xOTg5LCBp
-biBkZXIgRmFzc3VuZyBkZXMgQnVuZGVzZ2VzZXR6ZXMgQkdCbC7CoEkgTnIuwqA3
-MS8yMDAzLCB3aXJkIHZlcm9yZG5ldDo8L3A+CjxwIGNsYXNzPSJQcm9tS2xFaW5s
-U2F0eiI+RGllIEFsdGxhc3RlbmF0bGFzLVZPLCBCR0JsLsKgSUkgTnIuwqAyMzIv
-MjAwNCwgd2lyZCB3aWUgZm9sZ3QgZ2XDpG5kZXJ0OjwvcD4KPHAgY2xhc3M9Ik5v
-dkFvMSI+MS4gRGVyIGJpc2hlcmlnZSBUZXh0IGRlcyDCp8KgMiBlcmjDpGx0IGRp
-ZSBBYnNhdHpiZXplaWNobnVuZyDigJ4oMSnigJwgdW5kIGZvbGdlbmRlciBBYnMu
-wqAyIHdpcmQgYW5nZWbDvGd0OjwvcD4KPHAgY2xhc3M9IkFicyI+CuKAnigyKSBE
-aWUgQW5ow6RuZ2XCoDMgdW5kIMKgNCBpbiBkZXIgRmFzc3VuZyBkZXIgVmVyb3Jk
-bnVuZyBCR0JsLsKgSUkgTnIuwqAzNDEvMjAwNCB0cmV0ZW4gbWl0IDE1LsKgU2Vw
-dGVtYmVyIDIwMDQgaW4gS3JhZnQu4oCcCjwvcD4KPHAgY2xhc3M9Ik5vdkFvMSI+
-Mi4gSW0gQW5oYW5nIDMgd2lyZCBmb2xnZW5kZXIgRWludHJhZyBBTFRMQVNUIE41
-NCBhbmdlZsO8Z3Q6PC9wPgo8dGFibGUgY2xhc3M9Ik4xMDBDMCI+Cjx0cj4KPHRk
-IGNsYXNzPSJOMTAwQzkiIGNvbHNwYW49IjIiPgo8cCBjbGFzcz0iRXJsVWViZXJz
-Y2hyTCI+CuKAnkFMVExBU1QgTjU0OiBCZWl6c2NobGFtbWRlcG9uaWUgVGVybml0
-ejwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDBEOSI+CjxwIGNs
-YXNzPSJUYWJUZXh0UmVjaHRzYiI+QmV6aXJrOjwvcD4KPHAgY2xhc3M9IlRhYlRl
-eHRSZWNodHNiIj5HZW1laW5kZTo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRz
-YiI+S2F0YXN0cmFsZ2VtZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0
-c2IiPkdydW5kc3TDvGNrc251bW1lcm46PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4x
-MDBFRiI+CjxwIGNsYXNzPSJUYWJUZXh0Ij5OZXVua2lyY2hlbjwvcD4KPHAgY2xh
-c3M9IlRhYlRleHQiPlRlcm5pdHo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij5EdW5r
-ZWxzdGVpbiAoMjMzMDMpPC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+NzM0LzE8L3A+
-CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAxMDgiPgo8cCBjbGFzcz0i
-VGFiVGV4dFJlY2h0c2IiPkFydCBkZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0ZCBj
-bGFzcz0iTjEwMTEyIj4KPHAgY2xhc3M9IlRhYlRleHQiPkFsdGFibGFnZXJ1bmc8
-L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAxMUYiPgo8cCBjbGFz
-cz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBBbHRsYXN0YXVzd2Vpc3VuZzo8
-L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMTI5Ij4KPHAgY2xhc3M9IlRhYlRleHQi
-PjE1LjkuMjAwNDwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDEz
-NiI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+UHJpb3JpdMOkdGVua2xhc3Nl
-OjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAxNDAiPgo8cCBjbGFzcz0iVGFiVGV4
-dCI+MjwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDE0RCI+Cjxw
-IGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+RGF0dW0gZGVyIFByaW9yaXTDpHRlbmts
-YXNzaWZpemllcnVuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMTU3Ij4KPHAg
-Y2xhc3M9IlRhYlRleHQiPjE1LjkuMjAwNOKAnAo8L3A+CjwvdGQ+CjwvdHI+Cjwv
-dGFibGU+CjxwIGNsYXNzPSJBYnN0YW5kIj48L3A+CjxwIGNsYXNzPSJOb3ZBbzEi
-PjMuIEltIEFuaGFuZyA0IGxhdXRldCBkZXIgRWludHJhZyBBTFRMQVNUIE81MDo8
-L3A+Cjx0YWJsZSBjbGFzcz0iTjEwMTZCIj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDE3
-NCIgY29sc3Bhbj0iMiI+CjxwIGNsYXNzPSJFcmxVZWJlcnNjaHJMIj4K4oCeQUxU
-TEFTVCBPNTA6IFNjaHdlbGxlbmltcHLDpGduaWVydW5nIFNjaG5lZWdhdHRlcm48
-L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAxODQiPgo8cCBjbGFz
-cz0iVGFiVGV4dFJlY2h0c2IiPkJlemlyazo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0
-UmVjaHRzYiI+R2VtZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2Ii
-PkthdGFzdHJhbGdlbWVpbmRlOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNi
-Ij5HcnVuZHN0w7xja3NudW1tZXJuOjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAx
-OUEiPgo8cCBjbGFzcz0iVGFiVGV4dCI+QnJhdW5hdSBhbSBJbm48L3A+CjxwIGNs
-YXNzPSJUYWJUZXh0Ij5MZW5nYXU8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij5LcmVu
-d2FsZCAoNDAxMTQpPC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+NDcwLzEsIDUyMy81
-LCA2MDQvMywgOTU2LCA5ODUvNCwgOTg2Lzc8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4K
-PHRkIGNsYXNzPSJOMTAxQjMiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkFy
-dCBkZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMUJEIj4KPHAg
-Y2xhc3M9IlRhYlRleHQiPkFsdHN0YW5kb3J0PC9wPgo8L3RkPgo8L3RyPgo8dHI+
-Cjx0ZCBjbGFzcz0iTjEwMUNBIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5E
-YXR1bSBkZXIgQWx0bGFzdGF1c3dlaXN1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9
-Ik4xMDFENCI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4yMS44LjIwMDE8L3A+CjwvdGQ+
-CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAxRTEiPgo8cCBjbGFzcz0iVGFiVGV4
-dFJlY2h0c2IiPlByaW9yaXTDpHRlbmtsYXNzZTo8L3A+CjwvdGQ+Cjx0ZCBjbGFz
-cz0iTjEwMUVCIj4KPHAgY2xhc3M9IlRhYlRleHQiPjM8L3A+CjwvdGQ+CjwvdHI+
-Cjx0cj4KPHRkIGNsYXNzPSJOMTAxRjgiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0
-c2IiPkRhdHVtIGRlciBQcmlvcml0w6R0ZW5rbGFzc2lmaXppZXJ1bmc6PC9wPgo8
-L3RkPgo8dGQgY2xhc3M9Ik4xMDIwMiI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4xNS45
-LjIwMDTigJwKPC9wPgo8L3RkPgo8L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0iQWJz
-dGFuZCI+PC9wPgo8cCBjbGFzcz0iTm92QW8xIj40LiBJbSBBbmhhbmcgNCBsYXV0
-ZW4gZGllIEVpbnRyw6RnZSBBTFRMQVNUIE82MCBiaXMgTzYyOjwvcD4KPHRhYmxl
-IGNsYXNzPSJOMTAyMTYiPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMjFGIiBjb2xzcGFu
-PSIyIj4KPHAgY2xhc3M9IkVybFVlYmVyc2NockwiPgrigJ5BTFRMQVNUIE82MDog
-UHV0emVyZWkgRXhjbHVzaXYgU2Nod2FiPC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0
-ZCBjbGFzcz0iTjEwMjJGIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5CZXpp
-cms6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdlbWVpbmRlOjwvcD4K
-PHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5LYXRhc3RyYWxnZW1laW5kZTo8L3A+
-CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+R3J1bmRzdMO8Y2tzbnVtbWVybjo8
-L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMjQ1Ij4KPHAgY2xhc3M9IlRhYlRleHQi
-Pkxpbno8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0i
-VGFiVGV4dCI+VXJmYWhyICg0NTIxMik8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij4u
-MzE4Lzc8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAyNUUiPgo8
-cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkFydCBkZXIgQWx0bGFzdDo8L3A+Cjwv
-dGQ+Cjx0ZCBjbGFzcz0iTjEwMjY4Ij4KPHAgY2xhc3M9IlRhYlRleHQiPkFsdHN0
-YW5kb3J0PC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMjc1Ij4K
-PHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5EYXR1bSBkZXIgQWx0bGFzdGF1c3dl
-aXN1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDI3RiI+CjxwIGNsYXNzPSJU
-YWJUZXh0Ij4yOS44LjIwMDM8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNz
-PSJOMTAyOEMiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPlByaW9yaXTDpHRl
-bmtsYXNzZTo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMjk2Ij4KPHAgY2xhc3M9
-IlRhYlRleHQiPjE8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAy
-QTMiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBQcmlvcml0
-w6R0ZW5rbGFzc2lmaXppZXJ1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDJB
-RCI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4xNS45LjIwMDQ8L3A+CjwvdGQ+CjwvdHI+
-CjwvdGFibGU+CjxwIGNsYXNzPSJBYnN0YW5kIj48L3A+Cjx0YWJsZSBjbGFzcz0i
-TjEwMkJCIj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDJDNCIgY29sc3Bhbj0iMiI+Cjxw
-IGNsYXNzPSJFcmxVZWJlcnNjaHJMIj5BTFRMQVNUIE82MTogUHV0emVyZWkgU3rD
-tnRzPC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMkQyIj4KPHAg
-Y2xhc3M9IlRhYlRleHRSZWNodHNiIj5CZXppcms6PC9wPgo8cCBjbGFzcz0iVGFi
-VGV4dFJlY2h0c2IiPkdlbWVpbmRlOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNo
-dHNiIj5LYXRhc3RyYWxnZW1laW5kZTo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVj
-aHRzYiI+R3J1bmRzdMO8Y2tzbnVtbWVybjo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0i
-TjEwMkU4Ij4KPHAgY2xhc3M9IlRhYlRleHQiPkxpbno8L3A+CjxwIGNsYXNzPSJU
-YWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+VXJmYWhyICg0NTIx
-Mik8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij4uOTAwPC9wPgo8L3RkPgo8L3RyPgo8
-dHI+Cjx0ZCBjbGFzcz0iTjEwMzAxIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNi
-Ij5BcnQgZGVyIEFsdGxhc3Q6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDMwQiI+
-CjxwIGNsYXNzPSJUYWJUZXh0Ij5BbHRzdGFuZG9ydDwvcD4KPC90ZD4KPC90cj4K
-PHRyPgo8dGQgY2xhc3M9Ik4xMDMxOCI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRz
-YiI+RGF0dW0gZGVyIEFsdGxhc3RhdXN3ZWlzdW5nOjwvcD4KPC90ZD4KPHRkIGNs
-YXNzPSJOMTAzMjIiPgo8cCBjbGFzcz0iVGFiVGV4dCI+MTUuOS4yMDAzPC9wPgo8
-L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMzJGIj4KPHAgY2xhc3M9IlRh
-YlRleHRSZWNodHNiIj5Qcmlvcml0w6R0ZW5rbGFzc2U6PC9wPgo8L3RkPgo8dGQg
-Y2xhc3M9Ik4xMDMzOSI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4yPC9wPgo8L3RkPgo8
-L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMzQ2Ij4KPHAgY2xhc3M9IlRhYlRleHRS
-ZWNodHNiIj5EYXR1bSBkZXIgUHJpb3JpdMOkdGVua2xhc3NpZml6aWVydW5nOjwv
-cD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAzNTAiPgo8cCBjbGFzcz0iVGFiVGV4dCI+
-MTUuOS4yMDA0PC9wPgo8L3RkPgo8L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0iQWJz
-dGFuZCI+PC9wPgo8dGFibGUgY2xhc3M9Ik4xMDM1RSI+Cjx0cj4KPHRkIGNsYXNz
-PSJOMTAzNjciIGNvbHNwYW49IjIiPgo8cCBjbGFzcz0iRXJsVWViZXJzY2hyTCI+
-QUxUTEFTVCBPNjI6IFB1dHplcmVpIFNjaHdhYi1Ob3JnZTwvcD4KPC90ZD4KPC90
-cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDM3NSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVj
-aHRzYiI+QmV6aXJrOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5HZW1l
-aW5kZTo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+S2F0YXN0cmFsZ2Vt
-ZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdydW5kc3TDvGNr
-c251bW1lcm46PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDM4QiI+CjxwIGNsYXNz
-PSJUYWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+TGluejwvcD4K
-PHAgY2xhc3M9IlRhYlRleHQiPlVyZmFociAoNDUyMTIpPC9wPgo8cCBjbGFzcz0i
-VGFiVGV4dCI+LjQ2NjwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4x
-MDNBNCI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+QXJ0IGRlciBBbHRsYXN0
-OjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAzQUUiPgo8cCBjbGFzcz0iVGFiVGV4
-dCI+QWx0c3RhbmRvcnQ8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJO
-MTAzQkIiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBBbHRs
-YXN0YXVzd2Vpc3VuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwM0M1Ij4KPHAg
-Y2xhc3M9IlRhYlRleHQiPjEwLjkuMjAwMzwvcD4KPC90ZD4KPC90cj4KPHRyPgo8
-dGQgY2xhc3M9Ik4xMDNEMiI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+UHJp
-b3JpdMOkdGVua2xhc3NlOjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAzREMiPgo8
-cCBjbGFzcz0iVGFiVGV4dCI+MTwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xh
-c3M9Ik4xMDNFOSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+RGF0dW0gZGVy
-IFByaW9yaXTDpHRlbmtsYXNzaWZpemllcnVuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFz
-cz0iTjEwM0YzIj4KPHAgY2xhc3M9IlRhYlRleHQiPjE1LjkuMjAwNOKAnAo8L3A+
-CjwvdGQ+CjwvdHI+CjwvdGFibGU+CjxwIGNsYXNzPSJBYnN0YW5kIj48L3A+Cjxw
-IGNsYXNzPSJOb3ZBbzEiPjUuIEltIEFuaGFuZyA0IGxhdXRldCBkZXIgRWludHJh
-ZyBBTFRMQVNUIE82NDo8L3A+Cjx0YWJsZSBjbGFzcz0iTjEwNDA3Ij4KPHRyPgo8
-dGQgY2xhc3M9Ik4xMDQxMCIgY29sc3Bhbj0iMiI+CjxwIGNsYXNzPSJFcmxVZWJl
-cnNjaHJMIj4K4oCeQUxUTEFTVCBPNjQ6IEtpdHptYW50ZWw8L3A+CjwvdGQ+Cjwv
-dHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA0MjAiPgo8cCBjbGFzcz0iVGFiVGV4dFJl
-Y2h0c2IiPkJlemlyazo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+R2Vt
-ZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkthdGFzdHJhbGdl
-bWVpbmRlOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5HcnVuZHN0w7xj
-a3NudW1tZXJuOjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTA0MzYiPgo8cCBjbGFz
-cz0iVGFiVGV4dCI+R211bmRlbjwvcD4KPHAgY2xhc3M9IlRhYlRleHQiPlZvcmNo
-ZG9yZjwvcD4KPHAgY2xhc3M9IlRhYlRleHQiPlZvcmNoZG9yZiAoNDIxNjQpPC9w
-Pgo8cCBjbGFzcz0iVGFiVGV4dCI+Mzc2LzE8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4K
-PHRkIGNsYXNzPSJOMTA0NEYiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkFy
-dCBkZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwNDU5Ij4KPHAg
-Y2xhc3M9IlRhYlRleHQiPkFsdGFibGFnZXJ1bmc8L3A+CjwvdGQ+CjwvdHI+Cjx0
-cj4KPHRkIGNsYXNzPSJOMTA0NjYiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2Ii
-PkRhdHVtIGRlciBBbHRsYXN0YXVzd2Vpc3VuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFz
-cz0iTjEwNDcwIj4KPHAgY2xhc3M9IlRhYlRleHQiPjI1LjEyLjIwMDM8L3A+Cjwv
-dGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA0N0QiPgo8cCBjbGFzcz0iVGFi
-VGV4dFJlY2h0c2IiPlByaW9yaXTDpHRlbmtsYXNzZTo8L3A+CjwvdGQ+Cjx0ZCBj
-bGFzcz0iTjEwNDg3Ij4KPHAgY2xhc3M9IlRhYlRleHQiPjM8L3A+CjwvdGQ+Cjwv
-dHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA0OTQiPgo8cCBjbGFzcz0iVGFiVGV4dFJl
-Y2h0c2IiPkRhdHVtIGRlciBQcmlvcml0w6R0ZW5rbGFzc2lmaXppZXJ1bmc6PC9w
-Pgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDQ5RSI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4x
-NS45LjIwMDTigJwKPC9wPgo8L3RkPgo8L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0i
-QWJzdGFuZCI+PC9wPgo8cCBjbGFzcz0iTm92QW8xIj42LiBJbSBBbmhhbmcgNCB3
-ZXJkZW4gZm9sZ2VuZGUgRWludHLDpGdlIEFMVExBU1QgTzY1IGJpcyBPNjcgYW5n
-ZWbDvGd0OjwvcD4KPHRhYmxlIGNsYXNzPSJOMTA0QjIiPgo8dHI+Cjx0ZCBjbGFz
-cz0iTjEwNEJCIiBjb2xzcGFuPSIyIj4KPHAgY2xhc3M9IkVybFVlYmVyc2Nockwi
-PgrigJ5BTFRMQVNUIE82NTogUmFwcGVyc2JlcmdlciBDaGVtaWthbGllbjwvcD4K
-PC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDRDQiI+CjxwIGNsYXNzPSJU
-YWJUZXh0UmVjaHRzYiI+QmV6aXJrOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNo
-dHNiIj5HZW1laW5kZTo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+S2F0
-YXN0cmFsZ2VtZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdy
-dW5kc3TDvGNrc251bW1lcm46PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDRFMSI+
-CjxwIGNsYXNzPSJUYWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+
-TGluejwvcD4KPHAgY2xhc3M9IlRhYlRleHQiPlVyZmFociAoNDUyMTIpPC9wPgo8
-cCBjbGFzcz0iVGFiVGV4dCI+NDgyLzE8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRk
-IGNsYXNzPSJOMTA0RkEiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkFydCBk
-ZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwNTA0Ij4KPHAgY2xh
-c3M9IlRhYlRleHQiPkFsdHN0YW5kb3J0PC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0
-ZCBjbGFzcz0iTjEwNTExIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5EYXR1
-bSBkZXIgQWx0bGFzdGF1c3dlaXN1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4x
-MDUxQiI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4xNS45LjIwMDQ8L3A+CjwvdGQ+Cjwv
-dHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1MjgiPgo8cCBjbGFzcz0iVGFiVGV4dFJl
-Y2h0c2IiPlByaW9yaXTDpHRlbmtsYXNzZTo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0i
-TjEwNTMyIj4KPHAgY2xhc3M9IlRhYlRleHQiPi08L3A+CjwvdGQ+CjwvdHI+Cjx0
-cj4KPHRkIGNsYXNzPSJOMTA1M0YiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2Ii
-PkRhdHVtIGRlciBQcmlvcml0w6R0ZW5rbGFzc2lmaXppZXJ1bmc6PC9wPgo8L3Rk
-Pgo8dGQgY2xhc3M9Ik4xMDU0OSI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4tPC9wPgo8
-L3RkPgo8L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0iQWJzdGFuZCI+PC9wPgo8dGFi
-bGUgY2xhc3M9Ik4xMDU1NyI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1NjAiIGNvbHNw
-YW49IjIiPgo8cCBjbGFzcz0iRXJsVWViZXJzY2hyTCI+QUxUTEFTVCBPNjY6IFB1
-dHplcmVpIEvDpGZlcmLDtmNrPC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFz
-cz0iTjEwNTZFIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5CZXppcms6PC9w
-Pgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdlbWVpbmRlOjwvcD4KPHAgY2xh
-c3M9IlRhYlRleHRSZWNodHNiIj5LYXRhc3RyYWxnZW1laW5kZTo8L3A+CjxwIGNs
-YXNzPSJUYWJUZXh0UmVjaHRzYiI+R3J1bmRzdMO8Y2tzbnVtbWVybjo8L3A+Cjwv
-dGQ+Cjx0ZCBjbGFzcz0iTjEwNTg0Ij4KPHAgY2xhc3M9IlRhYlRleHQiPkxpbno8
-L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4
-dCI+VXJmYWhyICg0NTIxMik8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij4uMzcyLzI8
-L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1OUQiPgo8cCBjbGFz
-cz0iVGFiVGV4dFJlY2h0c2IiPkFydCBkZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0
-ZCBjbGFzcz0iTjEwNUE3Ij4KPHAgY2xhc3M9IlRhYlRleHQiPkFsdHN0YW5kb3J0
-PC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwNUI0Ij4KPHAgY2xh
-c3M9IlRhYlRleHRSZWNodHNiIj5EYXR1bSBkZXIgQWx0bGFzdGF1c3dlaXN1bmc6
-PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDVCRSI+CjxwIGNsYXNzPSJUYWJUZXh0
-Ij4xNS45LjIwMDQ8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1
-Q0IiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPlByaW9yaXTDpHRlbmtsYXNz
-ZTo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwNUQ1Ij4KPHAgY2xhc3M9IlRhYlRl
-eHQiPjE8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1RTIiPgo8
-cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBQcmlvcml0w6R0ZW5r
-bGFzc2lmaXppZXJ1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDVFQyI+Cjxw
-IGNsYXNzPSJUYWJUZXh0Ij4xNS45LjIwMDQ8L3A+CjwvdGQ+CjwvdHI+CjwvdGFi
-bGU+CjxwIGNsYXNzPSJBYnN0YW5kIj48L3A+Cjx0YWJsZSBjbGFzcz0iTjEwNUZB
-Ij4KPHRyPgo8dGQgY2xhc3M9Ik4xMDYwMyIgY29sc3Bhbj0iMiI+CjxwIGNsYXNz
-PSJFcmxVZWJlcnNjaHJMIj5BTFRMQVNUIE82NzogQlAtVGFua2xhZ2VyIExpbnog
-MSBhbHQgLSBTY2hhZGVuc2ZhbGwgU0YyQTwvcD4KPC90ZD4KPC90cj4KPHRyPgo8
-dGQgY2xhc3M9Ik4xMDYxMSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+QmV6
-aXJrOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5HZW1laW5kZTo8L3A+
-CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+S2F0YXN0cmFsZ2VtZWluZGU6PC9w
-Pgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdydW5kc3TDvGNrc251bW1lcm46
-PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDYyNyI+CjxwIGNsYXNzPSJUYWJUZXh0
-Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+TGluejwvcD4KPHAgY2xhc3M9
-IlRhYlRleHQiPkx1c3RlbmF1ICg0NTIwNCk8L3A+CjxwIGNsYXNzPSJUYWJUZXh0
-Ij4xNDg1LzIsIDE0ODUvODwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9
-Ik4xMDY0MCI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+QXJ0IGRlciBBbHRs
-YXN0OjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTA2NEEiPgo8cCBjbGFzcz0iVGFi
-VGV4dCI+QWx0c3RhbmRvcnQ8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNz
-PSJOMTA2NTciPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBB
-bHRsYXN0YXVzd2Vpc3VuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwNjYxIj4K
-PHAgY2xhc3M9IlRhYlRleHQiPjE1LjkuMjAwNDwvcD4KPC90ZD4KPC90cj4KPHRy
-Pgo8dGQgY2xhc3M9Ik4xMDY2RSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+
-UHJpb3JpdMOkdGVua2xhc3NlOjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTA2Nzgi
-Pgo8cCBjbGFzcz0iVGFiVGV4dCI+MzwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQg
-Y2xhc3M9Ik4xMDY4NSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+RGF0dW0g
-ZGVyIFByaW9yaXTDpHRlbmtsYXNzaWZpemllcnVuZzo8L3A+CjwvdGQ+Cjx0ZCBj
-bGFzcz0iTjEwNjhGIj4KPHAgY2xhc3M9IlRhYlRleHQiPjE1LjkuMjAwNOKAnAo8
-L3A+CjwvdGQ+CjwvdHI+CjwvdGFibGU+CjxwIGNsYXNzPSJVbnRlcnNjaHJMIj5Q
-csO2bGw8L3A+Cgo8cCBjbGFzcz0iRnVzc3plaWxlIj53d3cucmlzLmJrYS5ndi5h
-dDwvcD4KPC9kaXY+CjwvYm9keT4KCjwvaHRtbD4=</sl11:Base64Content></sl11:HashInputData><sl11:SignatureCheck><sl11:Code>0</sl11:Code></sl11:SignatureCheck><sl11:SignatureManifestCheck><sl11:Code>98</sl11:Code></sl11:SignatureManifestCheck><sl11:SignatureManifestCheck><sl11:Code>0</sl11:Code></sl11:SignatureManifestCheck><sl11:CertificateCheck><sl10:Code>1</sl10:Code></sl11:CertificateCheck></sl11:VerifyXMLSignatureResponse>
diff --git a/spss.slinterface/test/moa-wartung-la9/verifyResponse.341_2004.utf8.xml b/spss.slinterface/test/moa-wartung-la9/verifyResponse.341_2004.utf8.xml
deleted file mode 100644
index 866d96f85..000000000
--- a/spss.slinterface/test/moa-wartung-la9/verifyResponse.341_2004.utf8.xml
+++ /dev/null
@@ -1,1166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sl11:VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" 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:SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Christian Wregar,OU=Verfassungsdienst,O=Bundeskanzleramt der Republik \C3\96sterreich,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=a-sign-corporate-light-01,OU=a-sign-corporate-light-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>21221</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIE4TCCA8mgAwIBAgICUuUwDQYJKoZIhvcNAQEFBQAwgZ8xCzAJBgNVBAYTAkFU
-MUgwRgYDVQQKEz9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGlt
-IGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxIjAgBgNVBAsTGWEtc2lnbi1jb3Jw
-b3JhdGUtbGlnaHQtMDExIjAgBgNVBAMTGWEtc2lnbi1jb3Jwb3JhdGUtbGlnaHQt
-MDEwHhcNMDMxMjEwMTcyMzA3WhcNMDYxMjEwMTcyMzA3WjCBnzELMAkGA1UEBhMC
-QVQxWTBXBgNVBAoeUABCAHUAbgBkAGUAcwBrAGEAbgB6AGwAZQByAGEAbQB0ACAA
-ZABlAHIAIABSAGUAcAB1AGIAbABpAGsAIADWAHMAdABlAHIAcgBlAGkAYwBoMRow
-GAYDVQQLExFWZXJmYXNzdW5nc2RpZW5zdDEZMBcGA1UEAxMQQ2hyaXN0aWFuIFdy
-ZWdhcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv7Z6w9XhQLoIxipExnL7
-go/rp5Leh/y0E8mjS7XKe4acgmb/+p7cyAIzDjSY4Jse4xz9cKb+0hrEyKJjvR61
-Tl4lJxQsdYan3rLqcruPlC0GRkAgiiRdLwvAaAUBqzYxzTjKvdZBdcnuY+S2Ad1Z
-5N5zAF2XRzykcsmLRZvpvJ8CAwEAAaOCAacwggGjMAkGA1UdEwQCMAAwEQYDVR0O
-BAoECEhNunRQSAFFMF0GA1UdIARWMFQwUgYHKigAEQEOATBHMEUGCCsGAQUFBwIB
-FjlodHRwOi8vd3d3LmEtdHJ1c3QuYXQvZG9jcy9jcC9hc2lnbi1nb3Zlcm5tZW50
-LXNlcnZlci5wZGYwEwYDVR0jBAwwCoAITp5/1C/JHx8wfwYIKwYBBQUHAQEEczBx
-MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRydXN0LmF0L29jc3AwRgYIKwYB
-BQUHMAKGOmh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9hLXNpZ24tY29ycG9y
-YXRlLWxpZ2h0LTAxYS5jcnQwDgYDVR0PAQH/BAQDAgeAMG4GA1UdHwRnMGUwY6Bh
-oF+GXWxkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1s
-aWdodC0wMSxvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0
-PzAOBgcqKAAKAQEBBAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFIWZVsrHNwZDSkE
-44Cyc1cCJU49CrjsX7OPG43notq9JPRPMvbVAOrN3g0H8x2oOSYoxscKut1IqLxc
-xUVKYuCZEQBj0FZTYLFIuK8//vPOwmTSTBKMjKZpkkxfdcM5JX+nGdJgfqndjqPw
-e9lZ213EMIEfEf1Nfr5R0MNk1uCUg9diqEpDcUdVks2KN4/zQVuNRlGFgM+y8E2N
-VFopTtCBhSj6nuxeIbpbEOmjuAfF5zoVAJg4nj4DKJC8oiaY+KR+817fXpHclzxd
-f1s0aVpqdOf7Dc0FXjrCBGKpyjcN4Qj9zioy5J6awkiWDF9CQICxwt4TYB1lS8Vx
-Z+ghQ0g=</dsig:X509Certificate><moa:PublicAuthority/></dsig:X509Data></sl11:SignerInfo><sl11:HashInputData PartOf="SignedInfo"><sl11:Base64Content>PGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgo8aGVh
-ZD4KPHRpdGxlPmVSZWNodCBYSFRNTCAxLjEgRG9rdW1lbnQ8L3RpdGxlPgo8c3R5
-bGUgdHlwZT0idGV4dC9jc3MiPgogIAogICAgLk4xMDBDMCB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwMEM5IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTAwRDkgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-MEVGIHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwMTA4IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDExMiB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDExRiB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTAxMjkgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAxMzYgeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMTQwIHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMTREIHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDE1NyB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogIAog
-ICAgLk4xMDE2QiB7IHdpZHRoOjU2NzsgYm9yZGVyOjFweCBzb2xpZCBibGFjazsg
-Ym9yZGVyLXNwYWNpbmc6MDsgcGFkZGluZzowO3dpZHRoOjE1LjBjbTtib3JkZXIt
-Y29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVyOm5vbmV9CiAgCiAgCiAgICAuTjEwMTc0
-IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTUuMGNtO2Jv
-cmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1
-cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAxODQgeyB3aWR0aDoyMDk7IHZlcnRp
-Y2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0
-IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMTlBIHsgd2lkdGg6MzU4OyB2ZXJ0aWNh
-bC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRl
-ci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBw
-dDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoy
-Ljg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMUIzIHsgd2lkdGg6
-MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44
-NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDFCRCB7IHdpZHRoOjM1
-ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6
-bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRv
-d3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7
-IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDFD
-QSB7IHdpZHRoOjIwOTsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7
-Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IGJvcmRlci10b3A6bm9uZTtw
-YWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAxRDQg
-eyB3aWR0aDozNTg7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoyNjguMjVwdDti
-b3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxlZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpz
-b2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2JvcmRlci1yaWdodDpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0K
-ICAgIC5OMTAxRTEgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0
-aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXIt
-dG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAg
-ICAuTjEwMUVCIHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6
-MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRl
-ci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVw
-dCAyLjg1cHR9CiAgICAuTjEwMUY4IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGln
-bjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBw
-dDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQg
-Mi44NXB0fQogICAgLk4xMDIwMiB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246
-dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDog
-bm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVy
-LXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIu
-ODVwdCAyLjg1cHQgMi44NXB0fQogIAogICAgLk4xMDIxNiB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwMjFGIHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTAyMkYgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-MjQ1IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwMjVFIHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDI2OCB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDI3NSB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTAyN0YgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAyOEMgeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMjk2IHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMkEzIHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDJBRCB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogIAog
-ICAgLk4xMDJCQiB7IHdpZHRoOjU2NzsgYm9yZGVyOjFweCBzb2xpZCBibGFjazsg
-Ym9yZGVyLXNwYWNpbmc6MDsgcGFkZGluZzowO3dpZHRoOjE1LjBjbTtib3JkZXIt
-Y29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVyOm5vbmV9CiAgCiAgCiAgICAuTjEwMkM0
-IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTUuMGNtO2Jv
-cmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1
-cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAyRDIgeyB3aWR0aDoyMDk7IHZlcnRp
-Y2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0
-IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMkU4IHsgd2lkdGg6MzU4OyB2ZXJ0aWNh
-bC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRl
-ci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBw
-dDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoy
-Ljg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwMzAxIHsgd2lkdGg6
-MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44
-NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDMwQiB7IHdpZHRoOjM1
-ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6
-bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRv
-d3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7
-IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDMx
-OCB7IHdpZHRoOjIwOTsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7
-Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IGJvcmRlci10b3A6bm9uZTtw
-YWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAzMjIg
-eyB3aWR0aDozNTg7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoyNjguMjVwdDti
-b3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxlZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpz
-b2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2JvcmRlci1yaWdodDpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0K
-ICAgIC5OMTAzMkYgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0
-aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXIt
-dG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAg
-ICAuTjEwMzM5IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6
-MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRl
-ci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVw
-dCAyLjg1cHR9CiAgICAuTjEwMzQ2IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGln
-bjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBw
-dDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQg
-Mi44NXB0fQogICAgLk4xMDM1MCB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246
-dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDog
-bm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVy
-LXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIu
-ODVwdCAyLjg1cHQgMi44NXB0fQogIAogICAgLk4xMDM1RSB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwMzY3IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTAzNzUgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-MzhCIHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwM0E0IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDNBRSB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDNCQiB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTAzQzUgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTAzRDIgeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwM0RDIHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwM0U5IHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDNGMyB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogIAog
-ICAgLk4xMDQwNyB7IHdpZHRoOjU2NzsgYm9yZGVyOjFweCBzb2xpZCBibGFjazsg
-Ym9yZGVyLXNwYWNpbmc6MDsgcGFkZGluZzowO3dpZHRoOjE1LjBjbTtib3JkZXIt
-Y29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVyOm5vbmV9CiAgCiAgCiAgICAuTjEwNDEw
-IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTUuMGNtO2Jv
-cmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1
-cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA0MjAgeyB3aWR0aDoyMDk7IHZlcnRp
-Y2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0
-IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNDM2IHsgd2lkdGg6MzU4OyB2ZXJ0aWNh
-bC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRl
-ci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBw
-dDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoy
-Ljg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNDRGIHsgd2lkdGg6
-MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44
-NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDQ1OSB7IHdpZHRoOjM1
-ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6
-bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRv
-d3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7
-IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDQ2
-NiB7IHdpZHRoOjIwOTsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7
-Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IGJvcmRlci10b3A6bm9uZTtw
-YWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA0NzAg
-eyB3aWR0aDozNTg7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoyNjguMjVwdDti
-b3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxlZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpz
-b2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2JvcmRlci1yaWdodDpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0K
-ICAgIC5OMTA0N0QgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0
-aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXIt
-dG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAg
-ICAuTjEwNDg3IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6
-MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRl
-ci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVw
-dCAyLjg1cHR9CiAgICAuTjEwNDk0IHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGln
-bjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBw
-dDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQg
-Mi44NXB0fQogICAgLk4xMDQ5RSB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246
-dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDog
-bm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVy
-LXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIu
-ODVwdCAyLjg1cHQgMi44NXB0fQogIAogICAgLk4xMDRCMiB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwNEJCIHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTA0Q0IgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-NEUxIHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwNEZBIHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDUwNCB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDUxMSB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTA1MUIgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA1MjggeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNTMyIHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNTNGIHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDU0OSB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogIAog
-ICAgLk4xMDU1NyB7IHdpZHRoOjU2NzsgYm9yZGVyOjFweCBzb2xpZCBibGFjazsg
-Ym9yZGVyLXNwYWNpbmc6MDsgcGFkZGluZzowO3dpZHRoOjE1LjBjbTtib3JkZXIt
-Y29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVyOm5vbmV9CiAgCiAgCiAgICAuTjEwNTYw
-IHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTUuMGNtO2Jv
-cmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1
-cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA1NkUgeyB3aWR0aDoyMDk7IHZlcnRp
-Y2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0
-IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNTg0IHsgd2lkdGg6MzU4OyB2ZXJ0aWNh
-bC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRl
-ci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBw
-dDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoy
-Ljg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNTlEIHsgd2lkdGg6
-MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44
-NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDVBNyB7IHdpZHRoOjM1
-ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6
-bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRv
-d3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7
-IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDVC
-NCB7IHdpZHRoOjIwOTsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7
-Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IGJvcmRlci10b3A6bm9uZTtw
-YWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA1QkUg
-eyB3aWR0aDozNTg7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoyNjguMjVwdDti
-b3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxlZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpz
-b2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2JvcmRlci1yaWdodDpzb2xpZCB3aW5kb3d0
-ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0K
-ICAgIC5OMTA1Q0IgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0
-aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXIt
-dG9wOm5vbmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAg
-ICAuTjEwNUQ1IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6
-MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRl
-ci1ib3R0b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29s
-aWQgd2luZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVw
-dCAyLjg1cHR9CiAgICAuTjEwNUUyIHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGln
-bjp0b3A7d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBw
-dDsgYm9yZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQg
-Mi44NXB0fQogICAgLk4xMDVFQyB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246
-dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDog
-bm9uZTtib3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVy
-LXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIu
-ODVwdCAyLjg1cHQgMi44NXB0fQogIAogICAgLk4xMDVGQSB7IHdpZHRoOjU2Nzsg
-Ym9yZGVyOjFweCBzb2xpZCBibGFjazsgYm9yZGVyLXNwYWNpbmc6MDsgcGFkZGlu
-ZzowO3dpZHRoOjE1LjBjbTtib3JkZXItY29sbGFwc2U6Y29sbGFwc2U7Ym9yZGVy
-Om5vbmV9CiAgCiAgCiAgICAuTjEwNjAzIHsgd2lkdGg6NTY3OyB2ZXJ0aWNhbC1h
-bGlnbjp0b3A7d2lkdGg6MTUuMGNtO2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEu
-MHB0OyBwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5O
-MTA2MTEgeyB3aWR0aDoyMDk7IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcu
-MHB0O2JvcmRlcjpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5v
-bmU7cGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEw
-NjI3IHsgd2lkdGg6MzU4OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1
-cHQ7Ym9yZGVyLXRvcDpub25lO2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0
-b206c29saWQgd2luZG93dGV4dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2lu
-ZG93dGV4dCAxLjBwdDsgcGFkZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1
-cHR9CiAgICAuTjEwNjQwIHsgd2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7
-d2lkdGg6MTU3LjBwdDtib3JkZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9y
-ZGVyLXRvcDpub25lO3BhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0
-fQogICAgLk4xMDY0QSB7IHdpZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dp
-ZHRoOjI2OC4yNXB0O2JvcmRlci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTti
-b3JkZXItYm90dG9tOnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0
-OnNvbGlkIHdpbmRvd3RleHQgMS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAy
-Ljg1cHQgMi44NXB0fQogICAgLk4xMDY1NyB7IHdpZHRoOjIwOTsgdmVydGljYWwt
-YWxpZ246dG9wO3dpZHRoOjE1Ny4wcHQ7Ym9yZGVyOnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IGJvcmRlci10b3A6bm9uZTtwYWRkaW5nOjIuODVwdCAyLjg1cHQgMi44
-NXB0IDIuODVwdH0KICAgIC5OMTA2NjEgeyB3aWR0aDozNTg7IHZlcnRpY2FsLWFs
-aWduOnRvcDt3aWR0aDoyNjguMjVwdDtib3JkZXItdG9wOm5vbmU7Ym9yZGVyLWxl
-ZnQ6IG5vbmU7Ym9yZGVyLWJvdHRvbTpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0O2Jv
-cmRlci1yaWdodDpzb2xpZCB3aW5kb3d0ZXh0IDEuMHB0OyBwYWRkaW5nOjIuODVw
-dCAyLjg1cHQgMi44NXB0IDIuODVwdH0KICAgIC5OMTA2NkUgeyB3aWR0aDoyMDk7
-IHZlcnRpY2FsLWFsaWduOnRvcDt3aWR0aDoxNTcuMHB0O2JvcmRlcjpzb2xpZCB3
-aW5kb3d0ZXh0IDEuMHB0OyBib3JkZXItdG9wOm5vbmU7cGFkZGluZzoyLjg1cHQg
-Mi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNjc4IHsgd2lkdGg6MzU4OyB2
-ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MjY4LjI1cHQ7Ym9yZGVyLXRvcDpub25l
-O2JvcmRlci1sZWZ0OiBub25lO2JvcmRlci1ib3R0b206c29saWQgd2luZG93dGV4
-dCAxLjBwdDtib3JkZXItcmlnaHQ6c29saWQgd2luZG93dGV4dCAxLjBwdDsgcGFk
-ZGluZzoyLjg1cHQgMi44NXB0IDIuODVwdCAyLjg1cHR9CiAgICAuTjEwNjg1IHsg
-d2lkdGg6MjA5OyB2ZXJ0aWNhbC1hbGlnbjp0b3A7d2lkdGg6MTU3LjBwdDtib3Jk
-ZXI6c29saWQgd2luZG93dGV4dCAxLjBwdDsgYm9yZGVyLXRvcDpub25lO3BhZGRp
-bmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAgLk4xMDY4RiB7IHdp
-ZHRoOjM1ODsgdmVydGljYWwtYWxpZ246dG9wO3dpZHRoOjI2OC4yNXB0O2JvcmRl
-ci10b3A6bm9uZTtib3JkZXItbGVmdDogbm9uZTtib3JkZXItYm90dG9tOnNvbGlk
-IHdpbmRvd3RleHQgMS4wcHQ7Ym9yZGVyLXJpZ2h0OnNvbGlkIHdpbmRvd3RleHQg
-MS4wcHQ7IHBhZGRpbmc6Mi44NXB0IDIuODVwdCAyLjg1cHQgMi44NXB0fQogICAg
-ICAgIC5XMzggeyB3aWR0aDozOHB4OyB9CiAgICAgICAgLlcxNSB7IHdpZHRoOjE1
-cHg7IH0KICAgICAgICAuVzIyIHsgd2lkdGg6MjJweDsgfQogICAgICAgIC53aTEw
-MCB7IHdpZHRoOjEwMCU7IH0KICAgICAgICAuV0VybCB7IHdpZHRoOjE1cHg7IH0K
-ICAgICAgICAuRTFTcDIgeyB3aWR0aDo1NTcuM3B4OyB9CiAgICAgICAgLkUyU3Ay
-IHsgd2lkdGg6NTQyLjNweDsgfQogICAgICAgIC5FM1NwMiB7IHdpZHRoOjUyMC4z
-cHg7IH0KICAgICAgICAuRTRTcDIgeyB3aWR0aDo0OTguMjk5OTk5OTk5OTk5OTVw
-eDsgfQogICAgICAgIC5FNVNwMiB7IHdpZHRoOjQ3Ni4yOTk5OTk5OTk5OTk5NXB4
-OyB9CiAgICAgICAgLkVybFNwMiB7IHdpZHRoOjU3MC4zcHg7IH0KICAgICAgICAu
-RTFTcDJRIHsgd2lkdGg6ODAzLjlweDsgfQogICAgICAgIC5FMlNwMlEgeyB3aWR0
-aDo3ODguOXB4OyB9CiAgICAgICAgLkUzU3AyUSB7IHdpZHRoOjc2Ni45cHg7IH0K
-ICAgICAgICAuRTRTcDJRIHsgd2lkdGg6NzQ0LjlweDsgfQogICAgICAgIC5FNVNw
-MlEgeyB3aWR0aDo3MjIuOXB4OyB9CiAgICAgICAgLkVybFNwMlEgeyB3aWR0aDo4
-MTYuOXB4OyB9CiAgICAgICAgLm5leHRwYWdlIHsgcGFnZS1icmVhay1iZWZvcmU6
-YWx3YXlzOyB9CiAgICAgICAgLm1hcmdpbnMge21hcmdpbi10b3A6ODUuMDVwdDtt
-YXJnaW4tcmlnaHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2lu
-LWxlZnQ6ODUuMDVwdDt9CiAgICAgICAgQG1lZGlhIHNjcmVlbiB7IC5wYXBlcncg
-e3dpZHRoOjU5NS4zcHg7bWFyZ2luLXRvcDo4NS4wNXB0O21hcmdpbi1yaWdodDo4
-NS4wNXB0O21hcmdpbi1ib3R0b206ODUuMDVwdDttYXJnaW4tbGVmdDo4NS4wNXB0
-O319CiAgICAgICAgQG1lZGlhIHByaW50IHsgLnBhcGVydyB7d2lkdGg6NTk1LjNw
-eDttYXJnaW4tdG9wOjAuMHB0O21hcmdpbi1yaWdodDowLjBwdDttYXJnaW4tYm90
-dG9tOjAuMHB0O21hcmdpbi1sZWZ0OjAuMHB0O3NpemU6cG9ydHJhaXQ7fX0KICAg
-ICAgICBAbWVkaWEgc2NyZWVuIHsgLnBhcGVyaCB7d2lkdGg6ODQxLjlweDttYXJn
-aW4tcmlnaHQ6ODUuMDVwdDttYXJnaW4tYm90dG9tOjg1LjA1cHQ7bWFyZ2luLWxl
-ZnQ6ODUuMDVwdDttYXJnaW4tdG9wOjg1LjA1cHQ7fX0KICAgICAgICBAbWVkaWEg
-cHJpbnQgeyAucGFwZXJoIHt3aWR0aDo4NDEuOXB4O21hcmdpbi10b3A6MC4wcHQ7
-bWFyZ2luLXJpZ2h0OjAuMHB0O21hcmdpbi1ib3R0b206MC4wcHQ7bWFyZ2luLWxl
-ZnQ6MC4wcHQ7c2l6ZTpsYW5kc2NhcGV9fQovKioqKioqKioqKioqKioqKioqKioq
-KioqKioqLwovKiBSZXZpc2lvbjogICAgMS44LjYgICAgICAqLwovKiBFcnN0ZWxs
-dDogICAgMDMuMTAuMjAwMyAqLwovKiBNb2RpZml6aWVydDogMjQuMDMuMjAwNCAq
-LwovKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBBbGxnZW1laW5lIEFu
-Z2FiZW4genVtIEFuemVpZ2VuIHZvbiBMaW5pZW4gaW4gVGFiZWxsZW4gKi8KCi8q
-QHBhZ2UgOmxlZnQgewogIHNpemU6IDIxY20gMjkuN2NtOyAKICBtYXJnaW4tbGVm
-dDogMmNtOwogIG1hcmdpbi1yaWdodDogMmNtOwogIG1hcmtzOmNyb3A7Cn0KCkBw
-YWdlIDpyaWdodCB7CiAgc2l6ZTogMjFjbSAyOS43Y207ICAKICBtYXJnaW4tbGVm
-dDogMmNtOwogIG1hcmdpbi1yaWdodDogMmNtOwogIG1hcmtzOmNyb3A7Cn0KKi8K
-dGFibGUudG9wCnsKCWJvcmRlci10b3Atc3R5bGU6IHNvbGlkOwoJYm9yZGVyLXRv
-cC13aWR0aDogdGhpbjsKCWJvcmRlci1jb2xvcjogYmxhY2s7Cn0KCnRhYmxlLmJv
-dHRvbQp7Cglib3JkZXItYm90dG9tLXN0eWxlOiBzb2xpZDsKCWJvcmRlci1ib3R0
-b20td2lkdGg6IHRoaW47Cglib3JkZXItY29sb3I6IGJsYWNrOwp9Cgp0ZC50b3AK
-ewogICBib3JkZXItdG9wLXN0eWxlOnNvbGlkOwogICBib3JkZXItdG9wLXdpZHRo
-OjFwdDsKfQp0ZC5yaWdodAp7CiAgIGJvcmRlci1yaWdodC1zdHlsZTpzb2xpZDsK
-ICAgYm9yZGVyLXJpZ2h0LXdpZHRoOjFwdDsKfQp0ZC5ib3R0b20KewogICBib3Jk
-ZXItYm90dG9tLXN0eWxlOnNvbGlkOwogICBib3JkZXItYm90dG9tLXdpZHRoOjFw
-dDsKfQp0ZC5sZWZ0CnsKICAgYm9yZGVyLWxlZnQtc3R5bGU6c29saWQ7CiAgIGJv
-cmRlci1sZWZ0LXdpZHRoOjFwdDsKfQoKLypUZXh0IGlubmVyaGFsYiBlaW5lciBU
-YWJlbGxlbnplbGxlKi8KLkFsaWduTGVmdAp7Cgl0ZXh0LWFsaWduOmxlZnQ7Cn0K
-LkFsaWduUmlnaHQKewoJdGV4dC1hbGlnbjpyaWdodDsKfQouQWxpZ25DZW50ZXIK
-ewoJdGV4dC1hbGlnbjpjZW50ZXI7Cn0KLkFsaWduSnVzdGlmeQp7Cgl0ZXh0LWFs
-aWduOmp1c3RpZnk7Cn0KLlZBbGlnblRvcCB7Cgl2ZXJ0aWNhbC1hbGlnbjp0b3A7
-CQp9Ci8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKiovCi8qIExlZ2lzdGlrLVN0YW5kYXJkLUZvcm1h
-dHZvcmxhZ2UgICAgICAgICAgICAgICAgICAgICAgICAgICAgICovCi8qKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKiovCgovKiBGb3JtYXR2b3JsYWdlOiAwMF9MZWdTdGFuZGFyZCAqLwou
-TGVnU3RhbmRhcmQKewoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6
-MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iOwp9CgovKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBGb3JtYXR2b3JsYWdl
-biBmdWVyIEFic2FldHplICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAq
-LwovKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqLwoKLyogRm9ybWF0dm9ybGFnZTogMDFfVW5kZWZp
-bmllcnQgKi8KcC5VbmRlZmluaWVydAp7CgltYXJnaW4tdG9wOjEuMHB0OwoJbWFy
-Z2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6
-MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJ
-Zm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4i
-OwoJY29sb3I6IHJlZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogMDJfQkRHZXNCbGF0
-dCAqLwpwLkJER2VzQmxhdHQKewoJbWFyZ2luLXRvcDoxNC4wcHQ7CgltYXJnaW4t
-cmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207
-Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjM1LjBwdDsKCWZvbnQt
-c2l6ZTozNS4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNv
-bG9yOmJsYWNrOwoJdGV4dC10cmFuc2Zvcm06dXBwZXJjYXNlOwoJbGV0dGVyLXNw
-YWNpbmc6MS4zcHQ7Cglmb250LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3Js
-YWdlOiAwM19SZXBPZXN0ZXJyICovCnAuUmVwT2VzdGVycgp7CgltYXJnaW4tdG9w
-OjYuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJ
-bWFyZ2luLWxlZnQ6MGNtOwoJbWFyZ2luLWJvdHRvbToxMi4wcHQ7Cgl0ZXh0LWFs
-aWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjIwLjBwdDsKCWJvcmRlcjpub25lOwoJ
-cGFkZGluZzowY207Cglmb250LXNpemU6MjAuMHB0OwoJZm9udC1mYW1pbHk6IlRp
-bWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKCXRleHQtdHJhbnNmb3JtOnVw
-cGVyY2FzZTsKCWxldHRlci1zcGFjaW5nOjEuMHB0OwoJZm9udC13ZWlnaHQ6Ym9s
-ZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogMDRfQXVzZ2FiZURhdGVuICovCnAuQXVz
-Z2FiZURhdGVuCnsKCW1hcmdpbi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsK
-CW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWln
-aHQ6MTQuMHB0OwoJcGFkZGluZzowY207Cglmb250LXNpemU6MTIuMHB0OwoJZm9u
-dC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjogYmxhY2s7Cglmb250
-LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiAwNV9LdXJ6dGl0ZWwg
-Ki8KLyogS3VyenRpdGVsIGluIGVpbmVyIFNwYWx0ZSAod2VubiBrZWluIFRBQiB2
-b3JoYW5kZW4gaXN0KSAqLwpwLkt1cnp0aXRlbDEKewoJbWFyZ2luLXRvcDoyLjBw
-dDsKCW1hcmdpbi1yaWdodDogMGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJn
-aW4tbGVmdDogMy42Y207Cgl0ZXh0LWFsaWduOmp1c3RpZnk7Cgl0ZXh0LWluZGVu
-dDogLTMuNmNtOwoJYm9yZGVyOm5vbmU7CglwYWRkaW5nOjBjbTsKCWZvbnQtc2l6
-ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNvbG9y
-OmJsYWNrOwoJZm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogS3VyenRpdGVsIGluIHp3
-ZWkgU3BhbHRlbiAod2VubiBlaW4gVEFCIHZvcmhhbmRlbiBpc3QpICovCnAuS3Vy
-enRpdGVsMgp7CgltYXJnaW4tdG9wOjIuMHB0OwoJbWFyZ2luLXJpZ2h0OiAwY207
-CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OiAwY207Cgl0ZXh0LWFs
-aWduOmp1c3RpZnk7Cglib3JkZXI6bm9uZTsKCXBhZGRpbmc6MGNtOwoJZm9udC1z
-aXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29s
-b3I6YmxhY2s7Cglmb250LXdlaWdodDpib2xkOwp9CgpzcGFuLkt1cnp0aXRlbGJy
-ZWl0ZQp7Cgl3aWR0aDogMy40Y207Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDA5X0Fi
-c3RhbmQgKi8KcC5BYnN0YW5kCnsKCW1hcmdpbjo2LjBwdDsKCW1hcmdpbi1ib3R0
-b206Ni4wcHQ7CglsaW5lLWhlaWdodDoxMC4wcHQ7Cglmb250LXNpemU6MTAuMHB0
-OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsK
-fQoKLyogRm9ybWF0dm9ybGFnZTogMTBfRW50d3VyZiAqLwpwLkVudHd1cmYKewoJ
-bWFyZ2luLXRvcDo4MC4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJv
-dHRvbTo2NC4wcHQ7CgltYXJnaW4tbGVmdDowY207Cgl0ZXh0LWFsaWduOmNlbnRl
-cjsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250
-LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWxldHRlci1zcGFjaW5nOjEuM3B0
-Owp9CgovKiBGb3JtYXR2b3JsYWdlOiAxMV9UaXRlbCAqLwpwLlRpdGVsCnsKCW1h
-cmdpbi10b3A6MjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0
-b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJ
-bGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjExLjBwdDsKCWZvbnQtZmFt
-aWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJZm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyog
-Rm9ybWF0dm9ybGFnZTogMTJfUHJvbUtsX0VpbmxTYXR6ICovCQpwLlByb21LbEVp
-bmxTYXR6CnsKCW1hcmdpbi10b3A6OC4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJ
-bWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207Cgl0ZXh0LWFsaWdu
-Omp1c3RpZnk7Cgl0ZXh0LWluZGVudDoxOS44NXB0OwoJbGluZS1oZWlnaHQ6MTEu
-MHB0OwoJcGFnZS1icmVhay1hZnRlcjphdm9pZDsKCWZvbnQtc2l6ZToxMC4wcHQ7
-Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9y
-bGFnZTogMThfQWJiaWxkdW5nX29kZXJfT2JqZWt0ICovCnAuQWJiaWxkdW5nb2Rl
-ck9iamVrdAp7CgltYXJnaW4tdG9wOjYuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsK
-CW1hcmdpbi1ib3R0b206Ni4wcHQ7CgltYXJnaW4tbGVmdDowY207Cglmb250LXNp
-emU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xv
-cjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTogMThfQWJiaWxkdW5nX29kZXJf
-T2JqZWt0ICovCnAuQWJiaWxkdW5nb2Rlck9iamVrdEwKewoJbWFyZ2luLXRvcDo2
-LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjYuMHB0OwoJ
-bWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpsZWZ0OwoJZm9udC1zaXplOjEw
-LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6Ymxh
-Y2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDE4X0FiYmlsZHVuZ19vZGVyX09iamVr
-dCAqLwpwLkFiYmlsZHVuZ29kZXJPYmpla3RaCnsKCW1hcmdpbi10b3A6Ni4wcHQ7
-CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTo2LjBwdDsKCW1hcmdp
-bi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246Y2VudGVyOwoJZm9udC1zaXplOjEwLjBw
-dDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7
-Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDE4X0FiYmlsZHVuZ19vZGVyX09iamVrdCAq
-LwpwLkFiYmlsZHVuZ29kZXJPYmpla3RSCnsKCW1hcmdpbi10b3A6Ni4wcHQ7Cglt
-YXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTo2LjBwdDsKCW1hcmdpbi1s
-ZWZ0OjBjbTsKCXRleHQtYWxpZ246cmlnaHQ7Cglmb250LXNpemU6MTAuMHB0OwoJ
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKfQoK
-LyogRm9ybWF0dm9ybGFnZTogMTlfQmVzY2hyaWZ0dW5nICovCnAuQmVzY2hyaWZ0
-dW5nCnsKCW1hcmdpbi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdp
-bi1ib3R0b206Ni4wcHQ7CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDox
-MS4wcHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7Cgljb2xvcjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTogMTlf
-QmVzY2hyaWZ0dW5nICovCnAuQmVzY2hyaWZ0dW5nTAp7CgltYXJnaW4tdG9wOjBj
-bTsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjYuMHB0OwoJbWFy
-Z2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJdGV4dC1hbGlnbjps
-ZWZ0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcg
-Um9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDE5X0Jl
-c2NocmlmdHVuZyAqLwpwLkJlc2NocmlmdHVuZ1oKewoJbWFyZ2luLXRvcDowY207
-CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTo2LjBwdDsKCW1hcmdp
-bi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCXRleHQtYWxpZ246Y2Vu
-dGVyOwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcg
-Um9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDE5X0Jl
-c2NocmlmdHVuZyAqLwpwLkJlc2NocmlmdHVuZ1IKewoJbWFyZ2luLXRvcDowY207
-CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTo2LjBwdDsKCW1hcmdp
-bi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCXRleHQtYWxpZ246cmln
-aHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBS
-b21hbiI7Cgljb2xvcjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTogMjFfTm92
-QW8xICovCnAuTm92QW8xCnsKCW1hcmdpbi10b3A6NC4wcHQ7CgltYXJnaW4tcmln
-aHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207Cgl0
-ZXh0LWFsaWduOmp1c3RpZnk7CglsaW5lLWhlaWdodDoxMS4wcHQ7CglwYWdlLWJy
-ZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5
-OiJUaW1lcyBOZXcgUm9tYW4iOwoJZm9udC1zdHlsZTppdGFsaWM7Cn0KCi8qIEZv
-cm1hdHZvcmxhZ2U6IDIyX05vdkFvMSAqLwpwLk5vdkFvMgp7CgltYXJnaW4tdG9w
-OjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJ
-bWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWln
-aHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iOwoJZm9udC1zdHlsZTppdGFsaWM7Cn0KCi8qIEZvcm1hdHZv
-cmxhZ2U6IDIzX1NhdHpfKG5hY2hfTm92YW8pICovCnAuU2F0em5hY2hOb3Zhbwp7
-CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1i
-b3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5
-OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZv
-cm1hdHZvcmxhZ2U6IDMwX0luaGFsdFVlYmVyc2NocmlmdCAqLwpwLkluaGFsdFVl
-YmVyc2NocmlmdAp7CgltYXJnaW4tdG9wOjE2LjBwdDsKCW1hcmdpbi1yaWdodDow
-Y207CgltYXJnaW4tYm90dG9tOjguMHB0OwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4
-dC1hbGlnbjpjZW50ZXI7CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6
-MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cglmb250LXdl
-aWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiAzMV9JbmhhbHRTcGFsdGUg
-Ki8KcC5JbmhhbHRTcGFsdGUKewoJbWFyZ2luLXRvcDo0LjBwdDsKCW1hcmdpbi1y
-aWdodDowY207CgltYXJnaW4tYm90dG9tOjQuMHB0OwoJbWFyZ2luLWxlZnQ6MGNt
-OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJcGFnZS1icmVhay1hZnRlcjphdm9pZDsK
-CWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFu
-IjsKCWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDMyX0lu
-aGFsdEVpbnRyYWcgKi8KcC5JbmhhbHRFaW50cmFnCnsKCW1hcmdpbi10b3A6MGNt
-OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2lu
-LWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBw
-dDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2
-b3JsYWdlOiA0MV9VZWJlcnNjaHJHMSAqLwpwLlVlYmVyc2NockcxCnsKCW1hcmdp
-bi10b3A6MTYuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206
-MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpjZW50ZXI7CglsaW5l
-LWhlaWdodDoxMS4wcHQ7CglwYWdlLWJyZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1z
-aXplOjExLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29s
-b3I6YmxhY2s7Cglmb250LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdl
-OiA0Ml9VZWJlcnNjaHJHMS0gKi8KcC5VZWJlcnNjaHJHMS0KewoJbWFyZ2luLXRv
-cDo4LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjBjbTsK
-CW1hcmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246Y2VudGVyOwoJbGluZS1oZWln
-aHQ6MTEuMHB0OwoJcGFnZS1icmVhay1hZnRlcjphdm9pZDsKCWZvbnQtc2l6ZTox
-MS4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNvbG9yOmJs
-YWNrOwoJZm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogNDNf
-VWViZXJzY2hyRzIgKi8KcC5VZWJlcnNjaHJHMgp7CgltYXJnaW4tdG9wOjQuMHB0
-OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206NC4wcHQ7CgltYXJn
-aW4tbGVmdDowY207Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjEx
-LjBwdDsKCXBhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Cglmb250LXNpemU6MTEuMHB0
-OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsK
-CWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDQ0X1VlYmVy
-c2NockFydCAqLwpwLlVlYmVyc2NockFydAp7CgltYXJnaW4tdG9wOjguMHB0OwoJ
-bWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxl
-ZnQ6MGNtOwoJdGV4dC1hbGlnbjpjZW50ZXI7CglsaW5lLWhlaWdodDoxMS4wcHQ7
-CglwYWdlLWJyZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1zaXplOjEwLjBwdDsKCWZv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cglmb250
-LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA0NV9VZWJlcnNjaHJQ
-YXJhICovCnAuVWViZXJzY2hyUGFyYQp7CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFy
-Z2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6
-MGNtOwoJdGV4dC1hbGlnbjpjZW50ZXI7CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglw
-YWdlLWJyZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cglmb250LXdl
-aWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1MV9BYnMgKi8KcC5BYnMK
-ewoJbWFyZ2luLXRvcDo0LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4t
-Ym90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246anVzdGlm
-eTsKCXRleHQtaW5kZW50OjE5Ljg1cHQ7Ci8qCWxpbmUtaGVpZ2h0OjExLjBwdDsg
-Ki8KCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTJfWmlmZmVyX2UxICovCnAuWmlm
-ZmVyRTEKewoJbWFyZ2luLXRvcDoyLjBwdDsKCW1hcmdpbi1yaWdodDowY207Cglt
-YXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0
-OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTJfWmlmZmVyX2UyICov
-CnAuWmlmZmVyRTIKewoJbWFyZ2luLXRvcDoyLjBwdDsKCW1hcmdpbi1yaWdodDow
-Y207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUt
-aGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToi
-VGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTJfWmlmZmVy
-X2UzICovCnAuWmlmZmVyRTMKewoJbWFyZ2luLXRvcDoyLjBwdDsKCW1hcmdpbi1y
-aWdodDowY207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsK
-CWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZh
-bWlseToiVGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTJf
-WmlmZmVyX21pdF9CZXRyYWcgKi8KcC5aaWZmZXJNaXRCZXRyYWcKewoJbWFyZ2lu
-LXRvcDowY207CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207
-CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7CglwdW5jdHVh
-dGlvbi13cmFwOnNpbXBsZTsKCXRleHQtYXV0b3NwYWNlOm5vbmU7Cglmb250LXNp
-emU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8q
-IEZvcm1hdHZvcmxhZ2U6IDUyYVRfWmlmZmVyX21pdF9CZXRyYWdfVEdVRSAqLwpw
-LlppZmZlck1pdEJldHJhZ1RHVUUKewoJbWFyZ2luLXRvcDowY207CgltYXJnaW4t
-cmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207
-CglsaW5lLWhlaWdodDoxMS4wcHQ7CglwdW5jdHVhdGlvbi13cmFwOnNpbXBsZTsK
-CXRleHQtYXV0b3NwYWNlOm5vbmU7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDUz
-X0xpdGVyYV9lMSAqLwpwLkxpdGVyYUUxCnsKCW1hcmdpbi10b3A6Mi4wcHQ7Cglt
-YXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVm
-dDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6MTAuMHB0OwoJ
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8qIEZvcm1hdHZvcmxh
-Z2U6IDUzX0xpdGVyYV9lMiAqLwpwLkxpdGVyYUUyCnsKCW1hcmdpbi10b3A6Mi4w
-cHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJn
-aW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6MTAu
-MHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8qIEZvcm1h
-dHZvcmxhZ2U6IDUzX0xpdGVyYV9lMyAqLwpwLkxpdGVyYUUzCnsKCW1hcmdpbi10
-b3A6Mi4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207
-CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNp
-emU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8q
-IEZvcm1hdHZvcmxhZ2U6IDUzX0xpdGVyYV9taXRfQmV0cmFnICovCnAuTGl0ZXJh
-TWl0QmV0cmFnCnsKCW1hcmdpbi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsK
-CW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWln
-aHQ6MTEuMHB0OwoJcHVuY3R1YXRpb24td3JhcDpzaW1wbGU7Cgl0ZXh0LWF1dG9z
-cGFjZTpub25lOwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1M2FUX0xpdGVyYV9t
-aXRfQmV0cmFnX1RHVUUgKi8KcC5MaXRlcmFNaXRCZXRyYWdUR1VFCnsKCW1hcmdp
-bi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNt
-OwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJcHVuY3R1
-YXRpb24td3JhcDpzaW1wbGU7Cgl0ZXh0LWF1dG9zcGFjZTpub25lOwoJZm9udC1z
-aXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9Cgov
-KiBGb3JtYXR2b3JsYWdlOiA1NF9TdWJsaXRlcmFfZTEgKi8KcC5TdWJsaXRlcmFF
-MQp7CgltYXJnaW4tdG9wOjIuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdp
-bi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEu
-MHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcg
-Um9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1NF9TdWJsaXRlcmFfZTIgKi8K
-cC5TdWJsaXRlcmFFMgp7CgltYXJnaW4tdG9wOjIuMHB0OwoJbWFyZ2luLXJpZ2h0
-OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGlu
-ZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5
-OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1NF9TdWJs
-aXRlcmFfZTMgKi8KcC5TdWJsaXRlcmFFMwp7CgltYXJnaW4tdG9wOjIuMHB0OwoJ
-bWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxl
-ZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsK
-CWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3Js
-YWdlOiA1NF9TdWJsaXRlcmFfbWl0X0JldHJhZyAqLwpwLlN1YmxpdGVyYU1pdEJl
-dHJhZwp7CgltYXJnaW4tdG9wOjBjbTsKCW1hcmdpbi1yaWdodDowY207CgltYXJn
-aW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjEx
-LjBwdDsKCXB1bmN0dWF0aW9uLXdyYXA6c2ltcGxlOwoJdGV4dC1hdXRvc3BhY2U6
-bm9uZTsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3
-IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTRhVF9TdWJsaXRlcmFfbWl0
-X0JldHJhZ19UR1VFICovCnAuU3VibGl0ZXJhTWl0QmV0cmFnVEdVRQp7CgltYXJn
-aW4tdG9wOjBjbTsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjBj
-bTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCXB1bmN0
-dWF0aW9uLXdyYXA6c2ltcGxlOwoJdGV4dC1hdXRvc3BhY2U6bm9uZTsKCWZvbnQt
-c2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKfQoK
-LyogRm9ybWF0dm9ybGFnZTogNTRhX1N0cmljaF9lMSAqLwpwLlN0cmljaEUxCnsK
-CW1hcmdpbi10b3A6Mi4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJv
-dHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4wcHQ7
-Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDU0YV9TdHJpY2hfZTIgKi8KcC5TdHJp
-Y2hFMgp7CgltYXJnaW4tdG9wOjIuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1h
-cmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6
-MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1NGFfU3RyaWNoX2UzICov
-CnAuU3RyaWNoRTMKewoJbWFyZ2luLXRvcDoyLjBwdDsKCW1hcmdpbi1yaWdodDow
-Y207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCWxpbmUt
-aGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToi
-VGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9ybGFnZTogNTRhX1N0cmlj
-aF9lNCAqLwpwLlN0cmljaEU0CnsKCW1hcmdpbi10b3A6Mi4wcHQ7CgltYXJnaW4t
-cmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207
-CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1m
-YW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDU0
-YV9TdHJpY2hfZTUgKi8KcC5TdHJpY2hFNQp7CgltYXJnaW4tdG9wOjIuMHB0OwoJ
-bWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxl
-ZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsK
-CWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3Js
-YWdlOiA1NGFfU3RyaWNoX2U2ICovCnAuU3RyaWNoRTYKewoJbWFyZ2luLXRvcDoy
-LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1h
-cmdpbi1sZWZ0OjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZTox
-MC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNvbG9yOmJs
-YWNrOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA1NGFfU3RyaWNoX2U3ICovCnAuU3Ry
-aWNoRTcKCXsKCW1hcmdpbi10b3A6Mi4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJ
-bWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdo
-dDoxMS4wcHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTog
-NTVfU2NobHVzc3RlaWxBYnMgKi8KcC5TY2hsdXNzdGVpbEFicwp7CgltYXJnaW46
-MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2b3JsYWdl
-OiA1Nl9TY2hsdXNzdGVpbFppZmYgKi8KcC5TY2hsdXNzdGVpbFppZmYKewoJbWFy
-Z2luOjBjbTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMC4wcHQ7
-Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKfQoKLyogRm9ybWF0dm9y
-bGFnZTogNTdfU2NobHVzc3RlaWxMaXQgKi8KcC5TY2hsdXNzdGVpbExpdAp7Cglt
-YXJnaW46MGNtOwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBw
-dDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3JtYXR2
-b3JsYWdlOiA2MV9UYWJUZXh0ICovCnAuVGFiVGV4dAp7CgltYXJnaW46MGNtOwoJ
-bGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFt
-aWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZvcm1h
-dHZvcmxhZ2U6IDYxYV9UYWJUZXh0UmVjaHRzYiAqLwpwLlRhYlRleHRSZWNodHNi
-CnsKCW1hcmdpbjowY207Cgl0ZXh0LWFsaWduOnJpZ2h0OwoJbGluZS1oZWlnaHQ6
-MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDYx
-Yl9UYWJUZXh0WmVudHJpZXJ0ICovCnAuVGFiVGV4dFplbnRyaWVydAp7CgltYXJn
-aW46MGNtOwoJdGV4dC1hbGlnbjpjZW50ZXI7CglsaW5lLWhlaWdodDoxMS4wcHQ7
-Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21h
-biI7Cgljb2xvcjpibGFjazsKfQoKLyogRm9ybWF0dm9ybGFnZTogNjFjX1RhYlRl
-eHRCbG9jayAqLwpwLlRhYlRleHRCbG9jawp7CgltYXJnaW46MGNtOwoJdGV4dC1h
-bGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEw
-LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6Ymxh
-Y2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDYyX0tvcGZ6ZWlsZSAqLwpwLktvcGZ6
-ZWlsZQp7CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1h
-cmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpq
-dXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsK
-CWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6ICNDMEMwQzA7
-Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDYzX0Z1w596ZWlsZSAqLwpwLkZ1c3N6ZWls
-ZQp7CgltYXJnaW4tdG9wOjEwLjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJn
-aW4tYm90dG9tOjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246anVz
-dGlmeTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZTo5LjBwdDsKCWZv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6ICNDMEMwQzA7Cn0K
-Ci8qIEZvcm1hdHZvcmxhZ2U6IDY0X0ZOX0xpbmllICovCnAuRk5MaW5pZQp7Cglt
-YXJnaW4tdG9wOjExLjBwdDsKCW1hcmdpbi1yaWdodDoxMy4wY207CgltYXJnaW4t
-Ym90dG9tOjEuMHB0OwoJbWFyZ2luLWxlZnQ6MGNtOwoJbGluZS1oZWlnaHQ6MTEu
-MHB0OwoJcGFkZGluZzowY207Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKCWJvcmRlci1ib3R0
-b20tc3R5bGU6IHNvbGlkOwoJYm9yZGVyLWJvdHRvbS1jb2xvcjogR3JheTsKCWJv
-cmRlci1ib3R0b20td2lkdGg6IDFweDsKfQoKLyogRm9ybWF0dm9ybGFnZTogNjVf
-Rk5fVGV4dCAqLwpwLkZOVGV4dAp7CgltYXJnaW46MGNtOwoJdGV4dC1hbGlnbjpq
-dXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjkuMHB0OwoJ
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKfQoK
-LyogRm9ybWF0dm9ybGFnZTogNjZfRk5fWmVpY2hlbiAqLwpzcGFuLkZOWmVpY2hl
-bgp7Cgl2ZXJ0aWNhbC1hbGlnbjpzdXBlcjsKfQoKLyogRm9ybWF0dm9ybGFnZTog
-NjhfVW50ZXJzY2hyTCAqLwpwLlVudGVyc2NockwKewoJbWFyZ2luLXRvcDo4LjBw
-dDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjBjbTsKCW1hcmdp
-bi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246bGVmdDsKCWxpbmUtaGVpZ2h0OjExLjBw
-dDsKCWZvbnQtc2l6ZToxMC4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJv
-bWFuIjsKCWNvbG9yOmJsYWNrOwoJZm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogRm9y
-bWF0dm9ybGFnZTogNjlfVW50ZXJzY2hyTSAqLwpwLlVudGVyc2Nock0KewoJbWFy
-Z2luLXRvcDo4LjBwdDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9t
-OjBjbTsKCW1hcmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246Y2VudGVyOwoJbGlu
-ZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5
-OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cglmb250LXdlaWdodDpi
-b2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA3MV9BbmxhZ2VuYmV6ICovCnAuQW5s
-YWdlbmJlegp7CgltYXJnaW4tdG9wOjguMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsK
-CW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGln
-bjpyaWdodDsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6ZToxMS4wcHQ7
-Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWNvbG9yOmJsYWNrOwoJ
-Zm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogODFfRXJsVWVi
-ZXJzY2hyWiAqLwpwLkVybFVlYmVyc2NocloKewoJbWFyZ2luLXRvcDoxNi4wcHQ7
-CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4t
-bGVmdDowY207Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjExLjBw
-dDsKCXBhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Cglmb250LXNpemU6MTEuMHB0OwoJ
-Zm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsKCWZv
-bnQtd2VpZ2h0OmJvbGQ7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDgyX0VybFVlYmVy
-c2NockwgKi8KcC5FcmxVZWJlcnNjaHJMCnsKCW1hcmdpbi10b3A6NC4wcHQ7Cglt
-YXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVm
-dDowY207Cgl0ZXh0LWFsaWduOmp1c3RpZnk7CglsaW5lLWhlaWdodDoxMS4wcHQ7
-CglwYWdlLWJyZWFrLWFmdGVyOmF2b2lkOwoJZm9udC1zaXplOjEwLjBwdDsKCWZv
-bnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29sb3I6YmxhY2s7Cglmb250
-LXdlaWdodDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA4M19FcmxUZXh0ICov
-CnAuRXJsVGV4dAp7CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBj
-bTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1h
-bGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1zaXplOjEw
-LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwp9CgovKiBGb3Jt
-YXR2b3JsYWdlOiA4NV9FcmxBdWZ6YWVobGcgLSBub2NoIG5pY2h0IGZlcnRpZyAq
-LwpwLkVybEF1ZnphZWhsZwp7CgltYXJnaW4tdG9wOjQuMHB0OwoJbWFyZ2luLXJp
-Z2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFyZ2luLWxlZnQ6MGNtOwoJ
-dGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6MTEuMHB0OwoJZm9udC1z
-aXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJY29s
-b3I6YmxhY2s7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDg5X1RHVUVfVWViZXJzY2hy
-U3BhbHRlKi8KcC5UR1VFVWViZXJzY2hyU3BhbHRlCnsKCW1hcmdpbi10b3A6NC4w
-cHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJn
-aW4tbGVmdDowY207Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWxpbmUtaGVpZ2h0OjEx
-LjBwdDsKCXBhZ2UtYnJlYWstYWZ0ZXI6YXZvaWQ7Cglmb250LXNpemU6MTAuMHB0
-OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cgljb2xvcjpibGFjazsK
-CWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCi8qKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi8qIEZvcm1h
-dHZvcmxhZ2VuIGZ1ZXIgWmVpY2hlbmZvcm1hdGllcnVuZyAgICAgICAgICAgICAg
-ICAgICAgICovCi8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKiovCgovKiBGb3JtYXR2b3JsYWdlOiA5
-OTBfRmVobGVyICovCnNwYW4uRmVobGVyCnsKCWNvbG9yOiByZWQ7Cn0KCi8qIEZv
-cm1hdHZvcmxhZ2U6IDk5MV9HbGRTeW1ib2wgKi8Kc3Bhbi5HbGRTeW1ib2wKewoJ
-Zm9udC13ZWlnaHQ6Ym9sZDsKfQoKLyogRm9ybWF0dm9ybGFnZTogOTkyX05vcm1h
-bCAqLwpzcGFuLk5vcm1hbAp7Cglmb250LXN0eWxlOiBub3JtYWw7Cn0KCi8qIEZv
-cm1hdHZvcmxhZ2U6IDk5M19GZXR0ICovCnNwYW4uRmV0dAp7Cglmb250LXdlaWdo
-dDpib2xkOwp9CgovKiBGb3JtYXR2b3JsYWdlOiA5OTRfS3Vyc2l2ICovCnNwYW4u
-S3Vyc2l2CnsKCWZvbnQtc3R5bGU6aXRhbGljOwp9CgovKiBGb3JtYXR2b3JsYWdl
-OiA5OTVfVW50ZXJzdHJpY2hlbiAqLwpzcGFuLlVudGVyc3RyaWNoZW4KewoJdGV4
-dC1kZWNvcmF0aW9uOnVuZGVybGluZTsKfQoKLyogRm9ybWF0dm9ybGFnZTogOTk2
-X0dlc3BlcnJ0ICovCnNwYW4uR2VzcGVycnQKewoJbGV0dGVyLXNwYWNpbmc6MS4z
-cHQ7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6IDk5N19Ib2NoICovCnNwYW4uSG9jaAp7
-Cglmb250LXNpemU6IDUwJTsKCXZlcnRpY2FsLWFsaWduOnN1cGVyOwp9CgovKiBG
-b3JtYXR2b3JsYWdlOiA5OThfVGllZiAqLwpzcGFuLlRpZWYKewoJZm9udC1zaXpl
-OiA1MCU7Cgl2ZXJ0aWNhbC1hbGlnbjpzdWI7Cn0KCi8qIEZvcm1hdHZvcmxhZ2U6
-IDk5OV9GZXR0X3VuZF9LdXJzaXYgKi8Kc3Bhbi5GZXR0dW5kS3Vyc2l2CnsKCWZv
-bnQtd2VpZ2h0OmJvbGQ7Cglmb250LXN0eWxlOml0YWxpYzsKfQoKLyogU3RhbmRh
-cmR0YWJzY2hyaXR0d2VpdGUgYXVzIFdvcmQgKi8Kc3Bhbi5TdGFuZGFyZHRhYnVs
-YXRvcgp7Cgl3aWR0aDozNS40NXB0Owp9CgovKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwovKiBG
-b3JtYXR2b3JsYWdlbiBkZXIgUGFybGFtZW50c2RpcmVrdGlvbiAgICAgICAgICAg
-ICAgICAgICAgICAqLwovKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
-KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwoKcC5QRF9BbGxvbmdlLCBs
-aS5QRF9BbGxvbmdlLCBkaXYuUERfQWxsb25nZQp7CgltYXJnaW4tdG9wOjE0LjBw
-dDsKCW1hcmdpbi1yaWdodDowY207CgltYXJnaW4tYm90dG9tOjEwLjBwdDsKCW1h
-cmdpbi1sZWZ0OjBjbTsKCXRleHQtYWxpZ246Y2VudGVyOwoJZm9udC1zaXplOjE0
-LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJbGF5b3V0LWdy
-aWQtbW9kZTpsaW5lOwp9CgpwLlBEX0FsbG9uZ2VCLCBsaS5QRF9BbGxvbmdlQiwg
-ZGl2LlBEX0FsbG9uZ2VCCnsKCW1hcmdpbi10b3A6MTQuMHB0OwoJbWFyZ2luLXJp
-Z2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MTAuMHB0OwoJbWFyZ2luLWxlZnQ6MGNt
-OwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJZm9udC1zaXplOjE0LjBwdDsKCWZvbnQt
-ZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJbGF5b3V0LWdyaWQtbW9kZTpsaW5l
-Owp9CgpwLlBEX0FsbG9uZ2VMLCBsaS5QRF9BbGxvbmdlTCwgZGl2LlBEX0FsbG9u
-Z2VMCnsKCW1hcmdpbi10b3A6MTQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1h
-cmdpbi1ib3R0b206MTAuMHB0OwoJbWFyZ2luLWxlZnQ6MGNtOwoJZm9udC1zaXpl
-OjE0LjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBOZXcgUm9tYW4iOwoJbGF5b3V0
-LWdyaWQtbW9kZTpsaW5lOwp9CgpwLlBEX0FudHJhZ3Nmb3JtZWwsIGxpLlBEX0Fu
-dHJhZ3Nmb3JtZWwsIGRpdi5QRF9BbnRyYWdzZm9ybWVsCnsKCW1hcmdpbi10b3A6
-MTQuMHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJ
-bWFyZ2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWln
-aHQ6MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1l
-cyBOZXcgUm9tYW4iOwoJbGF5b3V0LWdyaWQtbW9kZTpsaW5lOwp9CgpwLlBEX0Rh
-dHVtLCBsaS5QRF9EYXR1bSwgZGl2LlBEX0RhdHVtCnsKCW1hcmdpbi10b3A6MTQu
-MHB0OwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MGNtOwoJbWFy
-Z2luLWxlZnQ6MGNtOwoJdGV4dC1hbGlnbjpqdXN0aWZ5OwoJbGluZS1oZWlnaHQ6
-MTEuMHB0OwoJZm9udC1zaXplOjEwLjBwdDsKCWZvbnQtZmFtaWx5OiJUaW1lcyBO
-ZXcgUm9tYW4iOwoJbGF5b3V0LWdyaWQtbW9kZTpsaW5lOwp9CgpwLlBEX0VudHNj
-aGxpZXNzdW5nLCBsaS5QRF9FbnRzY2hsaWVzc3VuZywgZGl2LlBEX0VudHNjaGxp
-ZXNzdW5nCnsKCW1hcmdpbi10b3A6OC4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJ
-bWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdo
-dDoxMS4wcHQ7Cglmb250LXNpemU6MTEuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVz
-IE5ldyBSb21hbiI7CglsYXlvdXQtZ3JpZC1tb2RlOmxpbmU7Cglmb250LXdlaWdo
-dDpib2xkOwp9CgpwLlBEX0sxLCBsaS5QRF9LMSwgZGl2LlBEX0sxCnsKCW1hcmdp
-bjowY207Cgl0ZXh0LWFsaWduOmNlbnRlcjsKCWJvcmRlcjpub25lOwoJcGFkZGlu
-ZzowY207Cglmb250LXNpemU6MTIuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5l
-dyBSb21hbiI7CglsZXR0ZXItc3BhY2luZzotLjRwdDsKCWZvbnQtd2VpZ2h0OmJv
-bGQ7Cn0KCnAuUERfSzFBbmxhZ2UsIGxpLlBEX0sxQW5sYWdlLCBkaXYuUERfSzFB
-bmxhZ2UKewoJbWFyZ2luOjBjbTsKCXRleHQtYWxpZ246cmlnaHQ7Cglmb250LXNp
-emU6MTIuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7CglsZXR0
-ZXItc3BhY2luZzotLjRwdDsKCWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCnAuUERfSzFB
-dXNnLCBsaS5QRF9LMUF1c2csIGRpdi5QRF9LMUF1c2cKewoJbWFyZ2luLXRvcDo2
-Mi45cHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2luLWJvdHRvbToyNy4wcHQ7
-CgltYXJnaW4tbGVmdDowY207Cglmb250LXNpemU6MTEuMHB0OwoJZm9udC1mYW1p
-bHk6IlRpbWVzIE5ldyBSb21hbiI7Cglmb250LXdlaWdodDpib2xkOwp9CgpwLlBE
-X0syLCBsaS5QRF9LMiwgZGl2LlBEX0syCnsKCW1hcmdpbi10b3A6MGNtOwoJbWFy
-Z2luLXJpZ2h0OjBjbTsKCW1hcmdpbi1ib3R0b206MTEuMzVwdDsKCW1hcmdpbi1s
-ZWZ0OjBjbTsKCWZvbnQtc2l6ZToyMi4wcHQ7Cglmb250LWZhbWlseToiVGltZXMg
-TmV3IFJvbWFuIjsKCWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KCnAuUERfSzMsIGxpLlBE
-X0szLCBkaXYuUERfSzMKewoJbWFyZ2luLXRvcDowY207CgltYXJnaW4tcmlnaHQ6
-MGNtOwoJbWFyZ2luLWJvdHRvbToyMC4wcHQ7CgltYXJnaW4tbGVmdDowY207Cglm
-b250LXNpemU6MTguMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7
-Cglmb250LXdlaWdodDpib2xkOwp9CgpwLlBEX0s0LCBsaS5QRF9LNCwgZGl2LlBE
-X0s0CnsKCW1hcmdpbi10b3A6MGNtOwoJbWFyZ2luLXJpZ2h0OjBjbTsKCW1hcmdp
-bi1ib3R0b206Ni4wcHQ7CgltYXJnaW4tbGVmdDowY207Cglmb250LXNpemU6MTMu
-MHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7Cglmb250LXdlaWdo
-dDpib2xkOwp9CgpwLlBEX0tvcGZ6ZWlsZSwgbGkuUERfS29wZnplaWxlLCBkaXYu
-UERfS29wZnplaWxlCnsKCW1hcmdpbi10b3A6NC4wcHQ7CgltYXJnaW4tcmlnaHQ6
-MGNtOwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207Cgl0ZXh0
-LWFsaWduOmp1c3RpZnk7CglsaW5lLWhlaWdodDoxMS4wcHQ7Cglmb250LXNpemU6
-MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiI7CglsYXlvdXQt
-Z3JpZC1tb2RlOmxpbmU7Cn0KCnAuUERfVTEsIGxpLlBEX1UxLCBkaXYuUERfVTEK
-ewoJbWFyZ2luLXRvcDoyMi4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNtOwoJbWFyZ2lu
-LWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhlaWdodDoxMS4w
-cHQ7Cglmb250LXNpemU6MTAuMHB0OwoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBS
-b21hbiI7Cglmb250LXdlaWdodDpib2xkOwp9CgpwLlBEX1UyLCBsaS5QRF9VMiwg
-ZGl2LlBEX1UyCnsKCW1hcmdpbi10b3A6NS4wcHQ7CgltYXJnaW4tcmlnaHQ6MGNt
-OwoJbWFyZ2luLWJvdHRvbTowY207CgltYXJnaW4tbGVmdDowY207CglsaW5lLWhl
-aWdodDoxMS4wcHQ7Cglmb250LXNpemU6OS4wcHQ7Cglmb250LWZhbWlseToiVGlt
-ZXMgTmV3IFJvbWFuIjsKfQoKcC5QRF9Wb3JsYWdlLCBsaS5QRF9Wb3JsYWdlLCBk
-aXYuUERfVm9ybGFnZQp7CgltYXJnaW4tdG9wOjBjbTsKCW1hcmdpbi1yaWdodDow
-Y207CgltYXJnaW4tYm90dG9tOjEwLjBwdDsKCW1hcmdpbi1sZWZ0OjBjbTsKCXRl
-eHQtYWxpZ246anVzdGlmeTsKCWxpbmUtaGVpZ2h0OjExLjBwdDsKCWZvbnQtc2l6
-ZToxMS4wcHQ7Cglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFuIjsKCWxheW91
-dC1ncmlkLW1vZGU6bGluZTsKCWZvbnQtd2VpZ2h0OmJvbGQ7Cn0KPC9zdHlsZT4K
-PC9oZWFkPgo8Ym9keT4KPGRpdiBjbGFzcz0icGFwZXJ3Ij4KCgoKCjxwIGNsYXNz
-PSJCREdlc0JsYXR0Ij5CVU5ERVNHRVNFVFpCTEFUVDwvcD4KPHAgY2xhc3M9IlJl
-cE9lc3RlcnIiPkbDnFIgRElFIFJFUFVCTElLIMOWU1RFUlJFSUNIPC9wPgo8dGFi
-bGUgY2xhc3M9InRvcCBib3R0b20gd2kxMDAiPgo8dHI+Cjx0ZD4KPHAgY2xhc3M9
-IkF1c2dhYmVEYXRlbiBBbGlnbkxlZnQiPkphaHJnYW5nIDIwMDQgPC9wPgo8L3Rk
-Pgo8dGQ+CjxwIGNsYXNzPSJBdXNnYWJlRGF0ZW4gQWxpZ25DZW50ZXIiPkF1c2dl
-Z2ViZW4gYW0gMzAuIEF1Z3VzdCAyMDA0IDwvcD4KPC90ZD4KPHRkPgo8cCBjbGFz
-cz0iQXVzZ2FiZURhdGVuIEFsaWduUmlnaHQiPlRlaWwgSUk8L3A+CjwvdGQ+Cjwv
-dHI+CjwvdGFibGU+Cjx0YWJsZSBjbGFzcz0iYm90dG9tIHdpMTAwIj4KPHRyPgo8
-dGQ+CjxwIGNsYXNzPSJLdXJ6dGl0ZWwyIEFsaWduTGVmdCBWQWxpZ25Ub3AiPgo8
-c3BhbiBjbGFzcz0iS3VyenRpdGVsYnJlaXRlIj4zNDEuIFZlcm9yZG51bmc6PC9z
-cGFuPgo8L3A+CjwvdGQ+Cjx0ZD4KPHAgY2xhc3M9Ikt1cnp0aXRlbDIgQWxpZ25M
-ZWZ0Ij7DhG5kZXJ1bmcgZGVyIEFsdGxhc3RlbmF0bGFzLVZPPC9wPgo8L3RkPgo8
-L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0iVGl0ZWwiPjM0MS4gVmVyb3JkbnVuZyBk
-ZXMgQnVuZGVzbWluaXN0ZXJzIGbDvHIgTGFuZC0gdW5kIEZvcnN0d2lydHNjaGFm
-dCwgVW13ZWx0IHVuZCBXYXNzZXJ3aXJ0c2NoYWZ0LCBtaXQgZGVyIGRpZSBBbHRs
-YXN0ZW5hdGxhcy1WTyBnZcOkbmRlcnQgd2lyZDwvcD4KPHAgY2xhc3M9IlByb21L
-bEVpbmxTYXR6Ij5BdWYgR3J1bmQgZGVyIMKnwqfCoDEzIHVuZCAxNCBkZXMgQWx0
-bGFzdGVuc2FuaWVydW5nc2dlc2V0emVzLCBCR0JsLiBOci7CoDI5OS8xOTg5LCBp
-biBkZXIgRmFzc3VuZyBkZXMgQnVuZGVzZ2VzZXR6ZXMgQkdCbC7CoEkgTnIuwqA3
-MS8yMDAzLCB3aXJkIHZlcm9yZG5ldDo8L3A+CjxwIGNsYXNzPSJQcm9tS2xFaW5s
-U2F0eiI+RGllIEFsdGxhc3RlbmF0bGFzLVZPLCBCR0JsLsKgSUkgTnIuwqAyMzIv
-MjAwNCwgd2lyZCB3aWUgZm9sZ3QgZ2XDpG5kZXJ0OjwvcD4KPHAgY2xhc3M9Ik5v
-dkFvMSI+MS4gRGVyIGJpc2hlcmlnZSBUZXh0IGRlcyDCp8KgMiBlcmjDpGx0IGRp
-ZSBBYnNhdHpiZXplaWNobnVuZyDigJ4oMSnigJwgdW5kIGZvbGdlbmRlciBBYnMu
-wqAyIHdpcmQgYW5nZWbDvGd0OjwvcD4KPHAgY2xhc3M9IkFicyI+CuKAnigyKSBE
-aWUgQW5ow6RuZ2XCoDMgdW5kIMKgNCBpbiBkZXIgRmFzc3VuZyBkZXIgVmVyb3Jk
-bnVuZyBCR0JsLsKgSUkgTnIuwqAzNDEvMjAwNCB0cmV0ZW4gbWl0IDE1LsKgU2Vw
-dGVtYmVyIDIwMDQgaW4gS3JhZnQu4oCcCjwvcD4KPHAgY2xhc3M9Ik5vdkFvMSI+
-Mi4gSW0gQW5oYW5nIDMgd2lyZCBmb2xnZW5kZXIgRWludHJhZyBBTFRMQVNUIE41
-NCBhbmdlZsO8Z3Q6PC9wPgo8dGFibGUgY2xhc3M9Ik4xMDBDMCI+Cjx0cj4KPHRk
-IGNsYXNzPSJOMTAwQzkiIGNvbHNwYW49IjIiPgo8cCBjbGFzcz0iRXJsVWViZXJz
-Y2hyTCI+CuKAnkFMVExBU1QgTjU0OiBCZWl6c2NobGFtbWRlcG9uaWUgVGVybml0
-ejwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDBEOSI+CjxwIGNs
-YXNzPSJUYWJUZXh0UmVjaHRzYiI+QmV6aXJrOjwvcD4KPHAgY2xhc3M9IlRhYlRl
-eHRSZWNodHNiIj5HZW1laW5kZTo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRz
-YiI+S2F0YXN0cmFsZ2VtZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0
-c2IiPkdydW5kc3TDvGNrc251bW1lcm46PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4x
-MDBFRiI+CjxwIGNsYXNzPSJUYWJUZXh0Ij5OZXVua2lyY2hlbjwvcD4KPHAgY2xh
-c3M9IlRhYlRleHQiPlRlcm5pdHo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij5EdW5r
-ZWxzdGVpbiAoMjMzMDMpPC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+NzM0LzE8L3A+
-CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAxMDgiPgo8cCBjbGFzcz0i
-VGFiVGV4dFJlY2h0c2IiPkFydCBkZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0ZCBj
-bGFzcz0iTjEwMTEyIj4KPHAgY2xhc3M9IlRhYlRleHQiPkFsdGFibGFnZXJ1bmc8
-L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAxMUYiPgo8cCBjbGFz
-cz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBBbHRsYXN0YXVzd2Vpc3VuZzo8
-L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMTI5Ij4KPHAgY2xhc3M9IlRhYlRleHQi
-PjE1LjkuMjAwNDwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDEz
-NiI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+UHJpb3JpdMOkdGVua2xhc3Nl
-OjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAxNDAiPgo8cCBjbGFzcz0iVGFiVGV4
-dCI+MjwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDE0RCI+Cjxw
-IGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+RGF0dW0gZGVyIFByaW9yaXTDpHRlbmts
-YXNzaWZpemllcnVuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMTU3Ij4KPHAg
-Y2xhc3M9IlRhYlRleHQiPjE1LjkuMjAwNOKAnAo8L3A+CjwvdGQ+CjwvdHI+Cjwv
-dGFibGU+CjxwIGNsYXNzPSJBYnN0YW5kIj48L3A+CjxwIGNsYXNzPSJOb3ZBbzEi
-PjMuIEltIEFuaGFuZyA0IGxhdXRldCBkZXIgRWludHJhZyBBTFRMQVNUIE81MDo8
-L3A+Cjx0YWJsZSBjbGFzcz0iTjEwMTZCIj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDE3
-NCIgY29sc3Bhbj0iMiI+CjxwIGNsYXNzPSJFcmxVZWJlcnNjaHJMIj4K4oCeQUxU
-TEFTVCBPNTA6IFNjaHdlbGxlbmltcHLDpGduaWVydW5nIFNjaG5lZWdhdHRlcm48
-L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAxODQiPgo8cCBjbGFz
-cz0iVGFiVGV4dFJlY2h0c2IiPkJlemlyazo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0
-UmVjaHRzYiI+R2VtZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2Ii
-PkthdGFzdHJhbGdlbWVpbmRlOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNi
-Ij5HcnVuZHN0w7xja3NudW1tZXJuOjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAx
-OUEiPgo8cCBjbGFzcz0iVGFiVGV4dCI+QnJhdW5hdSBhbSBJbm48L3A+CjxwIGNs
-YXNzPSJUYWJUZXh0Ij5MZW5nYXU8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij5LcmVu
-d2FsZCAoNDAxMTQpPC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+NDcwLzEsIDUyMy81
-LCA2MDQvMywgOTU2LCA5ODUvNCwgOTg2Lzc8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4K
-PHRkIGNsYXNzPSJOMTAxQjMiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkFy
-dCBkZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMUJEIj4KPHAg
-Y2xhc3M9IlRhYlRleHQiPkFsdHN0YW5kb3J0PC9wPgo8L3RkPgo8L3RyPgo8dHI+
-Cjx0ZCBjbGFzcz0iTjEwMUNBIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5E
-YXR1bSBkZXIgQWx0bGFzdGF1c3dlaXN1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9
-Ik4xMDFENCI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4yMS44LjIwMDE8L3A+CjwvdGQ+
-CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAxRTEiPgo8cCBjbGFzcz0iVGFiVGV4
-dFJlY2h0c2IiPlByaW9yaXTDpHRlbmtsYXNzZTo8L3A+CjwvdGQ+Cjx0ZCBjbGFz
-cz0iTjEwMUVCIj4KPHAgY2xhc3M9IlRhYlRleHQiPjM8L3A+CjwvdGQ+CjwvdHI+
-Cjx0cj4KPHRkIGNsYXNzPSJOMTAxRjgiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0
-c2IiPkRhdHVtIGRlciBQcmlvcml0w6R0ZW5rbGFzc2lmaXppZXJ1bmc6PC9wPgo8
-L3RkPgo8dGQgY2xhc3M9Ik4xMDIwMiI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4xNS45
-LjIwMDTigJwKPC9wPgo8L3RkPgo8L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0iQWJz
-dGFuZCI+PC9wPgo8cCBjbGFzcz0iTm92QW8xIj40LiBJbSBBbmhhbmcgNCBsYXV0
-ZW4gZGllIEVpbnRyw6RnZSBBTFRMQVNUIE82MCBiaXMgTzYyOjwvcD4KPHRhYmxl
-IGNsYXNzPSJOMTAyMTYiPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMjFGIiBjb2xzcGFu
-PSIyIj4KPHAgY2xhc3M9IkVybFVlYmVyc2NockwiPgrigJ5BTFRMQVNUIE82MDog
-UHV0emVyZWkgRXhjbHVzaXYgU2Nod2FiPC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0
-ZCBjbGFzcz0iTjEwMjJGIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5CZXpp
-cms6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdlbWVpbmRlOjwvcD4K
-PHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5LYXRhc3RyYWxnZW1laW5kZTo8L3A+
-CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+R3J1bmRzdMO8Y2tzbnVtbWVybjo8
-L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMjQ1Ij4KPHAgY2xhc3M9IlRhYlRleHQi
-Pkxpbno8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0i
-VGFiVGV4dCI+VXJmYWhyICg0NTIxMik8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij4u
-MzE4Lzc8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAyNUUiPgo8
-cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkFydCBkZXIgQWx0bGFzdDo8L3A+Cjwv
-dGQ+Cjx0ZCBjbGFzcz0iTjEwMjY4Ij4KPHAgY2xhc3M9IlRhYlRleHQiPkFsdHN0
-YW5kb3J0PC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMjc1Ij4K
-PHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5EYXR1bSBkZXIgQWx0bGFzdGF1c3dl
-aXN1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDI3RiI+CjxwIGNsYXNzPSJU
-YWJUZXh0Ij4yOS44LjIwMDM8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNz
-PSJOMTAyOEMiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPlByaW9yaXTDpHRl
-bmtsYXNzZTo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwMjk2Ij4KPHAgY2xhc3M9
-IlRhYlRleHQiPjE8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTAy
-QTMiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBQcmlvcml0
-w6R0ZW5rbGFzc2lmaXppZXJ1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDJB
-RCI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4xNS45LjIwMDQ8L3A+CjwvdGQ+CjwvdHI+
-CjwvdGFibGU+CjxwIGNsYXNzPSJBYnN0YW5kIj48L3A+Cjx0YWJsZSBjbGFzcz0i
-TjEwMkJCIj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDJDNCIgY29sc3Bhbj0iMiI+Cjxw
-IGNsYXNzPSJFcmxVZWJlcnNjaHJMIj5BTFRMQVNUIE82MTogUHV0emVyZWkgU3rD
-tnRzPC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMkQyIj4KPHAg
-Y2xhc3M9IlRhYlRleHRSZWNodHNiIj5CZXppcms6PC9wPgo8cCBjbGFzcz0iVGFi
-VGV4dFJlY2h0c2IiPkdlbWVpbmRlOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNo
-dHNiIj5LYXRhc3RyYWxnZW1laW5kZTo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVj
-aHRzYiI+R3J1bmRzdMO8Y2tzbnVtbWVybjo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0i
-TjEwMkU4Ij4KPHAgY2xhc3M9IlRhYlRleHQiPkxpbno8L3A+CjxwIGNsYXNzPSJU
-YWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+VXJmYWhyICg0NTIx
-Mik8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij4uOTAwPC9wPgo8L3RkPgo8L3RyPgo8
-dHI+Cjx0ZCBjbGFzcz0iTjEwMzAxIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNi
-Ij5BcnQgZGVyIEFsdGxhc3Q6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDMwQiI+
-CjxwIGNsYXNzPSJUYWJUZXh0Ij5BbHRzdGFuZG9ydDwvcD4KPC90ZD4KPC90cj4K
-PHRyPgo8dGQgY2xhc3M9Ik4xMDMxOCI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRz
-YiI+RGF0dW0gZGVyIEFsdGxhc3RhdXN3ZWlzdW5nOjwvcD4KPC90ZD4KPHRkIGNs
-YXNzPSJOMTAzMjIiPgo8cCBjbGFzcz0iVGFiVGV4dCI+MTUuOS4yMDAzPC9wPgo8
-L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMzJGIj4KPHAgY2xhc3M9IlRh
-YlRleHRSZWNodHNiIj5Qcmlvcml0w6R0ZW5rbGFzc2U6PC9wPgo8L3RkPgo8dGQg
-Y2xhc3M9Ik4xMDMzOSI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4yPC9wPgo8L3RkPgo8
-L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwMzQ2Ij4KPHAgY2xhc3M9IlRhYlRleHRS
-ZWNodHNiIj5EYXR1bSBkZXIgUHJpb3JpdMOkdGVua2xhc3NpZml6aWVydW5nOjwv
-cD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAzNTAiPgo8cCBjbGFzcz0iVGFiVGV4dCI+
-MTUuOS4yMDA0PC9wPgo8L3RkPgo8L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0iQWJz
-dGFuZCI+PC9wPgo8dGFibGUgY2xhc3M9Ik4xMDM1RSI+Cjx0cj4KPHRkIGNsYXNz
-PSJOMTAzNjciIGNvbHNwYW49IjIiPgo8cCBjbGFzcz0iRXJsVWViZXJzY2hyTCI+
-QUxUTEFTVCBPNjI6IFB1dHplcmVpIFNjaHdhYi1Ob3JnZTwvcD4KPC90ZD4KPC90
-cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDM3NSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVj
-aHRzYiI+QmV6aXJrOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5HZW1l
-aW5kZTo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+S2F0YXN0cmFsZ2Vt
-ZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdydW5kc3TDvGNr
-c251bW1lcm46PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDM4QiI+CjxwIGNsYXNz
-PSJUYWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+TGluejwvcD4K
-PHAgY2xhc3M9IlRhYlRleHQiPlVyZmFociAoNDUyMTIpPC9wPgo8cCBjbGFzcz0i
-VGFiVGV4dCI+LjQ2NjwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4x
-MDNBNCI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+QXJ0IGRlciBBbHRsYXN0
-OjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAzQUUiPgo8cCBjbGFzcz0iVGFiVGV4
-dCI+QWx0c3RhbmRvcnQ8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJO
-MTAzQkIiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBBbHRs
-YXN0YXVzd2Vpc3VuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwM0M1Ij4KPHAg
-Y2xhc3M9IlRhYlRleHQiPjEwLjkuMjAwMzwvcD4KPC90ZD4KPC90cj4KPHRyPgo8
-dGQgY2xhc3M9Ik4xMDNEMiI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+UHJp
-b3JpdMOkdGVua2xhc3NlOjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTAzREMiPgo8
-cCBjbGFzcz0iVGFiVGV4dCI+MTwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xh
-c3M9Ik4xMDNFOSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+RGF0dW0gZGVy
-IFByaW9yaXTDpHRlbmtsYXNzaWZpemllcnVuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFz
-cz0iTjEwM0YzIj4KPHAgY2xhc3M9IlRhYlRleHQiPjE1LjkuMjAwNOKAnAo8L3A+
-CjwvdGQ+CjwvdHI+CjwvdGFibGU+CjxwIGNsYXNzPSJBYnN0YW5kIj48L3A+Cjxw
-IGNsYXNzPSJOb3ZBbzEiPjUuIEltIEFuaGFuZyA0IGxhdXRldCBkZXIgRWludHJh
-ZyBBTFRMQVNUIE82NDo8L3A+Cjx0YWJsZSBjbGFzcz0iTjEwNDA3Ij4KPHRyPgo8
-dGQgY2xhc3M9Ik4xMDQxMCIgY29sc3Bhbj0iMiI+CjxwIGNsYXNzPSJFcmxVZWJl
-cnNjaHJMIj4K4oCeQUxUTEFTVCBPNjQ6IEtpdHptYW50ZWw8L3A+CjwvdGQ+Cjwv
-dHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA0MjAiPgo8cCBjbGFzcz0iVGFiVGV4dFJl
-Y2h0c2IiPkJlemlyazo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+R2Vt
-ZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkthdGFzdHJhbGdl
-bWVpbmRlOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5HcnVuZHN0w7xj
-a3NudW1tZXJuOjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTA0MzYiPgo8cCBjbGFz
-cz0iVGFiVGV4dCI+R211bmRlbjwvcD4KPHAgY2xhc3M9IlRhYlRleHQiPlZvcmNo
-ZG9yZjwvcD4KPHAgY2xhc3M9IlRhYlRleHQiPlZvcmNoZG9yZiAoNDIxNjQpPC9w
-Pgo8cCBjbGFzcz0iVGFiVGV4dCI+Mzc2LzE8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4K
-PHRkIGNsYXNzPSJOMTA0NEYiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkFy
-dCBkZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwNDU5Ij4KPHAg
-Y2xhc3M9IlRhYlRleHQiPkFsdGFibGFnZXJ1bmc8L3A+CjwvdGQ+CjwvdHI+Cjx0
-cj4KPHRkIGNsYXNzPSJOMTA0NjYiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2Ii
-PkRhdHVtIGRlciBBbHRsYXN0YXVzd2Vpc3VuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFz
-cz0iTjEwNDcwIj4KPHAgY2xhc3M9IlRhYlRleHQiPjI1LjEyLjIwMDM8L3A+Cjwv
-dGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA0N0QiPgo8cCBjbGFzcz0iVGFi
-VGV4dFJlY2h0c2IiPlByaW9yaXTDpHRlbmtsYXNzZTo8L3A+CjwvdGQ+Cjx0ZCBj
-bGFzcz0iTjEwNDg3Ij4KPHAgY2xhc3M9IlRhYlRleHQiPjM8L3A+CjwvdGQ+Cjwv
-dHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA0OTQiPgo8cCBjbGFzcz0iVGFiVGV4dFJl
-Y2h0c2IiPkRhdHVtIGRlciBQcmlvcml0w6R0ZW5rbGFzc2lmaXppZXJ1bmc6PC9w
-Pgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDQ5RSI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4x
-NS45LjIwMDTigJwKPC9wPgo8L3RkPgo8L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0i
-QWJzdGFuZCI+PC9wPgo8cCBjbGFzcz0iTm92QW8xIj42LiBJbSBBbmhhbmcgNCB3
-ZXJkZW4gZm9sZ2VuZGUgRWludHLDpGdlIEFMVExBU1QgTzY1IGJpcyBPNjcgYW5n
-ZWbDvGd0OjwvcD4KPHRhYmxlIGNsYXNzPSJOMTA0QjIiPgo8dHI+Cjx0ZCBjbGFz
-cz0iTjEwNEJCIiBjb2xzcGFuPSIyIj4KPHAgY2xhc3M9IkVybFVlYmVyc2Nockwi
-PgrigJ5BTFRMQVNUIE82NTogUmFwcGVyc2JlcmdlciBDaGVtaWthbGllbjwvcD4K
-PC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9Ik4xMDRDQiI+CjxwIGNsYXNzPSJU
-YWJUZXh0UmVjaHRzYiI+QmV6aXJrOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNo
-dHNiIj5HZW1laW5kZTo8L3A+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+S2F0
-YXN0cmFsZ2VtZWluZGU6PC9wPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdy
-dW5kc3TDvGNrc251bW1lcm46PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDRFMSI+
-CjxwIGNsYXNzPSJUYWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+
-TGluejwvcD4KPHAgY2xhc3M9IlRhYlRleHQiPlVyZmFociAoNDUyMTIpPC9wPgo8
-cCBjbGFzcz0iVGFiVGV4dCI+NDgyLzE8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRk
-IGNsYXNzPSJOMTA0RkEiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkFydCBk
-ZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwNTA0Ij4KPHAgY2xh
-c3M9IlRhYlRleHQiPkFsdHN0YW5kb3J0PC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0
-ZCBjbGFzcz0iTjEwNTExIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5EYXR1
-bSBkZXIgQWx0bGFzdGF1c3dlaXN1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4x
-MDUxQiI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4xNS45LjIwMDQ8L3A+CjwvdGQ+Cjwv
-dHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1MjgiPgo8cCBjbGFzcz0iVGFiVGV4dFJl
-Y2h0c2IiPlByaW9yaXTDpHRlbmtsYXNzZTo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0i
-TjEwNTMyIj4KPHAgY2xhc3M9IlRhYlRleHQiPi08L3A+CjwvdGQ+CjwvdHI+Cjx0
-cj4KPHRkIGNsYXNzPSJOMTA1M0YiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2Ii
-PkRhdHVtIGRlciBQcmlvcml0w6R0ZW5rbGFzc2lmaXppZXJ1bmc6PC9wPgo8L3Rk
-Pgo8dGQgY2xhc3M9Ik4xMDU0OSI+CjxwIGNsYXNzPSJUYWJUZXh0Ij4tPC9wPgo8
-L3RkPgo8L3RyPgo8L3RhYmxlPgo8cCBjbGFzcz0iQWJzdGFuZCI+PC9wPgo8dGFi
-bGUgY2xhc3M9Ik4xMDU1NyI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1NjAiIGNvbHNw
-YW49IjIiPgo8cCBjbGFzcz0iRXJsVWViZXJzY2hyTCI+QUxUTEFTVCBPNjY6IFB1
-dHplcmVpIEvDpGZlcmLDtmNrPC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFz
-cz0iTjEwNTZFIj4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5CZXppcms6PC9w
-Pgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdlbWVpbmRlOjwvcD4KPHAgY2xh
-c3M9IlRhYlRleHRSZWNodHNiIj5LYXRhc3RyYWxnZW1laW5kZTo8L3A+CjxwIGNs
-YXNzPSJUYWJUZXh0UmVjaHRzYiI+R3J1bmRzdMO8Y2tzbnVtbWVybjo8L3A+Cjwv
-dGQ+Cjx0ZCBjbGFzcz0iTjEwNTg0Ij4KPHAgY2xhc3M9IlRhYlRleHQiPkxpbno8
-L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4
-dCI+VXJmYWhyICg0NTIxMik8L3A+CjxwIGNsYXNzPSJUYWJUZXh0Ij4uMzcyLzI8
-L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1OUQiPgo8cCBjbGFz
-cz0iVGFiVGV4dFJlY2h0c2IiPkFydCBkZXIgQWx0bGFzdDo8L3A+CjwvdGQ+Cjx0
-ZCBjbGFzcz0iTjEwNUE3Ij4KPHAgY2xhc3M9IlRhYlRleHQiPkFsdHN0YW5kb3J0
-PC9wPgo8L3RkPgo8L3RyPgo8dHI+Cjx0ZCBjbGFzcz0iTjEwNUI0Ij4KPHAgY2xh
-c3M9IlRhYlRleHRSZWNodHNiIj5EYXR1bSBkZXIgQWx0bGFzdGF1c3dlaXN1bmc6
-PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDVCRSI+CjxwIGNsYXNzPSJUYWJUZXh0
-Ij4xNS45LjIwMDQ8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1
-Q0IiPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPlByaW9yaXTDpHRlbmtsYXNz
-ZTo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwNUQ1Ij4KPHAgY2xhc3M9IlRhYlRl
-eHQiPjE8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNzPSJOMTA1RTIiPgo8
-cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBQcmlvcml0w6R0ZW5r
-bGFzc2lmaXppZXJ1bmc6PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDVFQyI+Cjxw
-IGNsYXNzPSJUYWJUZXh0Ij4xNS45LjIwMDQ8L3A+CjwvdGQ+CjwvdHI+CjwvdGFi
-bGU+CjxwIGNsYXNzPSJBYnN0YW5kIj48L3A+Cjx0YWJsZSBjbGFzcz0iTjEwNUZB
-Ij4KPHRyPgo8dGQgY2xhc3M9Ik4xMDYwMyIgY29sc3Bhbj0iMiI+CjxwIGNsYXNz
-PSJFcmxVZWJlcnNjaHJMIj5BTFRMQVNUIE82NzogQlAtVGFua2xhZ2VyIExpbnog
-MSBhbHQgLSBTY2hhZGVuc2ZhbGwgU0YyQTwvcD4KPC90ZD4KPC90cj4KPHRyPgo8
-dGQgY2xhc3M9Ik4xMDYxMSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+QmV6
-aXJrOjwvcD4KPHAgY2xhc3M9IlRhYlRleHRSZWNodHNiIj5HZW1laW5kZTo8L3A+
-CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+S2F0YXN0cmFsZ2VtZWluZGU6PC9w
-Pgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkdydW5kc3TDvGNrc251bW1lcm46
-PC9wPgo8L3RkPgo8dGQgY2xhc3M9Ik4xMDYyNyI+CjxwIGNsYXNzPSJUYWJUZXh0
-Ij5MaW56PC9wPgo8cCBjbGFzcz0iVGFiVGV4dCI+TGluejwvcD4KPHAgY2xhc3M9
-IlRhYlRleHQiPkx1c3RlbmF1ICg0NTIwNCk8L3A+CjxwIGNsYXNzPSJUYWJUZXh0
-Ij4xNDg1LzIsIDE0ODUvODwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQgY2xhc3M9
-Ik4xMDY0MCI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+QXJ0IGRlciBBbHRs
-YXN0OjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTA2NEEiPgo8cCBjbGFzcz0iVGFi
-VGV4dCI+QWx0c3RhbmRvcnQ8L3A+CjwvdGQ+CjwvdHI+Cjx0cj4KPHRkIGNsYXNz
-PSJOMTA2NTciPgo8cCBjbGFzcz0iVGFiVGV4dFJlY2h0c2IiPkRhdHVtIGRlciBB
-bHRsYXN0YXVzd2Vpc3VuZzo8L3A+CjwvdGQ+Cjx0ZCBjbGFzcz0iTjEwNjYxIj4K
-PHAgY2xhc3M9IlRhYlRleHQiPjE1LjkuMjAwNDwvcD4KPC90ZD4KPC90cj4KPHRy
-Pgo8dGQgY2xhc3M9Ik4xMDY2RSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+
-UHJpb3JpdMOkdGVua2xhc3NlOjwvcD4KPC90ZD4KPHRkIGNsYXNzPSJOMTA2Nzgi
-Pgo8cCBjbGFzcz0iVGFiVGV4dCI+MzwvcD4KPC90ZD4KPC90cj4KPHRyPgo8dGQg
-Y2xhc3M9Ik4xMDY4NSI+CjxwIGNsYXNzPSJUYWJUZXh0UmVjaHRzYiI+RGF0dW0g
-ZGVyIFByaW9yaXTDpHRlbmtsYXNzaWZpemllcnVuZzo8L3A+CjwvdGQ+Cjx0ZCBj
-bGFzcz0iTjEwNjhGIj4KPHAgY2xhc3M9IlRhYlRleHQiPjE1LjkuMjAwNOKAnAo8
-L3A+CjwvdGQ+CjwvdHI+CjwvdGFibGU+CjxwIGNsYXNzPSJVbnRlcnNjaHJMIj5Q
-csO2bGw8L3A+Cgo8cCBjbGFzcz0iRnVzc3plaWxlIj53d3cucmlzLmJrYS5ndi5h
-dDwvcD4KPC9kaXY+CjwvYm9keT4KCjwvaHRtbD4=</sl11:Base64Content></sl11:HashInputData><sl11:SignatureCheck><sl11:Code>0</sl11:Code></sl11:SignatureCheck><sl11:SignatureManifestCheck><sl11:Code>98</sl11:Code></sl11:SignatureManifestCheck><sl11:SignatureManifestCheck><sl11:Code>0</sl11:Code></sl11:SignatureManifestCheck><sl11:CertificateCheck><sl10:Code>1</sl10:Code></sl11:CertificateCheck></sl11:VerifyXMLSignatureResponse>
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();
- }
-
-}