[jboss-cvs] JBossAS SVN: r101679 - trunk/server/src/bin.

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

Author: mladen.turk at jboss.com
Date: 2010-03-01 12:44:25 -0500 (Mon, 01 Mar 2010)
New Revision: 101679

Modified:
   trunk/server/src/bin/README-service.txt
   trunk/server/src/bin/service.bat
Log:
Fix JBNATIVE-59 by using run.conf.bat if present

Modified: trunk/server/src/bin/README-service.txt
===================================================================
--- trunk/server/src/bin/README-service.txt	2010-03-01 17:24:14 UTC (rev 101678)
+++ trunk/server/src/bin/README-service.txt	2010-03-01 17:44:25 UTC (rev 101679)
@@ -28,7 +28,7 @@
 To install the JBoss Application Server as Windows service use
 the provided service.bat batch file.
 
-C:\> cd c:\jboss-5.0.0\bin
+C:\> cd c:\jboss-6.0.0\bin
 C:\> service.bat install
 
 To start the JBoss Application Server as Windows service use Control pannel
@@ -37,9 +37,9 @@
 during service startup.
 
 
-C:\> net start JBAS50SVC
-  The JBoss Application Server 5.0 service is starting.
-  The JBoss Application Server 5.0 service was started successfully.
+C:\> net start JBAS60SVC
+  The JBoss Application Server 6.0 service is starting.
+  The JBoss Application Server 6.0 service was started successfully.
 
 
 To stop the JBoss Application Server as Windows service use Control pannel
@@ -48,8 +48,8 @@
 any errors during service shutdown.
 
 
-C:\> net stop JBAS50SVC
-  The JBoss Application Server 5.0 service was stopped successfully.
+C:\> net stop JBAS60SVC
+  The JBoss Application Server 6.0 service was stopped successfully.
 
 
 To restart the JBoss Application Server as Windows service use Control pannel.
@@ -58,7 +58,7 @@
 service.bat batch file.
 
 
-C:\> cd c:\jboss-5.0.0\bin
+C:\> cd c:\jboss-6.0.0\bin
 C:\> service.bat uninstall
 
 

Modified: trunk/server/src/bin/service.bat
===================================================================
--- trunk/server/src/bin/service.bat	2010-03-01 17:24:14 UTC (rev 101678)
+++ trunk/server/src/bin/service.bat	2010-03-01 17:44:25 UTC (rev 101679)
@@ -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
-set SVCDISP=JBoss Application Server 5.0
-set SVCDESC=JBoss Application Server 5.0.0 GA/Platform: Windows x86
+if "x%SVCNAME" == "x" (
+    set "SVCNAME=JBAS60SVC"
+)
+set SVCDISP=JBoss Application Server 6.0
+set SVCDESC=JBoss Application Server 6.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
 
@@ -118,3 +132,4 @@
 goto cmdEnd
 
 :cmdEnd
+