git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1114 d688527b-c9ab-4aba-bd8d-4036d912da1d

5 files changed, 24 insertions, 12 deletions

diff --git a/id/server/auth/.classpath b/id/server/auth/.classpath
index d6e7fdeb6..6acd7de03 100644
--- a/id/server/auth/.classpath
+++ b/id/server/auth/.classpath
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>

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

 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.0"/>

-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/>

+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">

+		<attributes>

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

+		</attributes>

+	</classpathentry>

 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>

+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>

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

 </classpath>

diff --git a/id/server/auth/.project b/id/server/auth/.project
index c397a88ee..90cbf1ff3 100644
--- a/id/server/auth/.project
+++ b/id/server/auth/.project
@@ -9,6 +9,11 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

 			<arguments>

 			</arguments>

@@ -41,5 +46,6 @@
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

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

 		<nature>kr.javanese.devtools.m2wtp.m2wtpNature</nature>

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

 	</natures>

 </projectDescription>

diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 5f3e4a378..b116cf610 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">

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

-</dependent-module>

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

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

-<wb-resource deploy-path="/WEB-INF/LIB" source-path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>

-</dependent-module>

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

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

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

+        </dependent-module>

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

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

         </dependent-module>

+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">

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

+        </dependent-module>

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

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

 </wb-module>

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 d0145894a..f30a1de6e 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <faceted-project>

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

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

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

 </faceted-project>

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index d2aa59f2e..6d5a5538e 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.4</version>
+		<version>1.4.5</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.4</version>
+	<version>1.4.5</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>