Author: snjeza Date: 2012-05-15 06:04:16 -0400 (Tue, 15 May 2012) New Revision: 41018 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/ServerBeanLoader.java Log: JBIDE-11822 - Found SOA-P runtime does not show version 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 2012-05-15 10:00:18 UTC (rev 41017) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2012-05-15 10:04:16 UTC (rev 41018) @@ -391,7 +391,7 @@ } public String getFullVersion(File location, File systemFile) { - String fullVersion = ServerBeanLoader.getFullServerVersionFromZip(location); + String fullVersion = ServerBeanLoader.getFullServerVersionFromZip(systemFile); if (fullVersion != null && fullVersion.startsWith("5.1.1")) { //$NON-NLS-1$ // SOA-P 5.2 String runJar = JBossServerType.JBOSS_AS_PATH + File.separatorChar + Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2012-05-15 10:00:18 UTC (rev 41017) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2012-05-15 10:04:16 UTC (rev 41018) @@ -111,6 +111,9 @@ return version; } version = (String)props.get("Specification-Version");//$NON-NLS-1$ + if (version == null || version.trim().length() == 0 || !(version.charAt(0) >= '0' && version.charAt(0) <= '9')) { + version = (String)props.get("Implementation-Version");//$NON-NLS-1$ + } } catch (IOException e) { // It's already null, and would fall through to return null, // but hudson doesn't like empty catch blocks.