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, upstream-3.6 has been updated via 68f899e621857ab6f44c7926b80c1da742bf7adf (commit) from c4581570d622c04e03188f20aeb9f2149dff5724 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 25 +++ build.xml | 37 ++++- patches/bz319476-compile-jar-in-jar-loader.patch | 197 ++++++++++++++++++++++ patches/eclipse-help-webapps-xss-BZ329582.patch | 25 +++ runtests.sh | 11 +- 5 files changed, 286 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 109c27a..dfc577b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2011-01-19 Andrew Overholt <overh...@redhat.com> + + * build.xml: Aggregate test results with proper JUNIT.XSL. + +2011-01-18 Andrew Overholt <overh...@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 <overh...@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 <sgehw...@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 <sgehw...@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/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.@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.@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.@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. _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits