[115352] Icons for facet runtimes
diff --git a/plugins/org.eclipse.jst.server.core/plugin.xml b/plugins/org.eclipse.jst.server.core/plugin.xml
index 38ee065..f73aa93 100644
--- a/plugins/org.eclipse.jst.server.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.core/plugin.xml
@@ -92,9 +92,7 @@
</extension>
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <runtime-component-type id="standard.jre">
- <!-- <icon>images/jre.gif</icon> -->
- </runtime-component-type>
+ <runtime-component-type id="standard.jre"/>
<runtime-component-version
type="standard.jre"
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
index 89c117f..b66a9ca 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
@@ -214,9 +214,7 @@
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<runtime-component-type
- id="org.eclipse.jst.server.tomcat">
- <!-- <icon>images/tomcat.gif</icon> -->
- </runtime-component-type>
+ id="org.eclipse.jst.server.tomcat"/>
<runtime-component-version
type="org.eclipse.jst.server.tomcat"
@@ -250,34 +248,58 @@
<supported>
<runtime-component
id="org.eclipse.jst.server.tomcat"
- version=">=3.2"/>
+ version="3.2"/>
<facet
id="jst.web"
version="2.2"/>
+ <facet
+ id="jst.utility"
+ version="1.0"/>
</supported>
<supported>
<runtime-component
id="org.eclipse.jst.server.tomcat"
- version=">=4.0"/>
+ version="4.0"/>
<facet
id="jst.web"
- version="2.3"/>
+ version="2.2,2.3"/>
+ <facet
+ id="jst.utility"
+ version="1.0"/>
</supported>
<supported>
<runtime-component
id="org.eclipse.jst.server.tomcat"
- version=">=5.0"/>
+ version="4.1"/>
<facet
id="jst.web"
- version="2.4"/>
+ version="2.2,2.3,2.4"/>
+ <facet
+ id="jst.utility"
+ version="1.0"/>
</supported>
<supported>
<runtime-component
id="org.eclipse.jst.server.tomcat"
- version=">=3.2"/>
+ version="5.0"/>
+ <facet
+ id="jst.web"
+ version="2.2,2.3,2.4"/>
+ <facet
+ id="jst.utility"
+ version="1.0"/>
+ </supported>
+
+ <supported>
+ <runtime-component
+ id="org.eclipse.jst.server.tomcat"
+ version="5.5"/>
+ <facet
+ id="jst.web"
+ version="2.2,2.3,2.4"/>
<facet
id="jst.utility"
version="1.0"/>
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
index eafb85b..0623976 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/plugin.xml
@@ -120,7 +120,7 @@
typeIds="org.eclipse.jst.server.tomcat.runtime.55"
class="org.eclipse.jst.server.tomcat.ui.internal.TomcatRuntimeWizardFragment"/>
</extension>
-
+
<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
<launchConfigurationTypeImage
id="org.eclipse.jst.server.tomcat.ui.launchConfigurationTypeImage"
@@ -137,4 +137,8 @@
</launchConfigurationTabGroup>
</extension>
+ <extension point="org.eclipse.wst.common.project.facet.ui.images">
+ <image runtime-component-type="org.eclipse.jst.server.tomcat"
+ path="icons/obj16/tomcat.gif"/>
+ </extension>
</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/icons/obj16/jre.gif b/plugins/org.eclipse.jst.server.ui/icons/obj16/jre.gif
new file mode 100644
index 0000000..cb55e33
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.ui/icons/obj16/jre.gif
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.ui/plugin.xml b/plugins/org.eclipse.jst.server.ui/plugin.xml
index c21b923..8ae14a6 100644
--- a/plugins/org.eclipse.jst.server.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.ui/plugin.xml
@@ -97,4 +97,8 @@
</adapter>
</extension>
+ <extension point="org.eclipse.wst.common.project.facet.ui.images">
+ <image runtime-component-type="standard.jre"
+ path="icons/obj16/jre.gif"/>
+ </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 dd89986..0c2bdf5 100644
--- a/plugins/org.eclipse.jst.server.websphere.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.websphere.core/plugin.xml
@@ -109,25 +109,18 @@
version="6.0"/>
<facet
id="jst.web"
- version=">=2.2"/>
- </supported>
-
- <supported>
- <runtime-component
- id="org.eclipse.jst.server.generic.runtime.websphere"
- version="6.0"/>
+ version="2.2,2.3,2.4"/>
<facet
id="jst.ejb"
- version=">=1.1"/>
- </supported>
-
- <supported>
- <runtime-component
- id="org.eclipse.jst.server.generic.runtime.websphere"
- version="6.0"/>
+ version="1.1,2.0,2.1"/>
<facet
id="jst.ear"
- version=">=1.2"/>
+ version="1.2,1.3,1.4"/>
</supported>
</extension>
-</plugin>
+
+ <extension point="org.eclipse.wst.common.project.facet.ui.images">
+ <image runtime-component-type="org.eclipse.jst.server.generic.runtime.websphere"
+ path="icons/obj16/websphere.gif"/>
+ </extension>
+</plugin>
\ No newline at end of file
