rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Mat Booth 2015-01-30 10:05:27 +00:00
parent 98fd2d20f5
commit bb7d8dd4fc
21 changed files with 189 additions and 1310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

259
eclipse-bug-386377.patch
View File

@ -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 @@
<ws>gtk</ws>
<arch>x86_64</arch>
</properties>
+ <profiles>
+ <profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.x86_64</id>
+ <activation>
+ <property>
@ -17,7 +17,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@ -32,28 +32,6 @@
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@ -62,13 +40,12 @@
</project>
--- 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 @@
<ws>win32</ws>
<arch>x86_64</arch>
</properties>
+
+ <profiles>
+ <profile>
+ <profile>
+ <id>build-native-launchers-win32.win32.x86_64</id>
+ <activation>
+ <property>
@ -80,7 +57,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@ -95,28 +72,6 @@
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@ -125,13 +80,12 @@
</project>
--- 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 @@
<ws>gtk</ws>
<arch>ppc64le</arch>
</properties>
+
+ <profiles>
+ <profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.ppc64le</id>
+ <activation>
+ <property>
@ -143,7 +97,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@ -158,28 +112,6 @@
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@ -188,12 +120,12 @@
</project>
--- 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 @@
<ws>gtk</ws>
<arch>x86</arch>
</properties>
+ <profiles>
+ <profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.x86</id>
+ <activation>
+ <property>
@ -205,7 +137,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@ -220,28 +152,6 @@
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@ -250,13 +160,12 @@
</project>
--- 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 @@
<ws>win32</ws>
<arch>x86</arch>
</properties>
+
+ <profiles>
+ <profile>
+ <profile>
+ <id>build-native-launchers-win32.win32.x86</id>
+ <activation>
+ <property>
@ -268,7 +177,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@ -283,28 +192,6 @@
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@ -313,13 +200,12 @@
</project>
--- 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 @@
<ws>gtk</ws>
<arch>s390</arch>
</properties>
+
+ <profiles>
+ <profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.s390</id>
+ <activation>
+ <property>
@ -331,7 +217,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@ -346,28 +232,6 @@
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@ -376,13 +240,12 @@
</project>
--- 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 @@
<ws>gtk</ws>
<arch>s390x</arch>
</properties>
+
+ <profiles>
+ <profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.s390x</id>
+ <activation>
+ <property>
@ -394,7 +257,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@ -409,28 +272,6 @@
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@ -439,13 +280,12 @@
</project>
--- 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 @@
<ws>gtk</ws>
<arch>ppc64</arch>
</properties>
+
+ <profiles>
+ <profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.ppc64</id>
+ <activation>
+ <property>
@ -457,7 +297,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@ -472,28 +312,6 @@
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
@ -502,13 +320,12 @@
</project>
--- 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 @@
<ws>gtk</ws>
<arch>ppc</arch>
</properties>
+
+ <profiles>
+ <profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.ppc</id>
+ <activation>
+ <property>
@ -520,7 +337,7 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version> 1.7 </version>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
@ -535,28 +352,6 @@
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>

96
eclipse-bug-444143.patch
View File

@ -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 <swagiaal@redhat.com>
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

16
eclipse-bug-903537.patch
View File

