From fd123dfd23f241e312dfa5e6430dc52cf4a0a98d Mon Sep 17 00:00:00 2001 From: jvergara <jvergara@localhost> Date: Fri, 28 Sep 2007 19:50:40 +0000 Subject: [PATCH] Fix for issue 2035 (Use OpenDS specific environment variables to determine the JVM to be used.) --- opendj-sdk/opends/resource/bin/start-ds.bat | 59 +++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/opendj-sdk/opends/resource/bin/start-ds.bat b/opendj-sdk/opends/resource/bin/start-ds.bat index 0a06135..538f28a 100644 --- a/opendj-sdk/opends/resource/bin/start-ds.bat +++ b/opendj-sdk/opends/resource/bin/start-ds.bat @@ -36,33 +36,44 @@ echo %SCRIPT%: invoked >> %LOG% -:checkJavaBin -if "%JAVA_BIN%" == "" goto noJavaBin +:checkOpenDSJavaBin +if "%OPENDS_JAVA_BIN%" == "" goto checkOpenDSJavaHome goto setClassPath -:noJavaBin +:checkOpenDSJavaHome +if "%OPENDS_JAVA_HOME%" == "" goto checkOpenDSJavaHomeFile +if not exist "%OPENDS_JAVA_HOME%\bin\java.exe" goto checkOpenDSJavaHomeFile +set OPENDS_JAVA_BIN=%OPENDS_JAVA_HOME%\bin\java.exe +goto setClassPath + +:checkOpenDSJavaHomeFile +if not exist "%DIR_HOME%\lib\set-java-home.bat" goto checkJavaBin +call "%DIR_HOME%\lib\set-java-home.bat" +if not exist "%OPENDS_JAVA_HOME%\bin\java.exe" goto checkJavaBin +set OPENDS_JAVA_BIN=%OPENDS_JAVA_HOME%\bin\java.exe +goto setClassPath + +:checkJavaBin +if "%JAVA_BIN%" == "" goto checkJavaHome +set OPENDS_JAVA_BIN=%JAVA_BIN% +goto setClassPath + +:checkJavaHome if "%JAVA_HOME%" == "" goto noJavaHome if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome -set JAVA_BIN=%JAVA_HOME%\bin\java.exe +set OPENDS_JAVA_BIN=%JAVA_HOME%\bin\java.exe goto setClassPath :noJavaHome -if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome -call "%DIR_HOME%\lib\set-java-home.bat" -set JAVA_BIN=%JAVA_HOME%\bin\java.exe -goto setClassPath - -:noSetJavaHome -echo %SCRIPT%: JAVA_HOME environment variable is not set. >> %LOG% -echo Error: JAVA_HOME environment variable is not set. +echo Error: OPENDS_JAVA_HOME environment variable is not set. echo Please set it to a valid Java 5 (or later) installation. pause goto end :noValidJavaHome -echo %SCRIPT%: The detected Java version could notf be used. JAVA_HOME=[%JAVA_HOME%] >> %LOG% +echo %SCRIPT%: The detected Java version could not be used. OPENDS_JAVA_HOME=[%OPENDS_JAVA_HOME%] >> %LOG% echo ERROR: The detected Java version could not be used. Please set -echo JAVA_HOME to to a valid Java 5 (or later) installation. +echo OPENDS_JAVA_HOME to to a valid Java 5 (or later) installation. pause goto end @@ -78,10 +89,10 @@ set SCRIPT_NAME_ARG=-Dorg.opends.server.scriptName=start-ds rem Test that the provided JDK is 1.5 compatible. -"%JAVA_BIN%" org.opends.server.tools.InstallDS -t > NUL 2>&1 +"%OPENDS_JAVA_BIN%" org.opends.server.tools.InstallDS -t > NUL 2>&1 if not %errorlevel% == 0 goto noValidJavaHome -"%JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" --checkStartability %* +"%OPENDS_JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" --checkStartability %* if %errorlevel% == 98 goto serverAlreadyStarted if %errorlevel% == 99 goto runDetach @@ -98,7 +109,7 @@ echo %SCRIPT%: Run no detach >> %LOG% if not exist "%DIR_HOME%\logs\server.out" echo. > "%DIR_HOME%\logs\server.out" if not exist "%DIR_HOME%\logs\server.starting" echo. > "%DIR_HOME%\logs\server.starting" -"%JAVA_BIN%" %JAVA_ARGS% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %* +"%OPENDS_JAVA_BIN%" %JAVA_ARGS% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %* goto end @@ -106,9 +117,9 @@ echo %SCRIPT%: Run detach >> %LOG% if not exist "%DIR_HOME%\logs\server.out" echo. > "%DIR_HOME%\logs\server.out" if not exist "%DIR_HOME%\logs\server.starting" echo. > "%DIR_HOME%\logs\server.starting" -"%DIR_HOME%\lib\winlauncher.exe" start "%DIR_HOME%" "%JAVA_BIN%" %JAVA_ARGS% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %* +"%DIR_HOME%\lib\winlauncher.exe" start "%DIR_HOME%" "%OPENDS_JAVA_BIN%" %JAVA_ARGS% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %* echo %SCRIPT%: Waiting for "%DIR_HOME%\logs\server.out" to be deleted >> %LOG% -"%JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.tools.WaitForFileDelete --targetFile "%DIR_HOME%\logs\server.starting" --logFile "%DIR_HOME%\logs\server.out" +"%OPENDS_JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.tools.WaitForFileDelete --targetFile "%DIR_HOME%\logs\server.starting" --logFile "%DIR_HOME%\logs\server.out" goto checkStarted :runDetachCalledByWinService @@ -118,24 +129,24 @@ if not exist "%DIR_HOME%\logs\server.starting" echo. > "%DIR_HOME%\logs\server.starting" echo. > "%DIR_HOME%\logs\server.startingservice" echo. > "%DIR_HOME%\logs\winservice.out" -"%DIR_HOME%\lib\winlauncher.exe" start "%DIR_HOME%" "%JAVA_BIN%" -Xrs %JAVA_ARGS% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %* +"%DIR_HOME%\lib\winlauncher.exe" start "%DIR_HOME%" "%OPENDS_JAVA_BIN%" -Xrs %JAVA_ARGS% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %* echo %SCRIPT%: Waiting for "%DIR_HOME%\logs\server.out" to be deleted >> %LOG% -"%JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.tools.WaitForFileDelete --targetFile "%DIR_HOME%\logs\server.starting" --logFile "%DIR_HOME%\logs\server.out" --outputFile "%DIR_HOME%\logs\winservice.out" +"%OPENDS_JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.tools.WaitForFileDelete --targetFile "%DIR_HOME%\logs\server.starting" --logFile "%DIR_HOME%\logs\server.out" --outputFile "%DIR_HOME%\logs\winservice.out" erase "%DIR_HOME%\logs\server.startingservice" goto checkStarted :runAsService echo %SCRIPT%: Run as service >> %LOG% -"%JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.tools.StartWindowsService +"%OPENDS_JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.tools.StartWindowsService echo %SCRIPT%: Waiting for "%DIR_HOME%\logs\server.startingservice" to be deleted >> %LOG% -"%JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.tools.WaitForFileDelete --targetFile "%DIR_HOME%\logs\server.startingservice" +"%OPENDS_JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.tools.WaitForFileDelete --targetFile "%DIR_HOME%\logs\server.startingservice" rem Type the contents the winwervice.out file and delete it. if exist "%DIR_HOME%\logs\winservice.out" type "%DIR_HOME%\logs\winservice.out" if exist "%DIR_HOME%\logs\winservice.out" erase "%DIR_HOME%\logs\winservice.out" goto end :checkStarted -"%JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" --checkStartability > NUL 2>&1 +"%OPENDS_JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" --checkStartability > NUL 2>&1 if %errorlevel% == 98 goto serverStarted goto serverNotStarted -- Gitblit v1.10.0