From 4ee59e0cc3fd8cd0850ac767c14cbbee065ce304 Mon Sep 17 00:00:00 2001
From: Thomas Watson
Date: Mon, 14 Nov 2011 13:10:00 -0600
Subject: Bug 362724 - Build Equinox against Servlet 3.0

---
 .../build.properties                               |  9 +++-
 .../org.eclipse.equinox.serverside.sdk/feature.xml | 51 +---------------------
 2 files changed, 9 insertions(+), 51 deletions(-)

(limited to 'features')

diff --git a/features/org.eclipse.equinox.serverside.sdk/build.properties b/features/org.eclipse.equinox.serverside.sdk/build.properties
index 110a827bc..2c1d7b205 100644
--- a/features/org.eclipse.equinox.serverside.sdk/build.properties
+++ b/features/org.eclipse.equinox.serverside.sdk/build.properties
@@ -19,4 +19,11 @@ generate.plugin@org.eclipse.equinox.http.servletbridge.source=org.eclipse.equino
 generate.plugin@org.eclipse.equinox.servletbridge.source=org.eclipse.equinox.servletbridge
 generate.plugin@org.eclipse.equinox.jsp.jasper.source=org.eclipse.equinox.jsp.jasper
 generate.plugin@org.eclipse.equinox.jsp.jasper.registry.source=org.eclipse.equinox.jsp.jasper.registry
-
+generate.plugin@org.eclipse.jetty.continuation.source=org.eclipse.jetty.continuation
+generate.plugin@org.eclipse.jetty.http.source=org.eclipse.jetty.http
+generate.plugin@org.eclipse.jetty.io.source=org.eclipse.jetty.io
+generate.plugin@org.eclipse.jetty.security.source=org.eclipse.jetty.security
+generate.plugin@org.eclipse.jetty.server.source=org.eclipse.jetty.server
+generate.plugin@org.eclipse.jetty.servlet.source=org.eclipse.jetty.servlet
+generate.plugin@org.eclipse.jetty.util.source=org.eclipse.jetty.util
+generate.plugin@javax.el.source=javax.el
diff --git a/features/org.eclipse.equinox.serverside.sdk/feature.xml b/features/org.eclipse.equinox.serverside.sdk/feature.xml
index 1bb53383c..4c056501b 100644
--- a/features/org.eclipse.equinox.serverside.sdk/feature.xml
+++ b/features/org.eclipse.equinox.serverside.sdk/feature.xml
@@ -75,28 +75,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
-
-   <!-- <plugin
-         id="org.eclipse.equinox.http"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
          unpack="false"/> 
-
-   <plugin
-         id="org.eclipse.equinox.http.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/> 
-
-    <plugin
-         id="org.eclipse.equinox.http.jetty"
-         download-size="0"
-         install-size="0"
-         version="2.0.100.qualifier"
-         unpack="false"/> -->
          
    <plugin
          id="org.eclipse.equinox.http.jetty"
@@ -179,34 +158,6 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
- <!--  <plugin
-         id="org.mortbay.jetty.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.mortbay.jetty.server.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.mortbay.jetty.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.mortbay.jetty.util.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/> -->
          
     <plugin
          id="org.eclipse.jetty.continuation"
@@ -346,4 +297,4 @@
          fragment="true"
          unpack="false"/>
 
-</feature>
+</feature>
\ No newline at end of file
-- 
cgit v1.2.3