diff --git a/.classpath b/.classpath
index ab7ab72d3a..d71bc34210 100644
--- a/.classpath
+++ b/.classpath
@@ -123,5 +123,7 @@
 	<classpathentry kind="lib" path="zkwebui/WEB-INF/lib/zk.jar"/>
 	<classpathentry kind="lib" path="zkwebui/WEB-INF/lib/zul.jar"/>
 	<classpathentry kind="lib" path="tools/lib/junit.jar"/>
+	<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="bin"/>
 </classpath>
diff --git a/.project b/.project
index b58f755b9b..d3da6f5a9d 100644
--- a/.project
+++ b/.project
@@ -1,17 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>adempiere_trunk</name>
-	<comment></comment>
-	<projects>
-	</projects>
-        <buildSpec>
-                <buildCommand>
-                        <name>org.eclipse.jdt.core.javabuilder</name>
-                        <arguments>
-                        </arguments>
-                </buildCommand>
-        </buildSpec>
-        <natures>
-                <nature>org.eclipse.jdt.core.javanature</nature>
-        </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Adempiere_stable</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</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>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..3356a56fdf
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Sun Aug 03 07:33:03 SGT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..de81d9952e
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="Adempiere_stable">
+<wb-resource deploy-path="/" source-path="/zkwebui"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/base/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/client/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/sqlj/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/looks/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/install/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/extend/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/serverRoot/src/main/ejb"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/serverRoot/src/main/server"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/serverRoot/src/main/servlet"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/interfaces/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/serverApps/src/main/servlet"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/posterita/src/main"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/zkwebui/WEB-INF/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/tools/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/migration/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/JasperReports/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/JasperReportsWebApp/src"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/webCM/src/main/servlet"/>
+<property name="context-root" value="webui"/>
+<property name="java-output-path" value="build/classes"/>
+</wb-module>
+</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..89912d3836
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="jst.java" version="5.0"/>
+  <installed facet="jst.web" version="2.4"/>
+</faceted-project>