Author: rob.stryker(a)jboss.com Date: 2011-08-30 04:21:49 -0400 (Tue, 30 Aug 2011) New Revision: 34381 Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java Log: JBIDE-9381 - branch Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java =================================================================== --- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-08-30 07:06:49 UTC (rev 34380) +++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-08-30 08:21:49 UTC (rev 34381) @@ -17,10 +17,10 @@ public class JBossServerType implements IJBossToolingConstants { - private static final String JBOSS_AS_PATH = "jboss-as"; //$NON-NLS-1$ - private static final String BIN_PATH = "bin"; //$NON-NLS-1$ + public static final String JBOSS_AS_PATH = "jboss-as"; //$NON-NLS-1$ + public static final String BIN_PATH = "bin"; //$NON-NLS-1$ private static final String TWIDDLE_JAR_NAME = "twiddle.jar"; //$NON-NLS-1$ - private static final String RUN_JAR_NAME = "run.jar"; //$NON-NLS-1$ + public static final String RUN_JAR_NAME = "run.jar"; //$NON-NLS-1$ private static final String JBOSS_ESB_PATH = "jboss-esb"; //$NON-NLS-1$ private static final String SOAP_JBPM_JPDL_PATH = "jbpm-jpdl"; //$NON-NLS-1$ private static final String JBOSS_AS_WEB_PATH = "jboss-as-web"; //$NON-NLS-1$ @@ -83,7 +83,7 @@ UNKNOWN_STR, UNKNOWN_STR, "",//$NON-NLS-1$ - new String[]{V6_0, V5_1, V5_0, V4_3, V4_2, V4_0, V3_2}, null); + new String[]{V6_0, V6_1, V5_2, V5_1, V5_0, V4_3, V4_2, V4_0, V3_2}, null); public String toString() { return id; Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java =================================================================== --- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2011-08-30 07:06:49 UTC (rev 34380) +++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2011-08-30 08:21:49 UTC (rev 34381) @@ -27,7 +27,17 @@ public ServerBean loadFromLocation(File location) { JBossServerType type = getServerType(location); - String version = getServerVersion(getFullServerVersion(new File(location,type.getSystemJarPath()))); + String version = null; + if (!JBossServerType.UNKNOWN.equals(type)) { + String fullVersion = getFullServerVersion(new File(location,type.getSystemJarPath())); + if (fullVersion != null && fullVersion.startsWith("5.1.1") && JBossServerType.SOAP.equals(type)) { //$NON-NLS-1$ + // SOA-P 5.2 + String runJar = JBossServerType.JBOSS_AS_PATH + File.separatorChar + + JBossServerType.BIN_PATH+ File.separatorChar + JBossServerType.RUN_JAR_NAME; + fullVersion = getFullServerVersion(new File(location, runJar)); + } + version = getServerVersion(fullVersion); + } ServerBean server = new ServerBean(location.getPath(),getName(location),type,version); return server; } Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java =================================================================== --- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-08-30 07:06:49 UTC (rev 34380) +++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-08-30 08:21:49 UTC (rev 34381) @@ -47,6 +47,7 @@ public static final String V4_3 = "4.3"; //$NON-NLS-1$ public static final String V5_0 = "5.0"; //$NON-NLS-1$ public static final String V5_1 = "5.1"; //$NON-NLS-1$ + public static final String V5_2 = "5.2"; //$NON-NLS-1$ public static final String V6_0 = "6.0"; //$NON-NLS-1$ public static final String V6_1 = "6.1"; //$NON-NLS-1$