[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-187-g65aca3d
Benjamin Drung
bdrung at alioth.debian.org
Tue Feb 1 13:13:27 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master-3.6 has been updated
via 65aca3d333d2d581c17c4d207d5b18a0a83ab190 (commit)
via 8a90f6f63427ad22deee2c59711513d728de82e4 (commit)
via ff028ae3cb9c3066288605b13c0bf61754aa5a5c (commit)
via 68f899e621857ab6f44c7926b80c1da742bf7adf (commit)
from 356d32c3a7f6fbe4f219f39826cb5e6f8fc1fef7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 65aca3d333d2d581c17c4d207d5b18a0a83ab190
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Feb 1 14:13:12 2011 +0100
Refresh patches.
commit 8a90f6f63427ad22deee2c59711513d728de82e4
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Feb 1 14:06:12 2011 +0100
Drop compile-jarinjarloader.patch (applied upstream).
commit ff028ae3cb9c3066288605b13c0bf61754aa5a5c
Merge: 356d32c 68f899e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Feb 1 14:03:18 2011 +0100
Merge branch 'upstream-3.6' into master-3.6
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 25 +++
build.xml | 37 ++++-
debian/patches/compile-IPluginDescriptor.patch | 21 ++-
debian/patches/compile-jarinjarloader.patch | 40 ----
debian/patches/eclipse-manpage.patch | 2 +-
...nerate-metadata-and-extract-swt-libraries.patch | 2 +-
debian/patches/remove-unnecessary-files.patch | 2 +-
debian/patches/series | 1 -
debian/patches/strip-destDir.patch | 2 +-
patches/bz319476-compile-jar-in-jar-loader.patch | 197 ++++++++++++++++++++
patches/eclipse-help-webapps-xss-BZ329582.patch | 25 +++
runtests.sh | 11 +-
12 files changed, 304 insertions(+), 61 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 109c27a..dfc577b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2011-01-19 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Aggregate test results with proper JUNIT.XSL.
+
+2011-01-18 Andrew Overholt <overholt at redhat.com>
+
+ Bug #334716
+
+ * build.xml: Provision SDK and test framework for use by tests.
+ * runtests.sh: Use SDK and test framework provisioned by build.xml.
+
+2011-01-11 Andrew Overholt <overholt at redhat.com>
+
+ Bug #319476
+
+ * patches/bz319476-compile-jar-in-jar-loader.patch: Backport patch to
+ build jar-in-jar-loader in JDT UI (bz324794).
+ * build.xml: Add patch to build jar-in-jar-loader.
+
+2010-12-10 Severin Gehwolf <sgehwolf at redhat.com>
+
+ * patches/eclipse-help-webapps-xss-BZ329582.patch: Backport patch for XSS vulnerability
+ of org.eclipse.help.webapp.
+ * build.xml: Add backport patch to applyPatches target.
+
2010-10-26 Severin Gehwolf <sgehwolf at redhat.com>
* patches/eclipse-pde.build-add-package-build.patch: Fix the
diff --git a/build.xml b/build.xml
index f88d145..a622819 100644
--- a/build.xml
+++ b/build.xml
@@ -60,6 +60,7 @@
<property name="productFiles" value="${buildConfig}/productFiles" />
<property name="reposource" value="${buildDirectory}/reposource" />
<property name="provisionDir" value="${buildDirectory}/installation" />
+ <property name="provisionWithTestsDir" value="${buildDirectory}/installationWithTests" />
<!-- Distros with alternative JUnit 4 JAR locations should pass this
parameter in to ant -->
@@ -312,6 +313,8 @@
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<!-- end eclipse-build-only patches -->
<!-- back-ported patches -->
+ <patch patchfile="${basedir}/patches/eclipse-help-webapps-xss-BZ329582.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/bz319476-compile-jar-in-jar-loader.patch" dir="${buildDirectory}/plugins/org.eclipse.jdt.ui" strip="0" />
<!-- end back-ported patches -->
<!-- Only build for one target (bug #293952) -->
<copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
@@ -784,6 +787,36 @@
<property name="debugTestsSwitch" value="" />
<property name="verboseTestsSwitch" value="" />
+ <!-- Install a clean SDK for testing -->
+ <antcall target="provision">
+ <param name="provisionDir" value="${provisionWithTestsDir}"/>
+ <param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
+ <param name="profileName" value="SDKProfile" />
+ </antcall>
+
+ <fileset id="junit4.jar" dir="${provisionWithTestsDir}/plugins">
+ <include name="**/org.junit4_**/junit.jar" />
+ </fileset>
+ <property name="junit4jar.path" refid="junit4.jar" />
+
+ <delete file="${provisionWithTestsDir}/plugins/${junit4jar.path}" />
+ <symlink link="${provisionWithTestsDir}/plugins/${junit4jar.path}" resource="${junit4JarLocation}" />
+
+ <!-- Re-symlink system JARs -->
+ <symlinkInstalledOSGiJars dependencies="${basedir}/dependencies.properties" topLevelDir="${provisionWithTestsDir}/plugins" />
+ <symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties" topLevelDir="${provisionWithTestsDir}/plugins" />
+ <symlinkInstalledOSGiJars dependencies="${basedir}/jdtdependencies.properties" topLevelDir="${provisionWithTestsDir}/plugins" />
+ <symlinkNonOSGiJars dependencies="${basedir}/jdtnonosgidependencies.properties" topLevelDir="${provisionWithTestsDir}/plugins" />
+ <symlinkInstalledOSGiJars dependencies="${basedir}/sdkdependencies.properties" topLevelDir="${provisionWithTestsDir}/plugins" />
+
+ <!-- Install test framework -->
+ <antcall target="provision">
+ <param name="provisionDir" value="${provisionWithTestsDir}"/>
+ <param name="reposource" value="${testsBuildDirectory}/buildRepo" />
+ <param name="p2.director.installIU" value="org.eclipse.test.feature.group" />
+ <param name="profileName" value="SDKProfile" />
+ </antcall>
+
<echo message="###################################################################" />
<echo message="# #" />
<echo message="# Please post and discuss results here: #" />
@@ -801,7 +834,7 @@
<exec executable="${basedir}/runtests.sh" dir="${basedir}">
<arg value="-t${timestamp}" />
<arg value="-b ${testsBuildDirectory}" />
- <arg value="-p ${provisionDir}" />
+ <arg value="-p ${provisionWithTestsDir}" />
<arg value="${testSwitches}" />
</exec>
<property name="testResultDir" value="${basedir}/tests_${timestamp}/results" />
@@ -826,7 +859,7 @@
<fileset dir="${testResultDir}/origXml" includes="*.xml" />
</junitreport>
<!-- Generate top-level HTML report -->
- <xslt style="${basedir}/tests_${timestamp}/installation/plugins/${testframework}/JUNIT.XSL" basedir="${testResultDir}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${testResultDir}/html" />
+ <xslt style="${provisionWithTestsDir}/plugins/${testframework}/JUNIT.XSL" basedir="${testResultDir}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${testResultDir}/html" />
</target>
<target name="run.director">
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index bf2995f..bc5dc71 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,10 +4,12 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319478
--- a/build.xml
+++ b/build.xml
-@@ -382,6 +382,32 @@
- <zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
- basedir="${basedir}/temp/"/>
- <delete dir="${basedir}/temp/"/>
+@@ -371,7 +371,38 @@
+ <echo file="symlinks-stamp" />
+ </target>
+
+- <target name="build" depends="applyPatches,symlinkDeps,bootstrap,compilelibs" unless="build.complete">
++ <target name="prebootstrap" depends="symlinkDeps" unless="prebootstrap.complete">
+ <mkdir dir="${basedir}/temp/" />
+ <copy todir="${basedir}/temp/" >
+ <fileset dir="${basedir}/stubs/">
@@ -34,9 +36,14 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319478
+ </fileset>
+ </copy>
+ <delete dir="${basedir}/temp/"/>
- <!-- Create a stamp file -->
- <echo file="prebootstrap-stamp" />
- </target>
++ <!-- Create a stamp file -->
++ <echo file="prebootstrap-stamp" />
++ </target>
++
++ <target name="build" depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs" unless="build.complete">
+ <echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
+ <java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
+ <classpath>
--- /dev/null
+++ b/stubs/org/eclipse/core/runtime/CoreException.java
@@ -0,0 +1,4 @@
diff --git a/debian/patches/compile-jarinjarloader.patch b/debian/patches/compile-jarinjarloader.patch
deleted file mode 100644
index 664e949..0000000
--- a/debian/patches/compile-jarinjarloader.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Regenerates the jar-in-jar-loader.zip file from source.
-From: Niels Thykier <niels at thykier.net>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319476
-
---- a/build.xml
-+++ b/build.xml
-@@ -36,6 +36,7 @@
- <uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
- <uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
- <uptodate property="symlinks.complete" srcfile="patch-stamp" targetfile="symlinks-stamp" />
-+ <uptodate property="prebootstrap.complete" srcfile="symlinks-stamp" targetfile="prebootstrap-stamp" />
- <uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
- <uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
- <uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
-@@ -368,7 +369,24 @@
- <echo file="symlinks-stamp" />
- </target>
-
-- <target name="build" depends="applyPatches,symlinkDeps,bootstrap,compilelibs" unless="build.complete">
-+ <target name="prebootstrap" depends="symlinkDeps" unless="prebootstrap.complete">
-+ <mkdir dir="${basedir}/temp/" />
-+ <javac destdir="${basedir}/temp"
-+ srcdir="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar in jar loader/"
-+ source="1.3"
-+ target="1.1"
-+ debug="true"
-+ optimize="true"
-+ fork="true"
-+ compiler="modern" />
-+ <zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
-+ basedir="${basedir}/temp/"/>
-+ <delete dir="${basedir}/temp/"/>
-+ <!-- Create a stamp file -->
-+ <echo file="prebootstrap-stamp" />
-+ </target>
-+
-+ <target name="build" depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs" unless="build.complete">
- <echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
- <java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
- <classpath>
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index 7a7e74c..0e5db13 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -624,7 +624,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
+</refentry>
--- a/build.xml
+++ b/build.xml
-@@ -918,6 +918,12 @@
+@@ -951,6 +951,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
index f288fa9..6c84b39 100644
--- a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -4,7 +4,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -982,6 +982,55 @@
+@@ -1002,6 +1002,55 @@
<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
index 6ce5b13..f1ca1b8 100644
--- a/debian/patches/remove-unnecessary-files.patch
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -3,7 +3,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -1117,6 +1117,10 @@
+@@ -1137,6 +1137,10 @@
</fileset>
</apply>
diff --git a/debian/patches/series b/debian/patches/series
index dcc87d7..53de397 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
eclipse-manpage.patch
-compile-jarinjarloader.patch
compile-IPluginDescriptor.patch
use-stable-xulrunner.patch
add-o.e.equinox.concurrent.patch
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
index 2d2aeaa..e0394a6 100644
--- a/debian/patches/strip-destDir.patch
+++ b/debian/patches/strip-destDir.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
--- a/build.xml
+++ b/build.xml
-@@ -1121,6 +1121,21 @@
+@@ -1141,6 +1141,21 @@
<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
diff --git a/patches/bz319476-compile-jar-in-jar-loader.patch b/patches/bz319476-compile-jar-in-jar-loader.patch
new file mode 100644
index 0000000..25fccef
--- /dev/null
+++ b/patches/bz319476-compile-jar-in-jar-loader.patch
@@ -0,0 +1,197 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.jdt.ui
+Index: build.properties
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/build.properties,v
+retrieving revision 1.39
+diff -u -r1.39 build.properties
+--- build.properties 14 Jan 2010 16:57:59 -0000 1.39
++++ build.properties 20 Oct 2010 19:00:04 -0000
+@@ -31,3 +31,4 @@
+ core extension/,\
+ internal compatibility/
+ jars.compile.order = .
++customBuildCallbacks = customBuildCallbacks.xml
+Index: customBuildCallbacks.xml
+===================================================================
+RCS file: customBuildCallbacks.xml
+diff -N customBuildCallbacks.xml
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ customBuildCallbacks.xml 1 Jan 1970 00:00:00 -0000
+@@ -0,0 +1,176 @@
++<!-- ===================================================================== -->
++<!-- Custom targets called from a project's generated build.xml -->
++<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
++<!-- ===================================================================== -->
++<project name="Build specific targets and properties" default="noDefault">
++
++ <available file="${basedir}/jar-in-jar-loader.zip" property="jijl-zip" />
++
++ <!-- ===================================================================== -->
++ <!-- Default target -->
++ <!-- ===================================================================== -->
++ <target name="noDefault">
++ <echo message="This file must be called with explicit targets" />
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do before the target build.jars -->
++ <!-- Available parameters : -->
++ <!-- build.result.folder - folder to contain the build results -->
++ <!-- ===================================================================== -->
++ <target name="pre.build.jars">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do after the target build.jars -->
++ <!-- Available parameters : -->
++ <!-- build.result.folder - folder to contain the build results -->
++ <!-- ===================================================================== -->
++ <target name="post.build.jars">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do before the target build.sources -->
++ <!-- Available parameters : -->
++ <!-- build.result.folder - folder to contain the build results -->
++ <!-- ===================================================================== -->
++ <target name="pre.build.sources">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do after the target build.sources -->
++ <!-- Available parameters : -->
++ <!-- build.result.folder - folder to contain the build results -->
++ <!-- ===================================================================== -->
++ <target name="post.build.sources">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do before the compilation target <name> -->
++ <!-- Substitute "name" with the name of the compilation target, eg @dot -->
++ <!-- Available parameters : -->
++ <!-- source.foldern : n = 1 ... N, the source folders -->
++ <!-- target.folder : where the results of the compilation go -->
++ <!-- <name>.classpath : name = name of the compilation target. A -->
++ <!-- reference to the classpath structure. -->
++ <!-- ===================================================================== -->
++ <target name="pre.name">
++ </target>
++
++ <target name="pre. at dot" depends="compile-jar-in-jar-loader">
++ </target>
++
++ <target name="compile-jar-in-jar-loader" unless="jijl-zip" >
++ <mkdir dir="${basedir}/temp/" />
++ <javac destdir="${basedir}/temp"
++ srcdir="jar in jar loader/"
++ source="1.3"
++ target="1.1"
++ debug="true"
++ optimize="true"
++ fork="true" />
++ <zip destfile="${basedir}/jar-in-jar-loader.zip"
++ basedir="${basedir}/temp/" />
++
++ <delete dir="${basedir}/temp/" />
++
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do during the compilation target <name>, after the compile -->
++ <!-- but before jaring. Substitute "name" with the name of the compilation-->
++ <!-- target, eg @dot -->
++ <!-- Available parameters : -->
++ <!-- source.foldern : n = 1 ... N, the source folders -->
++ <!-- target.folder : where the results of the compilation go -->
++ <!-- <name>.classpath : name = name of the compilation target. A -->
++ <!-- reference to the classpath structure. -->
++ <!-- ===================================================================== -->
++ <target name="post.compile.name">
++ </target>
++
++ <target name="post.compile. at dot">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do after the compilation target <name> -->
++ <!-- Substitute "name" with the name of the compilation target, eg @dot -->
++ <!-- Available parameters : -->
++ <!-- jar.Location - the location of the compilation results -->
++ <!-- <name>.classpath : name = name of the compilation target. A -->
++ <!-- reference to the classpath structure. -->
++ <!-- ===================================================================== -->
++ <target name="post.name">
++ </target>
++
++ <target name="post. at dot">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do before the target gather.bin.parts -->
++ <!-- Available parameters : -->
++ <!-- build.result.folder - folder containing the build results -->
++ <!-- target.folder - destination folder -->
++ <!-- ===================================================================== -->
++ <target name="pre.gather.bin.parts">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do after the target gather.bin.parts -->
++ <!-- Available parameters : -->
++ <!-- build.result.folder - folder containing the build results -->
++ <!-- target.folder - destination folder -->
++ <!-- ===================================================================== -->
++ <target name="post.gather.bin.parts">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do before the target gather.sources -->
++ <!-- Available parameters : -->
++ <!-- destination.temp.folder - destination folder -->
++ <!-- ===================================================================== -->
++ <target name="pre.gather.sources">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do after the target gather.sources -->
++ <!-- Available parameters : -->
++ <!-- destination.temp.folder - destination folder -->
++ <!-- ===================================================================== -->
++ <target name="post.gather.sources">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do before the target gather.logs -->
++ <!-- Available parameters : -->
++ <!-- destination.temp.folder - destination folder -->
++ <!-- ===================================================================== -->
++ <target name="pre.gather.logs">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do after the target gather.logs -->
++ <!-- Available parameters : -->
++ <!-- destination.temp.folder - destination folder -->
++ <!-- ===================================================================== -->
++ <target name="post.gather.logs">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do before the target clean -->
++ <!-- Available parameters : -->
++ <!-- destination.temp.folder - destination folder -->
++ <!-- ===================================================================== -->
++ <target name="pre.clean">
++ </target>
++
++ <!-- ===================================================================== -->
++ <!-- Steps to do after the target clean -->
++ <!-- Available parameters : -->
++ <!-- plugin.destination - final destination of the build -->
++ <!-- build.result.folder - results of the compilation -->
++ <!-- temp.folder - temporary folder -->
++ <!-- ===================================================================== -->
++ <target name="post.clean">
++ </target>
++</project>
diff --git a/patches/eclipse-help-webapps-xss-BZ329582.patch b/patches/eclipse-help-webapps-xss-BZ329582.patch
new file mode 100644
index 0000000..7ce0752
--- /dev/null
+++ b/patches/eclipse-help-webapps-xss-BZ329582.patch
@@ -0,0 +1,25 @@
+# Backport patch for upstream Eclipse BZ: 329582 (XSS attack)
+--- plugins/org.eclipse.help.webapp/advanced/content.jsp.orig 2010-04-21 14:00:16.000000000 -0400
++++ plugins/org.eclipse.help.webapp/advanced/content.jsp 2010-12-10 09:41:14.642196217 -0500
+@@ -45,7 +45,7 @@
+
+ </head>
+ <frameset id="contentFrameset" rows="<%=frameData.getContentAreaFrameSizes()%>" frameborder=0" framespacing="0" border="0" spacing="0">
+- <frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+data.getQuery()%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >
++ <frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >
+ <frame ACCESSKEY="K" name="ContentViewFrame" title="<%=ServletResources.getString("topicView", request)%>" src='<%=UrlUtil.htmlEncode(data.getContentURL())%>' marginwidth="10"<%=(data.isIE() && "6.0".compareTo(data.getIEVersion()) <=0)?"scrolling=\"yes\"":""%> marginheight="0" frameborder="0" >
+ <%
+ AbstractFrame[] frames = frameData.getFrames(AbstractFrame.BELOW_CONTENT);
+--- plugins/org.eclipse.help.webapp/basic/index.jsp.orig 2010-04-21 14:00:17.000000000 -0400
++++ plugins/org.eclipse.help.webapp/basic/index.jsp 2010-12-10 09:42:58.516317455 -0500
+@@ -29,8 +29,8 @@
+ <%
+ }
+ %>
+- <frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+data.getQuery()%>' marginwidth="5" marginheight="5" scrolling="no">
+- <frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+data.getQuery()%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">
++ <frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="5" marginheight="5" scrolling="no">
++ <frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">
+ <%
+ if(!("0".equals(data.getFooterHeight()))){
+ %>
diff --git a/runtests.sh b/runtests.sh
index 2924bcc..b77f785 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -94,14 +94,11 @@ function init() {
testsParent=$(pwd)/tests_${timestamp}
mkdir -p ${testsParent}
- cp -rp ${provisionDir} ${testsParent}/testsinstallation.clean
- cleanInstall=${testsParent}/testsinstallation.clean
- workspace=${testsParent}/workspace
+ cp -rp ${provisionDir} ${testsParent}/installationWithTests.clean
+ cleanInstall=${testsParent}/installationWithTests.clean
+ workspace=${testsParent}/workspace
- eclipseHome=${cleanInstall}
- installTestFramework
-
- eclipseHome=${testsParent}/installation
+ eclipseHome=${provisionDir}
results=${testsParent}/results
datadir=${testsParent}/testDataDir
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list