From 3c9aa3a8e25490ff83b16a9a40be98860c193f3b Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 16 Sep 2009 02:21:01 +0000
Subject: [PATCH] improve and install CheckConflicts.sh in lib directory

---
 install/build.xml     |  3 ++-
 lib/CheckConflicts.sh | 26 +++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/install/build.xml b/install/build.xml
index 30a8747443..8ddf689852 100644
--- a/install/build.xml
+++ b/install/build.xml
@@ -152,7 +152,8 @@
   	<mkdir dir="${build.dir}/Adempiere/packages/liberoHR"/>
   	<mkdir dir="${build.dir}/Adempiere/packages/liberoHR/lib"/>
   	<copy file="../packages/liberoHR.jar" tofile="${build.dir}/Adempiere/packages/liberoHR/lib/liberoHR.jar"/>
-  	
+
+  	<copy file="../lib/CheckConflicts.sh" tofile="${build.dir}/Adempiere/lib"/>
 
 	<!-- Base Directory			-->
 	<copy todir="${build.dir}/Adempiere">
diff --git a/lib/CheckConflicts.sh b/lib/CheckConflicts.sh
index fc3682e1bb..2a3ad9ade0 100755
--- a/lib/CheckConflicts.sh
+++ b/lib/CheckConflicts.sh
@@ -6,6 +6,8 @@
 
 PROCESS=$$
 TMPDIR=/tmp
+TMPLISADEMPIEREORIGINAL=$TMPDIR/lisadempiereoriginal$PROCESS.txt
+TMPLISWEBUIORIGINAL=$TMPDIR/liswebuioriginal$PROCESS.txt
 TMPLISPATCHES=$TMPDIR/lispatches$PROCESS.txt
 TMPLISCUST=$TMPDIR/liscustomization$PROCESS.txt
 TMPLISPACK=$TMPDIR/lispackages$PROCESS.txt
@@ -17,6 +19,16 @@ TMPLISZKPACK=$TMPDIR/liszkpackages$PROCESS.txt
 TMPLISZKALLPACK=$TMPDIR/liszkallpackages$PROCESS.txt
 TMPLISZKUNQPACK=$TMPDIR/liszkunqpackages$PROCESS.txt
 
+jar tf AdempiereOriginal.jar |
+    fgrep -v META-INF |
+    fgrep .class |
+    sort > $TMPLISADEMPIEREORIGINAL
+
+jar tf webuiOriginal.war |
+    fgrep -v META-INF |
+    fgrep .class |
+    sort > $TMPLISWEBUIORIGINAL
+
 jar tf patches.jar |
     fgrep -v META-INF |
     fgrep .class |
@@ -72,6 +84,18 @@ sort -o $TMPLISZKALLPACK $TMPLISZKALLPACK
 sort -u -o $TMPLISZKUNQPACK $TMPLISZKALLPACK
 
 
+if [ `comm -12 $TMPLISPACK $TMPLISADEMPIEREORIGINAL | wc -l` -ne 0 ]
+then
+    echo "** WARNING: Package classes are overwritting Adempiere classes. Package will take precedence"
+    comm -12 $TMPLISPACK $TMPLISADEMPIEREORIGINAL
+fi
+
+if [ `comm -12 $TMPLISZKPACK $TMPLISWEBUIORIGINAL | wc -l` -ne 0 ]
+then
+    echo "** WARNING: ZK Package classes are overwritting ZK webui original classes. ZK Package will take precedence"
+    comm -12 $TMPLISZKPACK $TMPLISWEBUIORIGINAL
+fi
+
 if [ `comm -12 $TMPLISPATCHES $TMPLISCUST | wc -l` -ne 0 ]
 then
     echo "** WARNING: Dup files in customization and patches.  Customization will take precedence"
@@ -120,4 +144,4 @@ then
     comm -23 $TMPLISZKALLPACK $TMPLISZKUNQPACK
 fi
 
-rm -f $TMPLISPATCHES $TMPLISCUST $TMPLISPACK $TMPLISALLPACK $TMPLISUNQPACK $TMPLISZKPATCHES $TMPLISZKCUST $TMPLISZKPACK $TMPLISZKALLPACK $TMPLISZKUNQPACK
+rm -f $TMPLISADEMPIEREORIGINAL $TMPLISWEBUIORIGINAL $TMPLISPATCHES $TMPLISCUST $TMPLISPACK $TMPLISALLPACK $TMPLISUNQPACK $TMPLISZKPATCHES $TMPLISZKCUST $TMPLISZKPACK $TMPLISZKALLPACK $TMPLISZKUNQPACK