Author: rob.stryker(a)jboss.com Date: 2010-01-07 17:46:57 -0500 (Thu, 07 Jan 2010) New Revision: 19679 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/util/IJBossToolingConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-5582 - add support for jb 6 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-07 21:42:32 UTC (rev 19678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-01-07 22:46:57 UTC (rev 19679) @@ -211,14 +211,16 @@ } public static boolean isValidJREVersion(String jreVersion, IRuntimeType rtType) { + // all servers require at least 1.3 String id = rtType.getId(); - String version = rtType.getVersion(); - if( id.equals(IConstants.EAP_50) && version.equals(IConstants.V5_0)) { - return !jreVersion.startsWith(JavaCore.VERSION_1_1) && - !jreVersion.startsWith(JavaCore.VERSION_1_2) && - !jreVersion.startsWith(JavaCore.VERSION_1_3) && - !jreVersion.startsWith(JavaCore.VERSION_1_4) && - !jreVersion.startsWith(JavaCore.VERSION_1_5); + 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; } return true; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2010-01-07 21:42:32 UTC (rev 19678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2010-01-07 22:46:57 UTC (rev 19679) @@ -20,6 +20,7 @@ public static final String AS_42 = "org.jboss.ide.eclipse.as.runtime.42"; //$NON-NLS-1$ public static final String AS_50 = "org.jboss.ide.eclipse.as.runtime.50"; //$NON-NLS-1$ public static final String AS_51 = "org.jboss.ide.eclipse.as.runtime.51"; //$NON-NLS-1$ + public static final String AS_60 = "org.jboss.ide.eclipse.as.runtime.60"; //$NON-NLS-1$ public static final String EAP_43 = "org.jboss.ide.eclipse.as.runtime.eap.43"; //$NON-NLS-1$ public static final String EAP_50 = "org.jboss.ide.eclipse.as.runtime.eap.50"; //$NON-NLS-1$ @@ -28,6 +29,7 @@ public static final String SERVER_AS_42 = "org.jboss.ide.eclipse.as.42"; //$NON-NLS-1$ public static final String SERVER_AS_50 = "org.jboss.ide.eclipse.as.50"; //$NON-NLS-1$ public static final String SERVER_AS_51 = "org.jboss.ide.eclipse.as.51"; //$NON-NLS-1$ + public static final String SERVER_AS_60 = "org.jboss.ide.eclipse.as.60"; //$NON-NLS-1$ public static final String SERVER_EAP_43 = "org.jboss.ide.eclipse.as.eap.43"; //$NON-NLS-1$ public static final String SERVER_EAP_50 = "org.jboss.ide.eclipse.as.eap.50"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-01-07 21:42:32 UTC (rev 19678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-01-07 22:46:57 UTC (rev 19679) @@ -93,6 +93,23 @@ startTimeout="450000" stopTimeout="450000" supportsRemoteHosts="false"/> + + <serverType + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" + class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer" + description="%jboss.version.60.description" + hasConfiguration="false" + id="org.jboss.ide.eclipse.as.60" + initialState="stopped" + launchConfigId="org.jboss.ide.eclipse.as.core.server.startupConfiguration" + launchModes="run,debug,profile" + name="%jboss.version.60.name" + runtime="true" + runtimeTypeId="org.jboss.ide.eclipse.as.runtime.60" + startBeforePublish="false" + startTimeout="450000" + stopTimeout="450000" + supportsRemoteHosts="false"/> <serverType behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" @@ -307,6 +324,43 @@ versions="1.1, 2.0"> </moduleType> </runtimeType> + <runtimeType + vendor="%providerName" + class="org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime" + description="%jboss.version.60.description" + name="%jboss.version.60.runtime.name" + id="org.jboss.ide.eclipse.as.runtime.60" + version="6.0"> + <moduleType + types="jst.web" + versions="2.2, 2.3, 2.4, 2.5"/> + <moduleType + types="jst.ejb" + versions="1.0, 1.1, 2.0, 2.1, 3.0"/> + <moduleType + types="jst.ear" + versions="1.2, 1.3, 1.4, 5.0"/> + <moduleType + types="jst.connector" + versions="1.0, 1.5"/> + <moduleType + types="jst.utility" + versions="1.0"/> + <moduleType + types="jboss.package" + versions="1.0"/> + <moduleType + types="jboss.singlefile" + versions="1.0"/> + <moduleType + types="jst.jboss.esb" + versions="4.2,4.3,4.4,4.5,4.6,4.7"> + </moduleType> + <moduleType + types="jbt.bpel.module" + versions="1.1, 2.0"> + </moduleType> + </runtimeType> <runtimeType @@ -545,6 +599,10 @@ runtimeTypeId="org.jboss.ide.eclipse.as.runtime.51" runtime-component="org.jboss.ide.eclipse.as.runtime.component" version="5.1"/> + <runtimeFacetMapping + runtimeTypeId="org.jboss.ide.eclipse.as.runtime.60" + runtime-component="org.jboss.ide.eclipse.as.runtime.component" + version="6.0"/> <runtimeFacetMapping runtimeTypeId="org.jboss.ide.eclipse.as.runtime.stripped" runtime-component="org.jboss.ide.eclipse.as.runtime.stripped.component" @@ -636,6 +694,9 @@ <runtime-component-version type="org.jboss.ide.eclipse.as.runtime.component" version="5.1"/> + <runtime-component-version + type="org.jboss.ide.eclipse.as.runtime.component" + version="6.0"/> <supported> @@ -703,6 +764,19 @@ <facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/> </supported> + <supported> + <runtime-component + id="org.jboss.ide.eclipse.as.runtime.component" + version="6.0"/> + <facet id="jst.web" version="2.2,2.3,2.4,2.5"/> + <facet id="jst.java" version="1.3,1.4,5.0,6.0"/> + <facet id="jst.utility" version="1.0"/> + <facet id="jst.connector" version="1.0,1.5"/> + <facet id="jst.ejb" version="2.0,2.1,3.0"/> + <facet id="jst.ear" version="1.2,1.3,1.4,5.0"/> + <facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/> + </supported> + </extension> @@ -749,6 +823,16 @@ </default-facets> <default-facets> <runtime-component + id="org.jboss.ide.eclipse.as.runtime.component" + version="6.0"> + </runtime-component> + <facet + id="jst.java" + version="5.0"> + </facet> + </default-facets> + <default-facets> + <runtime-component id="org.jboss.ide.eclipse.eap.runtime.component" version="4.3"> </runtime-component> 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-07 21:42:32 UTC (rev 19678) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-01-07 22:46:57 UTC (rev 19679) @@ -9,11 +9,11 @@ point="org.eclipse.wst.server.ui.serverImages"> <image icon="$nl$/icons/jboss.gif" - 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.eap.43,org.jboss.ide.eclipse.as.eap.50" + 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" id="org.jboss.ide.eclipse.as.ui.jbossIcon"/> <image icon="$nl$/icons/jboss.gif" - 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" + 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.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50" id="org.jboss.ide.eclipse.as.ui.jbossIcon"/> <image @@ -35,12 +35,12 @@ <!-- 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" + 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.eap.43,org.jboss.ide.eclipse.as.eap.50"/> + 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"/> <fragment class="org.jboss.ide.eclipse.as.ui.wizards.StrippedServerWizardFragment" id="org.jboss.ide.eclipse.as.ui.strippedServerWizardFragment"