[Bug 353169] missing jetty 73 and 74 runtimes in Dynamic web project creation
diff --git a/org.eclipse.jst.server.jetty.core/plugin.properties b/org.eclipse.jst.server.jetty.core/plugin.properties
index 1c7eb43..69fb32d 100644
--- a/org.eclipse.jst.server.jetty.core/plugin.properties
+++ b/org.eclipse.jst.server.jetty.core/plugin.properties
@@ -25,7 +25,6 @@
runtimeTypeJetty74Label=Jetty v7.4
runtimeTypeJetty74Description=Jetty v7.4 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.
-
runtimeTypeJetty80Label=Jetty v8.x
runtimeTypeJetty80Description=Jetty v8.0 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.
diff --git a/org.eclipse.jst.server.jetty.core/plugin.xml b/org.eclipse.jst.server.jetty.core/plugin.xml
index b39ea07..90f42f9 100644
--- a/org.eclipse.jst.server.jetty.core/plugin.xml
+++ b/org.eclipse.jst.server.jetty.core/plugin.xml
@@ -238,11 +238,10 @@
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<runtime-component-type
id="org.eclipse.jst.server.jetty"/>
-
+
<runtime-component-version
type="org.eclipse.jst.server.jetty"
version="7.1"/>
-
<runtime-component-version
type="org.eclipse.jst.server.jetty"
version="7.2"/>
@@ -292,6 +291,30 @@
<supported>
<runtime-component
id="org.eclipse.jst.server.jetty"
+ version="7.3"/>
+ <facet
+ id="jst.web"
+ version="2.2,2.3,2.4,2.5"/>
+ <facet
+ id="jst.utility"
+ version="1.0"/>
+ </supported>
+
+ <supported>
+ <runtime-component
+ id="org.eclipse.jst.server.jetty"
+ version="7.4"/>
+ <facet
+ id="jst.web"
+ version="2.2,2.3,2.4,2.5"/>
+ <facet
+ id="jst.utility"
+ version="1.0"/>
+ </supported>
+
+ <supported>
+ <runtime-component
+ id="org.eclipse.jst.server.jetty"
version="8.0"/>
<facet
id="jst.web"
diff --git a/org.eclipse.jst.server.jetty.site/pom.xml b/org.eclipse.jst.server.jetty.site/pom.xml
index cd93cf2..c5ea126 100644
--- a/org.eclipse.jst.server.jetty.site/pom.xml
+++ b/org.eclipse.jst.server.jetty.site/pom.xml
@@ -29,9 +29,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty.toolchain</groupId>
+ <groupId>org.eclipse.dash.maven</groupId>
<artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.2.0-SNAPSHOT</version>
<executions>
<!-- example of executing locally for pack -->
<execution>
@@ -44,6 +44,9 @@
<!-- the sign remote -->
<execution>
<id>sign</id>
+ <configuration>
+ <signerInputDirectory>/home/data/httpd/download-staging.priv/jetty</signerInputDirectory>
+ </configuration>
<phase>package</phase>
<goals>
<goal>sign</goal>
@@ -52,12 +55,9 @@
<!-- example of remote pack -->
<execution>
<id>repack</id>
- <configuration>
- <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
- </configuration>
<phase>package</phase>
<goals>
- <goal>pack</goal>
+ <goal>repack</goal>
</goals>
</execution>
<!-- signing and pack alters tycho checksums so fix them -->
@@ -101,5 +101,12 @@
</plugins>
</build>
</profile>
+
</profiles>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>maven.eclipse.org</id>
+ <url>http://maven.eclipse.org/nexus/content/repositories/milestone-indigo</url>
+ </pluginRepository>
+ </pluginRepositories>
</project>
