From 43a2c201f9e305a50ea678d6685a8b23190eb74d Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 11 Apr 2007 13:37:33 +0000
Subject: [PATCH] Revert 2055, 2056, 2057

---
 install/Adempiere/build.xml  |  16 ++++++++++++++--
 launch/Adempiere.xml         |   2 ++
 launch/Release/Adempiere.exe | Bin 27136 -> 27136 bytes
 utils/RUN_Adempiere.bat      |   4 ++--
 utils/RUN_Adempiere.sh       |   4 ++--
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/install/Adempiere/build.xml b/install/Adempiere/build.xml
index 703f90247d..675e03de2f 100644
--- a/install/Adempiere/build.xml
+++ b/install/Adempiere/build.xml
@@ -144,6 +144,18 @@
 			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
 		<copy file="buildALib/Adempiere1.jar" tofile="lib/Adempiere.jar" overwrite="yes" />
 
+		<!-- Sign patches Jar -->
+		<copy file="lib/patches.jar" tofile="buildALib/patches1.jar" overwrite="yes" />
+		<signjar jar="buildALib/patches1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
+		<copy file="buildALib/patches1.jar" tofile="lib/patches.jar" overwrite="yes" />
+
+		<!-- Sign customization Jar -->
+		<copy file="lib/customization.jar" tofile="buildALib/customization1.jar" overwrite="yes" />
+		<signjar jar="buildALib/customization1.jar" alias="${ADEMPIERE_KEYSTORECODEALIAS}" 
+			storepass="${ADEMPIERE_KEYSTOREPASS}" keystore="${ADEMPIERE_KEYSTORE}" />
+		<copy file="buildALib/customization1.jar" tofile="lib/customization.jar" overwrite="yes" />
+		
 		<delete dir="buildALib" />
 	</target>
 		
@@ -279,7 +291,7 @@
 			<zipfileset dir="utils" prefix="Adempiere" 
 				includes="WinEnv.js" />
 			<zipfileset dir="lib" prefix="Adempiere/lib" 
-				includes="Adempiere.exe,*.ico,CompiereJasperReqs.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		-->
@@ -300,7 +312,7 @@
 			<zipfileset dir="utils" prefix="Adempiere" 
 				includes="WinEnv.js" />
 			<zipfileset dir="lib" prefix="Adempiere/lib" 
-				includes="Adempiere.exe,*.ico,CompiereJasperReqs.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>
 
diff --git a/launch/Adempiere.xml b/launch/Adempiere.xml
index 6bae6e724f..017106652d 100644
--- a/launch/Adempiere.xml
+++ b/launch/Adempiere.xml
@@ -14,6 +14,8 @@
   <icon>Adempiere.ico</icon>
   <classPath>
     <mainClass>org.compiere.Adempiere</mainClass>
+    <cp>customization.jar</cp>
+    <cp>patches.jar</cp>
     <cp>Adempiere.jar</cp>
     <cp>AdempiereCLib.jar</cp>
     <cp>CompiereJasperReqs.jar</cp>
diff --git a/launch/Release/Adempiere.exe b/launch/Release/Adempiere.exe
index 59cdefeb99035ea1c652f8a4475b67ac6dc96aad..ce6357047a8ee3818700c0dac324da8c9b6080e1 100644
GIT binary patch
delta 516
zcmZp;!q{+yaY6?(*I9vy-M&n`8z$Z|VtOMnxsWMqas}fB#y6WinRfd!bDkBL%pRaC
z4W!)|z<`l~5lDM5Ff@R;AbI})QLwu7fLs)H3@i)`2}~eW5OwbZL^0$WkmTh9G36H^
z$@^oGKY%1(k463glKgrs@(j!f_uWU62l<nO3E@xvAXN8(<Smfo?So3|Lm|e2$p#fh
znDJnK3y?2~B)<U2H$viH0rHEH_#Uc^45mo@1|UBJiT?t~7eV6xQDxk09Q;*4F1fV0
lBtJK^DzPLpKTj_!vB<h0u_QSowHVBvtdU}|IWDD%6#%(dRD%Ej

delta 489
zcmZp;!q{+yaY6_4LSE^K-M&oitrKq<F`bc^T*#C)xq|Tm<C)E#OuK!V7w}3?W)IMn
z2GVW}V8F=02&6q27#cuaki36@C|F&3KrV_p1{MZ}1SXIwh`RRyq8RcGNb>T5nDPsd
z<o&V8A3&0?$0Gj#Nq#*Rc?M>L`|hL3gZ#<CgzzVS5UTq?@)k()_Cclf<`Cn+WP%DK
z%y=+A1<02~l5YU=jga_Tfc#=4zJ@9zgDDa}0m#ol;-3KWMUeP+R2erL2Y(fq?3QA&
Nxgn*2b+Q7Z0ss~jMkN3M

diff --git a/utils/RUN_Adempiere.bat b/utils/RUN_Adempiere.bat
index 237df00353..0394899359 100644
--- a/utils/RUN_Adempiere.bat
+++ b/utils/RUN_Adempiere.bat
@@ -22,7 +22,7 @@
 
 :CHECK_ADEMPIERE
 @if not "%ADEMPIERE_HOME%" == "" goto ADEMPIERE_HOME_OK
-Set CLASSPATH=lib\Adempiere.jar;lib\AdempiereCLib.jar;lib\CompiereJasperReqs.jar;%CLASSPATH%
+Set CLASSPATH=lib\customization.jar;lib\patches.jar;lib\Adempiere.jar;lib\AdempiereCLib.jar;lib\CompiereJasperReqs.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 @@ set ADEMPIERE_HOME=%~dp0..
 @Echo     cscript WinEnv.js C:\Adempiere C:\j2sdk1.4.2_08
 @goto MULTI_INSTALL
 :ADEMPIERE_HOME_OK
-@Set CLASSPATH=%ADEMPIERE_HOME%\lib\Adempiere.jar;%ADEMPIERE_HOME%\lib\AdempiereCLib.jar;%ADEMPIERE_HOME%\lib\CompiereJasperReqs.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/utils/RUN_Adempiere.sh b/utils/RUN_Adempiere.sh
index 64eea36f3e..40770704e1 100644
--- a/utils/RUN_Adempiere.sh
+++ b/utils/RUN_Adempiere.sh
@@ -19,9 +19,9 @@ fi
 
 ## Check Adempiere Home
 if [ $ADEMPIERE_HOME ]; then
-  CLASSPATH=$ADEMPIERE_HOME/lib/Adempiere.jar:$ADEMPIERE_HOME/lib/AdempiereCLib.jar:$ADEMPIERE_HOME/lib/CompiereJasperReqs.jar:$CLASSPATH
+  CLASSPATH=$ADEMPIERE_HOME/lib/customization.jar:$ADEMPIERE_HOME/lib/patches.jar:$ADEMPIERE_HOME/lib/Adempiere.jar:$ADEMPIERE_HOME/lib/AdempiereCLib.jar:$ADEMPIERE_HOME/lib/CompiereJasperReqs.jar:$CLASSPATH
 else
-  CLASSPATH=lib/Adempiere.jar:lib/AdempiereCLib.jar:lib/CompiereJasperReqs.jar:$CLASSPATH
+  CLASSPATH=lib/customization.jar:lib/patches.jar:lib/Adempiere.jar:lib/AdempiereCLib.jar:lib/CompiereJasperReqs.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.