[jetty] Update osgi disabling patch

[Stanislav Ochotnicky]

commit 4e7b06cff965403d702972e02c73bbd24b38a68c
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Apr 30 16:35:12 2012 +0200

    Update osgi disabling patch

 0007-disable-jetty-osgi.patch |   45 +++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 10 deletions(-)
---
diff --git a/0007-disable-jetty-osgi.patch b/0007-disable-jetty-osgi.patch
index ab7a0ae..4f29e82 100644
--- a/0007-disable-jetty-osgi.patch
+++ b/0007-disable-jetty-osgi.patch
@@ -1,25 +1,50 @@
-From 7960d310a66c37b676b1fd03baae019530ccae79 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk at redhat.com>
-Date: Tue, 24 Apr 2012 11:22:42 +0200
+From 82457b406b8198f26c470ee0b55485abdfd7b903 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Mon, 30 Apr 2012 16:24:57 +0200
 Subject: [PATCH 7/7] disable jetty-osgi
 
 ---
- pom.xml |   18 ------------------
- 1 files changed, 0 insertions(+), 18 deletions(-)
+ jetty-jsp/pom.xml |    9 ++++++++-
+ pom.xml           |   18 ------------------
+ 2 files changed, 8 insertions(+), 19 deletions(-)
 
+diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
+index 55e8d29..4a3a5a9 100644
+--- a/jetty-jsp/pom.xml
++++ b/jetty-jsp/pom.xml
+@@ -48,11 +48,18 @@
+       <artifactId>com.sun.el</artifactId>
+       <version>2.2.0.v201108011116</version>
+     </dependency>
+-    <!-- Eclipse Java Compiler (for JSP Compilation) -->
++    <!-- Eclipse Java Compiler (for JSP Compilation). Replaced by
++         glassfish
+     <dependency>
+       <groupId>org.eclipse.jetty.orbit</groupId>
+       <artifactId>org.eclipse.jdt.core</artifactId>
+       <version>3.7.1</version>
++    </dependency> -->
++
++    <dependency>
++      <groupId>org.glassfish.web</groupId>
++      <artifactId>javax.servlet.jsp</artifactId>
++      <version>2.2.3</version>
+     </dependency>
+   </dependencies>
+ </project>
 diff --git a/pom.xml b/pom.xml
-index 6d778cc..f0ed5eb 100644
+index 65cf13a..65abba7 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -322,7 +322,6 @@
+@@ -352,7 +352,6 @@
      <module>jetty-start</module>
      <module>jetty-nested</module>
      <module>jetty-overlay-deployer</module>
 -    <module>jetty-osgi</module>
-     <module>jetty-distribution</module>
-     <module>test-jetty-webapp</module>
      <module>jetty-nosql</module>
-@@ -417,23 +416,6 @@
+     <module>jetty-http-spi</module>
+     <module>jetty-jsp</module>
+@@ -545,23 +544,6 @@
        </modules>
      </profile>
      <profile>