*** empty log message ***

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

45 files changed, 158 insertions, 161 deletions

diff --git a/id.server/build.xml b/id.server/build.xml
index 504ff6d71..2a5c880ac 100644
--- a/id.server/build.xml
+++ b/id.server/build.xml
@@ -8,7 +8,7 @@
 -->
 <project name="moa.id.server" default="dist-all" basedir=".">
 	<property environment="env"/>
-	<property name="version" value="1.3.0d01"/>
+	<property name="version" value="1.3.0"/>
 	<property name="projectroot" value="."/>
 	<property name="src" value="src"/>
 	<property name="res" value="res"/>
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
new file mode 100644
index 000000000..b6f39e354
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
new file mode 100644
index 000000000..8c434777e
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
new file mode 100644
index 000000000..c5fab8369
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
new file mode 100644
index 000000000..3be7b6a06
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
new file mode 100644
index 000000000..b6f39e354
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-Qual-01.20020207-20050207.SerNo210d(SecureSignatureKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
new file mode 100644
index 000000000..8c434777e
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
new file mode 100644
index 000000000..c5fab8369
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
new file mode 100644
index 000000000..3be7b6a06
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkarteAuthentisierungsDatenOhneTestkarten/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/OCSP Responder 02-20051027-20101027.der b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/OCSP Responder 02-20051027-20101027.der
new file mode 100644
index 000000000..010c5d5b6
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungMitTestkarten/OCSP Responder 02-20051027-20101027.der
diff --git a/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/OCSP Responder 02-20051027-20101027.der b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/OCSP Responder 02-20051027-20101027.der
new file mode 100644
index 000000000..010c5d5b6
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-spss/trustprofiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/OCSP Responder 02-20051027-20101027.der
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index 5bd0ee5fa..f25982c63 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -390,18 +390,14 @@ public class AuthenticationServer implements MOAIDAuthConstants {
       new VerifyXMLSignatureRequestBuilder().build(
         identityLink,
         authConf.getMoaSpIdentityLinkTrustProfileID());
-    // debug output
-    if(null != domVerifyXMLSignatureRequest)
-    	OutputXML2File.debugOutputXML2File("VerifyIdentityLinkRequest.xml", domVerifyXMLSignatureRequest, DEBUG_OUTPUT_HIERARCHY);
+ 
     // invokes the call
     Element domVerifyXMLSignatureResponse =
       new SignatureVerificationInvoker().verifyXMLSignature(domVerifyXMLSignatureRequest);
     // parses the <VerifyXMLSignatureResponse>
     VerifyXMLSignatureResponse verifyXMLSignatureResponse =
       new VerifyXMLSignatureResponseParser(domVerifyXMLSignatureResponse).parseData();
-    // debug output
-		if(null != domVerifyXMLSignatureResponse)
-			OutputXML2File.debugOutputXML2File("VerifyIdentityLinkResponse.xml", domVerifyXMLSignatureResponse, DEBUG_OUTPUT_HIERARCHY);
+    
     if (identityLink.getIdentificationType().equalsIgnoreCase(Constants.URN_PREFIX_BASEID)) {
     }
     
@@ -519,13 +515,11 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     String tpid = authConf.getMoaSpAuthBlockTrustProfileID();
     Element domVsreq = new VerifyXMLSignatureRequestBuilder().build(csresp, vtids, tpid);
     // debug output
-		if(null != domVsreq)
-			OutputXML2File.debugOutputXML2File("VerifyAuthenticationBlockRequest.xml", domVsreq, DEBUG_OUTPUT_HIERARCHY);
+		
     // invokes the call
     Element domVsresp = new SignatureVerificationInvoker().verifyXMLSignature(domVsreq);
     // debug output
-		if(null != domVsresp) 
-			OutputXML2File.debugOutputXML2File("VerifyAuthenticationBlockResponse.xml", domVsresp, DEBUG_OUTPUT_HIERARCHY);
+		
     // parses the <VerifyXMLSignatureResponse>
     VerifyXMLSignatureResponse vsresp = new VerifyXMLSignatureResponseParser(domVsresp).parseData();
     // validates the <VerifyXMLSignatureResponse>
diff --git a/spss.handbook/conf/moa-spss/log4j.properties b/spss.handbook/conf/moa-spss/log4j.properties
index be9d38586..c19abf586 100644
--- a/spss.handbook/conf/moa-spss/log4j.properties
+++ b/spss.handbook/conf/moa-spss/log4j.properties
@@ -6,9 +6,9 @@
 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
+log4j.rootLogger=debug, stdout
+log4j.logger.moa.spss.server=debug, moaspss
+log4j.logger.iaik.server=debug, moaspss
 
 # Configure the 'stdout' appender to write logging output to the console
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/spss.handbook/conf/moa-spss/spss.config.xml b/spss.handbook/conf/moa-spss/spss.config.xml
index 0d00bb511..20d919e95 100644
--- a/spss.handbook/conf/moa-spss/spss.config.xml
+++ b/spss.handbook/conf/moa-spss/spss.config.xml
@@ -1,149 +1,153 @@
 <?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>OCSP</cfg:Service>
-<cfg:Service>CRL</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: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:TrustProfile>
+					<cfg:Id>TrustProfile_custom</cfg:Id>
+					<cfg:TrustAnchorsLocation>C:/xml/moa/support/fiala/trustProfile_custom</cfg:TrustAnchorsLocation>
+				</cfg:TrustProfile>
+			</cfg:PathValidation>
+			<cfg:RevocationChecking>
+				<cfg:EnableChecking>true</cfg:EnableChecking>
+				<cfg:MaxRevocationAge>0</cfg:MaxRevocationAge>
+				<cfg:ServiceOrder>
+					<cfg:Service>OCSP</cfg:Service>
+					<cfg:Service>CRL</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/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
new file mode 100644
index 000000000..8c434777e
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
new file mode 100644
index 000000000..c5fab8369
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
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
new file mode 100644
index 000000000..3be7b6a06
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.GewoehnlicheSignatur.CA1.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.GewoehnlicheSignatur.CA1.cer
deleted file mode 100644
index 6da18c620..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.GewoehnlicheSignatur.CA1.cer
+++ /dev/null
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA1-v1.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA1-v1.cer
deleted file mode 100644
index 57bdee680..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA1-v1.cer
+++ /dev/null
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA1.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA1.cer
deleted file mode 100644
index b1e23e1d9..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA1.cer
+++ /dev/null
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA2-v1.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA2-v1.cer
deleted file mode 100644
index db8a28398..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA2-v1.cer
+++ /dev/null
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA2.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA2.cer
deleted file mode 100644
index 3cc9d342b..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-GewoehnlicheSignatur.CA2.cer
+++ /dev/null
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-OCSP-Responder.der b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-OCSP-Responder.der
deleted file mode 100644
index 4034e0635..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/Hauptverband.Test-OCSP-Responder.der
+++ /dev/null
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
new file mode 100644
index 000000000..8c434777e
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/A-Trust-nQual-01.20040326-20070326.SerNo6632(CertifiedKeypair).cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
new file mode 100644
index 000000000..c5fab8369
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
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
new file mode 100644
index 000000000..3be7b6a06
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/Hauptverband.GewoehnlicheSignatur.CA1.cer b/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/Hauptverband.GewoehnlicheSignatur.CA1.cer
deleted file mode 100644
index 6da18c620..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/certifiedSignature/Hauptverband.GewoehnlicheSignatur.CA1.cer
+++ /dev/null
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/OCSP Responder 02-20051027-20101027.der b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/OCSP Responder 02-20051027-20101027.der
new file mode 100644
index 000000000..010c5d5b6
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test-signerCerts/OCSP Responder 02-20051027-20101027.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/OCSP Responder 02-20051027-20101027.der b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/OCSP Responder 02-20051027-20101027.der
new file mode 100644
index 000000000..010c5d5b6
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/identityLink+Test/OCSP Responder 02-20051027-20101027.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/identityLink/OCSP Responder 02-20051027-20101027.der b/spss.handbook/conf/moa-spss/trustProfiles/identityLink/OCSP Responder 02-20051027-20101027.der
new file mode 100644
index 000000000..010c5d5b6
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/identityLink/OCSP Responder 02-20051027-20101027.der
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
new file mode 100644
index 000000000..b6f39e354
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
new file mode 100644
index 000000000..c5fab8369
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
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
new file mode 100644
index 000000000..3be7b6a06
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Test-OCSP-Responder.der b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Test-OCSP-Responder.der
deleted file mode 100644
index 4034e0635..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Test-OCSP-Responder.der
+++ /dev/null
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Test-Verwaltungssignatur.CA1.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Test-Verwaltungssignatur.CA1.cer
deleted file mode 100644
index 6dbc8ea2f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Test-Verwaltungssignatur.CA1.cer
+++ /dev/null
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Test-Verwaltungssignatur.CA2.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Test-Verwaltungssignatur.CA2.cer
deleted file mode 100644
index 3ab36b774..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Test-Verwaltungssignatur.CA2.cer
+++ /dev/null
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Verwaltungssignatur.CA2.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Verwaltungssignatur.CA2.cer
deleted file mode 100644
index 5026d395f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature+Test/Hauptverband.Verwaltungssignatur.CA2.cer
+++ /dev/null
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
new file mode 100644
index 000000000..b6f39e354
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature-qual-only/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.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
new file mode 100644
index 000000000..b6f39e354
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/A-Trust.A-Trust-Qual-01.20020207-20050207.SerNo210d[SecureSignatureKeypair].cer
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
new file mode 100644
index 000000000..c5fab8369
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der
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
new file mode 100644
index 000000000..3be7b6a06
--- /dev/null
+++ b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/C=AT,O=Hauptverband oesterr. Sozialvers.,CN=Root-CA 1-2045.der
diff --git a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/Hauptverband.Verwaltungssignatur.CA2.cer b/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/Hauptverband.Verwaltungssignatur.CA2.cer
deleted file mode 100644
index 5026d395f..000000000
--- a/spss.handbook/conf/moa-spss/trustProfiles/secureSignature/Hauptverband.Verwaltungssignatur.CA2.cer
+++ /dev/null
diff --git a/spss.iaiklibsupdate/iaiklibs.eval/iaik_moa_full.jar b/spss.iaiklibsupdate/iaiklibs.eval/iaik_moa_full.jar
index fd2c27061..2aa356bf4 100644
--- a/spss.iaiklibsupdate/iaiklibs.eval/iaik_moa_full.jar
+++ b/spss.iaiklibsupdate/iaiklibs.eval/iaik_moa_full.jar
diff --git a/spss.iaiklibsupdate/iaiklibs.prod/iaik_moa_full.jar b/spss.iaiklibsupdate/iaiklibs.prod/iaik_moa_full.jar
index fe4370020..fc8ed8f18 100644
--- a/spss.iaiklibsupdate/iaiklibs.prod/iaik_moa_full.jar
+++ b/spss.iaiklibsupdate/iaiklibs.prod/iaik_moa_full.jar
diff --git a/spss.server/build.xml b/spss.server/build.xml
index 43b6fc6e2..b2aba5233 100644
--- a/spss.server/build.xml
+++ b/spss.server/build.xml
@@ -10,8 +10,7 @@
 <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.0D01"/>
-  <property name="src" value="src"/>
+  <property name="version" value="1.3.0"/>
   <property name="lib" value="lib"/>
   <property name="res" value="res"/>
   <property name="data" value="data"/>