diff --git a/JasperReports/.classpath b/JasperReports/.classpath
index e443184a47..64df02a4f1 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.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
diff --git a/JasperReports/.project b/JasperReports/.project
index 2295b1c3f3..8d2e1e88ed 100644
--- a/JasperReports/.project
+++ b/JasperReports/.project
@@ -1,24 +1,35 @@
-<?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.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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/JasperReports/META-INF/MANIFEST.MF b/JasperReports/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..6ca8e39366
--- /dev/null
+++ b/JasperReports/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: JasperReports
+Bundle-SymbolicName: JasperReports
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: JasperReports.jar,
+ lib/postgresql.jar,
+ lib/ocrs12.jar,
+ lib/ojdbc14.jar,
+ lib/barbecue-1.5-beta1.jar
+Export-Package: org.compiere.interfaces,
+ org.compiere.report,
+ org.compiere.utils
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.JasperReportsTools;bundle-version="1.0.0"
diff --git a/JasperReports/build.properties b/JasperReports/build.properties
new file mode 100644
index 0000000000..4651ea48f1
--- /dev/null
+++ b/JasperReports/build.properties
@@ -0,0 +1,7 @@
+source.JasperReports.jar = src/
+bin.includes = META-INF/,\
+               lib/postgresql.jar,\
+               lib/ocrs12.jar,\
+               lib/ojdbc14.jar,\
+               lib/barbecue-1.5-beta1.jar,\
+               JasperReports.jar
diff --git a/JasperReportsTools/.classpath b/JasperReportsTools/.classpath
index c272fc7fd0..7a5d3899a4 100644
--- a/JasperReportsTools/.classpath
+++ b/JasperReportsTools/.classpath
@@ -7,5 +7,6 @@
 	<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 combineaccessrules="false" kind="src" path="/tools"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/JasperReportsTools/.project b/JasperReportsTools/.project
