aboutsummaryrefslogtreecommitdiff
path: root/spss.server/res
diff options
context:
space:
mode:
authorgregor <gregor@d688527b-c9ab-4aba-bd8d-4036d912da1d>2005-08-11 13:22:41 +0000
committergregor <gregor@d688527b-c9ab-4aba-bd8d-4036d912da1d>2005-08-11 13:22:41 +0000
commita67ed8406bb7f9d4bca48891308e7bfead90efe4 (patch)
treecd351f4a11be4c3ea9e3ecbf4b17da54353c2e35 /spss.server/res
parent8cf117a1d3ae7381c335e037a0a5b97daef08667 (diff)
downloadmoa-id-spss-a67ed8406bb7f9d4bca48891308e7bfead90efe4.tar.gz
moa-id-spss-a67ed8406bb7f9d4bca48891308e7bfead90efe4.tar.bz2
moa-id-spss-a67ed8406bb7f9d4bca48891308e7bfead90efe4.zip
Bug 271: Adpation auf neue Struktur des Konfigurationsfiles abgeschlossen. Modultests durchgeführt.
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@436 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'spss.server/res')
-rw-r--r--spss.server/res/resources/properties/spss_messages_de.properties2
-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.xml26
-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
12 files changed, 112 insertions, 15 deletions
diff --git a/spss.server/res/resources/properties/spss_messages_de.properties b/spss.server/res/resources/properties/spss_messages_de.properties
index d7dd17464..ee65d561f 100644
--- a/spss.server/res/resources/properties/spss_messages_de.properties
+++ b/spss.server/res/resources/properties/spss_messages_de.properties
@@ -102,7 +102,7 @@ init.03=Fehler beim Aktivieren des IAIK-JCE/JSSE/JDK1.3 Workaround: SSL ist mögl
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: kein gültiger Wert für CRLArchive/duration
+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
diff --git a/spss.server/res/test/resources/config/log4j.properties b/spss.server/res/test/resources/config/log4j.properties
new file mode 100644
index 000000000..c37455300
--- /dev/null
+++ b/spss.server/res/test/resources/config/log4j.properties
@@ -0,0 +1,10 @@
+# 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
new file mode 100644
index 000000000..43374c81e
--- /dev/null
+++ b/spss.server/res/test/resources/config/moa.sp.noopts-config.xml
@@ -0,0 +1,32 @@
+<?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
index f0cbb9cdb..ce0c47a94 100644
--- a/spss.server/res/test/resources/config/moa.spss.complete-config.xml
+++ b/spss.server/res/test/resources/config/moa.spss.complete-config.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--Sample XML file generated by XMLSPY v2004 rel. 4 U (http://www.xmlspy.com)-->
-<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moaconfig/20021122#
-E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPSS-config-1.3.xsd">
+<MOAConfiguration xmlns="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
<HardwareCryptoModule>
<Name>HWC1_Name</Name>
<SlotId>HWC1_SlotId</SlotId>
@@ -26,12 +24,12 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS
</HardwareKeyModule>
<SoftwareKeyModule>
<Id>SWK1_Id</Id>
- <FileName>SWK1_FileName</FileName>
+ <FileName>swk/SWK1_FileName.txt</FileName>
<Password>SWK1_Password</Password>
</SoftwareKeyModule>
<SoftwareKeyModule>
<Id>SWK2_Id</Id>
- <FileName>SWK1_FileName</FileName>
+ <FileName>swk/SWK2_FileName.txt</FileName>
</SoftwareKeyModule>
</KeyModules>
<KeyGroup>
@@ -74,15 +72,15 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS
<dsig:X509SerialNumber>4</dsig:X509SerialNumber>
</CustomerId>
<KeyGroupId>KG1_Id</KeyGroupId>
- <KeyGroupId>KK2_Id</KeyGroupId>
+ <KeyGroupId>KG2_Id</KeyGroupId>
</KeyGroupMapping>
<KeyGroupMapping>
<KeyGroupId>KG1_Id</KeyGroupId>
- <KeyGroupId>KK2_Id</KeyGroupId>
+ <KeyGroupId>KG2_Id</KeyGroupId>
</KeyGroupMapping>
<XMLDSIG>
- <CanonicalizationAlgorithm>http://an.c14n.alg</CanonicalizationAlgorithm>
- <DigestMethodAlgorithm>http://a.digest.method</DigestMethodAlgorithm>
+ <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>
@@ -94,7 +92,7 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS
</CreateTransformsInfoProfile>
<CreateSignatureEnvironmentProfile>
<Id>CSEP_1</Id>
- <Location>profiles/csep/CESP_1.xml</Location>
+ <Location>profiles/csep/CSEP_1.xml</Location>
</CreateSignatureEnvironmentProfile>
</SignatureCreation>
<SignatureVerification>
@@ -104,7 +102,7 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS
<UseAuthorityInformationAccess>false</UseAuthorityInformationAccess>
<CertificateStore>
<DirectoryStore>
- <Location>certstore</Location>
+ <Location>certstore_test</Location>
</DirectoryStore>
</CertificateStore>
</PathConstruction>
@@ -113,7 +111,7 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS
<DefaultMode>pkix</DefaultMode>
<TrustAnchor>
<Identification>
- <dsig:X509IssuerName> </dsig:X509IssuerName>
+ <dsig:X509IssuerName>CN=TA1_Issuer</dsig:X509IssuerName>
<dsig:X509SerialNumber>5</dsig:X509SerialNumber>
</Identification>
<Mode>chaining</Mode>
@@ -133,8 +131,8 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS
</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>
+ <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>
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
new file mode 100644
index 000000000..af910ee3c
--- /dev/null
+++ b/spss.server/res/test/resources/config/moa.ss.noopts-config.xml
@@ -0,0 +1,31 @@
+<?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
new file mode 100644
index 000000000..c51d6beaf
--- /dev/null
+++ b/spss.server/res/test/resources/config/profiles/csep/CSEP_1.xml
@@ -0,0 +1,4 @@
+<?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
new file mode 100644
index 000000000..4cc6d4f65
--- /dev/null
+++ b/spss.server/res/test/resources/config/profiles/ctip/CTIP_1.xml
@@ -0,0 +1,8 @@
+<?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
new file mode 100644
index 000000000..4cc6d4f65
--- /dev/null
+++ b/spss.server/res/test/resources/config/profiles/ctip/CTIP_2.xml
@@ -0,0 +1,8 @@
+<?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
new file mode 100644
index 000000000..7d69058d7
--- /dev/null
+++ b/spss.server/res/test/resources/config/profiles/sp/SP_1.xml
@@ -0,0 +1,4 @@
+<?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
new file mode 100644
index 000000000..f97c2a78a
--- /dev/null
+++ b/spss.server/res/test/resources/config/profiles/vtip/VTIP_1.xml
@@ -0,0 +1,2 @@
+<?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
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spss.server/res/test/resources/config/swk/SWK1_FileName.txt
diff --git a/spss.server/res/test/resources/config/swk/SWK2_FileName.txt b/spss.server/res/test/resources/config/swk/SWK2_FileName.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spss.server/res/test/resources/config/swk/SWK2_FileName.txt