From ec09778b132b3403759aba4a8f567e63528df6e9 Mon Sep 17 00:00:00 2001
From: Ben Galaviz
Date: Thu, 23 Feb 2012 15:55:08 -0600
Subject: add new jetty releases

---
 .../plugin.properties                              |  10 ++
 org.eclipse.jst.server.jetty.core/plugin.xml       | 121 ++++++++++++++++++++-
 .../jetty/core/internal/JettyVersionManager.java   |   4 +-
 org.eclipse.jst.server.jetty.ui/plugin.xml         |  28 +++++
 4 files changed, 159 insertions(+), 4 deletions(-)

diff --git a/org.eclipse.jst.server.jetty.core/plugin.properties b/org.eclipse.jst.server.jetty.core/plugin.properties
index 69fb32d..6f3eb0c 100644
--- a/org.eclipse.jst.server.jetty.core/plugin.properties
+++ b/org.eclipse.jst.server.jetty.core/plugin.properties
@@ -25,6 +25,12 @@ runtimeTypeJetty73Description=Jetty v7.3 supports J2EE 1.2, 1.3, 1.4, and Java E
 runtimeTypeJetty74Label=Jetty v7.4
 runtimeTypeJetty74Description=Jetty v7.4 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.
 
+runtimeTypeJetty74Label=Jetty v7.5
+runtimeTypeJetty74Description=Jetty v7.5 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.
+
+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
 runtimeTypeJetty80Description=Jetty v8.0 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.
 
@@ -37,6 +43,10 @@ jetty73ServerType=Jetty v7.3 Server
 jetty73ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.
 jetty74ServerType=Jetty v7.4 Server
 jetty74ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.
+jetty74ServerType=Jetty v7.5 Server
+jetty74ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.
+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.
 
diff --git a/org.eclipse.jst.server.jetty.core/plugin.xml b/org.eclipse.jst.server.jetty.core/plugin.xml
index 90f42f9..bd7329e 100644
--- a/org.eclipse.jst.server.jetty.core/plugin.xml
+++ b/org.eclipse.jst.server.jetty.core/plugin.xml
@@ -80,7 +80,41 @@
              versions="1.0">
        </moduleType>
     </runtimeType>
-        
+    
+    <runtimeType
+          class="org.eclipse.jst.server.jetty.core.internal.JettyRuntime"
+          description="%runtimeTypeJetty75Description"
+          id="org.eclipse.jst.server.jetty.runtime.75"
+          name="%runtimeTypeJetty75Label"
+          vendor="%jetty"
+          version="7.5">
+       <moduleType
+             types="jst.web"
+             versions="2.2, 2.3, 2.4, 2.5">
+       </moduleType>
+       <moduleType
+             types="jst.utility"
+             versions="1.0">
+       </moduleType>
+    </runtimeType>
+    
+    <runtimeType
+          class="org.eclipse.jst.server.jetty.core.internal.JettyRuntime"
+          description="%runtimeTypeJetty76Description"
+          id="org.eclipse.jst.server.jetty.runtime.76"
+          name="%runtimeTypeJetty76Label"
+          vendor="%jetty"
+          version="7.6">
+       <moduleType
+             types="jst.web"
+             versions="2.2, 2.3, 2.4, 2.5">
+       </moduleType>
+       <moduleType
+             types="jst.utility"
+             versions="1.0">
+       </moduleType>
+    </runtimeType>
+    
     <runtimeType
        id="org.eclipse.jst.server.jetty.runtime.80"
        name="%runtimeTypeJetty80Label"
@@ -180,6 +214,38 @@
            supportsRemoteHosts="false">
      </serverType>
      
+     <serverType
+           behaviourClass="org.eclipse.jst.server.jetty.core.internal.JettyServerBehaviour"
+           class="org.eclipse.jst.server.jetty.core.internal.JettyServer"
+           description="%jetty75ServerDescription"
+           hasConfiguration="true"
+           id="org.eclipse.jst.server.jetty.75"
+           initialState="stopped"
+           launchConfigId="org.eclipse.jst.server.jetty.core.launchConfigurationType"
+           name="%jetty75ServerType"
+           runtime="true"
+           runtimeTypeId="org.eclipse.jst.server.jetty.runtime.75"
+           startTimeout="30000"
+           stopTimeout="15000"
+           supportsRemoteHosts="false">
+     </serverType>
+     
+     <serverType
+           behaviourClass="org.eclipse.jst.server.jetty.core.internal.JettyServerBehaviour"
+           class="org.eclipse.jst.server.jetty.core.internal.JettyServer"
+           description="%jetty76ServerDescription"
+           hasConfiguration="true"
+           id="org.eclipse.jst.server.jetty.76"
+           initialState="stopped"
+           launchConfigId="org.eclipse.jst.server.jetty.core.launchConfigurationType"
+           name="%jetty76ServerType"
+           runtime="true"
+           runtimeTypeId="org.eclipse.jst.server.jetty.runtime.76"
+           startTimeout="30000"
+           stopTimeout="15000"
+           supportsRemoteHosts="false">
+     </serverType>
+     
      <serverType
        id="org.eclipse.jst.server.jetty.80"
        name="%jetty80ServerType"
