From 0f52e211a0fca612075ed81496c08331dee4692a Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Mon, 25 Sep 2006 15:00:28 +0000
Subject: [PATCH] Support dbl click startup of server.bat

---
 .../serverruntime/scripts/windows/daemon.bat  | 22 +++++++++++++++-
 .../serverruntime/scripts/windows/server.bat  | 26 ++++++++++++++++---
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
index b5ed66b250f..19ca0dec1b8 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
@@ -1,4 +1,18 @@
 @ECHO OFF
+REM
+REM Start an RSE Windows Daemon
+REM Usage: daemon.bat [<port> | <low port>-<high port>] [ <low server port>-<high server port>]
+REM
+SET DaemonPort=4035
+SET ServerPortRange=
+IF NOT "%1"=="" SET DaemonPort=%1
+IF NOT "%2"=="" SET ServerPortRange=%2
+
+if "%1" == "?" goto usage
+if "%1" == "/h" goto usage
+if "%1" == "help" goto usage
+if "%1" == "/help" goto usage
+
 IF NOT "%A_PLUGIN_PATH%"=="" GOTO DoneSetup
 IF EXIST setup.bat GOTO HaveSetup
 ECHO.
@@ -8,5 +22,11 @@ GOTO Done
 :HaveSetup
 CALL setup.bat
 :DoneSetup
-java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.ServerLauncher
+java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.ServerLauncher %DaemonPort% %ServerPortRange%
+GOTO Done
+
+:usage
+@echo Usage: daemon.bat [^<port^> ^| ^<low port^>-^<high port^>] [ ^<low server port^>-^<high server port^>]
+pause
+
 :Done
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat
index d27b96e8da0..e4b2b3fb07e 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/server.bat
@@ -1,4 +1,8 @@
-echo off
+@echo off
+REM
+REM Start an RSE Windows Server
+REM Usage: server.bat [<port>] [<timeout>] [<clientUserID>]
+REM
 
 setlocal
 
@@ -6,12 +10,25 @@ set PORT=%1
 set TIMEOUT=%2
 set TICKET=%3
 
+if "%1" == "?" goto usage
+if "%1" == "/h" goto usage
+if "%1" == "help" goto usage
+if "%1" == "/help" goto usage
 if xxx%1 == xxx set PORT=4033
 if xxx%2 == xxx set TIMEOUT=120000
+
+IF NOT "%A_PLUGIN_PATH%"=="" GOTO doneSetup
+IF EXIST setup.bat GOTO HaveSetup
+ECHO.
+ECHO Please run setup.bat before running server.bat
+PAUSE
+GOTO done
+:HaveSetup
+CALL setup.bat
+
+:doneSetup
 if xxx%3 == xxx goto runNoTicket
-
 @echo on
-
 java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT% %TICKET%
 goto done
 
@@ -21,7 +38,8 @@ java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.
 goto done
 
 :usage
-@echo Usage: run.win ^<port^> ^<timeout^>  
+@echo Usage: server.bat ^<port^> ^<timeout^>  
+pause
 
 :done
 endlocal
\ No newline at end of file