index efb75418d8..c420329c89 100644
--- a/JasperReportsTools/.project
+++ b/JasperReportsTools/.project
@@ -1,17 +1,28 @@
-<?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.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.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/JasperReportsTools/META-INF/MANIFEST.MF b/JasperReportsTools/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..5132322ca4
--- /dev/null
+++ b/JasperReportsTools/META-INF/MANIFEST.MF
@@ -0,0 +1,199 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: JasperReportsTools
+Bundle-SymbolicName: org.adempiere.JasperReportsTools
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: lib/commons-beanutils-1.7.jar,
+ lib/commons-digester-1.7.jar,
+ lib/iReport.jar,
+ lib/jasperreports-3.5.3.jar,
+ lib/jfreechart-1.0.3.jar
+Export-Package: .,
+ be.savat.components,
+ it.businesslogic.ireport,
+ it.businesslogic.ireport.barcode,
+ it.businesslogic.ireport.chart,
+ it.businesslogic.ireport.chart.gui,
+ it.businesslogic.ireport.compiler,
+ it.businesslogic.ireport.compiler.xml,
+ it.businesslogic.ireport.connection,
+ it.businesslogic.ireport.connection.gui,
+ it.businesslogic.ireport.crosstab,
+ it.businesslogic.ireport.crosstab.gui,
+ it.businesslogic.ireport.data,
+ it.businesslogic.ireport.data.ejbql,
+ it.businesslogic.ireport.data.hibernate,
+ it.businesslogic.ireport.data.olap,
+ it.businesslogic.ireport.data.xml,
+ it.businesslogic.ireport.dtds,
+ it.businesslogic.ireport.examples,
+ it.businesslogic.ireport.examples.beans,
+ it.businesslogic.ireport.examples.chart,
+ it.businesslogic.ireport.examples.queryexecuter,
+ it.businesslogic.ireport.export,
+ it.businesslogic.ireport.gui,
+ it.businesslogic.ireport.gui.actions,
+ it.businesslogic.ireport.gui.box,
+ it.businesslogic.ireport.gui.command,
+ it.businesslogic.ireport.gui.dnd,
+ it.businesslogic.ireport.gui.docking,
+ it.businesslogic.ireport.gui.documentstructure,
+ it.businesslogic.ireport.gui.event,
+ it.businesslogic.ireport.gui.expbuilder,
+ it.businesslogic.ireport.gui.export,
+ it.businesslogic.ireport.gui.fonts,
+ it.businesslogic.ireport.gui.library,
+ it.businesslogic.ireport.gui.library.objects,
+ it.businesslogic.ireport.gui.listview,
+ it.businesslogic.ireport.gui.locale,
+ it.businesslogic.ireport.gui.logpane,
+ it.businesslogic.ireport.gui.prompt,
+ it.businesslogic.ireport.gui.queryexecuters,
+ it.businesslogic.ireport.gui.sheet,
+ it.businesslogic.ireport.gui.style,
+ it.businesslogic.ireport.gui.subdataset,
+ it.businesslogic.ireport.gui.syntax,
+ it.businesslogic.ireport.gui.table,
+ it.businesslogic.ireport.gui.wizard,
+ it.businesslogic.ireport.icons,
+ it.businesslogic.ireport.icons.charts,
+ it.businesslogic.ireport.icons.crosstab,
+ it.businesslogic.ireport.icons.datasource,
+ it.businesslogic.ireport.icons.docking,
+ it.businesslogic.ireport.icons.layout,
+ it.businesslogic.ireport.icons.library,
+ it.businesslogic.ireport.icons.log,
+ it.businesslogic.ireport.icons.menu,
+ it.businesslogic.ireport.icons.newtoolbar,
+ it.businesslogic.ireport.icons.olap,
+ it.businesslogic.ireport.icons.palette,
+ it.businesslogic.ireport.icons.problems,
+ it.businesslogic.ireport.icons.sheet,
+ it.businesslogic.ireport.icons.styles,
+ it.businesslogic.ireport.icons.toolbars,
+ it.businesslogic.ireport.icons.toolbars.format,
+ it.businesslogic.ireport.icons.toolbars.text,
+ it.businesslogic.ireport.icons.tree,
+ it.businesslogic.ireport.icons.tree.editor,
+ it.businesslogic.ireport.icons.tree.elements,
+ it.businesslogic.ireport.icons.tree.javabean,
+ it.businesslogic.ireport.icons.xml,
+ it.businesslogic.ireport.locale,
+ it.businesslogic.ireport.plugin,
+ it.businesslogic.ireport.plugin.checkupdate,
+ it.businesslogic.ireport.plugin.examples,
+ it.businesslogic.ireport.plugin.jforg,
+ it.businesslogic.ireport.plugin.jrx,
+ it.businesslogic.ireport.plugin.locale,
+ it.businesslogic.ireport.plugin.massivecompiler,
+ it.businesslogic.ireport.plugin.oracle,
+ it.businesslogic.ireport.plugin.textwizard,
+ it.businesslogic.ireport.refactoring,
+ it.businesslogic.ireport.res,
+ it.businesslogic.ireport.rmi,
+ it.businesslogic.ireport.undo,
+ it.businesslogic.ireport.util,
+ net.sf.jasperreports.ant,
+ net.sf.jasperreports.charts,
+ net.sf.jasperreports.charts.base,
+ net.sf.jasperreports.charts.design,
+ net.sf.jasperreports.charts.fill,
+ net.sf.jasperreports.charts.util,
+ net.sf.jasperreports.charts.xml,
+ net.sf.jasperreports.compilers,
+ net.sf.jasperreports.components,
+ net.sf.jasperreports.components.barbecue,
+ net.sf.jasperreports.components.barcode4j,
+ net.sf.jasperreports.components.list,
+ net.sf.jasperreports.crosstabs,
+ net.sf.jasperreports.crosstabs.base,
+ net.sf.jasperreports.crosstabs.design,
+ net.sf.jasperreports.crosstabs.fill,
+ net.sf.jasperreports.crosstabs.fill.calculation,
+ net.sf.jasperreports.crosstabs.xml,
+ net.sf.jasperreports.engine,
+ net.sf.jasperreports.engine.base,
+ net.sf.jasperreports.engine.component,
+ net.sf.jasperreports.engine.convert,
+ net.sf.jasperreports.engine.data,
+ net.sf.jasperreports.engine.design,
+ net.sf.jasperreports.engine.design.events,
+ net.sf.jasperreports.engine.dtds,
+ net.sf.jasperreports.engine.export,
+ net.sf.jasperreports.engine.export.data,
+ net.sf.jasperreports.engine.export.draw,
+ net.sf.jasperreports.engine.export.legacy,
+ net.sf.jasperreports.engine.export.oasis,
+ net.sf.jasperreports.engine.export.ooxml,
+ net.sf.jasperreports.engine.export.xmlss,
+ net.sf.jasperreports.engine.export.zip,
+ net.sf.jasperreports.engine.fill,
+ net.sf.jasperreports.engine.fonts,
+ net.sf.jasperreports.engine.images,
+ net.sf.jasperreports.engine.print,
+ net.sf.jasperreports.engine.query,
+ net.sf.jasperreports.engine.scriptlets,
+ net.sf.jasperreports.engine.util,
+ net.sf.jasperreports.engine.util.xml,
+ net.sf.jasperreports.engine.xml,
+ net.sf.jasperreports.extensions,
+ net.sf.jasperreports.governors,
+ net.sf.jasperreports.j2ee.servlets,
+ net.sf.jasperreports.olap,
+ net.sf.jasperreports.olap.mapping,
+ net.sf.jasperreports.olap.mondrian,
+ net.sf.jasperreports.olap.result,
+ net.sf.jasperreports.olap.xmla,
+ net.sf.jasperreports.renderers,
+ net.sf.jasperreports.swing,
+ net.sf.jasperreports.view,
+ net.sf.jasperreports.view.images,
+ net.sf.jasperreports.view.save,
+ org.apache.commons.beanutils,
+ org.apache.commons.beanutils.converters,
+ org.apache.commons.beanutils.locale,
+ org.apache.commons.beanutils.locale.converters,
+ org.apache.commons.collections,
+ org.apache.commons.digester,
+ org.apache.commons.digester.parser,
+ org.apache.commons.digester.plugins,
+ org.apache.commons.digester.plugins.strategies,
+ org.apache.commons.digester.substitution,
+ org.apache.commons.digester.xmlrules,
+ org.jfree.chart,
+ org.jfree.chart.annotations,
+ org.jfree.chart.axis,
+ org.jfree.chart.block,
+ org.jfree.chart.demo,
+ org.jfree.chart.editor,
+ org.jfree.chart.encoders,
+ org.jfree.chart.entity,
+ org.jfree.chart.event,
+ org.jfree.chart.imagemap,
+ org.jfree.chart.labels,
+ org.jfree.chart.needle,
+ org.jfree.chart.plot,
+ org.jfree.chart.renderer,
+ org.jfree.chart.renderer.category,
+ org.jfree.chart.renderer.xy,
+ org.jfree.chart.resources,
+ org.jfree.chart.servlet,
+ org.jfree.chart.title,
+ org.jfree.chart.urls,
+ org.jfree.chart.util,
+ org.jfree.data,
+ org.jfree.data.category,
+ org.jfree.data.contour,
+ org.jfree.data.function,
+ org.jfree.data.gantt,
+ org.jfree.data.general,
+ org.jfree.data.io,
+ org.jfree.data.jdbc,
+ org.jfree.data.resources,
+ org.jfree.data.statistics,
+ org.jfree.data.time,
+ org.jfree.data.xml,
+ org.jfree.data.xy,
+ org.syntax.jedit,
+ org.syntax.jedit.tokenmarker,
+ org.w3c.tools.codec
diff --git a/JasperReportsTools/build.properties b/JasperReportsTools/build.properties
new file mode 100644
index 0000000000..628d6cfe13
--- /dev/null
+++ b/JasperReportsTools/build.properties
@@ -0,0 +1,6 @@
+bin.includes = META-INF/,\
+               lib/commons-beanutils-1.7.jar,\
+               lib/commons-digester-1.7.jar,\
+               lib/iReport.jar,\
+               lib/jasperreports-3.5.3.jar,\
+               lib/jfreechart-1.0.3.jar
diff --git a/tools/META-INF/MANIFEST.MF b/tools/META-INF/MANIFEST.MF
index 704dcf4692..dc79ccc1b6 100644
--- a/tools/META-INF/MANIFEST.MF
+++ b/tools/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.tools
 Bundle-SymbolicName: org.adempiere.tools
 Bundle-Version: 0.0.0.1
