[Bug 353041] resolve missing server registration for 73 and 74
diff --git a/org.eclipse.jst.server.jetty.core/plugin.xml b/org.eclipse.jst.server.jetty.core/plugin.xml
index 1767f8a..b39ea07 100644
--- a/org.eclipse.jst.server.jetty.core/plugin.xml
+++ b/org.eclipse.jst.server.jetty.core/plugin.xml
@@ -360,11 +360,9 @@
licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt">
</runtime>
<runtime
- id="org.eclipse.jst.server.jetty.runtime.80"
- licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
- archiveUrl="http://download.eclipse.org/jetty/8.0.0.M3/dist/jetty-distribution-8.0.0.M3.zip"
- archivePath="jetty-distribution-8.0.0.M3" />
-
+ id="org.eclipse.jst.server.jetty.runtime.80"
+ licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
+ archiveUrl="http://download.eclipse.org/jetty/8.0.0.M3/dist/jetty-distribution-8.0.0.M3.zip"
+ archivePath="jetty-distribution-8.0.0.M3" />
</extension>
-
</plugin>
diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java
index 680a4ce..ccff2b2 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java
@@ -34,16 +34,15 @@
public enum JettyVersion
{
- V71, V72, V80
+ V71, V72, V73, V74, V80
}
private JettyVersionManager()
{
- // Jetty 7.1
register(JettyVersion.V71, Jetty7Provider.__INSTANCE);
- // Jetty 7.2
register(JettyVersion.V72, Jetty7Provider.__INSTANCE);
- // Jetty 8.0, same than Jetty7.0
+ register(JettyVersion.V73, Jetty7Provider.__INSTANCE);
+ register(JettyVersion.V74, Jetty7Provider.__INSTANCE);
register(JettyVersion.V80, Jetty8Provider.__INSTANCE);
}
diff --git a/org.eclipse.jst.server.jetty.ui/plugin.xml b/org.eclipse.jst.server.jetty.ui/plugin.xml
index e0aaef1..800dbfc 100644
--- a/org.eclipse.jst.server.jetty.ui/plugin.xml
+++ b/org.eclipse.jst.server.jetty.ui/plugin.xml
@@ -12,8 +12,7 @@
<?eclipse version="3.0"?>
<plugin>
-<extension point="org.eclipse.wst.server.ui.serverImages">
-
+<extension point="org.eclipse.wst.server.ui.serverImages">
<image
id="org.eclipse.jst.server.jetty.71"
icon="icons/obj16/jetty.gif"
@@ -21,17 +20,7 @@
<image
id="org.eclipse.jst.server.jetty.71"
icon="icons/obj16/jetty.gif"
- typeIds="org.eclipse.jst.server.jetty.71"/>
-
- <image
- id="org.eclipse.jst.server.jetty.80"
- icon="icons/obj16/jetty.gif"
- typeIds="org.eclipse.jst.server.jetty.runtime.80"/>
- <image
- id="org.eclipse.jst.server.jetty.80"
- icon="icons/obj16/jetty.gif"
- typeIds="org.eclipse.jst.server.jetty.80"/>
-
+ typeIds="org.eclipse.jst.server.jetty.71"/>
<image
icon="icons/obj16/jetty.gif"
id="org.eclipse.jst.server.jetty.72"
@@ -41,8 +30,7 @@
icon="icons/obj16/jetty.gif"
id="org.eclipse.jst.server.jetty.72"
typeIds="org.eclipse.jst.server.jetty.72">
- </image>
-
+ </image>
<image
icon="icons/obj16/jetty.gif"
id="org.eclipse.jst.server.jetty.73"
@@ -52,8 +40,7 @@
icon="icons/obj16/jetty.gif"
id="org.eclipse.jst.server.jetty.73"
typeIds="org.eclipse.jst.server.jetty.73">
- </image>
-
+ </image>
<image
icon="icons/obj16/jetty.gif"
id="org.eclipse.jst.server.jetty.74"
@@ -64,6 +51,14 @@
id="org.eclipse.jst.server.jetty.74"
typeIds="org.eclipse.jst.server.jetty.74">
</image>
+ <image
+ id="org.eclipse.jst.server.jetty.80"
+ icon="icons/obj16/jetty.gif"
+ typeIds="org.eclipse.jst.server.jetty.runtime.80"/>
+ <image
+ id="org.eclipse.jst.server.jetty.80"
+ icon="icons/obj16/jetty.gif"
+ typeIds="org.eclipse.jst.server.jetty.80"/>
</extension>
<extension point="org.eclipse.core.expressions.propertyTesters">
@@ -106,11 +101,7 @@
<fragment
id="org.eclipse.jst.server.jetty.runtime.71"
typeIds="org.eclipse.jst.server.jetty.runtime.71"
- class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"/>
- <fragment
- id="org.eclipse.jst.server.jetty.runtime.80"
- typeIds="org.eclipse.jst.server.jetty.runtime.80"
- class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"/>
+ class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"/>
<fragment
class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"
id="org.eclipse.jst.server.jetty.runtime.72"
@@ -123,6 +114,10 @@
class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"
id="org.eclipse.jst.server.jetty.runtime.74"
typeIds="org.eclipse.jst.server.jetty.runtime.74"/>
+ <fragment
+ id="org.eclipse.jst.server.jetty.runtime.80"
+ typeIds="org.eclipse.jst.server.jetty.runtime.80"
+ class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"/>
</extension>
<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
