OPENDJ-1098 Upgrading must disable old patches - II.

Violette Roche-Montane

04.30.2014 8c46207b056ab0986d5ae810e995d3116f3a72cc

OPENDJ-1098 Upgrading must disable old patches - II.

 opendj3-server-dev/resource/upgrade

@@ -32,13 +32,13 @@
SCRIPT_NAME="upgrade"
export SCRIPT_NAME

DIR_CLASSES="./classes"
SCRIPT_DIR=`dirname "${0}"`
DIR_CLASSES="${SCRIPT_DIR}/classes"
# The upgrade is not compatible with patches. If the folder is not empty
# we renamed it as "classes.disabled", and the upgrade process should be launched properly.
if [ "`(ls -A ${DIR_CLASSES})`" ]; then
    mv -f ${DIR_CLASSES} "./classes.disabled"
    mv -f ${DIR_CLASSES} "${SCRIPT_DIR}/classes.disabled"
    mkdir ${DIR_CLASSES}
fi

SCRIPT_DIR=`dirname "${0}"`
"${SCRIPT_DIR}/lib/_server-script.sh" "${@}"

 opendj3-server-dev/resource/upgrade.bat

@@ -29,7 +29,8 @@
set OPENDJ_INVOKE_CLASS="org.opends.server.tools.upgrade.UpgradeCli"
set SCRIPT_NAME=upgrade

set DIR_CLASSES="classes"
for %%i in (%~sf0) do set SCRIPT_DIR=%%~dPsi
set DIR_CLASSES="%SCRIPT_DIR%classes"
rem The upgrade is not compatible with patches. If the folder is not empty
rem we renamed it as "classes.disabled", and the upgrade process should be launched properly.
IF EXIST "%DIR_CLASSES%" (
@@ -38,7 +39,7 @@
goto end

:renamePatchesFolder
rename %DIR_CLASSES% "classes.disabled"
move /-Y "%DIR_CLASSES%" "%SCRIPT_DIR%classes.disabled" > nul
mkdir %DIR_CLASSES%

:end