TSL integration updates:

- Setting of hashcache parameter in MOA
- Update MOA-SP Response (Source attribute in QualifiedCertificate and SecureSignatureCreationDevice element)
- Hidden truststores (for TSL enabled truststore: given certificates are copied to hidden truststore, where TSL certificates are copied)
- Update of QC and SSCD detection
- Update MOA-SPSS config: EU TSL URL can be set via configuration

14 files changed, 77 insertions, 107 deletions

diff --git a/id/oa/.settings/org.eclipse.wst.common.component b/id/oa/.settings/org.eclipse.wst.common.component
index 004255b9e..7e38d20b7 100644
--- a/id/oa/.settings/org.eclipse.wst.common.component
+++ b/id/oa/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

+<?xml version="1.0" encoding="UTF-8"?>

+<project-modules id="moduleCoreId" project-version="2.0">

   <wb-module deploy-name="moa-id-oa">

+    <property name="context-root" value="moa-id-oa"/>

+    <wb-resource deploy-path="/" source-path="src/main/webapp"/>

     <property name="java-output-path" value="/target/classes"/>

-        <property name="context-root" value="oa"/>

-    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>

-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>

-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>

-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/"/>

   </wb-module>

-</project-modules>

+</project-modules>
\ No newline at end of file
diff --git a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml
index c4dff31bf..a801c94a0 100644
--- a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>

   <fixed facet="jst.java"/>

   <fixed facet="jst.web"/>

-  <installed facet="jst.web" version="2.3"/>

-  <installed facet="jst.java" version="1.7"/>

-</faceted-project>

+  <installed facet="jst.web" version="2.4"/>

+  <installed facet="jst.java" version="1.4"/>

+</faceted-project>
\ No newline at end of file
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 7bcce39aa..e667e1ee5 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -9,12 +9,13 @@
         <dependent-module archiveName="moa-id-lib-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">

             <dependency-type>uses</dependency-type>

         </dependent-module>

+        <dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">

+            <dependency-type>uses</dependency-type>

+        </dependent-module>

     <property name="context-root" value="moa-id-auth"/>

+    <wb-resource deploy-path="/" source-path="src/main/webapp"/>

+    <wb-resource deploy-path="/" source-path="src/main/wsdl"/>

     <property name="java-output-path" value="/target/classes"/>

-    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>

     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>

-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>

-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>

-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/"/>

   </wb-module>

 </project-modules>

diff --git a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
index ac59587b0..564572b10 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>

   <fixed facet="jst.java"/>

   <fixed facet="jst.web"/>

+  <installed facet="jst.web" version="2.4"/>

   <installed facet="jst.java" version="5.0"/>

-  <installed facet="jst.web" version="2.3"/>

-</faceted-project>

+</faceted-project>
\ No newline at end of file
diff --git a/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs b/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs
index c788ee346..78a34d46c 100644
--- a/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs
+++ b/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
+#Mon Aug 05 10:52:32 CEST 2013

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

-org.eclipse.jdt.core.compiler.compliance=1.7

+org.eclipse.jdt.core.compiler.source=1.5

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

-org.eclipse.jdt.core.compiler.source=1.7

+org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/id/server/idserverlib/.settings/org.eclipse.wst.common.component b/id/server/idserverlib/.settings/org.eclipse.wst.common.component
index 0d5e207d9..8f3380621 100644
--- a/id/server/idserverlib/.settings/org.eclipse.wst.common.component
+++ b/id/server/idserverlib/.settings/org.eclipse.wst.common.component
@@ -2,6 +2,7 @@
   <wb-module deploy-name="moa-id-lib">

     <wb-resource deploy-path="/" source-path="src/main/java"/>

     <wb-resource deploy-path="/" source-path="src/main/resources"/>

-        <wb-resource deploy-path="/" source-path="/"/>

+        <wb-resource deploy-path="/" source-path="/src/main/java"/>

+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>

   </wb-module>

 </project-modules>

diff --git a/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
index 6c09452f2..656f15b87 100644
--- a/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
   <fixed facet="jst.java"/>

   <fixed facet="jst.utility"/>

   <installed facet="jst.utility" version="1.0"/>

-  <installed facet="jst.java" version="1.7"/>

-</faceted-project>

+  <installed facet="jst.java" version="5.0"/>

+</faceted-project>
\ No newline at end of file
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
index 1df5c5506..cc61830e7 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.component
@@ -9,10 +9,11 @@
         <dependent-module archiveName="moa-id-lib-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">

             <dependency-type>uses</dependency-type>

         </dependent-module>

+        <dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">

+            <dependency-type>uses</dependency-type>

+        </dependent-module>

     <property name="context-root" value="moa-id-proxy"/>

-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>

-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>

-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/"/>

