Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java

1 files changed, 71 insertions, 53 deletions

diff --git a/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml b/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml
index 171e05f12..fadef82b2 100644
--- a/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml
@@ -1,67 +1,85 @@
 <?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>
+    <!-- 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>
+        <!-- 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" />
+            <parameter name="softTrustStoreConfig" 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>
+    <!-- ******************** 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>
+        <!-- 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 ******************** -->
+    <!-- ******************** CONF2 ******************** -->
 
-	<instance name="CONF2">
-		<configuration name="SamlEngineConf">
-			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf2.xml" />
-		</configuration>
+    <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>
+        <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 ******************** -->
+    <!-- ******************** CONF3 ******************** -->
 
-	<instance name="CONF3">
-		<configuration name="SamlEngineConf">
-			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf3.xml" />
-		</configuration>
+    <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>
+        <configuration name="SignatureConf">
+            <parameter name="class"
+                       value="eu.stork.peps.auth.engine.core.impl.SignSW" />
+            <parameter name="fileConfiguration" value="SignModule_Conf3.xml" />
+        </configuration>
+    </instance>
+	
+    <!-- ******************** CONF4 ******************** -->
+    <instance name="CONF4">
+        <!-- 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.SignHW" />
+            <!-- Settings specific module -->
+            <parameter name="fileConfiguration" value="SignModule_P11.xml" />
+            <parameter name="softTrustStoreConfig" value="SignModule_Conf0.xml" />
+        </configuration>
+    </instance>
 
 </instances>
\ No newline at end of file