fix added real source of stork modules

22 files changed, 1172 insertions, 0 deletions

diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/all-wcprops b/id/server/stork2-saml-engine/src/test/resources/.svn/all-wcprops
new file mode 100644
index 000000000..fe8b26f95
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/all-wcprops
@@ -0,0 +1,101 @@
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/CITnet/svn/STORK2/!svn/ver/316/trunk/SamlEngine/src/test/resources
+END
+keyStoreCountry1.jks
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/CITnet/svn/STORK2/!svn/ver/316/trunk/SamlEngine/src/test/resources/keyStoreCountry1.jks
+END
+keyStoreCountry2.jks
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/CITnet/svn/STORK2/!svn/ver/316/trunk/SamlEngine/src/test/resources/keyStoreCountry2.jks
+END
+keyStoreCountry3.jks
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/CITnet/svn/STORK2/!svn/ver/316/trunk/SamlEngine/src/test/resources/keyStoreCountry3.jks
+END
+p11Conf.cfg
+K 25
+svn:wc:ra_dav:version-url
+V 78
+/CITnet/svn/STORK2/!svn/ver/22/trunk/SamlEngine/src/test/resources/p11Conf.cfg
+END
+logback-test.xml
+K 25
+svn:wc:ra_dav:version-url
+V 83
+/CITnet/svn/STORK2/!svn/ver/22/trunk/SamlEngine/src/test/resources/logback-test.xml
+END
+SamlEngine.xml
+K 25
+svn:wc:ra_dav:version-url
+V 81
+/CITnet/svn/STORK2/!svn/ver/56/trunk/SamlEngine/src/test/resources/SamlEngine.xml
+END
+SignModule_P11.xml
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/CITnet/svn/STORK2/!svn/ver/22/trunk/SamlEngine/src/test/resources/SignModule_P11.xml
+END
+StorkSamlEngine_Conf0.xml
+K 25
+svn:wc:ra_dav:version-url
+V 92
+/CITnet/svn/STORK2/!svn/ver/56/trunk/SamlEngine/src/test/resources/StorkSamlEngine_Conf0.xml
+END
+StorkSamlEngine_Conf1.xml
+K 25
+svn:wc:ra_dav:version-url
+V 92
+/CITnet/svn/STORK2/!svn/ver/56/trunk/SamlEngine/src/test/resources/StorkSamlEngine_Conf1.xml
+END
+SignModule_Conf0.xml
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/CITnet/svn/STORK2/!svn/ver/316/trunk/SamlEngine/src/test/resources/SignModule_Conf0.xml
+END
+StorkSamlEngine_Conf2.xml
+K 25
+svn:wc:ra_dav:version-url
+V 92
+/CITnet/svn/STORK2/!svn/ver/22/trunk/SamlEngine/src/test/resources/StorkSamlEngine_Conf2.xml
+END
+SignModule_Conf1.xml
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/CITnet/svn/STORK2/!svn/ver/316/trunk/SamlEngine/src/test/resources/SignModule_Conf1.xml
+END
+StorkSamlEngine_Conf3.xml
+K 25
+svn:wc:ra_dav:version-url
+V 92
+/CITnet/svn/STORK2/!svn/ver/22/trunk/SamlEngine/src/test/resources/StorkSamlEngine_Conf3.xml
+END
+SignModule_Conf2.xml
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/CITnet/svn/STORK2/!svn/ver/316/trunk/SamlEngine/src/test/resources/SignModule_Conf2.xml
+END
+SignModule_Conf3.xml
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/CITnet/svn/STORK2/!svn/ver/316/trunk/SamlEngine/src/test/resources/SignModule_Conf3.xml
+END
+keyStoreCountry0.jks
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/CITnet/svn/STORK2/!svn/ver/316/trunk/SamlEngine/src/test/resources/keyStoreCountry0.jks
+END
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/entries b/id/server/stork2-saml-engine/src/test/resources/.svn/entries
new file mode 100644
index 000000000..1afc5a426
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/entries
@@ -0,0 +1,575 @@
+10
+
+dir
+357
+https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/SamlEngine/src/test/resources
+https://webgate.ec.europa.eu/CITnet/svn/STORK2
+
+
+
+2013-12-16T15:04:09.136643Z
+316
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+aa842e49-f825-43fc-93ba-11ee9fd5a035
+
+data
+dir
+
+logback-test.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+9645eaa7005e2fd5856a650a46e58b75
+2013-07-25T08:47:40.940990Z
+6
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+530
+
+SamlEngine.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+e2a6926fe3dabd0b07ea0c7f61a5c9a9
+2013-10-24T15:44:04.704923Z
+56
+emgrtargr
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2236
+
+SignModule_P11.xml
+file
+
+
+
+
+2013-12-20T12:27:57.254475Z
+13d70d84e25f491976cbbd9a0e3edafe
+2013-07-25T08:47:40.940990Z
+6
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+436
+
+StorkSamlEngine_Conf0.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+4ec0bc5ac4fafef57b60184cded62f9f
+2013-10-24T15:44:04.704923Z
+56
+emgrtargr
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3912
+
+StorkSamlEngine_Conf1.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+4ec0bc5ac4fafef57b60184cded62f9f
+2013-10-24T15:44:04.704923Z
+56
+emgrtargr
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3912
+
+SignModule_Conf0.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+ad61baa5b5d5a0c648b2e4c05b637add
+2013-12-16T15:04:09.136643Z
+316
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+541
+
+StorkSamlEngine_Conf2.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+7092c091691b1862d989f856cdc57b82
+2013-07-25T08:47:40.940990Z
+6
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2827
+
+SignModule_Conf1.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+16be2497f59cbd9c57acc81b783ecff1
+2013-12-16T15:04:09.136643Z
+316
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+522
+
+StorkSamlEngine_Conf3.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+44066ee14d9b2a03f7ee2f72c965c287
+2013-07-25T08:47:40.940990Z
+6
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2774
+
+SignModule_Conf2.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+fb7a26c03ef7400fe296b7d60837dff0
+2013-12-16T15:04:09.136643Z
+316
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+522
+
+SignModule_Conf3.xml
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+128795cf3937e23a2af256cc5db88b84
+2013-12-16T15:04:09.136643Z
+316
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+540
+
+keyStoreCountry0.jks
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+241d66f1af1a3937dfbbcccc7b7432c8
+2013-12-16T15:04:09.136643Z
+316
+emsomavmi
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1376
+
+keyStoreCountry1.jks
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+821660c55e39b47f7cd6c750e366531d
+2013-12-16T15:04:09.136643Z
+316
+emsomavmi
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1313
+
+keyStoreCountry2.jks
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+821660c55e39b47f7cd6c750e366531d
+2013-12-16T15:04:09.136643Z
+316
+emsomavmi
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1313
+
+keyStoreCountry3.jks
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+821660c55e39b47f7cd6c750e366531d
+2013-12-16T15:04:09.136643Z
+316
+emsomavmi
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1313
+
+p11Conf.cfg
+file
+
+
+
+
+2013-12-20T12:27:57.250475Z
+d7154f1fb90d3edbad739f703a30ff3d
+2013-07-25T08:47:40.940990Z
+6
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+510
+
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry0.jks.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry0.jks.svn-base
new file mode 100644
index 000000000..5e9587e65
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry0.jks.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry1.jks.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry1.jks.svn-base
new file mode 100644
index 000000000..5e9587e65
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry1.jks.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry2.jks.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry2.jks.svn-base
new file mode 100644
index 000000000..5e9587e65
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry2.jks.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry3.jks.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry3.jks.svn-base
new file mode 100644
index 000000000..5e9587e65
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/prop-base/keyStoreCountry3.jks.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:mime-type
+V 24
+application/octet-stream
+END
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SamlEngine.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SamlEngine.xml.svn-base
new file mode 100644
index 000000000..6bb61ae29
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SamlEngine.xml.svn-base
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<instances>

