From ecd6711981fbd48a4a9bc376377ba6cc86c0c3fb Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 13 Apr 2007 15:36:41 +0000
Subject: [PATCH] This commit addresses addresses problems with the file system locking files that arose from testing the upgrader on Windows.
---
opendj-sdk/opends/resource/upgrade.bat | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/resource/upgrade.bat b/opendj-sdk/opends/resource/upgrade.bat
index 1e0bd31..ea1e591 100644
--- a/opendj-sdk/opends/resource/upgrade.bat
+++ b/opendj-sdk/opends/resource/upgrade.bat
@@ -32,28 +32,25 @@
:checkJavaBin
if "%JAVA_BIN%" == "" goto noJavaBin
-goto setClassPath
+goto callExtractor
:noJavaBin
if "%JAVA_HOME%" == "" goto noJavaHome
if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
-goto setClassPath
+goto callExtractor
:noJavaHome
if not exist "%DIR_HOME%\bat\set-java-home.bat" goto noSetJavaHome
call "%DIR_HOME%\bat\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
-goto setClassPath
+goto callExtractor
:noSetJavaHome
echo Error: JAVA_HOME environment variable is not set.
echo Please set it to a valid Java 5 installation.
goto end
-:setClassPath
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
-
set PATH=%SystemRoot%
if "%*" == "" goto callLaunch
@@ -63,8 +60,19 @@
"%DIR_HOME%\lib\winlauncher.exe" launch "%DIR_HOME%" "%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.upgrader.UpgradeLauncher
goto end
-:callJava
-"%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.upgrader.UpgradeLauncher %*
+:callExtractor
+if EXIST .\tmp\upgrade rd .\tmp\upgrade /s /q
+set CLASSPATH=""
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+"%JAVA_BIN%" org.opends.quicksetup.upgrader.BuildExtractor %*
+if %ERRORLEVEL%==0 goto callUpgrader
+goto end
+
+:callUpgrader
+set CLASSPATH=""
+FOR %%x in ("%DIR_HOME%\tmp\upgrade\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+"%JAVA_BIN%" org.opends.quicksetup.upgrader.UpgradeLauncher %*
+if EXIST .\tmp\upgrade rd .\tmp\upgrade /s /q
goto end
:end
--
Gitblit v1.10.0