Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge "update to include Jetty8.0 and Jetty8.1"

  • Loading branch information...
commit 4580fe23b43ba27655e9cf2ea80e232b75e875dc 2 parents c8cb32f + 20a343c
@jmcc0nn3ll jmcc0nn3ll authored Gerrit Code Review @ Eclipse.org committed
View
8 org.eclipse.jst.server.jetty.core/plugin.properties
@@ -31,9 +31,13 @@ runtimeTypeJetty74Description=Jetty v7.5 supports J2EE 1.2, 1.3, 1.4, and Java E
runtimeTypeJetty74Label=Jetty v7.6
runtimeTypeJetty74Description=Jetty v7.6 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.
-runtimeTypeJetty80Label=Jetty v8.x
+runtimeTypeJetty80Label=Jetty v8.0
runtimeTypeJetty80Description=Jetty v8.0 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.
+runtimeTypeJetty81Label=Jetty v8.1
+runtimeTypeJetty81Description=Jetty v8.1 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.
+
+
# --------------- Servers ---------------
jetty71ServerType=Jetty v7.1 Server
jetty71ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.
@@ -49,6 +53,8 @@ jetty74ServerType=Jetty v7.6 Server
jetty74ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.
jetty80ServerType=Jetty v8.0 Server
jetty80ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.
+jetty81ServerType=Jetty v8.1 Server
+jetty81ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.
jettyLaunchConfigurationType=Jetty
View
63 org.eclipse.jst.server.jetty.core/plugin.xml
@@ -130,7 +130,20 @@
versions="1.0"/>
</runtimeType>
-
+ <runtimeType
+ id="org.eclipse.jst.server.jetty.runtime.81"
+ name="%runtimeTypeJetty81Label"
+ description="%runtimeTypeJetty81Description"
+ vendor="%jetty"
+ version="8.1"
+ class="org.eclipse.jst.server.jetty.core.internal.JettyRuntime">
+ <moduleType
+ types="jst.web"
+ versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
+ <moduleType
+ types="jst.utility"
+ versions="1.0"/>
+ </runtimeType>
</extension>
<extension point="org.eclipse.wst.server.core.runtimeLocators">
@@ -262,6 +275,21 @@
behaviourClass="org.eclipse.jst.server.jetty.core.internal.JettyServerBehaviour">
</serverType>
+ <serverType
+ id="org.eclipse.jst.server.jetty.81"
+ name="%jetty81ServerType"
+ description="%jetty81ServerDescription"
+ supportsRemoteHosts="false"
+ runtime="true"
+ startTimeout="30000"
+ stopTimeout="15000"
+ initialState="stopped"
+ hasConfiguration="true"
+ launchConfigId="org.eclipse.jst.server.jetty.core.launchConfigurationType"
+ runtimeTypeId="org.eclipse.jst.server.jetty.runtime.81"
+ class="org.eclipse.jst.server.jetty.core.internal.JettyServer"
+ behaviourClass="org.eclipse.jst.server.jetty.core.internal.JettyServerBehaviour">
+ </serverType>
</extension>
<extension point="org.eclipse.wst.server.core.serverLocators">
@@ -326,7 +354,10 @@
<runtime-component-version
type="org.eclipse.jst.server.jetty"
version="8.0"/>
-
+ <runtime-component-version
+ type="org.eclipse.jst.server.jetty"
+ version="8.1"/>
+
<adapter>
<runtime-component
id="org.eclipse.jst.server.jetty"/>
@@ -421,6 +452,21 @@
id="jst.utility"
version="1.0"/>
</supported>
+
+ <supported>
+ <runtime-component
+ id="org.eclipse.jst.server.jetty"
+ version="8.1"/>
+ <facet
+ id="jst.web"
+ version="2.2,2.3,2.4,2.5,3.0"/>
+ <facet
+ id="jst.webfragment"
+ version="3.0"/>
+ <facet
+ id="jst.utility"
+ version="1.0"/>
+ </supported>
</extension>
<extension point="org.eclipse.wst.common.project.facet.core.defaultFacets">
@@ -459,6 +505,10 @@
runtimeTypeId="org.eclipse.jst.server.jetty.runtime.80"
runtime-component="org.eclipse.jst.server.jetty"
version="8.0"/>
+ <runtimeFacetMapping
+ runtimeTypeId="org.eclipse.jst.server.jetty.runtime.81"
+ runtime-component="org.eclipse.jst.server.jetty"
+ version="8.1"/>
</extension>
<extension point="org.eclipse.wst.server.core.installableRuntimes">
@@ -500,7 +550,12 @@
<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" />
+ archiveUrl="http://download.eclipse.org/jetty/8.0.4.v20111024/dist/jetty-distribution-8.0.4.v20111024.zip"
+ archivePath="jetty-distribution-8.0.4.v20111024" />
+ <runtime
+ id="org.eclipse.jst.server.jetty.runtime.81"
+ licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"
+ archiveUrl="http://download.eclipse.org/jetty/8.1.1.v20120215/dist/jetty-distribution-8.1.1.v20120215.zip"
+ archivePath="jetty-distribution-8.1.1.v20120215" />
</extension>
</plugin>
View
3  org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java
@@ -34,7 +34,7 @@
public enum JettyVersion
{
- V71, V72, V73, V74, V75, V76, V80
+ V71, V72, V73, V74, V75, V76, V80, V81
}
private JettyVersionManager()
@@ -46,6 +46,7 @@ private JettyVersionManager()
register(JettyVersion.V75, Jetty7Provider.__INSTANCE);
register(JettyVersion.V76, Jetty7Provider.__INSTANCE);
register(JettyVersion.V80, Jetty8Provider.__INSTANCE);
+ register(JettyVersion.V81, Jetty8Provider.__INSTANCE);
}
public void register(JettyVersion version, IJettyVersionProvider versionProvider)
View
12 org.eclipse.jst.server.jetty.ui/plugin.xml
@@ -79,6 +79,14 @@
id="org.eclipse.jst.server.jetty.80"
icon="icons/obj16/jetty.gif"
typeIds="org.eclipse.jst.server.jetty.80"/>
+ <image
+ id="org.eclipse.jst.server.jetty.81"
+ icon="icons/obj16/jetty.gif"
+ typeIds="org.eclipse.jst.server.jetty.runtime.81"/>
+ <image
+ id="org.eclipse.jst.server.jetty.81"
+ icon="icons/obj16/jetty.gif"
+ typeIds="org.eclipse.jst.server.jetty.81"/>
</extension>
<extension point="org.eclipse.core.expressions.propertyTesters">
@@ -146,6 +154,10 @@
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"/>
+ <fragment
+ id="org.eclipse.jst.server.jetty.runtime.81"
+ typeIds="org.eclipse.jst.server.jetty.runtime.81"
+ class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"/>
</extension>
<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
Please sign in to comment.
Something went wrong with that request. Please try again.