+

+	<!-- Configuration name-->

+	<instance name="CONF0">

+		<!-- Configurations parameters StorkSamlEngine  -->

+		<configuration name="SamlEngineConf">			

+			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf0.xml" />

+		</configuration>

+

+		<!-- Settings module signature-->

+		<configuration name="SignatureConf">

+			<!-- Specific signature module -->

+			<parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignSW" />

+			<!-- Settings specific module -->

+			<parameter name="fileConfiguration" value="SignModule_Conf0.xml" />

+		</configuration>

+	</instance>

+

+<!-- ******************** CONF1 ******************** -->

+	<!-- Configuration name-->

+	<instance name="CONF1">

+		<!-- Configurations parameters StorkSamlEngine  -->

+		<configuration name="SamlEngineConf">			

+			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf1.xml" />

+		</configuration>

+

+		<!-- Settings module signature-->

+		<configuration name="SignatureConf">

+			<!-- Specific signature module -->

+			<parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignSW" />

+			<!-- Settings specific module -->

+			<parameter name="fileConfiguration" value="SignModule_Conf1.xml" />

+		</configuration>

+	</instance>

+	

+<!-- ******************** CONF2 ******************** -->

+	

+	<instance name="CONF2">

+		<configuration name="SamlEngineConf">

+			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf2.xml" />

