[jboss-cvs] JBossAS SVN: r72205 - in trunk: main/src/bin and 1 other directories.

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

Author: dimitris at jboss.org
Date: 2008-04-15 05:44:29 -0400 (Tue, 15 Apr 2008)
New Revision: 72205

Modified:
   trunk/console/src/bin/twiddle.bat
   trunk/main/src/bin/run.bat
   trunk/server/src/bin/shutdown.bat
Log:
JBAS-5444, remove twiddle.bat/shutdown.bat %ARGS% processing in favour of %*

Modified: trunk/console/src/bin/twiddle.bat
===================================================================
--- trunk/console/src/bin/twiddle.bat	2008-04-15 09:34:39 UTC (rev 72204)
+++ trunk/console/src/bin/twiddle.bat	2008-04-15 09:44:29 UTC (rev 72205)
@@ -16,16 +16,6 @@
 set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
-rem Read all command line arguments
-
-set ARGS=
-:loop
-if [%1] == [] goto end
-        set ARGS=%ARGS% %1
-        shift
-        goto loop
-:end
-
 rem Find MAIN_JAR, or we can't continue
 
 set MAIN_JAR=%DIRNAME%\%MAIN_JAR_NAME%
@@ -69,6 +59,6 @@
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 set JAVA_OPTS=%JAVA_OPTS% -Djboss.boot.loader.name=%PROGNAME%
 
-"%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" -classpath "%JBOSS_CLASSPATH%" %MAIN_CLASS% %ARGS%
+"%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" -classpath "%JBOSS_CLASSPATH%" %MAIN_CLASS% %*
 
 :END

Modified: trunk/main/src/bin/run.bat
===================================================================
--- trunk/main/src/bin/run.bat	2008-04-15 09:34:39 UTC (rev 72204)
+++ trunk/main/src/bin/run.bat	2008-04-15 09:44:29 UTC (rev 72205)
@@ -81,20 +81,6 @@
   set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
 )
 
-rem Read all command line arguments
-
-REM
-REM The %ARGS% env variable commented out in favor of using %* to include
-REM all args in java command line. See bug #840239. [jpl]
-REM
-REM set ARGS=
-REM :loop
-REM if [%1] == [] goto endloop
-REM         set ARGS=%ARGS% %1
-REM         shift
-REM         goto loop
-REM :endloop
-
 rem Find run.jar, or we can't continue
 
 if exist "%JBOSS_HOME%\bin\run.jar" (

Modified: trunk/server/src/bin/shutdown.bat
===================================================================
--- trunk/server/src/bin/shutdown.bat	2008-04-15 09:34:39 UTC (rev 72204)
+++ trunk/server/src/bin/shutdown.bat	2008-04-15 09:44:29 UTC (rev 72205)
@@ -16,16 +16,6 @@
 set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
-rem Read all command line arguments
-
-set ARGS=
-:loop
-if [%1] == [] goto end
-        set ARGS=%ARGS% %1
-        shift
-        goto loop
-:end
-
 rem Find MAIN_JAR, or we can't continue
 
 set MAIN_JAR=%DIRNAME%\%MAIN_JAR_NAME%
@@ -58,7 +48,7 @@
 rem JPDA options. Uncomment and modify as appropriate to enable remote debugging.
 rem set JAVA_OPTS=-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%
 
-"%JAVA%" %JAVA_OPTS% -classpath "%JBOSS_CLASSPATH%" %MAIN_CLASS% %ARGS%
+"%JAVA%" %JAVA_OPTS% -classpath "%JBOSS_CLASSPATH%" %MAIN_CLASS% %*
 
 :END
 if "%NOPAUSE%" == "" pause