diff --git a/JasperReports/patch-2.5.2b.diff b/JasperReports/patch-2.5.2b.diff
deleted file mode 100644
index 69c2a8ea28..0000000000
--- a/JasperReports/patch-2.5.2b.diff
+++ /dev/null
@@ -1,137 +0,0 @@
-? data/import/AccountingFR.csv
-? install/.externalToolBuilders
-? utils_dev/.externalToolBuilders
-? tools/lib/barbecue-1.1.jar
-? tools/lib/iReport.jar
-? tools/lib/itext-1.2.jar
-? tools/lib/jfreechart-0.9.21.jar
-? tools/lib/xdoclet-1.2.1.jar
-? tools/lib/xdoclet-ejb-module-1.2.1.jar
-? tools/lib/xdoclet-jboss-module-1.2.1.jar
-? tools/lib/xdoclet-jmx-module-1.2.1.jar
-? tools/lib/xdoclet-web-module-1.2.1.jar
-? tools/lib/xjavadoc-1.0.3.jar
-Index: client/build.xml
-===================================================================
-RCS file: /cvsroot/compiere/client/build.xml,v
-retrieving revision 1.25
-diff -u -r1.25 build.xml
---- client/build.xml	22 Jan 2005 21:49:31 -0000	1.25
-+++ client/build.xml	4 Mar 2005 19:46:39 -0000
-@@ -94,6 +94,7 @@
-     <unjar src="..\print\Print.jar" dest="${build.dir}" />
-     <unjar src="..\extend\Extend.jar" dest="${build.dir}" />
-     <unjar src="..\interfaces\Interfaces.jar" dest="${build.dir}" />
-+  	 <unjar src="..\JasperReports\CompiereJasper.jar" dest="${build.dir}" />
-     <delete dir="${build.dir}/META-INF"/>
- 
-     <!-- put everything from ${build.dir} into Compiere.jar file -->
-
-Index: install/build.xml
-===================================================================
-RCS file: /cvsroot/compiere/install/build.xml,v
-retrieving revision 1.35
-diff -u -r1.35 build.xml
---- install/build.xml	8 Mar 2005 07:15:08 -0000	1.35
-+++ install/build.xml	10 Mar 2005 09:22:17 -0000
-@@ -147,6 +147,7 @@
- 	<copy file="${launch.dir}/Release/Compiere2.exe" todir="${build.dir}/Compiere2/lib"/>
- 	<copy file="CInstall.jar" todir="${build.dir}/Compiere2/lib"/>
- 	<copy file="../sqlj/sqlj.jar" todir="${build.dir}/Compiere2/lib"/>
-+  	<copy file="../JasperReports/CompiereJasperReqs.jar" todir="${build.dir}/Compiere2/lib"/>
- 	<concat destfile="${build.dir}/Compiere2/lib/index.html">CompiereHome</concat>
- 
-Index: install/Compiere2/build.xml
-===================================================================
-RCS file: /cvsroot/compiere/install/Compiere2/build.xml,v
-retrieving revision 1.30
-diff -u -r1.30 build.xml
---- install/Compiere2/build.xml	31 Jan 2005 06:08:15 -0000	1.30
-+++ install/Compiere2/build.xml	29 Mar 2005 22:37:21 -0000
-@@ -130,6 +130,8 @@
-     <unjar src="lib/jPDF.jar" dest="buildCLib" />
-     <unjar src="lib/${COMPIERE_DB_TYPE}.jar" dest="buildCLib" />
-     <unjar src="lib/${COMPIERE_APPS_TYPE}.jar" dest="buildCLib" />
-+	 <!-- adding the specific CompiereJasper libs -->
-+	 <unjar src="lib/CompiereJasperReqs.jar" dest="buildCLib" />
- 
-     <!-- Create CompiereCLib.jar file 	-->
-     <jar jarfile="lib/CompiereCLib.jar" index="yes">
-@@ -175,7 +177,8 @@
-     <unjar src="lib/CSTools.jar" dest="buildSLib" />
-     <unjar src="lib/jPDF.jar" dest="buildSLib" />
-     <unjar src="lib/${COMPIERE_DB_TYPE}.jar" dest="buildSLib" />
--
-+	 <!-- adding the specific CompiereJasper libs -->
-+	 <unjar src="lib/CompiereJasperReqs.jar" dest="buildSLib" />
-     <!-- Create CompiereSLib.jar file 	-->
-     <jar jarfile="lib/CompiereSLib.jar" index="yes" >
-       <fileset dir="buildSLib"/>
-@@ -196,9 +199,13 @@
-       storepass="${COMPIERE_KEYSTOREPASS}" keystore="${COMPIERE_KEYSTORE}" />
-       	
-     <delete dir="buildSLib" />
-+    <!-- Sign CompiereJasperReqs.jar for Java Web Start -->
-+    <signjar jar="lib/CompiereJasperReqs.jar"
-+      alias="${COMPIERE_KEYSTORECODEALIAS}"
-+      storepass="${COMPIERE_KEYSTOREPASS}" keystore="${COMPIERE_KEYSTORE}" />
-   </target>
- 	
--	
-+
-   <!-- ==================================================== -->
-   <!-- Setup Lib                                            -->
-   <!-- ==================================================== -->
-@@ -223,7 +230,7 @@
- 	  <zipfileset dir="utils" prefix="Compiere2"
- 	  	includes="WinEnv.js"/>
- 	  <zipfileset dir="lib" prefix="Compiere2/lib"
--		includes="Compiere2.exe,*.ico,Compiere.jar,CompiereCLib.jar,compiereDirect.jnlp,index.html,*.0"/>
-+		includes="Compiere2.exe,*.ico,Compiere.jar,CompiereJasperReqs.jar,CompiereCLib.jar,compiereDirect.jnlp,index.html,*.0"/>
- 	</zip>
- 
- 	<!--	Save properties		-->
-     
-Index: utils_dev/build.xml
-===================================================================
-RCS file: /cvsroot/compiere/utils_dev/build.xml,v
-retrieving revision 1.28
-diff -u -r1.28 build.xml
---- utils_dev/build.xml	11 Mar 2005 07:03:27 -0000	1.28
-+++ utils_dev/build.xml	21 Mar 2005 15:39:41 -0000
-@@ -22,6 +22,7 @@
- 		<ant inheritAll="false" dir="print"/>
- 		<ant inheritAll="false" dir="base"/>
- 		<ant inheritAll="false" dir="extend"/>
-+		<ant inheritAll="false" dir="JasperReports"/>
- 		<ant inheritAll="false" dir="client"/>
- 		<ant inheritAll="false" dir="serverRoot"/>
- 		<ant inheritAll="false" dir="serverApps"/>
-@@ -36,6 +37,7 @@
- 		<ant inheritAll="false" dir="dbPort" target="clean"/>
- 		<ant inheritAll="false" dir="base" target="clean"/>
- 		<ant inheritAll="false" dir="extend" target="clean"/>
-+		<ant inheritAll="false" dir="JasperReports" target="clean"/>
- 		<ant inheritAll="false" dir="client" target="clean"/>
- 		<ant inheritAll="false" dir="serverRoot" target="clean"/>
- 		<ant inheritAll="false" dir="serverApps" target="clean"/>
-Index: tools/lib/.cvsignore
-===================================================================
-RCS file: /cvsroot/compiere/tools/lib/.cvsignore,v
-retrieving revision 1.9
-diff -u -r1.9 .cvsignore
---- tools/lib/.cvsignore	28 Jan 2005 16:53:37 -0000	1.9
-+++ tools/lib/.cvsignore	9 Mar 2005 19:00:58 -0000
-@@ -2,3 +2,12 @@
- ojdbc_doc.tar
- ojdbc14_g.jar
- ojdbc_doc.zip
-+barbecue-1.0.6b.jar
-+commons-beanutils-1.7.jar
-+commons-collections-3.1.jar
-+commons-digester-1.6.jar
-+commons-logging-1.4.jar
-+xercesImpl.jar
-+jasperreports-0.6.5.jar
-+xml-apis.jar
-+.cvsignore
diff --git a/JasperReports/patch-2.5.2d.diff b/JasperReports/patch-2.5.2d.diff
deleted file mode 100644
index c4e321e16a..0000000000
--- a/JasperReports/patch-2.5.2d.diff
+++ /dev/null
@@ -1,283 +0,0 @@
-Index: .classpath
-===================================================================
-RCS file: /cvsroot/university/C-252d/.classpath,v
-retrieving revision 1.3
-diff -u -r1.3 .classpath
---- .classpath	12 Feb 2006 12:02:50 -0000	1.3
-+++ .classpath	15 Feb 2006 02:17:38 -0000
-@@ -13,52 +13,52 @@
- 	<classpathentry excluding="main/servlet/|main/servlet/" kind="src" path="serverApps/src"/>
- 	<classpathentry kind="src" path="sqlj/src"/>
- 	<classpathentry kind="src" path="tools/Src"/>
--	<classpathentry kind="lib" path="jboss/server/compiere/lib/jboss.jar"/>
--	<classpathentry kind="lib" path="lib/jPDF.jar"/>
--	<classpathentry kind="lib" path="lib/postgresql.jar"/>
--	<classpathentry kind="lib" path="tools/lib/xdoclet.jar"/>
--	<classpathentry kind="lib" path="tools/lib/activation.jar"/>
--	<classpathentry kind="lib" path="tools/lib/ant.jar"/>
--	<classpathentry kind="lib" path="tools/lib/ant-commons-net.jar"/>
--	<classpathentry kind="lib" path="tools/lib/ant-launcher.jar"/>
--	<classpathentry kind="lib" path="tools/lib/bsh-2.0b1.jar"/>
--	<classpathentry kind="lib" path="tools/lib/bsh-core-2.0b1.jar"/>
--	<classpathentry kind="lib" path="tools/lib/commons-net.jar"/>
--	<classpathentry kind="lib" path="tools/lib/j2ee.jar"/>
--	<classpathentry kind="lib" path="tools/lib/jakarta-oro.jar"/>
--	<classpathentry kind="lib" path="tools/lib/jconn3.jar"/>
--	<classpathentry kind="lib" path="tools/lib/jstl.jar"/>
--	<classpathentry kind="lib" path="tools/lib/jTDS3.jar"/>
--	<classpathentry kind="lib" path="tools/lib/jtds-1.0.jar"/>
--	<classpathentry kind="lib" path="tools/lib/junit.jar"/>
--	<classpathentry kind="lib" path="tools/lib/log4j.jar"/>
--	<classpathentry kind="lib" path="tools/lib/mail.jar"/>
--	<classpathentry kind="lib" path="tools/lib/ocrs12.jar"/>
--	<classpathentry kind="lib" path="tools/lib/ojdbc14.jar"/>
--	<classpathentry kind="lib" path="tools/lib/postgresql.jar"/>
--	<classpathentry kind="lib" path="tools/lib/rowset.jar"/>
--	<classpathentry kind="lib" path="tools/lib/saxpath.jar"/>
--	<classpathentry kind="lib" path="tools/lib/servlet.jar"/>
--	<classpathentry kind="lib" path="tools/lib/standard.jar"/>
--	<classpathentry kind="lib" path="tools/lib/Verisign.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/server/compiere/lib/jboss.jar"/>
-+	<classpathentry exported="true" kind="lib" path="lib/jPDF.jar"/>
-+	<classpathentry exported="true" kind="lib" path="lib/postgresql.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/xdoclet.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/activation.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/ant.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/ant-commons-net.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/ant-launcher.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-2.0b1.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-core-2.0b1.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/commons-net.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/j2ee.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/jakarta-oro.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/jconn3.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/jstl.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/jTDS3.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/jtds-1.0.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/junit.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/log4j.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/mail.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/ocrs12.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/ojdbc14.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/postgresql.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/rowset.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/saxpath.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/servlet.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/standard.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tools/lib/Verisign.jar"/>
- 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
--	<classpathentry kind="lib" path="jboss/server/compiere/lib/jmx-adaptor-plugin.jar"/>
--	<classpathentry kind="lib" path="jboss/server/compiere/lib/jnpserver.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/commons-httpclient.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/commons-logging.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/concurrent.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/getopt.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/gnu-regexp.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/jboss-boot.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/jboss-common.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/jboss-jmx.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/jboss-system.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/jdom.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/log4j-boot.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/webdavlib.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/xercesImpl.jar"/>
--	<classpathentry kind="lib" path="jboss/lib/xml-apis.jar"/>
--	<classpathentry kind="lib" path="interfaces/Interfaces.jar"/>
--	<classpathentry kind="lib" path="jboss/client/jboss-transaction-client.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/server/compiere/lib/jmx-adaptor-plugin.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/server/compiere/lib/jnpserver.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/commons-httpclient.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/commons-logging.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/concurrent.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/getopt.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/gnu-regexp.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/jboss-boot.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/jboss-common.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/jboss-jmx.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/jboss-system.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/jdom.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/log4j-boot.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/webdavlib.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/xercesImpl.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/lib/xml-apis.jar"/>
-+	<classpathentry exported="true" kind="lib" path="interfaces/Interfaces.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jboss/client/jboss-transaction-client.jar"/>
- 	<classpathentry kind="output" path="bin"/>
- </classpath>
-Index: client/build.xml
-===================================================================
-RCS file: /cvsroot/university/C-252d/client/build.xml,v
-retrieving revision 1.1
-diff -u -r1.1 build.xml
---- client/build.xml	14 Oct 2005 10:56:25 -0000	1.1
-+++ client/build.xml	15 Feb 2006 02:17:39 -0000
-@@ -94,6 +94,7 @@
-     <unjar src="..\print\Print.jar" dest="${build.dir}" />
-     <unjar src="..\extend\Extend.jar" dest="${build.dir}" />
-     <unjar src="..\interfaces\Interfaces.jar" dest="${build.dir}" />
-+  	 <unjar src="..\JasperReports\CompiereJasper.jar" dest="${build.dir}" />
-     <delete dir="${build.dir}/META-INF"/>
- 
-     <!-- put everything from ${build.dir} into Compiere.jar file -->
-Index: install/build.xml
-===================================================================
-RCS file: /cvsroot/university/C-252d/install/build.xml,v
-retrieving revision 1.1
-diff -u -r1.1 build.xml
---- install/build.xml	14 Oct 2005 12:32:15 -0000	1.1
-+++ install/build.xml	15 Feb 2006 02:17:42 -0000
-@@ -150,6 +150,7 @@
- 	<copy file="${launch.dir}/Release/Compiere2.exe" todir="${build.dir}/Compiere2/lib"/>
- 	<copy file="CInstall.jar" todir="${build.dir}/Compiere2/lib"/>
- 	<copy file="../sqlj/sqlj.jar" todir="${build.dir}/Compiere2/lib"/>
-+  	<copy file="../JasperReports/CompiereJasperReqs.jar" todir="${build.dir}/Compiere2/lib"/>
- 	<concat destfile="${build.dir}/Compiere2/lib/index.html">CompiereHome</concat>
- 
- 
-Index: install/Compiere2/build.xml
-===================================================================
-RCS file: /cvsroot/university/C-252d/install/Compiere2/build.xml,v
-retrieving revision 1.1
-diff -u -r1.1 build.xml
---- install/Compiere2/build.xml	14 Oct 2005 12:32:16 -0000	1.1
-+++ install/Compiere2/build.xml	15 Feb 2006 02:17:43 -0000
-@@ -130,6 +130,8 @@
-     <unjar src="lib/jPDF.jar" dest="buildCLib" />
-     <unjar src="lib/${COMPIERE_DB_TYPE}.jar" dest="buildCLib" />
-     <unjar src="lib/${COMPIERE_APPS_TYPE}.jar" dest="buildCLib" />
-+  	 <!-- adding the specific CompiereJasper libs -->
-+  	 <unjar src="lib/CompiereJasperReqs.jar" dest="buildCLib" />
- 
-     <!-- Create CompiereCLib.jar file 	-->
-     <jar jarfile="lib/CompiereCLib.jar" index="yes">
-@@ -175,7 +177,9 @@
-     <unjar src="lib/CSTools.jar" dest="buildSLib" />
-     <unjar src="lib/jPDF.jar" dest="buildSLib" />
-     <unjar src="lib/${COMPIERE_DB_TYPE}.jar" dest="buildSLib" />
--
-+  	<!-- adding the specific CompiereJasper libs -->
-+  	<unjar src="lib/CompiereJasperReqs.jar" dest="buildSLib" />
-+  	
-     <!-- Create CompiereSLib.jar file 	-->
-     <jar jarfile="lib/CompiereSLib.jar" index="yes" >
-       <fileset dir="buildSLib"/>
-@@ -196,6 +200,10 @@
-       storepass="${COMPIERE_KEYSTOREPASS}" keystore="${COMPIERE_KEYSTORE}" />
-       	
-     <delete dir="buildSLib" />
-+  	<!-- Sign CompiereJasperReqs.jar for Java Web Start	-->
-+  	<signjar jar="lib/CompiereJasperReqs.jar"
-+    	alias="${COMPIERE_KEYSTORECODEALIAS}"
-+    	storepass="${COMPIERE_KEYSTOREPASS}" keystore="${COMPIERE_KEYSTORE}" />
-   </target>
- 	
- 	
-@@ -223,7 +231,7 @@
- 	  <zipfileset dir="utils" prefix="Compiere2"
- 	  	includes="WinEnv.js"/>
- 	  <zipfileset dir="lib" prefix="Compiere2/lib"
--		includes="Compiere2.exe,*.ico,Compiere.jar,CompiereCLib.jar,compiereDirect.jnlp,index.html,*.0"/>
-+		includes="Compiere2.exe,*.ico,Compiere.jar,CompiereJasperReqs.jar,CompiereCLib.jar,compiereDirect.jnlp,index.html,*.0"/>
- 	</zip>
- 
- 	<!--	Save properties		-->
-@@ -246,7 +254,7 @@
- 		<zipfileset src="${basedir}/lib/compiereRootBase.war" />
- 		<!-- copy to compiereHome	-->
- 		<zipfileset dir="${basedir}/lib" 
--			includes="Compiere2Client.zip,Compiere.jar,CompiereCLib.jar,*.jnlp,*.0,*.html"
-+			includes="Compiere2Client.zip,Compiere.jar,CompiereJasperReqs.jar,CompiereCLib.jar,*.jnlp,*.0,*.html"
- 			prefix="compiereHome"/>
- 	</zip>
- 
-@@ -272,7 +280,7 @@
- 	    	destfile="${basedir}/lib/compiereApps.ear" 
-     		appxml="${basedir}/lib/compiereApps.xml">
- 	  <fileset dir="${basedir}/lib" 
--		includes="compiereApps.war,Compiere.jar,CompiereSLib.jar"/>
-+		includes="compiereApps.war,Compiere.jar,CompiereSLib.jar,CompiereJasperReqs.jar,CompiereJasper.jar"/>
- 	  <manifest>
- 		<attribute name="Specification-Title" value="CompiereApps"/>
- 		<attribute name="Specification-Version" value="R251x"/>
-Index: serverRoot/src/web/compiere.jnlp
-===================================================================
-RCS file: /cvsroot/university/C-252d/serverRoot/src/web/compiere.jnlp,v
-retrieving revision 1.1
-diff -u -r1.1 compiere.jnlp
---- serverRoot/src/web/compiere.jnlp	16 Oct 2005 02:14:38 -0000	1.1
-+++ serverRoot/src/web/compiere.jnlp	15 Feb 2006 02:17:44 -0000
-@@ -16,6 +16,7 @@
- 	<resources>
- 		<j2se version = "1.4*" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
- 		<jar href = "Compiere.jar" main = "true" download = "eager"/>
-+		<jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/>
- 		<jar href = "CompiereCLib.jar" main = "false" download = "eager"/>
- 	</resources>  
- 	<application-desc main-class = "org.compiere.Compiere"/>  
-Index: utils/RUN_Compiere2.bat
-===================================================================
-RCS file: /cvsroot/university/C-252d/utils/RUN_Compiere2.bat,v
-retrieving revision 1.1
-diff -u -r1.1 RUN_Compiere2.bat
---- utils/RUN_Compiere2.bat	16 Oct 2005 02:47:52 -0000	1.1
-+++ utils/RUN_Compiere2.bat	15 Feb 2006 02:17:45 -0000
-@@ -22,7 +22,7 @@
- 
- :CHECK_COMPIERE
- @if not "%COMPIERE_HOME%" == "" goto COMPIERE_HOME_OK
--Set CLASSPATH=lib\Compiere.jar;lib\CompiereCLib.jar;%CLASSPATH%
-+Set CLASSPATH=lib\Compiere.jar;lib\CompiereCLib.jar;lib\CompiereJasperReqs.jar;%CLASSPATH%
- set COMPIERE_HOME=%~dp0..
- @Echo COMPIERE_HOME is not set.  
- @Echo   You may not be able to start Compiere
-@@ -31,7 +31,7 @@
- @Echo     cscript WinEnv.js C:\Compiere2 C:\j2sdk1.4.2_06
- @goto START
- :COMPIERE_HOME_OK
--@Set CLASSPATH=%COMPIERE_HOME%\lib\Compiere.jar;%COMPIERE_HOME%\lib\CompiereCLib.jar;%CLASSPATH%
-+@Set CLASSPATH=%COMPIERE_HOME%\lib\Compiere.jar;%COMPIERE_HOME%\lib\CompiereCLib.jar;%COMPIERE_HOME%\lib\CompiereJasperReqs.jar;%CLASSPATH%
- 
- @REM To switch between multiple installs, copy the created Compiere.properties file
- @REM Select the configuration by setting the PROP variable
-Index: utils/RUN_Compiere2.sh
-===================================================================
-RCS file: /cvsroot/university/C-252d/utils/RUN_Compiere2.sh,v
-retrieving revision 1.1
-diff -u -r1.1 RUN_Compiere2.sh
---- utils/RUN_Compiere2.sh	16 Oct 2005 02:47:52 -0000	1.1
-+++ utils/RUN_Compiere2.sh	15 Feb 2006 02:17:45 -0000
-@@ -19,9 +19,9 @@
- 
- ## Check Compiere Home
- if [ $COMPIERE_HOME ]; then
--  CLASSPATH=$COMPIERE_HOME/lib/Compiere.jar:$COMPIERE_HOME/lib/CompiereCLib.jar:$CLASSPATH
-+  CLASSPATH=$COMPIERE_HOME/lib/Compiere.jar:$COMPIERE_HOME/lib/CompiereCLib.jar:$COMPIERE_HOME/lib/CompiereJasperReqs.jar:$CLASSPATH
- else
--  CLASSPATH=lib/Compiere.jar:lib/CompiereCLib.jar:$CLASSPATH
-+  CLASSPATH=lib/Compiere.jar:lib/CompiereCLib.jar:lib/CompiereJasperReqs.jar:$CLASSPATH
-   echo COMPIERE_HOME is not set
-   echo   You may not be able to start Compiere
-   echo   Set COMPIERE_HOME to the directory of Compiere2.
-Index: utils_dev/build.xml
-===================================================================
-RCS file: /cvsroot/university/C-252d/utils_dev/build.xml,v
-retrieving revision 1.1
-diff -u -r1.1 build.xml
---- utils_dev/build.xml	16 Oct 2005 02:47:52 -0000	1.1
-+++ utils_dev/build.xml	15 Feb 2006 02:17:45 -0000
-@@ -22,6 +22,7 @@
- 		<ant inheritAll="false" dir="print"/>
- 		<ant inheritAll="false" dir="base"/>
- 		<ant inheritAll="false" dir="extend"/>
-+		<ant inheritAll="false" dir="JasperReports"/>
- 		<ant inheritAll="false" dir="client"/>
- 		<ant inheritAll="false" dir="serverRoot"/>
- 		<ant inheritAll="false" dir="serverApps"/>
-@@ -36,6 +37,7 @@
- 		<ant inheritAll="false" dir="dbPort" target="clean"/>
- 		<ant inheritAll="false" dir="base" target="clean"/>
- 		<ant inheritAll="false" dir="extend" target="clean"/>
-+		<ant inheritAll="false" dir="JasperReports" target="clean"/>
- 		<ant inheritAll="false" dir="client" target="clean"/>
- 		<ant inheritAll="false" dir="serverRoot" target="clean"/>
- 		<ant inheritAll="false" dir="serverApps" target="clean"/>
diff --git a/JasperReports/patch-client-3.1.4.diff b/JasperReports/patch-client-3.1.4.diff
deleted file mode 100644
index 6f2514db13..0000000000
--- a/JasperReports/patch-client-3.1.4.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: C:/Trifon-CD-0.2/COMAP/adempiere-trunk/client/build.xml
-===================================================================
---- C:/Trifon-CD-0.2/COMAP/adempiere-trunk/client/build.xml	(revision 1227)
-+++ C:/Trifon-CD-0.2/COMAP/adempiere-trunk/client/build.xml	(working copy)
-@@ -100,6 +100,7 @@
-     <unjar src="..\print\Print.jar" dest="${build.dir}" />
-     <unjar src="..\extend\Extend.jar" dest="${build.dir}" />
-     <!-- <unjar src="..\interfaces\Interfaces.jar" dest="${build.dir}" /> -->
-+  	<unjar src="..\JasperReports\CompiereJasper.jar" dest="${build.dir}" />
-     <delete dir="${build.dir}/META-INF"/>
- 
-     <!-- put everything from ${build.dir} into Adempiere.jar file -->
diff --git a/JasperReports/patch-install-3.1.4.diff b/JasperReports/patch-install-3.1.4.diff
deleted file mode 100644
index 2cb366e028..0000000000
--- a/JasperReports/patch-install-3.1.4.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/Adempiere/build.xml
-===================================================================
---- C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/Adempiere/build.xml	(revision 1227)
-+++ C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/Adempiere/build.xml	(working copy)
-@@ -164,6 +164,9 @@
- 		<!--end vpj-cd e-evolution-->
-         <unjar src="lib/fyracle.jar" dest="buildCLib" />
- 
-+		<!-- adding the specific CompiereJasper libs -->
-+		<unjar src="lib/CompiereJasperReqs.jar" dest="buildCLib" />
-+		
- 		<unjar src="lib/${ADEMPIERE_APPS_TYPE}.jar" dest="buildCLib" />
- 
- 		<!-- Create AdempiereCLib.jar file 	-->
-@@ -209,6 +212,9 @@
-         <!--end vpj-cd e-evolution-->
-         <unjar src="lib/fyracle.jar" dest="buildSLib" />
- 
-+		<!-- adding the specific CompiereJasper libs -->
-+		<unjar src="lib/CompiereJasperReqs.jar" dest="buildSLib" />
-+		
- 
- 		<!-- Create AdempiereSLib.jar file 	-->
- 		<jar jarfile="lib/AdempiereSLib.jar" index="yes">
-@@ -228,6 +234,11 @@
- 		<signjar jar="lib/AdempiereSLib.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
- 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
- 		<delete dir="buildSLib" />
-+		
-+		<!-- Sign CompiereJasperReqs.jar for Java Web Start	-->
-+		<signjar jar="lib/CompiereJasperReqs.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}"
-+		   	storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
-+
- 	</target>
- 	
- 	<!-- Sign other application jars -->
-@@ -271,7 +282,7 @@
- 			<zipfileset dir="utils" prefix="Adempiere" 
- 				includes="WinEnv.js" />
- 			<zipfileset dir="lib" prefix="Adempiere/lib" 
--				includes="Adempiere.exe,*.ico,customization.jar,patches.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
-+				includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
- 		</zip>
- 
- 		<!--	Save properties		-->
-@@ -292,7 +303,7 @@
- 			<zipfileset dir="utils" prefix="Adempiere" 
- 				includes="WinEnv.js" />
- 			<zipfileset dir="lib" prefix="Adempiere/lib" 
--				includes="Adempiere.exe,*.ico,customization.jar,patches.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
-+				includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" />
- 		</zip>
- 	</target>
- 
-@@ -303,7 +314,7 @@
- 			<zipfileset src="${basedir}/lib/adempiereRootBase.war" />
- 			<!-- copy to adempiereHome	-->
- 			<zipfileset dir="${basedir}/lib" 
--				includes="AdempiereClient.zip,Adempiere.jar,AdempiereCLib.jar,*.jnlp,*.0,*.html" 
-+				includes="AdempiereClient.zip,Adempiere.jar,AdempiereCLib.jar,*.jnlp,*.0,*.html,CompiereJasperReqs.jar,CompiereJasper.jar" 
- 				prefix="adempiereHome" />
- 		</zip>
- 
-Index: C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/build.xml
-===================================================================
---- C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/build.xml	(revision 1227)
-+++ C:/Trifon-CD-0.2/COMAP/adempiere-trunk/install/build.xml	(working copy)
-@@ -155,6 +155,7 @@
- 	<copy file="CInstall.jar" todir="${build.dir}/Adempiere/lib"/>
- 	<copy file="../sqlj/sqlj.jar" todir="${build.dir}/Adempiere/lib"/>
- 	<copy file="../tools/lib/j2ee.jar" todir="${build.dir}/Adempiere/lib"/>
-+  	<copy file="../JasperReports/CompiereJasperReqs.jar" todir="${build.dir}/Compiere2/lib"/>
- 	<concat destfile="${build.dir}/Adempiere/lib/index.html">AdempiereHome</concat>
- 
- 
diff --git a/JasperReports/patch-serverRoot-3.1.4.diff b/JasperReports/patch-serverRoot-3.1.4.diff
deleted file mode 100644
index b03c1a4fd9..0000000000
--- a/JasperReports/patch-serverRoot-3.1.4.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: C:/Trifon-CD-0.2/COMAP/adempiere-trunk/serverRoot/src/web/adempiere.jnlp
-===================================================================
---- C:/Trifon-CD-0.2/COMAP/adempiere-trunk/serverRoot/src/web/adempiere.jnlp	(revision 1227)
-+++ C:/Trifon-CD-0.2/COMAP/adempiere-trunk/serverRoot/src/web/adempiere.jnlp	(working copy)
-@@ -24,6 +24,7 @@
- 		<j2se version = "1.5+" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
- 		<jar href = "Adempiere.jar" main = "true" download = "eager"/>
- 		<jar href = "AdempiereCLib.jar" main = "false" download = "eager"/>
-+		<jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/>
- 		<property name="adempiereJNLP" value="$$context"/> 
- 	</resources>  
- 	<application-desc main-class = "org.compiere.Adempiere"/>  
diff --git a/JasperReports/patch-utils-3.1.4.diff b/JasperReports/patch-utils-3.1.4.diff
deleted file mode 100644
index 5d63723ecc..0000000000
--- a/JasperReports/patch-utils-3.1.4.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: C:/Trifon-CD-0.2/COMAP/adempiere-trunk/utils/RUN_Adempiere.sh
-===================================================================
---- C:/Trifon-CD-0.2/COMAP/adempiere-trunk/utils/RUN_Adempiere.sh	(revision 1227)
-+++ C:/Trifon-CD-0.2/COMAP/adempiere-trunk/utils/RUN_Adempiere.sh	(working copy)
-@@ -19,9 +19,9 @@
- 
- ## Check Adempiere Home
- if [ $ADEMPIERE_HOME ]; then
--  CLASSPATH=$ADEMPIERE_HOME/lib/customization.jar:$ADEMPIERE_HOME/lib/patches.jar:$ADEMPIERE_HOME/lib/Adempiere.jar:$ADEMPIERE_HOME/lib/AdempiereCLib.jar:$CLASSPATH
-+  CLASSPATH=$ADEMPIERE_HOME/lib/customization.jar:$ADEMPIERE_HOME/lib/patches.jar:$ADEMPIERE_HOME/lib/CompiereJasperReqs.jar:$ADEMPIERE_HOME/lib/Adempiere.jar:$ADEMPIERE_HOME/lib/AdempiereCLib.jar:$CLASSPATH
- else
--  CLASSPATH=lib/customization.jar:lib/patches.jar:lib/Adempiere.jar:lib/AdempiereCLib.jar:$CLASSPATH
-+  CLASSPATH=lib/customization.jar:lib/patches.jar:lib/CompiereJasperReqs.jar:lib/Adempiere.jar:lib/AdempiereCLib.jar:$CLASSPATH
-   echo ADEMPIERE_HOME is not set
-   echo   You may not be able to start Adempiere
-   echo   Set ADEMPIERE_HOME to the directory of Adempiere.
-Index: C:/Trifon-CD-0.2/COMAP/adempiere-trunk/utils/RUN_Adempiere.bat
-===================================================================
---- C:/Trifon-CD-0.2/COMAP/adempiere-trunk/utils/RUN_Adempiere.bat	(revision 1227)
-+++ C:/Trifon-CD-0.2/COMAP/adempiere-trunk/utils/RUN_Adempiere.bat	(working copy)
-@@ -22,7 +22,7 @@
- 
- :CHECK_ADEMPIERE
- @if not "%ADEMPIERE_HOME%" == "" goto ADEMPIERE_HOME_OK
--Set CLASSPATH=lib\customization.jar;lib\patches.jar;lib\Adempiere.jar;lib\AdempiereCLib.jar;%CLASSPATH%
-+Set CLASSPATH=lib\customization.jar;lib\patches.jar;lib\CompiereJasperReqs.jar;lib\Adempiere.jar;lib\AdempiereCLib.jar;%CLASSPATH%
- set ADEMPIERE_HOME=%~dp0..
- @Echo ADEMPIERE_HOME is not set.  
- @Echo   You may not be able to start Adempiere
-@@ -31,7 +31,7 @@
- @Echo     cscript WinEnv.js C:\Adempiere C:\j2sdk1.4.2_08
- @goto MULTI_INSTALL
- :ADEMPIERE_HOME_OK
--@Set CLASSPATH=%ADEMPIERE_HOME%\lib\customization.jar;%ADEMPIERE_HOME%\lib\patches.jar;%ADEMPIERE_HOME%\lib\Adempiere.jar;%ADEMPIERE_HOME%\lib\AdempiereCLib.jar;%CLASSPATH%
-+@Set CLASSPATH=%ADEMPIERE_HOME%\lib\customization.jar;%ADEMPIERE_HOME%\lib\patches.jar;%ADEMPIERE_HOME%\lib\CompiereJasperReqs.jar;%ADEMPIERE_HOME%\lib\Adempiere.jar;%ADEMPIERE_HOME%\lib\AdempiereCLib.jar;%CLASSPATH%
- 
- :MULTI_INSTALL
- @REM  To switch between multiple installs, copy the created Adempiere.properties file
diff --git a/JasperReports/patch-utils_dev-3.1.4.diff b/JasperReports/patch-utils_dev-3.1.4.diff
deleted file mode 100644
index 1d6690c6ff..0000000000
--- a/JasperReports/patch-utils_dev-3.1.4.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: C:/Trifon-CD-0.2/COMAP/adempiere-trunk/utils_dev/build.xml
-===================================================================
---- C:/Trifon-CD-0.2/COMAP/adempiere-trunk/utils_dev/build.xml	(revision 1227)
-+++ C:/Trifon-CD-0.2/COMAP/adempiere-trunk/utils_dev/build.xml	(working copy)
-@@ -22,6 +22,7 @@
- 		<ant inheritAll="false" dir="print"/>
- 		<ant inheritAll="false" dir="base"/>
- 		<ant inheritAll="false" dir="extend"/>
-+		<ant inheritAll="false" dir="JasperReports"/>
- 		<ant inheritAll="false" dir="client"/>
- 		<ant inheritAll="false" dir="serverRoot"/>
- 		<ant inheritAll="false" dir="serverApps"/>
-@@ -37,6 +38,7 @@
- 		<ant inheritAll="false" dir="dbPort" target="clean"/>
- 		<ant inheritAll="false" dir="base" target="clean"/>
- 		<ant inheritAll="false" dir="extend" target="clean"/>
-+		<ant inheritAll="false" dir="JasperReports" target="clean"/>
- 		<ant inheritAll="false" dir="client" target="clean"/>
- 		<ant inheritAll="false" dir="serverRoot" target="clean"/>
- 		<ant inheritAll="false" dir="serverApps" target="clean"/>
diff --git a/JasperReportsTools/.cvsignore b/JasperReportsTools/.cvsignore
deleted file mode 100644
index ec3474d119..0000000000
--- a/JasperReportsTools/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-JasperReportsTools.jar