[eclipse] Rebuild against Jetty 9.1.0. (Bug 1036888)

[Roland Grunberg]

commit 3caab923204d2f7725410dacea9fb27d41bee6fd
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Dec 12 17:02:37 2013 -0500

    Rebuild against Jetty 9.1.0. (Bug 1036888)

 eclipse-jetty-9.1.patch |   29 +++++++++++++++++++++++++++++
 eclipse.spec            |   18 +++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-jetty-9.1.patch b/eclipse-jetty-9.1.patch
new file mode 100644
index 0000000..b5069fe
--- /dev/null
+++ b/eclipse-jetty-9.1.patch
@@ -0,0 +1,29 @@
+From 12bc35c1dc35b7bf25874b4476bc672b940c8714 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Thu, 28 Nov 2013 13:51:05 +0100
+Subject: [PATCH] Update to Jetty 9.1.0
+
+---
+ .../org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java   | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java b/rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
+index 8ce6825..4cc4b94 100644
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
+@@ -169,6 +169,12 @@ public class EquinoxStdErrLog implements Logger {
+ 		realLogger.debug(thrown);
+ 	}
+
++	public void debug(String msg, long value) {
++		if (threshold > DEBUG)
++			return;
++		realLogger.debug(msg, value);
++	}
++
+ 	public void ignore(Throwable ignored) {
+ 		// Just post this to debug
+ 		debug(ignored);
+--
+1.8.3.1
+
diff --git a/eclipse.spec b/eclipse.spec
index c709c4f..2e2f71e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -49,7 +49,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -123,6 +123,8 @@ Patch20:        %{pkg_name}-bug-408505.patch
 
 Patch21:        %{pkg_name}-bug-386377.patch
 
+Patch22:        %{pkg_name}-jetty-9.1.patch
+
 BuildRequires: ant >= 1.8.3
 BuildRequires: rsync
 BuildRequires: make, gcc
@@ -180,6 +182,7 @@ BuildRequires: tomcat-el-2.2-api
 BuildRequires: glassfish-jsp-api >= 2.2.1-4
 BuildRequires: cglib
 BuildRequires: glassfish-jsp >= 2.2.5
+BuildRequires: glassfish-servlet-api >= 3.1.0
 BuildRequires: cbi-plugins
 BuildRequires: xml-maven-plugin
 BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin)
@@ -253,6 +256,7 @@ Requires: tomcat-servlet-3.0-api
 Requires: tomcat-el-2.2-api
 Requires: glassfish-jsp-api >= 2.2.1-4
 Requires: glassfish-jsp >= 2.2.5
+Requires: glassfish-servlet-api >= 3.1.0
 Requires: %{?scl_prefix}icu4j-eclipse >= 1:50.1.1
 Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
 Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
@@ -334,6 +338,7 @@ tar --strip-components=1 -xf %{SOURCE1}
 pushd rt.equinox.framework
 %patch21 -p1
 popd
+%{!?scl:%patch22}
 
 #Disable as many things as possible to make the build faster. We care only for Eclipse.
 %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -484,6 +489,13 @@ eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedorap
 
 pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse
 
+# this belongs in dependencies/replace_platform_plugins_with_symlinks.sh
+pushd plugins
+ f=`ls | grep -e "^javax.servlet-api_"`
+ rm -f $f
+ ln -s %{_javadir}/glassfish-servlet-api.jar $f
+popd
+
 #in jdt and pde
 pushd dropins/jdt/plugins
  f=`ls | grep -e "^org.hamcrest.core_"`
@@ -778,6 +790,7 @@ fi
 %{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
 %{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
 %{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_*
+%{_libdir}/%{pkg_name}/plugins/javax.servlet-api_*
 %{_libdir}/%{pkg_name}/plugins/javax.servlet_*
 %{_libdir}/%{pkg_name}/plugins/javax.servlet.jsp_*
 %{_libdir}/%{pkg_name}/plugins/javax.xml_*
@@ -990,6 +1003,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Thu Dec 12 2013 Roland Grunberg <rgrunber at redhat.com> - 1:4.3.1-13
+- Rebuild against Jetty 9.1.0. (Bug 1036888)
+
 * Wed Dec 4 2013 Alexander Kurtakov <akurtako at redhat.com> 1:4.3.1-12
 - Move pre-kepler changelog to separate file.
 - Fix rpmlint warnings.