Author: rob.stryker(a)jboss.com Date: 2009-07-16 15:02:27 -0400 (Thu, 16 Jul 2009) New Revision: 16602 Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java Log: JBIDE-4577 Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml 2009-07-16 19:00:16 UTC (rev 16601) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml 2009-07-16 19:02:27 UTC (rev 16602) @@ -40,6 +40,13 @@ <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> </adapter> + <adapter> + <runtime-component + id="org.jboss.ide.eclipse.as.runtime.component" version="5.1"/> + <factory class="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeClasspathProvider$Factory"/> + <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> + </adapter> + <adapter> <runtime-component id="org.jboss.ide.eclipse.eap.runtime.component" version="4.3"/> @@ -47,7 +54,12 @@ <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> </adapter> - + <adapter> + <runtime-component + id="org.jboss.ide.eclipse.eap.runtime.component" version="5.0"/> + <factory class="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeClasspathProvider$Factory"/> + <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> + </adapter> </extension> <extension @@ -62,7 +74,7 @@ <extension point="org.eclipse.jst.server.core.runtimeClasspathProviders"> <runtimeClasspathProvider id="org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget" - runtimeTypeIds="org.jboss.ide.eclipse.as.runtime.32, org.jboss.ide.eclipse.as.runtime.40, org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.eap.43" + runtimeTypeIds="org.jboss.ide.eclipse.as.runtime.32, org.jboss.ide.eclipse.as.runtime.40, org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51, org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.eap.50" class="org.jboss.ide.eclipse.as.classpath.core.runtime.ClientAllRuntimeClasspathProvider"/> </extension> <extension Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java 2009-07-16 19:00:16 UTC (rev 16601) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ClasspathConstants.java 2009-07-16 19:02:27 UTC (rev 16602) @@ -18,7 +18,9 @@ public static final String AS_40 = "org.jboss.ide.eclipse.as.runtime.40"; //$NON-NLS-1$ public static final String AS_42 = "org.jboss.ide.eclipse.as.runtime.42"; //$NON-NLS-1$ public static final String AS_50 = "org.jboss.ide.eclipse.as.runtime.50"; //$NON-NLS-1$ + public static final String AS_51 = "org.jboss.ide.eclipse.as.runtime.51"; //$NON-NLS-1$ public static final String EAP_43 = "org.jboss.ide.eclipse.as.runtime.eap.43"; //$NON-NLS-1$ + public static final String EAP_50 = "org.jboss.ide.eclipse.as.runtime.eap.50"; //$NON-NLS-1$ /* Version Strings */ public static final String V3_0 = "3.0"; //$NON-NLS-1$ @@ -26,6 +28,7 @@ public static final String V4_0 = "4.0"; //$NON-NLS-1$ public static final String V4_2 = "4.2"; //$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$ /* Files and folders that must be added to CP */ Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2009-07-16 19:00:16 UTC (rev 16601) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2009-07-16 19:02:27 UTC (rev 16602) @@ -62,7 +62,9 @@ if(AS_40.equals(rtID)) return get40(loc,config); if(AS_42.equals(rtID)) return get42(loc,config); if(AS_50.equals(rtID)) return get50(loc,config); + if(AS_51.equals(rtID)) return get51(loc,config); if(EAP_43.equals(rtID)) return getEAP43(loc,config); + if(EAP_50.equals(rtID)) return getEAP50(loc,config); return null; } @@ -96,6 +98,10 @@ return get40(location, config); } + protected IClasspathEntry[] getEAP50(IPath location, String config) { + return get51(location, config); + } + protected IClasspathEntry[] get50(IPath location, String config) { ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); IPath configPath = location.append(SERVER).append(config); @@ -112,6 +118,10 @@ return list.toArray(new IClasspathEntry[list.size()]); } + protected IClasspathEntry[] get51(IPath location, String config) { + return get50(location, config); + } + protected IClasspathEntry getEntry(IPath path) { return JavaRuntime.newArchiveRuntimeClasspathEntry(path).getClasspathEntry(); }