@@ -251,7 +317,12 @@
     <runtime-component-version
        type="org.eclipse.jst.server.jetty"
        version="7.4"/>
-       
+    <runtime-component-version
+       type="org.eclipse.jst.server.jetty"
+       version="7.5"/>
+    <runtime-component-version
+       type="org.eclipse.jst.server.jetty"
+       version="7.6"/>
     <runtime-component-version
        type="org.eclipse.jst.server.jetty"
        version="8.0"/>
@@ -312,6 +383,30 @@
          version="1.0"/>
     </supported>
     
+    <supported>
+      <runtime-component
+         id="org.eclipse.jst.server.jetty"
+         version="7.5"/>
+      <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.6"/>
+      <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"
@@ -352,6 +447,14 @@
       runtime-component="org.eclipse.jst.server.jetty"
       runtimeTypeId="org.eclipse.jst.server.jetty.runtime.74"
       version="7.4"/>
+    <runtimeFacetMapping
+      runtime-component="org.eclipse.jst.server.jetty"
+      runtimeTypeId="org.eclipse.jst.server.jetty.runtime.75"
+      version="7.5"/>
+    <runtimeFacetMapping
+      runtime-component="org.eclipse.jst.server.jetty"
+      runtimeTypeId="org.eclipse.jst.server.jetty.runtime.76"
+      version="7.6"/>
     <runtimeFacetMapping
       runtimeTypeId="org.eclipse.jst.server.jetty.runtime.80"
       runtime-component="org.eclipse.jst.server.jetty"
@@ -381,7 +484,19 @@
          archiveUrl="http://download.eclipse.org/jetty/7.4.5.v20110725/dist/jetty-distribution-7.4.5.v20110725.zip"
          id="org.eclipse.jst.server.jetty.runtime.74"
          licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt">
-   </runtime>      
+   </runtime>
+   <runtime
+         archivePath="jetty-distribution-7.5.4.v20111024"
+         archiveUrl="http://download.eclipse.org/jetty/7.5.4.v20111024/dist/jetty-distribution-7.5.4.v20111024.zip"
+         id="org.eclipse.jst.server.jetty.runtime.75"
+         licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt">
+   </runtime>
+   <runtime
+         archivePath="jetty-distribution-7.6.1.v20120215"
+         archiveUrl="http://download.eclipse.org/jetty/7.6.1.v20120215/dist/jetty-distribution-7.6.1.v20120215.zip"
+         id="org.eclipse.jst.server.jetty.runtime.74"
+         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"
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 ccff2b2..f7f3009 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,7 +34,7 @@ public class JettyVersionManager
 
     public enum JettyVersion
     {
-        V71, V72, V73, V74, V80
+        V71, V72, V73, V74, V75, V76, V80
     }
 
     private JettyVersionManager()
@@ -43,6 +43,8 @@ public class JettyVersionManager
         register(JettyVersion.V72, Jetty7Provider.__INSTANCE);
         register(JettyVersion.V73, Jetty7Provider.__INSTANCE);
         register(JettyVersion.V74, Jetty7Provider.__INSTANCE);
+        register(JettyVersion.V75, Jetty7Provider.__INSTANCE);
+        register(JettyVersion.V76, 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 800dbfc..67a26c0 100644
--- a/org.eclipse.jst.server.jetty.ui/plugin.xml
+++ b/org.eclipse.jst.server.jetty.ui/plugin.xml
@@ -51,6 +51,26 @@
             id="org.eclipse.jst.server.jetty.74"
             typeIds="org.eclipse.jst.server.jetty.74">
       </image>
+      <image
+            icon="icons/obj16/jetty.gif"
+            id="org.eclipse.jst.server.jetty.75"
+            typeIds="org.eclipse.jst.server.jetty.runtime.75">
+      </image>
+      <image
+            icon="icons/obj16/jetty.gif"
+            id="org.eclipse.jst.server.jetty.75"
+            typeIds="org.eclipse.jst.server.jetty.75">
+      </image>
+      <image
+            icon="icons/obj16/jetty.gif"
+            id="org.eclipse.jst.server.jetty.76"
+            typeIds="org.eclipse.jst.server.jetty.runtime.76">
+      </image>
+      <image
+            icon="icons/obj16/jetty.gif"
+            id="org.eclipse.jst.server.jetty.76"
+            typeIds="org.eclipse.jst.server.jetty.76">
+      </image>
       <image
          id="org.eclipse.jst.server.jetty.80"
          icon="icons/obj16/jetty.gif"
@@ -114,6 +134,14 @@
             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
+            class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"
+            id="org.eclipse.jst.server.jetty.runtime.75"
+            typeIds="org.eclipse.jst.server.jetty.runtime.75"/>
+      <fragment
+            class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"
+            id="org.eclipse.jst.server.jetty.runtime.76"
+            typeIds="org.eclipse.jst.server.jetty.runtime.76"/>
       <fragment
          id="org.eclipse.jst.server.jetty.runtime.80"
          typeIds="org.eclipse.jst.server.jetty.runtime.80"
-- 
cgit v1.2.3