You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/03/19 16:30:10 UTC
svn commit: r638874 - in /geronimo/server/trunk:
assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/
framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/
Author: jbohn
Date: Wed Mar 19 08:30:09 2008
New Revision: 638874
URL: http://svn.apache.org/viewvc?rev=638874&view=rev
Log:
GERONIMO-3902 start-server, default.groovy in etc/rc.d overrides -Xmx value when starting server using gshell - Fix by Jason Warner
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server,default.groovy
geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy
geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server,default.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server%2Cdefault.groovy?rev=638874&r1=638873&r2=638874&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server,default.groovy (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server,default.groovy Wed Mar 19 08:30:09 2008
@@ -20,9 +20,9 @@
//
// $Rev$ $Date$
//
-
-command.javaFlags << '-Xmx512m'
-
+if (command.javaFlags.isEmpty() ) {
+ command.javaFlags << '-Xmx512m'
+}
// Uncomment the following lines to enable remote debugging.
// command.javaFlags << '-Xdebug'
// command.javaFlags << '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000'
Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy?rev=638874&r1=638873&r2=638874&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy (original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy Wed Mar 19 08:30:09 2008
@@ -67,11 +67,6 @@
log.debug("Geronimo home: $geronimoHome")
- // Setup default java flags
- if (javaAgentJar) {
- javaFlags << "-javaagent:${javaAgentJar.canonicalPath}"
- }
-
// Setup the default properties required to boot the server
properties['org.apache.geronimo.base.dir'] = geronimoHome
properties['java.io.tmpdir'] = 'var/temp' // Use relative path
@@ -79,6 +74,10 @@
properties['java.ext.dirs'] = prefixSystemPath('java.ext.dirs', new File(geronimoHome, 'lib/ext'))
processScripts()
+ // Setup default java flags
+ if (javaAgentJar) {
+ javaFlags << "-javaagent:${javaAgentJar.canonicalPath}"
+ }
// If we are not backgrounding, then add a nice message for the user when ctrl-c gets hit
if (!background) {
Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=638874&r1=638873&r2=638874&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy (original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy Wed Mar 19 08:30:09 2008
@@ -79,11 +79,6 @@
log.debug("Geronimo home: $geronimoHome")
- // Setup default java flags
- if (javaAgentJar) {
- javaFlags << "-javaagent:${javaAgentJar.canonicalPath}"
- }
-
// Setup the default properties required to boot the server
properties['org.apache.geronimo.base.dir'] = geronimoHome
properties['java.io.tmpdir'] = 'var/temp' // Use relative path
@@ -92,6 +87,10 @@
processScripts()
+ //Setup default java flags
+ if (javaAgentJar) {
+ javaFlags << "-javaagent:${javaAgentJar.canonicalPath}"
+ }
// If we are not backgrounding, then add a nice message for the user when ctrl-c gets hit
if (!background) {
addShutdownHook({