diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2012-04-22 02:26:58 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2012-04-22 02:26:58 +0000 |
| commit | bb3662de19316f48a32517a4a6a95fcbd1d60250 (patch) | |
| tree | eb32f3e787ce7da7be278dae1818ec2daf0b037c /java/eclipse-devel/files | |
| parent | Sometimes the LSI-server redirects to a EULA acceptance page, which (diff) | |
. Update to 3.7.1.
Submitted by: tg@
Diffstat (limited to 'java/eclipse-devel/files')
| -rw-r--r-- | java/eclipse-devel/files/eclipse-build-upstream.patch | 43 | ||||
| -rw-r--r-- | java/eclipse-devel/files/freebsd-support.patch | 115 | ||||
| -rw-r--r-- | java/eclipse-devel/files/patch-dependencyManifests | 88 | ||||
| -rw-r--r-- | java/eclipse-devel/files/patch-eclipse-build | 124 | ||||
| -rw-r--r-- | java/eclipse-devel/files/patch-generatedScripts | 980 |
5 files changed, 371 insertions, 979 deletions
diff --git a/java/eclipse-devel/files/eclipse-build-upstream.patch b/java/eclipse-devel/files/eclipse-build-upstream.patch index 69bee7f18dea..d4c5991762b7 100644 --- a/java/eclipse-devel/files/eclipse-build-upstream.patch +++ b/java/eclipse-devel/files/eclipse-build-upstream.patch @@ -17,11 +17,13 @@ Index: build.xml =================================================================== --- build.xml (revision 23733) +++ build.xml (working copy) -@@ -130,6 +130,7 @@ +@@ -131,7 +131,8 @@ <ant inheritall="false" antfile="pdebuild.xml"> <property name="buildId" value="${buildId}" /> <property name="buildArch" value="${buildArch}" /> +- <property name="buildDirectory" value="../../" /> + <property name="buildOs" value="${buildOs}" /> ++ <property name="buildDirectory" value="../../" /> </ant> </target> @@ -148,7 +150,7 @@ Index: build.xml <property name="swtjarpath" refid="swtjar" /> <symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" /> <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" /> -@@ -1023,7 +1027,7 @@ +@@ -1061,7 +1074,7 @@ <param name="p2.director.profile" value="PlatformProfile" /> <param name="p2.director.install.path" value="${installationDir}" /> <param name="p2.director.extraArgs" value="-purgeHistory" /> @@ -161,16 +163,16 @@ Index: pdebuild.xml =================================================================== --- pdebuild.xml (revision 23733) +++ pdebuild.xml (working copy) -@@ -78,7 +78,7 @@ - <file name="org.eclipse.help.base" /> - </filelist> - <filelist id="depsDirs2" dir="${sdkSource}/plugins"> -- <file name="org.eclipse.swt.gtk.linux.${buildArch}" /> -+ <file name="org.eclipse.swt.gtk.${buildOs}.${buildArch}" /> - <file name="org.eclipse.core.filesystem" /> - <file name="org.eclipse.core.resources" /> - <file name="org.eclipse.core.commands" /> -@@ -164,12 +164,14 @@ +@@ -88,7 +88,7 @@ + <filelist id="helpDirs" dir="${sdkSource}/plugins" files="${helpDirsProperty}"/> + + <property name="depsDirs2Property" +- value="org.eclipse.swt.gtk.linux.${buildArch} ++ value="org.eclipse.swt.gtk.${buildOs}.${buildArch} + org.eclipse.core.filesystem + org.eclipse.core.resources + org.eclipse.core.commands +@@ -214,12 +214,14 @@ <subant> <property name="buildId" value="${buildId}" /> <property name="buildArch" value="${buildArch}" /> @@ -185,14 +187,27 @@ Index: pdebuild.xml <property file="pdebuild.properties" /> <filelist refid="helpDirs" /> </subant> -@@ -195,6 +197,7 @@ +@@ -245,6 +247,7 @@ <arg line="-application org.eclipse.ant.core.antRunner " /> <arg line="-buildfile ../pdebuild.xml generateScripts2" /> <arg line="-DbuildArch=${buildArch} " /> + <arg line="-DbuildOs=${buildOs} " /> <arg line="-DbuildId=${buildId} " /> - <arg line="-debug -consolelog " /> + <arg line="-debug -consolelog" /> </java> +@@ -287,10 +288,10 @@ + <target name="removeGeneratedBuildXMLs" depends="zipPlugins2"> + <fileset id="buildXMLsToKeep" dir="${sdkSource}/plugins" + excludes="**/org.eclipse.swt.gtk.*/*, +- **/org.eclipse.update.core.linux/**/*, ++ **/org.eclipse.update.core.${buildOs}/**/*, + **/org.eclipse.pde.build/scripts/*, + **/org.eclipse.jdt.core/scripts/*, +- **/org.eclipse.update.core.linux/src/*, ++ **/org.eclipse.update.core.${buildOs}/src/*, + **/org.eclipse.jdt.doc.isv/*, + **/org.eclipse.swt/*, + **/org.eclipse.jdt.doc.user/*" Index: publishProduct.xml =================================================================== --- publishProduct.xml (revision 23733) diff --git a/java/eclipse-devel/files/freebsd-support.patch b/java/eclipse-devel/files/freebsd-support.patch index e3c4ea0e6147..90d530fd4805 100644 --- a/java/eclipse-devel/files/freebsd-support.patch +++ b/java/eclipse-devel/files/freebsd-support.patch @@ -3061,7 +3061,7 @@ $FreeBSD$ +Bundle-Name: %fragmentName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true -+Bundle-Version: 3.7.0.qualifier ++Bundle-Version: 3.7.1.qualifier +Bundle-ManifestVersion: 2 +Bundle-Localization: fragment +Export-Package: @@ -4875,18 +4875,23 @@ $FreeBSD$ +custom = true --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 2009-12-23 15:14:12.583575548 -0500 -@@ -0,0 +1,12 @@ +@@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="org.eclipse.swt.gtk.freebsd.x86" default="build.jars" basedir="."> + + <property name="swt.ws" value="gtk" /> + <property name="swt.os" value="freebsd" /> + <property name="swt.arch" value="x86" /> ++ <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/> + + <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> -+ <property name="version.suffix" value="3.7.0" /> ++ <property name="version.suffix" value="3.7.1" /> + -+ <import file="../org.eclipse.swt/buildFragment.xml"/> ++ <condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="${buildDirectory}/plugins/org.eclipse.swt"> ++ <available file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/> ++ </condition> ++ <import file="${plugindir}/buildFragment.xml"/> ++ <import file="${plugindir}/buildSWT.xml"/> +</project> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/fragment.properties 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/fragment.properties 2009-12-23 15:14:12.583575548 -0500 @@ -4942,7 +4947,7 @@ $FreeBSD$ +Bundle-Name: %fragmentName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true -+Bundle-Version: 3.7.0.qualifier ++Bundle-Version: 3.7.1.qualifier +Bundle-ManifestVersion: 2 +Bundle-Localization: fragment +Export-Package: @@ -6756,18 +6761,23 @@ $FreeBSD$ +custom = true --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2009-12-23 15:14:12.588595660 -0500 -@@ -0,0 +1,12 @@ +@@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="org.eclipse.swt.gtk.freebsd.x86_64" default="build.jars" basedir="."> + + <property name="swt.ws" value="gtk" /> + <property name="swt.os" value="freebsd" /> + <property name="swt.arch" value="x86_64" /> ++ <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/> + + <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> -+ <property name="version.suffix" value="3.7.0" /> ++ <property name="version.suffix" value="3.7.1" /> + -+ <import file="../org.eclipse.swt/buildFragment.xml"/> ++ <condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="${buildDirectory}/plugins/org.eclipse.swt"> ++ <available file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/> ++ </condition> ++ <import file="${plugindir}/buildFragment.xml"/> ++ <import file="${plugindir}/buildSWT.xml"/> +</project> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/fragment.properties 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/fragment.properties 2009-12-23 15:14:12.588595660 -0500 @@ -7336,19 +7346,96 @@ $FreeBSD$ @@ -34,6 +34,7 @@ org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=v20110502 org.eclipse.equinox.http,0.0.0=v20110413 - org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3735b -+org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3735b + org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3738a ++org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3738a org.eclipse.equinox.p2.ui.admin,0.0.0=v20110502-1955 org.eclipse.equinox.p2.publisher.eclipse,0.0.0=v20110511 org.eclipse.equinox.weaving.caching.j9,0.0.0=v20110502 -@@ -245,6 +246,7 @@ - org.eclipse.swt.examples,0.0.0=v3735b +@@ -52,6 +52,7 @@ + org.eclipse.ui.workbench.texteditor,0.0.0=v20110505-0800 + org.eclipse.ui.examples.multipageeditor,0.0.0=I20110413-1600 + org.eclipse.core.filesystem.linux.x86,0.0.0=v20110423-0524 ++org.eclipse.core.filesystem.freebsd.x86,0.0.0=v20110423-0524 + org.eclipse.equinox.p2.ui.discovery,0.0.0=v20110502-1955 + org.eclipse.ui.examples.javaeditor,0.0.0=v20110524-0800 + org.eclipse.ant.core,0.0.0=v20110511 +@@ -93,6 +94,7 @@ + org.eclipse.core.runtime,0.0.0=v20110110 + org.eclipse.core.resources.win32.x86,0.0.0=v20110423-0524 + org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=v20110505 ++org.eclipse.equinox.launcher.gtk.freebsd.x86_64,0.0.0=v20110505 + org.eclipse.help,0.0.0=v20110426 + org.eclipse.pde.api.tools.ee.j2se15,0.0.0=v20110401-1030 + org.junit4,0.0.0=v20100525 +@@ -135,6 +137,7 @@ + org.eclipse.equinox.p2.ui.importexport,0.0.0=v20110511 + org.eclipse.pde.api.tools.ee.jre11,0.0.0=v20110401-1030 + org.eclipse.core.net.linux.x86_64,0.0.0=I20110331-0827 ++org.eclipse.core.net.freebsd.x86_64,0.0.0=I20110331-0827 + org.eclipse.equinox.jsp.jasper,0.0.0=v20110502 + org.eclipse.pde.api.tools.ee.j2se14,0.0.0=v20110401-1030 + org.eclipse.equinox.p2.ui,0.0.0=v20110601 +@@ -158,6 +161,7 @@ + org.eclipse.swt.gtk.solaris.x86,0.0.0=v3738a + org.eclipse.pde.ds.ui,0.0.0=v20110516 + org.eclipse.core.net.linux.x86,0.0.0=I20110419-0800 ++org.eclipse.core.net.freebsd.x86,0.0.0=I20110419-0800 + org.eclipse.equinox.p2.console,0.0.0=v20110502-1955 + org.eclipse.equinox.http.jetty,0.0.0=v20110502 + org.eclipse.swt.examples.browser.demos,0.0.0=v3738a +@@ -175,6 +179,7 @@ + org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=v20110502 + org.eclipse.swt.examples.browser,0.0.0=v3738a + org.eclipse.core.filesystem.linux.x86_64,0.0.0=v20110423-0524 ++org.eclipse.core.filesystem.freebsd.x86_64,0.0.0=v20110423-0524 + org.eclipse.equinox.event,0.0.0=v20110502 + org.eclipse.ui.ide,0.0.0=v20110809-1737 + org.eclipse.ui.views.log,0.0.0=v20110404 +@@ -185,6 +190,7 @@ + org.eclipse.equinox.ds,0.0.0=R37x_v20110701 + org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=v20110502 + org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=v20110505 ++org.eclipse.equinox.launcher.gtk.freebsd.x86,0.0.0=v20110505 + org.eclipse.update.core.linux,0.0.0=v20100512 + org.eclipse.core.databinding.property,0.0.0=I20110222-0800 + org.eclipse.ui.examples.propertysheet,0.0.0=I20110413-1600 +@@ -246,6 +247,7 @@ + org.eclipse.swt.examples,0.0.0=v3738a org.eclipse.cvs,0.0.0=v20110505-0800 - org.eclipse.swt.gtk.linux.x86,0.0.0=v3735b -+org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3735b + org.eclipse.swt.gtk.linux.x86,0.0.0=v3738a ++org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3738a org.eclipse.equinox.log,0.0.0=v20110502 org.eclipse.equinox.jmx.client,0.0.0=v20100503 org.eclipse.ui.win32,0.0.0=I20100509-0800 +--- build/eclipse-3.7.0-src/features/org.eclipse.equinox.executable/feature.xml~ Fri Feb 18 17:56:16 2011 ++++ build/eclipse-3.7.0-src/features/org.eclipse.equinox.executable/feature.xml Thu Sep 15 11:03:18 2011 +@@ -131,6 +131,26 @@ + fragment="true"/> + + <plugin ++ id="org.eclipse.equinox.launcher.gtk.freebsd.x86" ++ os="freebsd" ++ ws="gtk" ++ arch="x86" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true"/> ++ ++ <plugin ++ id="org.eclipse.equinox.launcher.gtk.freebsd.x86_64" ++ os="freebsd" ++ ws="gtk" ++ arch="x86_64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true"/> ++ ++ <plugin + id="org.eclipse.equinox.launcher.motif.aix.ppc" + os="aix" + ws="motif" --- build/eclipse-3.7.0-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2011-05-27 13:45:22.000000000 -0500 +++ build/eclipse-3.7.0-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2012-01-23 11:51:27.000000000 -0600 @@ -25,7 +25,7 @@ diff --git a/java/eclipse-devel/files/patch-dependencyManifests b/java/eclipse-devel/files/patch-dependencyManifests new file mode 100644 index 000000000000..ae57d2b77415 --- /dev/null +++ b/java/eclipse-devel/files/patch-dependencyManifests @@ -0,0 +1,88 @@ +--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF~ 2012-01-26 18:03:49.377369870 +0100 ++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF 2012-01-26 18:18:27.055000978 +0100 +@@ -6,6 +6,6 @@ + Bundle-Localization: plugin
+-Bundle-Version: 2.5.0.v200806031605
++Bundle-Version: 3.0.0.v201103241727
+ Bundle-Vendor: %bundleProvider
+-Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
+- ="2.5",javax.servlet.resources;version="2.5"
++Export-Package: javax.servlet;version="3.0",javax.servlet.http;version
++ ="3.0",javax.servlet.resources;version="3.0"
+
+--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF~ 2011-12-19 16:40:57.000000000 +0100 ++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF 2012-01-26 18:43:30.749772042 +0100 +@@ -4,10 +4,10 @@ + Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+ Bundle-Name: %bundleName
+ Bundle-SymbolicName: javax.servlet.jsp
+-Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
+- ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
+- .tagext; version=2.0
+-Bundle-Version: 2.0.0.v200806031607
++Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v
++ ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp
++ .tagext; version=2.2
++Bundle-Version: 2.2.0.v200806031607
+ Bundle-ManifestVersion: 2
+-Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
+- =2.4,javax.servlet.resources; version=2.4
++Import-Package: javax.servlet; version=3.0,javax.servlet.http; version
++ =3.0,javax.servlet.resources; version=3.0
+--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF~ 2011-12-19 16:40:57.000000000 +0100 ++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF 2012-01-26 18:36:42.891544584 +0100 +@@ -6,21 +6,21 @@ + 2SE-1.3
+ Bundle-Name: %bundleName
+ Bundle-SymbolicName: org.apache.jasper
+-Export-Package: org.apache.jasper;version="5.5.17",org.apache.jasper.c
+- ompiler;version="5.5.17",org.apache.jasper.compiler.tagplugin;version
+- ="5.5.17",org.apache.jasper.resources;version="5.5.17",org.apache.jas
+- per.runtime;version="5.5.17",org.apache.jasper.security;version="5.5.
+- 17",org.apache.jasper.servlet;version="5.5.17",org.apache.jasper.tagp
+- lugins.jstl;version="5.5.17",org.apache.jasper.tagplugins.jstl.core;v
+- ersion="5.5.17",org.apache.jasper.util;version="5.5.17",org.apache.ja
+- sper.xmlparser;version="5.5.17"
+-Bundle-Version: 5.5.17.v201004212143
++Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c
++ ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version
++ ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas
++ per.runtime;version="7.0.21",org.apache.jasper.security;version="5.5.
++ 17",org.apache.jasper.servlet;version="7.0.21",org.apache.jasper.tagp
++ lugins.jstl;version="7.0.21",org.apache.jasper.tagplugins.jstl.core;v
++ ersion="7.0.21",org.apache.jasper.util;version="7.0.21",org.apache.ja
++ sper.xmlparser;version="7.0.21"
++Bundle-Version: 7.0.21.v201004212143
+ Bundle-ManifestVersion: 2
+-Import-Package: javax.servlet;version="[2.4, 3.0)",javax.servlet.http;
+- version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
+- vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
+- "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
+- let.resources;version="[2.4, 3.0)",javax.xml.parsers,org.apache.commo
++Import-Package: javax.servlet;version="3.0",javax.servlet.http;
++ version="3.0",javax.servlet.jsp;version="2.2",javax.ser
++ vlet.jsp.el;version="2.2",javax.servlet.jsp.resources;version=
++ "2.2",javax.servlet.jsp.tagext;version="2.2",javax.serv
++ let.resources;version="3.0",javax.xml.parsers,org.apache.commo
+ ns.el;version="[1.0.0,2.0.0)",org.apache.commons.logging;version="[1.
+ 0.0,2.0.0)",org.apache.tools.ant;resolution:=optional,org.apache.tool
+ s.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolu
+--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF~ Mon Dec 19 16:40:57 2011 ++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF Wed Feb 29 16:33:20 2012 +@@ -8,11 +8,11 @@ + ns.el.parser;version="1.0.0"
+ Bundle-Version: 1.0.0.v201004212143
+ Bundle-ManifestVersion: 2
+-Import-Package: javax.servlet;version="[2.4, 3.0)",javax.servlet.http;
+- version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
+- vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
+- "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
+- let.resources;version="[2.4, 3.0)"
++Import-Package: javax.servlet;version="[2.5, 3.0]",javax.servlet.http;
++ version="[2.5, 3.0]",javax.servlet.jsp;version="2.2",javax.ser
++ vlet.jsp.el;version="2.2",javax.servlet.jsp.resources;version=
++ "2.2",javax.servlet.jsp.tagext;version="2.2",javax.serv
++ let.resources;version="[2.5, 3.0]"
+
+ Name: org/apache/commons/el/ImplicitObjects$6.class
+ SHA1-Digest: yk3eN531Co8H5mcmuI/jBgzMK7M=
diff --git a/java/eclipse-devel/files/patch-eclipse-build b/java/eclipse-devel/files/patch-eclipse-build index 554cc2382e95..fd225a9ce180 100644 --- a/java/eclipse-devel/files/patch-eclipse-build +++ b/java/eclipse-devel/files/patch-eclipse-build @@ -53,7 +53,7 @@ $FreeBSD$ +CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%% --- eclipse-build-0.5.0.orig/build.xml 2009-12-23 16:22:44.090824173 -0500 +++ eclipse-build-0.5.0/build.xml 2009-12-23 16:23:06.357147407 -0500 -@@ -117,11 +117,11 @@ +@@ -118,11 +118,11 @@ <target name="setLibDir" depends="setLib64Dir"> <property name="libDir" value="lib" /> @@ -67,7 +67,7 @@ $FreeBSD$ </target> <property name="doTests" value="true" /> -@@ -166,8 +166,7 @@ +@@ -167,8 +167,7 @@ <target name="copySource" unless="sdkSourcePresent"> <echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" /> <exec executable="cp" failonerror="true"> @@ -77,18 +77,61 @@ $FreeBSD$ <arg value="eclipse" /> <arg value="${buildDirectory}" /> </exec> -@@ -319,6 +318,10 @@ +@@ -309,12 +308,18 @@ + <!-- + <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" /> + --> +- <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p1" /> ++ <arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" /> +- <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p1" /> ++ <arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" /> +@@ -337,20 +342,30 @@ </replace> <patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" /> <patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> -+ <arg value="-p2" /> -+ <arg value="-i${basedir}/patches/freebsd-support.patch" /> -+ </exec> +- <patch patchfile="${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" dir="${buildDirectory}/plugins" strip="2" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins"> ++ <arg value="-p2" /> ++ <arg value="-i${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/remove-lucene-dependency.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-equinox-jsp-jasper.patch" dir="${buildDirectory}" strip="0" /> + <patch patchfile="${basedir}/patches/eclipse-equinox-http-jetty.patch" dir="${buildDirectory}" strip="0" /> + <patch patchfile="${basedir}/patches/eclipse-equinox-http-servlet.patch" dir="${buildDirectory}" strip="0" /> + <patch patchfile="${basedir}/patches/eclipse-help-feature.patch" dir="${buildDirectory}" strip="0" /> + <patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p2" /> ++ <arg value="-i${basedir}/patches/freebsd-support.patch" /> ++ </exec> <echo file="patch-stamp" /> </target> -@@ -704,7 +707,7 @@ + <target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete"> + <patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" /> + <patch patchfile="${basedir}/patches/tests-noequinoxregiontests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" /> +- <patch patchfile="${basedir}/patches/tests-BZ295666.patch" dir="${testsBuildDirectory}" strip="0" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${testsBuildDirectory}"> ++ <arg value="-p0" /> ++ <arg value="-i${basedir}/patches/tests-BZ295666.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.pde.ui.tests" strip="0" /> + <patch patchfile="${basedir}/patches/tests-nop2discoverytests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" /> + <patch patchfile="${basedir}/patches/tests-org.eclipse.ant.tests.core.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.ant.tests.core" strip="0" /> +@@ -725,7 +729,7 @@ <target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete"> <echo message="Installing into: ${provisionDir}" /> <antcall target="provision"> @@ -97,7 +140,7 @@ $FreeBSD$ <param name="profileName" value="SDKProfile" /> </antcall> -@@ -829,7 +833,8 @@ +@@ -850,7 +854,8 @@ <!-- <echo message="Calling runtests with (debug, verbose) = (${testSwitches})" /> --> @@ -107,7 +150,7 @@ $FreeBSD$ <arg value="-t${timestamp}" /> <arg value="-a${buildArch}" /> <arg value="-o${buildOs}" /> -@@ -958,33 +963,29 @@ +@@ -1014,33 +1030,29 @@ <target name="installIntoDestDir"> <mkdir dir="${installationDir}" /> <exec executable="rsync" failonerror="true"> @@ -122,13 +165,13 @@ $FreeBSD$ - <copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" /> - <!-- install Eclipse Java code formatter launcher --> - <property name="efj" value="${destDir}${prefix}/bin/efj"/> -- <copy file="efj.sh" todir="${efj}" /> -+ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" /> +- <copy file="efj.sh" tofile="${efj}" /> ++ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" /> <fileset id="equinoxLauncher" dir="${installationDir}/plugins"> <include name="org.eclipse.equinox.launcher_*.jar" /> </fileset> <property name="launcherJar" refid="equinoxLauncher"/> -- <replace file="${efj}/efj.sh" token="@LAUNCHER@" value="${launcherJar}"/> +- <replace file="${efj}" token="@LAUNCHER@" value="${prefix}/${libDir}/eclipse/plugins/${launcherJar}"/> <!-- install icons --> - <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" /> - <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" /> @@ -149,7 +192,7 @@ $FreeBSD$ <!-- Create the "swt.jar" and friends symlinks --> <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" /> <property name="swtjarpath" refid="swtjar" /> -@@ -992,7 +993,7 @@ +@@ -1013,7 +1015,7 @@ <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/> <symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/> @@ -158,16 +201,16 @@ $FreeBSD$ <!-- Extract SWT JNI .so files --> <java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}"> -@@ -1031,7 +1032,7 @@ +@@ -1039,7 +1041,7 @@ - <!-- copy PDE and JDT to dropins --> + <!-- copy PDE and JDT to dropins --> <exec executable="rsync" failonerror="true"> - <arg value="-vrpl" /> + <arg value="-vrpL" /> <arg value="${provisionDir}/dropins/" /> <arg value="${installationDir}/dropins/" /> </exec> -@@ -1064,8 +1065,8 @@ +@@ -1072,8 +1074,8 @@ <arg value="s@/@_@g" /> </exec> <apply executable="sed" failonerror="true" verbose="true"> @@ -178,7 +221,7 @@ $FreeBSD$ <srcfile /> <fileset dir="${installationDir}"> <include name="metadata/content.xml" /> -@@ -1086,7 +1087,7 @@ +@@ -1094,7 +1096,7 @@ </fileset> </apply> <apply executable="sed" failonerror="true" verbose="true"> @@ -187,7 +230,7 @@ $FreeBSD$ <arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" /> <srcfile /> <fileset dir="${installationDir}/${profileDir}"> -@@ -1101,9 +1105,11 @@ +@@ -1109,9 +1111,11 @@ </apply> <!-- Move config file to /etc --> @@ -199,7 +242,7 @@ $FreeBSD$ </target> -@@ -1126,8 +1129,7 @@ +@@ -1156,8 +1164,7 @@ <!-- make a copy of the clean platform+CVS installation --> <exec executable="cp" failonerror="true"> @@ -209,7 +252,7 @@ $FreeBSD$ <arg value="${provisionDir}" /> <arg value="${platformAndCVSInstallation}" /> </exec> -@@ -1143,16 +1145,14 @@ +@@ -1173,16 +1180,14 @@ tofile="${jdtInstallation}"/> <!-- make a second copy of the clean JDT installation --> <exec executable="cp" failonerror="true"> @@ -228,7 +271,7 @@ $FreeBSD$ <arg value="${platformAndCVSInstallation}" /> <arg value="${provisionDir}" /> </exec> -@@ -1169,8 +1169,7 @@ +@@ -1199,8 +1204,7 @@ <!-- restore clean platform+CVS installation --> <exec executable="cp" failonerror="true"> @@ -257,11 +300,10 @@ $FreeBSD$ -os=linux +os=freebsd - buildId=3.7.0-I20110613-1736 - buildTag=3.7.0-I20110613-1736 --label=3.7.0-I20110613-1736 + buildId=R3_7_1 + buildTag=R3_7_1 + label=3.7.1 -bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar -+label=3.7.0 +bootclasspath=%%BOOTCLASSPATH%% #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter @@ -330,20 +372,23 @@ $FreeBSD$ Categories=Development;IDE;Java; --- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties.orig Thu Jun 30 16:45:54 2011 +++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties Thu Jun 30 16:46:18 2011 -@@ -1,15 +1,15 @@ - com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar +@@ -1,5 +1,5 @@ + com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar:/usr/share/java/icu4j.jar -com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar +com.jcraft.jsch_0.1.41.v201101211617.jar=/usr/share/java/jsch.jar - javax.servlet_2.5.0.v201103041518.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar - javax.servlet.jsp_2.0.0.v201101211617.jar=/usr/share/java/tomcat6-jsp-2.1-api.jar:/usr/share/java/jsp-api-2.0.jar + javax.servlet_3.0.0.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar + javax.servlet.jsp_2.2.0.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar + javax.el_2.2.0.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar +@@ -7,13 +7,13 @@ + org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar + org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar -org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar -org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar +org.apache.commons.el_1.0.0.v201101211617.jar=/usr/share/java/commons-el.jar +org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar org.apache.commons.logging_1.0.4.v201101211617.jar=/usr/share/java/commons-logging.jar --org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar -+org.apache.jasper_5.5.17.v201101211617.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar + org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat/jasper.jar org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar -org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar @@ -357,3 +402,18 @@ $FreeBSD$ @@ -1,1 +1,1 @@ -org.objectweb.asm_3.3.1.v201101071600.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar +org.objectweb.asm_3.3.1.v201105211655.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar +--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh~ Mon Dec 19 16:40:57 2011 ++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh Wed Feb 29 14:54:42 2012 +@@ -1,8 +1,8 @@ +-#! /bin/bash ++#! /bin/sh + label=$1 + + for f in `find ./build/eclipse-${label}-src/plugins -name build.xml`; do +- sed -i 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f} +- sed -i 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f} +- sed -i 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f} ++ sed -i .orig 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f} ++ sed -i .orig 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f} ++ sed -i .orig 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f} + done diff --git a/java/eclipse-devel/files/patch-generatedScripts b/java/eclipse-devel/files/patch-generatedScripts index 11827c20536a..02d05aae06d7 100644 --- a/java/eclipse-devel/files/patch-generatedScripts +++ b/java/eclipse-devel/files/patch-generatedScripts @@ -1,938 +1,80 @@ $FreeBSD$ -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ant.core/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ant.core/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ant.core/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ant.core/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -116,7 +114,7 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/> - </path> -@@ -192,9 +188,9 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="${build.result.folder}/@dot"/> -- <pathelement path="${build.result.folder}/../org.eclipse.ant.core_3.2.300.v20110510/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.ant.core_3.2.300.v20110511/@dot"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/> - </path> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.expressions/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.expressions/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.expressions/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.expressions/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -142,7 +140,7 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - </path> - <!-- compile the source code --> - <javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured" > -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -123,7 +121,7 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - </path> - <!-- compile the source code --> - <javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured" > -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime.compatibility/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime.compatibility/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.runtime.compatibility/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.runtime.compatibility/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -142,7 +140,7 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.update.configurator/@dot"/> - </path> - <!-- compile the source code --> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.variables/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.variables/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.core.variables/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.core.variables/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -115,7 +113,7 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - </path> - <!-- compile the source code --> - <javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured" > -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -95,28 +95,26 @@ - <antcall target="gather.bin.parts"> - <param name="destination.temp.folder" value="${temp.folder}/"/> - </antcall> -- <jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101" filesetmanifest="merge"/> -+ <jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201107041518.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201107041518" filesetmanifest="merge"/> - <delete dir="${temp.folder}"/> - </target> - -- <target name="@dot.nestedJars"> -- </target> -- <target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient @dot."> -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient @dot."> +diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml +--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2011-09-09 09:31:10.000000000 +0200 ++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2012-01-19 16:07:46.000000000 +0100 +@@ -105,7 +105,7 @@ <delete dir="${build.result.folder}/@dot"/> <mkdir dir="${build.result.folder}/@dot"/> <path id="@dot.classpath"> -- <pathelement path="../../../../../../../../../usr/share/java/jakarta-commons-httpclient-3.1.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/commons-codec.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.httpclient_3.1.0.v201012070820.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.codec_1.3.0.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.logging_1.0.4.v201101211617.jar"/> +- <pathelement path="../org.apache.commons.httpclient_3.1.0.v201005080502.jar"/> ++ <pathelement path="../org.apache.commons.httpclient_3.1.0.v201012070820.jar"/> + <pathelement path="../org.apache.commons.codec_1.3.0.v201101211617.jar"/> + <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> <pathelement path="../org.eclipse.core.jobs/bin/"/> - <pathelement path="../org.eclipse.core.jobs/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.common/bin/"/> - <pathelement path="../org.eclipse.equinox.common/@dot"/> - <pathelement path="../org.eclipse.ecf.provider.filetransfer/bin/"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -95,30 +95,28 @@ - <antcall target="gather.bin.parts"> - <param name="destination.temp.folder" value="${temp.folder}/"/> - </antcall> -- <jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101" filesetmanifest="merge"/> -+ <jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201107041518.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201107041518" filesetmanifest="merge"/> - <delete dir="${temp.folder}"/> - </target> - -- <target name="@dot.nestedJars"> -- </target> -- <target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient.ssl @dot."> -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient.ssl @dot."> - <delete dir="${build.result.folder}/@dot"/> - <mkdir dir="${build.result.folder}/@dot"/> +diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml +--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2011-09-09 09:31:10.000000000 +0200 ++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2012-01-19 16:07:59.000000000 +0100 +@@ -107,7 +107,7 @@ <path id="@dot.classpath"> <pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/bin/"/> <pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/jakarta-commons-httpclient-3.1.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/commons-codec.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.httpclient_3.1.0.v201012070820.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.codec_1.3.0.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.logging_1.0.4.v201101211617.jar"/> +- <pathelement path="../org.apache.commons.httpclient_3.1.0.v201005080502.jar"/> ++ <pathelement path="../org.apache.commons.httpclient_3.1.0.v201012070820.jar"/> + <pathelement path="../org.apache.commons.codec_1.3.0.v201101211617.jar"/> + <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> <pathelement path="../org.eclipse.core.jobs/bin/"/> - <pathelement path="../org.eclipse.core.jobs/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.common/bin/"/> - <pathelement path="../org.eclipse.equinox.common/@dot"/> - <pathelement path="../org.eclipse.ecf.provider.filetransfer/bin/"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.app/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.app/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.app/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.app/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -99,22 +99,20 @@ - <delete dir="${temp.folder}"/> - </target> - -- <target name="@dot.nestedJars"> -- </target> -- <target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.app @dot."> -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.equinox.app @dot."> - <delete dir="${build.result.folder}/@dot"/> - <mkdir dir="${build.result.folder}/@dot"/> - <path id="@dot.classpath"> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -81,30 +81,28 @@ - <delete dir="${temp.folder}"/> - </target> - -- <target name="@dot.nestedJars"> -- </target> -- <target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.http.jetty @dot."> -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.equinox.http.jetty @dot."> - <delete dir="${build.result.folder}/@dot"/> - <mkdir dir="${build.result.folder}/@dot"/> - <path id="@dot.classpath"> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.equinox.http.servlet/bin/"/> - <pathelement path="../org.eclipse.equinox.http.servlet/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-util-6.1.26.jar"/> -- <pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-6.1.26.jar"/> -- <pathelement path="../../../../../../../../../usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-jsp-2.1-api.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/apache-commons-el-1.0.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/> -+ <pathelement path="../../../../bundles/org.mortbay.jetty.util_6.1.23.v201012071420.jar"/> -+ <pathelement path="../../../../bundles/org.mortbay.jetty.server_6.1.23.v201012071420.jar"/> -+ <pathelement path="../../../../bundles/org.apache.jasper_5.5.17.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet.jsp_2.0.0.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.el_1.0.0.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.logging_1.0.4.v201101211617.jar"/> +diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml +--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2011-09-09 09:31:10.000000000 +0200 ++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2012-01-19 16:11:35.000000000 +0100 +@@ -99,11 +99,11 @@ + <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> + <pathelement path="../org.eclipse.osgi.services"/> + <pathelement path="../org.eclipse.osgi.services/@dot"/> +- <pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/> +- <pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/> +- <pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/> ++ <pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/> ++ <pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/> ++ <pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/> + <pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/> +- <pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/> ++ <pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/> + <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/> <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.servlet/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.servlet/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.http.servlet/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.http.servlet/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -90,20 +90,18 @@ - <delete dir="${temp.folder}"/> - </target> - -- <target name="@dot.nestedJars"> -- </target> -- <target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.http.servlet @dot."> -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.equinox.http.servlet @dot."> - <delete dir="${build.result.folder}/@dot"/> - <mkdir dir="${build.result.folder}/@dot"/> - <path id="@dot.classpath"> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> - </path> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.console/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.console/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.console/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.console/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -122,12 +120,12 @@ - <pathelement path="../org.eclipse.equinox.security/@dot"/> - <pathelement path="../org.eclipse.equinox.security.macosx/bin/"/> - <pathelement path="../org.eclipse.equinox.security.macosx/@dot"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> -+ <pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/> - </path> - <!-- compile the source code --> - <javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured" > -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -120,12 +118,12 @@ - <pathelement path="../org.eclipse.equinox.security/@dot"/> - <pathelement path="../org.eclipse.equinox.security.macosx/bin/"/> - <pathelement path="../org.eclipse.equinox.security.macosx/@dot"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> -+ <pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/> - </path> - <!-- compile the source code --> - <javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured" > -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director.app/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director.app/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.director.app/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.director.app/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -89,14 +87,14 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/> -@@ -127,12 +125,12 @@ - <pathelement path="../org.eclipse.equinox.security/@dot"/> - <pathelement path="../org.eclipse.equinox.security.macosx/bin/"/> - <pathelement path="../org.eclipse.equinox.security.macosx/@dot"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> -+ <pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/> - </path> - <!-- compile the source code --> -@@ -182,14 +178,14 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/> -@@ -220,12 +216,12 @@ - <pathelement path="../org.eclipse.equinox.security/@dot"/> - <pathelement path="../org.eclipse.equinox.security.macosx/bin/"/> - <pathelement path="../org.eclipse.equinox.security.macosx/@dot"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> -+ <pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/> - <pathelement path="bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.director.app_1.0.300.v20110505/bin/"/> - <pathelement path="${build.result.folder}/@dot"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -108,7 +106,7 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.equinox.p2.core/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.core/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -118,17 +116,17 @@ - <pathelement path="../org.eclipse.equinox.security/@dot"/> - <pathelement path="../org.eclipse.equinox.security.macosx/bin/"/> - <pathelement path="../org.eclipse.equinox.security.macosx/@dot"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/> - <pathelement path="../org.eclipse.equinox.app/bin/"/> - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - </path> - <!-- compile the source code --> - <javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured" > -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -83,14 +81,14 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/> -@@ -185,14 +181,14 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.repository.tools/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.repository.tools/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.repository.tools/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.repository.tools/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -89,14 +87,14 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/> -@@ -135,8 +133,8 @@ - <pathelement path="../org.eclipse.equinox.p2.engine/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/> - <pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/> - <pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/> -@@ -197,14 +193,14 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/> -@@ -243,8 +239,8 @@ - <pathelement path="../org.eclipse.equinox.p2.engine/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/> - <pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/> - <pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -120,17 +118,17 @@ - <pathelement path="../org.eclipse.equinox.security/@dot"/> - <pathelement path="../org.eclipse.equinox.security.macosx/bin/"/> - <pathelement path="../org.eclipse.equinox.security.macosx/@dot"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.garbagecollector/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.garbagecollector/@dot"/> - <pathelement path="../org.eclipse.equinox.app/bin/"/> - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/> - <pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/> - <pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/> -@@ -139,8 +137,8 @@ - <pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.director/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.director/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/> - <pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/> - <pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.updatesite/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.updatesite/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.equinox.p2.updatesite/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.equinox.p2.updatesite/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -79,24 +79,22 @@ - <delete dir="${temp.folder}"/> - </target> - -- <target name="@dot.nestedJars"> -- </target> -- <target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.updatesite @dot."> -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.equinox.p2.updatesite @dot."> - <delete dir="${build.result.folder}/@dot"/> - <mkdir dir="${build.result.folder}/@dot"/> - <path id="@dot.classpath"> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.app/bin/"/> - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/> - <pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -99,25 +99,18 @@ - <delete dir="${temp.folder}"/> - </target> - -- <target name="@dot.nestedJars"> -- <mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/> -- <unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false"> -- <patternset includes="icu-data.jar"/> -- </unzip> -- </target> -- <target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.help @dot."> -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.help @dot."> - <delete dir="${build.result.folder}/@dot"/> - <mkdir dir="${build.result.folder}/@dot"/> - <path id="@dot.classpath"> -- <pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/> -- <pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/> -+ <pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.core.runtime/@dot"/> - <pathelement path="../org.eclipse.equinox.common/bin/"/> - <pathelement path="../org.eclipse.equinox.common/@dot"/> -@@ -140,7 +133,7 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.core.expressions/@dot"/> - </path> - <!-- compile the source code --> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help.base/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.help.base/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -77,42 +77,35 @@ - <antcall target="gather.bin.parts"> - <param name="destination.temp.folder" value="${temp.folder}/"/> - </antcall> -- <jar destfile="${plugin.destination}/org.eclipse.help.base_3.6.0.v20110506.jar" basedir="${temp.folder}/org.eclipse.help.base_3.6.0.v20110506" filesetmanifest="merge"/> -+ <jar destfile="${plugin.destination}/org.eclipse.help.base_3.6.0.v20110517.jar" basedir="${temp.folder}/org.eclipse.help.base_3.6.0.v20110517" filesetmanifest="merge"/> - <delete dir="${temp.folder}"/> - </target> - -- <target name="@dot.nestedJars"> -- <mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/> -- <unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false"> -- <patternset includes="icu-data.jar"/> -- </unzip> -- </target> -- <target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.help.base @dot."> -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.help.base @dot."> - <delete dir="${build.result.folder}/@dot"/> - <mkdir dir="${build.result.folder}/@dot"/> - <path id="@dot.classpath"> -- <pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/> -- <pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/> -+ <pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/> - <pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/bin/"/> - <pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.equinox.http.servlet/bin/"/> - <pathelement path="../org.eclipse.equinox.http.servlet/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-util-6.1.26.jar"/> -- <pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-6.1.26.jar"/> -- <pathelement path="../../../../../../../../../usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-jsp-2.1-api.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/apache-commons-el-1.0.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/> -+ <pathelement path="../../../../bundles/org.mortbay.jetty.util_6.1.23.v201012071420.jar"/> -+ <pathelement path="../../../../bundles/org.mortbay.jetty.server_6.1.23.v201012071420.jar"/> -+ <pathelement path="../../../../bundles/org.apache.jasper_5.5.17.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet.jsp_2.0.0.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.el_1.0.0.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.logging_1.0.4.v201101211617.jar"/> +diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.help.base/build.xml +--- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml 2011-09-09 09:31:10.000000000 +0200 ++++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.help.base/build.xml 2012-01-19 16:12:03.000000000 +0100 +@@ -107,11 +107,11 @@ + <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> + <pathelement path="../org.eclipse.osgi.services"/> + <pathelement path="../org.eclipse.osgi.services/@dot"/> +- <pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/> +- <pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/> +- <pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/> ++ <pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/> ++ <pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/> ++ <pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/> + <pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/> +- <pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/> ++ <pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/> + <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/> <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/> -@@ -137,8 +130,8 @@ - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/> - <pathelement path="../org.apache.lucene"/> - <pathelement path="../org.apache.lucene/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/lucene.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/lucene-contrib/lucene-analyzers.jar"/> -+ <pathelement path="../../../../bundles/org.apache.lucene.core_2.9.1.v201101211721.jar"/> -+ <pathelement path="../../../../bundles/org.apache.lucene.analysis_2.9.1.v201101211721.jar"/> - <pathelement path="../org.eclipse.ant.core/@dot"/> - <pathelement path="../org.eclipse.core.variables/@dot"/> - <pathelement path="../org.eclipse.core.runtime/@dot"/> -@@ -212,38 +205,31 @@ - </copy> - </target> - -- <target name="ant_tasks/helpbase-ant.jar.nestedJars"> -- <mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/> -- <unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false"> -- <patternset includes="icu-data.jar"/> -- </unzip> -- </target> -- <target name="ant_tasks/helpbase-ant.jar" depends="init,ant_tasks/helpbase-ant.jar.nestedJars" unless="ant_tasks/helpbase-ant.jar" description="Create jar: org.eclipse.help.base ant_tasks/helpbase-ant.jar."> -+ <target name="ant_tasks/helpbase-ant.jar" depends="init" unless="ant_tasks/helpbase-ant.jar" description="Create jar: org.eclipse.help.base ant_tasks/helpbase-ant.jar."> - <delete dir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin"/> - <mkdir dir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin"/> - <path id="ant_tasks/helpbase-ant.jar.classpath"> -- <pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/> -- <pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/> -+ <pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/> - <pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/bin/"/> - <pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.equinox.http.servlet/bin/"/> - <pathelement path="../org.eclipse.equinox.http.servlet/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> +@@ -238,11 +238,11 @@ <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> <pathelement path="../org.eclipse.osgi.services"/> <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-util-6.1.26.jar"/> -- <pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-6.1.26.jar"/> -- <pathelement path="../../../../../../../../../usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-jsp-2.1-api.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/apache-commons-el-1.0.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/> -+ <pathelement path="../../../../bundles/org.mortbay.jetty.util_6.1.23.v201012071420.jar"/> -+ <pathelement path="../../../../bundles/org.mortbay.jetty.server_6.1.23.v201012071420.jar"/> -+ <pathelement path="../../../../bundles/org.apache.jasper_5.5.17.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet.jsp_2.0.0.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.el_1.0.0.v201101211617.jar"/> -+ <pathelement path="../../../../bundles/org.apache.commons.logging_1.0.4.v201101211617.jar"/> +- <pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/> +- <pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/> +- <pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/> ++ <pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/> ++ <pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/> ++ <pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/> + <pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/> +- <pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/> ++ <pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/> + <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/> <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/> -@@ -268,8 +254,8 @@ - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/> - <pathelement path="../org.apache.lucene"/> - <pathelement path="../org.apache.lucene/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/lucene.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/lucene-contrib/lucene-analyzers.jar"/> -+ <pathelement path="../../../../bundles/org.apache.lucene.core_2.9.1.v201101211721.jar"/> -+ <pathelement path="../../../../bundles/org.apache.lucene.analysis_2.9.1.v201101211721.jar"/> - <pathelement path="../org.eclipse.ant.core/@dot"/> - <pathelement path="../org.eclipse.core.variables/@dot"/> - <pathelement path="../org.eclipse.core.runtime/@dot"/> -@@ -294,7 +280,7 @@ - <pathelement path="../org.eclipse.help/@dot"/> - <pathelement path="../org.eclipse.core.expressions/@dot"/> - <pathelement path="${build.result.folder}/@dot"/> -- <pathelement path="${build.result.folder}/../org.eclipse.help.base_3.6.0.v20110506/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.help.base_3.6.0.v20110517/@dot"/> - </path> - <!-- compile the source code --> - <javac destdir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured" > -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.osgi.services/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.osgi.services/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.osgi.services/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.osgi.services/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -97,24 +97,22 @@ - <antcall target="gather.bin.parts"> - <param name="destination.temp.folder" value="${temp.folder}/"/> - </antcall> -- <jar destfile="${plugin.destination}/org.eclipse.osgi.services_3.3.0.v20110411.jar" basedir="${temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411" filesetmanifest="merge"/> -+ <jar destfile="${plugin.destination}/org.eclipse.osgi.services_3.3.0.v20110513.jar" basedir="${temp.folder}/org.eclipse.osgi.services_3.3.0.v20110513" filesetmanifest="merge"/> - <delete dir="${temp.folder}"/> - </target> - -- <target name="@dot.nestedJars"> -- </target> -- <target name="@dot" depends="init,@dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.osgi.services @dot."> -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.osgi.services @dot."> - <delete dir="${build.result.folder}/@dot"/> - <mkdir dir="${build.result.folder}/@dot"/> - <path id="@dot.classpath"> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - </path> - <subant antfile="${customBuildCallbacks}" target="pre.@dot" failonerror="false" buildpath="."> - <property name="source.folder1" value="."/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.pde.build/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.pde.build/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.pde.build/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.pde.build/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -77,31 +77,24 @@ - <antcall target="gather.bin.parts"> - <param name="destination.temp.folder" value="${temp.folder}/"/> - </antcall> -- <jar destfile="${plugin.destination}/org.eclipse.pde.build_3.7.0.v20110509.jar" basedir="${temp.folder}/org.eclipse.pde.build_3.7.0.v20110509" filesetmanifest="merge"/> -+ <jar destfile="${plugin.destination}/org.eclipse.pde.build_3.7.0.v20110512-1320.jar" basedir="${temp.folder}/org.eclipse.pde.build_3.7.0.v20110512-1320" filesetmanifest="merge"/> - <delete dir="${temp.folder}"/> - </target> - -- <target name="pdebuild.jar.nestedJars"> -- <mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/> -- <unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false"> -- <patternset includes="icu-data.jar"/> -- </unzip> -- </target> -- <target name="pdebuild.jar" depends="init,pdebuild.jar.nestedJars" unless="pdebuild.jar" description="Create jar: org.eclipse.pde.build pdebuild.jar."> -+ <target name="pdebuild.jar" depends="init" unless="pdebuild.jar" description="Create jar: org.eclipse.pde.build pdebuild.jar."> - <delete dir="${temp.folder}/pdebuild.jar.bin"/> - <mkdir dir="${temp.folder}/pdebuild.jar.bin"/> - <path id="pdebuild.jar.classpath"> -- <pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/> -- <pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/> -+ <pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/> - <pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/> - <pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.common/bin/"/> - <pathelement path="../org.eclipse.equinox.common/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.core/bin/"/> -@@ -144,7 +137,7 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/> -@@ -166,8 +159,8 @@ - <pathelement path="../org.eclipse.equinox.p2.repository.tools/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.director/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.director/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/> - <pathelement path="../org.eclipse.equinox.p2.director.app/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.director.app/@dot"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/> -@@ -213,27 +206,20 @@ - </copy> - </target> - -- <target name="lib/pdebuild-ant.jar.nestedJars"> -- <mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/> -- <unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false"> -- <patternset includes="icu-data.jar"/> -- </unzip> -- </target> -- <target name="lib/pdebuild-ant.jar" depends="init,lib/pdebuild-ant.jar.nestedJars" unless="lib/pdebuild-ant.jar" description="Create jar: org.eclipse.pde.build lib/pdebuild-ant.jar."> -+ <target name="lib/pdebuild-ant.jar" depends="init" unless="lib/pdebuild-ant.jar" description="Create jar: org.eclipse.pde.build lib/pdebuild-ant.jar."> - <delete dir="${temp.folder}/lib/pdebuild-ant.jar.bin"/> - <mkdir dir="${temp.folder}/lib/pdebuild-ant.jar.bin"/> - <path id="lib/pdebuild-ant.jar.classpath"> -- <pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/> -- <pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/> -+ <pathelement path="../../../../bundles/com.ibm.icu_4.4.2.v20110208.jar"/> - <pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/> - <pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/> - <pathelement path="../org.eclipse.osgi/bin/"/> - <pathelement path="../org.eclipse.osgi/@dot"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -+ <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/> - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/> -- <pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/> - <pathelement path="../org.eclipse.equinox.common/bin/"/> - <pathelement path="../org.eclipse.equinox.common/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.core/bin/"/> -@@ -276,7 +262,7 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/> -@@ -298,14 +284,14 @@ - <pathelement path="../org.eclipse.equinox.p2.repository.tools/@dot"/> - <pathelement path="../org.eclipse.equinox.p2.director/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.director/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/> -- <pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.core_2.3.0.v20110329.jar"/> -+ <pathelement path="../../../../bundles/org.sat4j.pb_2.3.0.v20110329.jar"/> - <pathelement path="../org.eclipse.equinox.p2.director.app/bin/"/> - <pathelement path="../org.eclipse.equinox.p2.director.app/@dot"/> - <pathelement path="bin/"/> -- <pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110509/bin/"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110512-1320/bin/"/> - <pathelement path="${build.result.folder}/pdebuild.jar"/> -- <pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110509/pdebuild.jar"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110512-1320/pdebuild.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/> - <pathelement path="../org.eclipse.equinox.p2.repository.tools/lib/repository-tools-ant.jar"/> - <pathelement path="../org.apache.ant/ant.jar"/> -diff -urN eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.update.core/build.xml eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.update.core/build.xml ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts.orig/plugins/org.eclipse.update.core/build.xml 2011-06-15 18:11:43.000000000 +0200 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/generatedScripts/plugins/org.eclipse.update.core/build.xml 2011-07-04 15:18:29.000000000 +0200 -@@ -126,22 +124,24 @@ - <pathelement path="../org.eclipse.equinox.app/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/> -+ <pathelement path="../../../../bundles/javax.servlet_2.5.0.v201103041518.jar"/> - <pathelement path="../org.eclipse.update.configurator/@dot"/> - <pathelement path="../org.eclipse.core.net/bin/"/> - <pathelement path="../org.eclipse.core.net/@dot"/> - <pathelement path="../org.eclipse.core.net.linux.x86_64/@dot"/> -- <pathelement path="../org.eclipse.core.net.win32.x86/@dot"/> - <pathelement path="../org.eclipse.core.net.linux.x86/@dot"/> -+ <pathelement path="../org.eclipse.core.net.win32.x86/@dot"/> - <pathelement path="../org.eclipse.core.net.win32.x86_64/@dot"/> -+ <pathelement path="../org.eclipse.core.net.freebsd.x86/@dot"/> -+ <pathelement path="../org.eclipse.core.net.freebsd.x86_64/@dot"/> - <pathelement path="../org.eclipse.equinox.security/bin/"/> - <pathelement path="../org.eclipse.equinox.security/@dot"/> - <pathelement path="../org.eclipse.equinox.security.macosx/bin/"/> - <pathelement path="../org.eclipse.equinox.security.macosx/@dot"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -- <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/> - <pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/> -+ <pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/> - </path> - <subant antfile="${customBuildCallbacks}" target="pre.@dot" failonerror="false" buildpath="."> - <property name="source.folder1" value="src/"/> |