[124389] Move facet extensions out to adapter plugins
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
index 0623976..a4b40a7 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
@@ -141,4 +141,12 @@
<image runtime-component-type="org.eclipse.jst.server.tomcat"
path="icons/obj16/tomcat.gif"/>
</extension>
+
+ <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
+ <adapter>
+ <runtime-component id="org.eclipse.jst.server.tomcat"/>
+ <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
+ <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
+ </adapter>
+ </extension>
</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/plugin.xml b/plugins/org.eclipse.jst.server.ui/plugin.xml
index 606fe77..11b5830 100644
--- a/plugins/org.eclipse.jst.server.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.ui/plugin.xml
@@ -61,36 +61,6 @@
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<adapter>
- <runtime-component id="org.eclipse.jst.server.tomcat"/>
- <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
- <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
- </adapter>
- <adapter>
- <runtime-component id="org.eclipse.jst.server.generic.runtime.websphere"/>
- <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
- <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
- </adapter>
- <adapter>
- <runtime-component id="org.eclipse.jst.server.generic.runtime.weblogic"/>
- <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
- <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
- </adapter>
- <adapter>
- <runtime-component id="org.eclipse.jst.server.generic.runtime.jboss"/>
- <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
- <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
- </adapter>
- <adapter>
- <runtime-component id="org.eclipse.jst.server.generic.runtime.jonas"/>
- <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
- <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
- </adapter>
- <adapter>
- <runtime-component id="org.eclipse.jst.server.generic.runtime.oracle"/>
- <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
- <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
- </adapter>
- <adapter>
<runtime-component id="standard.jre"/>
<factory class="org.eclipse.jst.server.ui.internal.StandardJreLabelProvider$Factory"/>
<type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
@@ -103,4 +73,12 @@
<image runtime-component-type="org.eclipse.jst.server.core.runtimeType"
path="icons/obj16/java_jar.gif"/>
</extension>
+
+ <extension point="org.eclipse.jdt.ui.classpathContainerPage">
+ <classpathContainerPage
+ id="org.eclipse.jst.server.core.container"
+ name="%classpathContainer"
+ class="org.eclipse.jst.server.ui.internal.ServerClasspathContainerPage">
+ </classpathContainerPage>
+ </extension>
</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.websphere.core/plugin.xml b/plugins/org.eclipse.jst.server.websphere.core/plugin.xml
index a52a573..a776c55 100644
--- a/plugins/org.eclipse.jst.server.websphere.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.websphere.core/plugin.xml
@@ -142,4 +142,12 @@
<image runtime-component-type="org.eclipse.jst.server.generic.runtime.websphere"
path="icons/obj16/websphere.gif"/>
</extension>
+
+ <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
+ <adapter>
+ <runtime-component id="org.eclipse.jst.server.generic.runtime.websphere"/>
+ <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
+ <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
+ </adapter>
+ </extension>
</plugin>
\ No newline at end of file