Author: rob.stryker(a)jboss.com Date: 2011-06-23 23:35:12 -0400 (Thu, 23 Jun 2011) New Revision: 32339 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 Log: JBIDE-9245 - renaming 6.0 to 6.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 2011-06-24 00:29:12 UTC (rev 32338) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-06-24 03:35:12 UTC (rev 32339) @@ -60,15 +60,20 @@ } protected String getNextRuntimeName() { + String rtVersion = getRuntime().getRuntimeType().getVersion(); + String prefix = Messages.jboss; if( isEAP(getRuntime())) { - String version = "5.x"; //$NON-NLS-1$ - String base = Messages.jboss + " EAP " + version + " " + Messages.runtime; //$NON-NLS-1$ //$NON-NLS-2$ - return getNextRuntimeName(base); + prefix = Messages.jboss + " EAP "; //$NON-NLS-1$ + if( rtVersion.equals(IJBossToolingConstants.V5_0)) { + rtVersion = "5.x"; //$NON-NLS-1$ + } + } else if( rtVersion.equals(IJBossToolingConstants.V6_0)) { + rtVersion = "6.x"; //$NON-NLS-1$ } - return super.getNextRuntimeName(); + String base = prefix + SPACE + rtVersion + SPACE + Messages.runtime; + return getNextRuntimeName(base); } - public static boolean isEAP(IRuntime rt) { return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$ } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-06-24 00:29:12 UTC (rev 32338) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-06-24 03:35:12 UTC (rev 32339) @@ -24,9 +24,9 @@ jboss.version.51.description=JBoss Application Server 5.1 jboss.version.51.runtime.name=JBoss 5.1 Runtime -jboss.version.60.name=JBoss AS 6.0 -jboss.version.60.description=JBoss Application Server 6.0 -jboss.version.60.runtime.name=JBoss 6.0 Runtime +jboss.version.60.name=JBoss AS 6.x +jboss.version.60.description=JBoss Application Server 6.x +jboss.version.60.runtime.name=JBoss 6.x Runtime jboss.version.70.name=JBoss AS 7.0 jboss.version.70.description=JBoss Application Server 7.0 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 2011-06-24 00:29:12 UTC (rev 32338) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-06-24 03:35:12 UTC (rev 32339) @@ -145,9 +145,13 @@ // make modifications to parent IRuntime r = (IRuntime) getTaskModel() .getObject(TaskModel.TASK_RUNTIME); + // TODO: Unify with code in LocalJBossServerRuntime and in getHomeVersionWarning String version = r.getRuntimeType().getVersion(); if( isEAP() && version.startsWith("5.")) version = "5.x"; + if( !isEAP() && version.startsWith("6.")) + version = "6.x"; + handle.setTitle( Messages.rwf_JBossRuntime); String description = NLS.bind( isEAP() ? Messages.JBEAP_version : Messages.JBAS_version, @@ -660,8 +664,13 @@ * EAP 5.0 was started as named 5.0, but is now 5.x. * So a jar with 5.1 should work here also. */ + // This really needs to be extracted into an API + // To determine what server types work for what actual underlying version + // Unify with the core code in LocalJBossServerRuntime which changes 6.0 to 6.x if( isEAP() && v.startsWith("5.")) v = "5."; + if( !isEAP() && v.startsWith("6.")) + v = "6."; return version.startsWith(v) ? null : NLS.bind(Messages.rwf_homeIncorrectVersion, v, version); }