From 3af4e07c6abfeb03d2746d12ba6df258e8da8ce4 Mon Sep 17 00:00:00 2001 From: jvergara <jvergara@localhost> Date: Tue, 08 May 2007 16:44:01 +0000 Subject: [PATCH] Add the option -Xrs to java when we start the server as a service. This is required to avoid the server to be shutdown when is run as a service and the user logs off. --- opends/resource/bin/stop-ds.bat | 2 ++ opends/resource/bin/_server-script.bat | 2 ++ opends/resource/uninstall.bat | 2 ++ opends/resource/bin/status-panel.bat | 1 + opends/resource/bin/_client-script.bat | 2 ++ opends/resource/bin/start-ds.bat | 4 +++- opends/resource/upgrade.bat | 2 ++ opends/resource/setup.bat | 2 ++ 8 files changed, 16 insertions(+), 1 deletions(-) diff --git a/opends/resource/bin/_client-script.bat b/opends/resource/bin/_client-script.bat index 52fe3e7..88fe198 100644 --- a/opends/resource/bin/_client-script.bat +++ b/opends/resource/bin/_client-script.bat @@ -38,6 +38,7 @@ :noInvokeClass echo Error: OPENDS_INVOKE_CLASS environment variable is not set. +pause goto end :checkJavaBin @@ -59,6 +60,7 @@ :noSetJavaHome echo Error: JAVA_HOME environment variable is not set. echo Please set it to a valid Java 5 (or later) installation. +pause goto end :setClassPath diff --git a/opends/resource/bin/_server-script.bat b/opends/resource/bin/_server-script.bat index 07b66fa..d57b5c1 100644 --- a/opends/resource/bin/_server-script.bat +++ b/opends/resource/bin/_server-script.bat @@ -38,6 +38,7 @@ :noInvokeClass echo Error: OPENDS_INVOKE_CLASS environment variable is not set. +pause goto end :checkJavaBin @@ -59,6 +60,7 @@ :noSetJavaHome echo Error: JAVA_HOME environment variable is not set. echo Please set it to a valid Java 5 (or later) installation. +pause goto end :setClassPath diff --git a/opends/resource/bin/start-ds.bat b/opends/resource/bin/start-ds.bat index 31a2f71..cf2becc 100644 --- a/opends/resource/bin/start-ds.bat +++ b/opends/resource/bin/start-ds.bat @@ -55,12 +55,14 @@ echo %SCRIPT%: JAVA_HOME environment variable is not set. >> %LOG% echo Error: 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 ERROR: The detected Java version could not be used. Please set echo JAVA_HOME to to a valid Java 5 (or later) installation. +pause goto end :setClassPath @@ -115,7 +117,7 @@ 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%" %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%" "%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" erase "%DIR_HOME%\logs\server.startingservice" diff --git a/opends/resource/bin/status-panel.bat b/opends/resource/bin/status-panel.bat index 67c3955..a82ba38 100644 --- a/opends/resource/bin/status-panel.bat +++ b/opends/resource/bin/status-panel.bat @@ -49,6 +49,7 @@ :noSetJavaHome echo Error: JAVA_HOME environment variable is not set. echo Please set it to a valid Java 5 installation. +pause goto end :setClassPath diff --git a/opends/resource/bin/stop-ds.bat b/opends/resource/bin/stop-ds.bat index 15ecf1d..2e9c88c 100644 --- a/opends/resource/bin/stop-ds.bat +++ b/opends/resource/bin/stop-ds.bat @@ -62,12 +62,14 @@ echo Error: JAVA_HOME environment variable is not set. echo Please set it to a valid Java 5 (or later) installation. echo %SCRIPT%: JAVA_HOME environment variable is not set. >> %LOG% +pause goto end :noValidJavaHome echo %SCRIPT%: The detected Java version could not be used. JAVA_HOME=[%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. +pause goto end :setClassPath diff --git a/opends/resource/setup.bat b/opends/resource/setup.bat index a46efdd..3d393bb 100644 --- a/opends/resource/setup.bat +++ b/opends/resource/setup.bat @@ -49,11 +49,13 @@ :noSetJavaHome echo Error: JAVA_HOME environment variable is not set. echo Please set it to a valid Java 5 (or later) installation. +pause goto end :noValidJavaHome echo ERROR: The detected Java version could not be used. Please set echo JAVA_HOME to to a valid Java 5 (or later) installation. +pause goto end :setClassPath diff --git a/opends/resource/uninstall.bat b/opends/resource/uninstall.bat index 7349a8f..40a5db7 100644 --- a/opends/resource/uninstall.bat +++ b/opends/resource/uninstall.bat @@ -49,11 +49,13 @@ :noSetJavaHome echo Error: JAVA_HOME environment variable is not set. echo Please set it to a valid Java 5 (or later) installation. +pause goto end :noValidJavaHome echo ERROR: The detected Java version could not be used. Please set echo JAVA_HOME to to a valid Java 5 (or later) installation. +pause goto end :setClassPath diff --git a/opends/resource/upgrade.bat b/opends/resource/upgrade.bat index f4776f3..c2e4504 100644 --- a/opends/resource/upgrade.bat +++ b/opends/resource/upgrade.bat @@ -54,11 +54,13 @@ :noSetJavaHome echo Error: JAVA_HOME environment variable is not set. echo Please set it to a valid Java 5 (or later) installation. +pause goto end :noValidJavaHome echo ERROR: The detected Java version could not be used. Please set echo JAVA_HOME to to a valid Java 5 (or later) installation. +pause goto end set PATH=%SystemRoot% -- Gitblit v1.10.0