Author: rob.stryker(a)jboss.com Date: 2011-12-16 13:15:42 -0500 (Fri, 16 Dec 2011) New Revision: 37401 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java 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/util/ServerCreationUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/ServerBeanLoaderTest.java 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-10494 - ServerBeanLoader and other AS7.1 / EAP6.0 updates. Also added keyword NEW_SERVER_ADAPTER to several locations. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java 2011-12-16 17:55:19 UTC (rev 37400) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -100,6 +100,8 @@ return getDefaultAS70Entries(); if(AS_71.equals(type.getId())) return getDefaultAS71Entries(); + if(EAP_60.equals(type.getId())) + return getDefaultAS71Entries(); // NEW_SERVER_ADAPTER add logic for new adapter here return new IDefaultPathProvider[]{}; 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 2011-12-16 17:55:19 UTC (rev 37400) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -91,6 +91,10 @@ ZipEntry manifest = jar.getEntry("META-INF/MANIFEST.MF");//$NON-NLS-1$ Properties props = new Properties(); props.load(jar.getInputStream(manifest)); + version = props.getProperty("JBossEAP-Release-Version"); //$NON-NLS-1$ + if (version != null) { + return version; + } version = (String)props.get("Specification-Version");//$NON-NLS-1$ } catch (IOException e) { // version = "" Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2011-12-16 17:55:19 UTC (rev 37400) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -34,6 +34,7 @@ runtimeServerTypeMap.put(IJBossToolingConstants.AS_70, IJBossToolingConstants.SERVER_AS_70); runtimeServerTypeMap.put(IJBossToolingConstants.EAP_43, IJBossToolingConstants.SERVER_EAP_43); runtimeServerTypeMap.put(IJBossToolingConstants.EAP_50, IJBossToolingConstants.SERVER_EAP_50); + runtimeServerTypeMap.put(IJBossToolingConstants.EAP_60, IJBossToolingConstants.SERVER_EAP_60); // NEW_SERVER_ADAPTER Add the server / runtime mapping here } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2011-12-16 17:55:19 UTC (rev 37400) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -220,11 +220,11 @@ TaskModel.TASK_RUNTIME); String adapterVersion = rt.getRuntimeType().getVersion(); - if(!isEAP() && (adapterVersion.equals("7.0") && !version.startsWith("7.0.")) - || (adapterVersion.equals("7.1") && version.startsWith("7.0."))) { + if(!isEAP() && ((adapterVersion.equals("7.0") && !version.startsWith("7.0.")) + || (adapterVersion.equals("7.1") && version.startsWith("7.0."))) ) { return NLS.bind(Messages.rwf_homeIncorrectVersionError, adapterVersion, version); } - if( isEAP() && (adapterVersion.equals("6.0") && !version.startsWith("7."))) + if( isEAP() && !adapterVersion.equals("6.0") ) return NLS.bind(Messages.rwf_homeIncorrectVersionError, adapterVersion, version); return null; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-12-16 17:55:19 UTC (rev 37400) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -164,9 +164,11 @@ String runtimeTypeId = null; if( version.compareTo("5.0") < 0 ) //$NON-NLS-1$ runtimeTypeId=IJBossToolingConstants.EAP_43; - else + else if( version.compareTo("6.0") < 0 ) //$NON-NLS-1$ runtimeTypeId=IJBossToolingConstants.EAP_50; - + else + runtimeTypeId=IJBossToolingConstants.EAP_60 + ; IPath path2 = path.append(IJBossRuntimeResourceConstants.JBOSS_AS_EAP_DIRECTORY); if( runtimeTypeId != null ) { try { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-12-16 17:55:19 UTC (rev 37400) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -683,7 +683,7 @@ if( !isEAP() && v.startsWith("7.")) v = "7."; if( isEAP() && v.startsWith("6.")) - v = "7."; + v = "6."; if( !isEAP() && v.startsWith("7.")) v = "7."; Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/ServerBeanLoaderTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/ServerBeanLoaderTest.java 2011-12-16 17:55:19 UTC (rev 37400) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/ServerBeanLoaderTest.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -40,11 +40,7 @@ serverBeanLoaderTestAS6AndBelow("serverEAP5/jbossas", IJBossToolingConstants.SERVER_EAP_50, JBossServerType.EAP_STD,IJBossToolingConstants.V5_0); } public void testEAP60() { - try { serverBeanLoaderTestAS7Style("serverEap6", IJBossToolingConstants.SERVER_EAP_60, JBossServerType.EAP6,IJBossToolingConstants.V6_0); - } catch(AssertionError e) { - // TODO FIX THIS SITUATION!!! NOT expected failure, but, this test cannot run correctly. - } } private void serverBeanLoaderTestAS6AndBelow(String name, String serverTypeId, 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-12-16 17:55:19 UTC (rev 37400) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/IJBossRuntimePluginConstants.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -38,7 +38,9 @@ "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.71" //$NON-NLS-1$ + "org.jboss.ide.eclipse.as.runtime.71", //$NON-NLS-1$ + "org.jboss.ide.eclipse.as.runtime.eap.60" //$NON-NLS-1$ + // NEW_SERVER_ADAPTER add logic for new adapter here }; public static final String HSQLDB_DRIVER_JAR_NAME = "hsqldb.jar"; //$NON-NLS-1$ @@ -69,7 +71,8 @@ "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.71" //$NON-NLS-1$ + "org.jboss.ide.eclipse.as.71", //$NON-NLS-1$ + "org.jboss.ide.eclipse.as.eap.60" //$NON-NLS-1$ }; public static final String JBOSS_AS_NAME[] = { @@ -82,7 +85,8 @@ 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_1 + Messages.JBossRuntimeStartup_JBoss_Application_Server_7_1, + Messages.JBossRuntimeStartup_JBoss_EAP_Server_6_0 }; 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-12-16 17:55:19 UTC (rev 37400) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/Messages.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -27,6 +27,8 @@ public static String JBossRuntimeStartup_JBoss_Application_Server_5_1; public static String JBossRuntimeStartup_JBoss_EAP_Server_4_3; public static String JBossRuntimeStartup_JBoss_EAP_Server_5_0; + public static String JBossRuntimeStartup_JBoss_EAP_Server_6_0; + // NEW_SERVER_ADAPTER add logic for new adapter here public static String JBossRuntimeStartup_Runtime; public static String JBossRuntimeStartup_The_JBoss_AS_Hypersonic_embedded_database; static { 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-12-16 17:55:19 UTC (rev 37400) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/as/detector/messages.properties 2011-12-16 18:15:42 UTC (rev 37401) @@ -11,5 +11,6 @@ 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_JBoss_EAP_Server_6_0=JBoss EAP Server 6.0 JBossRuntimeStartup_Runtime=Runtime JBossRuntimeStartup_The_JBoss_AS_Hypersonic_embedded_database=The JBoss AS Hypersonic embedded database 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-12-16 17:55:19 UTC (rev 37400) +++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-12-16 18:15:42 UTC (rev 37401) @@ -63,6 +63,7 @@ private static final int JBOSS_AS70_INDEX = 8; private static final int JBOSS_AS71_INDEX = 9; + private static final int JBOSS_EAP60_INDEX = 10; 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$ @@ -73,6 +74,10 @@ private static File getLocation(ServerDefinition serverDefinition) { String type = serverDefinition.getType(); + String version = serverDefinition.getVersion(); + if (EAP.equals(type) && version != null && version.startsWith("6") ) { + return serverDefinition.getLocation(); + } if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type)) { return new File(serverDefinition.getLocation(), "jboss-as"); } @@ -103,7 +108,7 @@ || EAP_STD.equals(type)) { String name = serverDefinition.getName(); String runtimeName = name + " " + RUNTIME; //$NON-NLS-1$ - int index = getJBossASVersion(asLocation); + int index = getJBossASVersion(asLocation, serverDefinition); createJBossServer(asLocation, index, name, runtimeName); } else if (AS.equals(type)){ String version = serverDefinition.getVersion(); @@ -125,15 +130,23 @@ } else if ("7.1".equals(version)) { //$NON-NLS-1$ index = JBOSS_AS71_INDEX; } + // NEW_SERVER_ADAPTER add logic for new adapter here createJBossServer(serverDefinition.getLocation(),index,serverDefinition.getName(),serverDefinition.getName() + " " + RUNTIME); //$NON-NLS-1$ } createJBossServerFromDefinitions(serverDefinition.getIncludedServerDefinitions()); } } - private static int getJBossASVersion(File asLocation) { + private static int getJBossASVersion(File asLocation, ServerDefinition serverDefinition) { int index = -1; - String fullVersion = new ServerBeanLoader().getFullServerVersion(new File(asLocation, JBossServerType.AS.getSystemJarPath())); + String type = serverDefinition.getType(); + String ver = serverDefinition.getVersion(); + String fullVersion; + if (EAP.equals(type) && "6.0".equals(ver)) { + fullVersion = new ServerBeanLoader().getFullServerVersion(new File(asLocation, JBossServerType.EAP6.getSystemJarPath())); + } else { + fullVersion = new ServerBeanLoader().getFullServerVersion(new File(asLocation, JBossServerType.AS.getSystemJarPath())); + } if(fullVersion != null ) { String version = fullVersion.substring(0, 3); if ("4.3".equals(version)) { //$NON-NLS-1$ @@ -146,6 +159,9 @@ } else if ("5.2".equals(version)) { //$NON-NLS-1$ // SOA-P 5.2 index = 7; + } else if ("6.0".equals(version)) { //$NON-NLS-1$ + // EAP 6.0 + index = 10; } } return index; @@ -252,7 +268,7 @@ // Don't create the driver a few times return; } - if (index == JBOSS_AS70_INDEX || index == JBOSS_AS71_INDEX) { + if (index == JBOSS_AS70_INDEX || index == JBOSS_AS71_INDEX || index == JBOSS_EAP60_INDEX) { // AS 7 return; }