[jboss-cvs] JBossAS SVN: r108553 - branches/JBPAPP_4_2_0_GA_CP/system/src/bin.

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

Author: permaine
Date: 2010-10-13 12:04:29 -0400 (Wed, 13 Oct 2010)
New Revision: 108553

Added:
   branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.conf.bat
Modified:
   branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat
Log:
JBPAPP-2847 run.bat doesn't set correct values for JAVA_OPTS

Modified: branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat	2010-10-13 15:55:57 UTC (rev 108552)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat	2010-10-13 16:04:29 UTC (rev 108553)
@@ -13,6 +13,20 @@
 set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
+rem Read an optional configuration file.
+if "x%RUN_CONF%" == "x" (   
+   set "RUN_CONF=%DIRNAME%run.conf.bat"
+) else (
+   set "RUN_CONF=%DIRNAME%\..\server\%JBOSSCONF%\run.conf"
+)
+
+if exist "%RUN_CONF%" (
+   echo Calling %RUN_CONF%
+   call "%RUN_CONF%" %*
+) else (
+   echo Config file not found %RUN_CONF%
+)
+
 pushd %DIRNAME%..
 set JBOSS_HOME=%CD%
 popd
@@ -70,7 +84,7 @@
 if not errorlevel == 1 (set JAVA_OPTS=%JAVA_OPTS% -server)
 
 rem JVM memory allocation pool parameters. Modify as appropriate.
-set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m
+rem set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m
 
 rem Force use of IPv4 stack
 set JAVA_OPTS=%JAVA_OPTS% -Djava.net.preferIPv4Stack=true

Added: branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.conf.bat
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.conf.bat	                        (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.conf.bat	2010-10-13 16:04:29 UTC (rev 108553)
@@ -0,0 +1,51 @@
+rem ### -*- batch file -*- ######################################################
+rem #                                                                          ##
+rem #  JBoss Bootstrap Script Configuration                                    ##
+rem #                                                                          ##
+rem #############################################################################
+
+rem # $Id: run.conf.bat 102595 2010-03-18 22:14:39Z rrajesh $
+
+rem #
+rem # This batch file is executed by run.bat to initialize the environment 
+rem # variables that run.bat uses. It is recommended to use this file to
+rem # configure these variables, rather than modifying run.bat itself. 
+rem #
+
+if not "x%JAVA_OPTS%" == "x" goto JAVA_OPTS_SET
+
+rem #
+rem # Specify the JBoss Profiler configuration file to load.
+rem #
+rem # Default is to not load a JBoss Profiler configuration file.
+rem #
+rem set "PROFILER=%JBOSS_HOME%\bin\jboss-profiler.properties"
+
+rem #
+rem # Specify the location of the Java home directory (it is recommended that
+rem # this always be set). If set, then "%JAVA_HOME%\bin\java" will be used as
+rem # the Java VM executable; otherwise, "%JAVA%" will be used (see below).
+rem #
+rem set "JAVA_HOME=C:\opt\jdk1.6.0_13"
+
+rem #
+rem # Specify the exact Java VM executable to use - only used if JAVA_HOME is
+rem # not set. Default is "java".
+rem #
+rem set "JAVA=C:\opt\jdk1.6.0_13\bin\java"
+
+rem #
+rem # Specify options to pass to the Java VM. Note, there are some additional
+rem # options that are always passed by run.bat.
+rem #
+
+rem # JVM memory allocation pool parameters - modify as appropriate.
+set "JAVA_OPTS=-Xms1503m -Xmx1503m -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true"
+
+rem # Sample JPDA settings for remote socket debugging
+rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
+
+rem # Sample JPDA settings for shared memory debugging 
+rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
+
+:JAVA_OPTS_SET