diff --git a/org.adempiere.base.callout/.classpath b/org.adempiere.base.callout/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.base.callout/.classpath
+++ b/org.adempiere.base.callout/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.base.process/.classpath b/org.adempiere.base.process/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.base.process/.classpath
+++ b/org.adempiere.base.process/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index a84c08fdc9..1767e4d2d6 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -19,7 +19,7 @@
 	<classpathentry exported="true" kind="lib" path="super-csv-2.0.0-beta-1.jar" sourcepath="/home/carlos/libsources/super-csv-2.0.0-beta-1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="barcode4j-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="bcprov-jdk15on-1.46.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.adempiere.eclipse.equinox.http.servlet/.classpath b/org.adempiere.eclipse.equinox.http.servlet/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servlet/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.eclipse.equinox.servletbridge/.classpath b/org.adempiere.eclipse.equinox.servletbridge/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.servletbridge/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.extend/.classpath b/org.adempiere.extend/.classpath
index 6fe0ea9fc3..1517484308 100644
--- a/org.adempiere.extend/.classpath
+++ b/org.adempiere.extend/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="spiffy-with_source-all-0.05.jar"/>
diff --git a/org.adempiere.install/.classpath b/org.adempiere.install/.classpath
index 4194d6e884..6ec290c67b 100644
--- a/org.adempiere.install/.classpath
+++ b/org.adempiere.install/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<accessrules>
 			<accessrule kind="accessible" pattern="sun/security/tools/*"/>
 		</accessrules>
diff --git a/org.adempiere.payment.processor/.classpath b/org.adempiere.payment.processor/.classpath
index d056d9cc16..c8dedbe49a 100644
--- a/org.adempiere.payment.processor/.classpath
+++ b/org.adempiere.payment.processor/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="jpayment.jar"/>
diff --git a/org.adempiere.pipo.handlers/.classpath b/org.adempiere.pipo.handlers/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.pipo.handlers/.classpath
+++ b/org.adempiere.pipo.handlers/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.pipo/.classpath b/org.adempiere.pipo/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.pipo/.classpath
+++ b/org.adempiere.pipo/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.plugin.utils/.classpath b/org.adempiere.plugin.utils/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.plugin.utils/.classpath
+++ b/org.adempiere.plugin.utils/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.replication.server/.classpath b/org.adempiere.replication.server/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.replication.server/.classpath
+++ b/org.adempiere.replication.server/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.replication/.classpath b/org.adempiere.replication/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.replication/.classpath
+++ b/org.adempiere.replication/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.report.jasper.fonts/.classpath b/org.adempiere.report.jasper.fonts/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.report.jasper.fonts/.classpath
+++ b/org.adempiere.report.jasper.fonts/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.report.jasper.fragment.test/.classpath b/org.adempiere.report.jasper.fragment.test/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.report.jasper.fragment.test/.classpath
+++ b/org.adempiere.report.jasper.fragment.test/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 045479f6b7..e2b23d29b9 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-5.1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.0.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.adempiere.report.jasper.swing/.classpath b/org.adempiere.report.jasper.swing/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.report.jasper.swing/.classpath
+++ b/org.adempiere.report.jasper.swing/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.report.jasper.webapp/.classpath b/org.adempiere.report.jasper.webapp/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.report.jasper.webapp/.classpath
+++ b/org.adempiere.report.jasper.webapp/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath
index 30a61b009f..c0c50b3955 100644
--- a/org.adempiere.report.jasper/.classpath
+++ b/org.adempiere.report.jasper/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="org/compiere/report/ReportExporter.java" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index e655a41916..dbe0e91935 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -73,6 +73,7 @@
       <plugin id="org.objectweb.asm.commons" autoStart="true" startLevel="0" />
       <plugin id="org.objectweb.asm.tree" autoStart="true" startLevel="0" />
       <plugin id="org.restlet" autoStart="true" startLevel="3" />
