Integration of STORK

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

8 files changed, 55 insertions, 63 deletions

diff --git a/id/oa/.settings/org.eclipse.jdt.core.prefs b/id/oa/.settings/org.eclipse.jdt.core.prefs
index fe7479929..6d046587d 100644
--- a/id/oa/.settings/org.eclipse.jdt.core.prefs
+++ b/id/oa/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Tue Jul 07 16:07:19 CEST 2009

 eclipse.preferences.version=1

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

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

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

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

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

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning

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

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

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

diff --git a/id/oa/.settings/org.eclipse.wst.common.component b/id/oa/.settings/org.eclipse.wst.common.component
index 3bc38ebcc..7e38d20b7 100644
--- a/id/oa/.settings/org.eclipse.wst.common.component
+++ b/id/oa/.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">

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

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

 <faceted-project>

+  <fixed facet="jst.java"/>

+  <fixed facet="jst.web"/>

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

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

-  <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 df4174ed6..ca3d70965 100644
--- a/id/templates/.classpath
+++ b/id/templates/.classpath
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

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

+</classpath>
\ No newline at end of file
diff --git a/id/templates/.project b/id/templates/.project
index 583a2a0e7..b96a8a898 100644
--- a/id/templates/.project
+++ b/id/templates/.project
@@ -1,37 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

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

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

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

-	</buildSpec>

-	<natures>

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

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

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

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

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

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

+    </buildCommand>

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

+  </buildSpec>

+  <natures>

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

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

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

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

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

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

+    <nature>org.eclipse.wst.jsdt.core.jsNature</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 f5e17a86f..a519d2f62 100644
--- a/id/templates/.settings/org.eclipse.jdt.core.prefs
+++ b/id/templates/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
-#Mon Aug 17 10:06:12 CEST 2009

 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4

 org.eclipse.jdt.core.compiler.compliance=1.4

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

 org.eclipse.jdt.core.compiler.source=1.4

diff --git a/id/templates/.settings/org.eclipse.wst.common.component b/id/templates/.settings/org.eclipse.wst.common.component
index 1e8a98df8..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">

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

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

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

-        <property name="java-output-path"/>

-    </wb-module>

-</project-modules>

+<project-modules id="moduleCoreId" project-version="2.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"/>

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

+  </wb-module>

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

 <faceted-project>

+  <fixed facet="jst.java"/>

+  <fixed facet="jst.web"/>

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

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

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

-</faceted-project>

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