+		</configuration>

+

+		<configuration name="SignatureConf">

+			<parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignSW" />

+			<parameter name="fileConfiguration" value="SignModule_Conf2.xml" />

+		</configuration>

+	</instance>

+	

+<!-- ******************** CONF3 ******************** -->

+	

+	<instance name="CONF3">

+		<configuration name="SamlEngineConf">

+			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf3.xml" />

+		</configuration>

+

+		<configuration name="SignatureConf">

+			<parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignSW" />

+			<parameter name="fileConfiguration" value="SignModule_Conf3.xml" />

+		</configuration>

+	</instance>

+	

+</instances>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf0.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf0.xml.svn-base
new file mode 100644
index 000000000..eb9ed6f5d
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf0.xml.svn-base
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

+

+<properties>

+	<comment>SWModule sign with JKS.</comment>

+	<entry key="keystorePath">src/test/resources/keyStoreCountry0.jks</entry>

+	<entry key="keyStorePassword">local-demo</entry>

+	<entry key="keyPassword">local-demo</entry>

+	<entry key="issuer">CN=saml-demo-cert,OU=STORK2,O=Advania,L=Reykjavik,ST=Reykjavik,C=IS</entry>

+	<entry key="serialNumber">529E05C8</entry>

+	<entry key="keystoreType">JKS</entry>

+</properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf1.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf1.xml.svn-base
new file mode 100644
index 000000000..af68d33aa
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf1.xml.svn-base
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

+

+<properties>

+	<comment>SWModule sign with JKS.</comment>

+	<entry key="keystorePath">src/test/resources/keyStoreCountry1.jks</entry>

+	<entry key="keyStorePassword">local-demo</entry>

+	<entry key="keyPassword">local-demo</entry>

+	<entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>

+	<entry key="serialNumber">529E04FF</entry>

+	<entry key="keystoreType">JKS</entry>

+</properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf2.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf2.xml.svn-base
new file mode 100644
index 000000000..b13cb390a
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf2.xml.svn-base
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

+

+<properties>

+	<comment>SWModule sign with JKS.</comment>

+	<entry key="keystorePath">src/test/resources/keyStoreCountry2.jks</entry>

+	<entry key="keyStorePassword">local-demo</entry>

+	<entry key="keyPassword">local-demo</entry>

+	<entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>

+	<entry key="serialNumber">529E04FF</entry>

+	<entry key="keystoreType">JKS</entry>

