From f70d20af3544cdd61a1205a4949d2584da985f58 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Tue, 13 Jul 2010 16:12:33 +0800
Subject: [PATCH] Fixed classpath to depends only on plugin dependency. Modify
 build file for osgi deployment

---
 tools/.classpath                              |   3 +-
 tools/META-INF/MANIFEST.MF                    |  17 +-
 tools/build.properties                        |   3 +-
 tools/build.xml                               | 553 +-----------------
 .../lib/ant4eclipse/macros/a4e-pde-macros.xml |   2 +-
 5 files changed, 34 insertions(+), 544 deletions(-)

diff --git a/tools/.classpath b/tools/.classpath
index d157e82079..e776df2596 100644
--- a/tools/.classpath
+++ b/tools/.classpath
@@ -117,7 +117,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/postgresql.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry exported="true" kind="lib" path="lib/ojdbc6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/activemq-core-5.0.0.jar"/>
@@ -131,7 +130,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/ant-commons-net.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/>
 	<classpathentry kind="lib" path="lib/cglib.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-codec.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/logkit.jar"/>
 	<classpathentry kind="lib" path="lib/jgraph.jar"/>
diff --git a/tools/META-INF/MANIFEST.MF b/tools/META-INF/MANIFEST.MF
index 47cc988140..2e4b3829b5 100644
--- a/tools/META-INF/MANIFEST.MF
+++ b/tools/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Bundle-ClassPath: tools.jar,
  lib/poi-3.0.1-FINAL-20070705.jar,
  lib/jnlp.jar,
  lib/iText-2.1.7.jar,
- lib/swingx-0.9.0.jar,
  lib/miglayout-3.7.1-swing.jar,
  lib/log4j.jar,
  lib/mail.jar,
@@ -23,7 +22,6 @@ Bundle-ClassPath: tools.jar,
  lib/groovy-engine.jar,
  lib/jython.jar,
  lib/jython-engine.jar,
- lib/javaee.jar,
  lib/c3p0-0.9.1.2.jar,
  lib/ant-commons-net.jar,
  lib/ant-contrib-1.0b1.jar,
@@ -32,7 +30,6 @@ Bundle-ClassPath: tools.jar,
  lib/commons-codec.jar,
  lib/commons-logging.jar,
  lib/jgraph.jar,
- lib/jsp-api.jar,
  lib/logkit.jar,
  lib/postgresql.jar,
  lib/wizard.jar,
@@ -430,6 +427,16 @@ Export-Package: Lib,
  javax.servlet.jsp.jstl.fmt,
  javax.servlet.jsp.jstl.sql,
  javax.servlet.jsp.jstl.tlv,
+ javax.xml,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.sax,
+ javax.xml.transform.stream,
+ javax.xml.validation,
+ javax.xml.xpath,
  junit.awtui,
  junit.extensions,
  junit.framework,
@@ -437,7 +444,6 @@ Export-Package: Lib,
  junit.swingui,
  junit.swingui.icons,
  junit.textui,
- jxxload_help;uses:="org.python.core",
  net.miginfocom.layout,
  net.miginfocom.swing;uses:="net.miginfocom.layout",
  net.sf.antcontrib,
@@ -1443,6 +1449,7 @@ Export-Package: Lib,
    org.apache.tools.ant.types,
    org.python.core,
    jline",
+ org.w3c.dom,
  org.w3c.dom.bootstrap,
  org.w3c.dom.css,
  org.w3c.dom.events,
@@ -1453,6 +1460,8 @@ Export-Package: Lib,
  org.w3c.dom.traversal,
  org.w3c.dom.views,
  org.w3c.dom.xpath,
+ org.xml.sax,
  org.xml.sax.ext,
+ org.xml.sax.helpers,
  paypal.payflow
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tools/build.properties b/tools/build.properties
index 88e51788e4..df43dbb2f7 100644
--- a/tools/build.properties
+++ b/tools/build.properties
@@ -1,4 +1,5 @@
 source.tools.jar = src/
+output.tools.jar = build
 bin.includes = META-INF/,\
                lib/jstl.jar,\
                lib/Verisign.jar,\
@@ -17,7 +18,6 @@ bin.includes = META-INF/,\
                lib/groovy-engine.jar,\
                lib/jython.jar,\
                lib/jython-engine.jar,\
-               lib/javaee.jar,\
                tools.jar,\
                lib/ant-commons-net.jar,\
                lib/ant-contrib-1.0b1.jar,\
@@ -28,7 +28,6 @@ bin.includes = META-INF/,\
                lib/commons-logging.jar,\
                lib/copyLibraries.bat,\
                lib/jgraph.jar,\
-               lib/jsp-api.jar,\
                lib/logkit.jar,\
                lib/postgresql.jar,\
                lib/wizard.jar,\
diff --git a/tools/build.xml b/tools/build.xml
index a4c310cf9f..a541ccf19b 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -3,555 +3,38 @@
 <!-- ============================================= -->
 <!-- $Header: /cvs/adempiere/tools/build.xml,v 1.4 2006/07/03 23:23:31 jjanke Exp $ -->
 
-<project name="tools" default="toolsDistribution" basedir=".">
+<project name="tools" default="plugin" 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>
+	tools plugin
+    </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" />
 
 	<property name="bundle.name" value="org.adempiere.tools"/>
 	<property name="bundle.version" value="0.0.0.2"/>
 