+Eclipse-BuddyPolicy: dependent
 Bundle-ClassPath: tools.jar,
  lib/jstl.jar,
  lib/Verisign.jar,
@@ -48,7 +49,6 @@ Bundle-ClassPath: tools.jar,
  lib/ocrs12.jar,
  lib/ojdbc14.jar,
  lib/postgresql.jar,
- lib/servlet-api.jar,
  lib/wizard.jar,
  lib/xercesImpl.jar,
  lib/xjavadoc-1.1.jar,
@@ -510,29 +510,6 @@ Export-Package: Lib,
  javax.resource.spi.work;uses:="javax.resource,javax.transaction.xa",
  javax.script,
  javax.security.jacc;uses:="javax.servlet.http",
- javax.servlet,
- javax.servlet.http;uses:="javax.servlet",
- javax.servlet.jsp;
-  uses:="javax.servlet.http,
-   javax.servlet,
-   javax.servlet.jsp.tagext,
-   javax.servlet.jsp.el,
-   javax.el",
- javax.servlet.jsp.el;
-  uses:="javax.servlet.http,
-   javax.servlet,
-   javax.servlet.jsp,
-   javax.el",
- javax.servlet.jsp.jstl.core;
-  uses:="javax.servlet.http,
-   javax.servlet,
-   javax.servlet.jsp.tagext,
-   javax.servlet.jsp,
-   javax.el",
- javax.servlet.jsp.jstl.fmt;uses:="javax.servlet.jsp",
- javax.servlet.jsp.jstl.sql,
- javax.servlet.jsp.jstl.tlv;uses:="javax.servlet.jsp.tagext",
- javax.servlet.jsp.tagext;uses:="javax.servlet.jsp",
  javax.transaction;uses:="javax.transaction.xa",
  javax.transaction.xa,
  javax.xml.bind;