+      <property name="eclipse.product" value="org.adempiere.server.product" />
       <property name="org.eclipse.update.reconcile" value="false" />
       <property name="osgi.compatibility.bootdelegation" value="true" />
       <property name="osgi.console.enable.builtin" value="false" />
diff --git a/org.adempiere.server/.classpath b/org.adempiere.server/.classpath
index 42b261bceb..1db989d1a0 100644
--- a/org.adempiere.server/.classpath
+++ b/org.adempiere.server/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<accessrules>
 			<accessrule kind="accessible" pattern="com/sun/jndi/ldap/*"/>
 		</accessrules>
diff --git a/org.adempiere.server/idempiere.html b/org.adempiere.server/idempiere.html
index 2f18f6ab6f..f4713e61e2 100644
--- a/org.adempiere.server/idempiere.html
+++ b/org.adempiere.server/idempiere.html
@@ -96,7 +96,7 @@
         <tbody>
           <tr>
 
-            <td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the iDempiere (OSGi+ADempiere) 2.0 Page!<br>
+            <td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the iDempiere (OSGi+ADempiere) 3.0 Page!<br>
 
             </font></td>
 
diff --git a/org.adempiere.tomcat.config/.classpath b/org.adempiere.tomcat.config/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/org.adempiere.tomcat.config/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.adempiere.tomcat.config/.project b/org.adempiere.tomcat.config/.project
deleted file mode 100644
index 42d41b6fc4..0000000000
--- a/org.adempiere.tomcat.config/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.adempiere.tomcat.config</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.adempiere.tomcat.config/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.tomcat.config/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 577ba9c089..0000000000
--- a/org.adempiere.tomcat.config/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 14 01:21:39 MYT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.adempiere.tomcat.config/.settings/org.eclipse.pde.core.prefs b/org.adempiere.tomcat.config/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 6391813d74..0000000000
--- a/org.adempiere.tomcat.config/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Jul 14 01:21:39 MYT 2010
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/org.adempiere.tomcat.config/META-INF/MANIFEST.MF b/org.adempiere.tomcat.config/META-INF/MANIFEST.MF
deleted file mode 100644
index 7487cd511a..0000000000
--- a/org.adempiere.tomcat.config/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: TomcatConfig
-Bundle-SymbolicName: org.adempiere.tomcat.config
-Bundle-Version: 2.0.0
-Fragment-Host: org.eclipse.gemini.web.tomcat;bundle-version="1.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.adempiere.tomcat.config/META-INF/tomcat/dev.readme.txt b/org.adempiere.tomcat.config/META-INF/tomcat/dev.readme.txt
deleted file mode 100644
index a8b121a5fc..0000000000
--- a/org.adempiere.tomcat.config/META-INF/tomcat/dev.readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-For development, save server.dev.xml as server.xml and change the ssl keystorepass to match 
-the keystorepass you use for your development jre. 
-
-This step is to enabled tomcat ssl connector which is needed for the swing client to use the 
-remote Server and Status service.  
\ No newline at end of file
diff --git a/org.adempiere.tomcat.config/META-INF/tomcat/server.dev.xml b/org.adempiere.tomcat.config/META-INF/tomcat/server.dev.xml
deleted file mode 100644
index 23ff2f1d5e..0000000000
--- a/org.adempiere.tomcat.config/META-INF/tomcat/server.dev.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" at this level.
-     Documentation at /docs/config/server.html
- -->
-
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html
--->
-  <Listener className="org.apache.catalina.core.JasperListener" />
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" Note:  A "Service" is not itself a "Container",
-       so you may not define subcomponents such as "Valves" at this level.
-       Documentation at /docs/config/service.html
-   -->
-  <Service name="Catalina">
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-
-         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
-         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
-         following the instructions below and uncommenting the second Connector
-         entry.  SSL support requires the following steps (see the SSL Config
-         HOWTO in the Tomcat 5 documentation bundle for more detailed
-         instructions):
-         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
-           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
-         * Execute:
-             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
-             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
-           with a password value of "changeit" for both the certificate and
-           the keystore itself.
-
-         By default, DNS lookups are enabled when a web application calls
-         request.getRemoteHost().  This can have an adverse impact on
-         performance, so you can disable it by setting the
-         "enableLookups" attribute to "false".  When DNS lookups are disabled,
-         request.getRemoteHost() will return the String version of the
-         IP address of the remote client.
-    -->
-
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
-    <Connector port="8080" protocol="HTTP/1.1"
-			maxHttpHeaderSize="8192"
-            maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-            enableLookups="false" redirectPort="8443" acceptCount="100"
-            connectionTimeout="20000" disableUploadTimeout="true" />
-    <!-- Note : To disable connection timeouts, set connectionTimeout value
-     to 0 -->
-
-	<!-- Note : To use gzip compression you could set the following properties :
-
-			   compression="on"
-			   compressionMinSize="2048"
-			   noCompressionUserAgents="gozilla, traviata"
-			   compressableMimeType="text/html,text/xml"
-	-->
-
-	<!-- SSL support requires the following steps (see the SSL Config
-         HOWTO in the Tomcat 6 documentation bundle for more detailed
-         instructions):
-         * Execute:
-             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
-             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
-           with a password value of "changeit" for both the certificate and
-           the keystore itself.
-    -->
-    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
-    <Connector port="8443" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" disableUploadTimeout="true"
-               acceptCount="100" scheme="https" secure="true" SSLEnabled="true"
-               clientAuth="false"
-	           keyAlias="tomcat" keystorePass="changeit"
-    	       sslProtocol="TLS" />
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009"
-               enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host). -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
-    -->
-
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!-- Define the default virtual host
-           Note: XML Schema validation will not work with Xerces 2.2.
-       -->
-      <Host name="localhost" appBase="webapps"
-       unpackWARs="true" autoDeploy="true"
-       xmlValidation="false" xmlNamespaceAware="false">
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-</Server>
diff --git a/org.adempiere.tomcat.config/META-INF/tomcat/serverTemplate.xml b/org.adempiere.tomcat.config/META-INF/tomcat/serverTemplate.xml
deleted file mode 100644
index acc07d9dcf..0000000000
--- a/org.adempiere.tomcat.config/META-INF/tomcat/serverTemplate.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" at this level.
-     Documentation at /docs/config/server.html
- -->
-
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html
--->
-  <Listener className="org.apache.catalina.core.JasperListener" />
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" Note:  A "Service" is not itself a "Container",
-       so you may not define subcomponents such as "Valves" at this level.
-       Documentation at /docs/config/service.html
-   -->
-  <Service name="Catalina">
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-
-         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
-         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
-         following the instructions below and uncommenting the second Connector
-         entry.  SSL support requires the following steps (see the SSL Config
-         HOWTO in the Tomcat 5 documentation bundle for more detailed
-         instructions):
-         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
-           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
-         * Execute:
-             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
-             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
-           with a password value of "changeit" for both the certificate and
-           the keystore itself.
-
-         By default, DNS lookups are enabled when a web application calls
-         request.getRemoteHost().  This can have an adverse impact on
-         performance, so you can disable it by setting the
-         "enableLookups" attribute to "false".  When DNS lookups are disabled,
-         request.getRemoteHost() will return the String version of the
-         IP address of the remote client.
-    -->
-
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
-    <Connector port="@ADEMPIERE_WEB_PORT@" protocol="HTTP/1.1"
-			maxHttpHeaderSize="8192"
-            maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-            enableLookups="false" redirectPort="@ADEMPIERE_SSL_PORT@" acceptCount="100"
-            connectionTimeout="20000" disableUploadTimeout="true" />
-    <!-- Note : To disable connection timeouts, set connectionTimeout value
-     to 0 -->
-
-	<!-- Note : To use gzip compression you could set the following properties :
-
-			   compression="on"
-			   compressionMinSize="2048"
-			   noCompressionUserAgents="gozilla, traviata"
-			   compressableMimeType="text/html,text/xml"
-	-->
-
-    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
-    <Connector port="@ADEMPIERE_SSL_PORT@" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" disableUploadTimeout="true"
-               acceptCount="100" scheme="https" secure="true" SSLEnabled="true"
-               clientAuth="false"
-	           keystoreFile="@ADEMPIERE_KEYSTORE@"
-    	       keystorePass="@ADEMPIERE_KEYSTOREPASS@"
-    	       keyAlias="idempiere"
-               sslProtocol="TLS" />
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009"
-               enableLookups="false" redirectPort="@ADEMPIERE_SSL_PORT@" protocol="AJP/1.3" />
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host). -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
-    -->
-
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!-- Define the default virtual host
-           Note: XML Schema validation will not work with Xerces 2.2.
-       -->
-      <Host name="localhost" appBase="webapps"
-       unpackWARs="true" autoDeploy="true"
-       xmlValidation="false" xmlNamespaceAware="false">
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-</Server>
diff --git a/org.adempiere.tomcat.config/buckminster.cspec b/org.adempiere.tomcat.config/buckminster.cspec
deleted file mode 100644
index 5e3c23418e..0000000000
--- a/org.adempiere.tomcat.config/buckminster.cspec
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.adempiere.tomcat.config" componentType="osgi.bundle" version="1.0.0">
-    <cs:dependencies>
-        <cs:dependency name="org.eclipse.gemini.web.tomcat" componentType="osgi.bundle" versionDesignator="1.1.0" filter="(bundleHost=true)"/>
-    </cs:dependencies>
-    <cs:generators>
-        <cs:generator generates="org.adempiere.tomcat.config.source" attribute="source.bundle.jar" generatesType="osgi.bundle"/>
-    </cs:generators>
-    <cs:artifacts>
-        <cs:public name="build.properties" path="build.properties"/>
-        <cs:public name="manifest" path="MANIFEST.MF" base="META-INF/"/>
-        <cs:private name="bin.excludes">
-            <cs:path path="META-INF/tomcat/server.xml"/>
-            <cs:path path="META-INF/tomcat/server.dev.xml"/>
-            <cs:path path="META-INF/tomcat/dev.readme.txt"/>
-        </cs:private>
-        <cs:private name="bin.includes" path="META-INF/"/>
-        <cs:private name="eclipse.build.source" base="src/"/>
-    </cs:artifacts>
-    <cs:actions>
-        <cs:public name="bundle.jar" actor="ant">
-            <cs:actorProperties>
-                <cs:property key="buildFileId" value="buckminster.pdetasks"/>
-                <cs:property key="targets" value="create.bundle.jar"/>
-            </cs:actorProperties>
-            <cs:prerequisites>
-                <cs:attribute name="manifest" alias="manifest"/>
-                <cs:attribute name="jar.contents" alias="action.requirements"/>
-            </cs:prerequisites>
-            <cs:products alias="action.output" base="${buckminster.output}/jar/" fileCount="1" upToDatePolicy="COUNT"/>
-        </cs:public>
-        <cs:public name="source.bundle.jar" actor="ant">
-            <cs:actorProperties>
-                <cs:property key="buildFileId" value="buckminster.pdetasks"/>
-                <cs:property key="targets" value="create.bundle.jar"/>
-            </cs:actorProperties>
-            <cs:prerequisites>
-                <cs:attribute name="src.includes" alias="action.requirements"/>
-                <cs:attribute name="source.manifest" alias="manifest"/>
-            </cs:prerequisites>
-            <cs:products alias="action.output" base="${buckminster.output}/source.jar/"/>
-        </cs:public>
-        <cs:private name="buckminster.rm.build.dir" actor="ant">
-            <cs:actorProperties>
-                <cs:property key="buildFileId" value="buckminster.pdetasks"/>
-                <cs:property key="targets" value="delete.dir"/>
-            </cs:actorProperties>
-            <cs:properties>
-                <cs:property key="dir.to.delete" value="${buckminster.output}/"/>
-            </cs:properties>
-        </cs:private>
-        <cs:private name="eclipse.build" actor="eclipse.build" always="true">
-            <cs:prerequisites>
-                <cs:attribute name="eclipse.build.source"/>
-            </cs:prerequisites>
-            <cs:products>
-                <cs:private name="eclipse.build.output.bin" base="${buckminster.home}/bin/"/>
-            </cs:products>
-        </cs:private>
-        <cs:private name="eclipse.clean" actor="eclipse.clean" always="true"/>
-        <cs:private name="source.manifest" actor="ant">
-            <cs:actorProperties>
-                <cs:property key="buildFileId" value="buckminster.pdetasks"/>
-                <cs:property key="targets" value="create.source.manifest"/>
-            </cs:actorProperties>
-            <cs:prerequisites>
-                <cs:attribute name="manifest" alias="manifest"/>
-                <cs:attribute name="build.properties" alias="properties"/>
-            </cs:prerequisites>
-            <cs:products alias="action.output" base="${buckminster.output}/temp/">
-                <cs:path path="SOURCE_MANIFEST.MF"/>
-            </cs:products>
-        </cs:private>
-    </cs:actions>
-    <cs:groups>
-        <cs:public name="buckminster.clean">
-            <cs:attribute name="buckminster.rm.build.dir"/>
-            <cs:attribute name="eclipse.clean"/>
-        </cs:public>
-        <cs:public name="bundle.and.fragments">
-            <cs:attribute name="bundle.jar"/>
-        </cs:public>
-        <cs:public name="bundle.and.fragments.source">
-            <cs:attribute name="source.bundle.jar"/>
-        </cs:public>
-        <cs:public name="bundle.jars">
-            <cs:attribute name="bundle.and.fragments"/>
-        </cs:public>
-        <cs:public name="java.binaries">
-            <cs:attribute name="eclipse.build"/>
-        </cs:public>
-        <cs:public name="product.configuration.exports"/>
-        <cs:private name="jar.contents">
-            <cs:attribute name="bin.includes"/>
-            <cs:attribute name="eclipse.build.output.bin"/>
-        </cs:private>
-        <cs:private name="src.includes">
-            <cs:attribute name="eclipse.build.source"/>
-        </cs:private>
-    </cs:groups>
-</cs:cspec>
diff --git a/org.adempiere.tomcat.config/build.properties b/org.adempiere.tomcat.config/build.properties
deleted file mode 100644
index a38a06e232..0000000000
--- a/org.adempiere.tomcat.config/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
-bin.excludes = META-INF/tomcat/dev.readme.txt,\
-               META-INF/tomcat/server.dev.xml,\
-               META-INF/tomcat/server.xml
diff --git a/org.adempiere.ui.swing/.classpath b/org.adempiere.ui.swing/.classpath
index 82c46a0ba0..92009dc82c 100644
--- a/org.adempiere.ui.swing/.classpath
+++ b/org.adempiere.ui.swing/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry exported="true" kind="lib" path="looks-2.0.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="miglayout-3.7.1-swing.jar"/>
 	<classpathentry exported="true" kind="lib" path="jpedal.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.adempiere.ui.zk.example/.classpath b/org.adempiere.ui.zk.example/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.ui.zk.example/.classpath
