From 1faa6b83895dba3f275c72635f03518a6dc01007 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 22 Feb 2007 09:41:28 +0000
Subject: [PATCH] Fix for Issues #1025 and #1248 ('stop-ds.bat should be able to stop server even if LDAP port' and 'cannot stop server through status panel').
---
opends/resource/bin/statuspanel.bat | 39 +++++++++++++++++--
opends/resource/bin/stop-ds.bat | 14 ++++++
opends/resource/uninstall.bat | 14 +++++-
opends/resource/bin/start-ds.bat | 4 +-
opends/resource/setup.bat | 14 +++++-
5 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/opends/resource/bin/start-ds.bat b/opends/resource/bin/start-ds.bat
index 429cca9..851b102 100644
--- a/opends/resource/bin/start-ds.bat
+++ b/opends/resource/bin/start-ds.bat
@@ -23,7 +23,7 @@
rem CDDL HEADER END
rem
rem
-rem Portions Copyright 2006 Sun Microsystems, Inc.
+rem Portions Copyright 2006-2007 Sun Microsystems, Inc.
setlocal
@@ -76,7 +76,7 @@
:runDetach
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"
-start "OpenDS %DIR_HOME%" /B "%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%" %JAVA_ARGS% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%DIR_HOME%\config\config.ldif" %*
"%JAVA_BIN%" -Xms8M -Xmx8M org.opends.server.tools.WaitForFileDelete --targetFile "%DIR_HOME%\logs\server.starting" --logFile "%DIR_HOME%\logs\server.out"
goto end
diff --git a/opends/resource/bin/statuspanel.bat b/opends/resource/bin/statuspanel.bat
index 8a0e01d..61134c9 100644
--- a/opends/resource/bin/statuspanel.bat
+++ b/opends/resource/bin/statuspanel.bat
@@ -23,10 +23,41 @@
rem CDDL HEADER END
rem
rem
-rem Portions Copyright 2007 Sun Microsystems, Inc.
+rem Portions Copyright 2006-2007 Sun Microsystems, Inc.
setlocal
-set OPENDS_INVOKE_CLASS="org.opends.statuspanel.StatusPanelLauncher"
-set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=statuspanel"
-call "%~dP0\_server-script.bat" %*
+set DIR_HOME=%~dP0..
+set INSTANCE_ROOT=%DIR_HOME%
+
+:checkJavaBin
+if "%JAVA_BIN%" == "" goto noJavaBin
+goto setClassPath
+
+: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
+
+:noJavaHome
+if not exist "%DIR_HOME%\bin\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\bin\set-java-home.bat"
+set JAVA_BIN=%JAVA_HOME%\bin\java.exe
+goto setClassPath
+
+: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%\bin\setcp.bat" %%x
+
+set PATH=%SystemRoot%
+
+"%DIR_HOME%\lib\winlauncher.exe" launch "%DIR_HOME%" "%JAVA_BIN%" %JAVA_ARGS% org.opends.statuspanel.StatusPanelLauncher %*
+goto end
+
+
+:end
diff --git a/opends/resource/bin/stop-ds.bat b/opends/resource/bin/stop-ds.bat
index 30b327c..d367548 100644
--- a/opends/resource/bin/stop-ds.bat
+++ b/opends/resource/bin/stop-ds.bat
@@ -23,10 +23,22 @@
rem CDDL HEADER END
rem
rem
-rem Portions Copyright 2006 Sun Microsystems, Inc.
+rem Portions Copyright 2006-2007 Sun Microsystems, Inc.
setlocal
set OPENDS_INVOKE_CLASS="org.opends.server.tools.StopDS"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=stop-ds"
+set DIR_HOME=%~dP0..
+
+set ARGUMENTS=1
+if "%*" == "" set ARGUMENTS=0
+if "%ARGUMENTS%" == "1" goto stopWithLDAP
+if not exist "%DIR_HOME%\logs\server.pid" goto stopWithLDAP
+"%DIR_HOME%\lib\winlauncher.exe" stop "%DIR_HOME%"
+goto end
+
+:stopWithLDAP
call "%~dP0\_client-script.bat" %*
+
+:end
\ No newline at end of file
diff --git a/opends/resource/setup.bat b/opends/resource/setup.bat
index 825263e..b751920 100644
--- a/opends/resource/setup.bat
+++ b/opends/resource/setup.bat
@@ -23,11 +23,11 @@
rem CDDL HEADER END
rem
rem
-rem Portions Copyright 2006 Sun Microsystems, Inc.
+rem Portions Copyright 2006-2007 Sun Microsystems, Inc.
setlocal
-set DIR_HOME=%~dP0
+set DIR_HOME=%~dP0.
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin
@@ -57,8 +57,16 @@
set PATH=%SystemRoot%
-"%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.installer.InstallLauncher -P setup.bat %*
+if "%*" == "" goto callLaunch
+goto callJava
+:callLaunch
+"%DIR_HOME%\lib\winlauncher.exe" launch "%DIR_HOME%" "%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.installer.InstallLauncher -P setup.bat
+goto end
+
+:callJava
+"%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.installer.InstallLauncher -P setup.bat %*
+goto end
:end
diff --git a/opends/resource/uninstall.bat b/opends/resource/uninstall.bat
index 5a11a3e..4613361 100644
--- a/opends/resource/uninstall.bat
+++ b/opends/resource/uninstall.bat
@@ -23,11 +23,11 @@
rem CDDL HEADER END
rem
rem
-rem Portions Copyright 2006 Sun Microsystems, Inc.
+rem Portions Copyright 2006-2007 Sun Microsystems, Inc.
setlocal
-set DIR_HOME=%~dP0
+set DIR_HOME=%~dP0.
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin
@@ -57,7 +57,15 @@
set PATH=%SystemRoot%
-"%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.uninstaller.UninstallLauncher %*
+if "%*" == "" goto callLaunch
+goto callJava
+:callLaunch
+"%DIR_HOME%\lib\winlauncher.exe" launch "%DIR_HOME%" "%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.uninstaller.UninstallLauncher
+goto end
+
+:callJava
+"%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.uninstaller.UninstallLauncher %*
+goto end
:end
--
Gitblit v1.10.0