+</properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf3.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf3.xml.svn-base
new file mode 100644
index 000000000..ed933020a
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_Conf3.xml.svn-base
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

+

+<properties>

+	<comment>SWModule sign with JKS.</comment>

+    <entry key="keystorePath">src/test/resources/keyStoreCountry3.jks</entry>

+    <entry key="keyStorePassword">local-demo</entry>

+    <entry key="keyPassword">local-demo</entry>

+    <entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>

+    <entry key="serialNumber">529E04FF</entry>

+    <entry key="keystoreType">JKS</entry>

+</properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_P11.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_P11.xml.svn-base
new file mode 100644
index 000000000..64eb426c8
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/SignModule_P11.xml.svn-base
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

+

+<properties>

+	<comment>HWModule sign with interface PKCS11.</comment>

+	<entry key="configurationFile">p11Config.cfg</entry>

+	<entry key="keyPassword">*******</entry>

+	<entry key="issuer">CN=XXXXXXXXX</entry>	

+	<entry key="serialNumber">xxxxxxxxxxxxxx</entry>	

+	<entry key="keystoreType">PKCS11</entry>	

+</properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf0.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf0.xml.svn-base
new file mode 100644
index 000000000..0a28a5de8
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf0.xml.svn-base
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

+

+<properties>

+	<comment>SAML constants for AuthnRequests and Responses.</comment>

+

+	<!--

+		Types of consent obtained from the user for this authentication and

+		data transfer.

+		Allow values: 'unspecified'.

+	-->

+	<entry key="consentAuthnRequest">unspecified</entry>

+	

+	<!--

+	Allow values: 'obtained', 'prior', 'current-implicit', 'current-explicit', 'unspecified'.

+	-->

+	<entry key="consentAuthnResponse">obtained</entry>

+

+	<!--URI representing the classification of the identifier

+		Allow values: 'entity'.

+	-->

+	<entry key="formatEntity">entity</entry>

+

+	<!--Only HTTP-POST binding is only supported for inter PEPS-->

+	<!--The SOAP binding is only supported for direct communication between SP-MW and VIdP-->

+	<entry key="protocolBinding">HTTP-POST</entry>

+	

+	

+	

+	

+	<!--URI representing the classification of the identifier

+		Allow values: 'entity'.

+		<entry key="eIDSectorShare">true</entry>

+		<entry key="eIDCrossSectorShare">true</entry>

+		<entry key="eIDCrossBorderShare">true</entry>

+	-->

+	

+	

+	

+	<!-- A friendly name for the attribute that can be displayed to a user -->

+	<entry key="friendlyName">false</entry>

+	

+	<!-- A friendly name for the attribute that can be displayed to a user -->

+	<entry key="isRequired">true</entry>

+	

+	<!--PEPS in the Service Provider's country-->

+	<entry key="requester">http://S-PEPS.gov.xx</entry>

+

+	<!--PEPS in the citizen's origin country-->

+	<entry key="responder">http://C-PEPS.gov.xx</entry>

+

+	<!--Subject cannot be confirmed on or after this seconds time (positive number)-->

+	<entry key="timeNotOnOrAfter">300</entry>

+	

+	<!--Validation IP of the response-->

+	<entry key="ipAddrValidation">false</entry>

+	

+	

+	<!--Subject Attribute Definitions-->

+	<entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>

+	<entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>

+	<entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>

+	<entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>

+	<entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>

+	<entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>

+	<entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>

+	<entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>

+	<entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>

+	<entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>

+	<entry key="residenceAddress">http://www.stork.gov.eu/1.0/residenceAddress</entry>

+	<entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>

+	<entry key="academicTitle">http://www.stork.gov.eu/1.0/academicTitle</entry>

+	<entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>

+	<entry key="age">http://www.stork.gov.eu/1.0/age</entry>

+	<entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>

+

