Author: rob.stryker(a)jboss.com Date: 2011-08-01 01:14:52 -0400 (Mon, 01 Aug 2011) New Revision: 33399 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java Log: JBIDE-9429 - snjezana's patch committed Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-08-01 04:03:55 UTC (rev 33398) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-08-01 05:14:52 UTC (rev 33399) @@ -53,7 +53,7 @@ "AS", //$NON-NLS-1$ "Application Server", //$NON-NLS-1$ BIN_PATH+File.separatorChar + TWIDDLE_JAR_NAME, - new String[]{V6_0,V5_1, V5_0, V4_2, V4_0, V3_2}, new ASServerTypeCondition()); + new String[]{V6_0, V6_1, V5_1, V5_0, V4_2, V4_0, V3_2}, new ASServerTypeCondition()); public static final JBossServerType AS7 = new JBossServerType( "AS", //$NON-NLS-1$ @@ -64,7 +64,7 @@ "as" + File.separatorChar + //$NON-NLS-1$ "server" + File.separatorChar + //$NON-NLS-1$ "main", //$NON-NLS-1$ - new String[]{V7_0,}, new AS7ServerTypeCondition()); + new String[]{V7_0,V7_1}, new AS7ServerTypeCondition()); public static final JBossServerType EAP_STD = new JBossServerType( "EAP_STD",//$NON-NLS-1$ @@ -106,7 +106,7 @@ UNKNOWN_STR, UNKNOWN_STR, "",//$NON-NLS-1$ - new String[]{V7_0, V6_0, V5_1, V5_0, V4_3, V4_2, V4_0, V3_2}, null); + new String[]{V7_0, V7_1, V6_0, V6_1, V5_1, V5_0, V4_3, V4_2, V4_0, V3_2}, null); public String toString() { return id; 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 2011-08-01 04:03:55 UTC (rev 33398) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-08-01 05:14:52 UTC (rev 33399) @@ -54,6 +54,7 @@ public static final String V6_0 = "6.0"; //$NON-NLS-1$ public static final String V6_1 = "6.1"; //$NON-NLS-1$ public static final String V7_0 = "7.0"; //$NON-NLS-1$ + public static final String V7_1 = "7.1"; //$NON-NLS-1$ /* Files or folders inside the TOOLING */