From 365159b3a7e268cf55903a5cd6658336f9d97af4 Mon Sep 17 00:00:00 2001
From: Mat Booth
Date: Feb 12 2015 12:03:51 +0000
Subject: Update to latest 4.5.0 I-build
- Drop upstreamed jetty9/servlet and workspace picker patches
- Drop upstreamed patches for bug 903537 and bug 444143
- Update eclipse-build snapshot for ant dependency
- Ship missing features used by some other projects' target platform
- Build with mvn_build macro
- Some spec file clean-up
---
diff --git a/eclipse-bug-386377.patch b/eclipse-bug-386377.patch
index 29dfe95..c912db5 100644
--- a/eclipse-bug-386377.patch
+++ b/eclipse-bug-386377.patch
@@ -1,11 +1,11 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,59 @@
+@@ -27,4 +27,37 @@
gtk
x86_64
+
-+
++
+ build-native-launchers-gtk.linux.x86_64
+
+
@@ -17,7 +17,7 @@
+
+
+ maven-antrun-plugin
-+ 1.7
++ 1.7
+
+
+ compile-executable-natives
@@ -32,28 +32,6 @@
+
+
+
-+
-+
-+ bsf
-+ bsf
-+ 2.4.0
-+
-+
-+ rhino
-+ js
-+ 1.7R2
-+
-+
-+ org.apache.ant
-+ ant-apache-bsf
-+ 1.8.3
-+
-+
-+ org.apache.ant
-+ ant-nodeps
-+ 1.8.1
-+
-+
+
+
+
@@ -62,13 +40,12 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
win32
x86_64
-+
+
-+
++
+ build-native-launchers-win32.win32.x86_64
+
+
@@ -80,7 +57,7 @@
+
+
+ maven-antrun-plugin
-+ 1.7
++ 1.7
+
+
+ compile-executable-natives
@@ -95,28 +72,6 @@
+
+
+
-+
-+
-+ bsf
-+ bsf
-+ 2.4.0
-+
-+
-+ rhino
-+ js
-+ 1.7R2
-+
-+
-+ org.apache.ant
-+ ant-apache-bsf
-+ 1.8.3
-+
-+
-+ org.apache.ant
-+ ant-nodeps
-+ 1.8.1
-+
-+
+
+
+
@@ -125,13 +80,12 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml.orig 2014-04-16 15:57:02.805249103 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 2014-04-16 15:57:26.204834155 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
gtk
ppc64le
-+
+
-+
++
+ build-native-launchers-gtk.linux.ppc64le
+
+
@@ -143,7 +97,7 @@
+
+
+ maven-antrun-plugin
-+ 1.7
++ 1.7
+
+
+ compile-executable-natives
@@ -158,28 +112,6 @@
+
+
+
-+
-+
-+ bsf
-+ bsf
-+ 2.4.0
-+
-+
-+ rhino
-+ js
-+ 1.7R2
-+
-+
-+ org.apache.ant
-+ ant-apache-bsf
-+ 1.8.3
-+
-+
-+ org.apache.ant
-+ ant-nodeps
-+ 1.8.1
-+
-+
+
+
+
@@ -188,12 +120,12 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,59 @@
+@@ -27,4 +27,37 @@
gtk
x86
+
-+
++
+ build-native-launchers-gtk.linux.x86
+
+
@@ -205,7 +137,7 @@
+
+
+ maven-antrun-plugin
-+ 1.7
++ 1.7
+
+
+ compile-executable-natives
@@ -220,28 +152,6 @@
+
+
+
-+
-+
-+ bsf
-+ bsf
-+ 2.4.0
-+
-+
-+ rhino
-+ js
-+ 1.7R2
-+
-+
-+ org.apache.ant
-+ ant-apache-bsf
-+ 1.8.3
-+
-+
-+ org.apache.ant
-+ ant-nodeps
-+ 1.8.1
-+
-+
+
+
+
@@ -250,13 +160,12 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
win32
x86
-+
+
-+
++
+ build-native-launchers-win32.win32.x86
+
+
@@ -268,7 +177,7 @@
+
+
+ maven-antrun-plugin
-+ 1.7
++ 1.7
+
+
+ compile-executable-natives
@@ -283,28 +192,6 @@
+
+
+
-+
-+
-+ bsf
-+ bsf
-+ 2.4.0
-+
-+
-+ rhino
-+ js
-+ 1.7R2
-+
-+
-+ org.apache.ant
-+ ant-apache-bsf
-+ 1.8.3
-+
-+
-+ org.apache.ant
-+ ant-nodeps
-+ 1.8.1
-+
-+
+
+
+
@@ -313,13 +200,12 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
gtk
s390
-+
+
-+
++
+ build-native-launchers-gtk.linux.s390
+
+
@@ -331,7 +217,7 @@
+
+
+ maven-antrun-plugin
-+ 1.7
++ 1.7
+
+
+ compile-executable-natives
@@ -346,28 +232,6 @@
+
+
+
-+
-+
-+ bsf
-+ bsf
-+ 2.4.0
-+
-+
-+ rhino
-+ js
-+ 1.7R2
-+
-+
-+ org.apache.ant
-+ ant-apache-bsf
-+ 1.8.3
-+
-+
-+ org.apache.ant
-+ ant-nodeps
-+ 1.8.1
-+
-+
+
+
+
@@ -376,13 +240,12 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 2014-04-16 15:53:08.146402075 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
gtk
s390x
-+
+
-+
++
+ build-native-launchers-gtk.linux.s390x
+
+
@@ -394,7 +257,7 @@
+
+
+ maven-antrun-plugin
-+ 1.7
++ 1.7
+
+
+ compile-executable-natives
@@ -409,28 +272,6 @@
+
+
+
-+
-+
-+ bsf
-+ bsf
-+ 2.4.0
-+
-+
-+ rhino
-+ js
-+ 1.7R2
-+
-+
-+ org.apache.ant
-+ ant-apache-bsf
-+ 1.8.3
-+
-+
-+ org.apache.ant
-+ ant-nodeps
-+ 1.8.1
-+
-+
+
+
+
@@ -439,13 +280,12 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml 2014-04-16 15:57:28.315796703 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
gtk
ppc64
-+
+
-+
++
+ build-native-launchers-gtk.linux.ppc64
+
+
@@ -457,7 +297,7 @@
+
+
+ maven-antrun-plugin
-+ 1.7
++ 1.7
+
+
+ compile-executable-natives
@@ -472,28 +312,6 @@
+
+
+
-+
-+
-+ bsf
-+ bsf
-+ 2.4.0
-+
-+
-+ rhino
-+ js
-+ 1.7R2
-+
-+
-+ org.apache.ant
-+ ant-apache-bsf
-+ 1.8.3
-+
-+
-+ org.apache.ant
-+ ant-nodeps
-+ 1.8.1
-+
-+
+
+
+
@@ -502,13 +320,12 @@
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml 2014-04-16 15:53:08.146402075 +0100
-@@ -27,4 +27,60 @@
+@@ -27,4 +27,37 @@
gtk
ppc
-+
+
-+
++
+ build-native-launchers-gtk.linux.ppc
+
+
@@ -520,7 +337,7 @@
+
+
+ maven-antrun-plugin
-+ 1.7
++ 1.7
+
+
+ compile-executable-natives
@@ -535,28 +352,6 @@
+
+
+
-+
-+
-+ bsf
-+ bsf
-+ 2.4.0
-+
-+
-+ rhino
-+ js
-+ 1.7R2
-+
-+
-+ org.apache.ant
-+ ant-apache-bsf
-+ 1.8.3
-+
-+
-+ org.apache.ant
-+ ant-nodeps
-+ 1.8.1
-+
-+
+
+
+
diff --git a/eclipse-bug-444143.patch b/eclipse-bug-444143.patch
deleted file mode 100644
index d9e7d93..0000000
--- a/eclipse-bug-444143.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 716d35d30c1f639a04515188fedd89bb3aaf12bc Mon Sep 17 00:00:00 2001
-From: Sami Wagiaalla
-Date: Mon, 15 Sep 2014 11:51:44 -0400
-Subject: Bug 444143 - [GTK3] Reset selected background color in Table
-
-When setBackgroundColor is called for Table it results in
-a call to gtk_widget_override_background_color with the flag
-GTK_STATE_FLAG_NORMAL which overrides the color for selected
-items' background despite the flag. Therefore the selected item
-color must be reset to the default.
-
-Change-Id: Iab3cad4e01cf87cca04e536fdea8991c818d0336
-Signed-off-by: Sami Wagiaalla
-
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
-index 96493c6..2558fd1 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
-@@ -11,12 +11,28 @@
- package org.eclipse.swt.widgets;
-
-
--import org.eclipse.swt.*;
--import org.eclipse.swt.internal.*;
--import org.eclipse.swt.internal.cairo.*;
--import org.eclipse.swt.internal.gtk.*;
--import org.eclipse.swt.graphics.*;
--import org.eclipse.swt.events.*;
-+import org.eclipse.swt.SWT;
-+import org.eclipse.swt.SWTException;
-+import org.eclipse.swt.events.SelectionEvent;
-+import org.eclipse.swt.events.SelectionListener;
-+import org.eclipse.swt.graphics.Color;
-+import org.eclipse.swt.graphics.Font;
-+import org.eclipse.swt.graphics.GC;
-+import org.eclipse.swt.graphics.Image;
-+import org.eclipse.swt.graphics.Point;
-+import org.eclipse.swt.graphics.Rectangle;
-+import org.eclipse.swt.internal.Converter;
-+import org.eclipse.swt.internal.ImageList;
-+import org.eclipse.swt.internal.cairo.Cairo;
-+import org.eclipse.swt.internal.gtk.GdkColor;
-+import org.eclipse.swt.internal.gtk.GdkEventButton;
-+import org.eclipse.swt.internal.gtk.GdkEventExpose;
-+import org.eclipse.swt.internal.gtk.GdkRGBA;
-+import org.eclipse.swt.internal.gtk.GdkRectangle;
-+import org.eclipse.swt.internal.gtk.GtkAllocation;
-+import org.eclipse.swt.internal.gtk.GtkCellRendererClass;
-+import org.eclipse.swt.internal.gtk.GtkRequisition;
-+import org.eclipse.swt.internal.gtk.OS;
-
- /**
- * Instances of this class implement a selectable user interface
-@@ -3006,6 +3022,17 @@ void setBackgroundColor (GdkColor color) {
- super.setBackgroundColor (color);
- if (!OS.GTK3) {
- OS.gtk_widget_modify_base (handle, 0, color);
-+ } else {
-+ // Setting the background color overrides the selected background color
-+ // so we have to reset it the default.
-+ GdkColor defaultColor = getDisplay().COLOR_LIST_SELECTION;
-+ GdkRGBA selectedBackground = new GdkRGBA ();
-+ selectedBackground.alpha = 1;
-+ selectedBackground.red = (defaultColor.red & 0xFFFF) / (float)0xFFFF;
-+ selectedBackground.green = (defaultColor.green & 0xFFFF) / (float)0xFFFF;
-+ selectedBackground.blue = (defaultColor.blue & 0xFFFF) / (float)0xFFFF;
-+
-+ OS.gtk_widget_override_background_color (handle, OS.GTK_STATE_FLAG_SELECTED, selectedBackground);
- }
- }
-
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
-index 2a40869..4603cff 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
-@@ -3038,6 +3038,17 @@ void setBackgroundColor (GdkColor color) {
- super.setBackgroundColor (color);
- if (!OS.GTK3) {
- OS.gtk_widget_modify_base (handle, 0, color);
-+ } else {
-+ // Setting the background color overrides the selected background color
-+ // so we have to reset it the default.
-+ GdkColor defaultColor = getDisplay().COLOR_LIST_SELECTION;
-+ GdkRGBA selectedBackground = new GdkRGBA ();
-+ selectedBackground.alpha = 1;
-+ selectedBackground.red = (defaultColor.red & 0xFFFF) / (float)0xFFFF;
-+ selectedBackground.green = (defaultColor.green & 0xFFFF) / (float)0xFFFF;
-+ selectedBackground.blue = (defaultColor.blue & 0xFFFF) / (float)0xFFFF;
-+
-+ OS.gtk_widget_override_background_color (handle, OS.GTK_STATE_FLAG_SELECTED, selectedBackground);
- }
- }
-
---
-cgit v0.10.1-9-gd18e
-
diff --git a/eclipse-bug-903537.patch b/eclipse-bug-903537.patch
deleted file mode 100644
index 332d1c7..0000000
--- a/eclipse-bug-903537.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java.bak 2013-01-28 12:16:08.000000000 +0100
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java 2013-02-19 13:22:29.529926456 +0100
-@@ -4439,7 +4439,12 @@
- oldDecorations.fixAccelGroup ();
- }
- long /*int*/ newParent = parent.parentingHandle();
-- OS.gtk_widget_reparent(topHandle, newParent);
-+// OS.gtk_widget_reparent(topHandle, newParent);
-+ OS.g_object_ref(topHandle);
-+ OS.gtk_container_remove(OS.gtk_widget_get_parent(topHandle), topHandle);
-+ OS.gtk_container_add(newParent, topHandle);
-+ OS.g_object_unref(topHandle);
-+
- if (OS.GTK3) {
- OS.swt_fixed_move (newParent, topHandle, x, y);
- } else {
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 86f3ff8..ce3606f 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -20,7 +20,7 @@
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml.orig 2014-04-22 19:03:17.404382093 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml 2014-04-22 19:08:40.599989429 +0100
-@@ -4,33 +4,21 @@
+@@ -4,24 +4,15 @@
id="org.eclipse.sdk.tests"
version="0.0.0" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-Date: Tue, 26 Feb 2013 21:25:42 +0100
-Subject: [PATCH] Adopt jetty 9
-
-diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF
-index deb06c3..f993d0e 100755
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF
-@@ -9,23 +9,20 @@
- Import-Package: javax.servlet;version="[2.6.0,4.0.0)",
- javax.servlet.http;version="[2.6.0,4.0.0)",
- org.eclipse.equinox.http.servlet;version="1.0.0",
-- org.eclipse.jetty.http;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.io.bio;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.io.nio;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.bio;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.handler;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.nio;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.session;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.ssl;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.servlet;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.util;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.util.component;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.util.log;version="[8.0.0,9.0.0)",
-+ org.eclipse.jetty.http;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.server;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.server.session;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.util;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.util.ssl;version="[9.0.0,10.0.0)",
- org.osgi.framework;version="1.3.0",
- org.osgi.service.cm;version="[1.4, 2.0)",
- org.osgi.service.startlevel;version="1.0"
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
- Export-Package: org.eclipse.equinox.http.jetty;version="1.1.0"
- Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
- Eclipse-LazyStart: true
-diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/jetty6-to-jetty7.patch rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/jetty6-to-jetty7.patch
-deleted file mode 100644
-index d55a157..0000000
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/jetty6-to-jetty7.patch
-+++ /dev/null
-@@ -1,204 +0,0 @@
--Index: .project
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/.project,v
--retrieving revision 1.3
--diff -u -r1.3 .project
----- .project 25 Apr 2008 14:38:54 -0000 1.3
--+++ .project 16 Apr 2010 21:35:58 -0000
--@@ -1,6 +1,6 @@
--
--
--- org.eclipse.equinox.http.jetty6
--+ org.eclipse.equinox.http.jetty7
--
--
--
--Index: META-INF/MANIFEST.MF
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF,v
--retrieving revision 1.24
--diff -u -r1.24 MANIFEST.MF
----- META-INF/MANIFEST.MF 24 Apr 2009 20:54:41 -0000 1.24
--+++ META-INF/MANIFEST.MF 16 Apr 2010 21:35:58 -0000
--@@ -4,23 +4,28 @@
-- Bundle-Vendor: %providerName
-- Bundle-Localization: plugin
-- Bundle-SymbolicName: org.eclipse.equinox.http.jetty
---Bundle-Version: 2.0.0.qualifier
--+Bundle-Version: 3.0.0.qualifier
-- Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator
-- Import-Package: javax.servlet;version="[2.5.0,2.6.0)",
-- javax.servlet.http;version="[2.5.0,2.6.0)",
-- org.eclipse.equinox.http.servlet;version="1.0.0",
--- org.mortbay.component;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.bio;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.handler;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.nio;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.security;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.servlet;version="[6.1.0,7.0.0)",
--- org.mortbay.log;version="[6.1.0,7.0.0)",
--+ org.eclipse.jetty.http;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.io.bio;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.io.nio;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.bio;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.handler;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.nio;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.session;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.ssl;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.servlet;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.util;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.util.component;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.util.log;version="[7.0.0,8.0.0)",
-- org.osgi.framework;version="1.3.0",
-- org.osgi.service.cm;version="1.2.0",
-- org.osgi.service.startlevel;version="1.0"
---Bundle-RequiredExecutionEnvironment: J2SE-1.4
--+Bundle-RequiredExecutionEnvironment: J2SE-1.5
-- Export-Package: org.eclipse.equinox.http.jetty;version="1.1.0"
-- Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
-- Eclipse-LazyStart: true
--Index: src/org/eclipse/equinox/http/jetty/JettyCustomizer.java
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyCustomizer.java,v
--retrieving revision 1.2
--diff -u -r1.2 JettyCustomizer.java
----- src/org/eclipse/equinox/http/jetty/JettyCustomizer.java 17 Apr 2009 21:58:58 -0000 1.2
--+++ src/org/eclipse/equinox/http/jetty/JettyCustomizer.java 16 Apr 2010 21:35:58 -0000
--@@ -33,13 +33,13 @@
-- * framework. Changing those may cause breakage and thus must be avoided.
-- *
-- * @param context
--- * the Jetty context; in case of Jetty 6 the context is of
--- * type org.mortbay.jetty.servlet.Context
--+ * the Jetty context; in case of Jetty 7 the context is of
--+ * type org.eclipse.jetty.servlet.ServletContextHandler
-- * @param settings
-- * the settings as passed to {@link JettyConfigurator#startServer(String, Dictionary)}
-- * @return context
--- * the customized context; in case of Jetty 6 the context is of
--- * type org.mortbay.jetty.servlet.Context
--+ * the customized context; in case of Jetty 7 the context is of
--+ * type org.eclipse.jetty.servlet.ServletContextHandler
-- */
-- public Object customizeContext(Object context, Dictionary settings) {
-- return context;
--@@ -52,13 +52,13 @@
-- * Implementors may perform additional configuration of the Jetty Connector.
-- *
-- * @param connector
--- * the Jetty connector; in case of Jetty 6 the context is of
--- * type org.mortbay.jetty.Connector
--+ * the Jetty connector; in case of Jetty 7 the context is of
--+ * type org.eclipse.jetty.server.Connector
-- * @param settings
-- * the settings as passed to {@link JettyConfigurator#startServer(String, Dictionary)}
-- * @return connector
-- * the customized connector; in case of Jetty 6 the connector is of
--- * type org.mortbay.jetty.Connector
--+ * type org.eclipse.jetty.server.Connector
-- */
-- public Object customizeHttpConnector(Object connector, Dictionary settings) {
-- return connector;
--@@ -71,13 +71,13 @@
-- * Implementors may perform additional configuration of the Jetty Connector.
-- *
-- * @param connector
--- * the Jetty connector; in case of Jetty 6 the connector is of
--- * type org.mortbay.jetty.Connector
--+ * the Jetty connector; in case of Jetty 7 the connector is of
--+ * type oorg.eclipse.jetty.server.Connector
-- * @param settings
-- * the settings as passed to {@link JettyConfigurator#startServer(String, Dictionary)}
-- * @return connector
--- * the customized connector; in case of Jetty 6 the connector is of
--- * type org.mortbay.jetty.Connector
--+ * the customized connector; in case of Jetty 7 the connector is of
--+ * type org.eclipse.jetty.server.Connector
-- */
-- public Object customizeHttpsConnector(Object connector, Dictionary settings) {
-- return connector;
--Index: src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java,v
--retrieving revision 1.20
--diff -u -r1.20 HttpServerManager.java
----- src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java 20 May 2009 21:12:37 -0000 1.20
--+++ src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java 16 Apr 2010 21:35:58 -0000
--@@ -18,12 +18,15 @@
-- import org.eclipse.equinox.http.jetty.JettyConstants;
-- import org.eclipse.equinox.http.jetty.JettyCustomizer;
-- import org.eclipse.equinox.http.servlet.HttpServiceServlet;
---import org.mortbay.jetty.Connector;
---import org.mortbay.jetty.Server;
---import org.mortbay.jetty.bio.SocketConnector;
---import org.mortbay.jetty.nio.SelectChannelConnector;
---import org.mortbay.jetty.security.SslSocketConnector;
---import org.mortbay.jetty.servlet.*;
--+import org.eclipse.jetty.server.Connector;
--+import org.eclipse.jetty.server.Server;
--+import org.eclipse.jetty.server.bio.SocketConnector;
--+import org.eclipse.jetty.server.nio.SelectChannelConnector;
--+import org.eclipse.jetty.server.session.HashSessionManager;
--+import org.eclipse.jetty.server.session.SessionHandler;
--+import org.eclipse.jetty.server.ssl.SslSocketConnector;
--+import org.eclipse.jetty.servlet.ServletContextHandler;
--+import org.eclipse.jetty.servlet.ServletHolder;
-- import org.osgi.framework.Constants;
-- import org.osgi.service.cm.ConfigurationException;
-- import org.osgi.service.cm.ManagedServiceFactory;
--@@ -98,12 +101,12 @@
-- if (otherInfo != null)
-- holder.setInitParameter(JettyConstants.OTHER_INFO, otherInfo);
--
--- Context httpContext = createHttpContext(dictionary);
--+ ServletContextHandler httpContext = createHttpContext(dictionary);
-- if (null != customizer)
--- httpContext = (Context) customizer.customizeContext(httpContext, dictionary);
--+ httpContext = (ServletContextHandler) customizer.customizeContext(httpContext, dictionary);
--
-- httpContext.addServlet(holder, "/*"); //$NON-NLS-1$
--- server.addHandler(httpContext);
--+ server.setHandler(httpContext);
--
-- try {
-- server.start();
--@@ -241,8 +244,8 @@
-- return sslConnector;
-- }
--
--- private Context createHttpContext(Dictionary dictionary) {
--- Context httpContext = new Context();
--+ private ServletContextHandler createHttpContext(Dictionary dictionary) {
--+ ServletContextHandler httpContext = new ServletContextHandler();
-- httpContext.setAttribute(INTERNAL_CONTEXT_CLASSLOADER, Thread.currentThread().getContextClassLoader());
-- httpContext.setClassLoader(this.getClass().getClassLoader());
--
--Index: src/org/slf4j/Logger.java
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/src/org/slf4j/Logger.java,v
--retrieving revision 1.2
--diff -u -r1.2 Logger.java
----- src/org/slf4j/Logger.java 17 Apr 2009 20:24:43 -0000 1.2
--+++ src/org/slf4j/Logger.java 16 Apr 2010 21:35:58 -0000
--@@ -10,8 +10,8 @@
-- *******************************************************************************/
-- package org.slf4j;
--
---import org.mortbay.log.Log;
---import org.mortbay.log.StdErrLog;
--+import org.eclipse.jetty.util.log.Log;
--+import org.eclipse.jetty.util.log.StdErrLog;
--
-- // NOTE: This class is not a real SLF4J implementation and MUST NOT be exported as a general implementation!
-- // It is a place-holder to allow overriding the default logging done in Jetty
--@@ -80,7 +80,7 @@
-- setDebugEnabled(true);
-- }
--
--- public org.mortbay.log.Logger getLogger(String name) {
--+ public org.eclipse.jetty.util.log.Logger getLogger(String name) {
-- if ((name == null && this.localName == null) || (name != null && name.equals(this.localName)))
-- return this;
-- return new Logger(name);
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java.orig 2014-03-24 10:46:20.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java 2014-03-24 14:59:31.662164402 +0000
-@@ -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);
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java.orig 2014-03-24 10:46:20.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java 2014-03-24 14:59:31.662164402 +0000
-@@ -18,21 +18,21 @@
- import org.eclipse.equinox.http.jetty.JettyConstants;
- import org.eclipse.equinox.http.jetty.JettyCustomizer;
- import org.eclipse.equinox.http.servlet.HttpServiceServlet;
--import org.eclipse.jetty.server.Connector;
--import org.eclipse.jetty.server.Server;
--import org.eclipse.jetty.server.bio.SocketConnector;
--import org.eclipse.jetty.server.nio.SelectChannelConnector;
-+import org.eclipse.jetty.server.*;
- import org.eclipse.jetty.server.session.HashSessionManager;
- import org.eclipse.jetty.server.session.SessionHandler;
--import org.eclipse.jetty.server.ssl.SslSocketConnector;
- import org.eclipse.jetty.servlet.ServletContextHandler;
- import org.eclipse.jetty.servlet.ServletHolder;
-+import org.eclipse.jetty.util.ssl.SslContextFactory;
- import org.osgi.framework.Constants;
- import org.osgi.service.cm.ConfigurationException;
- import org.osgi.service.cm.ManagedServiceFactory;
-
- public class HttpServerManager implements ManagedServiceFactory {
-
-+ private static final String HTTP_1_1 = "http/1.1"; //$NON-NLS-1$
-+ private static final int DEFAULT_IDLE_TIMEOUT = 30000;
-+ private static final String HTTPS = "https"; //$NON-NLS-1$
- private static final String CONTEXT_TEMPDIR = "javax.servlet.context.tempdir"; //$NON-NLS-1$
- private static final String DIR_PREFIX = "pid_"; //$NON-NLS-1$
- private static final String INTERNAL_CONTEXT_CLASSLOADER = "org.eclipse.equinox.http.jetty.internal.ContextClassLoader"; //$NON-NLS-1$
-@@ -68,18 +68,38 @@
-
- JettyCustomizer customizer = createJettyCustomizer(dictionary);
-
-- Connector httpConnector = createHttpConnector(dictionary);
-+ /**
-+ * May be modified by createHttp(s)Connector.
-+ */
-+ HttpConfiguration http_config = new HttpConfiguration();
-+
-+ ServerConnector httpConnector = createHttpConnector(dictionary, server, http_config);
-+
-+ ServerConnector httpsConnector = createHttpsConnector(dictionary, server, http_config);
-+
- if (null != customizer)
-- httpConnector = (Connector) customizer.customizeHttpConnector(httpConnector, dictionary);
-+ httpConnector = (ServerConnector) customizer.customizeHttpConnector(httpConnector, dictionary);
-
-- if (httpConnector != null)
-+ if (httpConnector != null) {
-+ try {
-+ httpConnector.open();
-+ } catch (IOException e) {
-+ e.printStackTrace();
-+ }
- server.addConnector(httpConnector);
-+ }
-
-- Connector httpsConnector = createHttpsConnector(dictionary);
- if (null != customizer)
-- httpsConnector = (Connector) customizer.customizeHttpsConnector(httpsConnector, dictionary);
-- if (httpsConnector != null)
-+ httpsConnector = (ServerConnector) customizer.customizeHttpsConnector(httpsConnector, dictionary);
-+
-+ if (httpsConnector != null) {
-+ try {
-+ httpsConnector.open();
-+ } catch (IOException e) {
-+ e.printStackTrace();
-+ }
- server.addConnector(httpsConnector);
-+ }
-
- ServletHolder holder = new ServletHolder(new InternalHttpServiceServlet());
- holder.setInitOrder(0);
-@@ -111,11 +131,76 @@
- try {
- server.start();
- } catch (Exception e) {
-- throw new ConfigurationException(pid, e.getMessage(), e);
-+ //throw new ConfigurationException(pid, e.getMessage(), e);
- }
- servers.put(pid, server);
- }
-
-+ private ServerConnector createHttpsConnector(@SuppressWarnings("rawtypes") Dictionary dictionary, Server server, HttpConfiguration http_config) {
-+ ServerConnector httpsConnector = null;
-+ if (isHttpsEnabled(dictionary)) {
-+ // SSL Context Factory for HTTPS and SPDY
-+ SslContextFactory sslContextFactory = new SslContextFactory();
-+ //sslContextFactory.setKeyStore(KeyS)
-+ //Not sure if the next tree are properly migrated from jetty 8...
-+ sslContextFactory.setKeyStorePath((String) dictionary.get(JettyConstants.SSL_KEYSTORE));
-+ sslContextFactory.setKeyStorePassword((String) dictionary.get(JettyConstants.SSL_PASSWORD));
-+ sslContextFactory.setKeyManagerPassword((String) dictionary.get(JettyConstants.SSL_KEYPASSWORD));
-+
-+ String keystoreType = (String) dictionary.get(JettyConstants.SSL_KEYSTORETYPE);
-+ if (keystoreType != null) {
-+ sslContextFactory.setKeyStoreType(keystoreType);
-+ }
-+
-+ String protocol = (String) dictionary.get(JettyConstants.SSL_PROTOCOL);
-+ if (protocol != null) {
-+ sslContextFactory.setProtocol(protocol);
-+ }
-+
-+ Object wantClientAuth = dictionary.get(JettyConstants.SSL_WANTCLIENTAUTH);
-+ if (wantClientAuth != null) {
-+ if (wantClientAuth instanceof String)
-+ wantClientAuth = Boolean.valueOf((String) wantClientAuth);
-+
-+ sslContextFactory.setWantClientAuth((Boolean) wantClientAuth);
-+ }
-+
-+ Object needClientAuth = dictionary.get(JettyConstants.SSL_NEEDCLIENTAUTH);
-+ if (needClientAuth != null) {
-+ if (needClientAuth instanceof String)
-+ needClientAuth = Boolean.valueOf((String) needClientAuth);
-+
-+ sslContextFactory.setNeedClientAuth(((Boolean) needClientAuth));
-+ }
-+
-+ // HTTPS Configuration
-+ HttpConfiguration https_config = new HttpConfiguration(http_config);
-+ https_config.addCustomizer(new SecureRequestCustomizer());
-+
-+ // HTTPS connector
-+ httpsConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, HTTP_1_1), new HttpConnectionFactory(https_config));
-+ httpsConnector.setPort(getIntProperty(dictionary, JettyConstants.HTTPS_PORT));
-+ }
-+ return httpsConnector;
-+ }
-+
-+ private ServerConnector createHttpConnector(@SuppressWarnings("rawtypes") Dictionary dictionary, Server server, HttpConfiguration http_config) {
-+ ServerConnector httpConnector = null;
-+ if (isHttpEnabled(dictionary)) {
-+ // HTTP Configuration
-+ if (isHttpsEnabled(dictionary)) {
-+ http_config.setSecureScheme(HTTPS);
-+ http_config.setSecurePort(getIntProperty(dictionary, JettyConstants.HTTPS_PORT));
-+ }
-+ // HTTP connector
-+ httpConnector = new ServerConnector(server, new HttpConnectionFactory(http_config));
-+ httpConnector.setPort(getIntProperty(dictionary, JettyConstants.HTTP_PORT));
-+ httpConnector.setHost((String) dictionary.get(JettyConstants.HTTP_HOST));
-+ httpConnector.setIdleTimeout(DEFAULT_IDLE_TIMEOUT);
-+ }
-+ return httpConnector;
-+ }
-+
- public synchronized void shutdown() throws Exception {
- for (Iterator it = servers.values().iterator(); it.hasNext();) {
- Server server = it.next();
-@@ -124,155 +209,46 @@
- servers.clear();
- }
-
-- private Connector createHttpConnector(@SuppressWarnings("rawtypes") Dictionary dictionary) {
-- Boolean httpEnabled = null;
-- Object httpEnabledObj = dictionary.get(JettyConstants.HTTP_ENABLED);
-- if (httpEnabledObj instanceof Boolean) {
-- httpEnabled = (Boolean) httpEnabledObj;
-- } else if (httpEnabledObj instanceof String) {
-- httpEnabled = Boolean.parseBoolean(httpEnabledObj.toString());
-- }
-- if (httpEnabled != null && !httpEnabled.booleanValue())
-- return null;
--
-+ private Integer getIntProperty(@SuppressWarnings("rawtypes") Dictionary dictionary, String property) {
- Integer httpPort = null;
-- Object httpPortObj = dictionary.get(JettyConstants.HTTP_PORT);
-+ Object httpPortObj = dictionary.get(property);
- if (httpPortObj instanceof Integer) {
- httpPort = (Integer) httpPortObj;
- } else if (httpPortObj instanceof String) {
- httpPort = Integer.valueOf(httpPortObj.toString());
- }
-- if (httpPort == null)
-- return null;
--
-- Boolean nioEnabled = null;
-- Object nioEnabledObj = dictionary.get(JettyConstants.HTTP_NIO);
-- if (nioEnabledObj instanceof Boolean) {
-- nioEnabled = (Boolean) nioEnabledObj;
-- } else if (nioEnabledObj instanceof String) {
-- nioEnabled = Boolean.parseBoolean(nioEnabledObj.toString());
-- }
-- if (nioEnabled == null)
-- nioEnabled = getDefaultNIOEnablement();
--
-- Connector connector;
-- if (nioEnabled.booleanValue())
-- connector = new SelectChannelConnector();
-- else
-- connector = new SocketConnector();
--
-- connector.setPort(httpPort.intValue());
--
-- String httpHost = (String) dictionary.get(JettyConstants.HTTP_HOST);
-- if (httpHost != null) {
-- connector.setHost(httpHost);
-- }
--
-- if (connector.getPort() == 0) {
-- try {
-- connector.open();
-- } catch (IOException e) {
-- // this would be unexpected since we're opening the next available port
-- e.printStackTrace();
-- }
-+ if (httpPort == null) {
-+ throw new IllegalArgumentException("Expected " + property + "property, but it is not set."); //$NON-NLS-1$//$NON-NLS-2$
- }
-- return connector;
-+ return httpPort;
- }
-
-- private Boolean getDefaultNIOEnablement() {
-- Properties systemProperties = System.getProperties();
-- String javaVendor = systemProperties.getProperty("java.vendor", ""); //$NON-NLS-1$ //$NON-NLS-2$
-- if (javaVendor.equals("IBM Corporation")) { //$NON-NLS-1$
-- String javaVersion = systemProperties.getProperty("java.version", ""); //$NON-NLS-1$ //$NON-NLS-2$
-- if (javaVersion.startsWith("1.4")) //$NON-NLS-1$
-- return Boolean.FALSE;
-- // Note: no problems currently logged with 1.5
-- if (javaVersion.equals("1.6.0")) { //$NON-NLS-1$
-- String jclVersion = systemProperties.getProperty("java.jcl.version", ""); //$NON-NLS-1$ //$NON-NLS-2$
-- if (jclVersion.startsWith("2007")) //$NON-NLS-1$
-- return Boolean.FALSE;
-- if (jclVersion.startsWith("2008") && !jclVersion.startsWith("200811") && !jclVersion.startsWith("200812")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-- return Boolean.FALSE;
-- }
-+ /**
-+ * If not configured -> enable
-+ */
-+ private boolean isHttpEnabled(@SuppressWarnings("rawtypes") Dictionary dictionary) {
-+ Boolean httpEnabled = true;
-+ Object httpEnabledObj = dictionary.get(JettyConstants.HTTP_ENABLED);
-+ if (httpEnabledObj instanceof Boolean) {
-+ httpEnabled = (Boolean) httpEnabledObj;
-+ } else if (httpEnabledObj instanceof String) {
-+ httpEnabled = Boolean.parseBoolean(httpEnabledObj.toString());
- }
-- return Boolean.TRUE;
-+ return httpEnabled;
- }
-
-- @SuppressWarnings("deprecation")
-- private Connector createHttpsConnector(@SuppressWarnings("rawtypes") Dictionary dictionary) {
-- Boolean httpsEnabled = null;
-+ /**
-+ * If not configured -> disable.
-+ */
-+ private boolean isHttpsEnabled(@SuppressWarnings("rawtypes") Dictionary dictionary) {
-+ Boolean httpsEnabled = false;
- Object httpsEnabledObj = dictionary.get(JettyConstants.HTTPS_ENABLED);
- if (httpsEnabledObj instanceof Boolean) {
- httpsEnabled = (Boolean) httpsEnabledObj;
- } else if (httpsEnabledObj instanceof String) {
- httpsEnabled = Boolean.parseBoolean(httpsEnabledObj.toString());
- }
-- if (httpsEnabled == null || !httpsEnabled.booleanValue())
-- return null;
--
-- Integer httpsPort = null;
-- Object httpsPortObj = dictionary.get(JettyConstants.HTTPS_PORT);
-- if (httpsPortObj instanceof Integer) {
-- httpsPort = (Integer) httpsPortObj;
-- } else if (httpsPortObj instanceof String) {
-- httpsPort = Integer.valueOf(httpsPortObj.toString());
-- }
-- if (httpsPort == null)
-- return null;
--
-- SslSocketConnector sslConnector = new SslSocketConnector();
-- sslConnector.setPort(httpsPort.intValue());
--
-- String httpsHost = (String) dictionary.get(JettyConstants.HTTPS_HOST);
-- if (httpsHost != null) {
-- sslConnector.setHost(httpsHost);
-- }
--
-- String keyStore = (String) dictionary.get(JettyConstants.SSL_KEYSTORE);
-- if (keyStore != null)
-- sslConnector.setKeystore(keyStore);
--
-- String password = (String) dictionary.get(JettyConstants.SSL_PASSWORD);
-- if (password != null)
-- sslConnector.setPassword(password);
--
-- String keyPassword = (String) dictionary.get(JettyConstants.SSL_KEYPASSWORD);
-- if (keyPassword != null)
-- sslConnector.setKeyPassword(keyPassword);
--
-- Object needClientAuth = dictionary.get(JettyConstants.SSL_NEEDCLIENTAUTH);
-- if (needClientAuth != null) {
-- if (needClientAuth instanceof String)
-- needClientAuth = Boolean.valueOf((String) needClientAuth);
--
-- sslConnector.setNeedClientAuth(((Boolean) needClientAuth).booleanValue());
-- }
--
-- Object wantClientAuth = dictionary.get(JettyConstants.SSL_WANTCLIENTAUTH);
-- if (wantClientAuth != null) {
-- if (wantClientAuth instanceof String)
-- wantClientAuth = Boolean.valueOf((String) wantClientAuth);
--
-- sslConnector.setWantClientAuth(((Boolean) wantClientAuth).booleanValue());
-- }
--
-- String protocol = (String) dictionary.get(JettyConstants.SSL_PROTOCOL);
-- if (protocol != null)
-- sslConnector.setProtocol(protocol);
--
-- String keystoreType = (String) dictionary.get(JettyConstants.SSL_KEYSTORETYPE);
-- if (keystoreType != null)
-- sslConnector.setKeystoreType(keystoreType);
--
-- if (sslConnector.getPort() == 0) {
-- try {
-- sslConnector.open();
-- } catch (IOException e) {
-- // this would be unexpected since we're opening the next available port
-- e.printStackTrace();
-- }
-- }
-- return sslConnector;
-+ return httpsEnabled;
- }
-
- private ServletContextHandler createHttpContext(@SuppressWarnings("rawtypes") Dictionary dictionary) {
diff --git a/eclipse-lucene-4.patch b/eclipse-lucene-4.patch
index e008540..6fe1d3f 100644
--- a/eclipse-lucene-4.patch
+++ b/eclipse-lucene-4.patch
@@ -446,3 +446,31 @@ index 1360599..f622417 100644
/// Unlikely to be called as this is a reused
if (this.reader != null) {
this.reader.close();
+--- a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java 2014-11-29 17:08:45.937034662 +0000
++++ b/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java 2014-11-29 17:12:29.324984554 +0000
+@@ -23,6 +23,7 @@
+ import org.osgi.framework.Bundle;
+
+ import org.apache.lucene.index.CorruptIndexException;
++import org.apache.lucene.index.DirectoryReader;
+ import org.apache.lucene.search.IndexSearcher;
+ import org.apache.lucene.search.Query;
+ import org.apache.lucene.search.TopDocs;
+@@ -155,7 +156,7 @@
+ IndexSearcher searcher = null;
+ try {
+ luceneDirectory = new NIOFSDirectory(new File(filePath));
+- searcher = new IndexSearcher(luceneDirectory, true);
++ searcher = new IndexSearcher(DirectoryReader.open(luceneDirectory));
+ TopDocs hits = searcher.search(luceneQuery, 500);
+ assertEquals(hits.totalHits, 1);
+ } finally {
+@@ -165,7 +166,7 @@
+ } catch (IOException x) {
+ }
+ if (searcher != null)
+- searcher.close();
++ searcher.getIndexReader().close();
+ }
+ } else {
+ fail("Cannot resolve to file protocol");
diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch
index 74e51ee..61ea200 100644
--- a/eclipse-mockito.patch
+++ b/eclipse-mockito.patch
@@ -1,44 +1,38 @@
--- eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:42:36.169928566 +0000
+++ eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:56:27.970146198 +0000
-@@ -43,9 +43,9 @@
+@@ -42,8 +42,8 @@
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.10.0",
org.eclipse.osgi.services;bundle-version="3.3.100",
- org.hamcrest;bundle-version="1.1.0",
-- org.objenesis;bundle-version="1.0.0",
- org.mockito;bundle-version="1.8.4"
+ org.hamcrest.core,
-+ org.objenesis,
+ org.mockito.mockito-core
Eclipse-AutoStart: true
Export-Package: org.eclipse.ui.tests.api,
org.eclipse.ui.tests.menus
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:44:04.400306048 +0000
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:58:07.608331033 +0000
-@@ -31,9 +31,9 @@
+@@ -31,8 +31,8 @@
org.eclipse.core.expressions;bundle-version="3.4.200",
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
org.eclipse.e4.ui.css.swt;bundle-version="0.11.0",
- org.hamcrest;bundle-version="1.1.0",
-- org.objenesis;bundle-version="1.0.0",
- org.mockito;bundle-version="1.8.4",
+ org.hamcrest.core,
-+ org.objenesis,
+ org.mockito.mockito-core,
org.eclipse.e4.ui.css.core;bundle-version="0.10.100"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF.orig 2014-04-22 14:31:35.155774270 +0100
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF 2014-04-22 14:33:47.599498477 +0100
-@@ -10,9 +10,9 @@
+@@ -10,8 +10,8 @@
org.w3c.css.sac,
org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1",
org.eclipse.ui;bundle-version="3.106.0",
- org.hamcrest;bundle-version="1.1.0",
-- org.objenesis;bundle-version="1.0.0",
- org.mockito;bundle-version="1.8.4",
+ org.hamcrest.core,
-+ org.objenesis,
+ org.mockito.mockito-core,
org.eclipse.equinox.preferences;bundle-version="3.5.200"
Bundle-ActivationPolicy: lazy
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index b0690cc..310e9d6 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -103,12 +103,13 @@
- plugin@org.w3c.css.sac.source;version=1.3.1.qualifier;unpack="false"
+generate.feature@org.eclipse.e4.rcp.source=org.eclipse.e4.rcp
\ No newline at end of file
---- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-03-24 12:58:43.355826288 +0000
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-03-24 13:04:46.463916138 +0000
-@@ -75,6 +75,12 @@
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000
+@@ -74,6 +74,13 @@
+
-
++
+
+
+
@@ -182,12 +183,12 @@
generatedVersionLength=45
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300
-@@ -54,6 +54,30 @@
+@@ -54,6 +54,29 @@
-+
-+
++
++
+
+
+
@@ -199,7 +200,6 @@
+
+
+
-+
+
+
+
@@ -209,7 +209,7 @@
+
+
+
-+
++
diff --git a/eclipse-no-target-platform.patch b/eclipse-no-target-platform.patch
index cb8db90..ae8873b 100644
--- a/eclipse-no-target-platform.patch
+++ b/eclipse-no-target-platform.patch
@@ -1,14 +1,14 @@
---- eclipse-platform-parent/pom.xml.orig 2014-03-24 15:52:04.794208197 +0000
-+++ eclipse-platform-parent/pom.xml 2014-03-24 15:56:15.746202079 +0000
-@@ -170,13 +170,6 @@
- org.eclipse.tycho
- target-platform-configuration
-
+--- eclipse-platform-parent/pom.xml.orig 2015-01-30 11:09:37.156904060 +0000
++++ eclipse-platform-parent/pom.xml 2015-01-30 11:11:05.154445821 +0000
+@@ -204,13 +204,6 @@
+
-
-
- org.eclipse
- eclipse-sdk-prereqs
-- 4.4.0-SNAPSHOT
+- 4.5.0-SNAPSHOT
-
-
diff --git a/eclipse-policy-comparators.patch b/eclipse-policy-comparators.patch
index b15cd3b..5ba1091 100644
--- a/eclipse-policy-comparators.patch
+++ b/eclipse-policy-comparators.patch
@@ -11,7 +11,7 @@
}
--- eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java.orig 2014-03-27 11:27:35.233213660 +0000
+++ eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java 2014-03-27 12:19:30.696748271 +0000
-@@ -13,6 +13,7 @@
+@@ -14,6 +14,7 @@
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.ArrayList;
@@ -19,7 +19,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
-@@ -235,7 +236,7 @@
+@@ -228,7 +229,7 @@
// show Help button in JFace dialogs
TrayDialog.setDialogHelpAvailable(true);
@@ -27,4 +27,4 @@
+ Policy.setComparator((Comparator)Collator.getInstance());
}
- /*
+ @Override
diff --git a/eclipse-remove-jgit-provider.patch b/eclipse-remove-jgit-provider.patch
index 07bf0c2..2e6faa2 100644
--- a/eclipse-remove-jgit-provider.patch
+++ b/eclipse-remove-jgit-provider.patch
@@ -1,6 +1,6 @@
---- eclipse-platform-parent/pom.xml.orig 2014-05-26 17:04:22.000000000 +0300
-+++ eclipse-platform-parent/pom.xml 2014-05-26 18:57:29.044704226 +0300
-@@ -332,7 +332,7 @@
+--- eclipse-platform-parent/pom.xml.orig 2014-11-28 14:54:50.000000000 +0000
++++ eclipse-platform-parent/pom.xml 2014-11-28 15:32:51.700154985 +0000
+@@ -360,7 +360,7 @@
tycho-packaging-plugin
${tycho.version}
@@ -9,7 +9,7 @@
org.eclipse.tycho.extras
tycho-buildtimestamp-jgit
${tycho-extras.version}
-@@ -341,19 +341,19 @@
+@@ -369,19 +369,19 @@
org.eclipse.tycho.extras
tycho-sourceref-jgit
${tycho-extras.version}
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 34b52d9..f490ee7 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -1,8 +1,6 @@
-diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
-index 6c567f8..969eafb 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
-@@ -209,49 +209,19 @@
+@@ -243,44 +243,14 @@
s390x
@@ -18,11 +16,6 @@ index 6c567f8..969eafb 100644
-
- macosx
- cocoa
-- x86
--
--
-- macosx
-- cocoa
- x86_64
-
-
@@ -37,17 +30,15 @@ index 6c567f8..969eafb 100644
-
-
- hpux
-+ linux
- gtk
+- gtk
- ia64
-+ arm
-
-
+-
+-
- aix
+ linux
gtk
- ppc
-+ ppc64le
++ arm
- aix
@@ -86,24 +77,22 @@ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.proper
index 80a32e4..85de879 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-@@ -32,6 +32,12 @@ root.solaris.gtk.sparc.permissions.755=eclipse
- root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
- root.solaris.gtk.x86.permissions.755=eclipse
+@@ -58,6 +58,10 @@
+ root.linux.gtk.s390=rootfiles/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390
+ root.linux.gtk.s390.permissions.755=eclipse
-+root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
++root.linux.gtk.arm=rootfiles/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
+root.linux.gtk.arm.permissions.755=eclipse
-+root.linux.gtk.aarch64=target/resources/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
-+root.linux.gtk.aarch64.permissions.755=eclipse
-+root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
-+root.linux.gtk.ppc64le.permissions.755=eclipse
- root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
- root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
- root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
++root.linux.gtk.aarch64=rootfiles/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
++root.linux.gtk.aarch64.permissions.755=eclipse
+
+ bin.includes = feature.properties
+
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
index 7dd0536..66d79ee 100644
--- a/eclipse.platform.swt.binaries/pom.xml
+++ b/eclipse.platform.swt.binaries/pom.xml
-@@ -54,6 +54,8 @@
+@@ -53,6 +53,8 @@
bundles/org.eclipse.swt.gtk.linux.ppc64le
bundles/org.eclipse.swt.gtk.linux.s390
bundles/org.eclipse.swt.gtk.linux.s390x
@@ -116,7 +105,7 @@ diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
index b46cdc6..0fb36a5 100644
--- a/rt.equinox.framework/pom.xml
+++ b/rt.equinox.framework/pom.xml
-@@ -55,6 +55,8 @@
+@@ -54,6 +54,8 @@
bundles/org.eclipse.equinox.launcher.gtk.aix.ppc
bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64
bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64
@@ -125,18 +114,6 @@ index b46cdc6..0fb36a5 100644
bundles/org.eclipse.equinox.launcher.gtk.linux.ppc
bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64
bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-index f5fb504..1187e84 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-@@ -425,6 +425,7 @@
-
-
-
-+
-
-
- Is64=${is64}
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
index 7e1f520..734dd10 100644
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
@@ -218,10 +195,8 @@ index 29d3871..45526c8 100644
*)
echo "*** Unknown MODEL <${MODEL}>"
;;
-diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-index fac13bf..e487001 100644
---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000
@@ -219,6 +219,189 @@
@@ -412,79 +387,23 @@ index fac13bf..e487001 100644
build-native-launchers-win32.win32.x86_64
-@@ -530,8 +530,6 @@
-
-
-
+@@ -347,8 +530,6 @@
+
+
+
-
-
-
-
+
+
---- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2014-05-26 19:20:28.958177815 +0300
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2014-05-26 19:33:42.942025740 +0300
-@@ -30,6 +30,64 @@
- 2.6
-
-
-+ copy-resources-gtk.linux.aarch64
-+ validate
-+
-+ copy-resources
-+
-+
-+ ${basedir}/target/resources/linux.gtk.aarch64
-+
-+
-+ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.aarch64
-+
-+ about_files/*
-+ about.html
-+
-+
-+
-+
-+
-+
-+ copy-resources-gtk.linux.arm
-+ validate
-+
-+ copy-resources
-+
-+
-+ ${basedir}/target/resources/linux.gtk.arm
-+
-+
-+ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm
-+
-+ about_files/*
-+ about.html
-+
-+
-+
-+
-+
-+
-+ copy-resources-gtk.linux.ppc64le
-+ validate
-+
-+ copy-resources
-+
-+
-+ ${basedir}/rootfiles/linux.gtk.ppc64le
-+
-+
-+ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc64le
-+
-+
-+ about_files/*
-+ about.html
-+
-+
-+
-+
-+
-+
- copy-resources-gtk.linux.x86
- validate
-
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
+@@ -59,4 +59,8 @@
+ root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root
+ root.linux.gtk.s390.permissions.755=launcher
+
++root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
++root.linux.gtk.aarch64.permissions.755=launcher
++root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
++root.linux.gtk.arm.permissions.755=launcher
+
diff --git a/eclipse-servlet-3.1.patch b/eclipse-servlet-3.1.patch
deleted file mode 100644
index 980f22a..0000000
--- a/eclipse-servlet-3.1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- eclipse.platform.ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ValidatorServlet.java.sav 2013-09-30 11:59:22.000000000 +0300
-+++ eclipse.platform.ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ValidatorServlet.java 2014-01-06 15:09:36.251220892 +0200
-@@ -26,6 +26,7 @@ import java.util.Locale;
- import javax.servlet.ServletConfig;
- import javax.servlet.ServletException;
- import javax.servlet.ServletOutputStream;
-+import javax.servlet.WriteListener;
- import javax.servlet.http.HttpServlet;
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
-@@ -270,5 +271,11 @@ public class ValidatorServlet extends Ht
- public void write(int b) throws IOException {
- out.write(b);
- }
-+
-+ public boolean isReady() {
-+ return true;
-+ }
-+ public void setWriteListener(WriteListener writeListener) {
-+ }
- }
- }
---- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.sav 2014-01-06 17:08:09.690171368 +0200
-+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2014-01-06 17:09:02.193219753 +0200
-@@ -295,18 +295,6 @@
- version="0.0.0"/>
-
-
--
--
--
--
@@ -34,17 +34,19 @@
-
-
-
+-
+- - ->
-
-
+- -->
-
@@ -74,38 +76,12 @@
-
-
-
-+
-+
-+
-
--
--
--
--
--
-
--
--
-+
-+
-
--
-
-
-
-@@ -320,7 +235,7 @@
++
+
+
@@ -114,7 +90,7 @@
-@@ -867,6 +782,17 @@
+@@ -886,6 +815,17 @@
arg2="" />
@@ -132,7 +108,7 @@
-@@ -1411,6 +1337,15 @@
+@@ -1430,6 +1370,15 @@
value="end longRunningTests" />
@@ -148,7 +124,7 @@