+	<entry key="textResidenceAddress">http://www.stork.gov.eu/1.0/textResidenceAddress</entry>

+	<entry key="canonicalResidenceAddress">http://www.stork.gov.eu/1.0/canonicalResidenceAddress</entry>

+

+	<entry key="title">http://www.stork.gov.eu/1.0/title</entry>

+	<entry key="residencePermit">http://www.stork.gov.eu/1.0/residencePermit</entry>

+

+	<entry key="signedDoc">http://www.stork.gov.eu/1.0/signedDoc</entry>

+	<entry key="citizen509Certificate">http://www.stork.gov.eu/1.0/citizen509Certificate</entry>

+	

+	<entry key="newAttribute1">http://www.stork.gov.eu/1.0/newAttribute1</entry>

+	<entry key="newAttribute2">http://www.stork.gov.eu/1.0/newAttribute2</entry>

+	<entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>

+	<entry key="mandateContent">http://www.stork.gov.eu/1.0/mandateContent</entry>

+	

+</properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf1.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf1.xml.svn-base
new file mode 100644
index 000000000..0a28a5de8
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf1.xml.svn-base
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

+

+<properties>

+	<comment>SAML constants for AuthnRequests and Responses.</comment>

+

+	<!--

+		Types of consent obtained from the user for this authentication and

+		data transfer.

+		Allow values: 'unspecified'.

+	-->

+	<entry key="consentAuthnRequest">unspecified</entry>

+	

+	<!--

+	Allow values: 'obtained', 'prior', 'current-implicit', 'current-explicit', 'unspecified'.

+	-->

+	<entry key="consentAuthnResponse">obtained</entry>

+

+	<!--URI representing the classification of the identifier

+		Allow values: 'entity'.

+	-->

+	<entry key="formatEntity">entity</entry>

+

+	<!--Only HTTP-POST binding is only supported for inter PEPS-->

+	<!--The SOAP binding is only supported for direct communication between SP-MW and VIdP-->

+	<entry key="protocolBinding">HTTP-POST</entry>

+	

+	

+	

+	

+	<!--URI representing the classification of the identifier

+		Allow values: 'entity'.

+		<entry key="eIDSectorShare">true</entry>

+		<entry key="eIDCrossSectorShare">true</entry>

+		<entry key="eIDCrossBorderShare">true</entry>

+	-->

+	

+	

+	

+	<!-- A friendly name for the attribute that can be displayed to a user -->

+	<entry key="friendlyName">false</entry>

+	

+	<!-- A friendly name for the attribute that can be displayed to a user -->

+	<entry key="isRequired">true</entry>

+	

+	<!--PEPS in the Service Provider's country-->

+	<entry key="requester">http://S-PEPS.gov.xx</entry>

+

+	<!--PEPS in the citizen's origin country-->

+	<entry key="responder">http://C-PEPS.gov.xx</entry>

+

+	<!--Subject cannot be confirmed on or after this seconds time (positive number)-->

+	<entry key="timeNotOnOrAfter">300</entry>

+	

+	<!--Validation IP of the response-->

+	<entry key="ipAddrValidation">false</entry>

+	

+	

+	<!--Subject Attribute Definitions-->

+	<entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>

+	<entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>

+	<entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>

+	<entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>

+	<entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>

+	<entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>

+	<entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>

+	<entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>

+	<entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>

+	<entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>

+	<entry key="residenceAddress">http://www.stork.gov.eu/1.0/residenceAddress</entry>

+	<entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>

+	<entry key="academicTitle">http://www.stork.gov.eu/1.0/academicTitle</entry>

+	<entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>

+	<entry key="age">http://www.stork.gov.eu/1.0/age</entry>

+	<entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>

+

+	<entry key="textResidenceAddress">http://www.stork.gov.eu/1.0/textResidenceAddress</entry>

+	<entry key="canonicalResidenceAddress">http://www.stork.gov.eu/1.0/canonicalResidenceAddress</entry>

