From 77b8ca758ddcbd0ba34221eaf73d279db284b485 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 22 Feb 2007 20:43:42 +0000
Subject: [PATCH] If the user provides no arguments or only the -R argument, we will assume that we want to stop the local server an we use the pid to kill it.  If other arguments are passed (which appart from --help are arguments related to LDAP authentication) I will assume that we are trying to stop the server using protocol.

---
 opendj-sdk/opends/resource/bin/stop-ds.bat |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/opendj-sdk/opends/resource/bin/stop-ds.bat b/opendj-sdk/opends/resource/bin/stop-ds.bat
index d367548..3543f22 100644
--- a/opendj-sdk/opends/resource/bin/stop-ds.bat
+++ b/opendj-sdk/opends/resource/bin/stop-ds.bat
@@ -31,14 +31,48 @@
 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
+set RESTART=0
+set NO_ARG_OR_ONLY_RESTART=0
+
+if "%*" == "" set NO_ARG_OR_ONLY_RESTART=1
+if "%NO_ARG_OR_ONLY_RESTART%" == "1" goto execute
+
+for %%x in (%*) DO if "%%x" == "-R" set RESTART=1
+for %%x in (%*) DO if "%%x" == "--restart" set RESTART=1
+
+goto testParameter1
+
+:testParameter1
+if not "%1" == "-R" goto testParameter1b
+goto testParameter2
+
+:testParameter1b
+if not "%1" == "--restart" goto execute
+goto testParameter2
+
+:testParameter2
+if not "%2" == "-R" goto testParameter2b
+goto testParameter3
+
+:testParameter2b
+if not "%2" == "--restart" goto execute
+goto testParameter3
+
+:testParameter3
+if not "%3" == "" goto execute
+set NO_ARG_OR_ONLY_RESTART=1
+goto execute
+
+:execute
+if "%NO_ARG_OR_ONLY_RESTART%" == "0" goto stopWithLDAP
 if not exist "%DIR_HOME%\logs\server.pid" goto stopWithLDAP
-"%DIR_HOME%\lib\winlauncher.exe" stop "%DIR_HOME%" 
+"%DIR_HOME%\lib\winlauncher.exe" stop "%DIR_HOME%"
+if not %errorlevel% == 0 goto end
+if "%RESTART%" == "1" "%DIR_HOME%\bin\start-ds.bat"
 goto end
 
 :stopWithLDAP
 call "%~dP0\_client-script.bat" %*
 
-:end
\ No newline at end of file
+:end
+

--
Gitblit v1.10.0