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

Author: rob.stryker(a)jboss.com Date: 2010-11-11 04:19:41 -0500 (Thu, 11 Nov 2010) New Revision: 26445 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/plugin.properties 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/JBossServerWizardFragment.java Log: JBDS-1381 JBIDE-7544 - eap 5.0 renamed eap 5.x 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-11-11 00:04:45 UTC (rev 26444) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-11-11 09:19:41 UTC (rev 26445) @@ -46,6 +46,11 @@ private String getNextRuntimeName() { String version = getRuntime().getRuntimeType().getVersion(); String base = null; + + // hack for eap 5.1, which is now using the 5.0 runtime type id + if( isEAP(getRuntime()) && version.equals(IConstants.V5_0)) + version = "5.x"; //$NON-NLS-1$ + if( getRuntime().getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.")) { //$NON-NLS-1$ base = Messages.jboss + " EAP " + version + " " + Messages.runtime; //$NON-NLS-1$ //$NON-NLS-2$ } else { @@ -54,6 +59,10 @@ return getNextRuntimeName(base); } + public static boolean isEAP(IRuntime rt) { + return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$ + } + public static String getNextRuntimeName(String base) { IRuntime rt = ServerCore.findRuntime(base); if (rt == null) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2010-11-11 00:04:45 UTC (rev 26444) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2010-11-11 09:19:41 UTC (rev 26445) @@ -32,9 +32,9 @@ jboss.eap.version.43.description=JBoss Enterprise Application Platform (EAP) 4.3 jboss.eap.version.43.runtime.name=JBoss Enterprise Application Platform 4.3 Runtime -jboss.eap.version.50.name=JBoss Enterprise Application Platform 5.0 -jboss.eap.version.50.description=JBoss Enterprise Application Platform (EAP) 5.0 -jboss.eap.version.50.runtime.name=JBoss Enterprise Application Platform 5.0 Runtime +jboss.eap.version.50.name=JBoss Enterprise Application Platform 5.x +jboss.eap.version.50.description=JBoss Enterprise Application Platform (EAP) 5.x +jboss.eap.version.50.runtime.name=JBoss Enterprise Application Platform 5.x Runtime deploy.runtime.name=Local Deployer Runtime deploy.runtime.description=A runtime provided to allow a deploy-only server the ability to deploy certain project types. 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-11-11 00:04:45 UTC (rev 26444) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2010-11-11 09:19:41 UTC (rev 26445) @@ -142,6 +142,8 @@ IRuntime r = (IRuntime) getTaskModel() .getObject(TaskModel.TASK_RUNTIME); String version = r.getRuntimeType().getVersion(); + if( isEAP() && version.startsWith("5.")) + version = "5.x"; handle.setTitle( Messages.rwf_JBossRuntime); String description = NLS.bind( isEAP() ? Messages.JBEAP_version : Messages.JBAS_version, @@ -153,9 +155,8 @@ } protected boolean isEAP() { - IRuntime rt = (IRuntime) getTaskModel().getObject( - TaskModel.TASK_RUNTIME); - return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$ + IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME); + return LocalJBossServerRuntime.isEAP(rt); } protected ImageDescriptor getImageDescriptor() { @@ -624,10 +625,19 @@ } protected String getHomeVersionWarning() { - String version = new ServerBeanLoader().getFullServerVersion(new File(homeDir, JBossServerType.AS.getSystemJarPath())); + File loc = new File(homeDir, JBossServerType.AS.getSystemJarPath()); + String version = new ServerBeanLoader().getFullServerVersion(loc); IRuntime rt = (IRuntime) getTaskModel().getObject( TaskModel.TASK_RUNTIME); String v = rt.getRuntimeType().getVersion(); + + /* + * CHEAP WARNING HACK - + * EAP 5.0 was started as named 5.0, but is now 5.x. + * So a jar with 5.1 should work here also. + */ + if( isEAP() && v.startsWith("5.")) + v = "5."; return version.startsWith(v) ? null : NLS.bind(Messages.rwf_homeIncorrectVersion, v, version); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2010-11-11 00:04:45 UTC (rev 26444) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2010-11-11 09:19:41 UTC (rev 26445) @@ -47,6 +47,7 @@ import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.Messages; @@ -79,6 +80,8 @@ IRuntime r = (IRuntime) getTaskModel() .getObject(TaskModel.TASK_RUNTIME); String version = r.getRuntimeType().getVersion(); + if( isEAP() && version.startsWith("5.")) + version = "5.x"; String description = NLS.bind( isEAP() ? Messages.JBEAP_version : Messages.JBAS_version, version); @@ -96,9 +99,8 @@ } protected boolean isEAP() { - IRuntime rt = (IRuntime) getTaskModel().getObject( - TaskModel.TASK_RUNTIME); - return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$ + IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME); + return LocalJBossServerRuntime.isEAP(rt); } public ImageDescriptor getImageDescriptor() {