+

+	<entry key="title">http://www.stork.gov.eu/1.0/title</entry>

+	<entry key="residencePermit">http://www.stork.gov.eu/1.0/residencePermit</entry>

+

+	<entry key="signedDoc">http://www.stork.gov.eu/1.0/signedDoc</entry>

+	<entry key="citizen509Certificate">http://www.stork.gov.eu/1.0/citizen509Certificate</entry>

+	

+	<entry key="newAttribute1">http://www.stork.gov.eu/1.0/newAttribute1</entry>

+	<entry key="newAttribute2">http://www.stork.gov.eu/1.0/newAttribute2</entry>

+	<entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>

+	<entry key="mandateContent">http://www.stork.gov.eu/1.0/mandateContent</entry>

+	

+</properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf2.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf2.xml.svn-base
new file mode 100644
index 000000000..435ef4b82
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf2.xml.svn-base
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

+

+<properties>

+	<comment>SAML constants for AuthnRequests and Responses.</comment>

+

+	<!--

+		Types of consent obtained from the user for this authentication and

+		data transfer.

+		Allow values: 'unspecified'.

+	-->

+	<entry key="consentAuthnRequest">unspecified</entry>

+	<!--

+	Allow values: 'obtained', 'prior', 'curent-implicit', 'curent-explicit', 'unspecified'.

+	-->

+	<entry key="consentAuthnResponse">obtained</entry>

+

+	<!--URI representing the classification of the identifier

+		Allow values: 'entity'.

+	-->

+	<entry key="formatEntity">entity</entry>

+

+	<!--Only HTTP-POST binding is only supported for inter PEPS-->

+	<!--The SOAP binding is only supported for direct communication between SP-MW and VIdP-->

+	<entry key="protocolBinding">HTTP-POST</entry>

+	

+	<entry key="eIDSectorShare">false</entry>

+	<entry key="eIDCrossSectorShare">false</entry>

+	<entry key="eIDCrossBorderShare">false</entry>

+

+	<!--PEPS in the Service Provider's country-->

+	<entry key="requester">http://S-PEPS.gov.xx</entry>

+

+	<!--PEPS in the citizen's origin country-->

+	<entry key="responder">http://C-PEPS.gov.xx</entry>

+

+	<!--Subject cannot be confirmed on or after this seconds time-->

+	<entry key="timeNotOnOrAfter">300</entry>

+	

+	<!--Validation IP of the response-->

+	<entry key="ipAddrValidation">false</entry>

+	

+	<!-- A friendly name for the attribute that can be displayed to a user -->

+	<entry key="isRequired">false</entry>

+

+

+	<!--Subject Attribute Definitions-->

+	<entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>

+	<entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>

+	<entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>

+	<entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>

+	<entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>

+	<entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>

+	<entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>

+	<entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>

+	<entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>

+	<entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>

+	<entry key="residenceAddress">http://www.stork.gov.eu/1.0/residenceAddress</entry>

+	<entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>

+	<entry key="academicTitle">http://www.stork.gov.eu/1.0/academicTitle</entry>

+	<entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>

+	<entry key="age">http://www.stork.gov.eu/1.0/age</entry>

+	<entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>

+</properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf3.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf3.xml.svn-base
new file mode 100644
index 000000000..bec8934f8
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/StorkSamlEngine_Conf3.xml.svn-base
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

+

+<properties>

+	<comment>SAML constants for AuthnRequests and Responses.</comment>

+

+	<!--

+		Types of consent obtained from the user for this authentication and

+		data transfer.

+		Allow values: 'unspecified'.

+	-->

+	<entry key="consentAuthnRequest">unspecified</entry>

+	<!--

+	Allow values: 'obtained', 'prior', 'curent-implicit', 'curent-explicit', 'unspecified'.

+	-->

+	<entry key="consentAuthnResponse">obtained</entry>

+

