geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
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 GMT
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;
     }
 
     /*



Mime
View raw message