Validation signing time (auth block) against server time

Update MOA-ID sample configs (new ES Test-PEPS Url)
WAI compliant template

4 files changed, 77 insertions, 175 deletions

diff --git a/spss/server/serverws/.classpath b/spss/server/serverws/.classpath
index 330efc0e1..070ce9946 100644
--- a/spss/server/serverws/.classpath
+++ b/spss/server/serverws/.classpath
@@ -1,122 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar">

-		<attributes>

-			<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/J2SE-1.5"/>

-	<classpathentry kind="src" path="/moa-spss-lib"/>

-	<classpathentry kind="var" path="M2_REPO/axis/axis/1.0_IAIK/axis-1.0_IAIK.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/postgresql/postgresql/7.2/postgresql-7.2.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_jce_full/4.0_MOA/iaik_jce_full-4.0_MOA.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_cms/4.1_MOA/iaik_cms-4.1_MOA.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_Pkcs11Wrapper/1.2.17/iaik_Pkcs11Wrapper-1.2.17.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="src" path="/moa-common"/>

-	<classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar">

-		<attributes>

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

-		</attributes>

-	</classpathentry>

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

-</classpath>

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

+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>

+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>

+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>

+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar"/>

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

+  <classpathentry kind="src" path="/moa-spss-lib"/>

+  <classpathentry kind="var" path="M2_REPO/axis/axis/1.0_IAIK/axis-1.0_IAIK.jar"/>

+  <classpathentry kind="var" path="M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"/>

+  <classpathentry kind="var" path="M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar"/>

+  <classpathentry kind="var" path="M2_REPO/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"/>

+  <classpathentry kind="var" path="M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"/>

+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>

+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>

+  <classpathentry kind="var" path="M2_REPO/postgresql/postgresql/7.2/postgresql-7.2.jar"/>

+  <classpathentry kind="var" path="M2_REPO/xalan-bin-dist/xalan/2.7.1/xalan-2.7.1.jar"/>

+  <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/>

+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"/>

+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.0/xercesImpl-2.9.0.jar"/>

+  <classpathentry kind="var" path="M2_REPO/xalan-bin-dist/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>

+  <classpathentry kind="var" path="M2_REPO/xalan-bin-dist/serializer/2.7.1/serializer-2.7.1.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_ecc/2.19/iaik_ecc-2.19.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_cms/4.1_MOA/iaik_cms-4.1_MOA.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_Pkcs11Wrapper/1.2.17/iaik_Pkcs11Wrapper-1.2.17.jar"/>

+  <classpathentry kind="src" path="/moa-common"/>

+  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar"/>

+  <classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar"/>

+  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6.2/joda-time-1.6.2.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar"/>

+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.jar"/>

+  <classpathentry kind="var" path="M2_REPO/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar"/>

+  <classpathentry kind="var" path="M2_REPO/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar"/>

+</classpath>
\ No newline at end of file
diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project
index ddf2e7061..2c2ea723a 100644
--- a/spss/server/serverws/.project
+++ b/spss/server/serverws/.project
@@ -1,54 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>moa-spss-ws</name>

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

-	<projects>

-		<project>moa-spss-lib</project>

-		<project>moa-common</project>

-		<project>moa-spss-tools</project>

-		<project>MOA</project>

-		<project>TestTimerTask</project>

-		<project>moa-spss-handbook-apiClient</project>

-		<project>stork-saml-engine</project>

-		<project>moa-spss</project>

-		<project>spss</project>

-		<project>moa-spss-handbook-webserviceClient</project>

-		<project>moa-id-lib</project>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

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

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

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

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

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

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

-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>

-	</natures>

-</projectDescription>

+  <name>moa-spss-ws</name>

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

+  <projects>

+    <project>moa-spss-lib</project>

+    <project>moa-common</project>

+  </projects>

+  <buildSpec>

+    <buildCommand>

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

+    </buildCommand>

+    <buildCommand>

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

+    </buildCommand>

+    <buildCommand>

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

+    </buildCommand>

+    <buildCommand>

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

+    </buildCommand>

+    <buildCommand>

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

+    </buildCommand>

+  </buildSpec>

+  <natures>

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

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

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

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

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

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

+    <nature>org.eclipse.wst.jsdt.core.jsNature</nature>

+  </natures>

+</projectDescription>
\ No newline at end of file
diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.component b/spss/server/serverws/.settings/org.eclipse.wst.common.component
index 0ebba2a3d..bf4e9bca3 100644
--- a/spss/server/serverws/.settings/org.eclipse.wst.common.component
+++ b/spss/server/serverws/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

   <wb-module deploy-name="moa-spss-ws">

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

         <dependent-module archiveName="moa-spss-lib-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">

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

         </dependent-module>

@@ -8,6 +7,9 @@
             <dependency-type>uses</dependency-type>

         </dependent-module>

     <property name="context-root" value="moa-spss-ws"/>

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

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

+    <wb-resource deploy-path="/" source-path="C:/eclipse_workspaces/MOA_Git02/moa-idspss/spss/handbook"/>

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

   </wb-module>

 </project-modules>

diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml
index ac59587b0..564572b10 100644
--- a/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/spss/server/serverws/.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