Getting the runtime bridge and binding to work after facet rename.
diff --git a/plugins/org.eclipse.jst.server.core/plugin.xml b/plugins/org.eclipse.jst.server.core/plugin.xml
index 823af6e..5bbf1da 100644
--- a/plugins/org.eclipse.jst.server.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.core/plugin.xml
@@ -129,7 +129,7 @@
version="3.2"
allow-newer="true"/>
<facet
- id="web"
+ id="jst.web"
version="2.2"/>
</supported>
@@ -139,7 +139,7 @@
version="4.0"
allow-newer="true"/>
<facet
- id="web"
+ id="jst.web"
version="2.3"/>
</supported>
@@ -149,7 +149,7 @@
version="4.1"
allow-newer="true"/>
<facet
- id="web"
+ id="jst.web"
version="2.4"/>
</supported>
@@ -159,7 +159,7 @@
version="5.5"
allow-newer="true"/>
<facet
- id="web"
+ id="jst.web"
version="2.4"/>
</supported>
@@ -185,12 +185,12 @@
<supported>
<runtime-component id="standard.jre" version="1.4"/>
- <facet id="java" version="1.4"/>
+ <facet id="jst.java" version="1.4"/>
</supported>
<supported>
<runtime-component id="standard.jre" version="5.0"/>
- <facet id="java" version="5.0"/>
+ <facet id="jst.java" version="5.0"/>
</supported>
</extension>
</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/StandardJreClasspathProvider.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/StandardJreClasspathProvider.java
index 9a2c077..65cab72 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/StandardJreClasspathProvider.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/StandardJreClasspathProvider.java
@@ -36,7 +36,7 @@
{
private static final IProjectFacet JAVA_FEATURE
- = ProjectFacetsManager.getProjectFacet( "java" );
+ = ProjectFacetsManager.getProjectFacet( "jst.java" );
private static final String STANDARD_VM_TYPE
= "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType";
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/TomcatClasspathProvider.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/TomcatClasspathProvider.java
index d0b2f9c..04d0500 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/TomcatClasspathProvider.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/TomcatClasspathProvider.java
@@ -27,7 +27,7 @@
*
*/
public final class TomcatClasspathProvider implements IClasspathProvider {
- private static final IProjectFacet WEB_FEATURE = ProjectFacetsManager.getProjectFacet("web");
+ private static final IProjectFacet WEB_FEATURE = ProjectFacetsManager.getProjectFacet("jst.web");
private final IRuntimeComponent rc;
