[jboss-cvs] JBossAS SVN: r88233 - branches/Branch_5_x/main/src/bin.

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

Author: ispringer
Date: 2009-05-05 18:17:16 -0400 (Tue, 05 May 2009)
New Revision: 88233

Added:
   branches/Branch_5_x/main/src/bin/run-conf.bat
Modified:
   branches/Branch_5_x/main/src/bin/run.bat
Log:
add support for a run.conf equivalent file to run.bat, so environment variable settings can be externalized as they can be for run.sh (https://jira.jboss.org/jira/browse/JBAS-6754)


Added: branches/Branch_5_x/main/src/bin/run-conf.bat
===================================================================
--- branches/Branch_5_x/main/src/bin/run-conf.bat	                        (rev 0)
+++ branches/Branch_5_x/main/src/bin/run-conf.bat	2009-05-05 22:17:16 UTC (rev 88233)
@@ -0,0 +1,50 @@
+rem ### -*- batch file -*- ######################################################
+rem #                                                                          ##
+rem #  JBoss Bootstrap Script Configuration                                    ##
+rem #                                                                          ##
+rem #############################################################################
+
+rem # $Id$
+
+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 #
+
+rem #
+rem # Specify the profiler configuration file to load.
+rem #
+rem # Default is to not load 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 are always passed by run.bat.
+rem #
+if not "%JAVA_OPTS%" == "" goto javaOptsSet
+rem # JVM memory allocation pool parameters. Modify as appropriate.
+set "JAVA_OPTS=-Xms128M -Xmx512M -XX:MaxPermSize=257M"
+rem # Reduce the RMI GCs to once per hour for Sun JVMs.
+set "JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
+rem # Warn when resolving remote XML dtd/schemas.
+set "JAVA_OPTS=%JAVA_OPTS% -Dorg.jboss.resolver.warning=true"
+rem # Sample JPDA settings for remote socket debuging
+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"
+:javaOptsSet


Property changes on: branches/Branch_5_x/main/src/bin/run-conf.bat
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Date Author Id Revision HeadURL
Name: svn:eol-style
   + CRLF

Modified: branches/Branch_5_x/main/src/bin/run.bat
===================================================================
--- branches/Branch_5_x/main/src/bin/run.bat	2009-05-05 22:15:16 UTC (rev 88232)
+++ branches/Branch_5_x/main/src/bin/run.bat	2009-05-05 22:17:16 UTC (rev 88233)
@@ -14,6 +14,11 @@
   set DIRNAME=.\
 )
 
+if exist "%DIRNAME%\run-conf.bat" (
+   echo Calling run-conf.bat to initialize environment...   
+   call "%DIRNAME%\run-conf.bat" %*   
+)
+
 pushd %DIRNAME%..
 if "x%JBOSS_HOME%" == "x" (
   set "JBOSS_HOME=%CD%"
@@ -31,7 +36,7 @@
 if "x%JAVA_OPTS%" == "x" (
   set "JAVA_OPTS=-Dprogram.name=%PROGNAME%"
 ) else (
-  set "JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%"
+  set "JAVA_OPTS=-Dprogram.name=%PROGNAME% %JAVA_OPTS%"
 )
 
 if "x%JAVA_HOME%" == "x" (
@@ -107,21 +112,10 @@
 set JBOSS_CLASSPATH=%RUN_CLASSPATH%
 
 rem Setup JBoss specific properties
-rem JVM memory allocation pool parameters. Modify as appropriate.
-set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m -XX:MaxPermSize=256m
 
-rem Warn when resolving remote XML dtd/schemas
-set JAVA_OPTS=%JAVA_OPTS% -Dorg.jboss.resolver.warning=true
-
 rem This should be removed when JBoss configuration XML files can be validated JBAS-6744
 set JAVA_OPTS=%JAVA_OPTS% -Dxb.builder.useUnorderedSequence=true
 
-rem With Sun JVMs reduce the RMI GCs to once per hour
-set JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
-
-rem JPDA options. Uncomment and modify as appropriate to enable remote debugging.
-rem set JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y
-
 rem Setup the java endorsed dirs
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed