From a67ed8406bb7f9d4bca48891308e7bfead90efe4 Mon Sep 17 00:00:00 2001 From: gregor Date: Thu, 11 Aug 2005 13:22:41 +0000 Subject: =?UTF-8?q?Bug=20271:=20Adpation=20auf=20neue=20Struktur=20des=20K?= =?UTF-8?q?onfigurationsfiles=20abgeschlossen.=20Modultests=20durchgef?= =?UTF-8?q?=C3=BChrt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@436 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .../properties/spss_messages_de.properties | 2 +- .../res/test/resources/config/log4j.properties | 10 +++++++ .../test/resources/config/moa.sp.noopts-config.xml | 32 ++++++++++++++++++++++ .../resources/config/moa.spss.complete-config.xml | 26 ++++++++---------- .../test/resources/config/moa.ss.noopts-config.xml | 31 +++++++++++++++++++++ .../test/resources/config/profiles/csep/CSEP_1.xml | 4 +++ .../test/resources/config/profiles/ctip/CTIP_1.xml | 8 ++++++ .../test/resources/config/profiles/ctip/CTIP_2.xml | 8 ++++++ .../res/test/resources/config/profiles/sp/SP_1.xml | 4 +++ .../test/resources/config/profiles/vtip/VTIP_1.xml | 2 ++ .../test/resources/config/swk/SWK1_FileName.txt | 0 .../test/resources/config/swk/SWK2_FileName.txt | 0 12 files changed, 112 insertions(+), 15 deletions(-) create mode 100644 spss.server/res/test/resources/config/log4j.properties create mode 100644 spss.server/res/test/resources/config/moa.sp.noopts-config.xml create mode 100644 spss.server/res/test/resources/config/moa.ss.noopts-config.xml create mode 100644 spss.server/res/test/resources/config/profiles/csep/CSEP_1.xml create mode 100644 spss.server/res/test/resources/config/profiles/ctip/CTIP_1.xml create mode 100644 spss.server/res/test/resources/config/profiles/ctip/CTIP_2.xml create mode 100644 spss.server/res/test/resources/config/profiles/sp/SP_1.xml create mode 100644 spss.server/res/test/resources/config/profiles/vtip/VTIP_1.xml create mode 100644 spss.server/res/test/resources/config/swk/SWK1_FileName.txt create mode 100644 spss.server/res/test/resources/config/swk/SWK2_FileName.txt (limited to 'spss.server/res') 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 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 @@ + + + + + + false + false + + + certstore + + + + + + pkix + + + TP1_Id + trustprofiles/tp1/anchors + + + + false + 10000 + + false + + + + + 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 @@ - - + HWC1_Name HWC1_SlotId @@ -26,12 +24,12 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS SWK1_Id - SWK1_FileName + swk/SWK1_FileName.txt SWK1_Password SWK2_Id - SWK1_FileName + swk/SWK2_FileName.txt @@ -74,15 +72,15 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS 4 KG1_Id - KK2_Id + KG2_Id KG1_Id - KK2_Id + KG2_Id - http://an.c14n.alg - http://a.digest.method + http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments + http://www.w3.org/2000/09/xmldsig#sha1 CTIP_1 @@ -94,7 +92,7 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS CSEP_1 - profiles/csep/CESP_1.xml + profiles/csep/CSEP_1.xml @@ -104,7 +102,7 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS false - certstore + certstore_test @@ -113,7 +111,7 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS pkix - + CN=TA1_Issuer 5 chaining @@ -133,8 +131,8 @@ E:\cio\projekte\basismodule\wartung\projekt\common\res\resources\schemas\MOA-SPS TP2_Id - file:e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/trustprofiles/tp2/anchors/ - file:e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/trustprofiles/tp2/signercerts/ + file:e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/trustprofiles/tp2/anchors + file:e:/cio/projekte/basismodule/wartung/projekt/spss.server/res/test/resources/config/trustprofiles/tp2/signercerts 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 @@ + + + + + + HWK1_Id + HWK1_Name + HWK1_SlotId + HWK1_UserPIN + + + + KG1_Id + + HWK1_Id + + CN=HWK1_Issuer + 0 + + + + + + CN=Customer1_Issuer + 4 + + KG1_Id + + + + 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 @@ + + + + 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 @@ + + + + + text/plain + + + 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 @@ + + + + + text/plain + + + 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 @@ + + + + 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 @@ + + 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 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 -- cgit v1.2.3