From 87a11d1c62b094a59b88a75c1e529f73ca1aa5d2 Mon Sep 17 00:00:00 2001 From: trifonnt Date: Tue, 16 Mar 2010 15:23:40 +0000 Subject: [PATCH] FR [2971329] - Cleanup Jasper Project https://sourceforge.net/tracker/?func=detail&aid=2971329&group_id=176962&atid=883808 --- JasperReports/patch-2.5.2b.diff | 137 ----------- JasperReports/patch-2.5.2d.diff | 283 ---------------------- JasperReports/patch-client-3.1.4.diff | 12 - JasperReports/patch-install-3.1.4.diff | 75 ------ JasperReports/patch-serverRoot-3.1.4.diff | 12 - JasperReports/patch-utils-3.1.4.diff | 38 --- JasperReports/patch-utils_dev-3.1.4.diff | 20 -- JasperReportsTools/.cvsignore | 1 - 8 files changed, 578 deletions(-) delete mode 100644 JasperReports/patch-2.5.2b.diff delete mode 100644 JasperReports/patch-2.5.2d.diff delete mode 100644 JasperReports/patch-client-3.1.4.diff delete mode 100644 JasperReports/patch-install-3.1.4.diff delete mode 100644 JasperReports/patch-serverRoot-3.1.4.diff delete mode 100644 JasperReports/patch-utils-3.1.4.diff delete mode 100644 JasperReports/patch-utils_dev-3.1.4.diff delete mode 100644 JasperReportsTools/.cvsignore 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 @@ - - - -+ - - - - -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 @@ - - - -+ - CompiereHome - -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 @@ - - - -+ -+ - - - -@@ -175,7 +177,8 @@ - - - -- -+ -+ - - - -@@ -196,9 +199,13 @@ - storepass="${COMPIERE_KEYSTOREPASS}" keystore="${COMPIERE_KEYSTORE}" /> - - -+ -+ - - -- -+ - - - -@@ -223,7 +230,7 @@ - - -+ includes="Compiere2.exe,*.ico,Compiere.jar,CompiereJasperReqs.jar,CompiereCLib.jar,compiereDirect.jnlp,index.html,*.0"/> - - - - -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 @@ - - - -+ - - - -@@ -36,6 +37,7 @@ - - - -+ - - - -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 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -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 @@ - - - -+ - - - -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 @@ - - - -+ - CompiereHome - - -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 @@ - - - -+ -+ - - - -@@ -175,7 +177,9 @@ - - - -- -+ -+ -+ - - - -@@ -196,6 +200,10 @@ - storepass="${COMPIERE_KEYSTOREPASS}" keystore="${COMPIERE_KEYSTORE}" /> - - -+ -+ - - - -@@ -223,7 +231,7 @@ - - -+ includes="Compiere2.exe,*.ico,Compiere.jar,CompiereJasperReqs.jar,CompiereCLib.jar,compiereDirect.jnlp,index.html,*.0"/> - - - -@@ -246,7 +254,7 @@ - - - - - -@@ -272,7 +280,7 @@ - destfile="${basedir}/lib/compiereApps.ear" - appxml="${basedir}/lib/compiereApps.xml"> - -+ includes="compiereApps.war,Compiere.jar,CompiereSLib.jar,CompiereJasperReqs.jar,CompiereJasper.jar"/> - - - -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 @@ - - - -+ - - - -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 @@ - - - -+ - - - -@@ -36,6 +37,7 @@ - - - -+ - - - 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 @@ - - - -+ - - - 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 @@ - - - -+ -+ -+ - - - -@@ -209,6 +212,9 @@ - - - -+ -+ -+ - - - -@@ -228,6 +234,11 @@ - - -+ -+ -+ -+ - - - -@@ -271,7 +282,7 @@ - - -+ includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" /> - - - -@@ -292,7 +303,7 @@ - - -+ includes="Adempiere.exe,*.ico,customization.jar,patches.jar,CompiereJasperReqs.jar,Adempiere.jar,AdempiereCLib.jar,adempiereDirect.jnlp,index.html,*.0" /> - - - -@@ -303,7 +314,7 @@ - - - - - -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 @@ - - - -+ - AdempiereHome - - 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 @@ - - - -+ - - - 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 @@ - - - -+ - - - -@@ -37,6 +38,7 @@ - - - -+ - - - 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