[jbosstools-commits] JBoss Tools SVN: r39958 - in branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 1 other directory.

Author: snjeza Date: 2012-04-01 17:27:36 -0400 (Sun, 01 Apr 2012) New Revision: 39958 Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties Log: JBIDE-9936 - rename jboss 6.0 runtime to 6.x Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java =================================================================== --- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-04-01 18:04:31 UTC (rev 39957) +++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-04-01 21:27:36 UTC (rev 39958) @@ -54,6 +54,9 @@ if( isEAP(getRuntime()) && version.equals(IConstants.V5_0)) version = "5.x"; //$NON-NLS-1$ + if (version.equals(IConstants.V6_0) || version.equals(IConstants.V6_1)) { + version = "6.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 { Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties =================================================================== --- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2012-04-01 18:04:31 UTC (rev 39957) +++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2012-04-01 21:27:36 UTC (rev 39958) @@ -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.eap.version.43.name=JBoss Enterprise Application Platform 4.3 jboss.eap.version.43.description=JBoss Enterprise Application Platform (EAP) 4.3