[jbosstools-commits] JBoss Tools SVN: r20009 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 3 other directories.

Author: rob.stryker(a)jboss.com Date: 2010-01-29 01:54:07 -0500 (Fri, 29 Jan 2010) New Revision: 20009 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-5742 - execution environments added with some UI changes Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2010-01-29 06:17:39 UTC (rev 20008) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2010-01-29 06:54:07 UTC (rev 20009) @@ -14,6 +14,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.environments.IExecutionEnvironment; import org.eclipse.wst.server.core.IRuntime; /** @@ -23,6 +24,7 @@ public interface IJBossServerRuntime { public static String PROPERTY_VM_ID = "PROPERTY_VM_ID"; //$NON-NLS-1$ public static String PROPERTY_VM_TYPE_ID = "PROPERTY_VM_TYPE_ID"; //$NON-NLS-1$ + public static String PROPERTY_EXECUTION_ENVIRONMENT = "PROPERTY_EXEC_ENVIRONMENT"; //$NON-NLS-1$ public static String PROPERTY_CONFIGURATION_NAME = "org.jboss.ide.eclipse.as.core.runtime.configurationName"; //$NON-NLS-1$ public static String PROPERTY_CONFIG_LOCATION="org.jboss.ide.eclipse.as.core.runtime.configurationLocation"; //$NON-NLS-1$ @@ -30,6 +32,8 @@ public IRuntime getRuntime(); public IVMInstall getVM(); public void setVM(IVMInstall install); + public IExecutionEnvironment getExecutionEnvironment(); + public void setExecutionEnvironment(IExecutionEnvironment environment); public String getJBossConfiguration(); public void setJBossConfiguration(String config); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2010-01-29 06:17:39 UTC (rev 20008) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2010-01-29 06:54:07 UTC (rev 20009) @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; @@ -33,6 +34,7 @@ import org.eclipse.debug.core.IDebugEventSetListener; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.model.IProcess; +import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; @@ -40,6 +42,7 @@ import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider; import org.jboss.ide.eclipse.as.core.extensions.jmx.JMXClassLoaderRepository; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration; import org.jboss.ide.eclipse.as.core.server.internal.launch.StopLaunchConfiguration; @@ -286,4 +289,36 @@ connection.invoke(objectName, methodName, new Object[] { }, new String[] {}); } + + // Can start / stop / restart etc + public IStatus canStart(String launchMode) { + return canChangeState(launchMode); + } + public IStatus canRestart(String launchMode) { + return canChangeState(launchMode); + } + public IStatus canStop() { + return canChangeState(null); + } + public IStatus canStop(String launchMode) { + return canChangeState(launchMode); + } + protected IStatus canChangeState(String launchMode) { + if( getServer() != null && getServer().getRuntime() != null && + getRuntime().getVM() != null ) + return Status.OK_STATUS; + return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + "This server does not have a valid runtime environment"); //$NON-NLS-1$ + } + + private IJBossServerRuntime getRuntime() { + IRuntime r = getServer().getRuntime(); + IJBossServerRuntime ajbsrt = null; + if (r != null) { + ajbsrt = (IJBossServerRuntime) r + .loadAdapter(IJBossServerRuntime.class, + new NullProgressMonitor()); + } + return ajbsrt; + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-01-29 06:17:39 UTC (rev 20008) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-01-29 06:54:07 UTC (rev 20009) @@ -10,9 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server.internal; -import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; @@ -20,11 +18,11 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.internal.launching.environments.EnvironmentsManager; import org.eclipse.jdt.launching.IVMInstall; -import org.eclipse.jdt.launching.IVMInstall2; import org.eclipse.jdt.launching.IVMInstallType; import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.jdt.launching.environments.IExecutionEnvironment; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeType; @@ -37,10 +35,10 @@ import org.jboss.ide.eclipse.as.core.util.IConstants; public class LocalJBossServerRuntime extends RuntimeDelegate implements IJBossServerRuntime { - public void setDefaults(IProgressMonitor monitor) { getRuntimeWorkingCopy().setName(getNextRuntimeName()); setAttribute(IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, IJBossServerConstants.DEFAULT_CONFIGURATION); + setExecutionEnvironment(getDefaultExecutionEnvironment(getRuntime().getRuntimeType())); setVM(null); } @@ -91,6 +89,13 @@ return vmInstalls[i]; } } + if( getExecutionEnvironment() != null ) { + IVMInstall[] installs = getExecutionEnvironment().getCompatibleVMs(); + if( getExecutionEnvironment().getDefaultVM() != null ) + return getExecutionEnvironment().getDefaultVM(); + if( installs != null && installs.length > 0 && installs[0] != null ) + return installs[0]; + } // not found, return default vm return getDefaultVMInstall(); } @@ -173,55 +178,29 @@ } protected IVMInstall getDefaultVMInstall() { - IVMInstall install = JavaRuntime.getDefaultVMInstall(); - if( install instanceof IVMInstall2 ) { - String version = ((IVMInstall2)install).getJavaVersion(); - if( isValidJREVersion(version, getRuntime().getRuntimeType())) - return install; - } - ArrayList<IVMInstall> installs = getValidJREs(getRuntime().getRuntimeType()); - Iterator<IVMInstall> i = installs.iterator(); - while(i.hasNext()) { - IVMInstall next = i.next(); - if( next instanceof IVMInstall2 ) { - String version = ((IVMInstall2)next).getJavaVersion(); - if( isValidJREVersion(version, getRuntime().getRuntimeType())) - return next; - } - } - return null; + return getExecutionEnvironment().getDefaultVM(); } - public static ArrayList<IVMInstall> getValidJREs(IRuntimeType type) { - ArrayList<IVMInstall> valid = new ArrayList<IVMInstall>(); - IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes(); - int size = vmInstallTypes.length; - for (int i = 0; i < size; i++) { - IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls(); - int size2 = vmInstalls.length; - for (int j = 0; j < size2; j++) { - if( vmInstalls[j] instanceof IVMInstall2 ) { - String version = ((IVMInstall2)vmInstalls[j]).getJavaVersion(); - if( isValidJREVersion(version, type)) - valid.add(vmInstalls[j]); - } - } - } - return valid; + public static IVMInstall[] getValidJREs(IRuntimeType type) { + return getDefaultExecutionEnvironment(type) == null ? new IVMInstall[0] + : getDefaultExecutionEnvironment(type).getCompatibleVMs(); } - public static boolean isValidJREVersion(String jreVersion, IRuntimeType rtType) { - // all servers require at least 1.3 - String id = rtType.getId(); - if( jreVersion.startsWith(JavaCore.VERSION_1_1)) return false; - if( jreVersion.startsWith(JavaCore.VERSION_1_2)) return false; - - // requires java6 - if( id.equals(IConstants.EAP_50) || id.equals(IConstants.AS_60)) { - if( jreVersion.startsWith(JavaCore.VERSION_1_3)) return false; - if( jreVersion.startsWith(JavaCore.VERSION_1_4)) return false; - if( jreVersion.startsWith(JavaCore.VERSION_1_5)) return false; + public IExecutionEnvironment getExecutionEnvironment() { + String id = getAttribute(PROPERTY_EXECUTION_ENVIRONMENT, (String)null); + return id == null ? getDefaultExecutionEnvironment(getRuntime().getRuntimeType()) : + EnvironmentsManager.getDefault().getEnvironment(id); + } + + public static IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) { + String typeId = rtType.getId(); + if( typeId.equals(IConstants.EAP_50) || typeId.equals(IConstants.AS_60)) { + return EnvironmentsManager.getDefault().getEnvironment("JavaSE-1.6"); //$NON-NLS-1$ } - return true; + return EnvironmentsManager.getDefault().getEnvironment("J2SE-1.4"); //$NON-NLS-1$ } + + public void setExecutionEnvironment(IExecutionEnvironment environment) { + setAttribute(PROPERTY_EXECUTION_ENVIRONMENT, environment.getId()); + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2010-01-29 06:17:39 UTC (rev 20008) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2010-01-29 06:54:07 UTC (rev 20009) @@ -56,11 +56,11 @@ } protected void preLaunch(ILaunchConfiguration configuration, - String mode, ILaunch launch, IProgressMonitor monitor) { + String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { // override me } protected void postLaunch(ILaunchConfiguration configuration, - String mode, ILaunch launch, IProgressMonitor monitor) { + String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { // override me } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2010-01-29 06:17:39 UTC (rev 20008) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2010-01-29 06:54:07 UTC (rev 20009) @@ -124,7 +124,6 @@ IJBossServerRuntime runtime = (IJBossServerRuntime) jbs.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null); - IVMInstall vmInstall = runtime.getVM(); String config = runtime.getJBossConfiguration(); args = ArgsUtil.setArg(args, IJBossRuntimeConstants.STARTUP_ARG_CONFIG_SHORT, @@ -179,7 +178,9 @@ List<String> cp = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, new ArrayList<String>()); List<String> newCP = fixCP(cp, jbs); - wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, JavaRuntime.newJREContainerPath(vmInstall).toPortableString()); + IVMInstall vmInstall = runtime.getVM(); + if( vmInstall != null ) + wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, JavaRuntime.newJREContainerPath(vmInstall).toPortableString()); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + IJBossRuntimeResourceConstants.BIN); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args.trim()); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArgs.trim()); @@ -277,8 +278,15 @@ return null; } + public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { + JBossServerBehavior jbsBehavior = getServerBehavior(configuration); + if( !jbsBehavior.canStart(mode).isOK()) + throw new CoreException(jbsBehavior.canStart(mode)); + return true; + } + protected void preLaunch(ILaunchConfiguration configuration, - String mode, ILaunch launch, IProgressMonitor monitor) { + String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { try { JBossServerBehavior jbsBehavior = getServerBehavior(configuration); jbsBehavior.setRunMode(mode); @@ -289,7 +297,7 @@ } public void postLaunch(ILaunchConfiguration configuration, String mode, - ILaunch launch, IProgressMonitor monitor) { + ILaunch launch, IProgressMonitor monitor) throws CoreException { try { IProcess[] processes = launch.getProcesses(); JBossServerBehavior jbsBehavior = getServerBehavior(configuration); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2010-01-29 06:17:39 UTC (rev 20008) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2010-01-29 06:54:07 UTC (rev 20009) @@ -21,32 +21,9 @@ */ package org.jboss.ide.eclipse.as.ui.wizards; -import java.util.ArrayList; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.launching.IVMInstall; -import org.eclipse.jdt.launching.IVMInstall2; -import org.eclipse.jdt.launching.IVMInstallType; -import org.eclipse.jdt.launching.JavaRuntime; -import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime; -import org.jboss.ide.eclipse.as.ui.Messages; - +@Deprecated public class JBossRuntimeJava6WizardFragment extends JBossRuntimeWizardFragment { - public JBossRuntimeJava6WizardFragment() { } - - protected boolean shouldIncludeDefaultJRE() { - return false; - } - - protected ArrayList<IVMInstall> getValidJREs() { - return LocalJBossServerRuntime.getValidJREs(getRuntimeType()); - } - - protected String getErrorString() { - if( !shouldIncludeDefaultJRE() && getValidJREs().size() == 0 ) - return Messages.rwf_jre6NotFound; - return super.getErrorString(); - } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2010-01-29 06:17:39 UTC (rev 20008) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2010-01-29 06:54:07 UTC (rev 20009) @@ -22,7 +22,8 @@ package org.jboss.ide.eclipse.as.ui.wizards; import java.io.File; -import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -32,8 +33,6 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Preferences; import org.eclipse.jdt.launching.IVMInstall; -import org.eclipse.jdt.launching.IVMInstallType; -import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.MessageDialog; @@ -80,6 +79,7 @@ import org.eclipse.wst.server.ui.wizard.WizardFragment; 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.server.internal.LocalJBossServerRuntime; import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.IConstants; import org.jboss.ide.eclipse.as.core.util.JBossServerType; @@ -118,7 +118,7 @@ private String configDirTextVal; // jre fields - protected ArrayList<IVMInstall> installedJREs; + protected List<IVMInstall> installedJREs; protected String[] jreNames; protected int defaultVMIndex; private IVMInstall selectedVM; @@ -195,7 +195,7 @@ configurations.setConfiguration(rt.getJBossConfiguration() == null ? IConstants.DEFAULT_CONFIGURATION : rt.getJBossConfiguration()); - if (rt.isUsingDefaultJRE() && shouldIncludeDefaultJRE()) { + if (rt.isUsingDefaultJRE()) { jreCombo.select(0); } else { IVMInstall install = rt.getVM(); @@ -556,10 +556,7 @@ configurations.setConfiguration(IJBossServerConstants.DEFAULT_CONFIGURATION); int sel = jreCombo.getSelectionIndex(); - int offset = 0; - if( shouldIncludeDefaultJRE() ) { - offset = -1; - } + int offset = -1; if( sel + offset >= 0 ) selectedVM = installedJREs.get(sel + offset); else // if sel < 0 or sel == 0 and offset == -1 @@ -590,6 +587,13 @@ return Messages.rwf_NameInUse; } + if( getValidJREs().size() == 0 ) { + String error = "No valid JREs found for execution environment \"" + + getRuntime().getExecutionEnvironment().getId() + "\""; + return error; + } + + if (!isHomeValid()) return Messages.rwf_homeMissingFiles; @@ -685,36 +689,21 @@ installedJREs = getValidJREs(); // get names int size = installedJREs.size(); - size = shouldIncludeDefaultJRE() ? size+1 : size; + size = size+1; int index = 0; jreNames = new String[size]; - if( shouldIncludeDefaultJRE()) - jreNames[index++] = "Default JRE"; //$NON-NLS-1$ + jreNames[index++] = "Default JRE for " + getRuntime().getExecutionEnvironment().getId(); //$NON-NLS-1$ for (int i = 0; i < installedJREs.size(); i++) { IVMInstall vmInstall = installedJREs.get(i); jreNames[index++] = vmInstall.getName(); } - defaultVMIndex = shouldIncludeDefaultJRE() ? 0 : - jreNames.length > 0 ? 0 : -1; + defaultVMIndex = 0; } - protected boolean shouldIncludeDefaultJRE() { - return true; - } - protected ArrayList<IVMInstall> getValidJREs() { - ArrayList<IVMInstall> valid = new ArrayList<IVMInstall>(); - IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes(); - int size = vmInstallTypes.length; - for (int i = 0; i < size; i++) { - IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls(); - int size2 = vmInstalls.length; - for (int j = 0; j < size2; j++) { - valid.add(vmInstalls[j]); - } - } - return valid; + protected List<IVMInstall> getValidJREs() { + return Arrays.asList(LocalJBossServerRuntime.getValidJREs(getRuntimeType())); } // WST API methods Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-01-29 06:17:39 UTC (rev 20008) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-01-29 06:54:07 UTC (rev 20009) @@ -30,14 +30,9 @@ point="org.eclipse.wst.server.ui.wizardFragments"> <fragment class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeWizardFragment" - typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43" + typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.60" id="org.jboss.ide.eclipse.as.ui.JBossRuntimeWizardFragment"/> - <!-- Fragment for runtimes that require java 6 --> <fragment - class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeJava6WizardFragment" - typeIds="org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.60" - id="org.jboss.ide.eclipse.as.ui.JBossRuntimeJava6WizardFragment"/> - <fragment class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment" id="org.jboss.ide.eclipse.as.ui.jbossServerWizardFragment" typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"/>