+++ b/org.adempiere.ui.zk.example/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index a0e282e983..e4eb7a7d31 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar"/>
diff --git a/org.adempiere.ui/.classpath b/org.adempiere.ui/.classpath
index bb1d4e5cc8..b179f6141a 100644
--- a/org.adempiere.ui/.classpath
+++ b/org.adempiere.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="org-netbeans-api-visual.jar"/>
diff --git a/org.adempiere.webstore.resource/.classpath b/org.adempiere.webstore.resource/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.webstore.resource/.classpath
+++ b/org.adempiere.webstore.resource/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.webstore.servlet/.classpath b/org.adempiere.webstore.servlet/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.webstore.servlet/.classpath
+++ b/org.adempiere.webstore.servlet/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.webstore/.classpath b/org.adempiere.webstore/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.adempiere.webstore/.classpath
+++ b/org.adempiere.webstore/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.apache.ecs/.classpath b/org.apache.ecs/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.apache.ecs/.classpath
+++ b/org.apache.ecs/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath
index 6ff053d680..fc3e243f2c 100644
--- a/org.compiere.db.oracle.provider/.classpath
+++ b/org.compiere.db.oracle.provider/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="ojdbc6.jar"/>
diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath
index 133e2029a5..b28578f71d 100644
--- a/org.compiere.db.postgresql.provider/.classpath
+++ b/org.compiere.db.postgresql.provider/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="postgresql-9.2-1004.jdbc4.jar"/>
diff --git a/org.idempiere.felix.webconsole/.classpath b/org.idempiere.felix.webconsole/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.idempiere.felix.webconsole/.classpath
+++ b/org.idempiere.felix.webconsole/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.idempiere.fitnesse.fixture/.classpath b/org.idempiere.fitnesse.fixture/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.idempiere.fitnesse.fixture/.classpath
+++ b/org.idempiere.fitnesse.fixture/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.idempiere.fitnesse.server/.classpath b/org.idempiere.fitnesse.server/.classpath
index 1dd1665bee..62b0413eb0 100644
--- a/org.idempiere.fitnesse.server/.classpath
+++ b/org.idempiere.fitnesse.server/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/fitlibrary-2.0.jar" sourcepath="lib/fitlibrary-2.0-sources.jar"/>
diff --git a/org.idempiere.fitrecorder/.classpath b/org.idempiere.fitrecorder/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.idempiere.fitrecorder/.classpath
+++ b/org.idempiere.fitrecorder/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.idempiere.hazelcast.service.config/.classpath b/org.idempiere.hazelcast.service.config/.classpath
index 098194ca4b..1fa3e6803d 100644
--- a/org.idempiere.hazelcast.service.config/.classpath
+++ b/org.idempiere.hazelcast.service.config/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.idempiere.hazelcast.service/.classpath b/org.idempiere.hazelcast.service/.classpath
index 36616bd447..cbe3901e69 100644
--- a/org.idempiere.hazelcast.service/.classpath
+++ b/org.idempiere.hazelcast.service/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry exported="true" kind="lib" path="hazelcast-3.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="hazelcast-cloud-3.3.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.idempiere.ui.zk.selenium/.classpath b/org.idempiere.ui.zk.selenium/.classpath
index ed37f7a1c6..fc99fa8cfa 100644
--- a/org.idempiere.ui.zk.selenium/.classpath
+++ b/org.idempiere.ui.zk.selenium/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index 7b9d62b3ad..89987628bf 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-osgi-extender-1.2.1.jar"/>
diff --git a/org.w3c.dom.fragment/.classpath b/org.w3c.dom.fragment/.classpath
index 501c04ff3b..f67391337f 100644
--- a/org.w3c.dom.fragment/.classpath
+++ b/org.w3c.dom.fragment/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="batik-ext.jar"/>
diff --git a/org.zkoss.zk.library/.classpath b/org.zkoss.zk.library/.classpath
index 2b349bcea0..54cf461987 100644
--- a/org.zkoss.zk.library/.classpath
+++ b/org.zkoss.zk.library/.classpath
@@ -15,7 +15,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/zul-7.0.3.jar" sourcepath="lib/src/zul-7.0.3-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/zweb-7.0.3.jar" sourcepath="lib/src/zweb-7.0.3-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jython-2.5.3.jar" sourcepath="lib/src/jython-2.5.3-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-el.jar"/>