diff --git a/JasperReports/.classpath b/JasperReports/.classpath
index e443184a47..5cbad27dac 100644
--- a/JasperReports/.classpath
+++ b/JasperReports/.classpath
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="org/compiere/report/ReportExporter.java" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/base"/>
-	<classpathentry kind="src" path="/client"/>
-	<classpathentry kind="src" path="/tools"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/JasperReportsTools"/>
-	<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/serverApps"/>
-	<classpathentry kind="output" path="build"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="org/compiere/report/ReportExporter.java" kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="/base"/>
+	<classpathentry kind="src" path="/client"/>
+	<classpathentry kind="src" path="/tools"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JasperReportsTools"/>
+	<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/serverApps"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
diff --git a/JasperReports/.project b/JasperReports/.project
index 2295b1c3f3..484eaaceb9 100644
--- a/JasperReports/.project
+++ b/JasperReports/.project
@@ -1,24 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>JasperReports</name>
-	<comment></comment>
-	<projects>
-		<project>base</project>
-		<project>client</project>
-		<project>dbPort</project>
-		<project>lib</project>
-		<project>looks</project>
-		<project>print</project>
-		<project>utils</project>
-	</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>JasperReports</name>
+	<comment></comment>
+	<projects>
+		<project>base</project>
+		<project>client</project>
+		<project>dbPort</project>
+		<project>lib</project>
+		<project>looks</project>
+		<project>print</project>
+		<project>utils</project>
+	</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/JasperReports/.settings/org.eclipse.jdt.core.prefs b/JasperReports/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..e1100a3f02
--- /dev/null
+++ b/JasperReports/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Mar 24 23:21:11 CET 2010
+eclipse.preferences.version=1
+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/JasperReports/.settings/org.eclipse.wst.common.component b/JasperReports/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..c2f85e6113
--- /dev/null
+++ b/JasperReports/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="JasperReports">
+        <wb-resource deploy-path="/" source-path="/src"/>
+    </wb-module>
+</project-modules>
diff --git a/JasperReports/.settings/org.eclipse.wst.common.project.facet.core.xml b/JasperReports/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..d0e0b2d1bf
--- /dev/null
+++ b/JasperReports/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.java"/>
+  <fixed facet="jst.utility"/>
+  <installed facet="jst.java" version="6.0"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/JasperReportsTools/.classpath b/JasperReportsTools/.classpath
index c272fc7fd0..6c8f7a9c29 100644
--- a/JasperReportsTools/.classpath
+++ b/JasperReportsTools/.classpath
@@ -1,11 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-digester-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/iReport.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-3.5.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/commons-digester-1.7.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/iReport.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-3.5.3.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.3.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/tools"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/JasperReportsTools/.project b/JasperReportsTools/.project
index efb75418d8..d6c1fadeaa 100644
--- a/JasperReportsTools/.project
+++ b/JasperReportsTools/.project
@@ -1,17 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>JasperReportsTools</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>JasperReportsTools</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/JasperReportsTools/.settings/org.eclipse.jdt.core.prefs b/JasperReportsTools/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..c58f5cdfb1
--- /dev/null
+++ b/JasperReportsTools/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Mar 24 23:36:56 CET 2010
+eclipse.preferences.version=1
+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/JasperReportsTools/.settings/org.eclipse.wst.common.component b/JasperReportsTools/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..71d01c5284
--- /dev/null
+++ b/JasperReportsTools/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId">
+    <wb-module deploy-name="JasperReportsTools"/>
+</project-modules>
diff --git a/JasperReportsTools/.settings/org.eclipse.wst.common.project.facet.core.xml b/JasperReportsTools/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..d0e0b2d1bf
--- /dev/null
+++ b/JasperReportsTools/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.java"/>
+  <fixed facet="jst.utility"/>
+  <installed facet="jst.java" version="6.0"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/base/.classpath b/base/.classpath
index 60ef3fcef5..763edba39e 100644
--- a/base/.classpath
+++ b/base/.classpath
@@ -3,27 +3,108 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/tools"/>
-	<classpathentry kind="lib" path="/tools/lib/commons-net-1.4.0.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ant.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jpedal.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jnlp.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/commons-net-1.4.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/ant.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/jpedal.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/jnlp.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="lib" path="/tools/lib/junit.jar"/>
-	<classpathentry kind="lib" path="/jboss/client/jbossall-client.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/postgresql.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ocrs12.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/c3p0-0.9.1.2.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/script-api.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/poi-3.0.1-FINAL-20070705.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/looks-2.0.4.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/commons-collections-3.1.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/activemq-core-5.0.0.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/cron4j-2.2.1.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/junit.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/jboss/client/jbossall-client.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/postgresql.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/ocrs12.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/ojdbc14.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/c3p0-0.9.1.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/script-api.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/barbecue-1.5-beta1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/poi-3.0.1-FINAL-20070705.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/looks-2.0.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/commons-collections-3.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/activemq-core-5.0.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/tools/lib/cron4j-2.2.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="/JasperReportsTools"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/base/.project b/base/.project
index 7e951739a9..b989a039ed 100644
--- a/base/.project
+++ b/base/.project
@@ -1,26 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>base</name>
-	<comment></comment>
-	<projects>
-		<project>dbPort</project>
-		<project>looks</project>
-		<project>print</project>
-		<project>tools</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.etools.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>base</name>
+	<comment></comment>
+	<projects>
+		<project>dbPort</project>
+		<project>looks</project>
+		<project>print</project>
+		<project>tools</project>
+	</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>com.ibm.etools.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/base/.settings/org.eclipse.wst.common.component b/base/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..6091bf6d13
--- /dev/null
+++ b/base/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="base">
+        <wb-resource deploy-path="/" source-path="/src"/>
+    </wb-module>
+</project-modules>
diff --git a/base/.settings/org.eclipse.wst.common.project.facet.core.xml b/base/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..d0e0b2d1bf
--- /dev/null
+++ b/base/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.java"/>
+  <fixed facet="jst.utility"/>
+  <installed facet="jst.java" version="6.0"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/client/.classpath b/client/.classpath
index 6733c56d92..e8f858ce72 100644
--- a/client/.classpath
+++ b/client/.classpath
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/base"/>
-	<classpathentry kind="src" path="/tools"/>
-	<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/groovy-all-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar"/>
-	<classpathentry kind="output" path="build"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="/base"/>
+	<classpathentry kind="src" path="/tools"/>
+	<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/groovy-all-1.5.1.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
diff --git a/client/.project b/client/.project
index f6ae8189d8..13176e95ec 100644
--- a/client/.project
+++ b/client/.project
@@ -1,23 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>client</name>
-	<comment></comment>
-	<projects>
-		<project>base</project>
-		<project>dbPort</project>
-		<project>extend</project>
-		<project>looks</project>
-		<project>print</project>
-		<project>tools</project>
-	</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>client</name>
+	<comment></comment>
+	<projects>
+		<project>base</project>
+		<project>dbPort</project>
+		<project>extend</project>
+		<project>looks</project>
+		<project>print</project>
+		<project>tools</project>
+	</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/client/.settings/org.eclipse.jdt.core.prefs b/client/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..6d7add4e01
--- /dev/null
+++ b/client/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Mar 24 23:20:29 CET 2010
+eclipse.preferences.version=1
+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/client/.settings/org.eclipse.wst.common.component b/client/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..03c215bda0
--- /dev/null
+++ b/client/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="client">
+        <wb-resource deploy-path="/" source-path="/src"/>
+    </wb-module>
+</project-modules>
diff --git a/client/.settings/org.eclipse.wst.common.project.facet.core.xml b/client/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..d0e0b2d1bf
--- /dev/null
+++ b/client/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.java"/>
+  <fixed facet="jst.utility"/>
+  <installed facet="jst.java" version="6.0"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/tools/.classpath b/tools/.classpath
index 5b3b2d18c9..ba333399b7 100644
--- a/tools/.classpath
+++ b/tools/.classpath
@@ -1,31 +1,132 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/jstl.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/Verisign.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/standard.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/barbecue-1.5-beta1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jnlp.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/iText-2.1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/swingx-0.9.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/miglayout-3.7.1-swing.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/payflow.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cron4j-2.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jstl.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/Verisign.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/standard.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/barbecue-1.5-beta1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/jnlp.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/iText-2.1.7.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/swingx-0.9.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/miglayout-3.7.1-swing.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/payflow.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/cron4j-2.2.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/activation.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mail.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jpayment.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bsh-2.0b5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/script-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bsh-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-all-1.5.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jython.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jython-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.14.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javaee.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/activation.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/mail.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/jpayment.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/bsh-2.0b5.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/script-api.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/bsh-engine.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-all-1.5.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-engine.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/jython.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/jython-engine.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.14.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.11.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/javaee.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/tools/.project b/tools/.project
index 0f9d568aea..7c37d4df9d 100644
--- a/tools/.project
+++ b/tools/.project
@@ -1,22 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>tools</name>
-	<comment>Tools Project</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.etools.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>tools</name>
+	<comment>Tools Project</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>com.ibm.etools.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/.settings/org.eclipse.jdt.core.prefs b/tools/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..9f251758c1
--- /dev/null
+++ b/tools/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Mar 24 23:42:26 CET 2010
+eclipse.preferences.version=1
+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/tools/.settings/org.eclipse.wst.common.component b/tools/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..a71e9c1e6e
--- /dev/null
+++ b/tools/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="tools">
+        <wb-resource deploy-path="/" source-path="/src"/>
+    </wb-module>
+</project-modules>
diff --git a/tools/.settings/org.eclipse.wst.common.project.facet.core.xml b/tools/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..d0e0b2d1bf
--- /dev/null
+++ b/tools/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.java"/>
+  <fixed facet="jst.utility"/>
+  <installed facet="jst.java" version="6.0"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/zkwebui/.project b/zkwebui/.project
index 8f4f4a18dc..ebf616dc4a 100644
--- a/zkwebui/.project
+++ b/zkwebui/.project
@@ -3,6 +3,11 @@
 	<name>zkwebui</name>
 	<comment></comment>
 	<projects>
+		<project>base</project>
+		<project>client</project>
+		<project>JasperReports</project>
+		<project>JasperReportsTools</project>
+		<project>tools</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/zkwebui/.settings/org.eclipse.wst.common.component b/zkwebui/.settings/org.eclipse.wst.common.component
index f0f400bef7..c7dff146c0 100644
--- a/zkwebui/.settings/org.eclipse.wst.common.component
+++ b/zkwebui/.settings/org.eclipse.wst.common.component
@@ -3,6 +3,24 @@
     <wb-module deploy-name="zkwebui">
         <wb-resource deploy-path="/" source-path="/"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/WEB-INF/src"/>
+        <dependent-module archiveName="base.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/base/base">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="client.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/client/client">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="JasperReports.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/JasperReports/JasperReports">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/tools/lib/jnlp.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="JasperReportsTools.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/JasperReportsTools/JasperReportsTools">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="tools.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tools/tools">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="java-output-path"/>
         <property name="context-root" value="webui"/>
     </wb-module>