[Jboss-svn-commits] JBL Code SVN: r4431 - in labs/jbossweb/trunk: . src/share/resources/bin

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-26 08:15:04 -0400 (Fri, 26 May 2006)
New Revision: 4431

Modified:
   labs/jbossweb/trunk/build.xml
   labs/jbossweb/trunk/src/share/resources/bin/run.bat
   labs/jbossweb/trunk/src/share/resources/bin/run.sh
   labs/jbossweb/trunk/src/share/resources/bin/service.bat
Log:
Add @VERSION@ filters to ant build for startup resources.

Modified: labs/jbossweb/trunk/build.xml
===================================================================
--- labs/jbossweb/trunk/build.xml	2006-05-26 00:40:26 UTC (rev 4430)
+++ labs/jbossweb/trunk/build.xml	2006-05-26 12:15:04 UTC (rev 4431)
@@ -219,6 +219,8 @@
 
   	<!-- Copy static resource files -->
     <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_MAJOR" value="${version.major}"/>
+    <filter token="VERSION_MINOR" value="${version.minor}"/>
     <filter token="VERSION_NUMBER" value="${version.number}"/>
     <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
     <copy todir="${jbossweb.build}/classes" filtering="yes">

Modified: labs/jbossweb/trunk/src/share/resources/bin/run.bat
===================================================================
--- labs/jbossweb/trunk/src/share/resources/bin/run.bat	2006-05-26 00:40:26 UTC (rev 4430)
+++ labs/jbossweb/trunk/src/share/resources/bin/run.bat	2006-05-26 12:15:04 UTC (rev 4431)
@@ -85,7 +85,7 @@
 
 echo ===============================================================================
 echo .
-echo   JBoss Bootstrap Environment
+echo   JBoss Web Server @VERSION@ Bootstrap Environment
 echo .
 echo   JBOSS_HOME: %JBOSS_HOME%
 echo .

Modified: labs/jbossweb/trunk/src/share/resources/bin/run.sh
===================================================================
--- labs/jbossweb/trunk/src/share/resources/bin/run.sh	2006-05-26 00:40:26 UTC (rev 4430)
+++ labs/jbossweb/trunk/src/share/resources/bin/run.sh	2006-05-26 12:15:04 UTC (rev 4431)
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### ====================================================================== ###
 ##                                                                          ##
-##  JBoss Bootstrap Script                                                  ##
+##  JBoss Web Server Bootstrap Script                                       ##
 ##                                                                          ##
 ### ====================================================================== ###
 
@@ -165,7 +165,7 @@
 # Display our environment
 echo "========================================================================="
 echo ""
-echo "  JBoss Bootstrap Environment"
+echo "  JBoss Web Server Bootstrap Environment"
 echo ""
 echo "  JBOSS_HOME: $JBOSS_HOME"
 echo ""

Modified: labs/jbossweb/trunk/src/share/resources/bin/service.bat
===================================================================
--- labs/jbossweb/trunk/src/share/resources/bin/service.bat	2006-05-26 00:40:26 UTC (rev 4430)
+++ labs/jbossweb/trunk/src/share/resources/bin/service.bat	2006-05-26 12:15:04 UTC (rev 4431)
@@ -5,8 +5,10 @@
 REM See terms of license at gnu.org.
 REM
 
-@if not "%ECHO%" == ""  echo %ECHO%
-@if "%OS%" == "Windows_NT"  setlocal
+@if not "%ECHO%" == "" echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal
+set DIRNAME=%CD%
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
 
 set NOPAUSE=Y
 set JAVA_OPTS=-Xrs
@@ -22,7 +24,7 @@
 goto cmdEnd
 
 :cmdInstall
-jbosssvc.exe -iwdc JBossWebServer "%CD%" "JBoss Web Server 4" "JBoss Web Server Version 1.0.0/CR1" service.bat
+jbosssvc.exe -iwdc JBossWebServer "%DIRNAME%" "JBoss Web Server @VERSION_MAJOR@.@VERSION_MINOR@" "JBoss Web Server @VERSION@/Built @VERSION_BUILT@" service.bat
 goto cmdEnd
 
 :cmdUninstall