Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 74442 invoked from network); 23 Apr 2008 20:54:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Apr 2008 20:54:00 -0000 Received: (qmail 28695 invoked by uid 500); 23 Apr 2008 20:54:02 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 28644 invoked by uid 500); 23 Apr 2008 20:54:02 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 28631 invoked by uid 99); 23 Apr 2008 20:54:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 13:54:01 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 20:53:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED4DC1A9832; Wed, 23 Apr 2008 13:53:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r651059 - /geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server, default.groovy Date: Wed, 23 Apr 2008 20:53:39 -0000 To: scm@geronimo.apache.org From: dwoods@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080423205339.ED4DC1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dwoods Date: Wed Apr 23 13:53:37 2008 New Revision: 651059 URL: http://svn.apache.org/viewvc?rev=651059&view=rev Log: merged in r650100 from trunk - Make a wee bit more groovy, add a comment too Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server,default.groovy Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server,default.groovy URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server%2Cdefault.groovy?rev=651059&r1=651058&r2=651059&view=diff ============================================================================== --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server,default.groovy (original) +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/rc.d/start-server,default.groovy Wed Apr 23 13:53:37 2008 @@ -20,12 +20,15 @@ // // $Rev$ $Date$ // -if (command.javaFlags.isEmpty() ) { - command.javaFlags << '-Xmx512m' + +// Append some reasonable java flags if none were configured already +if (command.javaFlags.empty) { + 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' // Uncomment this property so that Tribes work on Mac OS X -// command.properties['java.net.preferIPv4Stack'] = true \ No newline at end of file +// command.properties['java.net.preferIPv4Stack'] = true