diff --git a/tools/build.properties b/tools/build.properties
index 78fdf06548..db996bc655 100644
--- a/tools/build.properties
+++ b/tools/build.properties
@@ -46,7 +46,6 @@ bin.includes = META-INF/,\
                lib/ocrs12.jar,\
                lib/ojdbc14.jar,\
                lib/postgresql.jar,\
-               lib/servlet-api.jar,\
                lib/wizard.jar,\
                lib/xercesImpl.jar,\
                lib/xjavadoc-1.1.jar,\
diff --git a/tools/build.xml b/tools/build.xml
deleted file mode 100644
index d6d73556f7..0000000000
--- a/tools/build.xml
+++ /dev/null
@@ -1,490 +0,0 @@
-<!-- ============================================= -->
-<!-- Tools                                         -->
-<!-- ============================================= -->
-<!-- $Header: /cvs/adempiere/tools/build.xml,v 1.4 2006/07/03 23:23:31 jjanke Exp $ -->
-
-<project name="tools" default="toolsDistribution" basedir=".">
-
-	<description>
-	The resulting CCTools.jar and CSTools.jar
-	repackage all third party libraries
-	in a single jar for simplified start and version control.
-	The resuling Server CSTools.jar is added to EARs
-  </description>
-
-	<!-- set global properties for this build -->
-	<property name="src" value="src" />
-	<property name="build.dir" value="build" />
-	<property name="jboss.dir" value="../jboss" />
-	<property name="glassfish.dir" value="../glassfishfacet" />
-	<property name="dist.dir" value="../lib" />
-	<!--<property environment="env"/>-->
-	<import file="../utils_dev/properties.xml" />
-
-	<!-- set path to include the necessary jar files for javac -->
-	<path id="project.class.path">
-		<pathelement path="${classpath}" />
-		<pathelement path="lib/jstl.jar" />
-		<pathelement path="lib/jsp-api.jar" />
-		<pathelement path="lib/servlet-api.jar" />
-		<pathelement path="lib/standard.jar" />
-	</path>
-
-	<patternset id="manifest.exclude">
-		<exclude name="META-INF/*.DSA" />
-		<exclude name="META-INF/*.RSA" />
-		<exclude name="META-INF/*.SF" />
-		<exclude name="META-INF/MANIFEST.MF" />
-		<exclude name="META-INF/INDEX.LIST" />
-	</patternset>
-
-	<taskdef resource="net/sf/antcontrib/antlib.xml">
-		<classpath>
-			<fileset file="lib/ant-contrib-1.0b1.jar"></fileset>
-		</classpath>
-	</taskdef>
-
-	<!-- ============================================= -->
-	<!-- Init                                          -->
-	<!-- ============================================= -->
-	<target name="toolsInit" description="initialization target">
-		<echo message="=========== Build Tools  ${env.ADEMPIERE_VERSION}" />
-		<!-- create the time stamp -->
-		<tstamp />
-		<!-- create the build directory structure used by compile -->
-		<mkdir dir="${build.dir}" />
-		<!-- check for the distribution directory -->
-		<mkdir dir="${dist.dir}" />
-
-		<uptodate property="jars.uptodate" targetfile="${dist.dir}/CCTools.jar">
-			<srcfiles dir="${src}" includes="**/*.java" />
-		</uptodate>
-	</target>
-
-
-	<!-- ============================================= -->
-	<!-- Compile ECS                                   -->
-	<!-- ============================================= -->
-	<target name="toolsCompile" depends="toolsInit" unless="jars.uptodate">
-		<!-- compile the java code from ${src} into ${build.dir}S -->
-		<javac target="1.6" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
-			<classpath refid="project.class.path" />
-		</javac>
-		<!-- copy all image & sound files from src to the build directory -->
-		<copy todir="${build.dir}">
-			<fileset dir="${src}">
-				<include name="**/images/*" />
-				<include name="**/*.gif" />
-				<include name="**/*.jpg" />
-				<include name="**/*.wav" />
-				<include name="**/*.htm" />
-				<include name="**/*.html" />
-				<include name="**/*.properties" />
-				<exclude name="**/package.html" />
-			</fileset>
-		</copy>
-	</target>
-
-
-	<!-- ============================================= -->
-	<!-- Buld Apps Server Client Jars                  -->
-	<!-- ============================================= -->
-	<target name="toolsAppsServer" depends="toolsCompile" unless="jars.uptodate" description="Create JBoss Client jar">
-		<!-- Create jboss.jar file 	-->
-		<jar jarfile="${dist.dir}/jboss.jar" duplicate="preserve">
-			<zipfileset src="${jboss.dir}/client/jboss-ejb3x.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="${jboss.dir}/client/jboss-ejb3-client.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="${jboss.dir}/client/jbossall-client.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<manifest>
-				<attribute name="Specification-Title" value="Adempiere JBoss Client" />
-				<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}" />
-				<attribute name="Specification-Vendor" value="Adempiere, Inc." />
-				<attribute name="Implementation-Title" value="jboss ${env.ADEMPIERE_VERSION}" />
-				<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />
-				<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}" />
-				<attribute name="Implementation-URL" value="http://www.adempiere.com" />
-			</manifest>
-		</jar>
-
-		<jar jarfile="${dist.dir}/glassfish.jar" duplicate="preserve">
-			<zipgroupfileset dir="${glassfish.dir}/lib" includes="*.jar">
-				<patternset refid="manifest.exclude" />
-			</zipgroupfileset>
-			<zipfileset src="lib/javaee.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<manifest>
-				<attribute name="Specification-Title" value="Adempiere GlassFish Client" />
-				<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}" />
-				<attribute name="Specification-Vendor" value="Adempiere, Inc." />
-				<attribute name="Implementation-Title" value="GlassFish ${env.ADEMPIERE_VERSION}" />
-				<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />
-				<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}" />
-				<attribute name="Implementation-URL" value="http://www.adempiere.com" />
-			</manifest>
-		</jar>
-	</target>
-
-	<!-- ============================================= -->
-	<!-- Buld Database Jars                            -->
-	<!-- ============================================= -->
-	<target name="toolsDatabase" depends="toolsCompile" unless="jars.uptodate" description="Create db jars">
-
-		<!-- Create oracle.jar file 	-->
-		<jar jarfile="${dist.dir}/oracle.jar" duplicate="preserve">
-			<zipfileset src="lib/ojdbc14.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/ocrs12.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-
-			<manifest>
-				<attribute name="Specification-Title" value="Oracle JDBC" />
-				<attribute name="Specification-Version" value="10g" />
-				<attribute name="Specification-Vendor" value="Oracle" />
-				<attribute name="Implementation-Title" value="oracle ${env.ADEMPIERE_VERSION}" />
-				<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />
-				<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}" />
-				<attribute name="Implementation-URL" value="http://www.adempiere.org" />
-			</manifest>
-		</jar>
-
-		<!-- Create postgresql.jar file 	-->
-		<jar jarfile="${dist.dir}/postgresql.jar">
-			<zipfileset src="lib/postgresql.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-
-			<manifest>
-				<attribute name="Specification-Title" value="PostgreSQL JDBC" />
-				<attribute name="Specification-Version" value="postgresql" />
-				<attribute name="Specification-Vendor" value="postgresql" />
-				<attribute name="Implementation-Title" value="postgresql ${env.ADEMPIERE_VERSION}" />
-				<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />
-				<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}" />
-				<attribute name="Implementation-URL" value="http://www.adempiere.org" />
-			</manifest>
-		</jar>
-
-	</target>
-
-
-	<!-- ============================================= -->
-	<!-- Buld Server Jar                               -->
-	<!-- ============================================= -->
-	<target name="toolsServer" depends="toolsCompile" unless="jars.uptodate" description="Create CSTools.jar">
-
-		<!-- Create CSTools jar		-->
-		<jar jarfile="${dist.dir}/CSTools.jar" duplicate="preserve">
-
-			<!-- services entries -->
-			<fileset dir=".">
-				<include name="META-INF/services/**" />
-			</fileset>
-
-			<!-- JSTL				-->
-			<zipfileset src="lib/jstl.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/standard.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- ECS -->
-			<fileset dir="${build.dir}">
-				<include name="**/apache/ecs/**" />
-			</fileset>
-			<!-- Installing Script Based in JSR 223 Scripting APIs -->
-			<zipfileset src="lib/script-api.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- BeanShell -->
-			<zipfileset src="lib/bsh-2.0b5.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/bsh-engine.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Groovy -->
-			<zipfileset src="lib/groovy-all-1.5.1.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/groovy-engine.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Groovy -->
-			<zipfileset src="lib/jython.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jython-engine.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Payment Processors		-->
-			<zipfileset src="lib/Verisign.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/miglayout-3.7.1-swing.jar">
-					<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jpayment.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Log4J, jnlp			-->
-			<zipfileset src="lib/commons-logging.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/log4j.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jnlp.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Barcode, ftp			-->
-			<zipfileset src="lib/barbecue-1.5-beta1.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/commons-net-1.4.0.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Adempiere look and feel -->
-			<zipfileset src="lib/looks-2.0.4.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- PDF -->
-			<zipfileset src="lib/jpedal.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/iText-2.1.7.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- JFreeChart			-->
-			<zipfileset src="lib/jfreechart-1.0.11.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jcommon-1.0.14.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- JMS -->
-			<zipfileset src="lib/activemq-core-5.0.0.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- C3P0 connection pool -->
-			<zipfileset src="lib/c3p0-0.9.1.2.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/c3p0-oracle-thin-extras-0.9.1.2.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- POI -->
-			<zipfileset src="lib/poi-3.0.1-FINAL-20070705.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- CGLib -->
-			<zipfileset src="lib/cglib.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<manifest>
-				<attribute name="Specification-Title" value="Adempiere Server Tools" />
-				<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}" />
-				<attribute name="Specification-Vendor" value="Adempiere, Inc." />
-				<attribute name="Implementation-Title" value="CSTools ${env.ADEMPIERE_VERSION}" />
-				<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />
-				<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}" />
-				<attribute name="Implementation-URL" value="http://www.adempiere.org" />
-			</manifest>
-			<!-- Commons -->
-			<zipfileset src="lib/commons-collections-3.1.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/commons-codec.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- jars for 2pack                         -->
-			<zipfileset src="lib/ant.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/xercesImpl.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-		</jar>
-
-	</target>
-
-	<!-- ============================================= -->
-	<!-- Buld Client Jar                               -->
-	<!-- ============================================= -->
-	<target name="toolsClient" depends="toolsCompile" unless="jars.uptodate" description="Create CCTools.jar">
-
-		<!-- Create CCTools.jar file 	-->
-		<jar jarfile="${dist.dir}/CCTools.jar" duplicate="preserve">
-
-			<!-- services entries -->
-			<fileset dir=".">
-				<include name="META-INF/services/**" />
-			</fileset>
-
-			<!-- ECS -->
-			<fileset dir="${build.dir}">
-				<include name="**/apache/ecs/**" />
-			</fileset>
-			<!-- Tree CellEditor -->
-			<fileset dir="${build.dir}">
-				<include name="it/**" />
-			</fileset>
-			<!-- Mail				-->
-			<zipfileset src="lib/activation.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/mail.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Installing Script Based in JSR 223 Scripting APIs -->
-			<zipfileset src="lib/script-api.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- BeanShell -->
-			<zipfileset src="lib/bsh-2.0b5.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/bsh-engine.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Groovy -->
-			<zipfileset src="lib/groovy-all-1.5.1.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/groovy-engine.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Groovy -->
-			<zipfileset src="lib/jython.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jython-engine.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-
-			<!-- Payment Processors		-->
-			<zipfileset src="lib/Verisign.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/miglayout-3.7.1-swing.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jpayment.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Log4J, jnlp			-->
-			<zipfileset src="lib/commons-logging.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/log4j.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jnlp.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Barcode, ftp			-->
-			<zipfileset src="lib/barbecue-1.5-beta1.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/commons-net-1.4.0.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- JFreeChart			-->
-			<zipfileset src="lib/jfreechart-1.0.11.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jcommon-1.0.14.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Graph				-->
-			<zipfileset src="lib/jgraph.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- Adempeire Look and Feal				-->
-			<zipfileset src="lib/looks-2.0.4.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- jars for 2pack                         -->
-			<zipfileset src="lib/ant.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/xercesImpl.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- PDF -->
-			<zipfileset src="lib/jpedal.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/iText-2.1.7.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/swingx-0.9.0.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- JMS -->
-			<zipfileset src="lib/activemq-core-5.0.0.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- C3P0 connection pool -->
-			<zipfileset src="lib/c3p0-0.9.1.2.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/c3p0-oracle-thin-extras-0.9.1.2.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<!-- POI -->
-			<zipfileset src="lib/poi-3.0.1-FINAL-20070705.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<manifest>
-				<attribute name="Specification-Title" value="Adempiere Client Tools" />
-				<attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}" />
-				<attribute name="Specification-Vendor" value="Adempiere, Inc." />
-				<attribute name="Implementation-Title" value="CCTools ${env.ADEMPIERE_VERSION}" />
-				<attribute name="Implementation-Version" value="${env.ADEMPIERE_VERSION} ${DSTAMP}-${TSTAMP}" />
-				<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}" />
-				<attribute name="Implementation-URL" value="http://www.adempiere.org" />
-			</manifest>
-			<!-- Commons -->
-			<zipfileset src="lib/commons-collections-3.1.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/commons-codec.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-		</jar>
-
-	</target>
-
-
-	<!-- ============================================= -->
-	<!-- Buld Jars                                     -->
-	<!-- ============================================= -->
-	<target name="toolsDistribution" depends="toolsServer, toolsClient, toolsAppsServer, toolsDatabase" unless="jars.uptodate" description="Create jars">
-
-	</target>
-
-
-	<!-- ============================================= -->
-	<!-- Clean up                                      -->
-	<!-- ============================================= -->
-	<target name="clean">
-		<!-- Delete the ${build.dir} directory trees -->
-		<delete dir="${build.dir}" />
-		<delete file="${dist.dir}/CCTools.jar" failonerror="false" />
-		<delete file="${dist.dir}/CSTools.jar" failonerror="false" />
-		<delete file="${dist.dir}/jboss.jar" failonerror="false" />
-		<delete file="${dist.dir}/glassfish.jar" failonerror="false" />
-		<delete file="${dist.dir}/oracle.jar" failonerror="false" />
-		<delete file="${dist.dir}/postgresql.jar" failonerror="false" />
-	</target>
-
-</project>