From 56ed4518d7978c064af5f240494bf587136c93b0 Mon Sep 17 00:00:00 2001 From: rudolf Date: Mon, 15 Mar 2004 16:07:52 +0000 Subject: RSCH git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@99 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .../data/abnahme-test/conf/OAConfHeaderAuth.xml | 2 +- .../data/abnahme-test/conf/OAConfParamAuth.xml | 2 +- .../abnahme-test/conf/moa-id/ConfigurationTest.xml | 4 +- .../xmldata/A200/A262/Configuration.xml | 22 +-- .../xmldata/A300/A301/Configuration.xml | 2 +- .../xmldata/A300/A302/Configuration.xml | 2 +- .../xmldata/A300/A303/Configuration.xml | 2 +- .../xmldata/A300/A304/Configuration.xml | 2 +- .../xmldata/A300/A305/Configuration.xml | 2 +- .../xmldata/A300/A306/Configuration.xml | 2 +- .../xmldata/A300/A307/Configuration.xml | 2 +- .../xmldata/A300/A308/Configuration.xml | 2 +- .../xmldata/A300/A309/Configuration.xml | 2 +- .../xmldata/A300/A310/Configuration.xml | 2 +- .../xmldata/A300/A311/Configuration.xml | 2 +- .../xmldata/A300/A366/Configuration.xml | 4 +- .../xmldata/A300/A367/Configuration.xml | 4 +- .../xmldata/A700/A703/Configuration.xml | 2 +- .../abnahme-test/xmldata/A700/Configuration.xml | 2 +- .../xmldata/C000/C001/Configuration.xml | 2 +- .../xmldata/C000/C002/Configuration.xml | 2 +- .../data/abnahme-test/xmldata/Configuration.xml | 24 ++-- .../abnahme-test/xmldata/L000/Configuration.xml | 22 +-- .../conf/moa-id/SampleMOAIDConfiguration.xml | 21 +-- id.server/data/deploy/tomcat/server.mod_jk.xml | 157 ++++++++------------- id.server/data/deploy/tomcat/server.xml | 58 +++++--- id.server/data/test/conf/ConfigurationTest.xml | 16 +-- id.server/data/test/conf/OAConfHeaderAuth.xml | 2 +- 28 files changed, 172 insertions(+), 196 deletions(-) (limited to 'id.server/data') diff --git a/id.server/data/abnahme-test/conf/OAConfHeaderAuth.xml b/id.server/data/abnahme-test/conf/OAConfHeaderAuth.xml index c92e055e9..c084410b4 100644 --- a/id.server/data/abnahme-test/conf/OAConfHeaderAuth.xml +++ b/id.server/data/abnahme-test/conf/OAConfHeaderAuth.xml @@ -7,7 +7,7 @@
-
+
diff --git a/id.server/data/abnahme-test/conf/OAConfParamAuth.xml b/id.server/data/abnahme-test/conf/OAConfParamAuth.xml index a70f6a6c0..7b1c7c075 100644 --- a/id.server/data/abnahme-test/conf/OAConfParamAuth.xml +++ b/id.server/data/abnahme-test/conf/OAConfParamAuth.xml @@ -5,6 +5,6 @@ stateful - + diff --git a/id.server/data/abnahme-test/conf/moa-id/ConfigurationTest.xml b/id.server/data/abnahme-test/conf/moa-id/ConfigurationTest.xml index f2e23f2e2..fff97860a 100644 --- a/id.server/data/abnahme-test/conf/moa-id/ConfigurationTest.xml +++ b/id.server/data/abnahme-test/conf/moa-id/ConfigurationTest.xml @@ -34,7 +34,7 @@ - + file:/C:/Programme/ApacheGroup/abnahme/conf/moa-id/oa/server-certs/tomcat @@ -43,7 +43,7 @@ - + file:/home/moa/id/abnahme/conf/moa-id/oa/server-certs/tomcat diff --git a/id.server/data/abnahme-test/xmldata/A200/A262/Configuration.xml b/id.server/data/abnahme-test/xmldata/A200/A262/Configuration.xml index 44b4f519b..4f3cfe2ba 100644 --- a/id.server/data/abnahme-test/xmldata/A200/A262/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A200/A262/Configuration.xml @@ -34,7 +34,7 @@ - + url:AcceptedServerCertificates @@ -43,7 +43,7 @@ - + url:AcceptedServerCertificates2 @@ -52,7 +52,7 @@ - + url:AcceptedServerCertificates2 @@ -61,7 +61,7 @@ - + url:AcceptedServerCertificates2 @@ -70,25 +70,25 @@ - + - + - + - + - + - + - + diff --git a/id.server/data/abnahme-test/xmldata/A300/A301/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A301/Configuration.xml index 39d9a864b..1b70f3997 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A301/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A301/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A302/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A302/Configuration.xml index 804a27e92..aff5564dc 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A302/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A302/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A303/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A303/Configuration.xml index 2067a40c7..1ec231dff 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A303/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A303/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A304/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A304/Configuration.xml index bc1bc17ce..3325577ec 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A304/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A304/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A305/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A305/Configuration.xml index 7a2ed2017..10ab7fd96 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A305/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A305/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A306/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A306/Configuration.xml index 3750de781..908f64dd9 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A306/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A306/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A307/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A307/Configuration.xml index 7400f791a..a784e4a7f 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A307/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A307/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A308/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A308/Configuration.xml index b6b42f267..0a8505c42 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A308/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A308/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A309/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A309/Configuration.xml index 9e523773a..8a673cb6c 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A309/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A309/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A310/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A310/Configuration.xml index 9e523773a..8a673cb6c 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A310/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A310/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A311/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A311/Configuration.xml index 9e523773a..8a673cb6c 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A311/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A311/Configuration.xml @@ -40,7 +40,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A366/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A366/Configuration.xml index 9a358e434..b3fb62200 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A366/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A366/Configuration.xml @@ -35,7 +35,7 @@ - + url:AcceptedServerCertificates @@ -44,7 +44,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A300/A367/Configuration.xml b/id.server/data/abnahme-test/xmldata/A300/A367/Configuration.xml index 5aade8185..cf4e839ea 100644 --- a/id.server/data/abnahme-test/xmldata/A300/A367/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A300/A367/Configuration.xml @@ -35,7 +35,7 @@ - + url:AcceptedServerCertificates @@ -44,7 +44,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/A700/A703/Configuration.xml b/id.server/data/abnahme-test/xmldata/A700/A703/Configuration.xml index f38dc9ee0..d440c61ab 100644 --- a/id.server/data/abnahme-test/xmldata/A700/A703/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A700/A703/Configuration.xml @@ -26,7 +26,7 @@ - + diff --git a/id.server/data/abnahme-test/xmldata/A700/Configuration.xml b/id.server/data/abnahme-test/xmldata/A700/Configuration.xml index 44cc09196..e9d18ea89 100644 --- a/id.server/data/abnahme-test/xmldata/A700/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/A700/Configuration.xml @@ -26,7 +26,7 @@ - + diff --git a/id.server/data/abnahme-test/xmldata/C000/C001/Configuration.xml b/id.server/data/abnahme-test/xmldata/C000/C001/Configuration.xml index e125e2c38..bb4bfdd62 100644 --- a/id.server/data/abnahme-test/xmldata/C000/C001/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/C000/C001/Configuration.xml @@ -39,7 +39,7 @@ - + url:AcceptedServerCertificates2 diff --git a/id.server/data/abnahme-test/xmldata/C000/C002/Configuration.xml b/id.server/data/abnahme-test/xmldata/C000/C002/Configuration.xml index 7a75d85f8..cc4b33faa 100644 --- a/id.server/data/abnahme-test/xmldata/C000/C002/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/C000/C002/Configuration.xml @@ -19,6 +19,6 @@ - + diff --git a/id.server/data/abnahme-test/xmldata/Configuration.xml b/id.server/data/abnahme-test/xmldata/Configuration.xml index e3f1bd8b4..157798e85 100644 --- a/id.server/data/abnahme-test/xmldata/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/Configuration.xml @@ -36,7 +36,7 @@ - + url:AcceptedServerCertificates @@ -45,7 +45,7 @@ - + url:AcceptedServerCertificates2 @@ -54,7 +54,7 @@ - + url:AcceptedServerCertificates2 @@ -63,7 +63,7 @@ - + url:AcceptedServerCertificates2 @@ -72,25 +72,25 @@ - + - + - + - + - + - + - + @@ -102,4 +102,4 @@ - + \ No newline at end of file diff --git a/id.server/data/abnahme-test/xmldata/L000/Configuration.xml b/id.server/data/abnahme-test/xmldata/L000/Configuration.xml index e3f1bd8b4..b282548dc 100644 --- a/id.server/data/abnahme-test/xmldata/L000/Configuration.xml +++ b/id.server/data/abnahme-test/xmldata/L000/Configuration.xml @@ -36,7 +36,7 @@ - + url:AcceptedServerCertificates @@ -45,7 +45,7 @@ - + url:AcceptedServerCertificates2 @@ -54,7 +54,7 @@ - + url:AcceptedServerCertificates2 @@ -63,7 +63,7 @@ - + url:AcceptedServerCertificates2 @@ -72,25 +72,25 @@ - + - + - + - + - + - + - + diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml index e55e32679..12366b5ac 100644 --- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml +++ b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml @@ -1,6 +1,6 @@ - + @@ -17,13 +17,14 @@ --> - + MOAIDBuergerkartePersonenbindung - - + + MOAIDBuergerkarteAuthentisierungsDaten MOAIDTransformAuthBlock @@ -34,7 +35,7 @@ CN=zmr,OU=BMI-IV-2,O=BMI,C=AT - + @@ -48,7 +49,7 @@ - + @@ -66,13 +67,13 @@ 536 - - + certs/ca-certs - + diff --git a/id.server/data/deploy/tomcat/server.mod_jk.xml b/id.server/data/deploy/tomcat/server.mod_jk.xml index 61100b260..b32cf7844 100644 --- a/id.server/data/deploy/tomcat/server.mod_jk.xml +++ b/id.server/data/deploy/tomcat/server.mod_jk.xml @@ -1,7 +1,6 @@ - - - - - - + - - - - - - - - + + - - - - - + + - - - - - + + - - - - - - - - - - + + + + - - - - - + + - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/id.server/data/deploy/tomcat/server.xml b/id.server/data/deploy/tomcat/server.xml index c99136fa2..2fd7b6439 100644 --- a/id.server/data/deploy/tomcat/server.xml +++ b/id.server/data/deploy/tomcat/server.xml @@ -50,18 +50,22 @@ IP address of the remote client. --> - - + + - - - + + + + + --> - + - + - + - + - + @@ -145,13 +155,17 @@ --> - + - + - + - + \ No newline at end of file diff --git a/id.server/data/test/conf/ConfigurationTest.xml b/id.server/data/test/conf/ConfigurationTest.xml index 5c18e35cc..8e18c0802 100644 --- a/id.server/data/test/conf/ConfigurationTest.xml +++ b/id.server/data/test/conf/ConfigurationTest.xml @@ -19,7 +19,7 @@ - CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT + CN=MOA Test CA - Signaturdienste,OU=IKT-Stabsstelle des Bundes,O=Bundesministerium für öffentliche Leistung und Sport,C=AT @@ -31,7 +31,7 @@ - + url:AcceptedServerCertificates @@ -40,7 +40,7 @@ - + file:data/test/certs/server-certs @@ -48,7 +48,7 @@ - + file:data/test/certs/server-certs @@ -56,7 +56,7 @@ - + file:data/test/certs/server-certs @@ -64,7 +64,7 @@ - + file:data/test/certs/server-certs @@ -72,7 +72,7 @@ - + url:AcceptedServerCertificates2 @@ -81,7 +81,7 @@ - + url:AcceptedServerCertificates3 diff --git a/id.server/data/test/conf/OAConfHeaderAuth.xml b/id.server/data/test/conf/OAConfHeaderAuth.xml index c92e055e9..c084410b4 100644 --- a/id.server/data/test/conf/OAConfHeaderAuth.xml +++ b/id.server/data/test/conf/OAConfHeaderAuth.xml @@ -7,7 +7,7 @@
-
+
-- cgit v1.2.3