@ -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 {

5
eclipse-change-build-packagings.patch
View File

@ -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" />
<feature
@ -42,9 +42,10 @@
- id="org.eclipse.releng.tools"
- version="0.0.0" />
- <feature
id="org.eclipse.equinox.executable"
id="org.eclipse.swt.tools.feature"
version="0.0.0" />
<feature
@@ -31,9 +22,6 @@
id="org.eclipse.sdk"
version="0.0.0" />
<feature

12
eclipse-feature-plugins-to-category-ius.patch
View File

@ -223,7 +223,7 @@ index 8176831..c97bab0 100644
- id="org.apache.batik.css"
- download-size="0"
- install-size="0"
- version="1.7.0.qualifier"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
@ -237,28 +237,28 @@ index 8176831..c97bab0 100644
- id="org.apache.batik.util"
- download-size="0"
- install-size="0"
- version="1.7.0.qualifier"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.svg"
- download-size="0"
- install-size="0"
- version="1.1.0.qualifier"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.smil"
- download-size="0"
- install-size="0"
- version="1.0.0.qualifier"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.events"
- download-size="0"
- install-size="0"
- version="3.0.0.qualifier"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
@ -286,7 +286,7 @@ index 8176831..c97bab0 100644
- id="org.apache.batik.util.gui"
- download-size="0"
- install-size="0"
- version="1.7.0.qualifier"
- version="0.0.0"
- unpack="false"/>
-
- <plugin

2
eclipse-help-doc-adjust-dependencies.patch
View File

@ -27,6 +27,6 @@ index 12beb8e..e20ea19 100644
+ org.apache.lucene.index;version="[3.5.0,5.0.0)",
+ org.apache.lucene.search;version="[3.5.0,5.0.0)",
+ org.apache.lucene.store;version="[3.5.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.ua.tests,
org.eclipse.ua.tests.browser,

599
eclipse-jetty-9.patch
View File

@ -1,599 +0,0 @@
From eaca20d2a41ba2771bd379408d87673b12646390 Wed, 27 Feb 2013 09:33:50 +0100
From: Krzysztof Daniel <kdaniel@redhat.com>
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 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <projectDescription>
-- <name>org.eclipse.equinox.http.jetty6</name>
-+ <name>org.eclipse.equinox.http.jetty7</name>
- <comment></comment>
- <projects>
- </projects>
-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.
- * </p>
- * @param context
-- * the Jetty context; in case of Jetty 6 the context is of
-- * type <code>org.mortbay.jetty.servlet.Context</code>
-+ * the Jetty context; in case of Jetty 7 the context is of
-+ * type <code>org.eclipse.jetty.servlet.ServletContextHandler</code>
- * @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 <code>org.mortbay.jetty.servlet.Context</code>
-+ * the customized context; in case of Jetty 7 the context is of
-+ * type <code>org.eclipse.jetty.servlet.ServletContextHandler</code>
- */
- public Object customizeContext(Object context, Dictionary settings) {
- return context;
-@@ -52,13 +52,13 @@
- * Implementors may perform additional configuration of the Jetty Connector.
- * </p>
- * @param connector
-- * the Jetty connector; in case of Jetty 6 the context is of
-- * type <code>org.mortbay.jetty.Connector</code>
-+ * the Jetty connector; in case of Jetty 7 the context is of
-+ * type <code>org.eclipse.jetty.server.Connector</code>
- * @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 <code>org.mortbay.jetty.Connector</code>
-+ * type <code>org.eclipse.jetty.server.Connector</code>
- */
- public Object customizeHttpConnector(Object connector, Dictionary settings) {
- return connector;
-@@ -71,13 +71,13 @@
- * Implementors may perform additional configuration of the Jetty Connector.
- * </p>
- * @param connector
-- * the Jetty connector; in case of Jetty 6 the connector is of
-- * type <code>org.mortbay.jetty.Connector</code>
-+ * the Jetty connector; in case of Jetty 7 the connector is of
-+ * type <code>oorg.eclipse.jetty.server.Connector</code>
- * @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 <code>org.mortbay.jetty.Connector</code>
-+ * the customized connector; in case of Jetty 7 the connector is of
-+ * type <code>org.eclipse.jetty.server.Connector</code>
- */
- 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<Server> 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) {

28
eclipse-lucene-4.patch
View File

@ -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");

12
eclipse-mockito.patch
View File

@ -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

18
eclipse-no-source-for-dependencies.patch
View File

@ -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 @@
<plugin id="org.eclipse.core.net.linux.x86_64"/>
<plugin id="org.eclipse.core.net.win32.x86"/>
<plugin id="org.eclipse.core.net.win32.x86_64"/>
<plugin id="org.eclipse.equinox.security.macosx"/>
+ <plugin id="org.eclipse.equinox.security.macosx"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
+ <plugin id="org.eclipse.compare.win32"/>
@ -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 @@
<plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
+ <plugin id="org.apache.felix.gogo.command" />
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
+ <plugin id="org.apache.felix.gogo.command" />
+ <plugin id="org.apache.batik.css" />
+ <plugin id="org.w3c.css.sac" />
+ <plugin id="org.apache.batik.util" />
@ -199,7 +200,6 @@
+ <plugin id="org.apache.felix.gogo.shell" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le" />
+ <plugin id="org.eclipse.swt.win32.win32.x86" />
+ <plugin id="org.eclipse.swt.win32.win32.x86_64" />
+ <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" />
@ -209,7 +209,7 @@
+ <plugin id="org.eclipse.swt.gtk.aix.ppc" />
+ <plugin id="org.eclipse.swt.gtk.aix.ppc64" />
+ <plugin id="org.eclipse.swt.gtk.hpux.ia64" />
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
</excludes>
</configuration>
</execution>

14
eclipse-no-target-platform.patch
View File

@ -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 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<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 @@
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=453757
<resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints>
-->
- <target>
- <artifact>
- <groupId>org.eclipse</groupId>
- <artifactId>eclipse-sdk-prereqs</artifactId>
- <version>4.4.0-SNAPSHOT</version>
- <version>4.5.0-SNAPSHOT</version>
- </artifact>
- </target>
<environments>

6
eclipse-policy-comparators.patch
View File

@ -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

8
eclipse-remove-jgit-provider.patch
View File

@ -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 @@
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<dependencies>
@ -9,7 +9,7 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras.version}</version>
@@ -341,19 +341,19 @@
@@ -369,19 +369,19 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId>
<version>${tycho-extras.version}</version>

151
eclipse-secondary-arches.patch
View File

@ -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 @@
<arch>s390x</arch>
</environment>
<environment>
@ -18,11 +16,6 @@ index 6c567f8..969eafb 100644
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
@ -37,17 +30,15 @@ index 6c567f8..969eafb 100644
- </environment>
- <environment>
- <os>hpux</os>
+ <os>linux</os>
<ws>gtk</ws>
- <ws>gtk</ws>
- <arch>ia64</arch>
+ <arch>arm</arch>
</environment>
<environment>
- </environment>
- <environment>
- <os>aix</os>
+ <os>linux</os>
<ws>gtk</ws>
- <arch>ppc</arch>
+ <arch>ppc64le</arch>
+ <arch>arm</arch>
</environment>
<environment>
- <os>aix</os>
@ -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 @@
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
<module>bundles/org.eclipse.swt.gtk.linux.s390</module>
<module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
@ -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 @@
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
@ -125,18 +114,6 @@ index b46cdc6..0fb36a5 100644
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
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 @@
<equals arg1="${swt.arch}" arg2="ppc64"/>
<equals arg1="${swt.arch}" arg2="ppc64le"/>
<equals arg1="${swt.arch}" arg2="s390x"/>
+ <equals arg1="${swt.arch}" arg2="aarch64"/>
</or>
</condition>
<echo>Is64=${is64}</echo>
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 @@
</plugins>
</build>
@ -412,79 +387,23 @@ index fac13bf..e487001 100644
<profile>
<id>build-native-launchers-win32.win32.x86_64</id>
<activation>
@@ -530,8 +530,6 @@
<include name="gtk/solaris/x86/**/*" />
<include name="win32/win32/x86/**/*" />
<include name="win32/win32/x86_64/**/*" />
@@ -347,8 +530,6 @@
<include name="gtk/solaris/x86/**/*"/>
<include name="win32/win32/x86/**/*"/>
<include name="win32/win32/x86_64/**/*"/>
- </fileset>
- <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
<include name="gtk/linux/s390/**/*" />
<include name="gtk/linux/s390x/**/*" />
<include name="gtk/linux/s390/**/*"/>
<include name="gtk/linux/s390x/**/*"/>
</fileset>
--- 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 @@
<version>2.6</version>
<executions>
<execution>
+ <id>copy-resources-gtk.linux.aarch64</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/resources/linux.gtk.aarch64</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.aarch64</directory>
+ <includes>
+ <include>about_files/*</include>
+ <include>about.html</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources-gtk.linux.arm</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/resources/linux.gtk.arm</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm</directory>
+ <includes>
+ <include>about_files/*</include>
+ <include>about.html</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources-gtk.linux.ppc64le</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/rootfiles/linux.gtk.ppc64le</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc64le
+ </directory>
+ <includes>
+ <include>about_files/*</include>
+ <include>about.html</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
<id>copy-resources-gtk.linux.x86</id>
<phase>validate</phase>
<goals>
--- 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

43
eclipse-servlet-3.1.patch
View File

@ -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"/>
<plugin
- id="org.eclipse.ua.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.ua.tests.doc"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.eclipse.ui.tests.navigator"
download-size="0"
install-size="0"

58
eclipse-test-support.patch
View File

@ -1,6 +1,6 @@
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2014-04-01 15:02:34.500445944 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2014-04-01 15:16:01.556714647 +0100
@@ -200,99 +200,14 @@
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2014-11-28 14:54:50.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2014-11-28 15:44:49.542304044 +0000
@@ -207,79 +207,8 @@
<!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
<target name="setupPlatform">
@ -34,17 +34,19 @@
- </or>
- </and>
- </condition>
- <!--
- <condition
- property="platformArchive"
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
- <and>
- <os family="mac" />
- <os family="unix" />
- <!-- should not need, as long as x86_64 rules (above) comes first
- <!- - should not need, as long as x86_64 rules (above) comes first
- <os arch="i386" />
- -->
- - ->
- </and>
- </condition>
- -->
- <condition
- property="platformArchive"
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
@ -74,38 +76,12 @@
- <os arch="amd64" />
- </or>
- </and>
+ <property name="platformArchive" value="${runtimeArchive}" />
+ <condition property="platformTarget" value="platform-zip">
+ <contains string="${platformArchive}" substring=".zip" />
</condition>
-
- <fail
- unless="platformArchive"
- message="platformArchive is not defined. Check that conditions cover os arch ${os.arch}. May be VM dependent.)" />
-
- <condition
- property="platformTarget"
- value="platform-zip">
- <contains
- string="${platformArchive}"
- substring=".zip" />
- </condition>
- <condition
- property="platformTarget"
- value="platform-tar.gz">
- <contains
- string="${platformArchive}"
- substring=".tar.gz" />
+ <condition property="platformTarget" value="platform-tar.gz">
+ <contains string="${platformArchive}" substring=".tar.gz" />
</condition>
- <fail
- unless="platformTarget"
- message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
<echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
<antcall target="${platformTarget}" />
</target>
@@ -320,7 +235,7 @@
+ <property name="platformArchive" value="${runtimeArchive}" />
<fail
unless="platformArchive"
@@ -329,7 +258,7 @@
<exec
dir="${platformLocation}"
executable="tar">
@ -114,7 +90,7 @@
</exec>
</target>
@@ -867,6 +782,17 @@
@@ -886,6 +815,17 @@
arg2="" />
</not>
</condition>
@ -132,7 +108,7 @@
<antcall target="runSuite" />
<antcall target="genResults" />
</target>
@@ -1411,6 +1337,15 @@
@@ -1430,6 +1370,15 @@
value="end longRunningTests" />
</antcall>
@ -148,7 +124,7 @@
</target>
<!--
@@ -1453,7 +1388,6 @@
@@ -1471,7 +1420,6 @@
<antcall target="e4CssSwt" />
<antcall target="e4UI" />
<antcall target="equinoxds" />
@ -156,7 +132,7 @@
<antcall target="bidi" />
<antcall target="ltkuirefactoringtests" />
<antcall target="ltkcorerefactoringtests" />
@@ -1467,7 +1401,6 @@
@@ -1485,7 +1433,6 @@
<antcall target="osgi" />
<antcall target="coreresources" />
<antcall target="equinoxp2" />
@ -164,7 +140,7 @@
<antcall target="jface" />
<antcall target="ui" />
<antcall target="uiperformance" />
@@ -1550,7 +1483,7 @@
@@ -1568,7 +1515,7 @@
<property
name="message"
value="no message given by caller" />

44
eclipse-webkit2-support.patch
View File

@ -1,24 +1,3 @@
diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
index 01b3f12..2009b84 100644
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
@@ -401,6 +401,7 @@ public Object evaluate (String script) throws SWTException {
registerFunction (function);
String functionName = EXECUTE_ID + index;
+ // Create a function that will execute the given script
StringBuffer buffer = new StringBuffer ("window."); // $NON-NLS-1$
buffer.append (functionName);
buffer.append (" = function "); // $NON-NLS-1$
@@ -410,6 +411,8 @@ public Object evaluate (String script) throws SWTException {
buffer.append ("\n};"); // $NON-NLS-1$
execute (buffer.toString ());
+ // Execute the function created above, assign the result to
+ // a variable then call Java with that result
buffer = new StringBuffer ("if (window."); // $NON-NLS-1$
buffer.append (functionName);
buffer.append (" == undefined) {window.external.callJava("); // $NON-NLS-1$
diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
index 780a82c..c3bedd0 100644
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
@ -716,20 +695,6 @@ index 15b7761..3994f37 100644
#ifndef NO__1webkit_1web_1view_1get_1progress
JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress)
(JNIEnv *env, jclass that, jintLong arg0)
diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
index f54feb4..0598b9f 100644
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
@@ -31,6 +31,9 @@
char *webkit2 = getenv("SWT_WEBKIT2"); \
if (webkit2 != NULL && strcmp(webkit2, "1") == 0) { \
handle = dlopen("libwebkit2gtk-3.0.so.25", LOAD_FLAGS); /* webkit2 */ \
+ if (!handle) { \
+ handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \
+ } \
} else { \
handle = dlopen("libwebkitgtk-3.0.so.0", LOAD_FLAGS); /* webkitgtk >= 3.x lib */ \
} \
diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
index c3cf9ee..b0e6650 100644
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
@ -1554,15 +1519,6 @@ index 4b8c089..176b44f 100644
public static char [] mbcsToWcs (String codePage, byte [] buffer) {
long /*int*/ [] items_written = new long /*int*/ [1];
long /*int*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);
@@ -57,7 +64,7 @@ public static byte [] wcsToMbcs (String codePage, String string, boolean termina
public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) {
long /*int*/ [] items_read = new long /*int*/ [1], items_written = new long /*int*/ [1];
/*
- * Note that g_utf16_to_utf8() stops converting
+ * Note that g_utf16_to_utf8() stops converting
* when it finds the first NULL.
*/
long /*int*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);
diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GVariantConverter.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GVariantConverter.java
new file mode 100644
index 0000000..dc19b0f

28
eclipse-workspace-chooser.patch
View File

@ -1,28 +0,0 @@
From ba6d6b9708a06fa267240471407c239d02484821 Mon Sep 17 00:00:00 2001
From: Timo Kinnunen
Date: Fri, 7 Nov 2014 15:28:21 +0100
Subject: Fixed bug 429308: Make workspace selection dialog visible in the task
manager of the OS
Signed-off-by: Timo Kinnunen <timo.kinnunen@gmail.com>
diff --git a/eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
index 4797d2d..d88f57f 100644
--- a/eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
+++ b/eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
@@ -314,7 +314,12 @@ public class IDEApplication implements IApplication, IExecutableExtension {
URL url = null;
do {
// okay to use the shell now - this is the splash shell
- new ChooseWorkspaceDialog(shell, launchData, false, true).prompt(force);
+ new ChooseWorkspaceDialog(shell, launchData, false, true) {
+ @Override
+ protected Shell getParentShell() {
+ return null;
+ }
+ }.prompt(force);
String instancePath = launchData.getSelection();
if (instancePath == null) {
return null;
--
cgit v0.10.1-9-gd18e

91
eclipse.spec
View File

@ -10,12 +10,12 @@
Epoch: 1
%global eclipse_major 4
%global eclipse_minor 4
%global eclipse_micro 1
%global eb_commit 2135919f7f0f11f3c43901b8e70819c9a4911ac3
%global eclipse_tag R4_4_1
%global eclipse_minor 5
%global eclipse_micro 0
%global eb_commit 2775b93d3d9f147f5711c91bb3aa623f2582019d
%global eclipse_tag I20150210-0800
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
%global _jetty_version 9.2.3
%global _jetty_version 9.2.7
%ifarch %{ix86}
%define eclipse_arch x86
@ -38,9 +38,8 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 17%{?dist}
Release: 0.1.git201502100800%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
# Tarball generated by calling ./get-eclipse.sh
@ -92,18 +91,15 @@ Patch11: %{pkg_name}-debug-symbols.patch
Patch12: %{pkg_name}-fix-comaptibility-class.patch
Patch13: %{pkg_name}-bug-903537.patch
Patch14: %{pkg_name}-jetty-9.patch
Patch15: %{pkg_name}-fix-startup-class-refresh.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138
Patch16: %{pkg_name}-fix-dropins.patch
Patch17: %{pkg_name}-bug-386377.patch
Patch18: %{pkg_name}-servlet-3.1.patch
Patch19: %{pkg_name}-lucene-4.patch
# Resolving the target platform requires too many changes, so don't use it
Patch20: %{pkg_name}-no-target-platform.patch
# org.mockito -> org.mockito.mockito-core
@ -112,7 +108,6 @@ Patch21: %{pkg_name}-mockito.patch
Patch22: %{pkg_name}-policy-comparators.patch
Patch23: %{pkg_name}-webkit2-support.patch
Patch24: %{pkg_name}-bug-444143.patch
Patch25: %{pkg_name}-support-symlink-bundles.patch
@ -122,9 +117,6 @@ Patch25: %{pkg_name}-support-symlink-bundles.patch
# the plugin in the top-level category so it still gets bundled.
Patch26: %{pkg_name}-feature-plugins-to-category-ius.patch
# Make workspace selection dialog visible in the task manager of the OS
Patch27: eclipse-workspace-chooser.patch
# Require hamcrest when using directly (cannot rely on junit reexporting it)
Patch28: eclipse-direct-hamcrest-use.patch
@ -144,7 +136,6 @@ BuildRequires: desktop-file-utils
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: libXt-devel
BuildRequires: webkitgtk-devel
BuildRequires: webkitgtk4
BuildRequires: webkitgtk4-devel
BuildRequires: geronimo-annotation >= 1.0-7
BuildRequires: %{?scl_prefix}icu4j >= 1:54.1.1-2
@ -198,13 +189,12 @@ everything in between.
%package swt
Summary: SWT Library for GTK+
Group: Development/Tools
Requires: java >= 1:1.7.0
Requires: jpackage-utils
Requires: gtk2
Requires: gtk3
Requires: webkitgtk
Requires: webkitgtk3
Requires: webkitgtk4
%description swt
SWT Library for GTK+.
@ -220,7 +210,6 @@ Eclipse OSGi - Equinox
%package platform
Summary: Eclipse platform common files
Group: Development/Tools
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
Requires: apache-commons-el >= 1.0-23
@ -264,7 +253,6 @@ Java Development Tools or the Plugin Development Environment.
%package jdt
Summary: Eclipse Java Development Tools
Group: Development/Tools
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: junit >= 4.10-5
Requires: hamcrest >= 0:1.1-11
@ -275,7 +263,6 @@ developing software written in the Java programming language.
%package pde
Summary: Eclipse Plugin Development Environment
Group: Development/Tools
Provides: %{name} = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release}
@ -290,7 +277,6 @@ developing Eclipse plugins.
%package p2-discovery
Summary: Eclipse p2 Discovery
Group: Development/Tools
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Obsoletes: %{name}-p2-discovery < 1:4.4.0
@ -302,7 +288,6 @@ installer UIs.
%package tests
Summary: Eclipse Tests
Group: Development/Tools
Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release}
Requires: easymock3
Requires: mockito
@ -328,24 +313,19 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch10 -p1
%patch11
%patch12
%patch13
%patch14
%patch15
%patch16
%patch17
%patch18
%patch19 -p1
%patch20
%patch21
%patch22
%patch23
%patch24 -p1
%patch25
%patch26
%patch27 -p1
%patch28
#Disable as many things as possible to make the build faster. We care only for Eclipse.
# 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
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
@ -354,15 +334,15 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.caching rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.weaving.hook rt.equinox.bundles
@ -372,7 +352,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
%pom_disable_module org.eclipse.ua.tests eclipse.platform.ua
# We don't need releng tools
%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng
@ -415,7 +394,6 @@ done
%pom_disable_module bundles/org.eclipse.core.filesystem.win32.x86_64 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86 eclipse.platform.resources
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
%pom_disable_module examples/org.eclipse.swt.examples.ole.win32 eclipse.platform.swt
@ -427,6 +405,11 @@ for dir in eclipse.platform.swt.binaries/bundles \
utils/ensure_arch.sh "$dir" x86_64 aarch64
done
# Include some extra features with the product that some other projects may need at
# build time as part of their target platform definitions
sed -i -e '166i<feature id="org.eclipse.core.runtime.feature"/>' \
eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
# Don't mirror stuff to the repo that we haven't built
%pom_xpath_remove "pom:execution[pom:id[text()='mirror-build-emf']]" \
eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository
@ -456,9 +439,12 @@ for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt
done
# Don't set perms on files for platforms that aren't linux
sed -i -e '/^root\.[^l]/d' \
rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties \
eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
for f in \
rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties \
eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties ; do
grep '^root\.linux\.gtk\.%{eclipse_arch}[.=]' $f > tmp
sed -i -e '/^root\./d' $f && cat tmp >> $f
done
# Hack - this can go away once upstream grows arm and aarch64 support
mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
@ -496,10 +482,6 @@ sed -i 's/javax\.el/com\.sun\.el\.javax\.el/' \
# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat)
find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|'
# Bump javax.servlet Import-Package statements
sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
@ -514,17 +496,15 @@ sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/
#This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
export JAVA_HOME=%{java_home}
export GTK_VERSION=3.0
xmvn -o clean verify \
%mvn_build -j -f -- \
%if %{bootstrap}
-P !api-generation,!build-docs \
%endif
-Declipse.javadoc=/usr/bin/javadoc \
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} \
-Declipse.javadoc=/usr/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \
-Dtycho.local.keepTarget -Ddirector.running.env.only=true \
-Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk/plugins \
-Dtargets=install -DbuildType=Z
-Dfedora.p2.repos=`pwd`/.m2/p2/repo-sdk/plugins -DbuildType=Z
#ant again
dependencies/fake_ant_dependency.sh \
@ -822,8 +802,10 @@ fi
%dir %{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/
%{_libdir}/%{pkg_name}/configuration/config.ini
%{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
%{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
%{_libdir}/%{pkg_name}/features/org.eclipse.core.runtime.feature_*
%{_libdir}/%{pkg_name}/features/org.eclipse.e4.rcp_*
%{_libdir}/%{pkg_name}/features/org.eclipse.equinox.core.feature_*
%{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
%{_libdir}/%{pkg_name}/features/org.eclipse.rcp_*
%{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
%{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
@ -893,6 +875,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.ide.application_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.intro_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.intro.universal_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.monitoring_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.navigator_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.navigator.resources_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.net_*
@ -909,6 +892,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.css.swt_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.di_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.dialogs_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.model.workbench_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.services_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.widgets_*
@ -995,8 +979,6 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.update.configurator_*
%{_libdir}/%{pkg_name}/readme
%{_libdir}/%{pkg_name}/about_files
%doc %{_libdir}/%{pkg_name}/about.html
%{_libdir}/%{pkg_name}/artifacts.xml
%{_libdir}/%{pkg_name}/p2
%{_javadir}/%{pkg_name}/core*
@ -1030,6 +1012,15 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Fri Jan 30 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.1.git201502100800
- 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
* Fri Jan 23 2015 Michael Simacek <msimacek@redhat.com> - 1:4.4.1-17
- Rebuild against new jetty

5
get-eclipse.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
TAG=R4_4_1
TAG=I20150210-0800
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
@ -28,7 +28,8 @@ find . -type f -name *.class -delete
find . -type f -name *.so -delete
find . -type f -name *.dll -delete
find . -type f -name *.jnilib -delete
find . -type f -name eclipse -delete
# Remove pre-compiled native launchers
rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
popd

4
sources
View File

@ -1,2 +1,2 @@
0d857f3b64931672dca62142d7fbdbd0 R4_platform-aggregator-R4_4_1.tar.xz
4c99218a93f07f77d356c9bf06ee1cce org.eclipse.linuxtools.eclipse-build-2135919f7f0f11f3c43901b8e70819c9a4911ac3.tar.bz2
078ea3a8611e0aebcb1a5b5c037e101c R4_platform-aggregator-I20150210-0800.tar.xz
1497147a427b98a00a87263880063294 org.eclipse.linuxtools.eclipse-build-2775b93d3d9f147f5711c91bb3aa623f2582019d.tar.bz2