Author: rob.stryker(a)jboss.com Date: 2012-03-15 10:10:18 -0400 (Thu, 15 Mar 2012) New Revision: 39533 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java Log: JBIDE-11330 - as7.1 needs higher exec environment Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2012-03-15 13:37:20 UTC (rev 39532) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2012-03-15 14:10:18 UTC (rev 39533) @@ -124,11 +124,10 @@ } public static IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) { + // NEW_SERVER_ADAPTER Subclasses override this String typeId = rtType.getId(); if( typeId.equals(IConstants.EAP_50) - || typeId.equals(IConstants.AS_60) - || typeId.equals(IConstants.EAP_60) - || typeId.equals(IConstants.AS_70)) { + || typeId.equals(IConstants.AS_60)) { return EnvironmentsManager.getDefault().getEnvironment("JavaSE-1.6"); //$NON-NLS-1$ } return EnvironmentsManager.getDefault().getEnvironment("J2SE-1.4"); //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-03-15 13:37:20 UTC (rev 39532) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7ServerRuntime.java 2012-03-15 14:10:18 UTC (rev 39533) @@ -14,6 +14,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jdt.internal.launching.environments.EnvironmentsManager; +import org.eclipse.jdt.launching.environments.IExecutionEnvironment; +import org.eclipse.wst.server.core.IRuntimeType; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; @@ -89,6 +92,8 @@ public String getJBossConfiguration() { return ""; //$NON-NLS-1$ } - + public static IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) { + return EnvironmentsManager.getDefault().getEnvironment("JavaSE-1.6"); //$NON-NLS-1$ + } }