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

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

Author: ispringer
Date: 2009-05-05 18:37:25 -0400 (Tue, 05 May 2009)
New Revision: 88235

Modified:
   branches/Branch_5_x/main/src/bin/run-conf.bat
   branches/Branch_5_x/main/src/bin/run.bat
Log:
read default for run conf path just as run.sh does

Modified: branches/Branch_5_x/main/src/bin/run-conf.bat
===================================================================
--- branches/Branch_5_x/main/src/bin/run-conf.bat	2009-05-05 22:27:18 UTC (rev 88234)
+++ branches/Branch_5_x/main/src/bin/run-conf.bat	2009-05-05 22:37:25 UTC (rev 88235)
@@ -36,12 +36,12 @@
 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"
+if not "x%JAVA_OPTS%" == "x" goto javaOptsSet
+rem # JVM memory allocation pool parameters - modify as appropriate.
+set "JAVA_OPTS=-Xms128M -Xmx512M -XX:MaxPermSize=256M"
 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.
+rem # Warn when resolving remote XML DTDs or 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"

Modified: branches/Branch_5_x/main/src/bin/run.bat
===================================================================
--- branches/Branch_5_x/main/src/bin/run.bat	2009-05-05 22:27:18 UTC (rev 88234)
+++ branches/Branch_5_x/main/src/bin/run.bat	2009-05-05 22:37:25 UTC (rev 88235)
@@ -14,10 +14,16 @@
   set DIRNAME=.\
 )
 
-if exist "%DIRNAME%\run-conf.bat" (
-   echo Calling run-conf.bat to initialize environment...   
-   call "%DIRNAME%\run-conf.bat" %*   
+rem Read an optional configuration file.
+if "x%RUN_CONF%" == "x" (   
+   set "RUN_CONF=%DIRNAME%\run-conf.bat"
 )
+if exist "%RUN_CONF%" (
+   echo Calling %RUN_CONF% to initialize environment...   
+   call "%RUN_CONF%" %*   
+) else (
+   echo Warning: Configuration file not found at %RUN_CONF%.
+)
 
 pushd %DIRNAME%..
 if "x%JBOSS_HOME%" == "x" (