[jboss-cvs] JBossAS SVN: r109158 - in branches/JBPAPP_4_2_0_GA_CP: system/src/bin and 1 other directory.

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

Author: rsvoboda at redhat.com
Date: 2010-11-05 09:44:18 -0400 (Fri, 05 Nov 2010)
New Revision: 109158

Modified:
   branches/JBPAPP_4_2_0_GA_CP/build/build.xml
   branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat
   branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.conf.bat
Log:
JBPAPP-2847 correct JAVA_OPTS walues, support for custom conf per profile


Modified: branches/JBPAPP_4_2_0_GA_CP/build/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2010-11-05 12:56:59 UTC (rev 109157)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2010-11-05 13:44:18 UTC (rev 109158)
@@ -707,6 +707,12 @@
       token="Xms128m" value="Xms1503m"/>
     <replace file="${install.production}/run.conf" 
       token="Xmx512m" value="Xmx1503m"/>
+    <copy tofile="${install.production}/run.conf.bat"
+          file="${install.bin}/run.conf.bat" overwrite="true"/>
+    <replace file="${install.production}/run.conf.bat" 
+          token="Xms128m" value="Xms1503m"/>
+    <replace file="${install.production}/run.conf.bat" 
+          token="Xmx512m" value="Xmx1503m"/>
     <antcall target="makeCCChanges"/>
   </target>
 
@@ -1270,6 +1276,7 @@
   <target name="fixEOL" depends="check.windows" if="is.windows">
     <echo message="Fixing EOL characters for multi-line text replacement on Windows"/>
     <fixcrlf srcdir="../system/src/bin" includes="run.conf" eol="crlf"/>
+    <fixcrlf srcdir="../system/src/bin" includes="run.conf.bat" eol="crlf"/>
     <fixcrlf srcdir="../system/src/bin" includes="run.sh" eol="crlf"/>
     <fixcrlf srcdir="../server/src/resources/uuid-key-generator/META-INF" includes="jboss-service.xml" eol="crlf"/>
     <fixcrlf srcdir="../messaging/src/etc/server/default/deploy" includes="jbossmq-destinations-service.xml" eol="crlf"/>

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-11-05 12:56:59 UTC (rev 109157)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat	2010-11-05 13:44:18 UTC (rev 109158)
@@ -13,11 +13,25 @@
 set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
+
+rem Findout about actual configuration
+set JBOSSCONF=production
+:Loop
+IF "%~1"=="" GOTO Continue
+  if "%~1" == "-c" set JBOSSCONF=%~2
+  if "%~1" == "-configuration" set JBOSSCONF=%~2
+SHIFT
+GOTO Loop
+    
+:Continue
+
 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 "x%RUN_CONF%" == "x" (
+   if exist %DIRNAME%\..\server\%JBOSSCONF%\run.conf.bat (   
+      set "RUN_CONF=%DIRNAME%\..\server\%JBOSSCONF%\run.conf.bat"
+   ) else (
+      set "RUN_CONF=%DIRNAME%run.conf.bat" 
+   )
 )
 
 if exist "%RUN_CONF%" (
@@ -45,6 +59,8 @@
 
 :FOUND_RUN_JAR
 
+
+
 if not "%JAVA_HOME%" == "" goto ADD_TOOLS
 
 set JAVA=java
@@ -55,6 +71,9 @@
 
 :ADD_TOOLS
 
+rem verify if JAVA_HOME exists 
+if not exist %JAVA_HOME% echo JAVA_HOME points to non-existing directory (%JAVA_HOME%)  
+
 set JAVA=%JAVA_HOME%\bin\java
 
 rem A full JDK with toos.jar is not required anymore since jboss web packages

Modified: 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	2010-11-05 12:56:59 UTC (rev 109157)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.conf.bat	2010-11-05 13:44:18 UTC (rev 109158)
@@ -40,7 +40,7 @@
 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"
+set "JAVA_OPTS=-Xms128m -Xmx512m -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"