Update textkeys and testcertificates

Update signature algorithm selection
Update repository
Updates documentation

9 files changed, 108 insertions, 363 deletions

diff --git a/id/oa/.settings/org.eclipse.wst.common.component b/id/oa/.settings/org.eclipse.wst.common.component
index 9c72656e2..4395ccd72 100644
--- a/id/oa/.settings/org.eclipse.wst.common.component
+++ b/id/oa/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.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="/WEB-INF/classes" source-path="/src/main/java"/>

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

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

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

   </wb-module>

 </project-modules>

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 a801c94a0..fec12087a 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.4"/>

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

-</faceted-project>
\ No newline at end of file
+  <installed facet="jst.java" version="1.5"/>

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

+</faceted-project>

diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 174ea5a4f..70a85d980 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -1,165 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

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

+        <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>

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

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

+        </dependent-module>

+        <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"/>

-    <dependent-module archiveName="axis-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis/1.1/axis-1.1.jar">

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

-    </dependent-module>

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

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

-    </dependent-module>

-    <dependent-module archiveName="axis-jaxrpc-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="axis-saaj-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="axis-wsdl4j-1.5.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-discovery-0.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-logging-1.0.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="activation-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/activation/activation/1.1/activation-1.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="mail-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/mail/mail/1.4/mail-1.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="log4j-1.2.14.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="postgresql-7.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/postgresql/postgresql/7.2/postgresql-7.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_moa-1.32.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_ixsil-1.2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_cms-4.1_MOA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_cms/4.1_MOA/iaik_cms-4.1_MOA.jar">

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

-    </dependent-module>

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

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

-    </dependent-module>

-    <dependent-module archiveName="jaxen-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="saxpath-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="joda-time-1.6.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/joda-time/joda-time/1.6.2/joda-time-1.6.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_tsl-0.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_util-0.23.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_xsect-1.1709142.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="jaxb-api-2.2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="jaxb-impl-2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="sqlite-jdbc-3.7.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_jsse-4.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="moa-id-lib.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="commons-fileupload-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-io-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-httpclient-3.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-codec-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="dav4j-0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/dav4j/dav4j/0.1/dav4j-0.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="httpsclient-JSSE-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_X509TrustManager-0.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_X509TrustManager/0.3/iaik_X509TrustManager-0.3.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="regexp-1.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/regexp/regexp/1.3/regexp-1.3.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-lang-2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar">

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

-    </dependent-module>

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

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

-    </dependent-module>

-    <dependent-module archiveName="opensaml-2.5.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/opensaml/2.5.3/opensaml-2.5.3.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="openws-1.4.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/openws/1.4.4/openws-1.4.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xmltooling-1.3.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/xmltooling/1.3.4/xmltooling-1.3.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="bcprov-jdk15-1.46.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/bouncycastle/bcprov-jdk15/1.46/bcprov-jdk15-1.46.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="not-yet-commons-ssl-0.3.9.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/ca/juliusdavies/not-yet-commons-ssl/0.3.9/not-yet-commons-ssl-0.3.9.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xmlsec-1.4.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/santuario/xmlsec/1.4.5/xmlsec-1.4.5.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xml-apis-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xercesImpl-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="serializer-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xml-resolver-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xalan-2.7.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="slf4j-api-1.6.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-collections-3.2.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="velocity-1.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/velocity/velocity/1.5/velocity-1.5.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="esapi-2.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/owasp/esapi/esapi/2.0.1/esapi-2.0.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="slf4j-log4j12-1.6.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar">

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

-    </dependent-module>

     <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="/WEB-INF/classes" source-path="/src/main/java"/>

diff --git a/id/server/idserverlib/.settings/org.eclipse.wst.common.component b/id/server/idserverlib/.settings/org.eclipse.wst.common.component
index a5eb3d4d8..8f3380621 100644
--- a/id/server/idserverlib/.settings/org.eclipse.wst.common.component
+++ b/id/server/idserverlib/.settings/org.eclipse.wst.common.component
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

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

+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

   <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="/src/main/java"/>

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

   </wb-module>

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

diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
index 07ce6f6f9..cc61830e7 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.component
@@ -1,164 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

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

+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

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

+        <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>

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

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

+        </dependent-module>

+        <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="src/main/webapp"/>

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

-    <dependent-module archiveName="axis-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis/1.1/axis-1.1.jar">

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

-    </dependent-module>

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

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

-    </dependent-module>

-    <dependent-module archiveName="axis-jaxrpc-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="axis-saaj-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="axis-wsdl4j-1.5.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-discovery-0.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-logging-1.0.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="activation-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/activation/activation/1.1/activation-1.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="mail-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/mail/mail/1.4/mail-1.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="log4j-1.2.14.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="postgresql-7.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/postgresql/postgresql/7.2/postgresql-7.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_moa-1.32.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_ixsil-1.2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_cms-4.1_MOA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_cms/4.1_MOA/iaik_cms-4.1_MOA.jar">

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

-    </dependent-module>

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

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

-    </dependent-module>

-    <dependent-module archiveName="jaxen-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="saxpath-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="joda-time-1.6.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/joda-time/joda-time/1.6.2/joda-time-1.6.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_tsl-0.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_util-0.23.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_xsect-1.1709142.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="jaxb-api-2.2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="jaxb-impl-2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="sqlite-jdbc-3.7.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_jsse-4.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="moa-id-lib.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="commons-fileupload-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-io-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-httpclient-3.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-codec-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="dav4j-0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/dav4j/dav4j/0.1/dav4j-0.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="httpsclient-JSSE-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="iaik_X509TrustManager-0.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_X509TrustManager/0.3/iaik_X509TrustManager-0.3.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="regexp-1.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/regexp/regexp/1.3/regexp-1.3.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-lang-2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar">

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

-    </dependent-module>

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

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

-    </dependent-module>

-    <dependent-module archiveName="opensaml-2.5.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/opensaml/2.5.3/opensaml-2.5.3.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="openws-1.4.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/openws/1.4.4/openws-1.4.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xmltooling-1.3.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/xmltooling/1.3.4/xmltooling-1.3.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="bcprov-jdk15-1.46.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/bouncycastle/bcprov-jdk15/1.46/bcprov-jdk15-1.46.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="not-yet-commons-ssl-0.3.9.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/ca/juliusdavies/not-yet-commons-ssl/0.3.9/not-yet-commons-ssl-0.3.9.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xmlsec-1.4.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/santuario/xmlsec/1.4.5/xmlsec-1.4.5.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xml-apis-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xercesImpl-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="serializer-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xml-resolver-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="xalan-2.7.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="slf4j-api-1.6.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="commons-collections-3.2.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="velocity-1.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/velocity/velocity/1.5/velocity-1.5.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="esapi-2.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/owasp/esapi/esapi/2.0.1/esapi-2.0.1.jar">

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

-    </dependent-module>

-    <dependent-module archiveName="slf4j-log4j12-1.6.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar">

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

-    </dependent-module>

   </wb-module>

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

diff --git a/id/templates/.classpath b/id/templates/.classpath
index 0173dfd90..767a2a2de 100644
--- a/id/templates/.classpath
+++ b/id/templates/.classpath
@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <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
+	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">

+		<attributes>

+			<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="output" path="target/classes"/>

+</classpath>

diff --git a/id/templates/.project b/id/templates/.project
index 3089d3e1f..bbb999ed8 100644
--- a/id/templates/.project
+++ b/id/templates/.project
@@ -1,31 +1,42 @@
 <?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/>

-  <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.m2e.core.maven2Builder</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.eclipse.wst.common.project.facet.core.builder</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
+	<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>

diff --git a/id/templates/.settings/org.eclipse.wst.common.component b/id/templates/.settings/org.eclipse.wst.common.component
index 0d2cb24b4..8ef19dd6b 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="2.0">

+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

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

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

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

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

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

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

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

   </wb-module>

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

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 564572b10..ac59587b0 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.4"/>

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

-</faceted-project>
\ No newline at end of file
+  <installed facet="jst.web" version="2.3"/>

+</faceted-project>