-	<!-- 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">
+	<target name="init" 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>
 
+	<target name="plugin" depends="init">
+			<buildPlugin workspaceDirectory="${workspace}"
+			             projectName="tools"
+			             targetPlatformId="target.platform"
+						 destination="../lib"
+			 			 buildSourceJar="false" />
+  </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/ojdbc6.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-
-			<manifest>
-				<attribute name="Specification-Title" value="Oracle JDBC" />
-				<attribute name="Specification-Version" value="11g" />
-				<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/payflow.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.13.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jcommon-1.0.16.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>
-			<!-- cron job -->
-			<zipfileset src="lib/cron4j-2.2.1.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/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/payflow.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.13.jar">
-				<patternset refid="manifest.exclude" />
-			</zipfileset>
-			<zipfileset src="lib/jcommon-1.0.16.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-1.6.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>
-
-	<target name="plugin">
-	  	<jar destfile="${dist.dir}/plugins/${bundle.name}_${bundle.version}.jar" manifest="META-INF/MANIFEST.MF">
-	  		<fileset dir="${basedir}">
-	  			<include name="lib/jstl.jar"/>
-	  			<include name="lib/Verisign.jar"/>
-	  			<include name="lib/standard.jar"/>
-	  			<include name="lib/barbecue-1.5-beta1.jar"/>
-	  			<include name="lib/poi-3.0.1-FINAL-20070705.jar"/>
-	  			<include name="lib/jnlp.jar"/>
-	  			<include name="lib/iText-2.1.7.jar"/>
-	  			<include name="lib/swingx-0.9.0.jar"/>
-	  			<include name="lib/miglayout-3.7.1-swing.jar"/>
-	  			<include name="lib/log4j.jar"/>
-	  			<include name="lib/activation.jar"/>
-	  			<include name="lib/mail.jar"/>
-	  			<include name="lib/jpayment.jar"/>
-	  			<include name="lib/bsh-2.0b5.jar"/>
-	  			<include name="lib/script-api.jar"/>
-	  			<include name="lib/bsh-engine.jar"/>
-	  			<include name="lib/groovy-all-1.5.1.jar"/>
-	  			<include name="lib/groovy-engine.jar"/>
-	  			<include name="lib/jython.jar"/>
-	  			<include name="lib/jython-engine.jar"/>
-	  			<include name="lib/jcommon-1.0.14.jar"/>
-	  			<include name="lib/jfreechart-1.0.11.jar"/>
-	  			<include name="lib/javaee.jar"/>
-	  			<include name="lib/activemq-core-5.0.0.jar"/>
-	  			<include name="lib/ant-commons-net.jar"/>
-	  			<include name="lib/ant-contrib-1.0b1.jar"/>
-	  			<include name="lib/ant-launcher.jar"/>
-	  			<include name="lib/ant.jar"/>
-	  			<include name="lib/c3p0-0.9.1.2.jar"/>
-	  			<include name="lib/c3p0-oracle-thin-extras-0.9.1.2.jar"/>
-	  			<include name="lib/cglib.jar"/>
-	  			<include name="lib/commons-codec.jar"/>
-	  			<include name="lib/commons-collections-3.1.jar"/>
-	  			<include name="lib/commons-logging.jar"/>
-	  			<include name="lib/commons-net-1.4.0.jar"/>
-	  			<include name="lib/copyLibraries.bat"/>
-	  			<include name="lib/jgraph.jar"/>
-	  			<include name="lib/jpedal.jar"/>
-	  			<include name="lib/jsp-api.jar"/>
-	  			<include name="lib/junit.jar"/>
-	  			<include name="lib/logkit.jar"/>
-	  			<include name="lib/looks-2.0.4.jar"/>
-	  			<include name="lib/ocrs12.jar"/>
-	  			<include name="lib/ojdbc14.jar"/>
-	  			<include name="lib/postgresql.jar"/>
-	  			<include name="lib/wizard.jar"/>
-	  			<include name="lib/xjavadoc-1.1.jar"/>
-	  			<include name="lib/xml-apis.jar"/>
-	  			<include name="lib/cron4j-2.2.1.jar"/>
-	  			<include name="lib/payflow.jar"/>
-	  			<include name="lib/xercesImpl.jar"/>
-	  			<include name="META-INF/**/*"/>
-	  			<include name="plugin.xml"/>
-	  		</fileset>
-	  	</jar>
-	</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>
-
+  <target name="clean">
+  	<delete>
+   		<fileset dir="../lib">
+			<include name="org.adempiere.tools*.jar"/>
+		</fileset>
+   	</delete>
+  </target>
 </project>
diff --git a/tools/lib/ant4eclipse/macros/a4e-pde-macros.xml b/tools/lib/ant4eclipse/macros/a4e-pde-macros.xml
index eaf6abdce2..a2f14c839c 100644
--- a/tools/lib/ant4eclipse/macros/a4e-pde-macros.xml
+++ b/tools/lib/ant4eclipse/macros/a4e-pde-macros.xml
@@ -218,7 +218,7 @@
           <pre-package-library />
 
           <!-- copy the content of the library to a temporary folder -->
-          <ant4eclipse:executePluginLibrary workspace="@{workspaceDirectory}"
+          <ant4eclipse:executePluginLibrary workspaceDirectory="@{workspaceDirectory}"
                                             projectname="${buildPlugin.project.name}"
                                             libraryname="${buildPlugin.library.name}">