[jboss-cvs] JBossAS SVN: r101681 - branches/Branch_5_0/server/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2010-03-01 12:59:34 -0500 (Mon, 01 Mar 2010)
New Revision: 101681

Modified:
   branches/Branch_5_0/server/src/bin/service.bat
Log:
backport JBNATIVE-59 fix from trunk

Modified: branches/Branch_5_0/server/src/bin/service.bat
===================================================================
--- branches/Branch_5_0/server/src/bin/service.bat	2010-03-01 17:45:15 UTC (rev 101680)
+++ branches/Branch_5_0/server/src/bin/service.bat	2010-03-01 17:59:34 UTC (rev 101681)
@@ -13,17 +13,31 @@
 @if "%OS%" == "Windows_NT" setlocal
 set DIRNAME=%CD%
 
+REM Read an optional configuration file.
+if "x%RUN_CONF%" == "x" (   
+   set "RUN_CONF=%DIRNAME%\run.conf.bat"
+)
+if exist "%RUN_CONF%" (
+   call "%RUN_CONF%" %*
+)
+
 REM
 REM VERSION, VERSION_MAJOR and VERSION_MINOR are populated
 REM during the build with ant filter.
 REM
-set SVCNAME=JBAS50SVC
+if "x%SVCNAME" == "x" (
+    set "SVCNAME=JBAS50SVC"
+)
 set SVCDISP=JBoss Application Server 5.0
-set SVCDESC=JBoss Application Server 5.0.0 GA/Platform: Windows x86
+set SVCDESC=JBoss Application Server 5.0.0 GA/Platform: Windows %PROCESSOR_ARCHITECTURE%
 set NOPAUSE=Y
 
 REM Suppress killing service on logoff event
-set JAVA_OPTS=-Xrs
+if "x%JAVA_OPTS%" == "x" (
+  set "JAVA_OPTS=-Xrs"
+) else (
+  set "JAVA_OPTS=-Xrs %JAVA_OPTS%"
+)
 
 REM Figure out the running mode