+    <wb-resource deploy-path="/" source-path="src/main/webapp"/>

     <property name="java-output-path" value="/target/classes"/>

   </wb-module>

 </project-modules>

diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
index ac59587b0..564572b10 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>

   <fixed facet="jst.java"/>

   <fixed facet="jst.web"/>

+  <installed facet="jst.web" version="2.4"/>

   <installed facet="jst.java" version="5.0"/>

-  <installed facet="jst.web" version="2.3"/>

-</faceted-project>

+</faceted-project>
\ No newline at end of file
diff --git a/id/templates/.classpath b/id/templates/.classpath
index 3f17a7f21..0173dfd90 100644
--- a/id/templates/.classpath
+++ b/id/templates/.classpath
@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" output="target/classes" path="src/main/java">

-		<attributes>

-			<attribute name="optional" value="true"/>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">

-		<attributes>

-			<attribute name="optional" value="true"/>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

-		<attributes>

-			<attribute name="maven.pomderived" value="true"/>

-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">

-		<attributes>

-			<attribute name="owner.project.facets" value="java"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="output" path="target/classes"/>

-</classpath>

+  <classpathentry kind="output" path="target/classes"/>

+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+</classpath>
\ No newline at end of file
diff --git a/id/templates/.project b/id/templates/.project
index bbb999ed8..444626a3f 100644
--- a/id/templates/.project
+++ b/id/templates/.project
@@ -1,42 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>moa-id-templates</name>

-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.wst.validation.validationbuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.maven.ide.eclipse.maven2Builder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.wst.common.project.facet.core.builder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.m2e.core.maven2Builder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.m2e.core.maven2Nature</nature>

-		<nature>org.maven.ide.eclipse.maven2Nature</nature>

-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

-	</natures>

-</projectDescription>

+  <name>moa-id-templates</name>

+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>

+  <projects/>

+  <buildSpec>

+    <buildCommand>

+      <name>org.eclipse.jdt.core.javabuilder</name>

+    </buildCommand>

+    <buildCommand>

+      <name>org.eclipse.wst.validation.validationbuilder</name>

+    </buildCommand>

+    <buildCommand>

+      <name>org.maven.ide.eclipse.maven2Builder</name>

+    </buildCommand>

+    <buildCommand>

+      <name>org.eclipse.wst.common.project.facet.core.builder</name>

+    </buildCommand>

+    <buildCommand>

+      <name>org.eclipse.m2e.core.maven2Builder</name>

+    </buildCommand>

+  </buildSpec>

+  <natures>

+    <nature>org.eclipse.m2e.core.maven2Nature</nature>

+    <nature>org.maven.ide.eclipse.maven2Nature</nature>

+    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>

+    <nature>org.eclipse.jdt.core.javanature</nature>

+    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

+    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

+  </natures>

+</projectDescription>
\ No newline at end of file
diff --git a/id/templates/.settings/org.eclipse.jdt.core.prefs b/id/templates/.settings/org.eclipse.jdt.core.prefs
index c788ee346..5bdae7434 100644
--- a/id/templates/.settings/org.eclipse.jdt.core.prefs
+++ b/id/templates/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
+#Mon Aug 05 10:52:31 CEST 2013

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

-org.eclipse.jdt.core.compiler.compliance=1.7

+org.eclipse.jdt.core.compiler.source=1.5

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

-org.eclipse.jdt.core.compiler.source=1.7

+org.eclipse.jdt.core.compiler.compliance=1.5

diff --git a/id/templates/.settings/org.eclipse.wst.common.component b/id/templates/.settings/org.eclipse.wst.common.component
index 8ef19dd6b..0d2cb24b4 100644
--- a/id/templates/.settings/org.eclipse.wst.common.component
+++ b/id/templates/.settings/org.eclipse.wst.common.component
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

+<?xml version="1.0" encoding="UTF-8"?>

+<project-modules id="moduleCoreId" project-version="2.0">

   <wb-module deploy-name="moa-id-templates">

-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>

-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>

+    <property name="context-root" value="moa-id-templates"/>

+    <wb-resource deploy-path="/" source-path="src/main/webapp"/>

     <property name="java-output-path" value="/target/classes"/>

-        <property name="context-root" value="moaid-templates"/>

   </wb-module>

-</project-modules>

+</project-modules>
\ No newline at end of file
diff --git a/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml
index c4dff31bf..564572b10 100644
--- a/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>

   <fixed facet="jst.java"/>

   <fixed facet="jst.web"/>

-  <installed facet="jst.web" version="2.3"/>

-  <installed facet="jst.java" version="1.7"/>

-</faceted-project>

+  <installed facet="jst.web" version="2.4"/>

+  <installed facet="jst.java" version="5.0"/>

+</faceted-project>
\ No newline at end of file