Implement security mechanism for [ 1851190 ] Running outdated client can cause data corruption

install/Adempiere/RUN_setup.bat

@@ -44,15 +44,17 @@ goto START
 
 :NEXT
 
+cd utils
+
 @Rem ===================================
 @Rem Sign Database Build
 @Rem ===================================
-@"%JAVA%" -classpath %CP% -DADEMPIERE_HOME=%ADEMPIERE_HOME% org.adempiere.process.SignDatabaseBuild
+@Call RUN_SignDatabaseBuild.bat > NUL 2>&1
 
 @Rem ===================================
 @Rem Setup Adempiere Environment
 @Rem ===================================
-@Call utils\RUN_WinEnv.bat
+@Call RUN_WinEnv.bat
 
 @Rem ===================================
 @Rem Run Ant directly

install/Adempiere/RUN_setup.sh

@@ -28,22 +28,22 @@ ARGS=CONFIG
 
 $JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME org.compiere.install.Setup $ARGS
 
-# Sign database build
-$JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME org.adempiere.process.SignDatabaseBuild
-
 #echo ===================================
 #echo Setup Adempiere Server Environment
 #echo ===================================
 #$JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME -Dant.home="." org.apache.tools.ant.launch.Launcher setup
 
-
 echo ===================================
 echo Make .sh executable & set Env
 echo ===================================
 chmod -R a+x *.sh
 find . -name '*.sh' -exec chmod a+x '{}' \;
 
-. utils/RUN_UnixEnv.sh
+# Sign database build
+cd utils
+. RUN_SignDatabaseBuild.sh > /dev/null 2>&1
+
+. RUN_UnixEnv.sh
 
 #echo ================================
 #echo	Test local Connection

install/Adempiere/RUN_silentsetup.bat

@@ -45,15 +45,17 @@ goto START
 
 :NEXT
 
+cd utils
+
 @Rem ===================================
 @Rem Sign Database Build
 @Rem ===================================
-@"%JAVA%" -classpath %CP% -DADEMPIERE_HOME=%ADEMPIERE_HOME% org.adempiere.process.SignDatabaseBuild
+@Call RUN_SignDatabaseBuild.bat > NUL 2>&1
 
 @Rem ===================================
 @Rem Setup Adempiere Environment
 @Rem ===================================
-@Call utils\RUN_WinEnv.bat
+@Call RUN_WinEnv.bat
 
 @Echo .
 @Echo For problems, check log file in base directory

install/Adempiere/RUN_silentsetup.sh

@@ -25,16 +25,17 @@ ARGS=CONFIG
 
 $JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME org.compiere.install.SilentSetup $ARGS
 
-# Sign database build
-$JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME org.adempiere.process.SignDatabaseBuild
-
 echo ===================================
 echo Make .sh executable & set Env
 echo ===================================
 chmod -R a+x *.sh
 find . -name '*.sh' -exec chmod a+x '{}' \;
 
-. utils/RUN_UnixEnv.sh
+# Sign database build
+cd utils
+. RUN_SignDatabaseBuild.sh > /dev/null 2>&1
+
+. RUN_UnixEnv.sh
 
 echo .
 echo For problems, check log file in base directory

utils/RUN_DBRestore.bat

@@ -13,6 +13,6 @@
 @Rem globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres (ignored in oracle)
 @call %ADEMPIERE_DB_PATH%\DBRestore system/%ADEMPIERE_DB_SYSTEM% %ADEMPIERE_DB_USER% %ADEMPIERE_DB_PASSWORD% %ADEMPIERE_DB_SYSTEM%
 
-@call %ADEMPIERE_HOME%\RUN_SignDatabaseBuild
+@Call %ADEMPIERE_HOME%\utils\RUN_SignDatabaseBuild.bat > NUL 2>&1
 
 @pause

utils/RUN_DBRestore.sh

@@ -16,4 +16,4 @@ read in
 # globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres(ignored in oracle)
 sh $ADEMPIERE_DB_PATH/DBRestore.sh system/$ADEMPIERE_DB_SYSTEM $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD $ADEMPIERE_DB_SYSTEM
 
-sh $ADEMPIERE_HOME/RUN_SignDatabaseBuild.sh
+sh $ADEMPIERE_HOME/utils/RUN_SignDatabaseBuild.sh > /dev/null 2>&1

utils/RUN_ImportAdempiere.bat

@@ -13,6 +13,6 @@
 @Rem globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres (ignored in oracle)
 @call %ADEMPIERE_DB_PATH%\ImportAdempiere system/%ADEMPIERE_DB_SYSTEM% %ADEMPIERE_DB_USER% %ADEMPIERE_DB_PASSWORD% %ADEMPIERE_DB_SYSTEM%
 
-@call %ADEMPIERE_HOME%\RUN_SignDatabaseBuild
+@call %ADEMPIERE_HOME%\utils\RUN_SignDatabaseBuild > NUL 2>&1
 
 @pause

utils/RUN_ImportAdempiere.sh

@@ -26,4 +26,4 @@ read in
 # globalqss - cruiz - 2007-10-09 - added fourth parameter for postgres(ignored in oracle)
 sh $ADEMPIERE_DB_PATH/ImportAdempiere.sh $SYSUSER/$ADEMPIERE_DB_SYSTEM $ADEMPIERE_DB_USER $ADEMPIERE_DB_PASSWORD $ADEMPIERE_DB_SYSTEM
 
-sh $ADEMPIERE_HOME/RUN_SignDatabaseBuild.sh
+sh $ADEMPIERE_HOME/utils/RUN_SignDatabaseBuild.sh > /dev/null 2>&1

utils/RUN_SignDatabaseBuild.bat

@@ -2,21 +2,10 @@
 @Rem  $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.bat,v 1.19 2005/09/08 21:54:12 jjanke Exp $
 @Echo off
 
+@if (%ADEMPIERE_HOME%) == () (CALL myEnvironment.bat) else (CALL %ADEMPIERE_HOME%\utils\myEnvironment.bat)
 
-@if not "%JAVA_HOME%" == "" goto JAVA_HOME_OK
-@Set JAVA=java
-@Echo JAVA_HOME is not set.  
-@Echo You may not be able to start the required Setup window !!
-@Echo Set JAVA_HOME to the directory of your local 1.5 JDK.
-@Echo If you experience problems, run utils/WinEnv.js
-@Echo Example: cscript utils\WinEnv.js C:\Adempiere "C:\Program Files\Java\jdk1.5.0_04"
-goto START
-
-:JAVA_HOME_OK
 @Set JAVA=%JAVA_HOME%\bin\java
 
-
-:START
 @Echo =======================================
 @Echo Sign Database Build
 @Echo =======================================

utils/RUN_SignDatabaseBuild.sh

@@ -3,15 +3,12 @@
 echo Install Adempiere Server
 # $Header: /cvsroot/adempiere/install/Adempiere/RUN_setup.sh,v 1.19 2005/09/08 21:54:12 jjanke Exp $
 
-if [ $JAVA_HOME ]; then
+if [ $ADEMPIERE_HOME ]; then
-  JAVA=$JAVA_HOME/bin/java
+  cd $ADEMPIERE_HOME/utils
-else
-  JAVA=java
-  echo JAVA_HOME is not set.
-  echo You may not be able to start the Setup
-  echo Set JAVA_HOME to the directory of your local JDK.
 fi
+. ./myEnvironment.sh Server
 
+JAVA=$JAVA_HOME/bin/java
 
 echo ===================================
 echo Sign Database Build