[jbosstools-commits] JBoss Tools SVN: r20302 - in branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
Author: snjeza
Date: 2010-02-16 12:30:39 -0500 (Tue, 16 Feb 2010)
New Revision: 20302
Modified:
branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5838 Default launch configuration for EAP 5.0 and
SOA-P 5.0 should have max heap -Xmx value increased to 768m
Modified:
branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
---
branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-02-16
17:26:51 UTC (rev 20301)
+++
branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-02-16
17:30:39 UTC (rev 20302)
@@ -33,6 +33,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.IConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
public class LocalJBossServerRuntime extends RuntimeDelegate implements
IJBossServerRuntime {
public void setDefaults(IProgressMonitor monitor) {
@@ -130,7 +131,16 @@
"JBossTools: " + name + c.QUOTE + c.SPACE; //$NON-NLS-1$
if( Platform.getOS().equals(Platform.OS_MACOSX))
ret += c.SERVER_ARG + c.SPACE;
- ret += c.DEFAULT_MEM_ARGS;
+ IRuntimeType type = getRuntime().getRuntimeType();
+ if (type != null &&
+ (IJBossToolingConstants.AS_50.equals(type.getId()) ||
+ IJBossToolingConstants.AS_51.equals(type.getId()) ||
+ IJBossToolingConstants.AS_60.equals(type.getId()) ||
+ IJBossToolingConstants.EAP_50.equals(type.getId())) ) {
+ ret += c.DEFAULT_MEM_ARGS_AS50;
+ } else {
+ ret += c.DEFAULT_MEM_ARGS;
+ }
if( Platform.getOS().equals(Platform.OS_LINUX))
ret += c.SYSPROP + c.JAVA_PREFER_IP4_ARG + c.EQ + true + c.SPACE;
ret += c.SYSPROP + c.SUN_CLIENT_GC_ARG + c.EQ + 3600000 + c.SPACE;
Modified:
branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java
===================================================================
---
branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java 2010-02-16
17:26:51 UTC (rev 20301)
+++
branches/jbosstools-3.1.0.RC2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java 2010-02-16
17:30:39 UTC (rev 20302)
@@ -35,6 +35,7 @@
public static final String STARTUP_ARG_CONFIG_LONG = "--configuration";
//$NON-NLS-1$
public static final String SERVER_ARG = "-server"; //$NON-NLS-1$
public static final String DEFAULT_MEM_ARGS = "-Xms256m -Xmx512m
-XX:MaxPermSize=256m "; //$NON-NLS-1$
+ public static final String DEFAULT_MEM_ARGS_AS50 = "-Xms256m -Xmx768m
-XX:MaxPermSize=256m "; //$NON-NLS-1$
public static final String SUN_CLIENT_GC_ARG =
"sun.rmi.dgc.client.gcInterval"; //$NON-NLS-1$
public static final String SUN_SERVER_GC_ARG =
"sun.rmi.dgc.server.gcInterval"; //$NON-NLS-1$
public static final String JAVA_PREFER_IP4_ARG = "java.net.preferIPv4Stack";
//$NON-NLS-1$