diff --git a/.classpath b/.classpath
deleted file mode 100644
index 14867d544b..0000000000
--- a/.classpath
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="base/src"/>
-	<classpathentry kind="src" path="glassfishfacet/src"/>
-	<classpathentry kind="src" path="jbossfacet/src"/>
-	<classpathentry kind="src" path="client/src"/>
-	<classpathentry kind="src" path="sqlj/src"/>
-	<classpathentry kind="src" path="install/src"/>
-	<classpathentry kind="src" path="extend/src"/>
-	<classpathentry kind="src" path="serverRoot/src/main/ejb"/>
-	<classpathentry kind="src" path="serverRoot/src/main/server"/>
-	<classpathentry kind="src" path="serverRoot/src/main/servlet"/>
-	<classpathentry kind="src" path="interfaces/src"/>
-	<classpathentry kind="src" path="serverApps/src/main/servlet"/>
-	<classpathentry kind="src" path="zkwebui/WEB-INF/src"/>
-	<classpathentry excluding="org/compiere/interfaces/" kind="src" path="JasperReports/src"/>
-	<classpathentry excluding="org/compiere/utils/DigestOfFile.java" kind="src" path="JasperReportsWebApp/src"/>
-	<classpathentry kind="src" path="tools/src"/>
-	<classpathentry kind="src" path="webCM/src/main/servlet"/>
-	<classpathentry kind="src" path="migration/src"/>
-	<classpathentry kind="src" path="posterita/posterita/src/main"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jstl.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/log4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/mail.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/standard.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/Verisign.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss/lib/commons-httpclient.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ant-commons-net.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ant-launcher.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ant.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jsp-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/servlet-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ojdbc6.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jpayment.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jnlp.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/commons-collections-3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/commons-logging.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/commons-net-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jgraph.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/postgresql.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/c3p0-0.9.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/c3p0-oracle-thin-extras-0.9.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/activemq-core-5.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/looks-2.0.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xercesImpl.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xjavadoc-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xml-apis.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jpedal.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/swingx-1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-2.0b5.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/groovy-all-1.5.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/groovy-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jython.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jython-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/script-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/barbecue-1.5-beta1.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/poi-3.0.1-FINAL-20070705.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/javaee.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jcommon-1.0.16.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jfreechart-1.0.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-codec-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-digester-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-fileupload.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-lang-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-validator-1.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/iReport.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss/client/jbosssx-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss/client/jnp-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss/client/jbossall-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="glassfishfacet/lib/appserv-rt.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/cglib.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zcommon.jar" sourcepath="zkwebui/WEB-INF/lib/zcommon-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zk.jar" sourcepath="zkwebui/WEB-INF/lib/zk-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zul.jar" sourcepath="zkwebui/WEB-INF/lib/zul-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/asm.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-el.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-io.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/fckez.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/Filters.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/gmapsz.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jruby.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/js.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/json_simple.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jxl.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/mvel.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/ognl.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/timelinez.jar" sourcepath="zkwebui/WEB-INF/lib/timelinez-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zcommons-el.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zhtml.jar" sourcepath="zkwebui/WEB-INF/lib/zhtml-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zhtml-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkex.jar" sourcepath="zkwebui/WEB-INF/lib/zkex-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkmax.jar" sourcepath="zkwebui/WEB-INF/lib/zkmax-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkmax-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus.jar" sourcepath="zkwebui/WEB-INF/lib/zkplus-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zml.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/bsh.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-fileupload.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/groovy.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jython.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/timelinez-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zcommon-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkex-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zk-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zml-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zul-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zweb-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/reference/aspectJ/aspectjlib.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/reference/aspectJ/aspectjtools.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/reference/aspectJ/aspectjweaver.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/struts.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/aop.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/aspectjrt.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/barcode4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/commons-validator.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/testing/spiffy-with_source-all-0.05.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/testing/SuperCSV-with_src-1.52.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/keylistener.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/junit.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/junit.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/displaytag-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zweb.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/commons-fileupload.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/displaytag-export-poi-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/log4j-1.2.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/poi-3.0-FINAL.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/servlet.jar"/>
-	<classpathentry exported="true" kind="lib" path="packages/liberoHR.jar" sourcepath="/adempiereLiberoHR"/>
-	<classpathentry exported="true" kind="lib" path="packages/liberoMFG.jar" sourcepath="/adempiereLibero"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/iText-2.1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/miglayout-3.7.1-swing.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/payflow.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/cron4j-2.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/jasperreports-3.7.3.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.hgignore b/.hgignore
index 7fdd28f759..6ce5d96131 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,10 +4,15 @@ build
 syntax: regexp
 ^adempiere$
 ^base/Base\.jar$
+^base/base\.jar$
+^client/client\.jar$
 ^extend/Extend\.jar$
+^extend/extend\.jar$
 ^install/lib$
 ^install/CInstall\.jar$
+^install/install\.jar$
 ^JasperReports/needed$
+^JasperReports/JasperReports\.jar$
 ^JasperReports/CompiereJasper\.jar$
 ^JasperReports/CompiereJasperReqs\.jar$
 ^JasperReportsWebApp/webApp\.ear$
@@ -39,7 +44,14 @@ syntax: regexp
 ^packages/liberoMFG\.jar$
 ^posterita/posterita/dist$
 ^posterita/posterita/web/WEB-INF/classes$
+^serverApps/serverApps\.jar$
 ^sqlj/sqlj\.jar$
+^tools/tools\.jar$
+^utils_dev/mybuild\.properties$
 ^webCM/deploy$
 ^zkwebui/dist$
 ^zkwebui/WEB-INF/classes$
+
+syntax: regexp
+^lib/plugins$
+^plugins/.*\.class$
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 4c9c4b48e6..2b4c2564b6 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,3 +1,9 @@
-#Tue Dec 09 01:55:17 COT 2008
+#Mon Jul 12 12:52:56 MYT 2010
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+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/.settings/org.eclipse.pde.core.prefs b/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..de4af5add1
--- /dev/null
+++ b/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Jul 12 12:52:56 MYT 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/doc/.classpath b/doc/.classpath
index be201bada6..b710571be9 100644
--- a/doc/.classpath
+++ b/doc/.classpath
@@ -9,6 +9,5 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/install"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/serverApps"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/serverRoot"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/sqlj"/>
 	<classpathentry kind="output" path="lib"/>
 </classpath>