+	<!--URI representing the classification of the identifier

+		Allow values: 'entity'.

+	-->

+	<entry key="formatEntity">entity</entry>

+	

+	<!--Only HTTP-POST binding is only supported for inter PEPS-->

+	<!--The SOAP binding is only supported for direct communication between SP-MW and VIdP-->

+	<entry key="protocolBinding">HTTP-POST</entry>

+	

+	<entry key="eIDSectorShare">false</entry>

+	<entry key="eIDCrossSectorShare">false</entry>

+	<entry key="eIDCrossBorderShare">false</entry>

+

+	<!--PEPS in the Service Provider's country-->

+	<entry key="requester">http://S-PEPS.gov.xx</entry>

+

+	<!--PEPS in the citizen's origin country-->

+	<entry key="responder">http://C-PEPS.gov.xx</entry>

+

+	<!--Subject cannot be confirmed on or after this seconds time-->

+	<entry key="timeNotOnOrAfter">300</entry>

+	

+	<!--Validation IP of the response-->

+	<entry key="ipAddrValidation">false</entry>

+	

+	<!--Subject Attribute Definitions-->

+	<entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>

+	<entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>

+	<entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>

+	<entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>

+	<entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>

+	<entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>

+	<entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>

+	<entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>

+	<entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>

+	<entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>

+	<entry key="residenceAddress">http://www.stork.gov.eu/1.0/residenceAddress</entry>

+	<entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>

+	<entry key="academicTitle">http://www.stork.gov.eu/1.0/academicTitle</entry>

+	<entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>

+	<entry key="age">http://www.stork.gov.eu/1.0/age</entry>

+	<entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>

+	<entry key="unknown">http://www.stork.gov.eu/1.0/unknown</entry>

+</properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry0.jks.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry0.jks.svn-base
new file mode 100644
index 000000000..289e952fe
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry0.jks.svn-base
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry1.jks.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry1.jks.svn-base
new file mode 100644
index 000000000..5399bf689
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry1.jks.svn-base
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry2.jks.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry2.jks.svn-base
new file mode 100644
index 000000000..5399bf689
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry2.jks.svn-base
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry3.jks.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry3.jks.svn-base
new file mode 100644
index 000000000..5399bf689
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/keyStoreCountry3.jks.svn-base
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/logback-test.xml.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/logback-test.xml.svn-base
new file mode 100644
index 000000000..ff900e124
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/logback-test.xml.svn-base
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+		Basic configuration used until the IdP can load the real configuration
+	-->
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+			</Pattern>
+		</layout>
+	</appender>
+
+	<logger name="eu.stork">
+		<level value="DEBUG" />
+	</logger>
+
+	<root>
+		<appender-ref ref="STDOUT" />
+		<level value="INFO" />
+	</root>
+
+</configuration>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/p11Conf.cfg.svn-base b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/p11Conf.cfg.svn-base
new file mode 100644
index 000000000..b712219c1
--- /dev/null
+++ b/id/server/stork2-saml-engine/src/test/resources/.svn/text-base/p11Conf.cfg.svn-base
@@ -0,0 +1,24 @@
+//ATTRIBUTE			VALUE

+//name				name suffix of this provider instance

+//library			pathname of PKCS#11 implementation

+//slotListIndex		slot index

+

+//PREFIX			DESCRIPTION

+//CKO_ 				Object class

+//CKA_ 				Attribute

+//CKK_ 				Key type

+

+//attributes(operation, keytype, keyalgorithm) = {

+//  name1 = value1

+//  [...]

+//}

+

+name=nameProvider

+library=library.dll

+slotListIndex=0

+attributes(*,CKO_PUBLIC_KEY,CKK_RSA)={

+	CKA_VERIFY=true

+}

+attributes(*,CKO_PRIVATE_KEY,CKK_RSA)={

+	CKA_SIGN=true

+}	
\ No newline at end of file