Author: rob.stryker(a)jboss.com Date: 2010-06-08 06:48:22 -0400 (Tue, 08 Jun 2010) New Revision: 22623 Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java Log: JBIDE-6345 - initial fix Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java =================================================================== --- branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2010-06-08 04:38:22 UTC (rev 22622) +++ branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2010-06-08 10:48:22 UTC (rev 22623) @@ -28,6 +28,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jst.common.project.facet.core.IClasspathProvider; +import org.eclipse.jst.common.project.facet.core.JavaFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent; @@ -58,7 +59,7 @@ public List getClasspathEntries(final IProjectFacetVersion fv) { IPath path = null; - if( fv.getProjectFacet().getId().equals(ClasspathConstants.FACET_JST_JAVA) ) { + if( fv.getProjectFacet().equals(JavaFacet.FACET)) { path = new Path(CONTAINER_ID); path = path.append(rc.getProperty("id")); //$NON-NLS-1$ path = path.append(fv.getProjectFacet().getId()); Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java =================================================================== --- branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2010-06-08 04:38:22 UTC (rev 22622) +++ branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2010-06-08 10:48:22 UTC (rev 22623) @@ -25,6 +25,7 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.launching.IVMInstall; import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.jst.common.project.facet.core.JavaFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.server.core.IRuntime; @@ -48,7 +49,6 @@ public class WebtoolsProjectJBossClasspathContainerInitializer extends ClasspathContainerInitializer implements ClasspathConstants { - public static final IProjectFacet JST_JAVA_FACET = ProjectFacetsManager.getProjectFacet(FACET_JST_JAVA); public static final IProjectFacet WEB_FACET = ProjectFacetsManager.getProjectFacet(FACET_WEB); public static final IProjectFacet EJB_FACET = ProjectFacetsManager.getProjectFacet(FACET_EJB); public static final IProjectFacet EAR_FACET = ProjectFacetsManager.getProjectFacet(FACET_EAR); @@ -141,7 +141,7 @@ protected IClasspathEntry[] loadClasspathEntries2(String runtimeId, String facetId, String facetVersion, String serverHome, String configName, String jbVersion, IJBossServerRuntime jbsRuntime) { - if( facetId.equals(JST_JAVA_FACET.getId())) { + if( ProjectFacetsManager.getProjectFacet(facetId).equals(JavaFacet.FACET)) { return loadJREClasspathEntries(jbsRuntime); } else if(V5_0.equals(jbVersion)) { return loadClasspathEntriesDefault(facetId, facetVersion, serverHome, configName); Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java =================================================================== --- branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2010-06-08 04:38:22 UTC (rev 22622) +++ branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2010-06-08 10:48:22 UTC (rev 22623) @@ -12,6 +12,7 @@ public interface IWTPConstants { /* Facet / Module Names */ + @Deprecated // DO NOT USE THIS public static final String FACET_JST_JAVA = "jst.java"; //$NON-NLS-1$ public static final String FACET_WEB = "jst.web";//$NON-NLS-1$ public static final String FACET_EJB = "jst.ejb";//$NON-NLS-1$