Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 72416 invoked from network); 12 Jan 2009 02:52:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jan 2009 02:52:08 -0000 Received: (qmail 44284 invoked by uid 500); 12 Jan 2009 02:52:08 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 44245 invoked by uid 500); 12 Jan 2009 02:52:08 -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 44236 invoked by uid 99); 12 Jan 2009 02:52:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Jan 2009 18:52:08 -0800 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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jan 2009 02:52:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B1F1123888AF; Sun, 11 Jan 2009 18:51:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r733585 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java Date: Mon, 12 Jan 2009 02:51:45 -0000 To: scm@geronimo.apache.org From: mcconne@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090112025145.B1F1123888AF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mcconne Date: Sun Jan 11 18:51:45 2009 New Revision: 733585 URL: http://svn.apache.org/viewvc?rev=733585&view=rev Log: GERONIMODEVTOOLS-543 Augment the vm arguments used to start the Geronimo server when running under Eclipse Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java?rev=733585&r1=733584&r2=733585&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java Sun Jan 11 18:51:45 2009 @@ -79,7 +79,6 @@ geronimoRuntimeDelegate = (GeronimoRuntimeDelegate) getServer().getRuntime().loadAdapter(GeronimoRuntimeDelegate.class,new NullProgressMonitor()); } IVMInstall vmInstall = geronimoRuntimeDelegate.getVMInstall(); - String vmInstallLocation = vmInstall.getInstallLocation().getAbsolutePath() + "/jre"; LibraryLocation[] libLocations = JavaRuntime.getLibraryLocations(vmInstall); IPath vmLibDir = null; @@ -107,10 +106,10 @@ //-Djava.endorsed.dirs="GERONIMO_BASE/lib/endorsed;JRE_HOME/lib/endorsed" String javaEndorsedDirs = "-Djava.endorsed.dirs=\"" + runtimeLocation + "/lib/endorsed" + cp + vmLibDir.append("endorsed").toOSString() + "\""; - //-Dorg.apache.geronimo.base.dir="GERONIMO_BASE" - String baseDir = "-Dorg.apache.geronimo.base.dir=" + runtimeLocation; + // Specify the minimum memory options for the Geronimo server + String memoryOpts = "-Xms256m -Xmx512m -XX:MaxPermSize=128m"; - return javaagent + " " + javaExtDirs + " " + javaEndorsedDirs; + return javaagent + " " + javaExtDirs + " " + javaEndorsedDirs + " " + memoryOpts; } /*