Author: snjeza Date: 2011-11-29 17:45:34 -0500 (Tue, 29 Nov 2011) New Revision: 36752 Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/IJBossRuntimePluginConstants.java trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/Messages.java trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/messages.properties trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java Log: JBIDE-10279 runtime detection detects 7.1 but set it up as if its a 7.0 Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/IJBossRuntimePluginConstants.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/IJBossRuntimePluginConstants.java 2011-11-29 22:13:35 UTC (rev 36751) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/IJBossRuntimePluginConstants.java 2011-11-29 22:45:34 UTC (rev 36752) @@ -37,7 +37,8 @@ "org.jboss.ide.eclipse.as.runtime.60", //$NON-NLS-1$ "org.jboss.ide.eclipse.as.runtime.eap.43", //$NON-NLS-1$ "org.jboss.ide.eclipse.as.runtime.eap.50", //$NON-NLS-1$ - "org.jboss.ide.eclipse.as.runtime.70" //$NON-NLS-1$ + "org.jboss.ide.eclipse.as.runtime.70", //$NON-NLS-1$ + "org.jboss.ide.eclipse.as.runtime.71" //$NON-NLS-1$ }; public static final String HSQLDB_DRIVER_JAR_NAME = "hsqldb.jar"; //$NON-NLS-1$ @@ -67,7 +68,8 @@ "org.jboss.ide.eclipse.as.60", //$NON-NLS-1$ "org.jboss.ide.eclipse.as.eap.43", //$NON-NLS-1$ "org.jboss.ide.eclipse.as.eap.50", //$NON-NLS-1$ - "org.jboss.ide.eclipse.as.70" //$NON-NLS-1$ + "org.jboss.ide.eclipse.as.70", //$NON-NLS-1$ + "org.jboss.ide.eclipse.as.71" //$NON-NLS-1$ }; public static final String JBOSS_AS_NAME[] = { @@ -79,7 +81,8 @@ Messages.JBossRuntimeStartup_JBoss_Application_Server_6_0, Messages.JBossRuntimeStartup_JBoss_EAP_Server_4_3, Messages.JBossRuntimeStartup_JBoss_EAP_Server_5_0, - Messages.JBossRuntimeStartup_JBoss_Application_Server_7_0 + Messages.JBossRuntimeStartup_JBoss_Application_Server_7_0, + Messages.JBossRuntimeStartup_JBoss_Application_Server_7_1 }; public static final String JBOSS_AS_HOST = "localhost"; //$NON-NLS-1$ Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/Messages.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/Messages.java 2011-11-29 22:13:35 UTC (rev 36751) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/Messages.java 2011-11-29 22:45:34 UTC (rev 36752) @@ -16,6 +16,7 @@ private static final String BUNDLE_NAME = "org.jboss.tools.runtime.as.detector.messages"; //$NON-NLS-1$ public static String JBossRuntimeStartup_JBoss_Application_Server_6_0; public static String JBossRuntimeStartup_JBoss_Application_Server_7_0; + public static String JBossRuntimeStartup_JBoss_Application_Server_7_1; public static String JBossRuntimeStartup_Cannot_create_new_JBoss_Server; public static String JBossRuntimeStartup_Cannott_create_new_DTP_Connection_Profile; public static String JBossRuntimeStartup_Cannott_create_new_HSQL_DB_Driver; Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/messages.properties =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/messages.properties 2011-11-29 22:13:35 UTC (rev 36751) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/messages.properties 2011-11-29 22:45:34 UTC (rev 36752) @@ -8,6 +8,7 @@ JBossRuntimeStartup_JBoss_Application_Server_5_1=JBoss Application Server 5.1 JBossRuntimeStartup_JBoss_Application_Server_6_0=JBoss Application Server 6.0 JBossRuntimeStartup_JBoss_Application_Server_7_0=JBoss Application Server 7.0 +JBossRuntimeStartup_JBoss_Application_Server_7_1=JBoss Application Server 7.1 JBossRuntimeStartup_JBoss_EAP_Server_4_3=JBoss EAP Server 4.3 JBossRuntimeStartup_JBoss_EAP_Server_5_0=JBoss EAP Server 5.0 JBossRuntimeStartup_Runtime=Runtime Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-11-29 22:13:35 UTC (rev 36751) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-11-29 22:45:34 UTC (rev 36752) @@ -61,7 +61,8 @@ public class JBossASHandler extends AbstractRuntimeDetector implements IJBossRuntimePluginConstants { - private static final int JBOSS_AS7_INDEX = 8; + private static final int JBOSS_AS70_INDEX = 8; + private static final int JBOSS_AS71_INDEX = 9; private static String[] hasIncludedRuntimes = new String[] {SOA_P, EAP, EPP, EWP, SOA_P_STD}; private static final String DROOLS = "DROOLS"; // NON-NLS-1$ private static final String ESB = "ESB"; //$NON-NLS-1$ @@ -119,8 +120,10 @@ index = 4; } else if ("6.0".equals(version) || "6.1".equals(version)) { //$NON-NLS-1$ index = 5; - } else if ("7.0".equals(version) || "7.1".equals(version)) { //$NON-NLS-1$ - index = 8; + } else if ("7.0".equals(version)) { //$NON-NLS-1$ + index = JBOSS_AS70_INDEX; + } else if ("7.1".equals(version)) { //$NON-NLS-1$ + index = JBOSS_AS71_INDEX; } createJBossServer(serverDefinition.getLocation(),index,serverDefinition.getName(),serverDefinition.getName() + " " + RUNTIME); //$NON-NLS-1$ } @@ -249,7 +252,7 @@ // Don't create the driver a few times return; } - if (index == 8) { + if (index == JBOSS_AS70_INDEX || index == JBOSS_AS71_INDEX) { // AS 7 return; }