geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r826785 - in /geronimo/server/trunk/framework: ./ configs/geronimo-boilerplate/ configs/geronimo-boilerplate/src/main/underlay/contents/bin/ configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/ modules/geronimo-upgrade/src/test...
Date Mon, 19 Oct 2009 19:40:31 GMT
Author: kevan
Date: Mon Oct 19 19:40:30 2009
New Revision: 826785

URL: http://svn.apache.org/viewvc?rev=826785&view=rev
Log:
GERONIMO-4885 Merge from branches/2.2 to trunk. Update default max heap and max permgen settings.
Make gsh and geronimo scripts default to the same settings. Thanks to Quintin Beukes for orignal
patch

Modified:
    geronimo/server/trunk/framework/   (props changed)
    geronimo/server/trunk/framework/configs/geronimo-boilerplate/   (props changed)
    geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
    geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh
    geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/start-server,default.groovy
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/   (props
changed)

Propchange: geronimo/server/trunk/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 19 19:40:30 2009
@@ -1 +1,2 @@
+/geronimo/server/branches/2.2/framework:826768
 /geronimo/server/trunk/framework:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/geronimo-boilerplate/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 19 19:40:30 2009
@@ -1,2 +1,2 @@
-/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate:814265
+/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate:814265,826768
 /geronimo/server/trunk/framework/configs/geronimo-boilerplate:749113,749116-807432,809079-825588

Modified: geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat?rev=826785&r1=826784&r2=826785&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
Mon Oct 19 19:40:30 2009
@@ -177,6 +177,11 @@
 call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
 if not %errorlevel% == 0 goto end
 
+@REM Using default JAVA_OPTS if it's not set
+if not "%JAVA_OPTS%" == "" goto skipDefaultJavaOpts
+set JAVA_OPTS=-Xmx256m -XX:MaxPermSize=128m
+:skipDefaultJavaOpts
+
 if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
 @REM A relative value will be resolved relative to each instance 
 set GERONIMO_TMPDIR=var\temp

Modified: geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh?rev=826785&r1=826784&r2=826785&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh
Mon Oct 19 19:40:30 2009
@@ -201,6 +201,11 @@
   fi
 fi
 
+# Use a default JAVA_OPTS if it's not set
+if [ -z "$JAVA_OPTS" ]; then
+  JAVA_OPTS="-Xmx256m -XX:MaxPermSize=128m"
+fi
+
 if [ -z "$GERONIMO_TMPDIR" ] ; then
   # Define the java.io.tmpdir to use for Geronimo
   # A relative value will be resolved relative to each instance

Modified: geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/start-server,default.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/start-server%2Cdefault.groovy?rev=826785&r1=826784&r2=826785&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/start-server,default.groovy
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-boilerplate/src/main/underlay/contents/etc/rc.d/start-server,default.groovy
Mon Oct 19 19:40:30 2009
@@ -22,15 +22,20 @@
 //
 
 // Append some reasonable java flags if none were configured already
-if (command.profiles.contains('java6')) {
-    command.javaFlags << '-XX:MaxPermSize=512m'
-    command.javaFlags << '-Xmx2048m'
-} else if (command.javaFlags.empty) {
-    command.javaFlags << '-Xmx512m'
+if (command.javaFlags.empty) {
+    command.javaFlags << '-Xmx256m'
+    command.javaFlags << '-XX:MaxPermSize=128m'
 }
 
+// If java version specific configuration were needed, it could take the following
+// form
+// 
+// if (command.profiles.contains('java6')) {
+//    command.javaFlags << '-Xmx2048m'
+// }
+
 // If the debug profile was selected, then append some debugging flags
 if (command.profiles.contains('debug')) {
     command.javaFlags << '-Xdebug'
     command.javaFlags << '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000'
-}
\ No newline at end of file
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 19 19:40:30 2009
@@ -1 +1,2 @@
+/geronimo/server/branches/2.2/framework/modules/geronimo-upgrade/src/test/resources:826768
 /geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588



Mime
View raw message