This commit was manufactured by cvs2git to create branch 'AC-branch'.AC-branch

Sprout from master 2007-12-01 00:58:20 UTC Elan Ruusamäe <glen@pld-linux.org> '- rel 1 (rel 1, deunderscore local macros)'
Cherrypick from master 2005-06-30 20:05:58 UTC djurban <djurban@pld-linux.org> '- updated to 3.1':
    eclipse-jikesbuild.patch -> 1.3
Delete:
    eclipse-disable-junit4-apt.patch

2 files changed, 121 insertions, 513 deletions

diff --git a/eclipse-disable-junit4-apt.patch b/eclipse-disable-junit4-apt.patch
deleted file mode 100644
index 472257f..0000000
--- a/eclipse-disable-junit4-apt.patch
+++ /dev/null
@@ -1,513 +0,0 @@
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.ia64.xml assemble.org.eclipse.sdk.linux.gtk.ia64.xml
---- assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2006-07-04 13:33:17.000000000 -0400
-@@ -106,9 +106,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -130,9 +127,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -295,9 +289,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -325,9 +316,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -471,10 +459,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -495,10 +479,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -675,10 +655,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
- 		</antcall>
- 		<antcall target="jarUp">
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.ppc64.xml assemble.org.eclipse.sdk.linux.gtk.ppc64.xml
---- assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-07-04 13:33:54.000000000 -0400
-@@ -106,9 +106,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -130,9 +127,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -292,9 +286,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -322,9 +313,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -462,10 +450,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -486,10 +470,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -662,10 +642,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
- 		</antcall>
- 		<antcall target="jarUp">
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.ppc.xml assemble.org.eclipse.sdk.linux.gtk.ppc.xml
---- assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2006-07-04 13:34:22.000000000 -0400
-@@ -109,9 +109,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -133,9 +130,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -298,9 +292,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -328,9 +319,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -471,10 +459,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -495,10 +479,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -675,10 +655,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
- 		</antcall>
- 		<antcall target="jarUp">
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.x86_64.xml assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
---- assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2006-07-04 13:34:53.000000000 -0400
-@@ -106,9 +106,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -130,9 +127,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -298,9 +292,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -331,9 +322,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -474,10 +462,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -498,10 +482,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -678,10 +658,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
- 		</antcall>
- 		<antcall target="jarUp">
-diff -uNr assemble.org.eclipse.sdk.linux.gtk.x86.xml assemble.org.eclipse.sdk.linux.gtk.x86.xml
---- assemble.org.eclipse.sdk.linux.gtk.x86.xml	2006-07-04 13:40:47.000000000 -0400
-+++ assemble.org.eclipse.sdk.linux.gtk.x86.xml	2006-07-04 13:35:31.000000000 -0400
-@@ -112,9 +112,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -136,9 +133,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -298,9 +292,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -331,9 +322,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
--			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
--		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
- 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
- 		</ant>
-@@ -474,10 +462,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -498,10 +482,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
- 		</antcall>
- 		<antcall target="jarUp">
-@@ -678,10 +658,6 @@
- 		</antcall>
- 		<antcall target="jarUp">
- 			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
--		</antcall>
--		<antcall target="jarUp">
--			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
- 		</antcall>
- 		<antcall target="jarUp">
-diff -uNr features/org.eclipse.jdt/build.xml features/org.eclipse.jdt/build.xml
---- features/org.eclipse.jdt/build.xml	2006-07-04 13:40:47.000000000 -0400
-+++ features/org.eclipse.jdt/build.xml	2006-07-04 13:38:22.000000000 -0400
-@@ -12,11 +12,6 @@
- 			<property name="os" value="win32"/>
- 			<property name="ws" value="win32"/>
- 		</ant>
--		<ant antfile="build.xml" dir="../../plugins/org.junit4" target="${target}">
--			<property name="arch" value="x86"/>
--			<property name="os" value="win32"/>
--			<property name="ws" value="win32"/>
--		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.junit" target="${target}">
- 			<property name="arch" value="x86"/>
- 			<property name="os" value="win32"/>
-@@ -27,11 +22,6 @@
- 			<property name="os" value="win32"/>
- 			<property name="ws" value="win32"/>
- 		</ant>
--		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.junit4.runtime" target="${target}">
--			<property name="arch" value="x86"/>
--			<property name="os" value="win32"/>
--			<property name="ws" value="win32"/>
--		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.core" target="${target}">
- 			<property name="arch" value="x86"/>
- 			<property name="os" value="win32"/>
-@@ -77,16 +67,6 @@
- 			<property name="os" value="win32"/>
- 			<property name="ws" value="win32"/>
- 		</ant>
--		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.core" target="${target}">
--			<property name="arch" value="x86"/>
--			<property name="os" value="win32"/>
--			<property name="ws" value="win32"/>
--		</ant>
--		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.ui" target="${target}">
--			<property name="arch" value="x86"/>
--			<property name="os" value="win32"/>
--			<property name="ws" value="win32"/>
--		</ant>
- 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ant.ui" target="${target}">
- 			<property name="arch" value="x86"/>
- 			<property name="os" value="win32"/>
-@@ -150,7 +130,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="epl-v10.html,feature.xml,feature.properties,eclipse_update_120.jpg,license.html"			/>
- 		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP/feature.xml"  selfVersion="3.2.0.v20060609m-F7snq1fxia-Z4XP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060605-1400,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.apt.core,3.2.0.v20060602-1740,org.eclipse.jdt.apt.ui,3.2.0.v20060602-1740,org.eclipse.jdt.core,3.2.0.v_671,org.eclipse.jdt.core.manipulation,1.0.0.v20060605-1400,org.eclipse.jdt.debug.ui,3.2.0.v20060605,org.eclipse.jdt.debug,3.2.0.v20060605,org.eclipse.jdt.junit,3.2.0.v20060605-1400,org.eclipse.jdt.junit.runtime,3.2.0.v20060605-1400,org.eclipse.jdt.junit4.runtime,1.0.0.v20060605-1400,org.eclipse.jdt.launching,3.2.0.v20060605,org.eclipse.jdt.ui,3.2.0.v20060605-1400,org.junit,3.8.1,org.junit4,4.1.0,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP/feature.xml"  selfVersion="3.2.0.v20060609m-F7snq1fxia-Z4XP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060605-1400,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.core,3.2.0.v_671,org.eclipse.jdt.core.manipulation,1.0.0.v20060605-1400,org.eclipse.jdt.debug.ui,3.2.0.v20060605,org.eclipse.jdt.debug,3.2.0.v20060605,org.eclipse.jdt.junit,3.2.0.v20060605-1400,org.eclipse.jdt.junit.runtime,3.2.0.v20060605-1400,org.eclipse.jdt.launching,3.2.0.v20060605,org.eclipse.jdt.ui,3.2.0.v20060605-1400,org.junit,3.8.1,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
- 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
- 	</target>
- 	<target name="rootFileswin32_win32_x86">
-diff -uNr features/org.eclipse.jdt/feature.xml features/org.eclipse.jdt/feature.xml
---- features/org.eclipse.jdt/feature.xml	2006-07-04 13:40:47.000000000 -0400
-+++ features/org.eclipse.jdt/feature.xml	2006-07-04 12:05:17.000000000 -0400
-@@ -38,20 +38,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.jdt.apt.core"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.jdt.apt.ui"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.jdt.core"
-          download-size="0"
-          install-size="0"
-@@ -91,13 +77,6 @@
-          version="0.0.0"/>
- 
-    <plugin
--         id="org.eclipse.jdt.junit4.runtime"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--         
--   <plugin
-          id="org.eclipse.jdt.launching"
-          download-size="0"
-          install-size="0"
-@@ -118,12 +97,6 @@
-          version="3.8.1"/>
- 
-    <plugin
--         id="org.junit4"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"/>
--         
--   <plugin
-          id="org.eclipse.jdt.doc.user"
-          download-size="0"
-          install-size="0"
-diff -uNr plugins/org.eclipse.jdt.doc.isv/buildDoc.xml plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
---- plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-07-04 13:40:47.000000000 -0400
-+++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-07-04 13:30:48.000000000 -0400
-@@ -75,7 +75,7 @@
- 		<exec dir="." executable="${javadoc}" output="doc.bin.log">
- 			<arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
- 		</exec>
--		<antcall target="generateJdtAptJavadoc" />
-+	        <!-- <antcall target="generateJdtAptJavadoc" /> -->
- 	</target>
- 	
- 	<target name="generateJdtAptJavadoc">
-diff -uNr plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
---- plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-07-04 13:40:47.000000000 -0400
-+++ plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-07-04 13:42:37.000000000 -0400
-@@ -22,12 +22,10 @@
- ;../org.eclipse.jdt.ui/ui refactoring
- ;../org.eclipse.jdt.ui/core extension
- ;../org.eclipse.jdt.core.manipulation/refactoring
--;../org.eclipse.jdt.core.manipulation/common
--;../org.eclipse.jdt.apt.core/src"
-+;../org.eclipse.jdt.core.manipulation/common"
- -d reference/api
- -classpath @rt@
- ;../../baseLocation/plugins/com.ibm.icu_3.4.4.1.jar
--;../org.eclipse.jdt.apt.core/mirrorapi.jar
- ;../org.apache.ant/lib/ant.jar
- ;../org.eclipse.compare/@dot
- ;../org.eclipse.core.commands/@dot
diff --git a/eclipse-jikesbuild.patch b/eclipse-jikesbuild.patch
new file mode 100644
index 0000000..2c20014
--- /dev/null
+++ b/eclipse-jikesbuild.patch
@@ -0,0 +1,121 @@
+--- eclipse-3.1/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/registry/ExtensionRegistry.java.orig	2005-04-09 10:45:14.000000000 +0000
++++ eclipse-3.1/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/registry/ExtensionRegistry.java	2005-04-09 10:45:50.000000000 +0000
+@@ -57,7 +57,7 @@
+ 		public IStatus run(IProgressMonitor monitor) {
+ 			MultiStatus result = new MultiStatus(Platform.PI_RUNTIME, IStatus.OK, Policy.bind("plugin.eventListenerError"), null); //$NON-NLS-1$			
+ 			for (int i = 0; i < listenerInfos.length; i++) {
+-				ListenerInfo listenerInfo = (ListenerInfo) listenerInfos[i];
++				ExtensionRegistry.ListenerInfo listenerInfo = (ExtensionRegistry.ListenerInfo) listenerInfos[i];
+ 				if (listenerInfo.filter != null && !deltas.containsKey(listenerInfo.filter))
+ 					continue;
+ 				try {
+--- eclipse-3.1/plugins/org.eclipse.help.webapp/build.xml.orig	2005-04-09 10:59:29.000000000 +0000
++++ eclipse-3.1/plugins/org.eclipse.help.webapp/build.xml	2005-04-09 10:59:35.000000000 +0000
+@@ -206,9 +206,6 @@
+ 				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ 			</classpath>
+ 			<src path="${temp.folder}/jsp.jar.src/"			/>
+-<!-- custom begin -->
+-			<compilerarg value="-warn:-serial" />
+-<!-- custom end -->	
+ 			</javac>
+ 		<!-- Copy necessary resources -->
+ 		<copy todir="${temp.folder}/WEB-INF/lib/jsp.jar.bin" failonerror="true">
+--- eclipse-3.1/plugins/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java.orig	2005-04-09 13:21:52.000000000 +0000
++++ eclipse-3.1/plugins/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java	2005-04-09 13:22:21.000000000 +0000
+@@ -230,7 +230,7 @@
+ 	}
+ 	
+ 	public interface IFlushOperation {
+-		public void flush(ThreadInfo info, IProgressMonitor monitor) throws TeamException;
++		public void flush(BatchingLock.ThreadInfo info, IProgressMonitor monitor) throws TeamException;
+ 	}
+ 	
+ 	private Map infos = new HashMap();
+--- eclipse-3.1/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/AnnotationExpansionControl.java.orig	2005-04-09 13:33:28.000000000 +0000
++++ eclipse-3.1/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/AnnotationExpansionControl.java	2005-04-09 13:33:50.000000000 +0000
+@@ -170,7 +170,7 @@
+ 		 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
+ 		 */
+ 		public void widgetDisposed(DisposeEvent e) {
+-			Item item= (Item) ((Widget) e.getSource()).getData();
++			AnnotationExpansionControl.Item item= (AnnotationExpansionControl.Item) ((Widget) e.getSource()).getData();
+ 			item.deselect();
+ 			item.canvas= null;
+ 			item.fAnnotation= null;
+--- eclipse-3.1/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperTypeNamesCollector.java.orig	2005-04-09 13:53:03.000000000 +0000
++++ eclipse-3.1/plugins/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperTypeNamesCollector.java	2005-04-09 13:53:05.000000000 +0000
+@@ -63,7 +63,7 @@
+ 		public boolean visit(FieldDeclaration fieldDeclaration, MethodScope scope) {
+ 			return false; // don't visit field declarations
+ 		}
+-		public boolean visit(Initializer initializer, MethodScope scope) {
++		public boolean visit(org.eclipse.jdt.internal.compiler.ast.Initializer initializer, MethodScope scope) {
+ 			return false; // don't visit initializers
+ 		}
+ 		public boolean visit(ConstructorDeclaration constructorDeclaration, ClassScope scope) {
+--- eclipse-3.1/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java.orig	2005-04-09 13:57:05.000000000 +0000
++++ eclipse-3.1/plugins/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java	2005-04-09 13:57:49.000000000 +0000
+@@ -166,10 +166,10 @@
+ 	/*
+ 	 * Convert an initializerinfo into a parsed initializer declaration
+ 	 */
+-	private Initializer convert(InitializerElementInfo initializerInfo, CompilationResult compilationResult) throws JavaModelException {
++	private org.eclipse.jdt.internal.compiler.ast.Initializer convert(InitializerElementInfo initializerInfo, CompilationResult compilationResult) throws JavaModelException {
+ 
+ 		Block block = new Block(0);
+-		Initializer initializer = new Initializer(block, IConstants.AccDefault);
++		org.eclipse.jdt.internal.compiler.ast.Initializer initializer = new org.eclipse.jdt.internal.compiler.ast.Initializer(block, IConstants.AccDefault);
+ 
+ 		int start = initializerInfo.getDeclarationSourceStart();
+ 		int end = initializerInfo.getDeclarationSourceEnd();
+--- eclipse-3.1/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java.orig	2005-04-09 14:03:07.000000000 +0000
++++ eclipse-3.1/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java	2005-04-09 14:03:27.000000000 +0000
+@@ -460,7 +460,7 @@
+ 			fItemMap.put(control, new Integer(fIndex++));
+ 		}
+ 		
+-		public void add(Preference preference) {
++		public void add(ModifyDialogTabPage.Preference preference) {
+ 			final Control control= preference.getControl();
+ 			if (control != null) 
+ 				add(control);
+--- eclipse-3.1/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java.orig	2005-04-09 14:03:58.000000000 +0000
++++ eclipse-3.1/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/CommentsTabPage.java	2005-04-09 14:05:50.000000000 +0000
+@@ -39,7 +39,7 @@
+ 			fMasters= masters;
+ 			fSlaves= slaves;
+ 			for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
+-			    ((CheckboxPreference)iter.next()).addObserver(this);
++			    ((ModifyDialogTabPage.CheckboxPreference)iter.next()).addObserver(this);
+ 			}
+ 			update(null, null);
+ 		}
+@@ -48,13 +48,13 @@
+ 		    boolean enabled= true; 
+ 
+ 		    for (final Iterator iter= fMasters.iterator(); iter.hasNext();) {
+-		        enabled &= ((CheckboxPreference)iter.next()).getChecked();
++		        enabled &= ((ModifyDialogTabPage.CheckboxPreference)iter.next()).getChecked();
+ 		    }
+ 
+ 			for (final Iterator iter = fSlaves.iterator(); iter.hasNext();) {
+ 			    final Object obj= iter.next();
+-			    if (obj instanceof Preference) {
+-			        ((Preference)obj).setEnabled(enabled);
++			    if (obj instanceof ModifyDialogTabPage.Preference) {
++			        ((ModifyDialogTabPage.Preference)obj).setEnabled(enabled);
+ 			    } else if (obj instanceof Control) {
+ 			        ((Group)obj).setEnabled(enabled);
+ 			    }
+--- eclipse-3.1/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java.orig	2005-06-27 20:54:39.000000000 +0200
++++ eclipse-3.1/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java	2005-06-30 18:06:27.000000000 +0200
+@@ -164,7 +164,7 @@
+ 		Shell fShell;
+ 
+ 		/** The registered listener, or <code>null</code>. */
+-		KeyListener fKeyListener;
++		LinkedModeUI.KeyListener fKeyListener;
+ 
+ 		/** The cached custom annotation model. */
+ 		LinkedPositionAnnotations fAnnotationModel;