From f13c3c4a2a63a83fda2b0754fff6d0b7628a75b6 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Mon, 25 Sep 2006 15:41:12 +0000
Subject: [PATCH] Fix DSTORE_USER_PREFS arg

---
 .../serverruntime/scripts/windows/server.bat       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

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 48bfc6aa3b6..f8c29c2b0f6 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,21 +1,17 @@
 @echo off
 REM
 REM Start an RSE Windows Server
-REM Usage: server.bat [/user <id>] [<port>] [<timeout>]
+REM Usage: server.bat [<port>] [<timeout>]
 REM
 
 setlocal
 
-IF NOT "%1" == "/user" GOTO noUserRestriction
-set USER_RESTRICTION=-Dclient.username=%2
-shift
-shift
-:noUserRestriction
 set PORT=%1
 set TIMEOUT=%2
 set TICKET=%3
 if "%1" == "" set PORT=4033
 if "%2" == "" set TIMEOUT=120000
+REM set DSTORE_USER_PREFS=-Dclient.username=remoteuser
 
 if "%1" == "?" goto usage
 if "%1" == "/?" goto usage
@@ -36,18 +32,18 @@ CALL setup.bat
 if "%3" == "" goto runNoTicket
 REM The ticket parameter may be used internally by the daemon for starting a server
 @echo on
-java %USER_RESTRICTION% -DA_PLUGIN_PATH=%A_PLUGIN_PATH% -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT% %TICKET%
+java %DSTORE_USER_PREFS% -DA_PLUGIN_PATH=%A_PLUGIN_PATH% -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT% %TICKET%
 @echo off
 goto done
 
 :runNoTicket
 @echo on
-java %USER_RESTRICTION% -DA_PLUGIN_PATH=%A_PLUGIN_PATH% -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT%
+java %DSTORE_USER_PREFS% -DA_PLUGIN_PATH=%A_PLUGIN_PATH% -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT%
 @echo off
 goto done
 
 :usage
-@echo Usage: server.bat [/user ^<id^>] [^<port^>] [^<timeout^>]
+@echo Usage: server.bat [^<port^>] [^<timeout^>]
 pause
 
 :done